summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-15 21:46:01 -0600
committerTimothy Pearson <[email protected]>2013-02-15 21:46:01 -0600
commitc75c928d6efe312ee7f8b5c51f73034dfcf00151 (patch)
treedfbc878da67ef7d1af4c7b4ef1054a53df7e3b03
parentaf1081c62ff7678846c133304e99aac3411ec707 (diff)
downloadkerberostray-c75c928d6efe312ee7f8b5c51f73034dfcf00151.tar.gz
kerberostray-c75c928d6efe312ee7f8b5c51f73034dfcf00151.zip
Rename additional header files to avoid conflicts with KDE4
-rw-r--r--src/configdlg.cpp2
-rw-r--r--src/main.cpp2
-rw-r--r--src/toplevel.cpp4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/configdlg.cpp b/src/configdlg.cpp
index ad4d3aa..f811c1e 100644
--- a/src/configdlg.cpp
+++ b/src/configdlg.cpp
@@ -18,7 +18,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-#include <klocale.h>
+#include <tdelocale.h>
#include <klineedit.h>
#include <ktextedit.h>
#include <knuminput.h>
diff --git a/src/main.cpp b/src/main.cpp
index ec70fc1..e9e7ba6 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -19,7 +19,7 @@
***************************************************************************/
#include <twin.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
diff --git a/src/toplevel.cpp b/src/toplevel.cpp
index a4bd302..ae2cd4d 100644
--- a/src/toplevel.cpp
+++ b/src/toplevel.cpp
@@ -41,8 +41,8 @@
#include <tdeconfig.h>
#include <khelpmenu.h>
#include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kpassivepopup.h>
#include <knotifyclient.h>
#include <knuminput.h>