From 272d7c3f5b0ff67c80ee83c0e5cc58c8273fc9d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 24 Jul 2013 19:39:16 +0200 Subject: Additional KDE3 => TDE conversion --- src/Makefile.am | 2 +- src/commonwidget.cpp | 2 +- src/compoundwidget.cpp | 2 +- src/htmlwidget.cpp | 10 +++++----- src/htmlwidget.h | 4 ++-- src/indexwidget.cpp | 4 ++-- src/knmap.cpp | 48 ++++++++++++++++++++++++------------------------ src/knmap.desktop | 2 +- src/knmap.h | 14 +++++++------- src/loggingoptions.cpp | 2 +- src/main.cpp | 6 +++--- src/mainwidget.cpp | 4 ++-- src/outputwidget.cpp | 2 +- src/pandsoptions.cpp | 2 +- src/profiledialog.cpp | 4 ++-- src/scannamedialog.cpp | 2 +- src/scanwidget.cpp | 10 +++++----- src/stylesheetdialog.cpp | 6 +++--- src/timingwidget.cpp | 2 +- 19 files changed, 64 insertions(+), 64 deletions(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 7a2a2be..925ea04 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -31,7 +31,7 @@ knmap_SOURCES = main.cpp knmap.cpp mainwidget.cpp outputwidget.cpp \ tabwidgetptrlist.cpp tabwidgetdata.cpp scanwidget.cpp indexwidget.cpp scannamedialog.cpp \ scanstack.cpp scanmonitor.cpp scanmonitorevent.cpp nmapoutputbuffer.cpp knmap_LDFLAGS = $(TDE_RPATH) $(all_libraries) -knmap_LDADD = $(LIB_KIO) $(LIB_KHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT) +knmap_LDADD = $(LIB_KIO) $(LIB_TDEHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT) # this is where the desktop file will go shelldesktopdir = $(kde_appsdir)/Utilities diff --git a/src/commonwidget.cpp b/src/commonwidget.cpp index 72f9e9b..7a5eaf7 100644 --- a/src/commonwidget.cpp +++ b/src/commonwidget.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include "commonwidget.h" #include "whatsthis.h" diff --git a/src/compoundwidget.cpp b/src/compoundwidget.cpp index 420a67e..997be7c 100644 --- a/src/compoundwidget.cpp +++ b/src/compoundwidget.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include "compoundwidget.h" #include "knmap.h" diff --git a/src/htmlwidget.cpp b/src/htmlwidget.cpp index 4132ba4..689f363 100644 --- a/src/htmlwidget.cpp +++ b/src/htmlwidget.cpp @@ -23,13 +23,13 @@ #include #include -#include +#include #include #include -#include -#include +#include +#include #include -#include +#include #include #include @@ -48,7 +48,7 @@ HTMLWidget::HTMLWidget( TQStringList* stylesheetURLs, TQWidget* parent, const ch m_process( NULL ), m_stylesheetURLs( stylesheetURLs ), m_zoomFactor( 100 ) -{ m_htmlPart = new KHTMLPart( this, "html part" ); +{ m_htmlPart = new TDEHTMLPart( this, "html part" ); m_htmlPart->setOnlyLocalReferences( true ); } diff --git a/src/htmlwidget.h b/src/htmlwidget.h index be0b5cc..ba57b0f 100644 --- a/src/htmlwidget.h +++ b/src/htmlwidget.h @@ -35,7 +35,7 @@ // forward class definitions // ========================= -class KHTMLPart; +class TDEHTMLPart; class TDEProcess; class StylesheetDialog; @@ -82,7 +82,7 @@ class HTMLWidget : public TQWidget StylesheetDialog* m_dlg; TQString m_htmlData; - KHTMLPart* m_htmlPart; + TDEHTMLPart* m_htmlPart; TQString m_manPageData; TQString m_manPagePath; TDEProcess* m_process; diff --git a/src/indexwidget.cpp b/src/indexwidget.cpp index 023867e..c223186 100644 --- a/src/indexwidget.cpp +++ b/src/indexwidget.cpp @@ -26,11 +26,11 @@ #include #include -#include +#include #include #include #include -#include +#include #include #include diff --git a/src/knmap.cpp b/src/knmap.cpp index 32c1f13..aa3dda5 100644 --- a/src/knmap.cpp +++ b/src/knmap.cpp @@ -23,18 +23,18 @@ #include #include -#include -#include +#include +#include #include #include #include -#include -#include +#include +#include #include #include #include #include -#include +#include #include #include #include @@ -93,7 +93,7 @@ void Knmap::createMenu( ) SLOT( slotFileSaveAs( )), actionCollection( )); - m_settingsManAction = new KAction( i18n( "&Use local man page" ), + m_settingsManAction = new TDEAction( i18n( "&Use local man page" ), "localman.png", 0, m_mainWidget, @@ -101,7 +101,7 @@ void Knmap::createMenu( ) actionCollection( ), "settings_local" ); - m_useTargetHostAction = new KToggleAction( i18n( "Use target host name" ), + m_useTargetHostAction = new TDEToggleAction( i18n( "Use target host name" ), NULL, 0, m_mainWidget, @@ -109,7 +109,7 @@ void Knmap::createMenu( ) actionCollection( ), "scan_use" ); - m_wrapTextAction = new KToggleAction( i18n( "Wrap text" ), + m_wrapTextAction = new TDEToggleAction( i18n( "Wrap text" ), NULL, 0, m_mainWidget, @@ -117,7 +117,7 @@ void Knmap::createMenu( ) actionCollection( ), "settings_wrap_text" ); - new KAction( i18n( "Close scan" ), + new TDEAction( i18n( "Close scan" ), "scanclose", CTRL+Key_W, m_mainWidget, @@ -125,7 +125,7 @@ void Knmap::createMenu( ) actionCollection( ), "scan_close" ); - new KAction( i18n( "Copy profile..." ), + new TDEAction( i18n( "Copy profile..." ), "profilecopy", 0, m_mainWidget, @@ -133,7 +133,7 @@ void Knmap::createMenu( ) actionCollection( ), "profile_copy" ); - new KAction( i18n( "Delete profile..." ), + new TDEAction( i18n( "Delete profile..." ), "profiledelete", 0, m_mainWidget, @@ -141,7 +141,7 @@ void Knmap::createMenu( ) actionCollection( ), "profile_delete" ); - new KAction( i18n( "Display nmap man page" ), + new TDEAction( i18n( "Display nmap man page" ), "manpage", 0, m_mainWidget, @@ -149,7 +149,7 @@ void Knmap::createMenu( ) actionCollection( ), "help_man_page" ); - new KAction( i18n( "Duplicate scan" ), + new TDEAction( i18n( "Duplicate scan" ), "scanduplicate", CTRL+Key_C, m_mainWidget, @@ -157,7 +157,7 @@ void Knmap::createMenu( ) actionCollection( ), "scan_duplicate" ); - new KAction( i18n( "Load profile..." ), + new TDEAction( i18n( "Load profile..." ), "profileload", 0, m_mainWidget, @@ -165,7 +165,7 @@ void Knmap::createMenu( ) actionCollection( ), "profile_load" ); - new KAction( i18n( "man page stylesheet..." ), + new TDEAction( i18n( "man page stylesheet..." ), "manstylesheet", 0, m_mainWidget, @@ -173,7 +173,7 @@ void Knmap::createMenu( ) actionCollection( ), "settings_stylesheet" ); - new KAction( i18n( "New scan..." ), + new TDEAction( i18n( "New scan..." ), "scannew", CTRL+Key_N, m_mainWidget, @@ -181,7 +181,7 @@ void Knmap::createMenu( ) actionCollection( ), "scan_new" ); - new KAction( i18n( "Rename profile..." ), + new TDEAction( i18n( "Rename profile..." ), "profilerename", 0, m_mainWidget, @@ -189,7 +189,7 @@ void Knmap::createMenu( ) actionCollection( ), "profile_rename" ); - new KAction( i18n( "Rename scan..." ), + new TDEAction( i18n( "Rename scan..." ), "scanrename", Key_F2, m_mainWidget, @@ -197,7 +197,7 @@ void Knmap::createMenu( ) actionCollection( ), "scan_rename" ); - new KAction( i18n( "Save profile..." ), + new TDEAction( i18n( "Save profile..." ), "profilesave", 0, m_mainWidget, @@ -205,7 +205,7 @@ void Knmap::createMenu( ) actionCollection( ), "profile_save" ); - new KAction( i18n( "Save profile as..." ), + new TDEAction( i18n( "Save profile as..." ), "profilesaveas", 0, m_mainWidget, @@ -213,7 +213,7 @@ void Knmap::createMenu( ) actionCollection( ), "profile_save_as" ); - new KAction( i18n( "Zoom custom" ), + new TDEAction( i18n( "Zoom custom" ), "zoomcustom", 0, m_mainWidget, @@ -221,7 +221,7 @@ void Knmap::createMenu( ) actionCollection( ), "settings_zoom_custom" ); - new KAction( i18n( "Zoom in" ), + new TDEAction( i18n( "Zoom in" ), "zoomin", 0, m_mainWidget, @@ -229,7 +229,7 @@ void Knmap::createMenu( ) actionCollection( ), "settings_zoom_in" ); - new KAction( i18n( "Zoom out" ), + new TDEAction( i18n( "Zoom out" ), "zoomout", 0, m_mainWidget, @@ -255,7 +255,7 @@ void Knmap::createMenu( ) // ======== void Knmap::findNmap( ) -{ TQString nmapPath = KStandardDirs::findExe( "nmap" ); +{ TQString nmapPath = TDEStandardDirs::findExe( "nmap" ); if( nmapPath.isEmpty( )) { KMessageBox::error( this, diff --git a/src/knmap.desktop b/src/knmap.desktop index 38949f4..33bb39c 100644 --- a/src/knmap.desktop +++ b/src/knmap.desktop @@ -39,4 +39,4 @@ Comment[xx]=xxA simple KDE Applicationxx Comment[zh_CN]=一个简单的 KDE 应用程序 GenericName=nmap Graphical User Interface GenericName[fr]=Interface Graphique pour nmap -Categories=Qt;KDE;Utility +Categories=Qt;TDE;Utility diff --git a/src/knmap.h b/src/knmap.h index 87dfa48..67bbd39 100644 --- a/src/knmap.h +++ b/src/knmap.h @@ -34,8 +34,8 @@ // forward class definitions // ========================= -class KAction; -class KToggleAction; +class TDEAction; +class TDEToggleAction; class MainWidget; class ScanWidget; @@ -70,12 +70,12 @@ class Knmap : public TDEMainWindow void saveSettings( ); void switchManPages( ); - KAction* m_fileSaveAction; - KAction* m_fileSaveAsAction; + TDEAction* m_fileSaveAction; + TDEAction* m_fileSaveAsAction; MainWidget* m_mainWidget; - KAction* m_settingsManAction; - KToggleAction* m_useTargetHostAction; - KToggleAction* m_wrapTextAction; + TDEAction* m_settingsManAction; + TDEToggleAction* m_useTargetHostAction; + TDEToggleAction* m_wrapTextAction; }; #endif // _KNMAP_H_ diff --git a/src/loggingoptions.cpp b/src/loggingoptions.cpp index e525a19..75a2b9c 100644 --- a/src/loggingoptions.cpp +++ b/src/loggingoptions.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include "knmap.h" #include "loggingoptions.h" diff --git a/src/main.cpp b/src/main.cpp index 4d60369..5485aa1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -21,7 +21,7 @@ ***************************************************************************/ #include -#include +#include #include #include #include @@ -30,7 +30,7 @@ #include "knmap.h" static const char description[] = I18N_NOOP( "A KDE frontend for nmap" ); -static TDECmdLineOptions options[] = { KCmdLineLastOption }; +static TDECmdLineOptions options[] = { TDECmdLineLastOption }; // main // ==== @@ -61,7 +61,7 @@ int main( int argc, string argv[]) "http://informatics.cdu.edu.au/staff/kgilbert" ); TDECmdLineArgs::init( argc, argv, &about ); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; if( app.isRestored( )) { RESTORE( Knmap ); diff --git a/src/mainwidget.cpp b/src/mainwidget.cpp index 17756aa..6f235e2 100644 --- a/src/mainwidget.cpp +++ b/src/mainwidget.cpp @@ -22,12 +22,12 @@ #include -#include +#include #include #include #include #include -#include +#include #include "htmlwidget.h" #include "indexwidget.h" diff --git a/src/outputwidget.cpp b/src/outputwidget.cpp index 852a1ff..3fe0d02 100644 --- a/src/outputwidget.cpp +++ b/src/outputwidget.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include "knmap.h" #include "outputwidget.h" diff --git a/src/pandsoptions.cpp b/src/pandsoptions.cpp index 9d0e66c..5b663b6 100644 --- a/src/pandsoptions.cpp +++ b/src/pandsoptions.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include "pandsoptions.h" #include "whatsthis.h" diff --git a/src/profiledialog.cpp b/src/profiledialog.cpp index c6c8ef7..40eb2dd 100644 --- a/src/profiledialog.cpp +++ b/src/profiledialog.cpp @@ -27,12 +27,12 @@ #include #include -#include +#include #include #include #include #include -#include +#include #include "profiledialog.h" diff --git a/src/scannamedialog.cpp b/src/scannamedialog.cpp index 2139ac5..1af3d80 100644 --- a/src/scannamedialog.cpp +++ b/src/scannamedialog.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include "scannamedialog.h" #include "scanwidget.h" diff --git a/src/scanwidget.cpp b/src/scanwidget.cpp index b9ca7c6..7f8c382 100644 --- a/src/scanwidget.cpp +++ b/src/scanwidget.cpp @@ -34,11 +34,11 @@ #include #include -#include +#include #include #include #include -#include +#include #include #include #include @@ -120,7 +120,7 @@ ScanWidget::~ScanWidget( ) TQStringList ScanWidget::buildNmapOptionsList( ) { TQStringList nmapOptions; - nmapOptions << KStandardDirs::findExe ( "nmap" ); + nmapOptions << TDEStandardDirs::findExe ( "nmap" ); if( m_commonWidget->resovleAlwaysState( )) nmapOptions << "-R"; @@ -509,7 +509,7 @@ bool ScanWidget::createPipes( ) { ASSERT( m_pipeStderr == NULL ); ASSERT( m_pipeStdout == NULL ); - KStandardDirs standardDirs; + TDEStandardDirs standardDirs; TQStringList tempDir = standardDirs.resourceDirs( "tmp" ); if( tempDir.isEmpty( )) @@ -969,7 +969,7 @@ void ScanWidget::slotStartClicked( ) nmapOptions << "2>"; nmapOptions << m_pipeStderr->name( ); - *m_nmapProcess << "kdesu"; + *m_nmapProcess << "tdesu"; *m_nmapProcess << "-n"; *m_nmapProcess << nmapOptions.join( " " ); } diff --git a/src/stylesheetdialog.cpp b/src/stylesheetdialog.cpp index 99795ca..f2b49b4 100644 --- a/src/stylesheetdialog.cpp +++ b/src/stylesheetdialog.cpp @@ -30,11 +30,11 @@ #include #include -#include -#include +#include +#include #include #include -#include +#include #include "stylesheetdialog.h" diff --git a/src/timingwidget.cpp b/src/timingwidget.cpp index 79e6cb6..3defb03 100644 --- a/src/timingwidget.cpp +++ b/src/timingwidget.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include "timingwidget.h" #include "whatsthis.h" -- cgit v1.2.1