From 47c8a359c5276062c4bc17f0e82410f29081b502 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:48:06 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1157648 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- lanbrowsing/kcmlisa/findnic.cpp | 26 ++--- lanbrowsing/kcmlisa/findnic.h | 24 ++--- lanbrowsing/kcmlisa/kcmkiolan.cpp | 42 ++++---- lanbrowsing/kcmlisa/kcmkiolan.h | 8 +- lanbrowsing/kcmlisa/kcmlisa.cpp | 182 ++++++++++++++++---------------- lanbrowsing/kcmlisa/kcmlisa.h | 28 ++--- lanbrowsing/kcmlisa/kcmreslisa.cpp | 130 +++++++++++------------ lanbrowsing/kcmlisa/kcmreslisa.h | 22 ++-- lanbrowsing/kcmlisa/main.cpp | 12 +-- lanbrowsing/kcmlisa/portsettingsbar.cpp | 12 +-- lanbrowsing/kcmlisa/portsettingsbar.h | 8 +- lanbrowsing/kcmlisa/setupwizard.cpp | 152 +++++++++++++------------- lanbrowsing/kcmlisa/setupwizard.h | 60 +++++------ lanbrowsing/kio_lan/kio_lan.cpp | 36 +++---- lanbrowsing/kio_lan/kio_lan.h | 24 ++--- 15 files changed, 383 insertions(+), 383 deletions(-) (limited to 'lanbrowsing') diff --git a/lanbrowsing/kcmlisa/findnic.cpp b/lanbrowsing/kcmlisa/findnic.cpp index 6e8b025e..721834c9 100644 --- a/lanbrowsing/kcmlisa/findnic.cpp +++ b/lanbrowsing/kcmlisa/findnic.cpp @@ -52,9 +52,9 @@ #if defined(HAVE_GETNAMEINFO) && defined(HAVE_GETIFADDRS) #include #include - #include + #include - QString flags_tos (unsigned int flags); + TQString flags_tos (unsigned int flags); #endif #include "findnic.h" @@ -190,10 +190,10 @@ NICList* findNICs() return nl; } -void suggestSettingsForAddress(const QString& addrMask, LisaConfigInfo& lci) +void suggestSettingsForAddress(const TQString& addrMask, LisaConfigInfo& lci) { - QString ip=addrMask.left(addrMask.find("/")); - QString mask=addrMask.mid(addrMask.find("/")+1); + TQString ip=addrMask.left(addrMask.find("/")); + TQString mask=addrMask.mid(addrMask.find("/")+1); if (mask[mask.length()-1]==';') mask=mask.left(mask.length()-1); @@ -208,10 +208,10 @@ void suggestSettingsForNic(MyNIC* nic, LisaConfigInfo& lci) lci.clear(); if (nic==0) return; - QString address = nic->addr; - QString netmask = nic->netmask; + TQString address = nic->addr; + TQString netmask = nic->netmask; - QString addrMask(address+"/"+netmask+";"); + TQString addrMask(address+"/"+netmask+";"); struct in_addr tmpaddr; inet_aton(nic->netmask.latin1(), &tmpaddr); unsigned int tmp= ntohl(tmpaddr.s_addr); @@ -266,30 +266,30 @@ void LisaConfigInfo::clear() } #if defined(HAVE_GETNAMEINFO) && defined(HAVE_GETIFADDRS) -QString flags_tos (unsigned int flags) +TQString flags_tos (unsigned int flags) { - QString tmp; + TQString tmp; if (flags & IFF_POINTOPOINT) { tmp += i18n("Point to Point"); } if (flags & IFF_BROADCAST) { if (tmp.length()) { - tmp += QString::fromLatin1(", "); + tmp += TQString::fromLatin1(", "); } tmp += i18n("Broadcast"); } if (flags & IFF_MULTICAST) { if (tmp.length()) { - tmp += QString::fromLatin1(", "); + tmp += TQString::fromLatin1(", "); } tmp += i18n("Multicast"); } if (flags & IFF_LOOPBACK) { if (tmp.length()) { - tmp += QString::fromLatin1(", "); + tmp += TQString::fromLatin1(", "); } tmp += i18n("Loopback"); } diff --git a/lanbrowsing/kcmlisa/findnic.h b/lanbrowsing/kcmlisa/findnic.h index 01140bcc..bff0aabb 100644 --- a/lanbrowsing/kcmlisa/findnic.h +++ b/lanbrowsing/kcmlisa/findnic.h @@ -21,8 +21,8 @@ #ifndef FINDNIC_H #define FINDNIC_H -#include -#include +#include +#include #include #include @@ -30,20 +30,20 @@ struct MyNIC { - QString name; - QString addr; - QString netmask; - QString state; - QString type; + TQString name; + TQString addr; + TQString netmask; + TQString state; + TQString type; }; struct LisaConfigInfo { LisaConfigInfo(); void clear(); - QString pingAddresses; - QString broadcastNetwork; - QString allowedAddresses; + TQString pingAddresses; + TQString broadcastNetwork; + TQString allowedAddresses; int secondWait; bool secondScan; int firstWait; @@ -54,7 +54,7 @@ struct LisaConfigInfo }; -typedef QPtrList NICList; +typedef TQPtrList NICList; //some plain C-like helper functions @@ -63,7 +63,7 @@ NICList* findNICs(); ///Enter some settings into lci which might be appropriate for nic void suggestSettingsForNic(MyNIC* nic, LisaConfigInfo& lci); -void suggestSettingsForAddress(const QString& addrMask, LisaConfigInfo& lci); +void suggestSettingsForAddress(const TQString& addrMask, LisaConfigInfo& lci); #endif diff --git a/lanbrowsing/kcmlisa/kcmkiolan.cpp b/lanbrowsing/kcmlisa/kcmkiolan.cpp index 981c6796..297f127b 100644 --- a/lanbrowsing/kcmlisa/kcmkiolan.cpp +++ b/lanbrowsing/kcmlisa/kcmkiolan.cpp @@ -20,39 +20,39 @@ #include "kcmkiolan.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include -IOSlaveSettings::IOSlaveSettings(const QString& config, QWidget *parent) +IOSlaveSettings::IOSlaveSettings(const TQString& config, TQWidget *parent) :KCModule(parent) ,m_config(config,false,true) { - QVBoxLayout *layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); layout->setAutoAdd(true); - QGroupBox* group=new QGroupBox(1, Horizontal, i18n("Show Links for Following Services"), this); + TQGroupBox* group=new TQGroupBox(1, Horizontal, i18n("Show Links for Following Services"), this); m_ftpSettings=new PortSettingsBar(i18n("FTP (TCP, port 21): "), group); m_httpSettings=new PortSettingsBar(i18n("HTTP (TCP, port 80): "),group); m_nfsSettings=new PortSettingsBar(i18n("NFS (TCP, port 2049): "),group); m_smbSettings=new PortSettingsBar(i18n("Windows shares (TCP, ports 445 and 139):"),group); m_fishSettings=new PortSettingsBar(i18n("Secure Shell/Fish (TCP, port 22): "),group); - m_shortHostnames = new QCheckBox(i18n("Show &short hostnames (without domain suffix)"),this); + m_shortHostnames = new TQCheckBox(i18n("Show &short hostnames (without domain suffix)"),this); - QHBox *hbox=new QHBox(this); - QLabel *label=new QLabel(i18n("Default LISa server host: "), hbox); - m_defaultLisaHostLe=new QLineEdit(hbox); + TQHBox *hbox=new TQHBox(this); + TQLabel *label=new TQLabel(i18n("Default LISa server host: "), hbox); + m_defaultLisaHostLe=new TQLineEdit(hbox); label->setBuddy(m_defaultLisaHostLe); - QWidget *w=new QWidget(this); + TQWidget *w=new TQWidget(this); layout->setStretchFactor(m_ftpSettings,0); layout->setStretchFactor(m_httpSettings,0); layout->setStretchFactor(m_nfsSettings,0); @@ -61,13 +61,13 @@ IOSlaveSettings::IOSlaveSettings(const QString& config, QWidget *parent) layout->setStretchFactor(hbox,0); layout->setStretchFactor(w,1); - connect(m_ftpSettings,SIGNAL(changed()),this,SIGNAL(changed())); - connect(m_httpSettings,SIGNAL(changed()),this,SIGNAL(changed())); - connect(m_nfsSettings,SIGNAL(changed()),this,SIGNAL(changed())); - connect(m_smbSettings,SIGNAL(changed()),this,SIGNAL(changed())); - connect(m_fishSettings,SIGNAL(changed()),this,SIGNAL(changed())); - connect(m_shortHostnames,SIGNAL(clicked()),this,SIGNAL(changed())); - connect(m_defaultLisaHostLe, SIGNAL(textChanged(const QString&)),this,SIGNAL(changed())); + connect(m_ftpSettings,TQT_SIGNAL(changed()),this,TQT_SIGNAL(changed())); + connect(m_httpSettings,TQT_SIGNAL(changed()),this,TQT_SIGNAL(changed())); + connect(m_nfsSettings,TQT_SIGNAL(changed()),this,TQT_SIGNAL(changed())); + connect(m_smbSettings,TQT_SIGNAL(changed()),this,TQT_SIGNAL(changed())); + connect(m_fishSettings,TQT_SIGNAL(changed()),this,TQT_SIGNAL(changed())); + connect(m_shortHostnames,TQT_SIGNAL(clicked()),this,TQT_SIGNAL(changed())); + connect(m_defaultLisaHostLe, TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SIGNAL(changed())); } void IOSlaveSettings::load() diff --git a/lanbrowsing/kcmlisa/kcmkiolan.h b/lanbrowsing/kcmlisa/kcmkiolan.h index d6910640..9fd0b2a0 100644 --- a/lanbrowsing/kcmlisa/kcmkiolan.h +++ b/lanbrowsing/kcmlisa/kcmkiolan.h @@ -32,7 +32,7 @@ class IOSlaveSettings:public KCModule { Q_OBJECT public: - IOSlaveSettings(const QString& config, QWidget *parent=0); + IOSlaveSettings(const TQString& config, TQWidget *parent=0); virtual ~IOSlaveSettings() {}; void load(); void save(); @@ -40,14 +40,14 @@ class IOSlaveSettings:public KCModule void changed(); protected: KConfig m_config; - QCheckBox *m_shortHostnames; - QCheckBox *m_rlanSidebar; + TQCheckBox *m_shortHostnames; + TQCheckBox *m_rlanSidebar; PortSettingsBar *m_ftpSettings; PortSettingsBar *m_httpSettings; PortSettingsBar *m_nfsSettings; PortSettingsBar *m_smbSettings; PortSettingsBar *m_fishSettings; - QLineEdit *m_defaultLisaHostLe; + TQLineEdit *m_defaultLisaHostLe; }; #endif diff --git a/lanbrowsing/kcmlisa/kcmlisa.cpp b/lanbrowsing/kcmlisa/kcmlisa.cpp index ee415462..7819b217 100644 --- a/lanbrowsing/kcmlisa/kcmlisa.cpp +++ b/lanbrowsing/kcmlisa/kcmlisa.cpp @@ -29,13 +29,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -48,140 +48,140 @@ #include -LisaSettings::LisaSettings(const QString& config, QWidget *parent) +LisaSettings::LisaSettings(const TQString& config, TQWidget *parent) : KCModule(parent, "kcmlanbrowser") ,m_config(config,false,true) ,m_wizard(0) ,m_configFilename(config) ,m_changed(false) { - QVBoxLayout *layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); layout->setAutoAdd(true); - QWidget *dummy(0); + TQWidget *dummy(0); - QVButtonGroup *gb=new QVButtonGroup(i18n("Tell LISa Daemon How to Search for Hosts"),this); + TQVButtonGroup *gb=new TQVButtonGroup(i18n("Tell LISa Daemon How to Search for Hosts"),this); gb->setInsideSpacing(10); - m_useNmblookup=new QCheckBox(i18n("Send &NetBIOS broadcasts using nmblookup"), gb); - QToolTip::add(m_useNmblookup,i18n("Only hosts running SMB servers will answer")); + m_useNmblookup=new TQCheckBox(i18n("Send &NetBIOS broadcasts using nmblookup"), gb); + TQToolTip::add(m_useNmblookup,i18n("Only hosts running SMB servers will answer")); - m_sendPings=new QCheckBox(i18n("Send &pings (ICMP echo packets)"), gb); - QToolTip::add(m_sendPings,i18n("All hosts running TCP/IP will answer")); + m_sendPings=new TQCheckBox(i18n("Send &pings (ICMP echo packets)"), gb); + TQToolTip::add(m_sendPings,i18n("All hosts running TCP/IP will answer")); - QHBox *hbox=new QHBox(gb); + TQHBox *hbox=new TQHBox(gb); hbox->setSpacing(10); - dummy=new QWidget(hbox); + dummy=new TQWidget(hbox); dummy->setMinimumWidth(10); - QLabel *label=new QLabel(i18n("To these &IP addresses:"),hbox); - QString comment = i18n("Enter all ranges to scan, using the format '192.168.0.1/255.255.255.0;10.0.0.1;255.0.0.0'"); - QToolTip::add(label,comment); + TQLabel *label=new TQLabel(i18n("To these &IP addresses:"),hbox); + TQString comment = i18n("Enter all ranges to scan, using the format '192.168.0.1/255.255.255.0;10.0.0.1;255.0.0.0'"); + TQToolTip::add(label,comment); m_pingAddresses=new KRestrictedLine(hbox,"a","0123456789.-/;"); - QToolTip::add(m_pingAddresses, comment); + TQToolTip::add(m_pingAddresses, comment); label->setBuddy(m_pingAddresses); - QGrid *addressesGrid = new QGrid(2, Qt::Horizontal, this); + TQGrid *addressesGrid = new TQGrid(2, Qt::Horizontal, this); addressesGrid->setSpacing(10); layout->setStretchFactor(addressesGrid,0); - label=new QLabel(i18n("&Broadcast network address:"),addressesGrid); + 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;)"); - QToolTip::add(label, comment); + TQToolTip::add(label, comment); m_broadcastNetwork=new KRestrictedLine(addressesGrid,"a","0123456789./;"); - QToolTip::add(m_broadcastNetwork,comment); + TQToolTip::add(m_broadcastNetwork,comment); label->setBuddy(m_broadcastNetwork); - label=new QLabel(i18n("&Trusted IP addresses:"),addressesGrid); + label=new TQLabel(i18n("&Trusted IP addresses:"),addressesGrid); comment = i18n("Usually your network address/subnet mask (e.g. 192.168.0.0/255.255.255.0;)"); - QToolTip::add(label, comment); + TQToolTip::add(label, comment); m_allowedAddresses=new KRestrictedLine(addressesGrid,"a","0123456789./;"); - QToolTip::add(m_allowedAddresses, comment); + TQToolTip::add(m_allowedAddresses, comment); label->setBuddy(m_allowedAddresses); - dummy=new QWidget(this); + dummy=new TQWidget(this); layout->setStretchFactor(dummy,10); - hbox = new QHBox(this); + hbox = new TQHBox(this); hbox->setSpacing(10); -// m_autoSetup=new QPushButton(i18n("&Guided LISa Setup..."),hbox); - m_autoSetup=new QPushButton(i18n("Setup Wizard..."),hbox); +// 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_suggestSettings=new QPushButton(i18n("&Suggest Settings"),hbox); + m_suggestSettings=new TQPushButton(i18n("&Suggest Settings"),hbox); - new QWidget(hbox); + new TQWidget(hbox); - m_advancedSettingsButton=new QPushButton(i18n("Ad&vanced Settings..."),hbox); + m_advancedSettingsButton=new TQPushButton(i18n("Ad&vanced Settings..."),hbox); m_lisaAdvancedDlg=new KDialogBase(0,0,true,i18n("Advanced Settings for LISa"),KDialogBase::Close, KDialogBase::Close); - connect(m_advancedSettingsButton,SIGNAL(clicked()),m_lisaAdvancedDlg,SLOT(show())); + connect(m_advancedSettingsButton,TQT_SIGNAL(clicked()),m_lisaAdvancedDlg,TQT_SLOT(show())); - QVBox *vbox=m_lisaAdvancedDlg->makeVBoxMainWidget(); + TQVBox *vbox=m_lisaAdvancedDlg->makeVBoxMainWidget(); m_pingNames=new KEditListBox(i18n("&Additionally Check These Hosts"),vbox,"a",false, KEditListBox::Add|KEditListBox::Remove); m_pingNames->setMinimumHeight(180); - QToolTip::add(m_pingNames,i18n("The hosts listed here will be pinged")); + TQToolTip::add(m_pingNames,i18n("The hosts listed here will be pinged")); - dummy=new QWidget(vbox); + dummy=new TQWidget(vbox); dummy->setMinimumHeight(10); - m_deliverUnnamedHosts=new QCheckBox(i18n("Show &hosts without DNS names"),vbox); + m_deliverUnnamedHosts=new TQCheckBox(i18n("Show &hosts without DNS names"),vbox); - QGrid *advGrid = new QGrid(2, Qt::Horizontal, vbox); + TQGrid *advGrid = new TQGrid(2, Qt::Horizontal, vbox); advGrid->setSpacing(10); - label=new QLabel(i18n("Host list update interval:"),advGrid); - QToolTip::add(label,i18n("Search hosts after this number of seconds")); - m_updatePeriod=new QSpinBox(30,1800,10,advGrid); + label=new TQLabel(i18n("Host list update interval:"),advGrid); + TQToolTip::add(label,i18n("Search hosts after this number of seconds")); + m_updatePeriod=new TQSpinBox(30,1800,10,advGrid); m_updatePeriod->setSuffix(i18n(" sec")); - QToolTip::add(m_updatePeriod,i18n("Search hosts after this number of seconds")); + TQToolTip::add(m_updatePeriod,i18n("Search hosts after this number of seconds")); - m_secondScan=new QCheckBox(i18n("Always check twice for hosts when searching"),advGrid); - new QWidget(advGrid); + m_secondScan=new TQCheckBox(i18n("Always check twice for hosts when searching"),advGrid); + new TQWidget(advGrid); - label=new QLabel(i18n("Wait for replies from hosts after first scan:"),advGrid); - QToolTip::add(label,i18n("How long to wait for replies to the ICMP echo requests from hosts")); - m_firstWait=new QSpinBox(10,1000,50,advGrid); + label=new TQLabel(i18n("Wait for replies from hosts after first scan:"),advGrid); + TQToolTip::add(label,i18n("How long to wait for replies to the ICMP echo requests from hosts")); + m_firstWait=new TQSpinBox(10,1000,50,advGrid); m_firstWait->setSuffix(i18n(" ms")); - QToolTip::add(m_firstWait,i18n("How long to wait for replies to the ICMP echo requests from hosts")); + TQToolTip::add(m_firstWait,i18n("How long to wait for replies to the ICMP echo requests from hosts")); - label=new QLabel(i18n("Wait for replies from hosts after second scan:"),advGrid); - QToolTip::add(label,i18n("How long to wait for replies to the ICMP echo requests from hosts")); - m_secondWait=new QSpinBox(0,1000,50,advGrid); + label=new TQLabel(i18n("Wait for replies from hosts after second scan:"),advGrid); + TQToolTip::add(label,i18n("How long to wait for replies to the ICMP echo requests from hosts")); + m_secondWait=new TQSpinBox(0,1000,50,advGrid); m_secondWait->setSuffix(i18n(" ms")); - QToolTip::add(m_secondWait,i18n("How long to wait for replies to the ICMP echo requests from hosts")); + TQToolTip::add(m_secondWait,i18n("How long to wait for replies to the ICMP echo requests from hosts")); - label=new QLabel(i18n("Max. number of ping packets to send at once:"),advGrid); - m_maxPingsAtOnce=new QSpinBox(8,1024,5,advGrid); + label=new TQLabel(i18n("Max. number of ping packets to send at once:"),advGrid); + m_maxPingsAtOnce=new TQSpinBox(8,1024,5,advGrid); - dummy=new QWidget(advGrid); + dummy=new TQWidget(advGrid); dummy->setMinimumHeight(10); - connect(m_secondScan,SIGNAL(toggled(bool)),m_secondWait,SLOT(setEnabled(bool))); - connect(m_sendPings,SIGNAL(toggled(bool)),m_pingAddresses,SLOT(setEnabled(bool))); - - connect(m_pingAddresses,SIGNAL(textChanged(const QString&)),this,SIGNAL(changed())); - connect(m_allowedAddresses,SIGNAL(textChanged(const QString&)),this,SIGNAL(changed())); - connect(m_broadcastNetwork,SIGNAL(textChanged(const QString&)),this,SIGNAL(changed())); - - connect(m_pingAddresses,SIGNAL(returnPressed()),this,SIGNAL(changed())); - connect(m_allowedAddresses,SIGNAL(returnPressed()),this,SIGNAL(changed())); - connect(m_broadcastNetwork,SIGNAL(returnPressed()),this,SIGNAL(changed())); - - connect(m_sendPings,SIGNAL(toggled(bool)),this,SIGNAL(changed())); - connect(m_firstWait,SIGNAL(valueChanged(int)),this,SIGNAL(changed())); - connect(m_secondWait,SIGNAL(valueChanged(int)),this,SIGNAL(changed())); - connect(m_maxPingsAtOnce,SIGNAL(valueChanged(int)),this,SIGNAL(changed())); - connect(m_secondScan,SIGNAL(toggled(bool)),this,SIGNAL(changed())); - connect(m_deliverUnnamedHosts,SIGNAL(toggled(bool)),this,SIGNAL(changed())); - connect(m_updatePeriod,SIGNAL(valueChanged(int)),this,SIGNAL(changed())); - connect(m_pingNames,SIGNAL(changed()),this,SIGNAL(changed())); - connect(m_useNmblookup,SIGNAL(toggled(bool)),this,SIGNAL(changed())); - connect(m_autoSetup,SIGNAL(clicked()),this,SLOT(autoSetup())); - connect(m_suggestSettings,SIGNAL(clicked()),this,SLOT(suggestSettings())); - connect(this, SIGNAL(changed()), SLOT(slotChanged())); + connect(m_secondScan,TQT_SIGNAL(toggled(bool)),m_secondWait,TQT_SLOT(setEnabled(bool))); + connect(m_sendPings,TQT_SIGNAL(toggled(bool)),m_pingAddresses,TQT_SLOT(setEnabled(bool))); + + connect(m_pingAddresses,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SIGNAL(changed())); + connect(m_allowedAddresses,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SIGNAL(changed())); + connect(m_broadcastNetwork,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SIGNAL(changed())); + + connect(m_pingAddresses,TQT_SIGNAL(returnPressed()),this,TQT_SIGNAL(changed())); + connect(m_allowedAddresses,TQT_SIGNAL(returnPressed()),this,TQT_SIGNAL(changed())); + connect(m_broadcastNetwork,TQT_SIGNAL(returnPressed()),this,TQT_SIGNAL(changed())); + + connect(m_sendPings,TQT_SIGNAL(toggled(bool)),this,TQT_SIGNAL(changed())); + connect(m_firstWait,TQT_SIGNAL(valueChanged(int)),this,TQT_SIGNAL(changed())); + connect(m_secondWait,TQT_SIGNAL(valueChanged(int)),this,TQT_SIGNAL(changed())); + connect(m_maxPingsAtOnce,TQT_SIGNAL(valueChanged(int)),this,TQT_SIGNAL(changed())); + connect(m_secondScan,TQT_SIGNAL(toggled(bool)),this,TQT_SIGNAL(changed())); + connect(m_deliverUnnamedHosts,TQT_SIGNAL(toggled(bool)),this,TQT_SIGNAL(changed())); + connect(m_updatePeriod,TQT_SIGNAL(valueChanged(int)),this,TQT_SIGNAL(changed())); + connect(m_pingNames,TQT_SIGNAL(changed()),this,TQT_SIGNAL(changed())); + connect(m_useNmblookup,TQT_SIGNAL(toggled(bool)),this,TQT_SIGNAL(changed())); + connect(m_autoSetup,TQT_SIGNAL(clicked()),this,TQT_SLOT(autoSetup())); + connect(m_suggestSettings,TQT_SIGNAL(clicked()),this,TQT_SLOT(suggestSettings())); + connect(this, TQT_SIGNAL(changed()), TQT_SLOT(slotChanged())); } void LisaSettings::load() @@ -242,13 +242,13 @@ void LisaSettings::save() m_config.writeEntry("PingAddresses",m_sendPings->isChecked()?m_pingAddresses->text():""); m_config.writeEntry("AllowedAddresses",m_allowedAddresses->text()); m_config.writeEntry("BroadcastNetwork",m_broadcastNetwork->text()); - QStringList writeStuff; + TQStringList writeStuff; for (int i=0; icount(); i++) writeStuff.append(m_pingNames->text(i)); m_config.writeEntry("PingNames",writeStuff,';'); m_config.sync(); - chmod(QFile::encodeName(m_configFilename),S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); + chmod(TQFile::encodeName(m_configFilename),S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH); } else { @@ -260,7 +260,7 @@ void LisaSettings::save() if (tmp.status() == 0 && tmp.textStream()) { m_tmpFilename = tmp.name(); - QTextStream &confStream = *(tmp.textStream()); + TQTextStream &confStream = *(tmp.textStream()); if (m_secondScan->isChecked()) confStream<<"SecondWait = "<<(m_secondWait->value()+5)/10<<"\n"; else @@ -282,15 +282,15 @@ void LisaSettings::save() confStream<<"PingAddresses = "<text().latin1()<<"\n"; confStream<<"AllowedAddresses = "<text().latin1()<<"\n"; confStream<<"BroadcastNetwork = "<text().latin1()<<"\n"; - QString writeStuff; + TQString writeStuff; for (int i=0; icount(); i++) writeStuff=writeStuff+m_pingNames->text(i).latin1()+";"; confStream<<"PingNames = "<count()>1) { - QString msg(i18n("You have more than one network interface installed.
" + TQString msg(i18n("You have more than one network interface installed.
" "Please make sure the suggested settings are correct.
" "
The following interfaces were found:

")); //not that easy to handle @@ -337,7 +337,7 @@ void LisaSettings::suggestSettings() { msg+=""+tmp->name+": "+tmp->addr+"/"+tmp->netmask+";
"; } - KMessageBox::information(0,QString("%1").arg(msg)); + KMessageBox::information(0,TQString("%1").arg(msg)); } emit changed(); @@ -353,7 +353,7 @@ void LisaSettings::autoSetup() m_wizard->clearAll(); int result=m_wizard->exec(); - if (result!=QDialog::Accepted) + if (result!=TQDialog::Accepted) return; m_pingAddresses->setText(lci.pingAddresses); @@ -375,7 +375,7 @@ void LisaSettings::autoSetup() void LisaSettings::saveDone(KProcess *proc) { - unlink(QFile::encodeName(m_tmpFilename)); + unlink(TQFile::encodeName(m_tmpFilename)); KApplication::restoreOverrideCursor(); setEnabled(true); KMessageBox::information(0,i18n("The configuration has been saved to /etc/lisarc.\n" diff --git a/lanbrowsing/kcmlisa/kcmlisa.h b/lanbrowsing/kcmlisa/kcmlisa.h index 743df96b..42fef9af 100644 --- a/lanbrowsing/kcmlisa/kcmlisa.h +++ b/lanbrowsing/kcmlisa/kcmlisa.h @@ -38,7 +38,7 @@ class LisaSettings:public KCModule { Q_OBJECT public: - LisaSettings(const QString& config, QWidget *parent=0); + LisaSettings(const TQString& config, TQWidget *parent=0); virtual ~LisaSettings() {}; void load(); void save(); @@ -51,27 +51,27 @@ class LisaSettings:public KCModule void suggestSettings(); protected: KConfig m_config; - QPushButton *m_autoSetup; - QCheckBox *m_useNmblookup; - QCheckBox *m_sendPings; + TQPushButton *m_autoSetup; + TQCheckBox *m_useNmblookup; + TQCheckBox *m_sendPings; KRestrictedLine *m_pingAddresses; KEditListBox *m_pingNames; KRestrictedLine *m_allowedAddresses; KRestrictedLine *m_broadcastNetwork; - QSpinBox *m_firstWait; - QCheckBox *m_secondScan; - QSpinBox *m_secondWait; - QSpinBox *m_updatePeriod; - QCheckBox *m_deliverUnnamedHosts; - QSpinBox *m_maxPingsAtOnce; - QPushButton* m_suggestSettings; - QPushButton *m_advancedSettingsButton; + TQSpinBox *m_firstWait; + TQCheckBox *m_secondScan; + TQSpinBox *m_secondWait; + TQSpinBox *m_updatePeriod; + TQCheckBox *m_deliverUnnamedHosts; + TQSpinBox *m_maxPingsAtOnce; + TQPushButton* m_suggestSettings; + TQPushButton *m_advancedSettingsButton; KDialogBase *m_lisaAdvancedDlg; SetupWizard *m_wizard; private: - QString m_tmpFilename; - QString m_configFilename; + TQString m_tmpFilename; + TQString m_configFilename; bool m_changed; }; diff --git a/lanbrowsing/kcmlisa/kcmreslisa.cpp b/lanbrowsing/kcmlisa/kcmreslisa.cpp index 7e92b199..fcaf104c 100644 --- a/lanbrowsing/kcmlisa/kcmreslisa.cpp +++ b/lanbrowsing/kcmlisa/kcmreslisa.cpp @@ -20,15 +20,15 @@ #include "kcmreslisa.h" #include "findnic.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -36,7 +36,7 @@ #include #include -ResLisaSettings::ResLisaSettings(const QString& config, QWidget *parent) +ResLisaSettings::ResLisaSettings(const TQString& config, TQWidget *parent) : KCModule(parent) ,m_config(config,false,true) ,m_kiolanConfig("kio_lanrc",false,true) @@ -53,90 +53,90 @@ ResLisaSettings::ResLisaSettings(const QString& config, QWidget *parent) ,m_maxPingsAtOnce(0) ,m_reslisaAdvancedDlg(0) { - QVBoxLayout *layout = new QVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); layout->setAutoAdd(true); - QVButtonGroup *gb=new QVButtonGroup(i18n("Tell ResLISa Daemon How to Search for Hosts"),this); + TQVButtonGroup *gb=new TQVButtonGroup(i18n("Tell ResLISa Daemon How to Search for Hosts"),this); gb->setInsideSpacing(10); - m_useNmblookup=new QCheckBox(i18n("Send &NetBIOS broadcasts using &nmblookup"),gb); - QToolTip::add(m_useNmblookup,i18n("Only hosts running SMB servers will answer")); + m_useNmblookup=new TQCheckBox(i18n("Send &NetBIOS broadcasts using &nmblookup"),gb); + TQToolTip::add(m_useNmblookup,i18n("Only hosts running SMB servers will answer")); m_pingNames=new KEditListBox(i18n("A&dditionally Check These Hosts"),gb,"a",false, KEditListBox::Add|KEditListBox::Remove); - QToolTip::add(m_pingNames,i18n("The hosts listed here will be pinged.")); + TQToolTip::add(m_pingNames,i18n("The hosts listed here will be pinged.")); - QHBox *hbox=new QHBox(this); + TQHBox *hbox=new TQHBox(this); hbox->setSpacing(10); - QLabel *label=new QLabel(i18n("&Trusted addresses:"),hbox); - QString comment = i18n("Usually your network address/subnet mask (e.g. 192.168.0.0/255.255.255.0;)"); - QToolTip::add(label, comment); + TQLabel *label=new TQLabel(i18n("&Trusted addresses:"),hbox); + TQString comment = i18n("Usually your network address/subnet mask (e.g. 192.168.0.0/255.255.255.0;)"); + TQToolTip::add(label, comment); m_allowedAddresses=new KRestrictedLine(hbox,"a","0123456789./;"); - QToolTip::add(m_allowedAddresses,comment); + TQToolTip::add(m_allowedAddresses,comment); label->setBuddy(m_allowedAddresses); - m_rlanSidebar = new QCheckBox(i18n("Use &rlan:/ instead of lan:/ in Konqueror's navigation panel"), this); + m_rlanSidebar = new TQCheckBox(i18n("Use &rlan:/ instead of lan:/ in Konqueror's navigation panel"), this); - hbox = new QHBox(this); - m_suggestSettings=new QPushButton(i18n("&Suggest Settings"),hbox); + hbox = new TQHBox(this); + m_suggestSettings=new TQPushButton(i18n("&Suggest Settings"),hbox); - new QWidget(hbox); + new TQWidget(hbox); - m_advancedSettingsButton=new QPushButton(i18n("Ad&vanced Settings"),hbox); + m_advancedSettingsButton=new TQPushButton(i18n("Ad&vanced Settings"),hbox); m_reslisaAdvancedDlg=new KDialogBase(0,0,true,i18n("Advanced Settings for ResLISa"),KDialogBase::Close, KDialogBase::Close); - connect(m_advancedSettingsButton,SIGNAL(clicked()),m_reslisaAdvancedDlg,SLOT(show())); + connect(m_advancedSettingsButton,TQT_SIGNAL(clicked()),m_reslisaAdvancedDlg,TQT_SLOT(show())); - QVBox *vbox=m_reslisaAdvancedDlg->makeVBoxMainWidget(); + TQVBox *vbox=m_reslisaAdvancedDlg->makeVBoxMainWidget(); - m_deliverUnnamedHosts=new QCheckBox(i18n("Show &hosts without DNS names"),vbox); + m_deliverUnnamedHosts=new TQCheckBox(i18n("Show &hosts without DNS names"),vbox); - QGrid *advGrid = new QGrid(2, Qt::Horizontal, vbox); + TQGrid *advGrid = new TQGrid(2, Qt::Horizontal, vbox); advGrid->setSpacing(10); - label=new QLabel(i18n("Host list update interval:"),advGrid); - QToolTip::add(label,i18n("Search hosts after this number of seconds")); - m_updatePeriod=new QSpinBox(30,1800,10,advGrid); + label=new TQLabel(i18n("Host list update interval:"),advGrid); + TQToolTip::add(label,i18n("Search hosts after this number of seconds")); + m_updatePeriod=new TQSpinBox(30,1800,10,advGrid); m_updatePeriod->setSuffix(i18n(" sec")); - QToolTip::add(m_updatePeriod,i18n("Search hosts after this number of seconds")); + TQToolTip::add(m_updatePeriod,i18n("Search hosts after this number of seconds")); - m_secondScan=new QCheckBox(i18n("Always check twice for hosts when searching"),advGrid); - new QWidget(advGrid); + m_secondScan=new TQCheckBox(i18n("Always check twice for hosts when searching"),advGrid); + new TQWidget(advGrid); - label=new QLabel(i18n("Wait for replies from hosts after first scan:"),advGrid); - QToolTip::add(label,i18n("How long to wait for replies to the ICMP echo requests from hosts")); - m_firstWait=new QSpinBox(10,1000,50,advGrid); + label=new TQLabel(i18n("Wait for replies from hosts after first scan:"),advGrid); + TQToolTip::add(label,i18n("How long to wait for replies to the ICMP echo requests from hosts")); + m_firstWait=new TQSpinBox(10,1000,50,advGrid); m_firstWait->setSuffix(i18n(" ms")); - QToolTip::add(m_firstWait,i18n("How long to wait for replies to the ICMP echo requests from hosts")); + TQToolTip::add(m_firstWait,i18n("How long to wait for replies to the ICMP echo requests from hosts")); - label=new QLabel(i18n("Wait for replies from hosts after second scan:"),advGrid); - QToolTip::add(label,i18n("How long to wait for replies to the ICMP echo requests from hosts")); - m_secondWait=new QSpinBox(0,1000,50,advGrid); + label=new TQLabel(i18n("Wait for replies from hosts after second scan:"),advGrid); + TQToolTip::add(label,i18n("How long to wait for replies to the ICMP echo requests from hosts")); + m_secondWait=new TQSpinBox(0,1000,50,advGrid); m_secondWait->setSuffix(i18n(" ms")); - QToolTip::add(m_secondWait,i18n("How long to wait for replies to the ICMP echo requests from hosts")); + TQToolTip::add(m_secondWait,i18n("How long to wait for replies to the ICMP echo requests from hosts")); - label=new QLabel(i18n("Max. number of ping packets to send at once:"),advGrid); - m_maxPingsAtOnce=new QSpinBox(8,1024,5,advGrid); + label=new TQLabel(i18n("Max. number of ping packets to send at once:"),advGrid); + m_maxPingsAtOnce=new TQSpinBox(8,1024,5,advGrid); - QWidget *dummy=new QWidget(advGrid); + TQWidget *dummy=new TQWidget(advGrid); dummy->setMinimumHeight(10); - connect(m_secondScan,SIGNAL(toggled(bool)),m_secondWait,SLOT(setEnabled(bool))); + connect(m_secondScan,TQT_SIGNAL(toggled(bool)),m_secondWait,TQT_SLOT(setEnabled(bool))); - connect(m_allowedAddresses,SIGNAL(textChanged(const QString&)),this,SIGNAL(changed())); + connect(m_allowedAddresses,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SIGNAL(changed())); - connect(m_allowedAddresses,SIGNAL(returnPressed()),this,SIGNAL(changed())); + connect(m_allowedAddresses,TQT_SIGNAL(returnPressed()),this,TQT_SIGNAL(changed())); - connect(m_firstWait,SIGNAL(valueChanged(int)),this,SIGNAL(changed())); - connect(m_secondWait,SIGNAL(valueChanged(int)),this,SIGNAL(changed())); - connect(m_maxPingsAtOnce,SIGNAL(valueChanged(int)),this,SIGNAL(changed())); - connect(m_secondScan,SIGNAL(toggled(bool)),this,SIGNAL(changed())); - connect(m_deliverUnnamedHosts,SIGNAL(toggled(bool)),this,SIGNAL(changed())); - connect(m_updatePeriod,SIGNAL(valueChanged(int)),this,SIGNAL(changed())); - connect(m_pingNames,SIGNAL(changed()),this,SIGNAL(changed())); - connect(m_useNmblookup,SIGNAL(toggled(bool)),this,SIGNAL(changed())); - connect(m_suggestSettings,SIGNAL(clicked()),this,SLOT(suggestSettings())); - connect(m_rlanSidebar,SIGNAL(clicked()),this,SIGNAL(changed())); + connect(m_firstWait,TQT_SIGNAL(valueChanged(int)),this,TQT_SIGNAL(changed())); + connect(m_secondWait,TQT_SIGNAL(valueChanged(int)),this,TQT_SIGNAL(changed())); + connect(m_maxPingsAtOnce,TQT_SIGNAL(valueChanged(int)),this,TQT_SIGNAL(changed())); + connect(m_secondScan,TQT_SIGNAL(toggled(bool)),this,TQT_SIGNAL(changed())); + connect(m_deliverUnnamedHosts,TQT_SIGNAL(toggled(bool)),this,TQT_SIGNAL(changed())); + connect(m_updatePeriod,TQT_SIGNAL(valueChanged(int)),this,TQT_SIGNAL(changed())); + connect(m_pingNames,TQT_SIGNAL(changed()),this,TQT_SIGNAL(changed())); + connect(m_useNmblookup,TQT_SIGNAL(toggled(bool)),this,TQT_SIGNAL(changed())); + connect(m_suggestSettings,TQT_SIGNAL(clicked()),this,TQT_SLOT(suggestSettings())); + connect(m_rlanSidebar,TQT_SIGNAL(clicked()),this,TQT_SIGNAL(changed())); load(); } @@ -193,7 +193,7 @@ void ResLisaSettings::save() m_config.writeEntry("UpdatePeriod",m_updatePeriod->value()); m_config.writeEntry("AllowedAddresses",m_allowedAddresses->text()); //m_config.writeEntry("BroadcastNetwork",m_broadcastNetwork->text()); - QStringList writeStuff; + TQStringList writeStuff; for (int i=0; icount(); i++) writeStuff.append(m_pingNames->text(i)); m_config.writeEntry("PingNames",writeStuff,';'); @@ -217,8 +217,8 @@ void ResLisaSettings::suggestSettings() } MyNIC *nic=nics->first(); - QString address = nic->addr; - QString netmask = nic->netmask; + TQString address = nic->addr; + TQString netmask = nic->netmask; m_allowedAddresses->setText(address+"/"+netmask+";"); m_secondWait->setValue(0); m_secondScan->setChecked(FALSE); @@ -229,7 +229,7 @@ void ResLisaSettings::suggestSettings() m_useNmblookup->setChecked(true); if (nics->count()>1) { - QString msg(i18n("You have more than one network interface installed.
" + TQString msg(i18n("You have more than one network interface installed.
" "Please make sure the suggested settings are correct.
" "
The following interfaces were found:

")); //not that easy to handle @@ -237,9 +237,9 @@ void ResLisaSettings::suggestSettings() { msg+=""+tmp->name+": "+tmp->addr+"/"+tmp->netmask+";
"; } - KMessageBox::information(0,QString("%1").arg(msg)); + KMessageBox::information(0,TQString("%1").arg(msg)); } - KMessageBox::information(0,QString("%1").arg(i18n("The ResLISa daemon is now configured " + KMessageBox::information(0,TQString("%1").arg(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/kcmreslisa.h b/lanbrowsing/kcmlisa/kcmreslisa.h index 6247cc81..adadd1cd 100644 --- a/lanbrowsing/kcmlisa/kcmreslisa.h +++ b/lanbrowsing/kcmlisa/kcmreslisa.h @@ -36,7 +36,7 @@ class ResLisaSettings:public KCModule { Q_OBJECT public: - ResLisaSettings(const QString& config, QWidget *parent=0); + ResLisaSettings(const TQString& config, TQWidget *parent=0); virtual ~ResLisaSettings() {} void load(); void save(); @@ -47,19 +47,19 @@ class ResLisaSettings:public KCModule protected: KConfig m_config; KConfig m_kiolanConfig; - QPushButton* m_advancedSettingsButton; - QPushButton* m_suggestSettings; - QCheckBox* m_useNmblookup; + TQPushButton* m_advancedSettingsButton; + TQPushButton* m_suggestSettings; + TQCheckBox* m_useNmblookup; KEditListBox *m_pingNames; KRestrictedLine *m_allowedAddresses; - QSpinBox *m_firstWait; - QCheckBox *m_secondScan; - QSpinBox *m_secondWait; - QSpinBox *m_updatePeriod; - QCheckBox *m_deliverUnnamedHosts; - QSpinBox *m_maxPingsAtOnce; - QCheckBox* m_rlanSidebar; + TQSpinBox *m_firstWait; + TQCheckBox *m_secondScan; + TQSpinBox *m_secondWait; + TQSpinBox *m_updatePeriod; + TQCheckBox *m_deliverUnnamedHosts; + TQSpinBox *m_maxPingsAtOnce; + TQCheckBox* m_rlanSidebar; KDialogBase* m_reslisaAdvancedDlg; }; diff --git a/lanbrowsing/kcmlisa/main.cpp b/lanbrowsing/kcmlisa/main.cpp index 7e68d345..00d03e52 100644 --- a/lanbrowsing/kcmlisa/main.cpp +++ b/lanbrowsing/kcmlisa/main.cpp @@ -21,8 +21,8 @@ #include #include -#include -#include +#include +#include #include #include @@ -33,15 +33,15 @@ extern "C" { - KDE_EXPORT KCModule *create_lisa(QWidget *parent, const char *) + KDE_EXPORT KCModule *create_lisa(TQWidget *parent, const char *) { return new LisaSettings("/etc/lisarc", parent); } - KDE_EXPORT KCModule *create_reslisa(QWidget *parent, const char *) + KDE_EXPORT KCModule *create_reslisa(TQWidget *parent, const char *) { - return new ResLisaSettings(QDir::homeDirPath()+"/.reslisarc", parent); + return new ResLisaSettings(TQDir::homeDirPath()+"/.reslisarc", parent); } - KDE_EXPORT KCModule *create_kiolan(QWidget *parent, const char *) + KDE_EXPORT KCModule *create_kiolan(TQWidget *parent, const char *) { return new IOSlaveSettings("kio_lanrc", parent); } diff --git a/lanbrowsing/kcmlisa/portsettingsbar.cpp b/lanbrowsing/kcmlisa/portsettingsbar.cpp index 540ea894..3e94c730 100644 --- a/lanbrowsing/kcmlisa/portsettingsbar.cpp +++ b/lanbrowsing/kcmlisa/portsettingsbar.cpp @@ -21,20 +21,20 @@ #include "portsettingsbar.h" #include -#include +#include -PortSettingsBar::PortSettingsBar(const QString& title, QWidget *parent) -:QHBox(parent) +PortSettingsBar::PortSettingsBar(const TQString& title, TQWidget *parent) +:TQHBox(parent) { - QLabel* label=new QLabel(title, this); - m_box=new QComboBox(this); + TQLabel* label=new TQLabel(title, this); + m_box=new TQComboBox(this); label->setBuddy(m_box); m_box->insertItem(i18n("Check Availability")); m_box->insertItem(i18n("Always")); m_box->insertItem(i18n("Never")); - connect(m_box,SIGNAL(activated(int)),this,SIGNAL(changed())); + connect(m_box,TQT_SIGNAL(activated(int)),this,TQT_SIGNAL(changed())); } int PortSettingsBar::selected() const diff --git a/lanbrowsing/kcmlisa/portsettingsbar.h b/lanbrowsing/kcmlisa/portsettingsbar.h index 35c372f5..150390dc 100644 --- a/lanbrowsing/kcmlisa/portsettingsbar.h +++ b/lanbrowsing/kcmlisa/portsettingsbar.h @@ -21,8 +21,8 @@ #ifndef PORTSETTINGSBAR_H #define PORTSETTINGSBAR_H -#include -#include +#include +#include #define PORTSETTINGS_CHECK 0 #define PORTSETTINGS_PROVIDE 1 @@ -32,14 +32,14 @@ class PortSettingsBar:public QHBox { Q_OBJECT public: - PortSettingsBar(const QString& title, QWidget *parent=0); + PortSettingsBar(const TQString& title, TQWidget *parent=0); virtual ~PortSettingsBar() {}; int selected() const; void setChecked(int what); signals: void changed(); protected: - QComboBox *m_box; + TQComboBox *m_box; }; #endif diff --git a/lanbrowsing/kcmlisa/setupwizard.cpp b/lanbrowsing/kcmlisa/setupwizard.cpp index 8b304359..fbe8db4e 100644 --- a/lanbrowsing/kcmlisa/setupwizard.cpp +++ b/lanbrowsing/kcmlisa/setupwizard.cpp @@ -20,7 +20,7 @@ #include "setupwizard.h" -#include +#include #include #include @@ -31,8 +31,8 @@ #include #include -SetupWizard::SetupWizard(QWidget* parent, LisaConfigInfo* configInfo) - :QWizard(parent,"hallo",true) +SetupWizard::SetupWizard(TQWidget* parent, LisaConfigInfo* configInfo) + :TQWizard(parent,"hallo",true) ,m_page1(0) ,m_noNicPage(0) ,m_multiNicPage(0) @@ -60,7 +60,7 @@ SetupWizard::SetupWizard(QWidget* parent, LisaConfigInfo* configInfo) ,m_nics(0) ,m_configInfo(configInfo) { - QString title( i18n("LISa Network Neighborhood Setup") ); + TQString title( i18n("LISa Network Neighborhood Setup") ); setCaption(title); m_configInfo->clear(); @@ -121,9 +121,9 @@ void SetupWizard::clearAll() void SetupWizard::setupPage1() { - m_page1 = new QVBox( this ); + m_page1 = new TQVBox( this ); - new QLabel(i18n("

This wizard will ask you a few questions about your network.

" + new TQLabel(i18n("

This wizard will ask you a few questions about your network.

" "

Usually you can simply keep the suggested settings.

" "

After you have finished the wizard, you will be able to browse and use " "shared resources on your LAN, not only Samba/Windows shares, but also " @@ -134,7 +134,7 @@ void SetupWizard::setupPage1() "only one LISa server can run on one machine."), m_page1); - QWidget *dummy=new QWidget(m_page1); + TQWidget *dummy=new TQWidget(m_page1); m_page1->setStretchFactor(dummy,10); m_page1->setSpacing(KDialog::spacingHint()); m_page1->setMargin(KDialog::marginHint()); @@ -145,23 +145,23 @@ void SetupWizard::setupPage1() void SetupWizard::setupMultiNicPage() { - m_multiNicPage=new QVBox(this); - new QLabel(i18n("

More than one network interface card was found on your system.

" + m_multiNicPage=new TQVBox(this); + new TQLabel(i18n("

More than one network interface card was found on your system.

" "

Please choose the one to which your LAN is connected.

"), m_multiNicPage); m_multiNicPage->setMargin(KDialog::marginHint()); m_multiNicPage->setSpacing(KDialog::spacingHint()); - m_nicListBox=new QListBox(m_multiNicPage); - m_nicListBox->setSelectionMode(QListBox::Single); + m_nicListBox=new TQListBox(m_multiNicPage); + m_nicListBox->setSelectionMode(TQListBox::Single); setHelpEnabled( m_multiNicPage, false ); } void SetupWizard::setupNoNicPage() { - m_noNicPage=new QVBox(this); - new QLabel(i18n("

No network interface card was found on your system.

" + m_noNicPage=new TQVBox(this); + new TQLabel(i18n("

No network interface card was found on your system.

" "

Possible reason: no network card is installed. You probably want to cancel now " "or enter your IP address and network manually

" "Example: 192.168.0.1/255.255.255.0."), @@ -170,8 +170,8 @@ void SetupWizard::setupNoNicPage() m_noNicPage->setMargin(KDialog::marginHint()); m_noNicPage->setSpacing(KDialog::spacingHint()); m_manualAddress=new KRestrictedLine(m_noNicPage,"0123456789./"); - connect(m_manualAddress,SIGNAL(textChanged(const QString&)),this,SLOT(checkIPAddress(const QString&))); - QWidget *dummy=new QWidget(m_noNicPage); + connect(m_manualAddress,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(checkIPAddress(const TQString&))); + TQWidget *dummy=new TQWidget(m_noNicPage); m_noNicPage->setStretchFactor(dummy,10); setNextEnabled(m_noNicPage, false); @@ -181,24 +181,24 @@ void SetupWizard::setupNoNicPage() void SetupWizard::setupSearchPage() { - m_searchPage=new QVBox(this); - QLabel *info=new QLabel(i18n("There are two ways LISa can search hosts on your network."),m_searchPage); + m_searchPage=new TQVBox(this); + TQLabel *info=new TQLabel(i18n("There are two ways LISa can search hosts on your network."),m_searchPage); info->setTextFormat(Qt::RichText); - m_ping=new QCheckBox(i18n("Send pings"), m_searchPage); - info=new QLabel(i18n("All hosts with TCP/IP will respond,
" + m_ping=new TQCheckBox(i18n("Send pings"), m_searchPage); + info=new TQLabel(i18n("All hosts with TCP/IP will respond,
" "whether or not they are samba servers.
" "Don\'t use it if your network is very large, i.e. more than 1000 hosts.
"),m_searchPage); - m_nmblookup=new QCheckBox(i18n("Send NetBIOS broadcasts"),m_searchPage); - info=new QLabel(i18n("You need to have the samba package (nmblookup) installed.
" + m_nmblookup=new TQCheckBox(i18n("Send NetBIOS broadcasts"),m_searchPage); + info=new TQLabel(i18n("You need to have the samba package (nmblookup) installed.
" "Only samba/windows servers will respond.
" "This method is not very reliable.
" "You should enable it if you are part of a large network."),m_searchPage); info->setTextFormat(Qt::RichText); - QWidget *dummy=new QWidget(m_searchPage); + TQWidget *dummy=new TQWidget(m_searchPage); m_searchPage->setStretchFactor(dummy,10); m_searchPage->setSpacing(KDialog::spacingHint()); m_searchPage->setMargin(KDialog::marginHint()); - info=new QLabel(i18n("If unsure, keep it as is."),m_searchPage); + info=new TQLabel(i18n("If unsure, keep it as is."),m_searchPage); info->setAlignment(AlignRight|AlignVCenter); setHelpEnabled( m_searchPage, false ); @@ -206,13 +206,13 @@ void SetupWizard::setupSearchPage() void SetupWizard::setupAddressesPage() { - m_addressesPage=new QVBox(this); - QLabel *info=new QLabel(i18n("All IP addresses included in the specified range will be pinged.
" + m_addressesPage=new TQVBox(this); + TQLabel *info=new TQLabel(i18n("All IP addresses included in the specified range will be pinged.
" "If you are part of a small network, e.g. with network mask 255.255.255.0
" "use your IP address/network mask.
"),m_addressesPage); info->setTextFormat(Qt::RichText); m_pingAddresses=new KRestrictedLine(m_addressesPage,"0123456789./;-"); - info=new QLabel(i18n("
There are four ways to specify address ranges:
" + info=new TQLabel(i18n("
There are four ways to specify address ranges:
" "1. IP address/network mask, like 192.168.0.0/255.255.255.0;
" "2. single IP addresses, like 10.0.0.23;
" "3. continuous ranges, like 10.0.1.0-10.0.1.200;
" @@ -220,11 +220,11 @@ void SetupWizard::setupAddressesPage() "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); - QWidget *dummy=new QWidget(m_addressesPage); + TQWidget *dummy=new TQWidget(m_addressesPage); m_addressesPage->setStretchFactor(dummy,10); m_addressesPage->setSpacing(KDialog::spacingHint()); m_addressesPage->setMargin(KDialog::marginHint()); - info=new QLabel(i18n("If unsure, keep it as is."), m_addressesPage); + info=new TQLabel(i18n("If unsure, keep it as is."), m_addressesPage); info->setAlignment(AlignRight|AlignVCenter); setHelpEnabled( m_addressesPage, false ); @@ -232,21 +232,21 @@ void SetupWizard::setupAddressesPage() void SetupWizard::setupAllowedPage() { - m_allowedAddressesPage=new QVBox(this); - QLabel* info=new QLabel(i18n("This is a security related setting.
" + m_allowedAddressesPage=new TQVBox(this); + TQLabel* info=new TQLabel(i18n("This is a security related setting.
" "It provides a simple IP address based way to specify \"trusted\" hosts.
" "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); m_allowedAddresses=new KRestrictedLine(m_allowedAddressesPage,"0123456789./-;"); - m_trustedHostsLabel=new QLabel(m_allowedAddressesPage); + m_trustedHostsLabel=new TQLabel(m_allowedAddressesPage); - QWidget *dummy=new QWidget(m_allowedAddressesPage); + TQWidget *dummy=new TQWidget(m_allowedAddressesPage); m_allowedAddressesPage->setStretchFactor(dummy,10); m_allowedAddressesPage->setSpacing(KDialog::spacingHint()); m_allowedAddressesPage->setMargin(KDialog::marginHint()); - info=new QLabel(i18n("If unsure, keep it as is."), m_allowedAddressesPage); + info=new TQLabel(i18n("If unsure, keep it as is."), m_allowedAddressesPage); info->setAlignment(AlignRight|AlignVCenter); setHelpEnabled( m_allowedAddressesPage, false ); @@ -254,19 +254,19 @@ void SetupWizard::setupAllowedPage() void SetupWizard::setupBcastPage() { - m_bcastPage=new QVBox(this); - QLabel *info=new QLabel(i18n("
Enter your IP address and network mask here, like 192.168.0.1/255.255.255.0"),m_bcastPage); + 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); m_bcastAddress=new KRestrictedLine(m_bcastPage,"0123456789./"); - info=new QLabel(i18n("
To reduce the network load, the LISa servers in one network
" + 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); - QWidget *dummy=new QWidget(m_bcastPage); + TQWidget *dummy=new TQWidget(m_bcastPage); m_bcastPage->setStretchFactor(dummy,10); m_bcastPage->setSpacing(KDialog::spacingHint()); - info=new QLabel(i18n("If unsure, keep it as is."), m_bcastPage); + info=new TQLabel(i18n("If unsure, keep it as is."), m_bcastPage); info->setAlignment(AlignRight|AlignVCenter); m_bcastPage->setSpacing(KDialog::spacingHint()); @@ -276,23 +276,23 @@ void SetupWizard::setupBcastPage() void SetupWizard::setupUpdateIntervalPage() { - m_intervalPage=new QVBox(this); - QLabel *info=new QLabel(i18n("
Enter the interval after which LISa, if busy, will update its host list."),m_intervalPage); + m_intervalPage=new TQVBox(this); + TQLabel *info=new TQLabel(i18n("
Enter the interval after which LISa, if busy, will update its host list."),m_intervalPage); info->setTextFormat(Qt::RichText); - m_updatePeriod=new QSpinBox(300,1800,10,m_intervalPage); + m_updatePeriod=new TQSpinBox(300,1800,10,m_intervalPage); m_updatePeriod->setSuffix(i18n(" sec")); - info=new QLabel(i18n("
Please note that the update interval will grow automatically by " + info=new TQLabel(i18n("
Please note that the update interval will grow automatically by " "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); - QWidget *dummy=new QWidget(m_intervalPage); + TQWidget *dummy=new TQWidget(m_intervalPage); m_intervalPage->setStretchFactor(dummy,10); m_intervalPage->setSpacing(KDialog::spacingHint()); m_intervalPage->setMargin(KDialog::marginHint()); - info=new QLabel(i18n("If unsure, keep it as is."), m_intervalPage); + info=new TQLabel(i18n("If unsure, keep it as is."), m_intervalPage); info->setAlignment(AlignRight|AlignVCenter); info->setTextFormat(Qt::RichText); @@ -301,53 +301,53 @@ void SetupWizard::setupUpdateIntervalPage() void SetupWizard::setupAdvancedSettingsPage() { - m_advancedPage=new QVBox(this); - QLabel *info=new QLabel(i18n("This page contains several settings you usually only
" + m_advancedPage=new TQVBox(this); + TQLabel *info=new TQLabel(i18n("This page contains several settings you usually only
" "need if LISa doesn't find all hosts in your network."),m_advancedPage); info->setTextFormat(Qt::RichText); - m_deliverUnnamedHosts=new QCheckBox(i18n("Re&port unnamed hosts"),m_advancedPage); - info=new QLabel(i18n("Should hosts for which LISa can\'t resolve the name be included in the host list?
"),m_advancedPage); + m_deliverUnnamedHosts=new TQCheckBox(i18n("Re&port unnamed hosts"),m_advancedPage); + info=new TQLabel(i18n("Should hosts for which LISa can\'t resolve the name be included in the host list?
"),m_advancedPage); - QHBox* hbox=new QHBox(m_advancedPage); + TQHBox* hbox=new TQHBox(m_advancedPage); - info=new QLabel(i18n("Wait for replies after first scan"),hbox); - m_firstWait=new QSpinBox(10,1000,50,hbox); + info=new TQLabel(i18n("Wait for replies after first scan"),hbox); + m_firstWait=new TQSpinBox(10,1000,50,hbox); m_firstWait->setSuffix(i18n(" ms")); - info=new QLabel(i18n("How long should LISa wait for answers to pings?
" + info=new TQLabel(i18n("How long should LISa wait for answers to pings?
" "If LISa doesn\'t find all hosts, try to increase this value.
"),m_advancedPage); - hbox=new QHBox(m_advancedPage); - info=new QLabel(i18n("Max. number of pings to send at once"),hbox); + hbox=new TQHBox(m_advancedPage); + info=new TQLabel(i18n("Max. number of pings to send at once"),hbox); info->setTextFormat(Qt::RichText); - m_maxPingsAtOnce=new QSpinBox(8,1024,5,hbox); - info=new QLabel(i18n("How many ping packets should LISa send at once?
" + m_maxPingsAtOnce=new TQSpinBox(8,1024,5,hbox); + info=new TQLabel(i18n("How many ping packets should LISa send at once?
" "If LISa doesn't find all hosts you could try to decrease this value.
"),m_advancedPage); - m_secondScan=new QCheckBox(i18n("Al&ways scan twice"),m_advancedPage); + m_secondScan=new TQCheckBox(i18n("Al&ways scan twice"),m_advancedPage); - hbox=new QHBox(m_advancedPage); + hbox=new TQHBox(m_advancedPage); // hbox->setSpacing(10); // WTF? - info=new QLabel(i18n("Wait for replies after second scan"),hbox); + info=new TQLabel(i18n("Wait for replies after second scan"),hbox); info->setTextFormat(Qt::RichText); - m_secondWait=new QSpinBox(0,1000,50,hbox); + m_secondWait=new TQSpinBox(0,1000,50,hbox); m_secondWait->setSuffix(i18n(" ms")); - info=new QLabel(i18n("If LISa doesn't find all hosts, enable this option."),m_advancedPage); + info=new TQLabel(i18n("If LISa doesn't find all hosts, enable this option."),m_advancedPage); //this would make the dialog to large //m_advancedPage->setSpacing(KDialog::spacingHint()); //m_advancedPage->setMargin(KDialog::marginHint()); - info=new QLabel(i18n("If unsure, keep it as is."), m_advancedPage); + info=new TQLabel(i18n("If unsure, keep it as is."), m_advancedPage); info->setAlignment(AlignRight|AlignVCenter); - connect(m_secondScan,SIGNAL(toggled(bool)),m_secondWait,SLOT(setEnabled(bool))); + connect(m_secondScan,TQT_SIGNAL(toggled(bool)),m_secondWait,TQT_SLOT(setEnabled(bool))); setHelpEnabled( m_advancedPage, false ); } void SetupWizard::setupFinalPage() { - m_finalPage=new QVBox(this); - QLabel *info=new QLabel(i18n("
Your LAN browsing has been successfully set up.

" + m_finalPage=new TQVBox(this); + TQLabel *info=new TQLabel(i18n("
Your LAN browsing has been successfully set up.

" "Make sure that the LISa server is started during the " "boot process. How this is done depends on your " "distribution and OS. Usually you have to insert it somewhere " @@ -357,7 +357,7 @@ void SetupWizard::setupFinalPage() "To test the server, try lan:/ in Konqueror.

" "If you have problems or suggestions, visit http://lisa-home.sourceforge.net."),m_finalPage); info->setTextFormat(Qt::RichText); - QWidget *dummy=new QWidget(m_finalPage); + TQWidget *dummy=new TQWidget(m_finalPage); m_finalPage->setStretchFactor(dummy,10); m_finalPage->setSpacing(KDialog::spacingHint()); m_finalPage->setMargin(KDialog::marginHint()); @@ -398,7 +398,7 @@ void SetupWizard::next() m_nicListBox->clear(); for (MyNIC *nic=m_nics->first(); nic!=0; nic=m_nics->next()) { - QString tmp=nic->name+": "+nic->addr+"/"+nic->netmask+";"; + TQString tmp=nic->name+": "+nic->addr+"/"+nic->netmask+";"; m_nicListBox->insertItem(tmp); } m_nicListBox->setSelected(0,true); @@ -406,7 +406,7 @@ void SetupWizard::next() } else if (currentPage()==m_multiNicPage) { - QString nic=m_nicListBox->currentText(); + TQString nic=m_nicListBox->currentText(); unsigned int i=0; for (i=0; icount(); i++) { @@ -438,10 +438,10 @@ void SetupWizard::next() } setAppropriate(m_advancedPage, m_ping->isChecked()); } - QWizard::next(); + TQWizard::next(); } -void SetupWizard::showPage(QWidget* page) +void SetupWizard::showPage(TQWidget* page) { if (page==m_noNicPage) { @@ -457,7 +457,7 @@ void SetupWizard::showPage(QWidget* page) m_pingAddresses->setFocus(); else if (page==m_allowedAddressesPage) { - QString text; + TQString text; if (m_ping->isChecked()) text+=i18n("You can use the same syntax as on the previous page.
"); else @@ -479,7 +479,7 @@ void SetupWizard::showPage(QWidget* page) else if (page==m_finalPage) setFinishEnabled(m_finalPage,true); - QWizard::showPage(page); + TQWizard::showPage(page); } void SetupWizard::setupRest() @@ -538,13 +538,13 @@ void SetupWizard::accept() m_configInfo->updatePeriod=m_updatePeriod->value(); m_configInfo->useNmblookup=m_nmblookup->isChecked(); m_configInfo->unnamedHosts=m_deliverUnnamedHosts->isChecked(); - QWizard::accept(); + TQWizard::accept(); } -void SetupWizard::checkIPAddress(const QString& addr) +void SetupWizard::checkIPAddress(const TQString& addr) { - QString address=addr.simplifyWhiteSpace(); - QRegExp regex("^\\d+\\.\\d+\\.\\d+\\.\\d+\\s*/\\s*\\d+\\.\\d+\\.\\d+\\.\\d+$"); + TQString address=addr.simplifyWhiteSpace(); + TQRegExp regex("^\\d+\\.\\d+\\.\\d+\\.\\d+\\s*/\\s*\\d+\\.\\d+\\.\\d+\\.\\d+$"); setNextEnabled(m_noNicPage, (regex.search(address,0)!=-1)); // setNextEnabled(m_noNicPage, (regex.find(address,0)!=-1)); } diff --git a/lanbrowsing/kcmlisa/setupwizard.h b/lanbrowsing/kcmlisa/setupwizard.h index b85d61c4..8ccd2a15 100644 --- a/lanbrowsing/kcmlisa/setupwizard.h +++ b/lanbrowsing/kcmlisa/setupwizard.h @@ -27,15 +27,15 @@ #include "findnic.h" -#include -#include +#include +#include #include -#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #include @@ -44,14 +44,14 @@ class SetupWizard:public QWizard { Q_OBJECT public: - SetupWizard(QWidget* parent, LisaConfigInfo* configInfo); + SetupWizard(TQWidget* parent, LisaConfigInfo* configInfo); ~SetupWizard(); - virtual void showPage(QWidget* page); + virtual void showPage(TQWidget* page); void clearAll(); protected slots: virtual void next(); virtual void accept(); - void checkIPAddress(const QString& address); + void checkIPAddress(const TQString& address); protected: void applyLisaConfigInfo(LisaConfigInfo& lci); @@ -67,32 +67,32 @@ class SetupWizard:public QWizard void setupFinalPage(); void setupRest(); - QVBox* m_page1; - QVBox* m_noNicPage; - QVBox* m_multiNicPage; - QVBox* m_searchPage; - QVBox* m_addressesPage; - QVBox* m_allowedAddressesPage; - QVBox* m_bcastPage; - QVBox* m_intervalPage; - QVBox* m_advancedPage; - QVBox* m_finalPage; + TQVBox* m_page1; + TQVBox* m_noNicPage; + TQVBox* m_multiNicPage; + TQVBox* m_searchPage; + TQVBox* m_addressesPage; + TQVBox* m_allowedAddressesPage; + TQVBox* m_bcastPage; + TQVBox* m_intervalPage; + TQVBox* m_advancedPage; + TQVBox* m_finalPage; - QListBox *m_nicListBox; - QLabel *m_trustedHostsLabel; - QCheckBox *m_ping; - QCheckBox *m_nmblookup; + TQListBox *m_nicListBox; + TQLabel *m_trustedHostsLabel; + TQCheckBox *m_ping; + TQCheckBox *m_nmblookup; KRestrictedLine* m_pingAddresses; KRestrictedLine* m_allowedAddresses; KRestrictedLine* m_bcastAddress; KRestrictedLine* m_manualAddress; - QSpinBox* m_updatePeriod; - QCheckBox* m_deliverUnnamedHosts; - QSpinBox* m_firstWait; - QSpinBox* m_maxPingsAtOnce; - QCheckBox* m_secondScan; - QSpinBox* m_secondWait; + TQSpinBox* m_updatePeriod; + TQCheckBox* m_deliverUnnamedHosts; + TQSpinBox* m_firstWait; + TQSpinBox* m_maxPingsAtOnce; + TQCheckBox* m_secondScan; + TQSpinBox* m_secondWait; NICList* m_nics; LisaConfigInfo* m_configInfo; diff --git a/lanbrowsing/kio_lan/kio_lan.cpp b/lanbrowsing/kio_lan/kio_lan.cpp index 89de40da..c1d79695 100644 --- a/lanbrowsing/kio_lan/kio_lan.cpp +++ b/lanbrowsing/kio_lan/kio_lan.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include @@ -87,7 +87,7 @@ int kdemain( int argc, char **argv ) return 0; } -LANProtocol::LANProtocol(int isLanIoslave, const QCString &pool, const QCString &app ) +LANProtocol::LANProtocol(int isLanIoslave, const TQCString &pool, const TQCString &app ) :TCPSlaveBase(7741,isLanIoslave?"lan":"rlan", pool, app) ,m_currentHost("") ,m_port(7741) @@ -275,7 +275,7 @@ int LANProtocol::rlanReadDataFromServer() sockaddr_un addr; memset((char*)&addr,0,sizeof(addr)); addr.sun_family=AF_LOCAL; - QCString socketname="/tmp/resLisa-"; + TQCString socketname="/tmp/resLisa-"; struct passwd *user = getpwuid( getuid() ); if ( user ) @@ -441,11 +441,11 @@ int LANProtocol::rlanReadDataFromServer() return 1; } -int LANProtocol::checkHost(const QString& host) +int LANProtocol::checkHost(const TQString& host) { kdDebug(7101)<<"LAN::checkHost() "<& _ports, in_addr ip ) +int LANProtocol::checkPort( TQValueVector& _ports, in_addr ip ) { int _port=0; struct sockaddr_in to_scan; @@ -567,7 +567,7 @@ int LANProtocol::checkPort( QValueVector& _ports, in_addr ip ) to_scan.sin_family = AF_INET; to_scan.sin_addr = ip; - for (QValueVector::iterator i= _ports.begin(); i != _ports.end(); i++) + for (TQValueVector::iterator i= _ports.begin(); i != _ports.end(); i++) { _port=(*i); kdDebug(7101)<<"LANProtocol::checkPort: "<<_port<& _ports, in_addr ip ) } -void LANProtocol::setHost( const QString& host, int port, const QString& , const QString& ) +void LANProtocol::setHost( const TQString& host, int port, const TQString& , const TQString& ) { if (m_isLanIoslave) { @@ -645,8 +645,8 @@ void LANProtocol::setHost( const QString& host, int port, const QString& , const void LANProtocol::mimetype( const KURL& url) { kdDebug(7101)<<"LANProtocol::mimetype -"<2) { @@ -745,8 +745,8 @@ void LANProtocol::stat( const KURL & url) entry.append(atom); - QString path( QFile::encodeName(url.path())); - QStringList pathList=QStringList::split( "/",path); + TQString path( TQFile::encodeName(url.path())); + TQStringList pathList=TQStringList::split( "/",path); if ((pathList.count()==2) && (pathList[1].upper()=="HTTP")) { atom.m_uds = KIO::UDS_FILE_TYPE; @@ -774,12 +774,12 @@ void LANProtocol::stat( const KURL & url) void LANProtocol::get(const KURL& url ) { - QString path(QFile::encodeName(url.path())); + TQString path(TQFile::encodeName(url.path())); kdDebug(7101)<<"LANProtocol::get: "< #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -44,7 +44,7 @@ struct MyProtocolInfo { int enabled; - QValueVector ports; + TQValueVector ports; //this should be large enough for things like "FTP" and so on char name[NAMELEN]; }; @@ -58,10 +58,10 @@ struct HostInfo class LANProtocol : public KIO::TCPSlaveBase { public: - LANProtocol (int isLanIoSlave, const QCString &pool, const QCString &app ); + LANProtocol (int isLanIoSlave, const TQCString &pool, const TQCString &app ); virtual ~LANProtocol(); - virtual void setHost( const QString& host, int port, const QString& user, const QString& pass ); + virtual void setHost( const TQString& host, int port, const TQString& user, const TQString& pass ); virtual void mimetype( const KURL& ); virtual void listDir( const KURL& url); @@ -69,19 +69,19 @@ class LANProtocol : public KIO::TCPSlaveBase virtual void get( const KURL& url ); protected: - QDict m_hostInfoCache; + TQDict m_hostInfoCache; int readDataFromServer(); int lanReadDataFromServer(); int rlanReadDataFromServer(); - int checkHost(const QString& host); - int checkPort(QValueVector& _ports, in_addr ip); - QString m_currentHost; + int checkHost(const TQString& host); + int checkPort(TQValueVector& _ports, in_addr ip); + TQString m_currentHost; unsigned short int m_port; MyProtocolInfo m_protocolInfo[KIOLAN_MAX]; int m_maxAge; bool m_isLanIoslave; bool m_shortHostnames; - QString m_defaultLisaHost; + TQString m_defaultLisaHost; }; #endif -- cgit v1.2.1