summaryrefslogtreecommitdiffstats
path: root/kgpg
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:14:58 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:14:58 -0600
commit9e5c87c89567a98c3344c90e392a27715437334c (patch)
tree6c1dd96ae0ba38b7e8f0a492d591881f44f474da /kgpg
parent53904b41cf005abbae3d468532db9adc2b04a9b4 (diff)
downloadtdeutils-9e5c87c89567a98c3344c90e392a27715437334c.tar.gz
tdeutils-9e5c87c89567a98c3344c90e392a27715437334c.zip
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'kgpg')
-rw-r--r--kgpg/conf_servers.ui2
-rw-r--r--kgpg/groupedit.ui4
-rw-r--r--kgpg/keyservers.cpp4
-rw-r--r--kgpg/keyservers.h4
-rw-r--r--kgpg/kgpg.cpp28
-rw-r--r--kgpg/kgpg.h6
-rw-r--r--kgpg/kgpgeditor.cpp20
-rw-r--r--kgpg/kgpgeditor.h14
-rw-r--r--kgpg/kgpglibrary.cpp2
-rw-r--r--kgpg/kgpglibrary.h2
-rw-r--r--kgpg/kgpgoptions.cpp2
-rw-r--r--kgpg/kgpgoptions.h4
-rw-r--r--kgpg/listkeys.cpp124
-rw-r--r--kgpg/listkeys.h18
-rw-r--r--kgpg/popuppublic.cpp20
-rw-r--r--kgpg/popuppublic.h6
-rw-r--r--kgpg/searchres.ui2
17 files changed, 131 insertions, 131 deletions
diff --git a/kgpg/conf_servers.ui b/kgpg/conf_servers.ui
index f93b871..121f468 100644
--- a/kgpg/conf_servers.ui
+++ b/kgpg/conf_servers.ui
@@ -67,7 +67,7 @@
<string>Delete</string>
</property>
</widget>
- <widget class="KListBox" row="0" column="0" rowspan="4" colspan="1">
+ <widget class="TDEListBox" row="0" column="0" rowspan="4" colspan="1">
<property name="name">
<cstring>ServerBox</cstring>
</property>
diff --git a/kgpg/groupedit.ui b/kgpg/groupedit.ui
index fe6d178..794a310 100644
--- a/kgpg/groupedit.ui
+++ b/kgpg/groupedit.ui
@@ -22,7 +22,7 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="KListView" row="1" column="0" rowspan="1" colspan="4">
+ <widget class="TDEListView" row="1" column="0" rowspan="1" colspan="4">
<column>
<property name="text">
<string>Name</string>
@@ -142,7 +142,7 @@
<string>&lt;b&gt;Keys in the Group&lt;/b&gt;</string>
</property>
</widget>
- <widget class="KListView" row="3" column="0" rowspan="1" colspan="4">
+ <widget class="TDEListView" row="3" column="0" rowspan="1" colspan="4">
<column>
<property name="text">
<string>Name</string>
diff --git a/kgpg/keyservers.cpp b/kgpg/keyservers.cpp
index 55135dd..c731fbe 100644
--- a/kgpg/keyservers.cpp
+++ b/kgpg/keyservers.cpp
@@ -304,7 +304,7 @@ void keyServer::slotsearchread(KProcIO *p)
keymail=TQString();
keyname=fullname;
}
- kitem=new KListViewItem(listpop->kLVsearch,keyname,keymail,TQString(),TQString());
+ kitem=new TDEListViewItem(listpop->kLVsearch,keyname,keymail,TQString(),TQString());
keyNumbers++;
count=0;
required=TQString();
@@ -332,7 +332,7 @@ void keyServer::slotsearchread(KProcIO *p)
keymail=TQString();
keyname=subkey;
}
- KListViewItem *subk = new KListViewItem(kitem,keyname,keymail,TQString(),TQString());
+ TDEListViewItem *subk = new TDEListViewItem(kitem,keyname,keymail,TQString(),TQString());
subk->setSelectable(false);
}
required=TQString();
diff --git a/kgpg/keyservers.h b/kgpg/keyservers.h
index 2387b2a..4a089f8 100644
--- a/kgpg/keyservers.h
+++ b/kgpg/keyservers.h
@@ -21,7 +21,7 @@
#include <kdialogbase.h>
#include "keyserver.h"
-class KListViewItem;
+class TDEListViewItem;
class KSimpleConfig;
class KProcIO;
class TDEProcess;
@@ -71,7 +71,7 @@ private:
searchRes *listpop;
int count;
bool cycle,autoCloseWindow;
- KListViewItem *kitem;
+ TDEListViewItem *kitem;
KDialogBase *dialogServer;
signals:
diff --git a/kgpg/kgpg.cpp b/kgpg/kgpg.cpp
index 44ff121..d3eecbc 100644
--- a/kgpg/kgpg.cpp
+++ b/kgpg/kgpg.cpp
@@ -80,10 +80,10 @@ MyView::MyView( TQWidget *parent, const char *name )
setBackgroundMode( X11ParentRelative );
openTasks=0;
- KAction *saveDecrypt=new KAction(i18n("&Decrypt && Save File"),"decrypted",0,TQT_TQOBJECT(this), TQT_SLOT(decryptDroppedFile()),TQT_TQOBJECT(this),"decrypt_file");
- KAction *showDecrypt=new KAction(i18n("&Show Decrypted File"),"edit",0,TQT_TQOBJECT(this), TQT_SLOT(showDroppedFile()),TQT_TQOBJECT(this),"show_file");
- KAction *encrypt=new KAction(i18n("&Encrypt File"),"encrypted",0,TQT_TQOBJECT(this), TQT_SLOT(encryptDroppedFile()),TQT_TQOBJECT(this),"encrypt_file");
- KAction *sign=new KAction(i18n("&Sign File"), "signature",0,TQT_TQOBJECT(this), TQT_SLOT(signDroppedFile()),TQT_TQOBJECT(this),"sign_file");
+ TDEAction *saveDecrypt=new TDEAction(i18n("&Decrypt && Save File"),"decrypted",0,TQT_TQOBJECT(this), TQT_SLOT(decryptDroppedFile()),TQT_TQOBJECT(this),"decrypt_file");
+ TDEAction *showDecrypt=new TDEAction(i18n("&Show Decrypted File"),"edit",0,TQT_TQOBJECT(this), TQT_SLOT(showDroppedFile()),TQT_TQOBJECT(this),"show_file");
+ TDEAction *encrypt=new TDEAction(i18n("&Encrypt File"),"encrypted",0,TQT_TQOBJECT(this), TQT_SLOT(encryptDroppedFile()),TQT_TQOBJECT(this),"encrypt_file");
+ TDEAction *sign=new TDEAction(i18n("&Sign File"), "signature",0,TQT_TQOBJECT(this), TQT_SLOT(signDroppedFile()),TQT_TQOBJECT(this),"sign_file");
//TQToolTip::add(this,i18n("KGpg drag & drop encryption applet"));
readOptions();
@@ -306,7 +306,7 @@ TQBoxLayout *layout=new TQBoxLayout(page,TQBoxLayout::TopToBottom,0);
layout->setAutoAdd(true);
(void) new KActiveLabel( i18n("Do you really want to <a href=\"whatsthis:%1\">shred</a> these files?").arg(i18n( "<qt><p>You must be aware that <b>shredding is not secure</b> on all file systems, and that parts of the file may have been saved in a temporary file or in the spooler of your printer if you previously opened it in an editor or tried to print it. Only works on files (not on folders).</p></qt>")),page);
-KListBox *lb=new KListBox(page);
+TDEListBox *lb=new TDEListBox(page);
lb->insertStringList(droppedUrls.toStringList());
if (shredConfirm->exec()==TQDialog::Accepted)
{
@@ -776,18 +776,18 @@ kgpgapplet::kgpgapplet(TQWidget *parent, const char *name)
{
w=new MyView(this);
w->show();
- KPopupMenu *conf_menu=contextMenu();
- KgpgEncryptClipboard = new KAction(i18n("&Encrypt Clipboard"), "kgpg", 0,TQT_TQOBJECT(w), TQT_SLOT(clipEncrypt()),actionCollection(),"clip_encrypt");
- KgpgDecryptClipboard = new KAction(i18n("&Decrypt Clipboard"), 0, 0,TQT_TQOBJECT(w), TQT_SLOT(clipDecrypt()),actionCollection(),"clip_decrypt");
- KgpgSignClipboard = new KAction(i18n("&Sign/Verify Clipboard"), "signature", 0,TQT_TQOBJECT(w), TQT_SLOT(clipSign()),actionCollection(),"clip_sign");
- KAction *KgpgOpenEditor;
+ TDEPopupMenu *conf_menu=contextMenu();
+ KgpgEncryptClipboard = new TDEAction(i18n("&Encrypt Clipboard"), "kgpg", 0,TQT_TQOBJECT(w), TQT_SLOT(clipEncrypt()),actionCollection(),"clip_encrypt");
+ KgpgDecryptClipboard = new TDEAction(i18n("&Decrypt Clipboard"), 0, 0,TQT_TQOBJECT(w), TQT_SLOT(clipDecrypt()),actionCollection(),"clip_decrypt");
+ KgpgSignClipboard = new TDEAction(i18n("&Sign/Verify Clipboard"), "signature", 0,TQT_TQOBJECT(w), TQT_SLOT(clipSign()),actionCollection(),"clip_sign");
+ TDEAction *KgpgOpenEditor;
if (KGpgSettings::leftClick()==KGpgSettings::EnumLeftClick::KeyManager)
- KgpgOpenEditor = new KAction(i18n("&Open Editor"), "edit", 0,TQT_TQOBJECT(parent), TQT_SLOT(slotOpenEditor()),actionCollection(),"kgpg_editor");
+ KgpgOpenEditor = new TDEAction(i18n("&Open Editor"), "edit", 0,TQT_TQOBJECT(parent), TQT_SLOT(slotOpenEditor()),actionCollection(),"kgpg_editor");
else
- KgpgOpenEditor = new KAction(i18n("&Open Key Manager"), "kgpg", 0,TQT_TQOBJECT(this), TQT_SLOT(slotOpenKeyManager()),actionCollection(),"kgpg_editor");
+ KgpgOpenEditor = new TDEAction(i18n("&Open Key Manager"), "kgpg", 0,TQT_TQOBJECT(this), TQT_SLOT(slotOpenKeyManager()),actionCollection(),"kgpg_editor");
- KAction *KgpgOpenServer = new KAction(i18n("&Key Server Dialog"), "network", 0,TQT_TQOBJECT(this), TQT_SLOT(slotOpenServerDialog()),actionCollection(),"kgpg_server");
- KAction *KgpgPreferences=KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showOptions()), actionCollection());
+ TDEAction *KgpgOpenServer = new TDEAction(i18n("&Key Server Dialog"), "network", 0,TQT_TQOBJECT(this), TQT_SLOT(slotOpenServerDialog()),actionCollection(),"kgpg_server");
+ TDEAction *KgpgPreferences=KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showOptions()), actionCollection());
connect (conf_menu,TQT_SIGNAL(aboutToShow()),TQT_TQOBJECT(this),TQT_SLOT(checkMenu()));
diff --git a/kgpg/kgpg.h b/kgpg/kgpg.h
index 973296b..c39ca0e 100644
--- a/kgpg/kgpg.h
+++ b/kgpg/kgpg.h
@@ -53,7 +53,7 @@ public:
KURL droppedUrl;
KURL::List droppedUrls;
KTempFile *kgpgfoldertmp;
- KShortcut goDefaultKey;
+ TDEShortcut goDefaultKey;
TQClipboard::Mode clipboardMode;
private:
@@ -132,7 +132,7 @@ public:
private:
KSystemTray *kgpgapp;
- KAction *KgpgEncryptClipboard, *KgpgDecryptClipboard, *KgpgSignClipboard;
+ TDEAction *KgpgEncryptClipboard, *KgpgDecryptClipboard, *KgpgSignClipboard;
private slots:
void slotOpenKeyManager();
@@ -154,7 +154,7 @@ public:
int newInstance ();
KURL::List urlList;
bool running;
- KShortcut goHome;
+ TDEShortcut goHome;
protected:
TDECmdLineArgs *args;
diff --git a/kgpg/kgpgeditor.cpp b/kgpg/kgpgeditor.cpp
index 897bf44..1351933 100644
--- a/kgpg/kgpgeditor.cpp
+++ b/kgpg/kgpgeditor.cpp
@@ -53,7 +53,7 @@
#include "listkeys.h"
#include "kgpglibrary.h"
-KgpgApp::KgpgApp(TQWidget *parent, const char *name, WFlags f,KShortcut goHome,bool mainWindow):KMainWindow(parent, name,f)
+KgpgApp::KgpgApp(TQWidget *parent, const char *name, WFlags f,TDEShortcut goHome,bool mainWindow):TDEMainWindow(parent, name,f)
{
isMainWindow=mainWindow;
textEncoding=TQString();
@@ -94,7 +94,7 @@ void KgpgApp::closeEvent ( TQCloseEvent * e )
if (!isMainWindow)
{
kapp->ref();
- KMainWindow::closeEvent( e );
+ TDEMainWindow::closeEvent( e );
}
else e->accept();
}
@@ -140,19 +140,19 @@ void KgpgApp::initActions()
//KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolbars()), actionCollection());
fileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection());
- (void) new KAction(i18n("&Encrypt File..."), "encrypted", 0,TQT_TQOBJECT(this), TQT_SLOT(slotFilePreEnc()), actionCollection(),"file_encrypt");
- (void) new KAction(i18n("&Decrypt File..."), "decrypted", 0,TQT_TQOBJECT(this), TQT_SLOT(slotFilePreDec()), actionCollection(),"file_decrypt");
- (void) new KAction(i18n("&Open Key Manager"), "kgpg", 0,TQT_TQOBJECT(this), TQT_SLOT(slotKeyManager()), actionCollection(),"key_manage");
+ (void) new TDEAction(i18n("&Encrypt File..."), "encrypted", 0,TQT_TQOBJECT(this), TQT_SLOT(slotFilePreEnc()), actionCollection(),"file_encrypt");
+ (void) new TDEAction(i18n("&Decrypt File..."), "decrypted", 0,TQT_TQOBJECT(this), TQT_SLOT(slotFilePreDec()), actionCollection(),"file_decrypt");
+ (void) new TDEAction(i18n("&Open Key Manager"), "kgpg", 0,TQT_TQOBJECT(this), TQT_SLOT(slotKeyManager()), actionCollection(),"key_manage");
editUndo = KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotundo()), actionCollection());
editRedo = KStdAction::redo(TQT_TQOBJECT(this), TQT_SLOT(slotredo()), actionCollection());
- //(void) new KAction(i18n("&Manage Keys"), "kgpg_manage", CTRL+Key_K,TQT_TQOBJECT(this), TQT_SLOT(slotManageKey()), actionCollection(),"keys_manage");
- (void) new KAction(i18n("&Generate Signature..."),0, TQT_TQOBJECT(this), TQT_SLOT(slotPreSignFile()), actionCollection(), "sign_generate");
- (void) new KAction(i18n("&Verify Signature..."),0, TQT_TQOBJECT(this), TQT_SLOT(slotPreVerifyFile()), actionCollection(), "sign_verify");
- (void) new KAction(i18n("&Check MD5 Sum..."), 0,TQT_TQOBJECT(this), TQT_SLOT(slotCheckMd5()), actionCollection(), "sign_check");
+ //(void) new TDEAction(i18n("&Manage Keys"), "kgpg_manage", CTRL+Key_K,TQT_TQOBJECT(this), TQT_SLOT(slotManageKey()), actionCollection(),"keys_manage");
+ (void) new TDEAction(i18n("&Generate Signature..."),0, TQT_TQOBJECT(this), TQT_SLOT(slotPreSignFile()), actionCollection(), "sign_generate");
+ (void) new TDEAction(i18n("&Verify Signature..."),0, TQT_TQOBJECT(this), TQT_SLOT(slotPreVerifyFile()), actionCollection(), "sign_verify");
+ (void) new TDEAction(i18n("&Check MD5 Sum..."), 0,TQT_TQOBJECT(this), TQT_SLOT(slotCheckMd5()), actionCollection(), "sign_check");
KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection());
// comment out for now, only confusing
- //encodingAction=new KToggleAction(i18n("&Unicode (utf-8) Encoding"), 0, 0,this, TQT_SLOT(slotSetCharset()),actionCollection(),"charsets");
+ //encodingAction=new TDEToggleAction(i18n("&Unicode (utf-8) Encoding"), 0, 0,this, TQT_SLOT(slotSetCharset()),actionCollection(),"charsets");
}
void KgpgApp::slotSetFont(TQFont myFont)
diff --git a/kgpg/kgpgeditor.h b/kgpg/kgpgeditor.h
index 6123847..e480207 100644
--- a/kgpg/kgpgeditor.h
+++ b/kgpg/kgpgeditor.h
@@ -29,11 +29,11 @@
class KPassivePopup;
class KComboBox;
-class KToggleAction;
-class KAction;
+class TDEToggleAction;
+class TDEAction;
class KgpgView;
-class KgpgApp : public KMainWindow
+class KgpgApp : public TDEMainWindow
{
Q_OBJECT
@@ -43,7 +43,7 @@ class KgpgApp : public KMainWindow
public:
/** construtor of KgpgApp, calls all init functions to create the application.
*/
- KgpgApp(TQWidget *parent=0, const char *name=0,WFlags f = 0,KShortcut goHome=TQKeySequence(CTRL+TQt::Key_Home),bool mainWindow=false);
+ KgpgApp(TQWidget *parent=0, const char *name=0,WFlags f = 0,TDEShortcut goHome=TQKeySequence(CTRL+TQt::Key_Home),bool mainWindow=false);
~KgpgApp();
/** opens a file specified by commandline option
*/
@@ -56,7 +56,7 @@ public:
int version;
TQString messages;
KgpgView *view;
- KShortcut goDefaultKey;
+ TDEShortcut goDefaultKey;
protected:
@@ -105,9 +105,9 @@ public slots:
private:
TQStringList customDecrypt;
- //KToggleAction *encodingAction ;
+ //TDEToggleAction *encodingAction ;
KURL urlselected;
- KAction* fileSave, *editUndo, *editRedo;
+ TDEAction* fileSave, *editUndo, *editRedo;
KComboBox *fontCombo;
bool isMainWindow;
TQString textEncoding;
diff --git a/kgpg/kgpglibrary.cpp b/kgpg/kgpglibrary.cpp
index 924c91b..ad0ee00 100644
--- a/kgpg/kgpglibrary.cpp
+++ b/kgpg/kgpglibrary.cpp
@@ -45,7 +45,7 @@ KgpgLibrary::~KgpgLibrary()
{}
-void KgpgLibrary::slotFileEnc(KURL::List urls,TQStringList opts,TQStringList defaultKey,KShortcut goDefaultKey)
+void KgpgLibrary::slotFileEnc(KURL::List urls,TQStringList opts,TQStringList defaultKey,TDEShortcut goDefaultKey)
{
///////////////////////////////////////////////////////////////////////// encode file file
if (!urls.empty()) {
diff --git a/kgpg/kgpglibrary.h b/kgpg/kgpglibrary.h
index e29563a..0785945 100644
--- a/kgpg/kgpglibrary.h
+++ b/kgpg/kgpglibrary.h
@@ -43,7 +43,7 @@ public:
KURL::List urlselecteds;
public slots:
- void slotFileEnc(KURL::List urls=KURL(""),TQStringList opts=TQString(),TQStringList defaultKey=TQString(),KShortcut goDefaultKey=TQKeySequence(CTRL+TQt::Key_Home));
+ void slotFileEnc(KURL::List urls=KURL(""),TQStringList opts=TQString(),TQStringList defaultKey=TQString(),TDEShortcut goDefaultKey=TQKeySequence(CTRL+TQt::Key_Home));
void slotFileDec(KURL srcUrl,KURL destUrl,TQStringList customDecryptOption=TQStringList());
void shredprocessenc(KURL::List filesToShred);
diff --git a/kgpg/kgpgoptions.cpp b/kgpg/kgpgoptions.cpp
index 749f3c5..9a4d6ed 100644
--- a/kgpg/kgpgoptions.cpp
+++ b/kgpg/kgpgoptions.cpp
@@ -91,7 +91,7 @@ kdDebug(2100)<<"Adding pages"<<endl;
page6=new ServerConf();
page7=new MiscConf();
TQBoxLayout *fontLayout=new TQBoxLayout(page3->tabWidget3->page(1),TQBoxLayout::TopToBottom,10);
- kfc=new KFontChooser(page3->tabWidget3->page(1),"kcfg_Font",false,TQStringList(),false);
+ kfc=new TDEFontChooser(page3->tabWidget3->page(1),"kcfg_Font",false,TQStringList(),false);
fontLayout->addWidget(kfc);
page7->shredInfo->setText(i18n( "<qt><p>You must be aware that <b>shredding is not secure</b> on all file systems, and that parts of the file may have been saved in a temporary file or in the spooler of your printer if you previously opened it in an editor or tried to print it. Only works on files (not on folders).</p></qt>"));
diff --git a/kgpg/kgpgoptions.h b/kgpg/kgpgoptions.h
index 0231ba1..5b981de 100644
--- a/kgpg/kgpgoptions.h
+++ b/kgpg/kgpgoptions.h
@@ -32,7 +32,7 @@ class GPGConf;
class ServerConf;
class ColorsConf;
class MiscConf;
-class KFontChooser;
+class TDEFontChooser;
class TDEConfig;
class KSimpleConfig;
@@ -50,7 +50,7 @@ public:
GPGConf *page4;
ServerConf *page6;
MiscConf *page7;
- KFontChooser *kfc;
+ TDEFontChooser *kfc;
private:
TDEConfig *config;
diff --git a/kgpg/listkeys.cpp b/kgpg/listkeys.cpp
index 6a9979c..acfe42e 100644
--- a/kgpg/listkeys.cpp
+++ b/kgpg/listkeys.cpp
@@ -97,9 +97,9 @@
#include "kgpgoptions.h"
#include "keyinfowidget.h"
-////////////// KListviewItem special
+////////////// TDEListviewItem special
-class UpdateViewItem : public KListViewItem
+class UpdateViewItem : public TDEListViewItem
{
public:
UpdateViewItem(TQListView *parent, TQString name,TQString email, TQString tr, TQString val, TQString size, TQString creat, TQString id,bool isdefault,bool isexpired);
@@ -111,7 +111,7 @@ public:
};
UpdateViewItem::UpdateViewItem(TQListView *parent, TQString name,TQString email, TQString tr, TQString val, TQString size, TQString creat, TQString id,bool isdefault,bool isexpired)
- : KListViewItem(parent)
+ : TDEListViewItem(parent)
{
def=isdefault;
exp=isexpired;
@@ -125,7 +125,7 @@ UpdateViewItem::UpdateViewItem(TQListView *parent, TQString name,TQString email,
}
UpdateViewItem::UpdateViewItem(TQListViewItem *parent, TQString name,TQString email, TQString tr, TQString val, TQString size, TQString creat, TQString id)
- : KListViewItem(parent)
+ : TDEListViewItem(parent)
{
setText(0,name);
setText(1,email);
@@ -157,7 +157,7 @@ void UpdateViewItem::paintCell(TQPainter *p, const TQColorGroup &cg,int column,
}
- KListViewItem::paintCell(p,_cg, column, width, alignment);
+ TDEListViewItem::paintCell(p,_cg, column, width, alignment);
}
#include <iostream>
@@ -223,7 +223,7 @@ KDialogBase( parent, name, true,i18n("Private Key List"),Ok | Cancel)
keyPair=loader->loadIcon("kgpg_key2",KIcon::Small,20);
setMinimumSize(350,100);
- keysListpr = new KListView( page );
+ keysListpr = new TDEListView( page );
keysListpr->setRootIsDecorated(true);
keysListpr->addColumn( i18n( "Name" ));
keysListpr->addColumn( i18n( "Email" ));
@@ -244,7 +244,7 @@ KDialogBase( parent, name, true,i18n("Private Key List"),Ok | Cancel)
bool selectedok=false;
bool warn=false;
- KListViewItem *item;
+ TDEListViewItem *item;
fp = popen("gpg --no-tty --with-colons --list-secret-keys", "r");
while ( fgets( line, sizeof(line), fp)) {
@@ -296,9 +296,9 @@ KDialogBase( parent, name, true,i18n("Private Key List"),Ok | Cancel)
keyName=KgpgInterface::checkForUtf8(keyName);
- item=new KListViewItem(keysListpr,keyName,keyMail,id);
- //KListViewItem *sub= new KListViewItem(item,i18n("ID: %1, trust: %2, expiration: %3").arg(id).arg(trust).arg(val));
- KListViewItem *sub= new KListViewItem(item,i18n("Expiration:"),val);
+ item=new TDEListViewItem(keysListpr,keyName,keyMail,id);
+ //TDEListViewItem *sub= new TDEListViewItem(item,i18n("ID: %1, trust: %2, expiration: %3").arg(id).arg(trust).arg(val));
+ TDEListViewItem *sub= new TDEListViewItem(item,i18n("Expiration:"),val);
sub->setSelectable(false);
item->setPixmap(0,keyPair);
if (preselected.find(id,0,false)!=-1) {
@@ -393,7 +393,7 @@ TQString KgpgSelKey::getkeyMail()
/////////////////////////////////////////////////////////////////////////////////////////////
KeyView::KeyView( TQWidget *parent, const char *name )
- : KListView( parent, name )
+ : TDEListView( parent, name )
{
KIconLoader *loader = TDEGlobal::iconLoader();
@@ -477,7 +477,7 @@ void KeyView::startDrag()
mySearchLine::mySearchLine(TQWidget *parent, KeyView *listView, const char *name)
-:KListViewSearchLine(parent,listView,name)
+:TDEListViewSearchLine(parent,listView,name)
{
searchListView=listView;
setKeepParentsVisible(false);
@@ -490,14 +490,14 @@ mySearchLine::~ mySearchLine()
bool mySearchLine::itemMatches(const TQListViewItem *item, const TQString & s) const
{
if (item->depth()!=0) return true;
-else return KListViewSearchLine::itemMatches(item,s);
+else return TDEListViewSearchLine::itemMatches(item,s);
}
void mySearchLine::updateSearch(const TQString& s)
{
- KListViewSearchLine::updateSearch(s);
+ TDEListViewSearchLine::updateSearch(s);
if (searchListView->displayOnlySecret || !searchListView->displayDisabled)
{
int disabledSerial=searchListView->trustbad.serialNumber();
@@ -519,7 +519,7 @@ void mySearchLine::updateSearch(const TQString& s)
/////////////////////////////////////////////////////////////////////////////////////// main window for key management
-listKeys::listKeys(TQWidget *parent, const char *name) : DCOPObject( "KeyInterface" ), KMainWindow(parent, name,0)
+listKeys::listKeys(TQWidget *parent, const char *name) : DCOPObject( "KeyInterface" ), TDEMainWindow(parent, name,0)
{
//KWin::setType(TQt::WDestructiveClose);
@@ -533,63 +533,63 @@ listKeys::listKeys(TQWidget *parent, const char *name) : DCOPObject( "KeyInterfa
installEventFilter(this);
setCaption(i18n("Key Management"));
- (void) new KAction(i18n("&Open Editor"), "edit",0,TQT_TQOBJECT(this), TQT_SLOT(slotOpenEditor()),actionCollection(),"kgpg_editor");
- KAction *exportPublicKey = new KAction(i18n("E&xport Public Keys..."), "kgpg_export", KStdAccel::shortcut(KStdAccel::Copy),TQT_TQOBJECT(this), TQT_SLOT(slotexport()),actionCollection(),"key_export");
- KAction *deleteKey = new KAction(i18n("&Delete Keys"),"editdelete", TQt::Key_Delete,TQT_TQOBJECT(this), TQT_SLOT(confirmdeletekey()),actionCollection(),"key_delete");
- signKey = new KAction(i18n("&Sign Keys..."), "kgpg_sign", 0,TQT_TQOBJECT(this), TQT_SLOT(signkey()),actionCollection(),"key_sign");
- KAction *delSignKey = new KAction(i18n("Delete Sign&ature"),"editdelete", 0,TQT_TQOBJECT(this), TQT_SLOT(delsignkey()),actionCollection(),"key_delsign");
- KAction *infoKey = new KAction(i18n("&Edit Key"), "kgpg_info", TQt::Key_Return,TQT_TQOBJECT(this), TQT_SLOT(listsigns()),actionCollection(),"key_info");
- KAction *importKey = new KAction(i18n("&Import Key..."), "kgpg_import", KStdAccel::shortcut(KStdAccel::Paste),TQT_TQOBJECT(this), TQT_SLOT(slotPreImportKey()),actionCollection(),"key_import");
- KAction *setDefaultKey = new KAction(i18n("Set as De&fault Key"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotSetDefKey()),actionCollection(),"key_default");
- importSignatureKey = new KAction(i18n("Import Key From Keyserver"),"network", 0,TQT_TQOBJECT(this), TQT_SLOT(preimportsignkey()),actionCollection(),"key_importsign");
- importAllSignKeys = new KAction(i18n("Import &Missing Signatures From Keyserver"),"network", 0,TQT_TQOBJECT(this), TQT_SLOT(importallsignkey()),actionCollection(),"key_importallsign");
- refreshKey = new KAction(i18n("&Refresh Keys From Keyserver"),"reload", 0,TQT_TQOBJECT(this), TQT_SLOT(refreshKeyFromServer()),actionCollection(),"key_server_refresh");
-
- KAction *createGroup=new KAction(i18n("&Create Group with Selected Keys..."), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(createNewGroup()),actionCollection(),"create_group");
- KAction *delGroup= new KAction(i18n("&Delete Group"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(deleteGroup()),actionCollection(),"delete_group");
- KAction *editCurrentGroup= new KAction(i18n("&Edit Group"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(editGroup()),actionCollection(),"edit_group");
-
- KAction *newContact=new KAction(i18n("&Create New Contact in Address Book"), "kaddressbook", 0,TQT_TQOBJECT(this), TQT_SLOT(addToKAB()),actionCollection(),"add_kab");
- (void) new KAction(i18n("&Go to Default Key"), "gohome",TQKeySequence(CTRL+TQt::Key_Home) ,TQT_TQOBJECT(this), TQT_SLOT(slotGotoDefaultKey()),actionCollection(),"go_default_key");
+ (void) new TDEAction(i18n("&Open Editor"), "edit",0,TQT_TQOBJECT(this), TQT_SLOT(slotOpenEditor()),actionCollection(),"kgpg_editor");
+ TDEAction *exportPublicKey = new TDEAction(i18n("E&xport Public Keys..."), "kgpg_export", TDEStdAccel::shortcut(TDEStdAccel::Copy),TQT_TQOBJECT(this), TQT_SLOT(slotexport()),actionCollection(),"key_export");
+ TDEAction *deleteKey = new TDEAction(i18n("&Delete Keys"),"editdelete", TQt::Key_Delete,TQT_TQOBJECT(this), TQT_SLOT(confirmdeletekey()),actionCollection(),"key_delete");
+ signKey = new TDEAction(i18n("&Sign Keys..."), "kgpg_sign", 0,TQT_TQOBJECT(this), TQT_SLOT(signkey()),actionCollection(),"key_sign");
+ TDEAction *delSignKey = new TDEAction(i18n("Delete Sign&ature"),"editdelete", 0,TQT_TQOBJECT(this), TQT_SLOT(delsignkey()),actionCollection(),"key_delsign");
+ TDEAction *infoKey = new TDEAction(i18n("&Edit Key"), "kgpg_info", TQt::Key_Return,TQT_TQOBJECT(this), TQT_SLOT(listsigns()),actionCollection(),"key_info");
+ TDEAction *importKey = new TDEAction(i18n("&Import Key..."), "kgpg_import", TDEStdAccel::shortcut(TDEStdAccel::Paste),TQT_TQOBJECT(this), TQT_SLOT(slotPreImportKey()),actionCollection(),"key_import");
+ TDEAction *setDefaultKey = new TDEAction(i18n("Set as De&fault Key"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotSetDefKey()),actionCollection(),"key_default");
+ importSignatureKey = new TDEAction(i18n("Import Key From Keyserver"),"network", 0,TQT_TQOBJECT(this), TQT_SLOT(preimportsignkey()),actionCollection(),"key_importsign");
+ importAllSignKeys = new TDEAction(i18n("Import &Missing Signatures From Keyserver"),"network", 0,TQT_TQOBJECT(this), TQT_SLOT(importallsignkey()),actionCollection(),"key_importallsign");
+ refreshKey = new TDEAction(i18n("&Refresh Keys From Keyserver"),"reload", 0,TQT_TQOBJECT(this), TQT_SLOT(refreshKeyFromServer()),actionCollection(),"key_server_refresh");
+
+ TDEAction *createGroup=new TDEAction(i18n("&Create Group with Selected Keys..."), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(createNewGroup()),actionCollection(),"create_group");
+ TDEAction *delGroup= new TDEAction(i18n("&Delete Group"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(deleteGroup()),actionCollection(),"delete_group");
+ TDEAction *editCurrentGroup= new TDEAction(i18n("&Edit Group"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(editGroup()),actionCollection(),"edit_group");
+
+ TDEAction *newContact=new TDEAction(i18n("&Create New Contact in Address Book"), "kaddressbook", 0,TQT_TQOBJECT(this), TQT_SLOT(addToKAB()),actionCollection(),"add_kab");
+ (void) new TDEAction(i18n("&Go to Default Key"), "gohome",TQKeySequence(CTRL+TQt::Key_Home) ,TQT_TQOBJECT(this), TQT_SLOT(slotGotoDefaultKey()),actionCollection(),"go_default_key");
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(quitApp()), actionCollection());
KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(findKey()), actionCollection());
KStdAction::findNext(TQT_TQOBJECT(this), TQT_SLOT(findNextKey()), actionCollection());
- (void) new KAction(i18n("&Refresh List"), "reload", KStdAccel::reload(),TQT_TQOBJECT(this), TQT_SLOT(refreshkey()),actionCollection(),"key_refresh");
- KAction *openPhoto= new KAction(i18n("&Open Photo"), "image", 0,TQT_TQOBJECT(this), TQT_SLOT(slotShowPhoto()),actionCollection(),"key_photo");
- KAction *deletePhoto= new KAction(i18n("&Delete Photo"), "delete", 0,TQT_TQOBJECT(this), TQT_SLOT(slotDeletePhoto()),actionCollection(),"delete_photo");
- KAction *addPhoto= new KAction(i18n("&Add Photo"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotAddPhoto()),actionCollection(),"add_photo");
+ (void) new TDEAction(i18n("&Refresh List"), "reload", TDEStdAccel::reload(),TQT_TQOBJECT(this), TQT_SLOT(refreshkey()),actionCollection(),"key_refresh");
+ TDEAction *openPhoto= new TDEAction(i18n("&Open Photo"), "image", 0,TQT_TQOBJECT(this), TQT_SLOT(slotShowPhoto()),actionCollection(),"key_photo");
+ TDEAction *deletePhoto= new TDEAction(i18n("&Delete Photo"), "delete", 0,TQT_TQOBJECT(this), TQT_SLOT(slotDeletePhoto()),actionCollection(),"delete_photo");
+ TDEAction *addPhoto= new TDEAction(i18n("&Add Photo"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotAddPhoto()),actionCollection(),"add_photo");
- KAction *addUid= new KAction(i18n("&Add User Id"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotAddUid()),actionCollection(),"add_uid");
- KAction *delUid= new KAction(i18n("&Delete User Id"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotDelUid()),actionCollection(),"del_uid");
+ TDEAction *addUid= new TDEAction(i18n("&Add User Id"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotAddUid()),actionCollection(),"add_uid");
+ TDEAction *delUid= new TDEAction(i18n("&Delete User Id"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotDelUid()),actionCollection(),"del_uid");
- KAction *editKey = new KAction(i18n("Edit Key in &Terminal"), "kgpg_term", TQKeySequence(ALT+TQt::Key_Return),TQT_TQOBJECT(this), TQT_SLOT(slotedit()),actionCollection(),"key_edit");
- KAction *exportSecretKey = new KAction(i18n("Export Secret Key..."), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotexportsec()),actionCollection(),"key_sexport");
- KAction *revokeKey = new KAction(i18n("Revoke Key..."), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(revokeWidget()),actionCollection(),"key_revoke");
+ TDEAction *editKey = new TDEAction(i18n("Edit Key in &Terminal"), "kgpg_term", TQKeySequence(ALT+TQt::Key_Return),TQT_TQOBJECT(this), TQT_SLOT(slotedit()),actionCollection(),"key_edit");
+ TDEAction *exportSecretKey = new TDEAction(i18n("Export Secret Key..."), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotexportsec()),actionCollection(),"key_sexport");
+ TDEAction *revokeKey = new TDEAction(i18n("Revoke Key..."), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(revokeWidget()),actionCollection(),"key_revoke");
- KAction *deleteKeyPair = new KAction(i18n("Delete Key Pair"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(deleteseckey()),actionCollection(),"key_pdelete");
- KAction *generateKey = new KAction(i18n("&Generate Key Pair..."), "kgpg_gen", KStdAccel::shortcut(KStdAccel::New),TQT_TQOBJECT(this), TQT_SLOT(slotgenkey()),actionCollection(),"key_gener");
+ TDEAction *deleteKeyPair = new TDEAction(i18n("Delete Key Pair"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(deleteseckey()),actionCollection(),"key_pdelete");
+ TDEAction *generateKey = new TDEAction(i18n("&Generate Key Pair..."), "kgpg_gen", TDEStdAccel::shortcut(TDEStdAccel::New),TQT_TQOBJECT(this), TQT_SLOT(slotgenkey()),actionCollection(),"key_gener");
- KAction *regeneratePublic = new KAction(i18n("&Regenerate Public Key"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotregenerate()),actionCollection(),"key_regener");
+ TDEAction *regeneratePublic = new TDEAction(i18n("&Regenerate Public Key"), 0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotregenerate()),actionCollection(),"key_regener");
- (void) new KAction(i18n("&Key Server Dialog"), "network", 0,TQT_TQOBJECT(this), TQT_SLOT(showKeyServer()),actionCollection(),"key_server");
+ (void) new TDEAction(i18n("&Key Server Dialog"), "network", 0,TQT_TQOBJECT(this), TQT_SLOT(showKeyServer()),actionCollection(),"key_server");
KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showOptions()), actionCollection(),"options_configure");
- (void) new KAction(i18n("Tip of the &Day"), "idea", 0,TQT_TQOBJECT(this), TQT_SLOT(slotTip()), actionCollection(),"help_tipofday");
- (void) new KAction(i18n("View GnuPG Manual"), "contents", 0,TQT_TQOBJECT(this), TQT_SLOT(slotManpage()),actionCollection(),"gpg_man");
+ (void) new TDEAction(i18n("Tip of the &Day"), "idea", 0,TQT_TQOBJECT(this), TQT_SLOT(slotTip()), actionCollection(),"help_tipofday");
+ (void) new TDEAction(i18n("View GnuPG Manual"), "contents", 0,TQT_TQOBJECT(this), TQT_SLOT(slotManpage()),actionCollection(),"gpg_man");
- (void) new KToggleAction(i18n("&Show only Secret Keys"), "kgpg_show", 0,TQT_TQOBJECT(this), TQT_SLOT(slotToggleSecret()),actionCollection(),"show_secret");
+ (void) new TDEToggleAction(i18n("&Show only Secret Keys"), "kgpg_show", 0,TQT_TQOBJECT(this), TQT_SLOT(slotToggleSecret()),actionCollection(),"show_secret");
keysList2->displayOnlySecret=false;
- (void) new KToggleAction(i18n("&Hide Expired/Disabled Keys"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotToggleDisabled()),actionCollection(),"hide_disabled");
+ (void) new TDEToggleAction(i18n("&Hide Expired/Disabled Keys"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotToggleDisabled()),actionCollection(),"hide_disabled");
keysList2->displayDisabled=true;
- sTrust=new KToggleAction(i18n("Trust"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotShowTrust()),actionCollection(),"show_trust");
- sSize=new KToggleAction(i18n("Size"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotShowSize()),actionCollection(),"show_size");
- sCreat=new KToggleAction(i18n("Creation"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotShowCreat()),actionCollection(),"show_creat");
- sExpi=new KToggleAction(i18n("Expiration"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotShowExpi()),actionCollection(),"show_expi");
+ sTrust=new TDEToggleAction(i18n("Trust"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotShowTrust()),actionCollection(),"show_trust");
+ sSize=new TDEToggleAction(i18n("Size"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotShowSize()),actionCollection(),"show_size");
+ sCreat=new TDEToggleAction(i18n("Creation"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotShowCreat()),actionCollection(),"show_creat");
+ sExpi=new TDEToggleAction(i18n("Expiration"),0, 0,TQT_TQOBJECT(this), TQT_SLOT(slotShowExpi()),actionCollection(),"show_expi");
- photoProps = new KSelectAction(i18n("&Photo ID's"),"kgpg_photo", actionCollection(), "photo_settings");
+ photoProps = new TDESelectAction(i18n("&Photo ID's"),"kgpg_photo", actionCollection(), "photo_settings");
connect(photoProps, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetPhotoSize(int)));
// Keep the list in kgpg.kcfg in sync with this one!
@@ -616,7 +616,7 @@ listKeys::listKeys(TQWidget *parent, const char *name) : DCOPObject( "KeyInterfa
keysList2->setAllColumnsShowFocus(true);
keysList2->setFullWidth(true);
keysList2->setAcceptDrops (true) ;
- keysList2->setSelectionModeExt(KListView::Extended);
+ keysList2->setSelectionModeExt(TDEListView::Extended);
popup=new TQPopupMenu();
@@ -693,7 +693,7 @@ listKeys::listKeys(TQWidget *parent, const char *name) : DCOPObject( "KeyInterfa
/////////////// get all keys data
keyStatusBar=statusBar();
- setupGUI(KMainWindow::Create | Save | ToolBar | StatusBar | Keys, "listkeys.rc");
+ setupGUI(TDEMainWindow::Create | Save | ToolBar | StatusBar | Keys, "listkeys.rc");
toolBar()->insertLineSeparator();
TQToolButton *clearSearch = new TQToolButton(toolBar());
@@ -705,7 +705,7 @@ listKeys::listKeys(TQWidget *parent, const char *name) : DCOPObject( "KeyInterfa
connect(clearSearch, TQT_SIGNAL(pressed()), TQT_TQOBJECT(listViewSearch), TQT_SLOT(clear()));
- (void)new KAction(i18n("Filter Search"), TQt::Key_F6, TQT_TQOBJECT(listViewSearch), TQT_SLOT(setFocus()),actionCollection(), "search_focus");
+ (void)new TDEAction(i18n("Filter Search"), TQt::Key_F6, TQT_TQOBJECT(listViewSearch), TQT_SLOT(setFocus()),actionCollection(), "search_focus");
sTrust->setChecked(KGpgSettings::showTrust());
sSize->setChecked(KGpgSettings::showSize());
@@ -1191,8 +1191,8 @@ void listKeys::slotTip()
void listKeys::closeEvent ( TQCloseEvent * e )
{
- //kapp->ref(); // prevent KMainWindow from closing the app
- //KMainWindow::closeEvent( e );
+ //kapp->ref(); // prevent TDEMainWindow from closing the app
+ //TDEMainWindow::closeEvent( e );
e->accept();
// hide();
// e->ignore();
@@ -1791,13 +1791,13 @@ void listKeys::editGroup()
return;
if (item->pixmap(2)) {
if (item->pixmap(2)->serialNumber()==keysList2->trustgood.serialNumber())
- (void) new KListViewItem(gEdit->availableKeys,item->text(0),item->text(1),item->text(6));
+ (void) new TDEListViewItem(gEdit->availableKeys,item->text(0),item->text(1),item->text(6));
}
while (item->nextSibling()) {
item=item->nextSibling();
if (item->pixmap(2)) {
if (item->pixmap(2)->serialNumber()==keysList2->trustgood.serialNumber())
- (void) new KListViewItem(gEdit->availableKeys,item->text(0),item->text(1),item->text(6));
+ (void) new TDEListViewItem(gEdit->availableKeys,item->text(0),item->text(1),item->text(6));
}
}
keysGroup=KgpgInterface::getGpgGroupSetting(keysList2->currentItem()->text(0),KGpgSettings::gpgConfigPath());
diff --git a/kgpg/listkeys.h b/kgpg/listkeys.h
index c006198..73e9818 100644
--- a/kgpg/listkeys.h
+++ b/kgpg/listkeys.h
@@ -49,7 +49,7 @@ class KgpgApp;
class keyServer;
class groupEdit;
class KgpgInterface;
-class KSelectAction;
+class TDESelectAction;
struct gpgKey
{
@@ -72,7 +72,7 @@ class KgpgSelKey : public KDialogBase
public:
KgpgSelKey( TQWidget *parent = 0, const char *name = 0,bool allowMultipleSelection=false, TQString preselected=TQString());
- KListView *keysListpr;
+ TDEListView *keysListpr;
TQPixmap keyPair;
TQCheckBox *local;
TQVBoxLayout *vbox;
@@ -89,7 +89,7 @@ public slots:
-class KeyView : public KListView
+class KeyView : public TDEListView
{
Q_OBJECT
@@ -141,7 +141,7 @@ protected:
virtual void contentsDropEvent (TQDropEvent*);
};
-class mySearchLine: public KListViewSearchLine
+class mySearchLine: public TDEListViewSearchLine
{
Q_OBJECT
@@ -158,7 +158,7 @@ virtual bool itemMatches(const TQListViewItem *item, const TQString & s) const;
};
-class listKeys : public KMainWindow, virtual public KeyInterface
+class listKeys : public TDEMainWindow, virtual public KeyInterface
{
friend class KeyView;
Q_OBJECT
@@ -173,20 +173,20 @@ public:
TQString message;
TQStringList keynames;
KPassivePopup *pop;
- KToggleAction *sTrust,*sCreat,*sExpi,*sSize;
- KSelectAction *photoProps;
+ TDEToggleAction *sTrust,*sCreat,*sExpi,*sSize;
+ TDESelectAction *photoProps;
KStatusBar *keyStatusBar;
KgpgApp *s_kgpgEditor;
private:
TQPushButton *bouton1,*bouton2,*bouton0;
TQString tempKeyFile,newKeyMail,newKeyName,newkeyFinger,newkeyID;
- KListViewSearchLine* listViewSearch;
+ TDEListViewSearchLine* listViewSearch;
bool continueSearch;
bool showPhoto;
keyServer *kServer;
KTempFile *kgpgtmp;
- KAction *importSignatureKey,*importAllSignKeys,*signKey,*refreshKey;
+ TDEAction *importSignatureKey,*importAllSignKeys,*signKey,*refreshKey;
TQPtrList<TQListViewItem> signList,keysList;
uint globalCount,keyCount;
int globalChecked;
diff --git a/kgpg/popuppublic.cpp b/kgpg/popuppublic.cpp
index c4f436f..46a9f61 100644
--- a/kgpg/popuppublic.cpp
+++ b/kgpg/popuppublic.cpp
@@ -51,7 +51,7 @@
///////////////// klistviewitem special
-class UpdateViewItem2 : public KListViewItem
+class UpdateViewItem2 : public TDEListViewItem
{
public:
UpdateViewItem2(TQListView *parent, TQString name,TQString mail,TQString id,bool isDefault);
@@ -61,7 +61,7 @@ public:
};
UpdateViewItem2::UpdateViewItem2(TQListView *parent, TQString name,TQString mail,TQString id,bool isDefault)
- : KListViewItem(parent)
+ : TDEListViewItem(parent)
{
def=isDefault;
setText(0,name);
@@ -77,7 +77,7 @@ void UpdateViewItem2::paintCell(TQPainter *p, const TQColorGroup &cg,int column,
font.setBold(true);
p->setFont(font);
}
- KListViewItem::paintCell(p, cg, column, width, alignment);
+ TDEListViewItem::paintCell(p, cg, column, width, alignment);
}
TQString UpdateViewItem2 :: key(int c,bool ) const
@@ -87,7 +87,7 @@ TQString UpdateViewItem2 :: key(int c,bool ) const
/////////////// main view
-popupPublic::popupPublic(TQWidget *parent, const char *name,TQString sfile,bool filemode,KShortcut goDefaultKey):
+popupPublic::popupPublic(TQWidget *parent, const char *name,TQString sfile,bool filemode,TDEShortcut goDefaultKey):
KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent, name,true)
{
@@ -119,11 +119,11 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent
clearSearch->setIconSet(SmallIconSet(TQApplication::reverseLayout() ? "clear_left"
: "locationbar_erase"));
(void) new TQLabel(i18n("Search: "),hBar);
- KListViewSearchLine* listViewSearch = new KListViewSearchLine(hBar);
+ TDEListViewSearchLine* listViewSearch = new TDEListViewSearchLine(hBar);
connect(clearSearch, TQT_SIGNAL(pressed()), listViewSearch, TQT_SLOT(clear()));
#endif
- keysList = new KListView( page );
+ keysList = new TDEListView( page );
keysList->addColumn(i18n("Name"));
keysList->addColumn(i18n("Email"));
keysList->addColumn(i18n("ID"));
@@ -137,7 +137,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent
keysList->setShowSortIndicator(true);
keysList->setFullWidth(true);
keysList->setAllColumnsShowFocus(true);
- keysList->setSelectionModeExt(KListView::Extended);
+ keysList->setSelectionModeExt(TDEListView::Extended);
keysList->setColumnWidthMode(0,TQListView::Manual);
keysList->setColumnWidthMode(1,TQListView::Manual);
keysList->setColumnWidth(0,210);
@@ -145,8 +145,8 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent
boutonboxoptions=new TQButtonGroup(5,Qt::Vertical ,page,0);
- KActionCollection *actcol=new KActionCollection(this);
- (void) new KAction(i18n("&Go to Default Key"),goDefaultKey, TQT_TQOBJECT(this), TQT_SLOT(slotGotoDefaultKey()),actcol,"go_default_key");
+ TDEActionCollection *actcol=new TDEActionCollection(this);
+ (void) new TDEAction(i18n("&Go to Default Key"),goDefaultKey, TQT_TQOBJECT(this), TQT_SLOT(slotGotoDefaultKey()),actcol,"go_default_key");
CBarmor=new TQCheckBox(i18n("ASCII armored encryption"),boutonboxoptions);
@@ -431,7 +431,7 @@ void popupPublic::slotprocread(KProcIO *p)
bool isDefaultKey=false;
if (id.right(8)==defaultKey) isDefaultKey=true;
UpdateViewItem2 *item=new UpdateViewItem2(keysList,keyname,keymail,id,isDefaultKey);
- //KListViewItem *sub= new KListViewItem(item,i18n("ID: %1, trust: %2, validity: %3").arg(id).arg(tr).arg(val));
+ //TDEListViewItem *sub= new TDEListViewItem(item,i18n("ID: %1, trust: %2, validity: %3").arg(id).arg(tr).arg(val));
//sub->setSelectable(false);
if (seclist.find(tst,0,FALSE)!=-1)
item->setPixmap(0,keyPair);
diff --git a/kgpg/popuppublic.h b/kgpg/popuppublic.h
index a732f4c..9bf910c 100644
--- a/kgpg/popuppublic.h
+++ b/kgpg/popuppublic.h
@@ -25,7 +25,7 @@
class TQPushButton;
class TQCheckBox;
-class KListView;
+class TDEListView;
class TQButtonGroup;
class KProcIO;
@@ -35,9 +35,9 @@ class popupPublic : public KDialogBase //TQDialog
public:
- popupPublic(TQWidget *parent=0, const char *name=0,TQString sfile="",bool filemode=false,KShortcut goDefaultKey=TQKeySequence(CTRL+TQt::Key_Home));
+ popupPublic(TQWidget *parent=0, const char *name=0,TQString sfile="",bool filemode=false,TDEShortcut goDefaultKey=TQKeySequence(CTRL+TQt::Key_Home));
~popupPublic();
- KListView *keysList;
+ TDEListView *keysList;
TQCheckBox *CBarmor,*CBuntrusted,*CBshred,*CBsymmetric,*CBhideid;
bool fmode,trusted;
TQPixmap keyPair,keySingle,keyGroup;
diff --git a/kgpg/searchres.ui b/kgpg/searchres.ui
index a41947c..8fd7379 100644
--- a/kgpg/searchres.ui
+++ b/kgpg/searchres.ui
@@ -40,7 +40,7 @@
<cstring>kLEID</cstring>
</property>
</widget>
- <widget class="KListView" row="1" column="0" rowspan="1" colspan="2">
+ <widget class="TDEListView" row="1" column="0" rowspan="1" colspan="2">
<column>
<property name="text">
<string>Name</string>