Rename old tq methods that no longer need a unique name

(cherry picked from commit e2cfc7c4dd)
v3.5.13-sru
Timothy Pearson 13 years ago committed by Slávek Banko
parent 5fbe0e6759
commit 4c7c7b15be

@ -78,7 +78,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>240</height>

@ -94,7 +94,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>146</width>
<height>20</height>
@ -113,7 +113,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>16</height>

@ -186,7 +186,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>171</width>
<height>20</height>
@ -270,7 +270,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>51</height>

@ -42,7 +42,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>30</height>

@ -48,7 +48,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>50</height>
@ -286,7 +286,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>41</height>

@ -165,7 +165,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>141</height>

@ -50,7 +50,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>282</width>
<height>20</height>

@ -105,7 +105,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>60</width>
<height>20</height>

@ -65,7 +65,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>50</width>
<height>20</height>

@ -82,7 +82,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>180</width>
<height>20</height>

@ -266,7 +266,7 @@ void DeviceTray::updateActiveConnection(NMDeviceState state)
{
Info* info = dynamic_cast<Info*>(active_conn->getSetting(NM_SETTING_CONNECTION_SETTING_NAME));
if (info)
info->setTimestamp(TQDateTime::tqcurrentDateTime());
info->setTimestamp(TQDateTime::currentDateTime());
}
}

@ -42,7 +42,7 @@ PluginManager::PluginManager(TQObject* parent, const char* name)
: TQObject(parent, name)
{
// get list of available plugins
this->_plugins = KPluginInfo::fromServices( KTrader::self()->query( TQString::tqfromLatin1( "KNetworkManager/Plugin" )));
this->_plugins = KPluginInfo::fromServices( KTrader::self()->query( TQString::fromLatin1( "KNetworkManager/Plugin" )));
// a bit debug output
for(TQValueList<KPluginInfo*>::ConstIterator it = _plugins.begin(); it != _plugins.end(); ++it)
@ -125,8 +125,8 @@ Plugin* PluginManager::loadPlugin(const TQString& pluginID)
// try to load Plugin
int error = 0;
KPluginInfo* info = infoForPluginID(pluginID);
Plugin *plugin = KParts::ComponentFactory::createInstanceFromQuery<Plugin>( TQString::tqfromLatin1( "KNetworkManager/Plugin" ),
TQString::tqfromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).tqarg( pluginID ), this, 0, TQStringList(), &error );
Plugin *plugin = KParts::ComponentFactory::createInstanceFromQuery<Plugin>( TQString::fromLatin1( "KNetworkManager/Plugin" ),
TQString::fromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).tqarg( pluginID ), this, 0, TQStringList(), &error );
// plugin loaded?
if (plugin)

@ -991,7 +991,7 @@ void Tray::updateActiveConnection(NMDeviceState state)
{
Info* info = dynamic_cast<Info*>(active_conn->getSetting(NM_SETTING_CONNECTION_SETTING_NAME));
if (info)
info->setTimestamp(TQDateTime::tqcurrentDateTime());
info->setTimestamp(TQDateTime::currentDateTime());
}
}
}

@ -109,7 +109,7 @@ VPNAuthenticationDialog::VPNAuthenticationDialog(VPNConnection* conn, TQWidget*
widget->setFocus();
// resize
this->resize(tqminimumSizeHint());
this->resize(minimumSizeHint());
}
VPNAuthenticationDialog::~VPNAuthenticationDialog()

@ -115,7 +115,7 @@ WirelessNetworkItem::paint (TQPainter *p, const TQColorGroup &/*cg*/, bool highl
{
int spacer = 0;
pbarStrength->setTotalSteps (100);
pbarStrength->tqsetSizePolicy (TQSizePolicy ((TQSizePolicy::SizeType) 0, (TQSizePolicy::SizeType) 0, 0, 0, pbarStrength->sizePolicy ().hasHeightForWidth ()));
pbarStrength->setSizePolicy (TQSizePolicy ((TQSizePolicy::SizeType) 0, (TQSizePolicy::SizeType) 0, 0, 0, pbarStrength->sizePolicy ().hasHeightForWidth ()));
pbarStrength->setFixedHeight (_height - 2);
pbarStrength->setProgress (_net.getStrength());
pbarStrength->setPercentageVisible (false);
@ -130,20 +130,20 @@ WirelessNetworkItem::paint (TQPainter *p, const TQColorGroup &/*cg*/, bool highl
if (_net.isEncrypted()) {
TQPixmap pmLock = SmallIcon ("lock", TQIconSet::Automatic);
p->drawPixmap (parent->tqsizeHint ().width () - pbarStrength->width () - _space - pmLock.size ().width () - 6, y + _border, pmLock);
p->drawPixmap (parent->sizeHint ().width () - pbarStrength->width () - _space - pmLock.size ().width () - 6, y + _border, pmLock);
spacer = pmLock.size ().width () + 4;
}
if (_adhoc) {
TQPixmap pmAdHoc = SmallIcon ("system", TQIconSet::Automatic);
p->drawPixmap (parent->tqsizeHint ().width () - pbarStrength->width () - _space - pmAdHoc.size ().width () - spacer - 6, y + _border, pmAdHoc);
p->drawPixmap (parent->sizeHint ().width () - pbarStrength->width () - _space - pmAdHoc.size ().width () - spacer - 6, y + _border, pmAdHoc);
}
p->drawPixmap (parent->tqsizeHint ().width () - pbarStrength->width () - _space, y +_border, TQPixmap::grabWidget (pbarStrength));
p->drawPixmap (parent->sizeHint ().width () - pbarStrength->width () - _space, y +_border, TQPixmap::grabWidget (pbarStrength));
}
TQSize
WirelessNetworkItem::tqsizeHint ()
WirelessNetworkItem::sizeHint ()
{
return TQSize (_width, _height);
}
@ -169,7 +169,7 @@ WirelessNetworkItem::WirelessNetworkItem (TQWidget* p, Device* dev, WirelessNetw
// figure out the height of the text
_textHeight = kapp->fontMetrics ().size (AlignLeft | AlignVCenter | DontClip | ShowPrefix, _net.getDisplaySsid()).height ();
// the item is height of the text plus the default frame width
_height = _textHeight + kapp->tqstyle ().tqpixelMetric (TQStyle::PM_DefaultFrameWidth);
_height = _textHeight + kapp->tqstyle ().pixelMetric (TQStyle::PM_DefaultFrameWidth);
/* _height needs to be at least the height of a SmallIcon plus a border of one px (top & bottom)*/
if (_height < _widgetHeight) {
_height = _widgetHeight + 2;
@ -177,8 +177,8 @@ WirelessNetworkItem::WirelessNetworkItem (TQWidget* p, Device* dev, WirelessNetw
/* border required for pmLock and pbarStrength */
_border = 1;
if (_border == kapp->tqstyle ().tqpixelMetric (TQStyle::PM_DefaultFrameWidth))
_border += 2 * kapp->tqstyle ().tqpixelMetric (TQStyle::PM_DefaultFrameWidth);
if (_border == kapp->tqstyle ().pixelMetric (TQStyle::PM_DefaultFrameWidth))
_border += 2 * kapp->tqstyle ().pixelMetric (TQStyle::PM_DefaultFrameWidth);
if (_border == 0)
_border ++;
@ -209,7 +209,7 @@ WirelessNetworkItem::WirelessNetworkItem (TQWidget* p, Device* dev, WirelessNetw
// figure out the height of the text
_textHeight = kapp->fontMetrics ().size (AlignLeft | AlignVCenter | DontClip | ShowPrefix, _net.getDisplaySsid()).height ();
// the item is height of the text plus the default frame width
_height = _textHeight + kapp->tqstyle ().tqpixelMetric (TQStyle::PM_DefaultFrameWidth);
_height = _textHeight + kapp->tqstyle ().pixelMetric (TQStyle::PM_DefaultFrameWidth);
/* _height needs to be at least the height of a SmallIcon plus a border of one px (top & bottom)*/
if (_height < _widgetHeight) {
_height = _widgetHeight + 2;
@ -217,8 +217,8 @@ WirelessNetworkItem::WirelessNetworkItem (TQWidget* p, Device* dev, WirelessNetw
/* border required for pmLock and pbarStrength */
_border = 1;
if (_border == kapp->tqstyle ().tqpixelMetric (TQStyle::PM_DefaultFrameWidth))
_border += 2 * kapp->tqstyle ().tqpixelMetric (TQStyle::PM_DefaultFrameWidth);
if (_border == kapp->tqstyle ().pixelMetric (TQStyle::PM_DefaultFrameWidth))
_border += 2 * kapp->tqstyle ().pixelMetric (TQStyle::PM_DefaultFrameWidth);
if (_border == 0)
_border ++;

@ -60,7 +60,7 @@ class WirelessNetworkItem : public NetworkMenuItem, public TQCustomMenuItem
TQProgressBar* pbarStrength;
void paint (TQPainter*, const TQColorGroup&, bool, bool, int, int, int, int);
TQSize tqsizeHint ();
TQSize sizeHint ();
public slots:
void slotActivate();

@ -64,7 +64,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@ -92,7 +92,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>

@ -166,7 +166,7 @@ TQString OpenVPNConfig::findOpenVPNBinary()
void OpenVPNConfig::receiveCipherData(KProcess*, char* buffer, int len)
{
// add possible cipher modes to the combobox
TQStringList cipherModes = TQStringList::split("\n", TQString::tqfromLatin1(buffer, len), false );
TQStringList cipherModes = TQStringList::split("\n", TQString::fromLatin1(buffer, len), false );
for (TQStringList::ConstIterator it = cipherModes.begin(); it != cipherModes.end(); ++it)
{
_openvpnWidget->cboCipher->insertItem((*it));
@ -181,7 +181,7 @@ void OpenVPNConfig::getCipherModes()
{
KProcess* cipherHelper = new KProcess();
cipherHelper->setUseShell(true, "/bin/sh");
*cipherHelper << TQString::tqfromLatin1("%1 --show-ciphers | awk '/^[A-Z][A-Z0-9]+-/ { print $1 }'").tqarg(openvpn);
*cipherHelper << TQString::fromLatin1("%1 --show-ciphers | awk '/^[A-Z][A-Z0-9]+-/ { print $1 }'").tqarg(openvpn);
connect (cipherHelper, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), this, TQT_SLOT(receiveCipherData(KProcess*, char*, int)));
kdDebug() << "starting openvpn to get cipher modes" << endl;
if (!cipherHelper->start(KProcess::Block, KProcess::Stdout))

@ -40,7 +40,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>40</width>
<height>20</height>
@ -57,7 +57,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>40</height>

@ -44,7 +44,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@ -444,7 +444,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>30</height>

@ -32,7 +32,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>

@ -60,7 +60,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>30</height>
@ -99,7 +99,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@ -124,7 +124,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>220</width>
<height>20</height>
@ -141,7 +141,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>230</width>
<height>20</height>

@ -32,7 +32,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>100</height>
@ -75,7 +75,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>130</width>
<height>20</height>

@ -143,7 +143,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>16</height>
@ -197,7 +197,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>51</height>
@ -214,7 +214,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>231</width>
<height>31</height>

@ -132,7 +132,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
@ -253,7 +253,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>

Loading…
Cancel
Save