summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:00:16 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:00:16 -0600
commit8c59c3314c1c10f726cbeef7c558fd1c9044d3bf (patch)
tree23bf03b5e926d1a36752c0a3631394297f0f3c4d /src
parent8c3110de4756b688277bd050a58e58bd03491aea (diff)
downloadkvpnc-8c59c3314c1c10f726cbeef7c558fd1c9044d3bf.tar.gz
kvpnc-8c59c3314c1c10f726cbeef7c558fd1c9044d3bf.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'src')
-rw-r--r--src/kvpnc.cpp2
-rw-r--r--src/kvpnc.h4
-rw-r--r--src/main.cpp4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/kvpnc.cpp b/src/kvpnc.cpp
index 4a22b1e..c79d956 100644
--- a/src/kvpnc.cpp
+++ b/src/kvpnc.cpp
@@ -111,7 +111,7 @@
//END includes
-KVpnc::KVpnc ( KApplication *parent, TQWidget*, const char *name ) : KMainWindow ( 0, name ), DCOPObject ( "KVpncInterface" )
+KVpnc::KVpnc ( TDEApplication *parent, TQWidget*, const char *name ) : KMainWindow ( 0, name ), DCOPObject ( "KVpncInterface" )
{
this->parent = parent;
setCaption ( i18n ( "KVpnc" ) );
diff --git a/src/kvpnc.h b/src/kvpnc.h
index 40ad2f3..6c50c4e 100644
--- a/src/kvpnc.h
+++ b/src/kvpnc.h
@@ -80,7 +80,7 @@ public:
* @param parent Parent widget
* @param name Name of the Mainwindow
*/
- KVpnc( KApplication *parent, TQWidget *qparent = 0, const char *name = 0 );
+ KVpnc( TDEApplication *parent, TQWidget *qparent = 0, const char *name = 0 );
/**
* Destruktor
@@ -145,7 +145,7 @@ private:
enum ConnectionStatus {disconnected=0, connecting=1, connected=2};
enum LogType {info=0, remote=1, error=2, success=3, debug=4};
- KApplication *parent;
+ TDEApplication *parent;
TQStringList *env;
KVpncConfig *GlobalConfig;
diff --git a/src/main.cpp b/src/main.cpp
index 83b42aa..00546de 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -116,10 +116,10 @@ int main ( int argc, char *argv[] )
TDECmdLineArgs::init ( argc, argv, &aboutData);
// Add options from other components
- KApplication::addCmdLineOptions();
+ TDEApplication::addCmdLineOptions();
TDECmdLineArgs::addCmdLineOptions ( options );
- KApplication a;
+ TDEApplication a;
KVpnc *kvpnc = new KVpnc ( &a );
DCOPClient* dcop = a.dcopClient();