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

---
 kgpg/keyservers.cpp     |  2 +-
 kgpg/kgpg.cpp           |  6 +++---
 kgpg/kgpgeditor.cpp     |  8 ++++----
 kgpg/kgpginterface.cpp  | 12 ++++++------
 kgpg/kgpglibrary.cpp    |  4 ++--
 kgpg/kgpglibrary.h      |  2 +-
 kgpg/kgpgoptions.cpp    |  4 ++--
 kgpg/kgpgoptions.h      |  2 +-
 kgpg/kgpgsettings.kcfgc |  2 +-
 kgpg/kgpgview.cpp       |  2 +-
 kgpg/listkeys.cpp       |  4 ++--
 11 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'kgpg')

diff --git a/kgpg/keyservers.cpp b/kgpg/keyservers.cpp
index b0a673d..55135dd 100644
--- a/kgpg/keyservers.cpp
+++ b/kgpg/keyservers.cpp
@@ -40,7 +40,7 @@
 #include <kprocio.h>
 #include <klistview.h>
 #include <kstatusbar.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klineedit.h>
 #include <ksimpleconfig.h>
 #include <kaction.h>
diff --git a/kgpg/kgpg.cpp b/kgpg/kgpg.cpp
index 34aa268..0dc74a1 100644
--- a/kgpg/kgpg.cpp
+++ b/kgpg/kgpg.cpp
@@ -30,7 +30,7 @@
 #include <kactivelabel.h>
 #include <tdeversion.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kmessagebox.h>
 #include <kcombobox.h>
@@ -40,7 +40,7 @@
 #include <kdebug.h>
 #include <kurlrequesterdlg.h>
 #include <klineedit.h>
-#include <kio/renamedlg.h>
+#include <tdeio/renamedlg.h>
 #include <kpassivepopup.h>
 #include <tqlayout.h>
 #include <tqbuttongroup.h>
@@ -57,7 +57,7 @@
 #include <kzip.h>
 #include <dcopclient.h>
 #include <kstandarddirs.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kpopupmenu.h>
 #include <tqcursor.h>
 #include <kdesktopfile.h>
diff --git a/kgpg/kgpgeditor.cpp b/kgpg/kgpgeditor.cpp
index 7c69f4f..897bf44 100644
--- a/kgpg/kgpgeditor.cpp
+++ b/kgpg/kgpgeditor.cpp
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 
 #include <kaction.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <klocale.h>
 #include <dcopclient.h>
 #include <tqpaintdevicemetrics.h>
@@ -37,8 +37,8 @@
 #include <tqcheckbox.h>
 #include <kurlrequester.h>
 #include <ktempfile.h>
-#include <kio/netaccess.h>
-#include <kio/renamedlg.h>
+#include <tdeio/netaccess.h>
+#include <tdeio/renamedlg.h>
 #include <kedittoolbar.h>
 
 
@@ -470,7 +470,7 @@ void KgpgApp::slotCheckMd5()
                 Md5Widget *mdwidget=new Md5Widget(this,0,url);
                 mdwidget->exec();
                 delete mdwidget;
-                //      KMessageBox::information(this,TQString("MD5 sum for "+url.fileName()+" is:\n"+checkfile.hexDigest().data()));
+                //      KMessageBox::information(this,TQString("MD5 sum for "+url.fileName()+" is:\n"+chectdefile.hexDigest().data()));
         }
 }
 
diff --git a/kgpg/kgpginterface.cpp b/kgpg/kgpginterface.cpp
index fae5911..28ce7d0 100644
--- a/kgpg/kgpginterface.cpp
+++ b/kgpg/kgpginterface.cpp
@@ -24,7 +24,7 @@
 #include <tqstring.h>
 #include <tqlabel.h>
 #include <tqapplication.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <tqcheckbox.h>
 
 #include <kmessagebox.h>
@@ -39,7 +39,7 @@
 #include <tqtextcodec.h>
 #include <kprocess.h>
 #include <kprocio.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqfile.h>
 #include <kled.h>
 #include <kdebug.h>
@@ -617,10 +617,10 @@ Md5Widget::Md5Widget(TQWidget *parent, const char *name,KURL url):KDialogBase( p
         mdSum=TQString();
         TQFile f(url.path());
         f.open( IO_ReadOnly);
-        KMD5 checkfile;
-        checkfile.reset();
-        checkfile.update(*TQT_TQIODEVICE(&f));
-        mdSum=checkfile.hexDigest().data();
+        KMD5 chectdefile;
+        chectdefile.reset();
+        chectdefile.update(*TQT_TQIODEVICE(&f));
+        mdSum=chectdefile.hexDigest().data();
         f.close();
         TQWidget *page = new TQWidget(this);
 
diff --git a/kgpg/kgpglibrary.cpp b/kgpg/kgpglibrary.cpp
index 5dc6636..924c91b 100644
--- a/kgpg/kgpglibrary.cpp
+++ b/kgpg/kgpglibrary.cpp
@@ -20,7 +20,7 @@
 
 #include <klocale.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <krun.h>
 #include <tqfile.h>
@@ -29,7 +29,7 @@
 #include "kgpglibrary.h"
 #include "popuppublic.h"
 #include "kgpginterface.h"
-#include <kio/renamedlg.h>
+#include <tdeio/renamedlg.h>
 
 KgpgLibrary::KgpgLibrary(TQWidget *parent, bool pgpExtension)
 {
diff --git a/kgpg/kgpglibrary.h b/kgpg/kgpglibrary.h
index 96f199e..e29563a 100644
--- a/kgpg/kgpglibrary.h
+++ b/kgpg/kgpglibrary.h
@@ -22,7 +22,7 @@
 #include <tqobject.h>
 #include <kurl.h>
 #include <kshortcut.h>
-#include <kio/job.h> 
+#include <tdeio/job.h> 
 
 class KPassivePopup;
 class KProgress;
diff --git a/kgpg/kgpgoptions.cpp b/kgpg/kgpgoptions.cpp
index 825b413..749f3c5 100644
--- a/kgpg/kgpgoptions.cpp
+++ b/kgpg/kgpgoptions.cpp
@@ -23,7 +23,7 @@
 #include <tqlabel.h>
 #include <tqtoolbutton.h>
 #include <tqfile.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tdeversion.h>
 #include <klocale.h>
 #include <kprocio.h>
@@ -37,7 +37,7 @@
 #include <kcombobox.h>
 #include <kurlrequester.h>
 #include <kiconloader.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kinputdialog.h>
 #include <kfontdialog.h>
 #include <kdesktopfile.h>
diff --git a/kgpg/kgpgoptions.h b/kgpg/kgpgoptions.h
index 7dcc8df..0231ba1 100644
--- a/kgpg/kgpgoptions.h
+++ b/kgpg/kgpgoptions.h
@@ -17,7 +17,7 @@
 #ifndef KGPGOPTIONS_H
 #define KGPGOPTIONS_H
 
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 
 #define GoodColor 0
 #define BadColor 1
diff --git a/kgpg/kgpgsettings.kcfgc b/kgpg/kgpgsettings.kcfgc
index 2eb79d7..3ea7c6d 100644
--- a/kgpg/kgpgsettings.kcfgc
+++ b/kgpg/kgpgsettings.kcfgc
@@ -1,4 +1,4 @@
-# Code generation options for kconfig_compiler
+# Code generation options for tdeconfig_compiler
 File=kgpg.kcfg
 ClassName=KGpgSettings
 Singleton=true
diff --git a/kgpg/kgpgview.cpp b/kgpg/kgpgview.cpp
index 3602156..1f1e166 100644
--- a/kgpg/kgpgview.cpp
+++ b/kgpg/kgpgview.cpp
@@ -25,7 +25,7 @@
 #include <tqscrollview.h>
 #include <tqregexp.h>
 
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klocale.h>
 #include <kstdaction.h>
 #include <kurldrag.h>
diff --git a/kgpg/listkeys.cpp b/kgpg/listkeys.cpp
index 0e4a5ca..3d5b20b 100644
--- a/kgpg/listkeys.cpp
+++ b/kgpg/listkeys.cpp
@@ -49,9 +49,9 @@
 #include <tqpopupmenu.h>
 
 #include <kurlrequester.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kurl.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kshortcut.h>
 #include <kstdaccel.h>
 #include <klocale.h>
-- 
cgit v1.2.1