summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 19:58:20 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 19:58:20 -0600
commit91dfed40243282a714bf314bcdd6e001d5d1edca (patch)
tree33d7019546b9834229c4d9b959774b3c2bb8b384 /src
parenteecbb16860d613854ac1c9dd90870d1a8e8774b3 (diff)
downloadkvpnc-91dfed40243282a714bf314bcdd6e001d5d1edca.tar.gz
kvpnc-91dfed40243282a714bf314bcdd6e001d5d1edca.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'src')
-rw-r--r--src/kfeedback.cpp2
-rw-r--r--src/main.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/kfeedback.cpp b/src/kfeedback.cpp
index 67ef633..3d16646 100644
--- a/src/kfeedback.cpp
+++ b/src/kfeedback.cpp
@@ -155,7 +155,7 @@ KFeedbackForm::sendMail()
TQString subject;
- const KAboutData * aboutData = KGlobal::instance()->aboutData();
+ const TDEAboutData * aboutData = KGlobal::instance()->aboutData();
if ( aboutData )
subject = aboutData->programName() + "-" + aboutData->version();
diff --git a/src/main.cpp b/src/main.cpp
index 00546de..073398c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -66,8 +66,8 @@ static KCmdLineOptions options[] =
int main ( int argc, char *argv[] )
{
- KAboutData aboutData ( "kvpnc", I18N_NOOP ( "KVpnc" ),
- KVPNCVERSION, description, KAboutData::License_GPL_V2,
+ TDEAboutData aboutData ( "kvpnc", I18N_NOOP ( "KVpnc" ),
+ KVPNCVERSION, description, TDEAboutData::License_GPL_V2,
I18N_NOOP ( "(C) 2005, the KVpnc team" ), 0,
"http://home.gna.org/kvpnc/", "crissi99@gmx.de" );