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

---
 karm/karm_part.cpp   | 2 +-
 karm/karmstorage.cpp | 2 +-
 karm/mainwindow.cpp  | 2 +-
 karm/preferences.cpp | 2 +-
 karm/taskview.cpp    | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'karm')

diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp
index b8426f22..36a71043 100644
--- a/karm/karm_part.cpp
+++ b/karm/karm_part.cpp
@@ -11,7 +11,7 @@
 #include <kinstance.h>
 #include <kaction.h>
 #include <kstdaction.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kglobal.h>
 #include <klocale.h>
 
diff --git a/karm/karmstorage.cpp b/karm/karmstorage.cpp
index bda5831b..0eb16c1e 100644
--- a/karm/karmstorage.cpp
+++ b/karm/karmstorage.cpp
@@ -49,7 +49,7 @@
 #include <taskview.h>
 #include <timekard.h>
 #include <karmutility.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kurl.h>
 #include <vector>
 
diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp
index 7e692092..dc9b3344 100644
--- a/karm/mainwindow.cpp
+++ b/karm/mainwindow.cpp
@@ -10,7 +10,7 @@
 #include <kaccel.h>
 #include <kaction.h>
 #include <kapplication.h>       // kapp
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kkeydialog.h>
diff --git a/karm/preferences.cpp b/karm/preferences.cpp
index 1dd13625..005243ce 100644
--- a/karm/preferences.cpp
+++ b/karm/preferences.cpp
@@ -6,7 +6,7 @@
 #include <tqlayout.h>
 
 #include <kapplication.h>       // kapp
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kemailsettings.h>
 #include <kiconloader.h>
diff --git a/karm/taskview.cpp b/karm/taskview.cpp
index eb63da48..bcabad37 100644
--- a/karm/taskview.cpp
+++ b/karm/taskview.cpp
@@ -11,9 +11,9 @@
 #include <tqxml.h>
 
 #include "kapplication.h"       // kapp
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>            // i18n
 #include <kmessagebox.h>
 #include <kurlrequester.h>
-- 
cgit v1.2.3