summaryrefslogtreecommitdiffstats
path: root/lanbrowsing
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:01 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:01 -0600
commit0e88a100de93641e5aeacd8c65e8076c948a5c20 (patch)
tree54cce3e6ae07c4fc8921244b1397c75cc21a2997 /lanbrowsing
parent5497356b6c12e5854b297bfa0d9c2a9f20cb4ca0 (diff)
downloadtdenetwork-0e88a100de93641e5aeacd8c65e8076c948a5c20.tar.gz
tdenetwork-0e88a100de93641e5aeacd8c65e8076c948a5c20.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'lanbrowsing')
-rw-r--r--lanbrowsing/kcmlisa/findnic.cpp2
-rw-r--r--lanbrowsing/kcmlisa/kcmlisa.cpp6
-rw-r--r--lanbrowsing/kcmlisa/kcmreslisa.cpp4
-rw-r--r--lanbrowsing/kcmlisa/kcmtdeiolan.cpp2
-rw-r--r--lanbrowsing/kcmlisa/main.cpp2
-rw-r--r--lanbrowsing/kcmlisa/portsettingsbar.cpp2
-rw-r--r--lanbrowsing/kcmlisa/setupwizard.cpp2
-rw-r--r--lanbrowsing/kcmlisa/setupwizard.h2
-rw-r--r--lanbrowsing/tdeio_lan/tdeio_lan.cpp4
9 files changed, 13 insertions, 13 deletions
diff --git a/lanbrowsing/kcmlisa/findnic.cpp b/lanbrowsing/kcmlisa/findnic.cpp
index 721834c9..42a74cb3 100644
--- a/lanbrowsing/kcmlisa/findnic.cpp
+++ b/lanbrowsing/kcmlisa/findnic.cpp
@@ -59,7 +59,7 @@
#include "findnic.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <ksockaddr.h>
NICList* findNICs()
diff --git a/lanbrowsing/kcmlisa/kcmlisa.cpp b/lanbrowsing/kcmlisa/kcmlisa.cpp
index e60eb6f2..5809d51b 100644
--- a/lanbrowsing/kcmlisa/kcmlisa.cpp
+++ b/lanbrowsing/kcmlisa/kcmlisa.cpp
@@ -39,12 +39,12 @@
#include <tdeapplication.h>
#include <kprocess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <keditlistbox.h>
#include <krestrictedline.h>
#include <kdialogbase.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
diff --git a/lanbrowsing/kcmlisa/kcmreslisa.cpp b/lanbrowsing/kcmlisa/kcmreslisa.cpp
index 252beadf..7026e3a6 100644
--- a/lanbrowsing/kcmlisa/kcmreslisa.cpp
+++ b/lanbrowsing/kcmlisa/kcmreslisa.cpp
@@ -31,8 +31,8 @@
#include <tqvbuttongroup.h>
#include <kdialogbase.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <krestrictedline.h>
#include <keditlistbox.h>
diff --git a/lanbrowsing/kcmlisa/kcmtdeiolan.cpp b/lanbrowsing/kcmlisa/kcmtdeiolan.cpp
index 68e01989..144c7262 100644
--- a/lanbrowsing/kcmlisa/kcmtdeiolan.cpp
+++ b/lanbrowsing/kcmlisa/kcmtdeiolan.cpp
@@ -27,7 +27,7 @@
#include <tqlabel.h>
#include <tqgroupbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kdialog.h>
diff --git a/lanbrowsing/kcmlisa/main.cpp b/lanbrowsing/kcmlisa/main.cpp
index b7d12c39..7252785f 100644
--- a/lanbrowsing/kcmlisa/main.cpp
+++ b/lanbrowsing/kcmlisa/main.cpp
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tqdir.h>
diff --git a/lanbrowsing/kcmlisa/portsettingsbar.cpp b/lanbrowsing/kcmlisa/portsettingsbar.cpp
index 3e94c730..2833a443 100644
--- a/lanbrowsing/kcmlisa/portsettingsbar.cpp
+++ b/lanbrowsing/kcmlisa/portsettingsbar.cpp
@@ -19,7 +19,7 @@
*/
#include "portsettingsbar.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlabel.h>
diff --git a/lanbrowsing/kcmlisa/setupwizard.cpp b/lanbrowsing/kcmlisa/setupwizard.cpp
index 53b5033d..820f09da 100644
--- a/lanbrowsing/kcmlisa/setupwizard.cpp
+++ b/lanbrowsing/kcmlisa/setupwizard.cpp
@@ -22,7 +22,7 @@
#include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include <ksockaddr.h>
#include <kdebug.h>
diff --git a/lanbrowsing/kcmlisa/setupwizard.h b/lanbrowsing/kcmlisa/setupwizard.h
index 81b7e45b..c9f81dad 100644
--- a/lanbrowsing/kcmlisa/setupwizard.h
+++ b/lanbrowsing/kcmlisa/setupwizard.h
@@ -31,7 +31,7 @@
#include <tqcheckbox.h>
#include <krestrictedline.h>
#include <tqwizard.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tqlayout.h>
#include <tqlabel.h>
#include <tqlistbox.h>
diff --git a/lanbrowsing/tdeio_lan/tdeio_lan.cpp b/lanbrowsing/tdeio_lan/tdeio_lan.cpp
index e573f7ea..4c24261d 100644
--- a/lanbrowsing/tdeio_lan/tdeio_lan.cpp
+++ b/lanbrowsing/tdeio_lan/tdeio_lan.cpp
@@ -22,10 +22,10 @@
#endif
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kinstance.h>
#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kprocess.h>
#include <tqfile.h>