summaryrefslogtreecommitdiffstats
path: root/kopete/plugins/cryptography
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:14:03 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 15:14:03 -0600
commit9c9412b30c54468adc9e506cc76c5d113fbf5056 (patch)
tree68a0c0d5bc770fc58596b8c5624cdf33d8625027 /kopete/plugins/cryptography
parent2e53bd0b77676f879fad7baeecea5879bf496a7d (diff)
downloadtdenetwork-9c9412b30c54468adc9e506cc76c5d113fbf5056.tar.gz
tdenetwork-9c9412b30c54468adc9e506cc76c5d113fbf5056.zip
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'kopete/plugins/cryptography')
-rw-r--r--kopete/plugins/cryptography/cryptographyguiclient.cpp2
-rw-r--r--kopete/plugins/cryptography/cryptographyguiclient.h4
-rw-r--r--kopete/plugins/cryptography/cryptographyplugin.cpp8
-rw-r--r--kopete/plugins/cryptography/kgpgselkey.cpp6
-rw-r--r--kopete/plugins/cryptography/kgpgselkey.h4
-rw-r--r--kopete/plugins/cryptography/popuppublic.cpp20
-rw-r--r--kopete/plugins/cryptography/popuppublic.h6
7 files changed, 25 insertions, 25 deletions
diff --git a/kopete/plugins/cryptography/cryptographyguiclient.cpp b/kopete/plugins/cryptography/cryptographyguiclient.cpp
index 4892afb1..df66c608 100644
--- a/kopete/plugins/cryptography/cryptographyguiclient.cpp
+++ b/kopete/plugins/cryptography/cryptographyguiclient.cpp
@@ -48,7 +48,7 @@ CryptographyGUIClient::CryptographyGUIClient(Kopete::ChatSession *parent )
setInstance( KGenericFactory<CryptographyPlugin>::instance() );
- m_action=new KToggleAction( i18n("Encrypt Messages" ), TQString::fromLatin1( "encrypted" ), 0, this, TQT_SLOT(slotToggled()), actionCollection() , "cryptographyToggle" );
+ m_action=new TDEToggleAction( i18n("Encrypt Messages" ), TQString::fromLatin1( "encrypted" ), 0, this, TQT_SLOT(slotToggled()), actionCollection() , "cryptographyToggle" );
m_action->setChecked( first->pluginData( CryptographyPlugin::plugin() , "encrypt_messages") != TQString::fromLatin1("off") ) ;
setXMLFile("cryptographychatui.rc");
diff --git a/kopete/plugins/cryptography/cryptographyguiclient.h b/kopete/plugins/cryptography/cryptographyguiclient.h
index 530a1172..f9c29a49 100644
--- a/kopete/plugins/cryptography/cryptographyguiclient.h
+++ b/kopete/plugins/cryptography/cryptographyguiclient.h
@@ -19,7 +19,7 @@
#include <kxmlguiclient.h>
namespace Kopete { class ChatSession; }
-class KToggleAction;
+class TDEToggleAction;
/**
*@author Olivier Goffart
@@ -33,7 +33,7 @@ public:
~CryptographyGUIClient();
private:
- KToggleAction *m_action;
+ TDEToggleAction *m_action;
private slots:
void slotToggled();
diff --git a/kopete/plugins/cryptography/cryptographyplugin.cpp b/kopete/plugins/cryptography/cryptographyplugin.cpp
index 06412936..1085da9c 100644
--- a/kopete/plugins/cryptography/cryptographyplugin.cpp
+++ b/kopete/plugins/cryptography/cryptographyplugin.cpp
@@ -68,7 +68,7 @@ CryptographyPlugin::CryptographyPlugin( TQObject *parent, const char *name, cons
TQObject::connect(m_cachedPass_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotForgetCachedPass() ));
- KAction *action=new KAction( i18n("&Select Cryptography Public Key..."), "encrypted", 0, this, TQT_SLOT (slotSelectContactKey()), actionCollection() , "contactSelectKey");
+ TDEAction *action=new TDEAction( i18n("&Select Cryptography Public Key..."), "encrypted", 0, this, TQT_SLOT (slotSelectContactKey()), actionCollection() , "contactSelectKey");
connect ( Kopete::ContactList::self() , TQT_SIGNAL( metaContactSelected(bool)) , action , TQT_SLOT(setEnabled(bool)));
action->setEnabled(Kopete::ContactList::self()->selectedMetaContacts().count()==1 );
@@ -138,12 +138,12 @@ bool CryptographyPlugin::passphraseHandling()
}
-/*KActionCollection *CryptographyPlugin::customChatActions(Kopete::ChatSession *KMM)
+/*TDEActionCollection *CryptographyPlugin::customChatActions(Kopete::ChatSession *KMM)
{
delete m_actionCollection;
- m_actionCollection = new KActionCollection(this);
- KAction *actionTranslate = new KAction( i18n ("Translate"), 0,
+ m_actionCollection = new TDEActionCollection(this);
+ TDEAction *actionTranslate = new TDEAction( i18n ("Translate"), 0,
this, TQT_SLOT( slotTranslateChat() ), m_actionCollection, "actionTranslate" );
m_actionCollection->insert( actionTranslate );
diff --git a/kopete/plugins/cryptography/kgpgselkey.cpp b/kopete/plugins/cryptography/kgpgselkey.cpp
index 37a0d8ab..63d26510 100644
--- a/kopete/plugins/cryptography/kgpgselkey.cpp
+++ b/kopete/plugins/cryptography/kgpgselkey.cpp
@@ -48,7 +48,7 @@ KgpgSelKey::KgpgSelKey(TQWidget *parent, const char *name,bool showlocal):KDialo
keyPair=loader->loadIcon("kgpg_key2",KIcon::Small,20);
setMinimumSize(300,200);
- keysListpr = new KListView( page );
+ keysListpr = new TDEListView( page );
keysListpr->setRootIsDecorated(true);
keysListpr->addColumn( i18n( "Name" ) );
keysListpr->setShowSortIndicator(true);
@@ -146,8 +146,8 @@ KgpgSelKey::KgpgSelKey(TQWidget *parent, const char *name,bool showlocal):KDialo
pclose(fp2);
if (!tst.isEmpty() && (!dead))
{
- KListViewItem *item=new KListViewItem(keysListpr,extractKeyName(tst));
- KListViewItem *sub= new KListViewItem(item,i18n("ID: %1, trust: %2, expiration: %3").arg(id).arg(tr).arg(val));
+ TDEListViewItem *item=new TDEListViewItem(keysListpr,extractKeyName(tst));
+ TDEListViewItem *sub= new TDEListViewItem(item,i18n("ID: %1, trust: %2, expiration: %3").arg(id).arg(tr).arg(val));
sub->setSelectable(false);
item->setPixmap(0,keyPair);
}
diff --git a/kopete/plugins/cryptography/kgpgselkey.h b/kopete/plugins/cryptography/kgpgselkey.h
index 0742082a..a832c886 100644
--- a/kopete/plugins/cryptography/kgpgselkey.h
+++ b/kopete/plugins/cryptography/kgpgselkey.h
@@ -23,7 +23,7 @@
#include <kdialogbase.h>
-class KListView;
+class TDEListView;
class TQCheckBox;
struct gpgKey {
@@ -45,7 +45,7 @@ class KgpgSelKey : public KDialogBase
public:
KgpgSelKey( TQWidget *parent = 0, const char *name = 0,bool showlocal=true);
- KListView *keysListpr;
+ TDEListView *keysListpr;
TQPixmap keyPair;
TQCheckBox *local;
private slots:
diff --git a/kopete/plugins/cryptography/popuppublic.cpp b/kopete/plugins/cryptography/popuppublic.cpp
index e3d2e630..7764d3b3 100644
--- a/kopete/plugins/cryptography/popuppublic.cpp
+++ b/kopete/plugins/cryptography/popuppublic.cpp
@@ -54,7 +54,7 @@
///////////////// klistviewitem special
-class UpdateViewItem2 : public KListViewItem
+class UpdateViewItem2 : public TDEListViewItem
{
public:
UpdateViewItem2(TQListView *parent, TQString name,TQString mail,TQString id,bool isDefault);
@@ -64,7 +64,7 @@ public:
};
UpdateViewItem2::UpdateViewItem2(TQListView *parent, TQString name,TQString mail,TQString id,bool isDefault)
- : KListViewItem(parent)
+ : TDEListViewItem(parent)
{
def=isDefault;
setText(0,name);
@@ -80,7 +80,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
@@ -90,7 +90,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)
{
TQWidget *page = plainPage();
@@ -120,10 +120,10 @@ 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()));
- keysList = new KListView( page );
+ keysList = new TDEListView( page );
keysList->addColumn(i18n("Name"));
keysList->addColumn(i18n("Email"));
keysList->addColumn(i18n("ID"));
@@ -135,7 +135,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);
@@ -143,8 +143,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);
@@ -452,7 +452,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/kopete/plugins/cryptography/popuppublic.h b/kopete/plugins/cryptography/popuppublic.h
index 02570ef2..83ac5102 100644
--- a/kopete/plugins/cryptography/popuppublic.h
+++ b/kopete/plugins/cryptography/popuppublic.h
@@ -27,7 +27,7 @@
class TQPushButton;
class TQCheckBox;
-class KListView;
+class TDEListView;
class TQButtonGroup;
class KProcIO;
@@ -37,9 +37,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;