From 34ec7cf1e70300eb43f3822ce3261893f9f8ace6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:19:04 -0600 Subject: Rename KIcon to enhance compatibility with KDE4 --- kgpg/keyinfowidget.cpp | 6 +++--- kgpg/keyservers.cpp | 2 +- kgpg/kgpg.cpp | 6 +++--- kgpg/kgpglibrary.cpp | 6 +++--- kgpg/kgpgoptions.cpp | 4 ++-- kgpg/listkeys.cpp | 28 ++++++++++++++-------------- kgpg/popuppublic.cpp | 8 ++++---- 7 files changed, 30 insertions(+), 30 deletions(-) (limited to 'kgpg') diff --git a/kgpg/keyinfowidget.cpp b/kgpg/keyinfowidget.cpp index 15a6e67..06c6e04 100644 --- a/kgpg/keyinfowidget.cpp +++ b/kgpg/keyinfowidget.cpp @@ -430,14 +430,14 @@ void KgpgKeyInfo::slotChangeTrust(int newTrust) void KgpgKeyInfo::slotInfoPasswordChanged() { -KPassivePopup::message(i18n("Passphrase for the key was changed"),TQString(),TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),this); +KPassivePopup::message(i18n("Passphrase for the key was changed"),TQString(),TDEGlobal::iconLoader()->loadIcon("kgpg",TDEIcon::Desktop),this); } void KgpgKeyInfo::slotInfoTrustChanged() { keyWasChanged=true; loadKey(displayedKeyID); -//KPassivePopup::message(i18n("Owner trust of the key was changed"),TQString(),TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),this,0,600); +//KPassivePopup::message(i18n("Owner trust of the key was changed"),TQString(),TDEGlobal::iconLoader()->loadIcon("kgpg",TDEIcon::Desktop),this,0,600); } void KgpgKeyInfo::slotInfoExpirationChanged(int res) @@ -451,7 +451,7 @@ else prop->tLExpiration->setText(TDEGlobal::locale()->formatDate(kdt->date())); } if (res==2) { infoMessage=i18n("Could not change expiration");infoText=i18n("Bad passphrase"); -KPassivePopup::message(infoMessage,infoText,TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),this); +KPassivePopup::message(infoMessage,infoText,TDEGlobal::iconLoader()->loadIcon("kgpg",TDEIcon::Desktop),this); } } diff --git a/kgpg/keyservers.cpp b/kgpg/keyservers.cpp index 8f05a83..0044387 100644 --- a/kgpg/keyservers.cpp +++ b/kgpg/keyservers.cpp @@ -119,7 +119,7 @@ void keyServer::slotprocread(KProcIO *p) ///////////////////////////////////////////////////////////////// extract encryption keys bool dead; TQString tst; - //TQPixmap pixkeySingle(TDEGlobal::iconLoader()->loadIcon("kgpg_key1",KIcon::Small,20)); + //TQPixmap pixkeySingle(TDEGlobal::iconLoader()->loadIcon("kgpg_key1",TDEIcon::Small,20)); while (p->readln(tst)!=-1) { //tst=tst.stripWhiteSpace(); if (tst.startsWith("pub")) { diff --git a/kgpg/kgpg.cpp b/kgpg/kgpg.cpp index 776c60f..433b373 100644 --- a/kgpg/kgpg.cpp +++ b/kgpg/kgpg.cpp @@ -206,7 +206,7 @@ if (encryptedFolder.exists()) { } pop = new KPassivePopup(); - pop->setView(i18n("Processing folder compression and encryption"),i18n("Please wait..."),TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop)); + pop->setView(i18n("Processing folder compression and encryption"),i18n("Please wait..."),TDEGlobal::iconLoader()->loadIcon("kgpg",TDEIcon::Desktop)); pop->setAutoDelete(false); pop->show(); kapp->processEvents(); @@ -1009,7 +1009,7 @@ int KgpgAppletApp::newInstance() void MyView::encryptClipboard(TQStringList selec,TQStringList encryptOptions,bool,bool symmetric) { if (kapp->clipboard()->text(clipboardMode).isEmpty()) { - KPassivePopup::message(i18n("Clipboard is empty."),TQString(),TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),this); + KPassivePopup::message(i18n("Clipboard is empty."),TQString(),TDEGlobal::iconLoader()->loadIcon("kgpg",TDEIcon::Desktop),this); return; } if (KGpgSettings::pgpCompatibility()) @@ -1033,7 +1033,7 @@ if (newtxt.length()>300) newtxt.replace(TQRegExp("\n"),"
"); pop = new KPassivePopup( this); - pop->setView(i18n("Encrypted following text:"),newtxt,TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop)); + pop->setView(i18n("Encrypted following text:"),newtxt,TDEGlobal::iconLoader()->loadIcon("kgpg",TDEIcon::Desktop)); pop->setTimeout(3200); pop->show(); TQRect qRect(TQApplication::desktop()->screenGeometry()); diff --git a/kgpg/kgpglibrary.cpp b/kgpg/kgpglibrary.cpp index ad0ee00..b8d62f6 100644 --- a/kgpg/kgpglibrary.cpp +++ b/kgpg/kgpglibrary.cpp @@ -122,7 +122,7 @@ void KgpgLibrary::processpopup2(TQString fileName) { //pop->setTimeout(0); - pop->setView(i18n("Processing encryption (%1)").arg(fileName),i18n("Please wait..."),TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop)); + pop->setView(i18n("Processing encryption (%1)").arg(fileName),i18n("Please wait..."),TDEGlobal::iconLoader()->loadIcon("kgpg",TDEIcon::Desktop)); pop->show(); /*TQRect qRect(TQApplication::desktop()->screenGeometry()); int iXpos=qRect.width()/2-pop->width()/2; @@ -154,7 +154,7 @@ void KgpgLibrary::slotShredResult( TDEIO::Job * job ) { job->showErrorDialog( (TQWidget*)parent() ); emit systemMessage(TQString(),true); - KPassivePopup::message(i18n("KGpg Error"),i18n("Process halted, not all files were shredded."),TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),panel,"kgpg_error",0); + KPassivePopup::message(i18n("KGpg Error"),i18n("Process halted, not all files were shredded."),TDEGlobal::iconLoader()->loadIcon("kgpg",TDEIcon::Desktop),panel,"kgpg_error",0); } } @@ -194,7 +194,7 @@ void KgpgLibrary::processpopup(TQString fileName) { emit systemMessage(i18n("Decrypting %1").arg(fileName)); pop->setTimeout(0); - pop->setView(i18n("Processing decryption"),i18n("Please wait..."),TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop)); + pop->setView(i18n("Processing decryption"),i18n("Please wait..."),TDEGlobal::iconLoader()->loadIcon("kgpg",TDEIcon::Desktop)); pop->show(); TQRect qRect(TQApplication::desktop()->screenGeometry()); int iXpos=qRect.width()/2-pop->width()/2; diff --git a/kgpg/kgpgoptions.cpp b/kgpg/kgpgoptions.cpp index 7113b4e..8c6e92d 100644 --- a/kgpg/kgpgoptions.cpp +++ b/kgpg/kgpgoptions.cpp @@ -96,8 +96,8 @@ kdDebug(2100)<<"Adding pages"<shredInfo->setText(i18n( "

You must be aware that shredding is not secure 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).

")); page7->groupShred->adjustSize(); - pixkeySingle=TDEGlobal::iconLoader()->loadIcon("kgpg_key1",KIcon::Small,20); - pixkeyDouble=TDEGlobal::iconLoader()->loadIcon("kgpg_key2",KIcon::Small,20); + pixkeySingle=TDEGlobal::iconLoader()->loadIcon("kgpg_key1",TDEIcon::Small,20); + pixkeyDouble=TDEGlobal::iconLoader()->loadIcon("kgpg_key2",TDEIcon::Small,20); addPage(page1, i18n("Encryption"), "encrypted"); addPage(page2, i18n("Decryption"), "decrypted"); addPage(page3, i18n("Appearance"), "looknfeel"); diff --git a/kgpg/listkeys.cpp b/kgpg/listkeys.cpp index 5804280..903fe3d 100644 --- a/kgpg/listkeys.cpp +++ b/kgpg/listkeys.cpp @@ -219,8 +219,8 @@ KDialogBase( parent, name, true,i18n("Private Key List"),Ok | Cancel) TQString keyname; page = new TQWidget(this); TQLabel *labeltxt; - KIconLoader *loader = TDEGlobal::iconLoader(); - keyPair=loader->loadIcon("kgpg_key2",KIcon::Small,20); + TDEIconLoader *loader = TDEGlobal::iconLoader(); + keyPair=loader->loadIcon("kgpg_key2",TDEIcon::Small,20); setMinimumSize(350,100); keysListpr = new TDEListView( page ); @@ -395,16 +395,16 @@ TQString KgpgSelKey::getkeyMail() KeyView::KeyView( TQWidget *parent, const char *name ) : TDEListView( parent, name ) { - KIconLoader *loader = TDEGlobal::iconLoader(); + TDEIconLoader *loader = TDEGlobal::iconLoader(); - pixkeyOrphan=loader->loadIcon("kgpg_key4",KIcon::Small,20); - pixkeyGroup=loader->loadIcon("kgpg_key3",KIcon::Small,20); - pixkeyPair=loader->loadIcon("kgpg_key2",KIcon::Small,20); - pixkeySingle=loader->loadIcon("kgpg_key1",KIcon::Small,20); - pixsignature=loader->loadIcon("signature",KIcon::Small,20); - pixuserid=loader->loadIcon("kgpg_identity",KIcon::Small,20); - pixuserphoto=loader->loadIcon("kgpg_photo",KIcon::Small,20); - pixRevoke=loader->loadIcon("stop",KIcon::Small,20); + pixkeyOrphan=loader->loadIcon("kgpg_key4",TDEIcon::Small,20); + pixkeyGroup=loader->loadIcon("kgpg_key3",TDEIcon::Small,20); + pixkeyPair=loader->loadIcon("kgpg_key2",TDEIcon::Small,20); + pixkeySingle=loader->loadIcon("kgpg_key1",TDEIcon::Small,20); + pixsignature=loader->loadIcon("signature",TDEIcon::Small,20); + pixuserid=loader->loadIcon("kgpg_identity",TDEIcon::Small,20); + pixuserphoto=loader->loadIcon("kgpg_photo",TDEIcon::Small,20); + pixRevoke=loader->loadIcon("stop",TDEIcon::Small,20); TQPixmap blankFrame; blankFrame.load(locate("appdata", "pics/kgpg_blank.png")); @@ -1778,8 +1778,8 @@ void listKeys::editGroup() KDialogBase *dialogGroupEdit=new KDialogBase(KDialogBase::Swallow, i18n("Group Properties"), KDialogBase::Ok | KDialogBase::Cancel,KDialogBase::Ok,this,0,true); gEdit=new groupEdit(); - gEdit->buttonAdd->setPixmap(TDEGlobal::iconLoader()->loadIcon("down",KIcon::Small,20)); - gEdit->buttonRemove->setPixmap(TDEGlobal::iconLoader()->loadIcon("up",KIcon::Small,20)); + gEdit->buttonAdd->setPixmap(TDEGlobal::iconLoader()->loadIcon("down",TDEIcon::Small,20)); + gEdit->buttonRemove->setPixmap(TDEGlobal::iconLoader()->loadIcon("up",TDEIcon::Small,20)); connect(gEdit->buttonAdd,TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(groupAdd())); connect(gEdit->buttonRemove,TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(groupRemove())); @@ -2149,7 +2149,7 @@ void listKeys::slotgenkey() TQWidget *wid=new TQWidget(pop); TQVBoxLayout *vbox=new TQVBoxLayout(wid,3); - TQVBox *passiveBox=pop->standardView(i18n("Generating new key pair."),TQString(),TDEGlobal::iconLoader()->loadIcon("kgpg",KIcon::Desktop),wid); + TQVBox *passiveBox=pop->standardView(i18n("Generating new key pair."),TQString(),TDEGlobal::iconLoader()->loadIcon("kgpg",TDEIcon::Desktop),wid); TQMovie anim; diff --git a/kgpg/popuppublic.cpp b/kgpg/popuppublic.cpp index fd7343b..59864f7 100644 --- a/kgpg/popuppublic.cpp +++ b/kgpg/popuppublic.cpp @@ -100,11 +100,11 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent if (KGpgSettings::allowCustomEncryptionOptions()) customOptions=KGpgSettings::customEncryptionOptions(); - KIconLoader *loader = TDEGlobal::iconLoader(); + TDEIconLoader *loader = TDEGlobal::iconLoader(); - keyPair=loader->loadIcon("kgpg_key2",KIcon::Small,20); - keySingle=loader->loadIcon("kgpg_key1",KIcon::Small,20); - keyGroup=loader->loadIcon("kgpg_key3",KIcon::Small,20); + keyPair=loader->loadIcon("kgpg_key2",TDEIcon::Small,20); + keySingle=loader->loadIcon("kgpg_key1",TDEIcon::Small,20); + keyGroup=loader->loadIcon("kgpg_key3",TDEIcon::Small,20); if (filemode) setCaption(i18n("Select Public Key for %1").arg(sfile)); fmode=filemode; -- cgit v1.2.1