From c0b24fe164924298d7e6ae33964b3c65fadbcba3 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 01:06:29 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 src/newui/CMakeLists.txt  | 4 ----
 src/newui/button.cpp      | 2 +-
 src/newui/buttonbar.cpp   | 2 +-
 src/newui/ddockwindow.cpp | 2 +-
 src/newui/dmainwindow.cpp | 2 +-
 src/newui/dtabwidget.cpp  | 2 +-
 6 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'src/newui')

diff --git a/src/newui/CMakeLists.txt b/src/newui/CMakeLists.txt
index e6f6b124..b1f89a56 100644
--- a/src/newui/CMakeLists.txt
+++ b/src/newui/CMakeLists.txt
@@ -15,10 +15,6 @@ include_directories(
   ${TQT_INCLUDE_DIRS}
 )
 
-link_directories(
-  ${TQT_LIBRARY_DIRS}
-)
-
 
 ##### d (shared) ################################
 
diff --git a/src/newui/button.cpp b/src/newui/button.cpp
index 4381ee2d..fc6720f9 100644
--- a/src/newui/button.cpp
+++ b/src/newui/button.cpp
@@ -33,7 +33,7 @@
 #include <kinputdialog.h>
 #include <klocale.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "buttonbar.h"
 
diff --git a/src/newui/buttonbar.cpp b/src/newui/buttonbar.cpp
index f64e0695..13afb6c0 100644
--- a/src/newui/buttonbar.cpp
+++ b/src/newui/buttonbar.cpp
@@ -22,7 +22,7 @@
 #include <tqlayout.h>
 
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kstringhandler.h>
 #include <klocale.h>
 
diff --git a/src/newui/ddockwindow.cpp b/src/newui/ddockwindow.cpp
index d8abfde7..091ad1c0 100644
--- a/src/newui/ddockwindow.cpp
+++ b/src/newui/ddockwindow.cpp
@@ -29,7 +29,7 @@
 
 #include <kdebug.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcombobox.h>
 #include <klocale.h>
 #include <kiconloader.h>
diff --git a/src/newui/dmainwindow.cpp b/src/newui/dmainwindow.cpp
index d8b79f22..1cdd0551 100644
--- a/src/newui/dmainwindow.cpp
+++ b/src/newui/dmainwindow.cpp
@@ -21,7 +21,7 @@
 
 #include <kdebug.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 
 #include <tqtoolbutton.h>
diff --git a/src/newui/dtabwidget.cpp b/src/newui/dtabwidget.cpp
index 92148207..e56a83f8 100644
--- a/src/newui/dtabwidget.cpp
+++ b/src/newui/dtabwidget.cpp
@@ -22,7 +22,7 @@
 #include <tqtoolbutton.h>
 #include <tqtabbar.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kapplication.h>
 
-- 
cgit v1.2.1