diff options
Diffstat (limited to 'knetworkconf')
20 files changed, 79 insertions, 142 deletions
diff --git a/knetworkconf/knetworkconf/CMakeLists.txt b/knetworkconf/knetworkconf/CMakeLists.txt index dc23479..7750c9a 100644 --- a/knetworkconf/knetworkconf/CMakeLists.txt +++ b/knetworkconf/knetworkconf/CMakeLists.txt @@ -13,9 +13,6 @@ link_directories( ${TDE_LIB_DIR} ) -add_definitions( -UTQT_NO_COMPAT -) - ##### kcm_knetworkconfmodule (kpart) ############ diff --git a/knetworkconf/knetworkconf/Makefile.am b/knetworkconf/knetworkconf/Makefile.am index 6c16644..29ffe82 100644 --- a/knetworkconf/knetworkconf/Makefile.am +++ b/knetworkconf/knetworkconf/Makefile.am @@ -2,9 +2,6 @@ #INCLUDES= $(all_includes) AM_CPPFLAGS = $(all_includes) -# We use deprecated routines in QButton, undefine TQT_NO_COMPAT. -KDE_CXXFLAGS = -UTQT_NO_COMPAT - METASOURCES = AUTO #bin_PROGRAMS = knetworkconf @@ -33,7 +30,7 @@ xdg_apps_DATA = kcm_knetworkconfmodule.desktop KDE_ICON = AUTO messages: rc.cpp - LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \ + LIST=`find . -name \*.h -o -name \*.cpp`; \ if test -n "$$LIST"; then \ $(XGETTEXT) $$LIST -o $(podir)/knetworkconf.pot; \ fi diff --git a/knetworkconf/knetworkconf/kadddevicecontainer.cpp b/knetworkconf/knetworkconf/kadddevicecontainer.cpp index d68dffe..aaeb48e 100644 --- a/knetworkconf/knetworkconf/kadddevicecontainer.cpp +++ b/knetworkconf/knetworkconf/kadddevicecontainer.cpp @@ -25,7 +25,7 @@ KAddDeviceContainer::KAddDeviceContainer(TQWidget *parent, const char *name) //Setup extension dialog setExtension( new KAddDeviceDlgExtension( this ) ); - setOrientation(Qt::Vertical ); + setOrientation(TQt::Vertical ); //Create dialog that contains the KAddDeviceDlg and KAddDeviceWifiExt (when //configuring a wireless interface) widgets @@ -64,30 +64,30 @@ KAddDeviceContainer::KAddDeviceContainer(TQWidget *parent, const char *name) mainLayout->setResizeMode(TQLayout::Auto); //Setup connections - connect((KAddDeviceDlgExtension*)extension(),TQT_SIGNAL(valueChangedSignal(int)),this,TQT_SLOT(toggleApplyButtonSlot(int))); - connect(addDlg->kleIPAddress,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(toggleApplyButtonSlot(const TQString&))); -// connect(addDlg->kleGateway,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(toggleApplyButtonSlot(const TQString&))); - connect(addDlg->kcbNetmask,TQT_SIGNAL(activated(int)),this,TQT_SLOT(toggleApplyButtonSlot(int))); - connect(addDlg->kcbAutoBootProto,TQT_SIGNAL(activated(const TQString&)),this,TQT_SLOT(toggleApplyButtonSlot(const TQString&))); - connect(addDlg->kcbstartAtBoot,TQT_SIGNAL(stateChanged(int)),this,TQT_SLOT(toggleApplyButtonSlot(int))); - connect(addDlg->rbBootProtoAuto,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(toggleAdvancedOptionsSlot(bool))); - connect(addDlg->rbBootProtoAuto,TQT_SIGNAL(toggled(bool)),kpbAdvanced,TQT_SLOT(setDisabled(bool))); - connect(addDlg->rbBootProtoAuto,TQT_SIGNAL(stateChanged(int)),this,TQT_SLOT(toggleApplyButtonSlot(int))); - // connect(addDlg->rbBootProtoAuto,TQT_SIGNAL(toggled(bool)),addDlg->kleIPAddress,TQT_SLOT(setDisabled(bool))); - // connect(addDlg->rbBootProtoAuto,TQT_SIGNAL(toggled(bool)),addDlg->kcbNetmask,TQT_SLOT(setDisabled(bool))); - // connect(addDlg->rbBootProtoManual,TQT_SIGNAL(toggled(bool)),addDlg->kcbAutoBootProto,TQT_SLOT(setDisabled(bool))); - connect(kpbCancel,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelSlot())); - connect(kpbApply,TQT_SIGNAL(clicked()),this,TQT_SLOT(verifyDeviceInfoSlot())); - connect(kpbAdvanced,TQT_SIGNAL(clicked()),this,TQT_SLOT(advancedOptionsSlot())); + connect((KAddDeviceDlgExtension*)extension(),TQ_SIGNAL(valueChangedSignal(int)),this,TQ_SLOT(toggleApplyButtonSlot(int))); + connect(addDlg->kleIPAddress,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(toggleApplyButtonSlot(const TQString&))); +// connect(addDlg->kleGateway,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(toggleApplyButtonSlot(const TQString&))); + connect(addDlg->kcbNetmask,TQ_SIGNAL(activated(int)),this,TQ_SLOT(toggleApplyButtonSlot(int))); + connect(addDlg->kcbAutoBootProto,TQ_SIGNAL(activated(const TQString&)),this,TQ_SLOT(toggleApplyButtonSlot(const TQString&))); + connect(addDlg->kcbstartAtBoot,TQ_SIGNAL(stateChanged(int)),this,TQ_SLOT(toggleApplyButtonSlot(int))); + connect(addDlg->rbBootProtoAuto,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(toggleAdvancedOptionsSlot(bool))); + connect(addDlg->rbBootProtoAuto,TQ_SIGNAL(toggled(bool)),kpbAdvanced,TQ_SLOT(setDisabled(bool))); + connect(addDlg->rbBootProtoAuto,TQ_SIGNAL(stateChanged(int)),this,TQ_SLOT(toggleApplyButtonSlot(int))); + // connect(addDlg->rbBootProtoAuto,TQ_SIGNAL(toggled(bool)),addDlg->kleIPAddress,TQ_SLOT(setDisabled(bool))); + // connect(addDlg->rbBootProtoAuto,TQ_SIGNAL(toggled(bool)),addDlg->kcbNetmask,TQ_SLOT(setDisabled(bool))); + // connect(addDlg->rbBootProtoManual,TQ_SIGNAL(toggled(bool)),addDlg->kcbAutoBootProto,TQ_SLOT(setDisabled(bool))); + connect(kpbCancel,TQ_SIGNAL(clicked()),this,TQ_SLOT(cancelSlot())); + connect(kpbApply,TQ_SIGNAL(clicked()),this,TQ_SLOT(verifyDeviceInfoSlot())); + connect(kpbAdvanced,TQ_SIGNAL(clicked()),this,TQ_SLOT(advancedOptionsSlot())); } void KAddDeviceContainer::addWirelessWidget(){ extDlg = new KAddDeviceWifiExt(this); mainLayout->addWidget( extDlg ); - connect(extDlg->kleEssid,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(toggleApplyButtonSlot(const TQString&))); - connect(extDlg->kleWepKey,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(toggleApplyButtonSlot(const TQString&))); - connect(extDlg->qcbKeyType,TQT_SIGNAL(activated(const TQString&)),this,TQT_SLOT(toggleApplyButtonSlot(const TQString&))); + connect(extDlg->kleEssid,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(toggleApplyButtonSlot(const TQString&))); + connect(extDlg->kleWepKey,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(toggleApplyButtonSlot(const TQString&))); + connect(extDlg->qcbKeyType,TQ_SIGNAL(activated(const TQString&)),this,TQ_SLOT(toggleApplyButtonSlot(const TQString&))); } void KAddDeviceContainer::toggleApplyButtonSlot( const TQString & ) { @@ -150,13 +150,6 @@ void KAddDeviceContainer::verifyDeviceInfoSlot() } } -void KAddDeviceContainer::makeButtonsResizeable() -{ - kpbApply->setAutoResize(true); - kpbAdvanced->setAutoResize(true); - kpbCancel->setAutoResize(true); -} - bool KAddDeviceContainer::modified() { return _modified; diff --git a/knetworkconf/knetworkconf/kadddevicecontainer.h b/knetworkconf/knetworkconf/kadddevicecontainer.h index 80e954e..8eca304 100644 --- a/knetworkconf/knetworkconf/kadddevicecontainer.h +++ b/knetworkconf/knetworkconf/kadddevicecontainer.h @@ -45,7 +45,7 @@ Network interface configuration dialog. This dialog contains the KAddDeviceDlg a */ class KAddDeviceContainer : public KDialog { - Q_OBJECT + TQ_OBJECT public: KAddDeviceContainer(TQWidget *parent = 0, const char *name = 0); @@ -61,9 +61,6 @@ class KAddDeviceContainer : public KDialog bool modified(); bool advanced(); - private: - void makeButtonsResizeable(); - protected: TQVBoxLayout* mainLayout; TQHBoxLayout* buttonsLayout; diff --git a/knetworkconf/knetworkconf/kadddevicedlgextension.ui b/knetworkconf/knetworkconf/kadddevicedlgextension.ui index cbb59f0..27f15aa 100644 --- a/knetworkconf/knetworkconf/kadddevicedlgextension.ui +++ b/knetworkconf/knetworkconf/kadddevicedlgextension.ui @@ -138,12 +138,12 @@ <includes> <include location="local" impldecl="in implementation">kadddevicedlgextension.ui.h</include> </includes> -<Q_SIGNALS> +<signals> <signal>valueChangedSignal(int)</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot access="private">valueChanged( const TQString & s )</slot> -</Q_SLOTS> +</slots> <functions> <function access="private" specifier="non virtual">init()</function> </functions> diff --git a/knetworkconf/knetworkconf/kadddnsserverdlg.ui b/knetworkconf/knetworkconf/kadddnsserverdlg.ui index a05a9e7..5bcf80a 100644 --- a/knetworkconf/knetworkconf/kadddnsserverdlg.ui +++ b/knetworkconf/knetworkconf/kadddnsserverdlg.ui @@ -147,10 +147,9 @@ <includes> <include location="local" impldecl="in implementation">kadddnsserverdlg.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="private">validateAddressSlot()</slot> - <slot access="private">makeButtonsResizeable()</slot> -</Q_SLOTS> +</slots> <functions> <function specifier="non virtual">setAddingAlias( bool add )</function> <function returnType="bool">modified()</function> diff --git a/knetworkconf/knetworkconf/kadddnsserverdlg.ui.h b/knetworkconf/knetworkconf/kadddnsserverdlg.ui.h index 3eba8a6..b2b9a49 100644 --- a/knetworkconf/knetworkconf/kadddnsserverdlg.ui.h +++ b/knetworkconf/knetworkconf/kadddnsserverdlg.ui.h @@ -25,7 +25,6 @@ void KAddDNSServerDlg::init() { _modified2 = false; addingAlias = false; - makeButtonsResizeable(); } void KAddDNSServerDlg::validateAddressSlot() @@ -55,10 +54,3 @@ void KAddDNSServerDlg::validateAddressSlot() } } } - - -void KAddDNSServerDlg::makeButtonsResizeable() -{ - kpbAddServer->setAutoResize(true); - kpbCancel->setAutoResize(true); -} diff --git a/knetworkconf/knetworkconf/kaddknownhostdlg.ui b/knetworkconf/knetworkconf/kaddknownhostdlg.ui index 35586fb..8833928 100644 --- a/knetworkconf/knetworkconf/kaddknownhostdlg.ui +++ b/knetworkconf/knetworkconf/kaddknownhostdlg.ui @@ -278,13 +278,12 @@ <includes> <include location="local" impldecl="in implementation">kaddknownhostdlg.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="private">validateAddressSlot()</slot> - <slot access="private">makeButtonsResizeable()</slot> <slot access="private">editHostSlot()</slot> <slot access="private">removeHostSlot()</slot> <slot access="private">addHostSlot()</slot> -</Q_SLOTS> +</slots> <functions> <function access="private" specifier="non virtual">init()</function> <function specifier="non virtual" returnType="bool">modified()</function> diff --git a/knetworkconf/knetworkconf/kaddknownhostdlg.ui.h b/knetworkconf/knetworkconf/kaddknownhostdlg.ui.h index bbf6e8f..f6465b2 100644 --- a/knetworkconf/knetworkconf/kaddknownhostdlg.ui.h +++ b/knetworkconf/knetworkconf/kaddknownhostdlg.ui.h @@ -16,7 +16,6 @@ bool _modifiedhost; void KAddKnownHostDlg::init() { _modifiedhost = false; - makeButtonsResizeable(); } void KAddKnownHostDlg::validateAddressSlot() { @@ -37,16 +36,6 @@ void KAddKnownHostDlg::validateAddressSlot() } -void KAddKnownHostDlg::makeButtonsResizeable() -{ - kpbAdd->setAutoResize(true); - kpbCancel->setAutoResize(true); - kpbAddHost->setAutoResize(true); - kpbEditHost->setAutoResize(true); - kpbRemoveHost->setAutoResize(true); -} - - bool KAddKnownHostDlg::modified() { return _modifiedhost; diff --git a/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui b/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui index c392aaf..0447210 100644 --- a/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui +++ b/knetworkconf/knetworkconf/kinterfaceupdowndlg.ui @@ -94,9 +94,9 @@ <includes> <include location="local" impldecl="in implementation">kinterfaceupdowndlg.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>close()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> diff --git a/knetworkconf/knetworkconf/knetworkconf.cpp b/knetworkconf/knetworkconf/knetworkconf.cpp index 36d4a46..8a6d6a1 100644 --- a/knetworkconf/knetworkconf/knetworkconf.cpp +++ b/knetworkconf/knetworkconf/knetworkconf.cpp @@ -23,7 +23,6 @@ KNetworkConf::KNetworkConf(TQWidget *parent, const char *name) : DCOPObject("KNetworkConfIface"), KNetworkConfDlg(parent, name) { netInfo = 0L; - makeButtonsResizeable(); config = new KNetworkConfigParser(); klvCardList->setAllColumnsShowFocus(true); klvKnownHosts->setAllColumnsShowFocus(true); @@ -34,14 +33,14 @@ KNetworkConf::KNetworkConf(TQWidget *parent, const char *name) : DCOPObject("KNe tooltip = new KProfilesListViewToolTip(klvProfilesList); //Connect signals emmitted by the backend to know when data is ready to be painted. - connect(config,TQT_SIGNAL(readyLoadingNetworkInfo()),this,TQT_SLOT(getNetworkInfoSlot())); - connect(config,TQT_SIGNAL(readyLoadingNetworkInfo()),this,TQT_SLOT(showMainWindow())); - connect(config,TQT_SIGNAL(readyLoadingNetworkInfo()),this,TQT_SLOT(enableSignals())); - connect(config, TQT_SIGNAL(setReadOnly(bool)),this,TQT_SLOT(setReadOnlySlot(bool))); + connect(config,TQ_SIGNAL(readyLoadingNetworkInfo()),this,TQ_SLOT(getNetworkInfoSlot())); + connect(config,TQ_SIGNAL(readyLoadingNetworkInfo()),this,TQ_SLOT(showMainWindow())); + connect(config,TQ_SIGNAL(readyLoadingNetworkInfo()),this,TQ_SLOT(enableSignals())); + connect(config, TQ_SIGNAL(setReadOnly(bool)),this,TQ_SLOT(setReadOnlySlot(bool))); connect(klvCardList, - TQT_SIGNAL(contextMenu(TDEListView*,TQListViewItem*,const TQPoint&)), + TQ_SIGNAL(contextMenu(TDEListView*,TQListViewItem*,const TQPoint&)), this, - TQT_SLOT(showInterfaceContextMenuSlot(TDEListView*,TQListViewItem*, const TQPoint&))); + TQ_SLOT(showInterfaceContextMenuSlot(TDEListView*,TQListViewItem*, const TQPoint&))); // Register with DCOP - No longer needed as now we are a kcontrol module? if ( !kapp->dcopClient()->isRegistered() ) { @@ -152,7 +151,7 @@ void KNetworkConf::loadNetworkDevicesInfo() */ void KNetworkConf::quitSlot(){ int code = 0; - connect( config, TQT_SIGNAL(readyLoadingNetworkInfo()), this, TQT_SLOT(quitSlot()) ); + connect( config, TQ_SIGNAL(readyLoadingNetworkInfo()), this, TQ_SLOT(quitSlot()) ); if (modified) { code = KMessageBox::warningYesNoCancel(this, @@ -571,7 +570,7 @@ void KNetworkConf::disableAll(){ kleDomainName->setReadOnly(true); tlDomainName->setEnabled(false); tlHostName->setEnabled(false); - disconnect(klvCardList,TQT_SIGNAL(doubleClicked(TQListViewItem *)),this,TQT_SLOT(configureDeviceSlot())); + disconnect(klvCardList,TQ_SIGNAL(doubleClicked(TQListViewItem *)),this,TQ_SLOT(configureDeviceSlot())); klvCardList->setEnabled(false); kpbUpButton->setEnabled(false); kpbDownButton->setEnabled(false); @@ -686,7 +685,7 @@ void KNetworkConf::changeDeviceState(const TQString &dev, int state){ dialog->setModal(true); dialog->show(); - procDeviceState = new TQProcess(TQT_TQOBJECT(this)); + procDeviceState = new TQProcess(this); TQString cmd; procDeviceState->addArgument( locate("data",BACKEND_PATH) ); @@ -703,10 +702,10 @@ void KNetworkConf::changeDeviceState(const TQString &dev, int state){ else if (state == DEVICE_DOWN) procDeviceState->addArgument("enable_iface::"+dev+"::0" ); - connect( procDeviceState, TQT_SIGNAL(readyReadStdout()),this, TQT_SLOT(readFromStdoutUpDown()) ); - connect( procDeviceState, TQT_SIGNAL(readyReadStderr()),this, TQT_SLOT(readFromStdErrUpDown()) ); - connect( procDeviceState, TQT_SIGNAL(processExited()),this, TQT_SLOT(verifyDeviceStateChanged()) ); - connect( procDeviceState, TQT_SIGNAL(processExited()), dialog, TQT_SLOT(close()) ); + connect( procDeviceState, TQ_SIGNAL(readyReadStdout()),this, TQ_SLOT(readFromStdoutUpDown()) ); + connect( procDeviceState, TQ_SIGNAL(readyReadStderr()),this, TQ_SLOT(readFromStdErrUpDown()) ); + connect( procDeviceState, TQ_SIGNAL(processExited()),this, TQ_SLOT(verifyDeviceStateChanged()) ); + connect( procDeviceState, TQ_SIGNAL(processExited()), dialog, TQ_SLOT(close()) ); currentDevice = dev; commandOutput = ""; @@ -810,20 +809,6 @@ bool KNetworkConf::valuesChanged(KNetworkInterface *dev, return false; } -/** Sets the TQPushButton::autoResize() in true for all buttons. */ -void KNetworkConf::makeButtonsResizeable(){ - kpbConfigureNetworkInterface->setAutoResize(true); - kcbGwDevice->setAutoResize(true); - kpbAddDomainServer->setAutoResize(true); - kpbEditDomainServer->setAutoResize(true); - kpbRemoveDomainServer->setAutoResize(true); - kpbUpButton->setAutoResize(true); - kpbDownButton->setAutoResize(true); - kpbAddKnownHost->setAutoResize(true); - kpbEditKnownHost->setAutoResize(true); - kpbRemoveKnownHost->setAutoResize(true); -} - void KNetworkConf::enableInterfaceSlot() { if (modified) { @@ -986,8 +971,8 @@ void KNetworkConf::showInterfaceContextMenuSlot(TDEListView* lv, TQListViewItem* TDEPopupMenu *context = new TDEPopupMenu( this ); TQ_CHECK_PTR( context ); - context->insertItem( "&Enable Interface", this, TQT_SLOT(enableInterfaceSlot())); - context->insertItem( "&Disable Interface", this, TQT_SLOT(disableInterfaceSlot())); + context->insertItem( "&Enable Interface", this, TQ_SLOT(enableInterfaceSlot())); + context->insertItem( "&Disable Interface", this, TQ_SLOT(disableInterfaceSlot())); TQListViewItem *item = klvCardList->currentItem(); TQString currentDevice = item->text(0); KNetworkInterface *dev = getDeviceInfo(currentDevice); @@ -1003,17 +988,17 @@ void KNetworkConf::showInterfaceContextMenuSlot(TDEListView* lv, TQListViewItem* context->setItemEnabled(1,false); } context->insertSeparator(2); - context->insertItem( "&Configure Interface...", this, TQT_SLOT(configureDeviceSlot())); + context->insertItem( "&Configure Interface...", this, TQ_SLOT(configureDeviceSlot())); context->popup(pt); - //context->insertItem( "About &TQt", this, TQT_SLOT(aboutTQt()) ); + //context->insertItem( "About &TQt", this, TQ_SLOT(aboutTQt()) ); } void KNetworkConf::enableSignals() { tooltip->setProfiles(netInfo->getProfilesList()); - connect(kleDefaultRoute,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(enableApplyButtonSlot(const TQString&))); - connect(kleDomainName,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(enableApplyButtonSlot(const TQString&))); - connect(kleHostName,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(enableApplyButtonSlot(const TQString&))); + connect(kleDefaultRoute,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(enableApplyButtonSlot(const TQString&))); + connect(kleDomainName,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(enableApplyButtonSlot(const TQString&))); + connect(kleHostName,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(enableApplyButtonSlot(const TQString&))); } void KNetworkConf::enableProfileSlot() @@ -1032,7 +1017,7 @@ void KNetworkConf::enableProfileSlot() profile->setProfilesList(netInfo->getProfilesList()); config->saveNetworkInfo(profile); modified = false; - //connect( config, TQT_SIGNAL(readyLoadingNetworkInfo()), this, TQT_SLOT(showSelectedProfile(selectedProfile)) ); + //connect( config, TQ_SIGNAL(readyLoadingNetworkInfo()), this, TQ_SLOT(showSelectedProfile(selectedProfile)) ); } else KMessageBox::error(this, diff --git a/knetworkconf/knetworkconf/knetworkconf.h b/knetworkconf/knetworkconf/knetworkconf.h index 990bef1..cb2d8b4 100644 --- a/knetworkconf/knetworkconf/knetworkconf.h +++ b/knetworkconf/knetworkconf/knetworkconf.h @@ -75,7 +75,7 @@ /** KNetworkConf is the base class of the project */ class KNetworkConf : public KNetworkConfDlg, public DCOPObject { - Q_OBJECT + TQ_OBJECT public: /** construtor */ @@ -175,8 +175,6 @@ class KNetworkConf : public KNetworkConfDlg, public DCOPObject TQString broadcast); /** Returns a list of strings of all the configured devices. */ TQStringList getDeviceList(); - /** Sets the TQPushButton::autoResize() in true for all buttons. */ - void makeButtonsResizeable(); /** Adds a new host to the TDEListView that has the known hosts. */ void addKnownHostSlot(); diff --git a/knetworkconf/knetworkconf/knetworkconfdlg.ui b/knetworkconf/knetworkconf/knetworkconfdlg.ui index dc77b40..3b83884 100644 --- a/knetworkconf/knetworkconf/knetworkconfdlg.ui +++ b/knetworkconf/knetworkconf/knetworkconfdlg.ui @@ -1043,7 +1043,7 @@ <include location="local" impldecl="in implementation">knetworkconfdlg.ui.h</include> <include location="local" impldecl="in declaration">tqlistview.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="private">enableButtonsSlot()</slot> <slot access="private">quitSlot()</slot> <slot access="private">moveUpServerSlot()</slot> @@ -1072,7 +1072,7 @@ <slot access="private">updateProfileNameSlot(TQListViewItem *item)</slot> <slot access="private">removeProfileSlot()</slot> <slot access="private">updateProfileSlot()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcombobox.h</include> diff --git a/knetworkconf/knetworkconf/knetworkconfigparser.cpp b/knetworkconf/knetworkconf/knetworkconfigparser.cpp index 73bab37..24def66 100644 --- a/knetworkconf/knetworkconf/knetworkconfigparser.cpp +++ b/knetworkconf/knetworkconf/knetworkconfigparser.cpp @@ -52,11 +52,11 @@ void KNetworkConfigParser::runDetectionScript(TQString platform){ procDetect->addArgument( platform ); } procDetect->addArgument( "--get" ); - connect( this, TQT_SIGNAL(readyLoadingNetworkInfo()), dialog, TQT_SLOT(close()) ); - connect( this, TQT_SIGNAL(errorDetectingPlatform()), dialog, TQT_SLOT(close()) ); - connect( procDetect, TQT_SIGNAL(processExited()), this, TQT_SLOT(readNetworkInfo()) ); - connect( procDetect, TQT_SIGNAL(readyReadStdout()),this, TQT_SLOT(concatXMLOutputSlot())); - connect( procDetect, TQT_SIGNAL(readyReadStderr()),this, TQT_SLOT(readXMLErrSlot())); + connect( this, TQ_SIGNAL(readyLoadingNetworkInfo()), dialog, TQ_SLOT(close()) ); + connect( this, TQ_SIGNAL(errorDetectingPlatform()), dialog, TQ_SLOT(close()) ); + connect( procDetect, TQ_SIGNAL(processExited()), this, TQ_SLOT(readNetworkInfo()) ); + connect( procDetect, TQ_SIGNAL(readyReadStdout()),this, TQ_SLOT(concatXMLOutputSlot())); + connect( procDetect, TQ_SIGNAL(readyReadStderr()),this, TQ_SLOT(readXMLErrSlot())); if ( !procDetect->start() ) { @@ -82,9 +82,9 @@ void KNetworkConfigParser::listIfaces(const TQString &platform){ procDetect->addArgument( "-d" ); procDetect->addArgument( "list_ifaces" ); - connect( procDetect, TQT_SIGNAL(processExited()), this, TQT_SLOT(readListIfacesSlot()) ); - connect( procDetect, TQT_SIGNAL(readyReadStdout()),this, TQT_SLOT(concatXMLOutputSlot())); - connect( procDetect, TQT_SIGNAL(readyReadStderr()),this, TQT_SLOT(readXMLErrSlot())); + connect( procDetect, TQ_SIGNAL(processExited()), this, TQ_SLOT(readListIfacesSlot()) ); + connect( procDetect, TQ_SIGNAL(readyReadStdout()),this, TQ_SLOT(concatXMLOutputSlot())); + connect( procDetect, TQ_SIGNAL(readyReadStderr()),this, TQ_SLOT(readXMLErrSlot())); xmlOuput = ""; xmlErr = ""; @@ -221,7 +221,7 @@ KNetworkConfigParser::hexIPv4ToDecIPv4(const TQString &hex) TQString temp = ""; TQString temp2 = ""; -#if Q_BYTE_ORDER == TQ_LITTLE_ENDIAN +#if TQ_BYTE_ORDER == TQ_LITTLE_ENDIAN temp = hex.mid(6,2); temp2 = temp2.setNum(temp.toInt(&ok,16)); dec.append(temp2); @@ -306,13 +306,13 @@ void KNetworkConfigParser::saveNetworkInfo(KNetworkInfo *networkInfo) xmlOuput = ""; - connect( this, TQT_SIGNAL(readyLoadingNetworkInfo()), dialog, TQT_SLOT(close()) ); - connect(procSaveNetworkInfo,TQT_SIGNAL(readyReadStdout()),this,TQT_SLOT(readFromStdoutSaveNetworkInfo())); - connect(procSaveNetworkInfo,TQT_SIGNAL(wroteToStdin()),this,TQT_SLOT(sendNetworkInfoSavedSignalSlot())); - connect(procSaveNetworkInfo,TQT_SIGNAL(processExited()),this,TQT_SLOT(listIfacesSlot())); + connect( this, TQ_SIGNAL(readyLoadingNetworkInfo()), dialog, TQ_SLOT(close()) ); + connect(procSaveNetworkInfo,TQ_SIGNAL(readyReadStdout()),this,TQ_SLOT(readFromStdoutSaveNetworkInfo())); + connect(procSaveNetworkInfo,TQ_SIGNAL(wroteToStdin()),this,TQ_SLOT(sendNetworkInfoSavedSignalSlot())); + connect(procSaveNetworkInfo,TQ_SIGNAL(processExited()),this,TQ_SLOT(listIfacesSlot())); processRunning = true; - connect( procSaveNetworkInfo, TQT_SIGNAL(processExited()), this, TQT_SLOT(processExitedSlot()) ); + connect( procSaveNetworkInfo, TQ_SIGNAL(processExited()), this, TQ_SLOT(processExitedSlot()) ); if ( !procSaveNetworkInfo->start() ) { @@ -822,7 +822,7 @@ void KNetworkConfigParser::readNetworkInfo() //user a dialog with all the supported platforms to choose. if (xmlErr.contains("platform_unsup::")) { - connect( this, TQT_SIGNAL(readyLoadingSupportedPlatforms()), this, TQT_SLOT(showSupportedPlatformsDialogSlot()) ); + connect( this, TQ_SIGNAL(readyLoadingSupportedPlatforms()), this, TQ_SLOT(showSupportedPlatformsDialogSlot()) ); loadSupportedPlatforms(); emit errorDetectingPlatform(); } @@ -1004,10 +1004,10 @@ void KNetworkConfigParser::loadSupportedPlatforms(){ procDetect->addArgument( locate("data",BACKEND_PATH) ); procDetect->addArgument( "-d" ); procDetect->addArgument( "platforms" ); - connect( procDetect, TQT_SIGNAL(processExited()), this, TQT_SLOT(readSupportedPlatformsSlot()) ); + connect( procDetect, TQ_SIGNAL(processExited()), this, TQ_SLOT(readSupportedPlatformsSlot()) ); xmlOuput = ""; - connect( procDetect, TQT_SIGNAL(readyReadStdout()),this, TQT_SLOT(concatXMLOutputSlot())); -// connect( procDetect, TQT_SIGNAL(readyReadStderr()),this, TQT_SLOT(readXMLErrSlot())); + connect( procDetect, TQ_SIGNAL(readyReadStdout()),this, TQ_SLOT(concatXMLOutputSlot())); +// connect( procDetect, TQ_SIGNAL(readyReadStderr()),this, TQ_SLOT(readXMLErrSlot())); if ( !procDetect->start() ) { diff --git a/knetworkconf/knetworkconf/knetworkconfigparser.h b/knetworkconf/knetworkconf/knetworkconfigparser.h index 461241d..e8b65d9 100644 --- a/knetworkconf/knetworkconf/knetworkconfigparser.h +++ b/knetworkconf/knetworkconf/knetworkconfigparser.h @@ -58,7 +58,7 @@ */ class KNetworkConfigParser : public TQObject { - Q_OBJECT + TQ_OBJECT public: KNetworkConfigParser(); diff --git a/knetworkconf/knetworkconf/knetworkconfmodule.cpp b/knetworkconf/knetworkconf/knetworkconfmodule.cpp index 774bde0..4e3d520 100644 --- a/knetworkconf/knetworkconf/knetworkconfmodule.cpp +++ b/knetworkconf/knetworkconf/knetworkconfmodule.cpp @@ -39,7 +39,7 @@ KNetworkConfModule::KNetworkConfModule(TQWidget* parent, const char *name/*, TQS conf->setReadOnly(true); } - connect(conf,TQT_SIGNAL(networkStateChanged(bool)),TQT_SLOT(configChanged(bool))); + connect(conf,TQ_SIGNAL(networkStateChanged(bool)),TQ_SLOT(configChanged(bool))); setButtons(TDECModule::Apply|TDECModule::Help); } diff --git a/knetworkconf/knetworkconf/knetworkconfmodule.h b/knetworkconf/knetworkconf/knetworkconfmodule.h index 772a65e..ac5f3ff 100644 --- a/knetworkconf/knetworkconf/knetworkconfmodule.h +++ b/knetworkconf/knetworkconf/knetworkconfmodule.h @@ -24,7 +24,7 @@ class KNetworkConfModule : public TDECModule { - Q_OBJECT + TQ_OBJECT public: diff --git a/knetworkconf/knetworkconf/kreloadnetworkdlg.ui b/knetworkconf/knetworkconf/kreloadnetworkdlg.ui index acef30e..0bf26aa 100644 --- a/knetworkconf/knetworkconf/kreloadnetworkdlg.ui +++ b/knetworkconf/knetworkconf/kreloadnetworkdlg.ui @@ -72,9 +72,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="autoResize"> - <bool>true</bool> - </property> </widget> <widget class="TQLabel"> <property name="name"> diff --git a/knetworkconf/knetworkconf/main.cpp b/knetworkconf/knetworkconf/main.cpp index 8411d76..ec5c4f4 100644 --- a/knetworkconf/knetworkconf/main.cpp +++ b/knetworkconf/knetworkconf/main.cpp @@ -40,7 +40,7 @@ K_EXPORT_COMPONENT_FACTORY( knetworkconfmodule, KDEDFactory( "kcm_knetworkconfmo extern "C" { - KDE_EXPORT TDECModule *create_knetworkconfmodule(TQWidget *parent, const char *name) + TDE_EXPORT TDECModule *create_knetworkconfmodule(TQWidget *parent, const char *name) { TDEGlobal::locale()->insertCatalogue("knetworkconf"); return new KNetworkConfModule(parent, name); diff --git a/knetworkconf/knetworkconf/tdeselectdistrodlg.ui b/knetworkconf/knetworkconf/tdeselectdistrodlg.ui index daa59b3..ebec1cf 100644 --- a/knetworkconf/knetworkconf/tdeselectdistrodlg.ui +++ b/knetworkconf/knetworkconf/tdeselectdistrodlg.ui @@ -37,9 +37,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -54,9 +51,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -129,9 +123,9 @@ <slot>accept()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>exitSlot()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> |