summaryrefslogtreecommitdiffstats
path: root/konqueror/konq_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 /konqueror/konq_main.h
parentd41050ea3f6904e5156d35f664346b816b9e4d12 (diff)
downloadtdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.tar.gz
tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/konq_main.h')
-rw-r--r--konqueror/konq_main.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/konqueror/konq_main.h b/konqueror/konq_main.h
index 92dbdd3b2..21f09f212 100644
--- a/konqueror/konq_main.h
+++ b/konqueror/konq_main.h
@@ -6,16 +6,16 @@
// This is used to know if we are being closed by session management
// or by the user. See KonqMainWindow::~KonqMainWindow.
// Credits to Matthias Ettrich for the idea.
-class KonquerorApplication : public KApplication
+class KonquerorApplication : public TDEApplication
{
public:
- KonquerorApplication() : KApplication(),
+ KonquerorApplication() : TDEApplication(),
closed_by_sm( false ) {}
bool closedByUser() const { return !closed_by_sm; }
void commitData(TQSessionManager& sm) {
closed_by_sm = true;
- KApplication::commitData( sm );
+ TDEApplication::commitData( sm );
closed_by_sm = false;
}