diff --git a/KMFSysTray/app.cpp b/KMFSysTray/app.cpp index 1e3d906..334a5e8 100644 --- a/KMFSysTray/app.cpp +++ b/KMFSysTray/app.cpp @@ -42,7 +42,7 @@ MainApp::MainApp() : KApplication() { // KConfig *ksConfig = config(); // KMFIPTWatcher *watch = new KMFIPTWatcher( this, "KMFIPTWatcher" ); // MainWidget *mainWid = new MainWidget( 0 ); -// connect( watch, TQT_SIGNAL( sigUpdateActive( bool ) ), mainWid, TQT_SLOT( slotSetRunningtqStatus( bool ) ) ); +// connect( watch, TQT_SIGNAL( sigUpdateActive( bool ) ), mainWid, TQT_SLOT( slotSetRunningStatus( bool ) ) ); // connect( watch, TQT_SIGNAL( sigUpdateRuleCount( const TQString&, const TQString&, int ) ), // mainWid, TQT_SIGNAL( sigUpdateRuleCount( const TQString&, const TQString&, int ) ) ); diff --git a/KMFSysTray/details_designer.ui b/KMFSysTray/details_designer.ui index a221336..dba4021 100644 --- a/KMFSysTray/details_designer.ui +++ b/KMFSysTray/details_designer.ui @@ -458,7 +458,7 @@ Expanding - + 51 20 diff --git a/KMFSysTray/kmfsystray.cpp b/KMFSysTray/kmfsystray.cpp index 28454d7..c8f214b 100644 --- a/KMFSysTray/kmfsystray.cpp +++ b/KMFSysTray/kmfsystray.cpp @@ -54,7 +54,7 @@ KMFSysTray::KMFSysTray( TQWidget* w ) : KSystemTray ( w ) , DCOPObject( "KMFSys setPixmap( baseIcon ); // Connect the watch deamon - connect( watch, TQT_SIGNAL( sigUpdateActive( bool ) ), this, TQT_SLOT( slotSetRunningtqStatus( bool ) ) ); + connect( watch, TQT_SIGNAL( sigUpdateActive( bool ) ), this, TQT_SLOT( slotSetRunningStatus( bool ) ) ); connect( watch, TQT_SIGNAL( sigUpdateRuleCount( const TQString&, const TQString&, int ) ), this, TQT_SIGNAL( sigUpdateRuleCount( const TQString&, const TQString&, int ) ) ); @@ -86,7 +86,7 @@ void KMFSysTray::initMenu() { } -void KMFSysTray::slotSetRunningtqStatus( bool on ) { +void KMFSysTray::slotSetRunningStatus( bool on ) { if ( on ) { baseIcon = KSystemTray::loadIcon( "kmyfirewall" ); } else { diff --git a/KMFSysTray/kmfsystray.h b/KMFSysTray/kmfsystray.h index e9b6f92..7130a8e 100644 --- a/KMFSysTray/kmfsystray.h +++ b/KMFSysTray/kmfsystray.h @@ -54,7 +54,7 @@ public: virtual void preferences(); public slots: - void slotSetRunningtqStatus( bool on ); + void slotSetRunningStatus( bool on ); void slotLaunchKMF(); void slotShowDetails(); void slotQueryDetails(); diff --git a/KMFSysTray/mainwidget.cpp b/KMFSysTray/mainwidget.cpp index f3f214f..14387f5 100644 --- a/KMFSysTray/mainwidget.cpp +++ b/KMFSysTray/mainwidget.cpp @@ -49,7 +49,7 @@ MainWidget::~MainWidget() { } -void MainWidget::slotSetRunningtqStatus( bool on ) { +void MainWidget::slotSetRunningStatus( bool on ) { m_ledActive->on(); m_cmd_info->setEnabled( on ); if ( on ) { diff --git a/KMFSysTray/mainwidget.h b/KMFSysTray/mainwidget.h index 1e9b371..92329ef 100644 --- a/KMFSysTray/mainwidget.h +++ b/KMFSysTray/mainwidget.h @@ -37,7 +37,7 @@ public: /*$PUBLIC_FUNCTIONS$*/ public slots: - void slotSetRunningtqStatus( bool ); + void slotSetRunningStatus( bool ); void slotDetailsClosed(); protected: diff --git a/KMFSysTray/mainwidget_designer.ui b/KMFSysTray/mainwidget_designer.ui index 06cd24c..211372f 100644 --- a/KMFSysTray/mainwidget_designer.ui +++ b/KMFSysTray/mainwidget_designer.ui @@ -37,13 +37,13 @@ 0 - + 30 30 - + 30 30 diff --git a/kmyfirewall/core/kmfapp.cpp b/kmyfirewall/core/kmfapp.cpp index f94931a..d484069 100644 --- a/kmyfirewall/core/kmfapp.cpp +++ b/kmyfirewall/core/kmfapp.cpp @@ -73,7 +73,7 @@ void showSplash() { splash->setFrameStyle( TQFrame::WinPanel | TQFrame::Raised ); splash->setPixmap( pic ); splash->adjustSize(); - splash->setFixedSize( splash->tqsizeHint() ); + splash->setFixedSize( splash->sizeHint() ); splash->move( screen.center() - TQPoint( splash->width() / 2, splash->height() / 2 ) ); splash->tqrepaint( FALSE ); splash->show(); diff --git a/kmyfirewall/core/kmfplugin.cpp b/kmyfirewall/core/kmfplugin.cpp index 1780bf4..1a9bcfc 100644 --- a/kmyfirewall/core/kmfplugin.cpp +++ b/kmyfirewall/core/kmfplugin.cpp @@ -85,8 +85,8 @@ void KMFPlugin::showOutput() { KMyFirewallInterface::instance()->showOutput(); } -void KMFPlugin::checktqStatus() { - KMyFirewallInterface::instance()->checktqStatus(); +void KMFPlugin::checkStatus() { + KMyFirewallInterface::instance()->checkStatus(); } } diff --git a/kmyfirewall/core/kmfplugin.h b/kmyfirewall/core/kmfplugin.h index ac2e74a..c689246 100644 --- a/kmyfirewall/core/kmfplugin.h +++ b/kmyfirewall/core/kmfplugin.h @@ -42,7 +42,7 @@ public: void setOutputWidget( TQWidget* wid ); void showEditor(); void showOutput(); - void checktqStatus(); + void checkStatus(); protected: KMFRulesetDoc* rulesetDoc(); diff --git a/kmyfirewall/core/kmyfirewallinterface.h b/kmyfirewall/core/kmyfirewallinterface.h index 1aa2773..2cd091e 100644 --- a/kmyfirewall/core/kmyfirewallinterface.h +++ b/kmyfirewall/core/kmyfirewallinterface.h @@ -47,7 +47,7 @@ public: virtual void showEditor() = 0; virtual void showOutput() = 0; virtual void setOutputWidget( TQWidget* wid ) = 0; - virtual void checktqStatus() = 0; + virtual void checkStatus() = 0; virtual void updateCaption() = 0; virtual void enableUndo( bool ) = 0; virtual void enableRedo( bool ) = 0; diff --git a/kmyfirewall/core/kprocesswrapper.cpp b/kmyfirewall/core/kprocesswrapper.cpp index 104b398..7843e2b 100644 --- a/kmyfirewall/core/kprocesswrapper.cpp +++ b/kmyfirewall/core/kprocesswrapper.cpp @@ -187,7 +187,7 @@ void KProcessWrapper::slotReceivedOutput( KProcess *, char *buffer, int buflen ) *m_stderrbuf = ""; } - *m_stdoutbuf += TQString::tqfromLatin1( buffer, buflen ); + *m_stdoutbuf += TQString::fromLatin1( buffer, buflen ); m_allOut.append( *m_stdoutbuf ); m_stdOut.append( *m_stdoutbuf ); @@ -214,7 +214,7 @@ void KProcessWrapper::slotReceivedError( KProcess *, char *buffer, int buflen ) *m_stdoutbuf = ""; } - *m_stderrbuf += TQString::tqfromLatin1( buffer, buflen ); + *m_stderrbuf += TQString::fromLatin1( buffer, buflen ); m_allOut.append( *m_stderrbuf ); m_stdErr.append( *m_stderrbuf ); *m_stderrbuf = ""; diff --git a/kmyfirewall/genericinterface/kmyfirewallgenericinterfaceicmp.ui b/kmyfirewall/genericinterface/kmyfirewallgenericinterfaceicmp.ui index 5906c0e..3ac49c8 100644 --- a/kmyfirewall/genericinterface/kmyfirewallgenericinterfaceicmp.ui +++ b/kmyfirewall/genericinterface/kmyfirewallgenericinterfaceicmp.ui @@ -35,7 +35,7 @@ Preferred - + 20 80 @@ -69,7 +69,7 @@ Preferred - + 401 20 @@ -131,7 +131,7 @@ A DoS attack is mostly performed by a lot of hosts connecting to the victim host Preferred - + 381 20 diff --git a/kmyfirewall/genericinterface/kmyfirewallgenericinterfacelogging.ui b/kmyfirewall/genericinterface/kmyfirewallgenericinterfacelogging.ui index d73f627..7f43102 100644 --- a/kmyfirewall/genericinterface/kmyfirewallgenericinterfacelogging.ui +++ b/kmyfirewall/genericinterface/kmyfirewallgenericinterfacelogging.ui @@ -35,7 +35,7 @@ Preferred - + 20 81 @@ -89,7 +89,7 @@ The entries are written to the system's main log file Preferred - + 381 20 diff --git a/kmyfirewall/installer/kmfinstallerplugin.cpp b/kmyfirewall/installer/kmfinstallerplugin.cpp index a6a69ee..4e05c92 100644 --- a/kmyfirewall/installer/kmfinstallerplugin.cpp +++ b/kmyfirewall/installer/kmfinstallerplugin.cpp @@ -187,7 +187,7 @@ void KMFInstallerPlugin::generateInstallerPackage( KMFTarget* tg ) { return; if ( KIO::NetAccess::exists( url, false, KApplication::kApplication()->mainWidget() ) ) { - TQDateTime now = TQDateTime::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); TQString backUp; backUp.append( url.url() ); diff --git a/kmyfirewall/installer/linux/kmfiptinstaller.cpp b/kmyfirewall/installer/linux/kmfiptinstaller.cpp index c84dd52..80912b6 100644 --- a/kmyfirewall/installer/linux/kmfiptinstaller.cpp +++ b/kmyfirewall/installer/linux/kmfiptinstaller.cpp @@ -209,7 +209,7 @@ void KMFIPTInstaller::cmdRunFW() { setOutputWidget( execWidget() ); execWidget()->runCmd( cmd, Constants::StartFirewallJob_Name, i18n("Start Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ), true ); showOutput(); - checktqStatus(); + checkStatus(); } else { if( KMessageBox::questionYesNo ( 0 , i18n( "

Are you sure you want to execute the generated firewall script on %1?" "

A wrongly configured firewall script may make your computer unusable! PLease make sure that you have left the SSH port open, otherwise you will no longer be able to remote control the comuter using KMyFirewall or any other SSH client!

" @@ -257,7 +257,7 @@ void KMFIPTInstaller::cmdRunFW() { setOutputWidget( execWidget() ); execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Start Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) ); showOutput(); - checktqStatus(); + checkStatus(); } } @@ -285,7 +285,7 @@ void KMFIPTInstaller::cmdStopFW() { setOutputWidget( execWidget() ); execWidget()->runCmd( cmd, Constants::StopFirewallJob_Name, i18n("Stop Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ), true ); showOutput(); - checktqStatus(); + checkStatus(); } else { setOutputWidget( execWidget() ); @@ -305,7 +305,7 @@ void KMFIPTInstaller::cmdStopFW() { setOutputWidget( execWidget() ); execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Stop Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) ); showOutput(); - checktqStatus(); + checkStatus(); } } @@ -426,7 +426,7 @@ void KMFIPTInstaller::cmdInstallFW() { setOutputWidget( execWidget() ); execWidget()->runCmd( cmd, Constants::InstallFirewallJob_Name, i18n("Install Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ), true ); showOutput(); - checktqStatus(); + checkStatus(); } else { setOutputWidget( execWidget() ); execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) ); @@ -445,7 +445,7 @@ void KMFIPTInstaller::cmdInstallFW() { setOutputWidget( execWidget() ); execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Install Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) ); showOutput(); - checktqStatus(); + checkStatus(); } } @@ -521,7 +521,7 @@ void KMFIPTInstaller::cmdUninstallFW() { setOutputWidget( execWidget() ); execWidget()->runCmd( cmd, Constants::UninstallFirewallJob_Name, i18n("Uninstall Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ), true ); showOutput(); - checktqStatus(); + checkStatus(); } else { setOutputWidget( execWidget() ); @@ -541,7 +541,7 @@ void KMFIPTInstaller::cmdUninstallFW() { setOutputWidget( execWidget() ); execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Uninstall Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) ); showOutput(); - checktqStatus(); + checkStatus(); } @@ -871,7 +871,7 @@ void KMFIPTInstaller::generateInstallerPackage( KMFTarget* tg ) { return; if ( KIO::NetAccess::exists( url, false, KApplication::kApplication()->mainWidget() ) ) { - TQDateTime now = TQDateTime::tqcurrentDateTime(); + TQDateTime now = TQDateTime::currentDateTime(); TQString backUp; backUp.append( url.url() ); diff --git a/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp b/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp index 6223c9b..88ccbc8 100644 --- a/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp +++ b/kmyfirewall/installer/openbsd/kmfpfinstaller.cpp @@ -220,7 +220,7 @@ void KMFPFInstaller::cmdRunFW() { // setOutputWidget( execWidget() ); // execWidget()->runCmd( cmd, Constants::StartFirewallJob_Name, i18n("Start Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ), true ); // showOutput(); -// checktqStatus(); +// checkStatus(); // } else { // if( KMessageBox::questionYesNo ( 0 , i18n( "

Are you sure you want to execute the generated firewall script on %1?" // "

A wrongly configured firewall script may make your computer unusable! PLease make sure that you have left the SSH port open, otherwise you will no longer be able to remote control the comuter using KMyFirewall or any other SSH client!

" @@ -268,7 +268,7 @@ void KMFPFInstaller::cmdRunFW() { // setOutputWidget( execWidget() ); // execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Start Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) ); // showOutput(); -// checktqStatus(); +// checkStatus(); // } // } @@ -296,7 +296,7 @@ void KMFPFInstaller::cmdStopFW() { // setOutputWidget( execWidget() ); // execWidget()->runCmd( cmd, Constants::StopFirewallJob_Name, i18n("Stop Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ), true ); // showOutput(); -// checktqStatus(); +// checkStatus(); // // } else { // setOutputWidget( execWidget() ); @@ -316,7 +316,7 @@ void KMFPFInstaller::cmdStopFW() { // setOutputWidget( execWidget() ); // execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Stop Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) ); // showOutput(); -// checktqStatus(); +// checkStatus(); // } } @@ -439,7 +439,7 @@ void KMFPFInstaller::cmdInstallFW() { // setOutputWidget( execWidget() ); // execWidget()->runCmd( cmd, Constants::InstallFirewallJob_Name, i18n("Install Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ), true ); // showOutput(); -// checktqStatus(); +// checkStatus(); // } else { // setOutputWidget( execWidget() ); // execWidget()->setText( i18n("Please wait while the scripts are uploaded and executed..."), i18n("Install Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) ); @@ -458,7 +458,7 @@ void KMFPFInstaller::cmdInstallFW() { // setOutputWidget( execWidget() ); // execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Install Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) ); // showOutput(); -// checktqStatus(); +// checkStatus(); // } // } @@ -534,7 +534,7 @@ void KMFPFInstaller::cmdUninstallFW() { // setOutputWidget( execWidget() ); // execWidget()->runCmd( cmd, Constants::UninstallFirewallJob_Name, i18n("Uninstall Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ), true ); // showOutput(); -// checktqStatus(); +// checkStatus(); // // } else { // setOutputWidget( execWidget() ); @@ -554,7 +554,7 @@ void KMFPFInstaller::cmdUninstallFW() { // setOutputWidget( execWidget() ); // execWidget()->setText( KProcessWrapper::instance()->stdOut(), i18n("Uninstall Firewall on %1").tqarg( rulesetDoc()->target()->toFriendlyString() ) ); // showOutput(); -// checktqStatus(); +// checkStatus(); // } // // @@ -829,7 +829,7 @@ void KMFPFInstaller::cmdUninstallFW() { // return; // // if ( KIO::NetAccess::exists( url, false, KApplication::kApplication()->mainWidget() ) ) { -// TQDateTime now = TQDateTime::tqcurrentDateTime(); +// TQDateTime now = TQDateTime::currentDateTime(); // // TQString backUp; // backUp.append( url.url() ); diff --git a/kmyfirewall/ipteditor/kmyfirewallchaineditor.ui b/kmyfirewall/ipteditor/kmyfirewallchaineditor.ui index 2f5f011..e453dc4 100644 --- a/kmyfirewall/ipteditor/kmyfirewallchaineditor.ui +++ b/kmyfirewall/ipteditor/kmyfirewallchaineditor.ui @@ -288,7 +288,7 @@ Expanding - + 110 20 @@ -324,7 +324,7 @@ Expanding - + 110 20 diff --git a/kmyfirewall/ipteditor/kmyfirewallchaineditornewchain.ui b/kmyfirewall/ipteditor/kmyfirewallchaineditornewchain.ui index 5c6cf0d..8342b98 100644 --- a/kmyfirewall/ipteditor/kmyfirewallchaineditornewchain.ui +++ b/kmyfirewall/ipteditor/kmyfirewallchaineditornewchain.ui @@ -206,7 +206,7 @@ Expanding - + 79 0 @@ -233,7 +233,7 @@ Preferred - + 16 16 diff --git a/kmyfirewall/ipteditor/kmyfirewallruleeditor.ui b/kmyfirewall/ipteditor/kmyfirewallruleeditor.ui index 05b62f9..8165f25 100644 --- a/kmyfirewall/ipteditor/kmyfirewallruleeditor.ui +++ b/kmyfirewall/ipteditor/kmyfirewallruleeditor.ui @@ -186,13 +186,13 @@ m_led_modules - + 16 16 - + 16 16 @@ -228,13 +228,13 @@ m_led_rp - + 16 16 - + 16 16 @@ -254,13 +254,13 @@ m_led_fwd - + 16 16 - + 16 16 @@ -288,13 +288,13 @@ 0 - + 16 16 - + 16 16 @@ -314,13 +314,13 @@ m_led_syn - + 16 16 - + 16 16 diff --git a/kmyfirewall/kmfwidgets/kmfchecklistoutput.cpp b/kmyfirewall/kmfwidgets/kmfchecklistoutput.cpp index 8395a1a..4f1d7c7 100644 --- a/kmyfirewall/kmfwidgets/kmfchecklistoutput.cpp +++ b/kmyfirewall/kmfwidgets/kmfchecklistoutput.cpp @@ -67,7 +67,7 @@ void KMFCheckListOutput::appendLine( const TQString &txt ) { kdDebug() << "void KMFCheckListOutput::appendLine(TQString txt)" << endl; } -void KMFCheckListOutput::settqStatus( bool ok, const TQString &err_msg ) { +void KMFCheckListOutput::setStatus( bool ok, const TQString &err_msg ) { kdDebug() << "void KMFCheckListOutput::setStatus(bool ok,TQString &err_msg)" << endl; if ( ok ) { m_currItem->setPixmap( 1, icon_ok ); diff --git a/kmyfirewall/kmfwidgets/kmfchecklistoutput.h b/kmyfirewall/kmfwidgets/kmfchecklistoutput.h index cfe72f8..79ec49e 100644 --- a/kmyfirewall/kmfwidgets/kmfchecklistoutput.h +++ b/kmyfirewall/kmfwidgets/kmfchecklistoutput.h @@ -42,9 +42,9 @@ public: void appendLine( const TQString &txt ); /** - Sets the tqStatus of the last created ListItem + Sets the Status of the last created ListItem */ - void settqStatus( bool ok, const TQString &err_msg ); + void setStatus( bool ok, const TQString &err_msg ); void clearList(); diff --git a/kmyfirewall/kmfwidgets/kmfhostwidget.cpp b/kmyfirewall/kmfwidgets/kmfhostwidget.cpp index fb99875..e572e34 100644 --- a/kmyfirewall/kmfwidgets/kmfhostwidget.cpp +++ b/kmyfirewall/kmfwidgets/kmfhostwidget.cpp @@ -135,15 +135,15 @@ void KMFHostWidget::updateView() { m_cb_os->blockSignals( true ); m_host_desc->blockSignals( true ); m_cmd_testSSH->blockSignals( true ); - m_led_configtqStatus->off(); + m_led_configStatus->off(); if ( m_target ) { - m_led_configtqStatus->on(); + m_led_configStatus->on(); if ( m_target->config()->isValid() ) { - m_led_configtqStatus->setColor( TQt::green ); - m_lbl_configtqStatus->setText( i18n( "Config Ok" ) ); + m_led_configStatus->setColor( TQt::green ); + m_lbl_configStatus->setText( i18n( "Config Ok" ) ); } else { - m_led_configtqStatus->setColor( TQt::red ); - m_lbl_configtqStatus->setText( i18n( "Invalid Config!" ) ); + m_led_configStatus->setColor( TQt::red ); + m_lbl_configStatus->setText( i18n( "Invalid Config!" ) ); } diff --git a/kmyfirewall/kmfwidgets/kmflistview.cpp b/kmyfirewall/kmfwidgets/kmflistview.cpp index f29f88a..e263fc2 100644 --- a/kmyfirewall/kmfwidgets/kmflistview.cpp +++ b/kmyfirewall/kmfwidgets/kmflistview.cpp @@ -54,7 +54,7 @@ KMFListView::KMFListView( TQWidget *parent, const char *name ) : KListView( pare addColumn( i18n( "Rule No." ) ); addColumn( TQString() ); addColumn( i18n( "Value" ) ); - tqsetSizePolicy( TQSizePolicy( ( TQSizePolicy::SizeType ) 2, ( TQSizePolicy::SizeType ) 2, 0, 0, + setSizePolicy( TQSizePolicy( ( TQSizePolicy::SizeType ) 2, ( TQSizePolicy::SizeType ) 2, 0, 0, sizePolicy().hasHeightForWidth() ) ); setFrameShape( KListView::StyledPanel ); setFrameShadow( KListView::Sunken ); diff --git a/kmyfirewall/kmfwidgets/kmfprocout.cpp b/kmyfirewall/kmfwidgets/kmfprocout.cpp index 46635a2..cf83a69 100644 --- a/kmyfirewall/kmfwidgets/kmfprocout.cpp +++ b/kmyfirewall/kmfwidgets/kmfprocout.cpp @@ -126,7 +126,7 @@ void KMFProcOut::slotReceivedOutput( KProcess *, char *buffer, int buflen ) { stderrbuf = new TQString( "" ); } - *stdoutbuf += TQString::tqfromLatin1( buffer, buflen ); + *stdoutbuf += TQString::fromLatin1( buffer, buflen ); int pos; while ( ( pos = stdoutbuf->find( '\n' ) ) != -1 ) { TQString line = stdoutbuf->left( pos ); @@ -143,7 +143,7 @@ void KMFProcOut::slotReceivedError( KProcess *, char *buffer, int buflen ) { stdoutbuf = new TQString( "" ); } - *stderrbuf += TQString::tqfromLatin1( buffer, buflen ); + *stderrbuf += TQString::fromLatin1( buffer, buflen ); int pos; while ( ( pos = stderrbuf->find( '\n' ) ) != -1 ) { TQString line = stderrbuf->left( pos ); diff --git a/kmyfirewall/kmfwidgets/kmyfirewalldocumentinfo.ui b/kmyfirewall/kmfwidgets/kmyfirewalldocumentinfo.ui index d4c54da..8d1b331 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewalldocumentinfo.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewalldocumentinfo.ui @@ -113,7 +113,7 @@ Expanding - + 300 20 diff --git a/kmyfirewall/kmfwidgets/kmyfirewallgenericinterfaceeditprotocolwidget.ui b/kmyfirewall/kmfwidgets/kmyfirewallgenericinterfaceeditprotocolwidget.ui index 3e6f069..24e2971 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewallgenericinterfaceeditprotocolwidget.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewallgenericinterfaceeditprotocolwidget.ui @@ -204,7 +204,7 @@ This required if you like to use a protocol not directely suppotred by KMyFirewa m_lb_tcpPorts - + 0 80 @@ -215,7 +215,7 @@ This required if you like to use a protocol not directely suppotred by KMyFirewa m_te_desc - + 32767 150 diff --git a/kmyfirewall/kmfwidgets/kmyfirewallhostwidget.ui b/kmyfirewall/kmfwidgets/kmyfirewallhostwidget.ui index 9cf1608..5c55952 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewallhostwidget.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewallhostwidget.ui @@ -320,7 +320,7 @@ Expanding - + 20 71 @@ -329,7 +329,7 @@ - m_lbl_configtqStatus + m_lbl_configStatus @@ -372,7 +372,7 @@ Expanding - + 241 20 @@ -381,7 +381,7 @@ - m_led_configtqStatus + m_led_configStatus diff --git a/kmyfirewall/kmfwidgets/kmyfirewallinterfacewidget.ui b/kmyfirewall/kmfwidgets/kmyfirewallinterfacewidget.ui index 274413d..a374a79 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewallinterfacewidget.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewallinterfacewidget.ui @@ -56,7 +56,7 @@ Expanding - + 20 41 diff --git a/kmyfirewall/kmfwidgets/kmyfirewalliptdocoptions.ui b/kmyfirewall/kmfwidgets/kmyfirewalliptdocoptions.ui index b1454cf..035bfaa 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewalliptdocoptions.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewalliptdocoptions.ui @@ -23,13 +23,13 @@ TextLabel7 - + 0 40 - + 32767 40 @@ -171,7 +171,7 @@ Expanding - + 51 0 @@ -199,7 +199,7 @@ Expanding - + 21 0 diff --git a/kmyfirewall/kmfwidgets/kmyfirewallnetworkwidget.ui b/kmyfirewall/kmfwidgets/kmyfirewallnetworkwidget.ui index 43e3800..163ff1f 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewallnetworkwidget.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewallnetworkwidget.ui @@ -228,7 +228,7 @@ Expanding - + 19 2 @@ -286,7 +286,7 @@ Expanding - + 20 45 diff --git a/kmyfirewall/kmfwidgets/kmyfirewallnewdocument.ui b/kmyfirewall/kmfwidgets/kmyfirewallnewdocument.ui index 0797cf9..04268f2 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewallnewdocument.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewallnewdocument.ui @@ -12,13 +12,13 @@ 330 - + 580 330 - + 580 330 @@ -145,7 +145,7 @@ 0 - + 25 25 @@ -204,7 +204,7 @@ Minimum - + 20 50 @@ -320,7 +320,7 @@ Minimum - + 20 20 diff --git a/kmyfirewall/kmfwidgets/kmyfirewallobjectinfo.ui b/kmyfirewall/kmfwidgets/kmyfirewallobjectinfo.ui index 5bae513..5915913 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewallobjectinfo.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewallobjectinfo.ui @@ -23,13 +23,13 @@ m_header - + 0 40 - + 32767 40 @@ -93,7 +93,7 @@ Expanding - + 21 20 @@ -118,7 +118,7 @@ Expanding - + 21 20 diff --git a/kmyfirewall/kmfwidgets/kmyfirewallprotocollistview.ui b/kmyfirewall/kmfwidgets/kmyfirewallprotocollistview.ui index f2f2f60..c9299c2 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewallprotocollistview.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewallprotocollistview.ui @@ -48,7 +48,7 @@ 1 - + 150 0 diff --git a/kmyfirewall/kmfwidgets/kmyfirewallselectactivetarget.ui b/kmyfirewall/kmfwidgets/kmyfirewallselectactivetarget.ui index 5e97ca8..285c8f9 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewallselectactivetarget.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewallselectactivetarget.ui @@ -29,7 +29,7 @@ Preferred - + 339 20 @@ -87,7 +87,7 @@ Preferred - + 178 20 diff --git a/kmyfirewall/kmfwidgets/kmyfirewallselectinterface.ui b/kmyfirewall/kmfwidgets/kmyfirewallselectinterface.ui index 4bee50a..645d918 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewallselectinterface.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewallselectinterface.ui @@ -67,13 +67,13 @@ m_pic_screenshot - + 400 300 - + 400 300 @@ -179,7 +179,7 @@ Expanding - + 101 20 @@ -244,7 +244,7 @@ 0 - + 25 25 @@ -283,7 +283,7 @@ Expanding - + 0 0 @@ -304,7 +304,7 @@ Expanding - + 0 0 diff --git a/kmyfirewall/kmfwidgets/kmyfirewallsystemsettingslinux.ui b/kmyfirewall/kmfwidgets/kmyfirewallsystemsettingslinux.ui index 399fc82..b65c8f9 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewallsystemsettingslinux.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewallsystemsettingslinux.ui @@ -157,7 +157,7 @@ Preferred - + 20 51 @@ -174,7 +174,7 @@ Expanding - + 20 41 diff --git a/kmyfirewall/kmfwidgets/kmyfirewalltemplatechooser.ui b/kmyfirewall/kmfwidgets/kmyfirewalltemplatechooser.ui index 54660bd..7a9239c 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewalltemplatechooser.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewalltemplatechooser.ui @@ -12,7 +12,7 @@ 401 - + 580 400 @@ -131,7 +131,7 @@ Expanding - + 20 20 @@ -321,13 +321,13 @@ 0 - + 25 25 - + 25 25 @@ -366,7 +366,7 @@ Preferred - + 20 31 diff --git a/kmyfirewall/kmfwidgets/kmyfirewalltransactionlog.ui b/kmyfirewall/kmfwidgets/kmyfirewalltransactionlog.ui index 6180bf8..d85d639 100644 --- a/kmyfirewall/kmfwidgets/kmyfirewalltransactionlog.ui +++ b/kmyfirewall/kmfwidgets/kmyfirewalltransactionlog.ui @@ -189,7 +189,7 @@ Expanding - + 225 20 @@ -262,7 +262,7 @@ Expanding - + 201 20 diff --git a/kmyfirewall/kmyfirewall.cpp b/kmyfirewall/kmyfirewall.cpp index d39d4b3..cc8f8cd 100644 --- a/kmyfirewall/kmyfirewall.cpp +++ b/kmyfirewall/kmyfirewall.cpp @@ -152,7 +152,7 @@ KMyFirewall::KMyFirewall( TQWidget* parent, const char *name ) : KMFMainWindow( setActiveWindow(); // Make sure this window gets keyboard focus raise(); // Make sure the window is now on top of other windows statusBar() ->changeItem( "Ready", 0 ); - checktqStatus(); + checkStatus(); } else { close(); // User indicated an abort is needed, so close the main window } @@ -883,7 +883,7 @@ KMFError* KMyFirewall::parseDocument( const KURL& url ) { toggleActions( true ); actionSave->setEnabled( true ); - checktqStatus(); + checkStatus(); updateCaption(); m_err->setErrType( KMFError::OK ); const TQString msg = ""; @@ -906,7 +906,7 @@ void KMyFirewall::slotRestoreSession() { worked = false; } - checktqStatus(); + checkStatus(); if ( ! worked ) { KMFConfig::setCurrentConfiguration( "" ); } @@ -932,7 +932,7 @@ void KMyFirewall::slotLoadEmptyRuleset() { // slotLoadDocument( network() ); toggleActions( true ); actionSave->setEnabled( true ); - checktqStatus(); + checkStatus(); toggleActions( true ); // m_configDlg->slotAutoConf(); @@ -1002,10 +1002,10 @@ void KMyFirewall::slotConfigureKMF() { m_configDlg->exec(); } -//################ Check tqStatus #############// +//################ Check Status #############// // FIXME: Implement iptables active check -void KMyFirewall::checktqStatus() { +void KMyFirewall::checkStatus() { kdDebug() << "checkStatus()" << endl; bool isInstalled = false; diff --git a/kmyfirewall/kmyfirewall.h b/kmyfirewall/kmyfirewall.h index c09b6dc..362a2dc 100644 --- a/kmyfirewall/kmyfirewall.h +++ b/kmyfirewall/kmyfirewall.h @@ -77,7 +77,7 @@ public: virtual void showEditor(); virtual void showOutput(); virtual void setOutputWidget( TQWidget* ); - virtual void checktqStatus(); + virtual void checkStatus(); virtual void updateCaption(); public slots: // Public slots diff --git a/kmyfirewall/ruleoptionplugins/custom_option/kmyfirewallruleeditorcustomrule.ui b/kmyfirewall/ruleoptionplugins/custom_option/kmyfirewallruleeditorcustomrule.ui index dd225ea..ce363cd 100644 --- a/kmyfirewall/ruleoptionplugins/custom_option/kmyfirewallruleeditorcustomrule.ui +++ b/kmyfirewall/ruleoptionplugins/custom_option/kmyfirewallruleeditorcustomrule.ui @@ -34,13 +34,13 @@ 0 - + 0 40 - + 32767 40 @@ -266,7 +266,7 @@ Expanding - + 80 20 @@ -291,7 +291,7 @@ Expanding - + 141 20 diff --git a/kmyfirewall/ruleoptionplugins/interface_option/kmyfirewallruleeditorinterface.ui b/kmyfirewall/ruleoptionplugins/interface_option/kmyfirewallruleeditorinterface.ui index 1270ef6..4cd62f4 100644 --- a/kmyfirewall/ruleoptionplugins/interface_option/kmyfirewallruleeditorinterface.ui +++ b/kmyfirewall/ruleoptionplugins/interface_option/kmyfirewallruleeditorinterface.ui @@ -29,13 +29,13 @@ TextLabel1 - + 0 40 - + 32767 40 @@ -185,7 +185,7 @@ Expanding - + 20 0 @@ -283,7 +283,7 @@ Expanding - + 20 0 @@ -337,7 +337,7 @@ Expanding - + 80 20 @@ -362,7 +362,7 @@ Expanding - + 130 20 diff --git a/kmyfirewall/ruleoptionplugins/ip_option/kmyfirewallruleeditorip.ui b/kmyfirewall/ruleoptionplugins/ip_option/kmyfirewallruleeditorip.ui index 49096b8..2ad95d7 100644 --- a/kmyfirewall/ruleoptionplugins/ip_option/kmyfirewallruleeditorip.ui +++ b/kmyfirewall/ruleoptionplugins/ip_option/kmyfirewallruleeditorip.ui @@ -37,13 +37,13 @@ 0 - + 0 40 - + 32767 40 @@ -170,7 +170,7 @@ Preferred - + 20 21 @@ -203,7 +203,7 @@ Preferred - + 60 20 @@ -228,7 +228,7 @@ Preferred - + 100 20 diff --git a/kmyfirewall/ruleoptionplugins/limit_option/kmyfirewallruleeditorlimit.ui b/kmyfirewall/ruleoptionplugins/limit_option/kmyfirewallruleeditorlimit.ui index 20cf8c2..d6059e3 100644 --- a/kmyfirewall/ruleoptionplugins/limit_option/kmyfirewallruleeditorlimit.ui +++ b/kmyfirewall/ruleoptionplugins/limit_option/kmyfirewallruleeditorlimit.ui @@ -37,13 +37,13 @@ 0 - + 0 40 - + 32767 40 @@ -157,7 +157,7 @@ Expanding - + 20 0 @@ -268,7 +268,7 @@ Expanding - + 20 0 @@ -303,7 +303,7 @@ Preferred - + 20 21 @@ -336,7 +336,7 @@ Expanding - + 60 20 @@ -361,7 +361,7 @@ Expanding - + 60 20 diff --git a/kmyfirewall/ruleoptionplugins/mac_option/kmyfirewallruleeditormac.ui b/kmyfirewall/ruleoptionplugins/mac_option/kmyfirewallruleeditormac.ui index e54139a..ae9473b 100644 --- a/kmyfirewall/ruleoptionplugins/mac_option/kmyfirewallruleeditormac.ui +++ b/kmyfirewall/ruleoptionplugins/mac_option/kmyfirewallruleeditormac.ui @@ -37,13 +37,13 @@ 0 - + 0 40 - + 32767 40 @@ -100,13 +100,13 @@ false - + 40 0 - + 40 32767 @@ -120,7 +120,7 @@ TextLabel1_2_6 - + 5 32767 @@ -137,13 +137,13 @@ false - + 40 0 - + 40 32767 @@ -157,7 +157,7 @@ TextLabel1_2_5 - + 5 32767 @@ -174,13 +174,13 @@ false - + 40 0 - + 40 32767 @@ -194,7 +194,7 @@ TextLabel1_2_4 - + 5 32767 @@ -211,13 +211,13 @@ false - + 40 0 - + 40 32767 @@ -231,7 +231,7 @@ TextLabel1_2_3 - + 5 32767 @@ -248,13 +248,13 @@ false - + 40 0 - + 40 32767 @@ -268,7 +268,7 @@ TextLabel1_2_2 - + 5 32767 @@ -285,13 +285,13 @@ false - + 40 0 - + 40 32767 @@ -351,7 +351,7 @@ Preferred - + 16 22 @@ -384,7 +384,7 @@ Expanding - + 80 20 @@ -409,7 +409,7 @@ Expanding - + 80 20 diff --git a/kmyfirewall/ruleoptionplugins/mark_target_option/kmyfirewallruleeditortargetmark.ui b/kmyfirewall/ruleoptionplugins/mark_target_option/kmyfirewallruleeditortargetmark.ui index 324a4c2..3c7dac8 100644 --- a/kmyfirewall/ruleoptionplugins/mark_target_option/kmyfirewallruleeditortargetmark.ui +++ b/kmyfirewall/ruleoptionplugins/mark_target_option/kmyfirewallruleeditortargetmark.ui @@ -96,7 +96,7 @@ Expanding - + 20 21 diff --git a/kmyfirewall/ruleoptionplugins/protocol_option/kmyfirewallruleeditorprotocol.ui b/kmyfirewall/ruleoptionplugins/protocol_option/kmyfirewallruleeditorprotocol.ui index 647f256..49c41aa 100644 --- a/kmyfirewall/ruleoptionplugins/protocol_option/kmyfirewallruleeditorprotocol.ui +++ b/kmyfirewall/ruleoptionplugins/protocol_option/kmyfirewallruleeditorprotocol.ui @@ -34,13 +34,13 @@ 0 - + 0 40 - + 32767 40 @@ -720,7 +720,7 @@ A misuse of this functionality may result in a hard to detect bug in the firewal Preferred - + 48 20 @@ -772,7 +772,7 @@ A misuse of this functionality may result in a hard to detect bug in the firewal Preferred - + 48 16 @@ -903,7 +903,7 @@ A misuse of this functionality may result in a hard to detect bug in the firewal Preferred - + 140 20 @@ -928,7 +928,7 @@ A misuse of this functionality may result in a hard to detect bug in the firewal Preferred - + 140 20 diff --git a/kmyfirewall/ruleoptionplugins/state_option/kmyfirewallruleeditorstate.ui b/kmyfirewall/ruleoptionplugins/state_option/kmyfirewallruleeditorstate.ui index ec6adf3..6154a1d 100644 --- a/kmyfirewall/ruleoptionplugins/state_option/kmyfirewallruleeditorstate.ui +++ b/kmyfirewall/ruleoptionplugins/state_option/kmyfirewallruleeditorstate.ui @@ -37,13 +37,13 @@ 0 - + 0 40 - + 32767 40 @@ -311,7 +311,7 @@ MinimumExpanding - + 90 20 @@ -336,7 +336,7 @@ MinimumExpanding - + 90 20 diff --git a/kmyfirewall/ruleoptionplugins/tos_option/kmyfirewallruleeditortos.ui b/kmyfirewall/ruleoptionplugins/tos_option/kmyfirewallruleeditortos.ui index 756998a..04646c5 100644 --- a/kmyfirewall/ruleoptionplugins/tos_option/kmyfirewallruleeditortos.ui +++ b/kmyfirewall/ruleoptionplugins/tos_option/kmyfirewallruleeditortos.ui @@ -127,7 +127,7 @@ Expanding - + 20 21 diff --git a/kmyfirewall/ruleoptionplugins/tos_target_option/kmyfirewallruleeditortos.ui b/kmyfirewall/ruleoptionplugins/tos_target_option/kmyfirewallruleeditortos.ui index 756998a..04646c5 100644 --- a/kmyfirewall/ruleoptionplugins/tos_target_option/kmyfirewallruleeditortos.ui +++ b/kmyfirewall/ruleoptionplugins/tos_target_option/kmyfirewallruleeditortos.ui @@ -127,7 +127,7 @@ Expanding - + 20 21