summaryrefslogtreecommitdiffstats
path: root/lib/kotext
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 00:54:22 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 00:54:22 -0600
commit038b18b2df1da40baab30d62171766048a948095 (patch)
treeba99d50e3e7b3f2eccb63ba71aea4f6163ede37a /lib/kotext
parentd0baf2961c379b31587c6542625018c6177474d0 (diff)
downloadkoffice-038b18b2df1da40baab30d62171766048a948095.tar.gz
koffice-038b18b2df1da40baab30d62171766048a948095.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'lib/kotext')
-rw-r--r--lib/kotext/KFontDialog_local.cpp2
-rw-r--r--lib/kotext/KoAutoFormat.cpp2
-rw-r--r--lib/kotext/KoCompletionDia.cpp2
-rw-r--r--lib/kotext/KoVariable.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/kotext/KFontDialog_local.cpp b/lib/kotext/KFontDialog_local.cpp
index 32efad601..95bc2553c 100644
--- a/lib/kotext/KFontDialog_local.cpp
+++ b/lib/kotext/KFontDialog_local.cpp
@@ -43,7 +43,7 @@
#include <kapplication.h>
#include <kcharsets.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdialog.h>
#include <kglobal.h>
#include <kglobalsettings.h>
diff --git a/lib/kotext/KoAutoFormat.cpp b/lib/kotext/KoAutoFormat.cpp
index 84ec27d51..b46973b3b 100644
--- a/lib/kotext/KoAutoFormat.cpp
+++ b/lib/kotext/KoAutoFormat.cpp
@@ -32,7 +32,7 @@
#include <kdebug.h>
#include <klocale.h>
#include <kinstance.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kstandarddirs.h>
#include <kglobal.h>
#include <kcommand.h>
diff --git a/lib/kotext/KoCompletionDia.cpp b/lib/kotext/KoCompletionDia.cpp
index 8464bf4d8..031a8122a 100644
--- a/lib/kotext/KoCompletionDia.cpp
+++ b/lib/kotext/KoCompletionDia.cpp
@@ -23,7 +23,7 @@
#include <kmessagebox.h>
#include <kinputdialog.h>
#include <kcompletion.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdebug.h>
#include <tqlayout.h>
#include <tqvbox.h>
diff --git a/lib/kotext/KoVariable.cpp b/lib/kotext/KoVariable.cpp
index 770c1da2d..8ee25c193 100644
--- a/lib/kotext/KoVariable.cpp
+++ b/lib/kotext/KoVariable.cpp
@@ -40,7 +40,7 @@
#include <kdebug.h>
#include <kglobal.h>
#include <kdialogbase.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <tdeversion.h>
#include <kinstance.h>
#include <kcalendarsystem.h>