summaryrefslogtreecommitdiffstats
path: root/khotkeys/kcontrol/triggers_tab.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:58:25 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:58:25 -0600
commit2c01fd64ddde84a6d78b632f7f3b7c3560dc288c (patch)
tree65f4f4370cf4269757d7fa4d0f4d15996a1bf68f /khotkeys/kcontrol/triggers_tab.cpp
parent73c08b592db45af554b9f21029bc549d70f683ab (diff)
downloadtdebase-2c01fd64ddde84a6d78b632f7f3b7c3560dc288c.tar.gz
tdebase-2c01fd64ddde84a6d78b632f7f3b7c3560dc288c.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 73c08b592db45af554b9f21029bc549d70f683ab.
Diffstat (limited to 'khotkeys/kcontrol/triggers_tab.cpp')
-rw-r--r--khotkeys/kcontrol/triggers_tab.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/khotkeys/kcontrol/triggers_tab.cpp b/khotkeys/kcontrol/triggers_tab.cpp
index c2a300848..12cd12452 100644
--- a/khotkeys/kcontrol/triggers_tab.cpp
+++ b/khotkeys/kcontrol/triggers_tab.cpp
@@ -20,7 +20,7 @@
#include <tqpushbutton.h>
#include <tqlineedit.h>
#include <tqpopupmenu.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <tqheader.h>
@@ -241,8 +241,8 @@ void Shortcut_trigger_widget::clear_data()
void Shortcut_trigger_widget::capturedShortcut( const KShortcut& s_P )
{
- if( KKeyChooser::checkGlobalShortcutsConflict( s_P, true, topLevelWidget())
- || KKeyChooser::checkStandardShortcutsConflict( s_P, true, topLevelWidget()))
+ if( KKeyChooser::checkGlobalShortcutsConflict( s_P, true, tqtopLevelWidget())
+ || KKeyChooser::checkStandardShortcutsConflict( s_P, true, tqtopLevelWidget()))
return;
// KHotKeys::Module::changed()
module->changed();