summaryrefslogtreecommitdiffstats
path: root/kdesktop/lock/main.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:17:06 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:17:06 -0600
commite4e0479220e9e9616b68b2a11e42cff7a8af7b3d (patch)
tree8e01571cdd132dad34ebec38b12c2dbc37d05bd9 /kdesktop/lock/main.h
parentd41050ea3f6904e5156d35f664346b816b9e4d12 (diff)
downloadtdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.tar.gz
tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kdesktop/lock/main.h')
-rw-r--r--kdesktop/lock/main.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/kdesktop/lock/main.h b/kdesktop/lock/main.h
index 23797e4b0..12db9ebca 100644
--- a/kdesktop/lock/main.h
+++ b/kdesktop/lock/main.h
@@ -24,10 +24,10 @@
#include <time.h>
-class MyApp : public KApplication {
+class MyApp : public TDEApplication {
Q_OBJECT
public:
- MyApp() : KApplication(), lastTick( 0 ) {}
+ MyApp() : TDEApplication(), lastTick( 0 ) {}
protected:
bool x11EventFilter( XEvent * );
signals: