summaryrefslogtreecommitdiffstats
path: root/libkpgp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:49:30 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:49:30 -0600
commita9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch)
treed087071b1e8fcf79698938efec19f8e48bab0799 /libkpgp
parent5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff)
downloadtdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz
tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'libkpgp')
-rw-r--r--libkpgp/kpgpbase2.cpp2
-rw-r--r--libkpgp/kpgpbase5.cpp4
-rw-r--r--libkpgp/kpgpbaseG.cpp4
-rw-r--r--libkpgp/kpgpui.cpp10
4 files changed, 10 insertions, 10 deletions
diff --git a/libkpgp/kpgpbase2.cpp b/libkpgp/kpgpbase2.cpp
index 9427edaf0..b8a6448ae 100644
--- a/libkpgp/kpgpbase2.cpp
+++ b/libkpgp/kpgpbase2.cpp
@@ -533,7 +533,7 @@ Base2::doGetPublicKeys( const TQCString & cmd, const TQStringList & patterns )
for ( TQStringList::ConstIterator it = patterns.begin();
it != patterns.end(); ++it ) {
- exitStatus = run( cmd + " " + KProcess::quote( *it ).local8Bit(),
+ exitStatus = run( cmd + " " + TDEProcess::quote( *it ).local8Bit(),
0, true );
if ( exitStatus != 0 ) {
diff --git a/libkpgp/kpgpbase5.cpp b/libkpgp/kpgpbase5.cpp
index 0e5837326..d7066cb91 100644
--- a/libkpgp/kpgpbase5.cpp
+++ b/libkpgp/kpgpbase5.cpp
@@ -363,7 +363,7 @@ Base5::publicKeys( const TQStringList & patterns )
for ( TQStringList::ConstIterator it = patterns.begin();
it != patterns.end(); ++it ) {
cmd += " ";
- cmd += KProcess::quote( *it ).local8Bit();
+ cmd += TDEProcess::quote( *it ).local8Bit();
}
status = 0;
exitStatus = run( cmd, 0, true );
@@ -393,7 +393,7 @@ Base5::secretKeys( const TQStringList & patterns )
for ( TQStringList::ConstIterator it = patterns.begin();
it != patterns.end(); ++it ) {
cmd += " ";
- cmd += KProcess::quote( *it ).local8Bit();
+ cmd += TDEProcess::quote( *it ).local8Bit();
}
status = 0;
exitStatus = run( cmd, 0, true );
diff --git a/libkpgp/kpgpbaseG.cpp b/libkpgp/kpgpbaseG.cpp
index 251a7737b..52bb6bc7e 100644
--- a/libkpgp/kpgpbaseG.cpp
+++ b/libkpgp/kpgpbaseG.cpp
@@ -414,7 +414,7 @@ BaseG::publicKeys( const TQStringList & patterns )
for ( TQStringList::ConstIterator it = patterns.begin();
it != patterns.end(); ++it ) {
cmd += " ";
- cmd += KProcess::quote( *it ).local8Bit();
+ cmd += TDEProcess::quote( *it ).local8Bit();
}
status = 0;
exitStatus = runGpg( cmd, 0, true );
@@ -446,7 +446,7 @@ BaseG::secretKeys( const TQStringList & patterns )
for ( TQStringList::ConstIterator it = patterns.begin();
it != patterns.end(); ++it ) {
cmd += " ";
- cmd += KProcess::quote( *it ).local8Bit();
+ cmd += TDEProcess::quote( *it ).local8Bit();
}
status = 0;
exitStatus = runGpg( cmd, 0, true );
diff --git a/libkpgp/kpgpui.cpp b/libkpgp/kpgpui.cpp
index 37533220b..2e6d71606 100644
--- a/libkpgp/kpgpui.cpp
+++ b/libkpgp/kpgpui.cpp
@@ -543,13 +543,13 @@ TQString KeySelectionDialog::keyInfo( const Kpgp::Key *key ) const
if( remark.isEmpty() ) {
return " " + i18n("creation date and status of an OpenPGP key",
"Creation date: %1, Status: %2")
- .arg( KGlobal::locale()->formatDate( dt.date(), true ) )
+ .arg( TDEGlobal::locale()->formatDate( dt.date(), true ) )
.arg( status );
}
else {
return " " + i18n("creation date, status and remark of an OpenPGP key",
"Creation date: %1, Status: %2 (%3)")
- .arg( KGlobal::locale()->formatDate( dt.date(), true ) )
+ .arg( TDEGlobal::locale()->formatDate( dt.date(), true ) )
.arg( status )
.arg( remark );
}
@@ -1498,7 +1498,7 @@ KeyApprovalDialog::KeyApprovalDialog( const TQStringList& addresses,
+ marginHint()
+ 2;
// don't make the dialog too large
- TQRect desk = KGlobalSettings::desktopGeometry(this);
+ TQRect desk = TDEGlobalSettings::desktopGeometry(this);
int screenWidth = desk.width();
if( dialogWidth > 3*screenWidth/4 )
dialogWidth = 3*screenWidth/4;
@@ -1635,7 +1635,7 @@ CipherTextDialog::CipherTextDialog( const TQCString & text,
unicodeText = TQString::fromLocal8Bit(text.data());
else {
bool ok=true;
- TQTextCodec *codec = KGlobal::charsets()->codecForName(charset, ok);
+ TQTextCodec *codec = TDEGlobal::charsets()->codecForName(charset, ok);
if(!ok)
unicodeText = TQString::fromLocal8Bit(text.data());
else
@@ -1660,7 +1660,7 @@ void CipherTextDialog::setMinimumSize()
#if KDE_IS_VERSION( 3, 1, 90 )
- int maxWidth = KGlobalSettings::desktopGeometry(parentWidget()).width()-100;
+ int maxWidth = TDEGlobalSettings::desktopGeometry(parentWidget()).width()-100;
#else
KConfig gc("kdeglobals", false, false);
gc.setGroup("Windows");