summaryrefslogtreecommitdiffstats
path: root/kgpg
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:22:31 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:22:31 -0600
commitbd11bce76f195adf4f3806cef8cf2e0737c99ff2 (patch)
treee3c1714d74f67cc51cd04162cd4afa927dd7f7d4 /kgpg
parent2d7591be424ae10d974d01e0e2f781d19ef07cd6 (diff)
downloadtdeutils-bd11bce76f195adf4f3806cef8cf2e0737c99ff2.tar.gz
tdeutils-bd11bce76f195adf4f3806cef8cf2e0737c99ff2.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kgpg')
-rw-r--r--kgpg/conf_servers.ui2
-rw-r--r--kgpg/detailedconsole.cpp2
-rw-r--r--kgpg/keyinfowidget.cpp2
-rw-r--r--kgpg/keyservers.cpp4
-rw-r--r--kgpg/kgpg.cpp2
-rw-r--r--kgpg/kgpg.h4
-rw-r--r--kgpg/kgpgeditor.cpp4
-rw-r--r--kgpg/kgpgeditor.h2
-rw-r--r--kgpg/kgpginterface.cpp10
-rw-r--r--kgpg/kgpglibrary.h2
-rw-r--r--kgpg/kgpgoptions.cpp4
-rw-r--r--kgpg/kgpgview.cpp2
-rw-r--r--kgpg/listkeys.cpp12
-rw-r--r--kgpg/listkeys.h10
-rw-r--r--kgpg/popuppublic.cpp10
-rw-r--r--kgpg/popuppublic.h2
-rw-r--r--kgpg/searchres.ui2
17 files changed, 38 insertions, 38 deletions
diff --git a/kgpg/conf_servers.ui b/kgpg/conf_servers.ui
index 121f468..677f561 100644
--- a/kgpg/conf_servers.ui
+++ b/kgpg/conf_servers.ui
@@ -113,6 +113,6 @@ all others will be stored for use by KGpg only.</string>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kpushbutton.h</includehint>
- <includehint>klistbox.h</includehint>
+ <includehint>tdelistbox.h</includehint>
</includehints>
</UI>
diff --git a/kgpg/detailedconsole.cpp b/kgpg/detailedconsole.cpp
index 30a5ca0..2fe2ce3 100644
--- a/kgpg/detailedconsole.cpp
+++ b/kgpg/detailedconsole.cpp
@@ -23,7 +23,7 @@
#include <kmessagebox.h>
#include <klocale.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
#include <kglobal.h>
#include "kgpgoptions.h"
diff --git a/kgpg/keyinfowidget.cpp b/kgpg/keyinfowidget.cpp
index ba7b641..15a6e67 100644
--- a/kgpg/keyinfowidget.cpp
+++ b/kgpg/keyinfowidget.cpp
@@ -21,7 +21,7 @@
#include <tqfile.h>
#include <kprocio.h>
#include <kpassivepopup.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <tqregexp.h>
#include <ktempfile.h>
#include <tqimage.h>
diff --git a/kgpg/keyservers.cpp b/kgpg/keyservers.cpp
index c731fbe..8f05a83 100644
--- a/kgpg/keyservers.cpp
+++ b/kgpg/keyservers.cpp
@@ -38,12 +38,12 @@
#include <klocale.h>
#include <kprocess.h>
#include <kprocio.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kstatusbar.h>
#include <tdeconfig.h>
#include <klineedit.h>
#include <ksimpleconfig.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kdebug.h>
diff --git a/kgpg/kgpg.cpp b/kgpg/kgpg.cpp
index d3eecbc..776c60f 100644
--- a/kgpg/kgpg.cpp
+++ b/kgpg/kgpg.cpp
@@ -58,7 +58,7 @@
#include <dcopclient.h>
#include <kstandarddirs.h>
#include <tdefiledialog.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <tqcursor.h>
#include <kdesktopfile.h>
diff --git a/kgpg/kgpg.h b/kgpg/kgpg.h
index c39ca0e..e797d28 100644
--- a/kgpg/kgpg.h
+++ b/kgpg/kgpg.h
@@ -22,11 +22,11 @@
#include <config.h>
#endif
-#include <kaction.h>
+#include <tdeaction.h>
#include <ksystemtray.h>
#include <kuniqueapplication.h>
#include <kurl.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
#include <tqlabel.h>
#include <tqstringlist.h>
diff --git a/kgpg/kgpgeditor.cpp b/kgpg/kgpgeditor.cpp
index 1351933..212d9a3 100644
--- a/kgpg/kgpgeditor.cpp
+++ b/kgpg/kgpgeditor.cpp
@@ -17,7 +17,7 @@
#include <stdlib.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <tdefiledialog.h>
#include <klocale.h>
#include <dcopclient.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"+chectdefile.hexDigest().data()));
+ // KMessageBox::information(this,TQString("MD5 sum for "+url.fileName()+" is:\n"+checkfile.hexDigest().data()));
}
}
diff --git a/kgpg/kgpgeditor.h b/kgpg/kgpgeditor.h
index e480207..4f8a9fb 100644
--- a/kgpg/kgpgeditor.h
+++ b/kgpg/kgpgeditor.h
@@ -22,7 +22,7 @@
#include <config.h>
#endif
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include <tqstringlist.h>
#include <kurl.h>
diff --git a/kgpg/kgpginterface.cpp b/kgpg/kgpginterface.cpp
index 28ce7d0..965a9d9 100644
--- a/kgpg/kgpginterface.cpp
+++ b/kgpg/kgpginterface.cpp
@@ -35,7 +35,7 @@
#include <kcharsets.h>
#include <kpassivepopup.h>
#include <kiconloader.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <tqtextcodec.h>
#include <kprocess.h>
#include <kprocio.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 chectdefile;
- chectdefile.reset();
- chectdefile.update(*TQT_TQIODEVICE(&f));
- mdSum=chectdefile.hexDigest().data();
+ KMD5 checkfile;
+ checkfile.reset();
+ checkfile.update(*TQT_TQIODEVICE(&f));
+ mdSum=checkfile.hexDigest().data();
f.close();
TQWidget *page = new TQWidget(this);
diff --git a/kgpg/kgpglibrary.h b/kgpg/kgpglibrary.h
index 0785945..267b7f6 100644
--- a/kgpg/kgpglibrary.h
+++ b/kgpg/kgpglibrary.h
@@ -21,7 +21,7 @@
#include <tqobject.h>
#include <kurl.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
#include <tdeio/job.h>
class KPassivePopup;
diff --git a/kgpg/kgpgoptions.cpp b/kgpg/kgpgoptions.cpp
index 9a4d6ed..7113b4e 100644
--- a/kgpg/kgpgoptions.cpp
+++ b/kgpg/kgpgoptions.cpp
@@ -31,7 +31,7 @@
#include <tqradiobutton.h>
#include <tqpushbutton.h>
#include <tqfont.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kmessagebox.h>
#include <klineedit.h>
#include <kcombobox.h>
@@ -39,7 +39,7 @@
#include <kiconloader.h>
#include <tdefiledialog.h>
#include <kinputdialog.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
#include <kdesktopfile.h>
#include <kstandarddirs.h>
#include <kcolorbutton.h>
diff --git a/kgpg/kgpgview.cpp b/kgpg/kgpgview.cpp
index 1f1e166..aafa0fb 100644
--- a/kgpg/kgpgview.cpp
+++ b/kgpg/kgpgview.cpp
@@ -35,7 +35,7 @@
#include <tqlayout.h>
#include <kbuttonbox.h>
#include <unistd.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <klineedit.h>
#include <tqtextcodec.h>
diff --git a/kgpg/listkeys.cpp b/kgpg/listkeys.cpp
index acfe42e..5804280 100644
--- a/kgpg/listkeys.cpp
+++ b/kgpg/listkeys.cpp
@@ -41,7 +41,7 @@
#include <kprocess.h>
#include <kprocio.h>
#include <tqwidget.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <tqcheckbox.h>
#include <tqlabel.h>
#include <tqtoolbutton.h>
@@ -52,8 +52,8 @@
#include <tdeio/netaccess.h>
#include <kurl.h>
#include <tdefiledialog.h>
-#include <kshortcut.h>
-#include <kstdaccel.h>
+#include <tdeshortcut.h>
+#include <tdestdaccel.h>
#include <klocale.h>
#include <ktip.h>
#include <krun.h>
@@ -1559,15 +1559,15 @@ void listKeys::slotexport()
}
} else {
- TQStringList klist;
+ TQStringList tdelist;
for ( uint i = 0; i < exportList.count(); ++i )
if ( exportList.at(i) )
- klist.append(exportList.at(i)->text(6).stripWhiteSpace());
+ tdelist.append(exportList.at(i)->text(6).stripWhiteSpace());
KgpgInterface *kexp=new KgpgInterface();
- TQString result=kexp->getKey(klist,exportAttr);
+ TQString result=kexp->getKey(tdelist,exportAttr);
if (page->checkClipboard->isChecked())
slotProcessExportClip(result);
//connect(kexp,TQT_SIGNAL(publicKeyString(TQString)),TQT_TQOBJECT(this),TQT_SLOT(slotProcessExportClip(TQString)));
diff --git a/kgpg/listkeys.h b/kgpg/listkeys.h
index 73e9818..55af3b5 100644
--- a/kgpg/listkeys.h
+++ b/kgpg/listkeys.h
@@ -19,11 +19,11 @@
#define LISTKEYS_H
#include <kdialogbase.h>
-#include <klistview.h>
-#include <kmainwindow.h>
-#include <klistviewsearchline.h>
+#include <tdelistview.h>
+#include <tdemainwindow.h>
+#include <tdelistviewsearchline.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
#include <tqclipboard.h>
#include "dcopiface.h"
@@ -33,7 +33,7 @@
#include <kurl.h>
#include <tqcheckbox.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
class TQPushButton;
class TQPopupMenu;
diff --git a/kgpg/popuppublic.cpp b/kgpg/popuppublic.cpp
index 46a9f61..fd7343b 100644
--- a/kgpg/popuppublic.cpp
+++ b/kgpg/popuppublic.cpp
@@ -29,16 +29,16 @@
#include <tqtextcodec.h>
#include <tdeversion.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <kprocess.h>
#include <kprocio.h>
#include <klocale.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
#if KDE_IS_VERSION( 3, 2, 90 )
-#include <klistviewsearchline.h>
+#include <tdelistviewsearchline.h>
#endif
#include <kactivelabel.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kdebug.h>
#include <kiconloader.h>
#include <klineedit.h>
@@ -49,7 +49,7 @@
#include "kgpgview.h"
#include "kgpg.h"
-///////////////// klistviewitem special
+///////////////// tdelistviewitem special
class UpdateViewItem2 : public TDEListViewItem
{
diff --git a/kgpg/popuppublic.h b/kgpg/popuppublic.h
index 9bf910c..8f9e418 100644
--- a/kgpg/popuppublic.h
+++ b/kgpg/popuppublic.h
@@ -20,7 +20,7 @@
#include <kdialogbase.h>
//#include <kiconloader.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
class TQPushButton;
diff --git a/kgpg/searchres.ui b/kgpg/searchres.ui
index 8fd7379..3a9a325 100644
--- a/kgpg/searchres.ui
+++ b/kgpg/searchres.ui
@@ -119,6 +119,6 @@
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klineedit.h</includehint>
- <includehint>klistview.h</includehint>
+ <includehint>tdelistview.h</includehint>
</includehints>
</UI>