summaryrefslogtreecommitdiffstats
path: root/kjots
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-27 01:05:57 -0600
committerTimothy Pearson <[email protected]>2013-01-27 01:05:57 -0600
commit0ea54195f4400f13a5cc109feee4b3779fbd2f0f (patch)
tree14f5fe9a43c0a4bc41119c9d518713a3f91bd4c1 /kjots
parent0ec14ccb8401eff2be20f861953a77431410955c (diff)
downloadtdeutils-0ea54195f4400f13a5cc109feee4b3779fbd2f0f.tar.gz
tdeutils-0ea54195f4400f13a5cc109feee4b3779fbd2f0f.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kjots')
-rw-r--r--kjots/KJotsMain.cpp4
-rw-r--r--kjots/KJotsSettings.kcfgc2
-rw-r--r--kjots/kjotsentry.cpp2
-rw-r--r--kjots/main.cpp2
4 files changed, 5 insertions, 5 deletions
diff --git a/kjots/KJotsMain.cpp b/kjots/KJotsMain.cpp
index 99c3ff9..f674d7e 100644
--- a/kjots/KJotsMain.cpp
+++ b/kjots/KJotsMain.cpp
@@ -22,12 +22,12 @@
#include <tqheader.h>
#include <tqwidgetstack.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
#include <kaction.h>
#include <kapplication.h>
#include <kbookmarkmenu.h>
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
#include <kdebug.h>
#include <keditcl.h>
#include <kencodingfiledialog.h>
diff --git a/kjots/KJotsSettings.kcfgc b/kjots/KJotsSettings.kcfgc
index f6e99d5..e8338bc 100644
--- a/kjots/KJotsSettings.kcfgc
+++ b/kjots/KJotsSettings.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
File=kjots.kcfg
ClassName=KJotsSettings
Singleton=true
diff --git a/kjots/kjotsentry.cpp b/kjots/kjotsentry.cpp
index 83b10e2..35d6ddf 100644
--- a/kjots/kjotsentry.cpp
+++ b/kjots/kjotsentry.cpp
@@ -35,7 +35,7 @@
#include <kstandarddirs.h>
#include <ktempfile.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
#include <assert.h>
#include "kjotsedit.h"
diff --git a/kjots/main.cpp b/kjots/main.cpp
index d2a3e0a..f91298e 100644
--- a/kjots/main.cpp
+++ b/kjots/main.cpp
@@ -28,7 +28,7 @@
#include <stdlib.h>
#include <kuniqueapplication.h>
#include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kaboutdata.h>
#include "KJotsMain.h"