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

---
 quanta/dialogs/actionconfigdialog.cpp     | 2 +-
 quanta/dialogs/copyto.cpp                 | 4 ++--
 quanta/dialogs/copyto.h                   | 2 +-
 quanta/dialogs/dirtydlg.cpp               | 8 ++++----
 quanta/dialogs/dirtydlg.h                 | 2 +-
 quanta/dialogs/dtepeditdlg.cpp            | 4 ++--
 quanta/dialogs/filecombo.cpp              | 2 +-
 quanta/dialogs/settings/parseroptions.cpp | 2 +-
 quanta/dialogs/tagdialogs/colorcombo.cpp  | 2 +-
 quanta/dialogs/tagdialogs/tagdialog.cpp   | 2 +-
 quanta/dialogs/tagdialogs/tagimgdlg.cpp   | 4 ++--
 11 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'quanta/dialogs')

diff --git a/quanta/dialogs/actionconfigdialog.cpp b/quanta/dialogs/actionconfigdialog.cpp
index 7ae6b4a4..9654c046 100644
--- a/quanta/dialogs/actionconfigdialog.cpp
+++ b/quanta/dialogs/actionconfigdialog.cpp
@@ -26,7 +26,7 @@
 
 //kde includes
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kicondialog.h>
 #include <kiconloader.h>
diff --git a/quanta/dialogs/copyto.cpp b/quanta/dialogs/copyto.cpp
index bc2543dc..b5c53356 100644
--- a/quanta/dialogs/copyto.cpp
+++ b/quanta/dialogs/copyto.cpp
@@ -17,8 +17,8 @@
 // qt includes
 
 // kde includes
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
 
 //app includes
 #include "copyto.h"
diff --git a/quanta/dialogs/copyto.h b/quanta/dialogs/copyto.h
index 29412488..3e021e0a 100644
--- a/quanta/dialogs/copyto.h
+++ b/quanta/dialogs/copyto.h
@@ -19,7 +19,7 @@
 #define COPYTO_H
 
 // kde includes
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 
 
 /**
diff --git a/quanta/dialogs/dirtydlg.cpp b/quanta/dialogs/dirtydlg.cpp
index be6f308a..08ce2883 100644
--- a/quanta/dialogs/dirtydlg.cpp
+++ b/quanta/dialogs/dirtydlg.cpp
@@ -23,10 +23,10 @@
 #include <kdialogbase.h>
 #include <klocale.h>
 #include <kprocess.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
-#include <kio/netaccess.h>
-#include <kfileitem.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/netaccess.h>
+#include <tdefileitem.h>
 
 //app includes
 #include "dirtydialog.h"
diff --git a/quanta/dialogs/dirtydlg.h b/quanta/dialogs/dirtydlg.h
index 4b6d9232..5fd14e36 100644
--- a/quanta/dialogs/dirtydlg.h
+++ b/quanta/dialogs/dirtydlg.h
@@ -18,7 +18,7 @@
 #define DIRTYDLG_H
 
 // kde includes
-#include <kio/jobclasses.h>
+#include <tdeio/jobclasses.h>
 
 class DirtyDialog;
 class KDialogBase;
diff --git a/quanta/dialogs/dtepeditdlg.cpp b/quanta/dialogs/dtepeditdlg.cpp
index bbb3456d..79247f40 100644
--- a/quanta/dialogs/dtepeditdlg.cpp
+++ b/quanta/dialogs/dtepeditdlg.cpp
@@ -24,8 +24,8 @@
 
 //kde includes
 #include <kcombobox.h>
-#include <kconfig.h>
-#include <kfiledialog.h>
+#include <tdeconfig.h>
+#include <tdefiledialog.h>
 #include <kicondialog.h>
 #include <klistbox.h>
 #include <klineedit.h>
diff --git a/quanta/dialogs/filecombo.cpp b/quanta/dialogs/filecombo.cpp
index 63fd1e58..8f31f692 100644
--- a/quanta/dialogs/filecombo.cpp
+++ b/quanta/dialogs/filecombo.cpp
@@ -22,7 +22,7 @@
 
 // KDE includes
 #include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 
 // app include
diff --git a/quanta/dialogs/settings/parseroptions.cpp b/quanta/dialogs/settings/parseroptions.cpp
index 92ff1206..1f0e8b3c 100644
--- a/quanta/dialogs/settings/parseroptions.cpp
+++ b/quanta/dialogs/settings/parseroptions.cpp
@@ -19,7 +19,7 @@
 #include <tqspinbox.h>
 
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 /*
  *  Constructs a ParserOptions which is a child of 'parent', with the
diff --git a/quanta/dialogs/tagdialogs/colorcombo.cpp b/quanta/dialogs/tagdialogs/colorcombo.cpp
index 19331def..ebe9a7fd 100644
--- a/quanta/dialogs/tagdialogs/colorcombo.cpp
+++ b/quanta/dialogs/tagdialogs/colorcombo.cpp
@@ -45,7 +45,7 @@
 #include <tqtimer.h>
 
 #include <kcolordialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
diff --git a/quanta/dialogs/tagdialogs/tagdialog.cpp b/quanta/dialogs/tagdialogs/tagdialog.cpp
index 90f5f80c..fe466986 100644
--- a/quanta/dialogs/tagdialogs/tagdialog.cpp
+++ b/quanta/dialogs/tagdialogs/tagdialog.cpp
@@ -24,7 +24,7 @@
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <tdetexteditor/viewcursorinterface.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kurl.h>
 #include <kstdguiitem.h>
 #include <kdebug.h>
diff --git a/quanta/dialogs/tagdialogs/tagimgdlg.cpp b/quanta/dialogs/tagdialogs/tagimgdlg.cpp
index d2a680f5..24578a88 100644
--- a/quanta/dialogs/tagdialogs/tagimgdlg.cpp
+++ b/quanta/dialogs/tagdialogs/tagimgdlg.cpp
@@ -22,8 +22,8 @@
 //kde includes
 #include <kapplication.h>
 #include <klocale.h>
-#include <kio/netaccess.h>
-#include <kfiledialog.h>
+#include <tdeio/netaccess.h>
+#include <tdefiledialog.h>
 #include <kurl.h>
 
 //app includes
-- 
cgit v1.2.1