summaryrefslogtreecommitdiffstats
path: root/kgpg
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:38:13 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:38:13 -0600
commit4bb787f41f7cdefac2aac33ef59317b7157302c1 (patch)
treec9726401d4eeb6fff8e78c4e35facb644c417e77 /kgpg
parentaef5eada7f51ee48f3d21448db290bd8f06953a8 (diff)
downloadtdeutils-4bb787f41f7cdefac2aac33ef59317b7157302c1.tar.gz
tdeutils-4bb787f41f7cdefac2aac33ef59317b7157302c1.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kgpg')
-rw-r--r--kgpg/kgpg.cpp4
-rw-r--r--kgpg/kgpgeditor.cpp8
-rw-r--r--kgpg/kgpginterface.cpp6
-rw-r--r--kgpg/kgpglibrary.cpp10
-rw-r--r--kgpg/kgpglibrary.h2
-rw-r--r--kgpg/kgpgoptions.cpp4
-rw-r--r--kgpg/kgpgoptions.h8
-rw-r--r--kgpg/kgpgsettings.kcfgc2
-rw-r--r--kgpg/kgpgview.cpp12
-rw-r--r--kgpg/listkeys.cpp12
-rw-r--r--kgpg/popuppublic.h2
11 files changed, 35 insertions, 35 deletions
diff --git a/kgpg/kgpg.cpp b/kgpg/kgpg.cpp
index 6cfba30..34aa268 100644
--- a/kgpg/kgpg.cpp
+++ b/kgpg/kgpg.cpp
@@ -194,7 +194,7 @@ KURL encryptedFile(droppedUrls.first().path()+extension);
TQFile encryptedFolder(droppedUrls.first().path()+extension);
if (encryptedFolder.exists()) {
dialogue->hide();
- KIO::RenameDlg *over=new KIO::RenameDlg(0,i18n("File Already Exists"),TQString(),encryptedFile.path(),KIO::M_OVERWRITE);
+ TDEIO::RenameDlg *over=new TDEIO::RenameDlg(0,i18n("File Already Exists"),TQString(),encryptedFile.path(),TDEIO::M_OVERWRITE);
if (over->exec()==TQDialog::Rejected)
{
delete over;
@@ -406,7 +406,7 @@ void MyView::decryptDroppedFile()
swapname=KURL(droppedUrls.first().directory(0,0)+oldname);
TQFile fgpg(swapname.path());
if (fgpg.exists()) {
- KIO::RenameDlg *over=new KIO::RenameDlg(0,i18n("File Already Exists"),TQString(),swapname.path(),KIO::M_OVERWRITE);
+ TDEIO::RenameDlg *over=new TDEIO::RenameDlg(0,i18n("File Already Exists"),TQString(),swapname.path(),TDEIO::M_OVERWRITE);
if (over->exec()==TQDialog::Rejected)
{
delete over;
diff --git a/kgpg/kgpgeditor.cpp b/kgpg/kgpgeditor.cpp
index 153cb75..7c69f4f 100644
--- a/kgpg/kgpgeditor.cpp
+++ b/kgpg/kgpgeditor.cpp
@@ -265,7 +265,7 @@ void KgpgApp::slotFilePreDec()
if (!newname.isEmpty()) {
TQFile fgpg(newname);
if (fgpg.exists()) {
- KIO::RenameDlg *over=new KIO::RenameDlg(0,i18n("File Already Exists"),TQString(),newname,KIO::M_OVERWRITE);
+ TDEIO::RenameDlg *over=new TDEIO::RenameDlg(0,i18n("File Already Exists"),TQString(),newname,TDEIO::M_OVERWRITE);
if (over->exec()==TQDialog::Rejected)
{
delete over;
@@ -348,7 +348,7 @@ void KgpgApp::slotFileSave()
stream->setCodec(cod);
*stream << view->editor->text();//.utf8();
tmpfile.close();
- if(!KIO::NetAccess::upload(tmpfile.name(), Docname,this)) {
+ if(!TDEIO::NetAccess::upload(tmpfile.name(), Docname,this)) {
KMessageBox::sorry(this,i18n("The document could not be saved, please check your permissions and disk space."));
tmpfile.unlink();
return;
@@ -383,7 +383,7 @@ void KgpgApp::slotFileSaveAs()
}
f.close();
}
- else if (KIO::NetAccess::exists(url,false,this))
+ else if (TDEIO::NetAccess::exists(url,false,this))
{
TQString message=i18n("Overwrite existing file %1?").arg(url.fileName());
int result=KMessageBox::warningContinueCancel(this,TQString(message),i18n("Warning"),i18n("Overwrite"));
@@ -400,7 +400,7 @@ void KgpgApp::openDocumentFile(const KURL& url,TQString encoding)
{
TQString tempOpenFile;
/////////////////////////////////////////////////
-if( KIO::NetAccess::download( url, tempOpenFile,this ) ) {
+if( TDEIO::NetAccess::download( url, tempOpenFile,this ) ) {
TQFile qfile(tempOpenFile);
if (qfile.open(IO_ReadOnly)) {
TQTextStream t( &qfile );
diff --git a/kgpg/kgpginterface.cpp b/kgpg/kgpginterface.cpp
index 0655b38..fae5911 100644
--- a/kgpg/kgpginterface.cpp
+++ b/kgpg/kgpginterface.cpp
@@ -958,7 +958,7 @@ void KgpgInterface::signover(TDEProcess *)
void KgpgInterface::openSignConsole()
{
TDEProcess conprocess;
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup("General");
conprocess<< config->readPathEntry("TerminalApplication","konsole");
conprocess<<"-e"<<"gpg";
@@ -1358,7 +1358,7 @@ void KgpgInterface::importKeyURL(KURL url)
{
///////////// import a key
- if( KIO::NetAccess::download( url, tempKeyFile,0) ) {
+ if( TDEIO::NetAccess::download( url, tempKeyFile,0) ) {
message=TQString();
KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale());
*conprocess<< "gpg"<<"--no-tty"<<"--no-secmem-warning"<<"--status-fd=2"<<"--utf8-strings"<<"--import";
@@ -1450,7 +1450,7 @@ kdDebug(2100)<<"Importing is over"<<endl;
void KgpgInterface::importURLover(TDEProcess *p)
{
- KIO::NetAccess::removeTempFile(tempKeyFile);
+ TDEIO::NetAccess::removeTempFile(tempKeyFile);
importover(p);
//KMessageBox::information(0,message);
//emit importfinished();
diff --git a/kgpg/kgpglibrary.cpp b/kgpg/kgpglibrary.cpp
index 0f3e66a..5dc6636 100644
--- a/kgpg/kgpglibrary.cpp
+++ b/kgpg/kgpglibrary.cpp
@@ -92,7 +92,7 @@ void KgpgLibrary::fastencode(KURL &fileToCrypt,TQStringList selec,TQStringList e
TQFile fgpg(dest.path());
if (fgpg.exists()) {
- KIO::RenameDlg *over=new KIO::RenameDlg(0,i18n("File Already Exists"),TQString(),dest.path(),KIO::M_OVERWRITE);
+ TDEIO::RenameDlg *over=new TDEIO::RenameDlg(0,i18n("File Already Exists"),TQString(),dest.path(),TDEIO::M_OVERWRITE);
if (over->exec()==TQDialog::Rejected)
{
delete over;
@@ -142,12 +142,12 @@ void KgpgLibrary::shredprocessenc(KURL::List filesToShred)
{
emit systemMessage(i18n("Shredding %n file","Shredding %n files",filesToShred.count()));
-KIO::Job *job;
-job = KIO::del( filesToShred, true );
-connect( job, TQT_SIGNAL( result( KIO::Job * ) ),TQT_SLOT( slotShredResult( KIO::Job * ) ) );
+TDEIO::Job *job;
+job = TDEIO::del( filesToShred, true );
+connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),TQT_SLOT( slotShredResult( TDEIO::Job * ) ) );
}
-void KgpgLibrary::slotShredResult( KIO::Job * job )
+void KgpgLibrary::slotShredResult( TDEIO::Job * job )
{
emit systemMessage(TQString());
if (job && job->error())
diff --git a/kgpg/kgpglibrary.h b/kgpg/kgpglibrary.h
index c887653..96f199e 100644
--- a/kgpg/kgpglibrary.h
+++ b/kgpg/kgpglibrary.h
@@ -51,7 +51,7 @@ private slots:
void startencode(TQStringList encryptKeys,TQStringList encryptOptions,bool shred,bool symetric);
void fastencode(KURL &fileToCrypt,TQStringList selec,TQStringList encryptOptions,bool symetric);
// void startencode(TQString &selec,TQString encryptOptions,bool shred,bool symetric);
- void slotShredResult( KIO::Job * job );
+ void slotShredResult( TDEIO::Job * job );
void shredpreprocessenc(KURL fileToShred);
void processenc(KURL);
void processdecover();
diff --git a/kgpg/kgpgoptions.cpp b/kgpg/kgpgoptions.cpp
index 85a0e75..825b413 100644
--- a/kgpg/kgpgoptions.cpp
+++ b/kgpg/kgpgoptions.cpp
@@ -63,12 +63,12 @@ class TQTabWidget;
/////////////////////// main window
kgpgOptions::kgpgOptions(TQWidget *parent, const char *name)
- : KConfigDialog( parent, name, KGpgSettings::self())
+ : TDEConfigDialog( parent, name, KGpgSettings::self())
{
defaultServerList="hkp://wwwkeys.eu.pgp.net ";
defaultServerList+=i18n("(Default)");
defaultServerList+=",hkp://search.keyserver.net,hkp://wwwkeys.pgp.net,hkp://pgp.dtype.org,hkp://wwwkeys.us.pgp.net";
- config = new KConfig ("kgpgrc");
+ config = new TDEConfig ("kgpgrc");
config->setGroup("Servers");
serverList=TQStringList::split (",",config->readEntry("Server_List",defaultServerList));
keyServer = KgpgInterface::getGpgSetting("keyserver", KGpgSettings::gpgConfigPath());
diff --git a/kgpg/kgpgoptions.h b/kgpg/kgpgoptions.h
index d58e9ba..7dcc8df 100644
--- a/kgpg/kgpgoptions.h
+++ b/kgpg/kgpgoptions.h
@@ -24,7 +24,7 @@
#define UnknownColor 2
#define RevColor 3
-class KConfig;
+class TDEConfig;
class Encryption;
class Decryption;
class UIConf;
@@ -33,10 +33,10 @@ class ServerConf;
class ColorsConf;
class MiscConf;
class KFontChooser;
-class KConfig;
+class TDEConfig;
class KSimpleConfig;
-class kgpgOptions : public KConfigDialog
+class kgpgOptions : public TDEConfigDialog
{
Q_OBJECT
@@ -53,7 +53,7 @@ public:
KFontChooser *kfc;
private:
- KConfig *config;
+ TDEConfig *config;
TQString alwaysKeyID,alwaysKeyName;
bool firstDisplay;
diff --git a/kgpg/kgpgsettings.kcfgc b/kgpg/kgpgsettings.kcfgc
index afbe628..2eb79d7 100644
--- a/kgpg/kgpgsettings.kcfgc
+++ b/kgpg/kgpgsettings.kcfgc
@@ -3,7 +3,7 @@ File=kgpg.kcfg
ClassName=KGpgSettings
Singleton=true
Mutators=true
-# Inherits=KConfigSkeleton
+# Inherits=TDEConfigSkeleton
IncludeFiles=kgpginterface.h
# MemberVariables=public
CustomAdditions=true \ No newline at end of file
diff --git a/kgpg/kgpgview.cpp b/kgpg/kgpgview.cpp
index 2e6540c..3602156 100644
--- a/kgpg/kgpgview.cpp
+++ b/kgpg/kgpgview.cpp
@@ -87,7 +87,7 @@ void MyEditor::slotDroppedFile(KURL url)
///////////////// decide what to do with dropped file
TQString text;
if (!tempFile.isEmpty()) {
- KIO::NetAccess::removeTempFile(tempFile);
+ TDEIO::NetAccess::removeTempFile(tempFile);
tempFile=TQString();
}
@@ -96,7 +96,7 @@ void MyEditor::slotDroppedFile(KURL url)
else {
if (KMessageBox::warningContinueCancel(0,i18n("<qt><b>Remote file dropped</b>.<br>The remote file will now be copied to a temporary file to process requested operation. This temporary file will be deleted after operation.</qt>"),0,KStdGuiItem::cont(),"RemoteFileWarning")!=KMessageBox::Continue)
return;
- if (!KIO::NetAccess::download (url, tempFile,this)) {
+ if (!TDEIO::NetAccess::download (url, tempFile,this)) {
KMessageBox::sorry(this,i18n("Could not download file."));
return;
}
@@ -129,7 +129,7 @@ TQFile qfile(fileToCheck);
qfile.close();
int result=KMessageBox::warningContinueCancel(this,i18n("<p>The file <b>%1</b> is a public key.<br>Do you want to import it ?</p>").arg(fileToCheck),i18n("Warning"));
if (result==KMessageBox::Cancel) {
- KIO::NetAccess::removeTempFile(fileToCheck);
+ TDEIO::NetAccess::removeTempFile(fileToCheck);
return true;
} else {
KgpgInterface *importKeyProcess=new KgpgInterface();
@@ -141,13 +141,13 @@ TQFile qfile(fileToCheck);
if (result.startsWith("-----BEGIN PGP PRIVATE KEY BLOCK")) {
qfile.close();
KMessageBox::information(0,i18n("This file is a private key.\nPlease use kgpg key management to import it."));
- KIO::NetAccess::removeTempFile(fileToCheck);
+ TDEIO::NetAccess::removeTempFile(fileToCheck);
return true;
}
setText(result);
qfile.close();
- KIO::NetAccess::removeTempFile(fileToCheck);
+ TDEIO::NetAccess::removeTempFile(fileToCheck);
}
}
return false;
@@ -183,7 +183,7 @@ void MyEditor::slotDecodeFile(TQString fname)
void MyEditor::slotProcessResult(TQStringList iKeys)
{
emit refreshImported(iKeys);
- KIO::NetAccess::removeTempFile(tempFile);
+ TDEIO::NetAccess::removeTempFile(tempFile);
tempFile=TQString();
}
diff --git a/kgpg/listkeys.cpp b/kgpg/listkeys.cpp
index c761552..0e4a5ca 100644
--- a/kgpg/listkeys.cpp
+++ b/kgpg/listkeys.cpp
@@ -890,7 +890,7 @@ void listKeys::slotDelUid()
item=item->parent();
TDEProcess *conprocess=new TDEProcess();
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup("General");
*conprocess<< config->readPathEntry("TerminalApplication","konsole");
*conprocess<<"-e"<<"gpg";
@@ -1283,7 +1283,7 @@ void listKeys::readOptions()
void listKeys::showOptions()
{
- if (KConfigDialog::showDialog("settings"))
+ if (TDEConfigDialog::showDialog("settings"))
return;
kgpgOptions *optionsDialog=new kgpgOptions(this,"settings");
connect(optionsDialog,TQT_SIGNAL(settingsUpdated()),TQT_TQOBJECT(this),TQT_SLOT(readAllOptions()));
@@ -1921,7 +1921,7 @@ void listKeys::signkey()
else {
TDEProcess kp;
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup("General");
kp<< config->readPathEntry("TerminalApplication","konsole");
kp<<"-e"
@@ -2097,7 +2097,7 @@ void listKeys::slotedit()
TDEProcess kp;
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup("General");
kp<< config->readPathEntry("TerminalApplication","konsole");
kp<<"-e"
@@ -2216,7 +2216,7 @@ void listKeys::slotgenkey()
{
TDEProcess kp;
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup("General");
kp<< config->readPathEntry("TerminalApplication","konsole");
kp<<"-e"
@@ -2352,7 +2352,7 @@ void listKeys::deleteseckey()
return;
TDEProcess *conprocess=new TDEProcess();
- KConfig *config = TDEGlobal::config();
+ TDEConfig *config = TDEGlobal::config();
config->setGroup("General");
*conprocess<< config->readPathEntry("TerminalApplication","konsole");
*conprocess<<"-e"<<"gpg"
diff --git a/kgpg/popuppublic.h b/kgpg/popuppublic.h
index e20c509..a732f4c 100644
--- a/kgpg/popuppublic.h
+++ b/kgpg/popuppublic.h
@@ -45,7 +45,7 @@ public:
TQStringList untrustedList;
private:
- KConfig *config;
+ TDEConfig *config;
TQButtonGroup *boutonboxoptions;
TQString customOptions;