From 2c01fd64ddde84a6d78b632f7f3b7c3560dc288c Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:58:25 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit 73c08b592db45af554b9f21029bc549d70f683ab.
---
 khotkeys/kcontrol/triggers_tab.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'khotkeys/kcontrol/triggers_tab.cpp')

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();
-- 
cgit v1.2.1