summaryrefslogtreecommitdiffstats
path: root/libkpimidentities
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 /libkpimidentities
parent5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff)
downloadtdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz
tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'libkpimidentities')
-rw-r--r--libkpimidentities/identity.cpp2
-rw-r--r--libkpimidentities/identity.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/libkpimidentities/identity.cpp b/libkpimidentities/identity.cpp
index 046225afc..c0ce5a6e8 100644
--- a/libkpimidentities/identity.cpp
+++ b/libkpimidentities/identity.cpp
@@ -93,7 +93,7 @@ TQString Signature::textFromCommand( bool * ok ) const
// run the process:
int rc = 0;
- if ( !proc.start( KProcess::Block, KProcess::Stdout ) )
+ if ( !proc.start( TDEProcess::Block, TDEProcess::Stdout ) )
rc = -1;
else
rc = ( proc.normalExit() ) ? proc.exitStatus() : -1 ;
diff --git a/libkpimidentities/identity.h b/libkpimidentities/identity.h
index a05ab61ce..7139b753a 100644
--- a/libkpimidentities/identity.h
+++ b/libkpimidentities/identity.h
@@ -15,7 +15,7 @@
#include <tqcstring.h>
#include <tqstringlist.h>
-class KProcess;
+class TDEProcess;
namespace KPIM {
class Identity;
class Signature;