summaryrefslogtreecommitdiffstats
path: root/kommander/editor
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:06:46 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:06:46 -0600
commitef2264e9790ae7e700ad3cf5fb3dbad05efd98d8 (patch)
treeac4650a642d502c458d0b654c8b731739ce601dc /kommander/editor
parenta32b928478b59d4fa8b8495bbad6864476c129b1 (diff)
downloadtdewebdev-ef2264e9790ae7e700ad3cf5fb3dbad05efd98d8.tar.gz
tdewebdev-ef2264e9790ae7e700ad3cf5fb3dbad05efd98d8.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kommander/editor')
-rw-r--r--kommander/editor/assoctexteditorimpl.cpp2
-rw-r--r--kommander/editor/filechooser.cpp2
-rw-r--r--kommander/editor/formfile.cpp2
-rw-r--r--kommander/editor/kommander.xml2
-rw-r--r--kommander/editor/main.cpp2
-rw-r--r--kommander/editor/mainwindow.cpp4
-rw-r--r--kommander/editor/mainwindowactions.cpp2
-rw-r--r--kommander/editor/messagelog.cpp2
8 files changed, 9 insertions, 9 deletions
diff --git a/kommander/editor/assoctexteditorimpl.cpp b/kommander/editor/assoctexteditorimpl.cpp
index 4cbaeb08..9fbfe938 100644
--- a/kommander/editor/assoctexteditorimpl.cpp
+++ b/kommander/editor/assoctexteditorimpl.cpp
@@ -16,7 +16,7 @@
***************************************************************************/
/* KDE INCLUDES */
#include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kmessagebox.h>
#include <kglobal.h>
#include <kglobalsettings.h>
diff --git a/kommander/editor/filechooser.cpp b/kommander/editor/filechooser.cpp
index 6dfb84ec..ac0aad5a 100644
--- a/kommander/editor/filechooser.cpp
+++ b/kommander/editor/filechooser.cpp
@@ -1,7 +1,7 @@
#include "filechooser.h"
#include <tqlineedit.h>
#include <tqpushbutton.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <tqlayout.h>
FileChooser::FileChooser( TQWidget *parent, const char *name )
diff --git a/kommander/editor/formfile.cpp b/kommander/editor/formfile.cpp
index fbb64d48..97a636ef 100644
--- a/kommander/editor/formfile.cpp
+++ b/kommander/editor/formfile.cpp
@@ -34,7 +34,7 @@
// KDE includes
#include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kstatusbar.h>
diff --git a/kommander/editor/kommander.xml b/kommander/editor/kommander.xml
index ee10455b..2652e09b 100644
--- a/kommander/editor/kommander.xml
+++ b/kommander/editor/kommander.xml
@@ -558,7 +558,7 @@
<!-- others -->
<item> dcop </item>
<item> kdialog </item>
- <item> kfile </item>
+ <item> tdefile </item>
<item> xhost </item>
<item> xmodmap </item>
<item> xset </item>
diff --git a/kommander/editor/main.cpp b/kommander/editor/main.cpp
index a4c4b27b..75e4ce67 100644
--- a/kommander/editor/main.cpp
+++ b/kommander/editor/main.cpp
@@ -17,7 +17,7 @@
#include <kaboutdata.h>
#include <kapplication.h>
#include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kiconloader.h>
#include <klocale.h>
#include <ksplashscreen.h>
diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp
index 608049ed..fd3f0ecb 100644
--- a/kommander/editor/mainwindow.cpp
+++ b/kommander/editor/mainwindow.cpp
@@ -74,7 +74,7 @@
#include <kaction.h>
#include <kapplication.h>
#include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kinputdialog.h>
#include <klocale.h>
#include <kmenubar.h>
@@ -86,7 +86,7 @@
#include <ktoolbar.h>
#include <kurl.h>
#include <tdeparts/partmanager.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
extern TQMap<TQWidget*, TQString> *qwf_functions;
extern TQMap<TQWidget*, TQString> *qwf_forms;
diff --git a/kommander/editor/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp
index 749f5d3b..8a217843 100644
--- a/kommander/editor/mainwindowactions.cpp
+++ b/kommander/editor/mainwindowactions.cpp
@@ -60,7 +60,7 @@
#include <kaction.h>
#include <kapplication.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kglobal.h>
#include <kiconloader.h>
#include <kkeydialog.h>
diff --git a/kommander/editor/messagelog.cpp b/kommander/editor/messagelog.cpp
index 16947a77..33a385b3 100644
--- a/kommander/editor/messagelog.cpp
+++ b/kommander/editor/messagelog.cpp
@@ -17,7 +17,7 @@
#include "messagelog.h"
#include <kapplication.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kiconloader.h>
#include <klistbox.h>
#include <kmessagebox.h>