From 83677e35509b4dafac63b76995652bdf3b49f209 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:34 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 808e453c56036211f57482ed847d54aca01bba68. --- lanbrowsing/kcmlisa/findnic.cpp | 6 +++--- lanbrowsing/kcmlisa/kcmkiolan.cpp | 20 ++++++++++---------- lanbrowsing/kcmlisa/kcmlisa.cpp | 16 ++++++++-------- lanbrowsing/kcmlisa/kcmreslisa.cpp | 10 +++++----- lanbrowsing/kcmlisa/setupwizard.cpp | 22 +++++++++++----------- lanbrowsing/kcmlisa/setupwizard.h | 2 +- lanbrowsing/kio_lan/kio_lan.cpp | 6 +++--- 7 files changed, 41 insertions(+), 41 deletions(-) (limited to 'lanbrowsing') diff --git a/lanbrowsing/kcmlisa/findnic.cpp b/lanbrowsing/kcmlisa/findnic.cpp index 721834c9..d7437848 100644 --- a/lanbrowsing/kcmlisa/findnic.cpp +++ b/lanbrowsing/kcmlisa/findnic.cpp @@ -275,21 +275,21 @@ TQString flags_tos (unsigned int flags) if (flags & IFF_BROADCAST) { if (tmp.length()) { - tmp += TQString::fromLatin1(", "); + tmp += TQString::tqfromLatin1(", "); } tmp += i18n("Broadcast"); } if (flags & IFF_MULTICAST) { if (tmp.length()) { - tmp += TQString::fromLatin1(", "); + tmp += TQString::tqfromLatin1(", "); } tmp += i18n("Multicast"); } if (flags & IFF_LOOPBACK) { if (tmp.length()) { - tmp += TQString::fromLatin1(", "); + tmp += TQString::tqfromLatin1(", "); } tmp += i18n("Loopback"); } diff --git a/lanbrowsing/kcmlisa/kcmkiolan.cpp b/lanbrowsing/kcmlisa/kcmkiolan.cpp index b7abad2c..2f02e2fa 100644 --- a/lanbrowsing/kcmlisa/kcmkiolan.cpp +++ b/lanbrowsing/kcmlisa/kcmkiolan.cpp @@ -21,7 +21,7 @@ #include "kcmkiolan.h" #include -#include +#include #include #include #include @@ -35,8 +35,8 @@ IOSlaveSettings::IOSlaveSettings(const TQString& config, TQWidget *parent) :KCModule(parent) ,m_config(config,false,true) { - TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - layout->setAutoAdd(true); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + tqlayout->setAutoAdd(true); TQGroupBox* group=new TQGroupBox(1,Qt::Horizontal, i18n("Show Links for Following Services"), this); @@ -53,13 +53,13 @@ IOSlaveSettings::IOSlaveSettings(const TQString& config, TQWidget *parent) label->setBuddy(m_defaultLisaHostLe); TQWidget *w=new TQWidget(this); - layout->setStretchFactor(m_ftpSettings,0); - layout->setStretchFactor(m_httpSettings,0); - layout->setStretchFactor(m_nfsSettings,0); - layout->setStretchFactor(m_smbSettings,0); - layout->setStretchFactor(m_shortHostnames,0); - layout->setStretchFactor(hbox,0); - layout->setStretchFactor(w,1); + tqlayout->setStretchFactor(m_ftpSettings,0); + tqlayout->setStretchFactor(m_httpSettings,0); + tqlayout->setStretchFactor(m_nfsSettings,0); + tqlayout->setStretchFactor(m_smbSettings,0); + tqlayout->setStretchFactor(m_shortHostnames,0); + tqlayout->setStretchFactor(hbox,0); + tqlayout->setStretchFactor(w,1); connect(m_ftpSettings,TQT_SIGNAL(changed()),this,TQT_SIGNAL(changed())); connect(m_httpSettings,TQT_SIGNAL(changed()),this,TQT_SIGNAL(changed())); diff --git a/lanbrowsing/kcmlisa/kcmlisa.cpp b/lanbrowsing/kcmlisa/kcmlisa.cpp index e17cf5b0..ea0ee2d9 100644 --- a/lanbrowsing/kcmlisa/kcmlisa.cpp +++ b/lanbrowsing/kcmlisa/kcmlisa.cpp @@ -55,8 +55,8 @@ LisaSettings::LisaSettings(const TQString& config, TQWidget *parent) ,m_configFilename(config) ,m_changed(false) { - TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - layout->setAutoAdd(true); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + tqlayout->setAutoAdd(true); TQWidget *dummy(0); @@ -83,7 +83,7 @@ LisaSettings::LisaSettings(const TQString& config, TQWidget *parent) TQGrid *addressesGrid = new TQGrid(2, Qt::Horizontal, this); addressesGrid->setSpacing(10); - layout->setStretchFactor(addressesGrid,0); + tqlayout->setStretchFactor(addressesGrid,0); label=new TQLabel(i18n("&Broadcast network address:"),addressesGrid); comment=i18n("Your network address/subnet mask (e.g. 192.168.0.0/255.255.255.0;)"); @@ -102,13 +102,13 @@ LisaSettings::LisaSettings(const TQString& config, TQWidget *parent) label->setBuddy(m_allowedAddresses); dummy=new TQWidget(this); - layout->setStretchFactor(dummy,10); + tqlayout->setStretchFactor(dummy,10); hbox = new TQHBox(this); hbox->setSpacing(10); // m_autoSetup=new TQPushButton(i18n("&Guided LISa Setup..."),hbox); m_autoSetup=new TQPushButton(i18n("Setup Wizard..."),hbox); - m_autoSetup->setFixedWidth( m_autoSetup->sizeHint().width() ); + m_autoSetup->setFixedWidth( m_autoSetup->tqsizeHint().width() ); m_suggestSettings=new TQPushButton(i18n("&Suggest Settings"),hbox); @@ -288,7 +288,7 @@ void LisaSettings::save() confStream<<"PingNames = "<name+": "+tmp->addr+"/"+tmp->netmask+";
"; } - KMessageBox::information(0,TQString("%1").arg(msg)); + KMessageBox::information(0,TQString("%1").tqarg(msg)); } emit changed(); diff --git a/lanbrowsing/kcmlisa/kcmreslisa.cpp b/lanbrowsing/kcmlisa/kcmreslisa.cpp index 17c12671..1ced6c13 100644 --- a/lanbrowsing/kcmlisa/kcmreslisa.cpp +++ b/lanbrowsing/kcmlisa/kcmreslisa.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include @@ -53,8 +53,8 @@ ResLisaSettings::ResLisaSettings(const TQString& config, TQWidget *parent) ,m_maxPingsAtOnce(0) ,m_reslisaAdvancedDlg(0) { - TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - layout->setAutoAdd(true); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + tqlayout->setAutoAdd(true); TQVButtonGroup *gb=new TQVButtonGroup(i18n("Tell ResLISa Daemon How to Search for Hosts"),this); gb->setInsideSpacing(10); @@ -237,9 +237,9 @@ void ResLisaSettings::suggestSettings() { msg+=""+tmp->name+": "+tmp->addr+"/"+tmp->netmask+";
"; } - KMessageBox::information(0,TQString("%1").arg(msg)); + KMessageBox::information(0,TQString("%1").tqarg(msg)); } - KMessageBox::information(0,TQString("%1").arg(i18n("The ResLISa daemon is now configured " + KMessageBox::information(0,TQString("%1").tqarg(i18n("The ResLISa daemon is now configured " "correctly, hopefully.
Make sure that the reslisa binary is installed suid root."))); emit changed(); diff --git a/lanbrowsing/kcmlisa/setupwizard.cpp b/lanbrowsing/kcmlisa/setupwizard.cpp index 53b5033d..f5b985e1 100644 --- a/lanbrowsing/kcmlisa/setupwizard.cpp +++ b/lanbrowsing/kcmlisa/setupwizard.cpp @@ -199,7 +199,7 @@ void SetupWizard::setupSearchPage() m_searchPage->setSpacing(KDialog::spacingHint()); m_searchPage->setMargin(KDialog::marginHint()); info=new TQLabel(i18n("If unsure, keep it as is."),m_searchPage); - info->setAlignment(AlignRight|AlignVCenter); + info->tqsetAlignment(AlignRight|AlignVCenter); setHelpEnabled( m_searchPage, false ); } @@ -219,13 +219,13 @@ void SetupWizard::setupAddressesPage() "4. ranges for each part of the address, like 10-10.1-5.1-25.1-3;
" "You can also enter combinations of 1 to 4, separated by \";\", like
" "192.168.0.0/255.255.255.0;10.0.0.0;10.0.1.1-10.0.1.100;
"),m_addressesPage); - info->setAlignment(AlignLeft|AlignVCenter|WordBreak); + info->tqsetAlignment(AlignLeft|AlignVCenter|WordBreak); TQWidget *dummy=new TQWidget(m_addressesPage); m_addressesPage->setStretchFactor(dummy,10); m_addressesPage->setSpacing(KDialog::spacingHint()); m_addressesPage->setMargin(KDialog::marginHint()); info=new TQLabel(i18n("If unsure, keep it as is."), m_addressesPage); - info->setAlignment(AlignRight|AlignVCenter); + info->tqsetAlignment(AlignRight|AlignVCenter); setHelpEnabled( m_addressesPage, false ); } @@ -238,7 +238,7 @@ void SetupWizard::setupAllowedPage() "Only hosts which fit into the addresses given here are accepted by LISa as clients. " "The list of hosts published by LISa will also only contain hosts which fit into this scheme.
" "Usually you enter your IP address/network mask here."),m_allowedAddressesPage); - info->setAlignment(AlignLeft|AlignVCenter|WordBreak); + info->tqsetAlignment(AlignLeft|AlignVCenter|WordBreak); m_allowedAddresses=new KRestrictedLine(m_allowedAddressesPage,"0123456789./-;"); m_trustedHostsLabel=new TQLabel(m_allowedAddressesPage); @@ -247,7 +247,7 @@ void SetupWizard::setupAllowedPage() m_allowedAddressesPage->setSpacing(KDialog::spacingHint()); m_allowedAddressesPage->setMargin(KDialog::marginHint()); info=new TQLabel(i18n("If unsure, keep it as is."), m_allowedAddressesPage); - info->setAlignment(AlignRight|AlignVCenter); + info->tqsetAlignment(AlignRight|AlignVCenter); setHelpEnabled( m_allowedAddressesPage, false ); } @@ -256,18 +256,18 @@ void SetupWizard::setupBcastPage() { m_bcastPage=new TQVBox(this); TQLabel *info=new TQLabel(i18n("
Enter your IP address and network mask here, like 192.168.0.1/255.255.255.0"),m_bcastPage); - info->setAlignment(AlignLeft|AlignVCenter|WordBreak); + info->tqsetAlignment(AlignLeft|AlignVCenter|WordBreak); m_bcastAddress=new KRestrictedLine(m_bcastPage,"0123456789./"); info=new TQLabel(i18n("
To reduce the network load, the LISa servers in one network
" "cooperate with each other. Therefore you have to enter the broadcast
" "address here. If you are connected to more than one network, choose
" "one of the broadcast addresses."),m_bcastPage); - info->setAlignment(AlignLeft|AlignVCenter|WordBreak); + info->tqsetAlignment(AlignLeft|AlignVCenter|WordBreak); TQWidget *dummy=new TQWidget(m_bcastPage); m_bcastPage->setStretchFactor(dummy,10); m_bcastPage->setSpacing(KDialog::spacingHint()); info=new TQLabel(i18n("If unsure, keep it as is."), m_bcastPage); - info->setAlignment(AlignRight|AlignVCenter); + info->tqsetAlignment(AlignRight|AlignVCenter); m_bcastPage->setSpacing(KDialog::spacingHint()); m_bcastPage->setMargin(KDialog::marginHint()); @@ -287,13 +287,13 @@ void SetupWizard::setupUpdateIntervalPage() "up to 16 times the value you enter here, if nobody accesses the LISa server. " "So if you enter 300 sec = 5 min here, this does not mean that LISa will ping " "your whole network every 5 minutes. The interval will increase up to 16 x 5 min = 80 min."),m_intervalPage); - info->setAlignment(AlignLeft|AlignVCenter|WordBreak); + info->tqsetAlignment(AlignLeft|AlignVCenter|WordBreak); TQWidget *dummy=new TQWidget(m_intervalPage); m_intervalPage->setStretchFactor(dummy,10); m_intervalPage->setSpacing(KDialog::spacingHint()); m_intervalPage->setMargin(KDialog::marginHint()); info=new TQLabel(i18n("If unsure, keep it as is."), m_intervalPage); - info->setAlignment(AlignRight|AlignVCenter); + info->tqsetAlignment(AlignRight|AlignVCenter); info->setTextFormat(TQt::RichText); setHelpEnabled( m_intervalPage, false ); @@ -338,7 +338,7 @@ void SetupWizard::setupAdvancedSettingsPage() //m_advancedPage->setMargin(KDialog::marginHint()); info=new TQLabel(i18n("If unsure, keep it as is."), m_advancedPage); - info->setAlignment(AlignRight|AlignVCenter); + info->tqsetAlignment(AlignRight|AlignVCenter); connect(m_secondScan,TQT_SIGNAL(toggled(bool)),m_secondWait,TQT_SLOT(setEnabled(bool))); setHelpEnabled( m_advancedPage, false ); diff --git a/lanbrowsing/kcmlisa/setupwizard.h b/lanbrowsing/kcmlisa/setupwizard.h index 7e502b40..c67b330b 100644 --- a/lanbrowsing/kcmlisa/setupwizard.h +++ b/lanbrowsing/kcmlisa/setupwizard.h @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/lanbrowsing/kio_lan/kio_lan.cpp b/lanbrowsing/kio_lan/kio_lan.cpp index 55cc13b4..06eb0a18 100644 --- a/lanbrowsing/kio_lan/kio_lan.cpp +++ b/lanbrowsing/kio_lan/kio_lan.cpp @@ -187,7 +187,7 @@ int LANProtocol::lanReadDataFromServer() if ((bytesRead<0) || (receivedBytes<4)) { delete [] receiveBuffer; - error(ERR_INTERNAL_SERVER,i18n("Received unexpected data from %1").arg(m_currentHost)); + error(ERR_INTERNAL_SERVER,i18n("Received unexpected data from %1").tqarg(m_currentHost)); return 0; } @@ -206,7 +206,7 @@ int LANProtocol::lanReadDataFromServer() if ((memchr(currentBuf,0,bytesLeft)==0) || (memchr(currentBuf,int('\n'),bytesLeft)==0)) { delete [] receiveBuffer; - error(ERR_INTERNAL_SERVER,i18n("Received unexpected data from %1").arg(m_currentHost)); + error(ERR_INTERNAL_SERVER,i18n("Received unexpected data from %1").tqarg(m_currentHost)); return 0; } kdDebug(7101)<<"LANProtocol::lanReadDataFromServer: processing "<