summaryrefslogtreecommitdiffstats
path: root/klipper
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 /klipper
parentd41050ea3f6904e5156d35f664346b816b9e4d12 (diff)
downloadtdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.tar.gz
tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'klipper')
-rw-r--r--klipper/toplevel.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp
index f6d2fa93..8e5e0df0 100644
--- a/klipper/toplevel.cpp
+++ b/klipper/toplevel.cpp
@@ -527,7 +527,7 @@ void KlipperWidget::saveSession()
void KlipperWidget::slotSettingsChanged( int category )
{
- if ( category == (int) KApplication::SETTINGS_SHORTCUTS ) {
+ if ( category == (int) TDEApplication::SETTINGS_SHORTCUTS ) {
globalKeys->readSettings();
globalKeys->updateConnections();
toggleURLGrabAction->setShortcut(globalKeys->shortcut("Enable/Disable Clipboard Actions"));
@@ -1034,7 +1034,7 @@ bool KlipperWidget::ignoreClipboardChanges() const
// which could possibly lead to TQClipboard reporting empty clipboard.
// Therefore, tqt_x_time needs to be updated to current X server timestamp.
-// Call KApplication::updateUserTime() only from functions that are
+// Call TDEApplication::updateUserTime() only from functions that are
// called from outside (DCOP), or from TQTimer timeout !
static Time next_x_time;