From 2c01fd64ddde84a6d78b632f7f3b7c3560dc288c Mon Sep 17 00:00:00 2001 From: Timothy Pearson 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. --- twin/kcmtwin/twinrules/detectwidgetbase.ui | 2 +- twin/kcmtwin/twinrules/editshortcutbase.ui | 6 ++-- twin/kcmtwin/twinrules/kcm.cpp | 2 +- twin/kcmtwin/twinrules/main.cpp | 4 +-- twin/kcmtwin/twinrules/ruleslistbase.ui | 2 +- twin/kcmtwin/twinrules/ruleswidget.cpp | 6 ++-- twin/kcmtwin/twinrules/ruleswidgetbase.ui | 50 +++++++++++++++--------------- 7 files changed, 36 insertions(+), 36 deletions(-) (limited to 'twin/kcmtwin/twinrules') diff --git a/twin/kcmtwin/twinrules/detectwidgetbase.ui b/twin/kcmtwin/twinrules/detectwidgetbase.ui index b13e7948a..af4ca9670 100644 --- a/twin/kcmtwin/twinrules/detectwidgetbase.ui +++ b/twin/kcmtwin/twinrules/detectwidgetbase.ui @@ -29,7 +29,7 @@ Expanding - + 20 40 diff --git a/twin/kcmtwin/twinrules/editshortcutbase.ui b/twin/kcmtwin/twinrules/editshortcutbase.ui index 702816263..af704c0a2 100644 --- a/twin/kcmtwin/twinrules/editshortcutbase.ui +++ b/twin/kcmtwin/twinrules/editshortcutbase.ui @@ -66,7 +66,7 @@ For example "<b>Shift+Alt+(123) Shift+Ctrl+(ABC)</b>" will first try Expanding - + 40 20 @@ -91,7 +91,7 @@ For example "<b>Shift+Alt+(123) Shift+Ctrl+(ABC)</b>" will first try Expanding - + 40 20 @@ -116,7 +116,7 @@ For example "<b>Shift+Alt+(123) Shift+Ctrl+(ABC)</b>" will first try Expanding - + 40 20 diff --git a/twin/kcmtwin/twinrules/kcm.cpp b/twin/kcmtwin/twinrules/kcm.cpp index 45b09cfea..c7cdc7587 100644 --- a/twin/kcmtwin/twinrules/kcm.cpp +++ b/twin/kcmtwin/twinrules/kcm.cpp @@ -19,7 +19,7 @@ #include "kcm.h" #include -#include +#include #include #include #include diff --git a/twin/kcmtwin/twinrules/main.cpp b/twin/kcmtwin/twinrules/main.cpp index b589d5005..db3a9fc48 100644 --- a/twin/kcmtwin/twinrules/main.cpp +++ b/twin/kcmtwin/twinrules/main.cpp @@ -151,7 +151,7 @@ static Rules* findRule( const TQValueList< Rules* >& rules, Window wid, bool who Rules* ret = new Rules; if( whole_app ) { - ret->description = i18n( "Application settings for %1" ).arg( static_cast(wmclass_class) ); + ret->description = i18n( "Application settings for %1" ).tqarg( static_cast(wmclass_class) ); // TODO maybe exclude some types? If yes, then also exclude them above // when searching. ret->types = NET::AllTypesMask; @@ -175,7 +175,7 @@ static Rules* findRule( const TQValueList< Rules* >& rules, Window wid, bool who } return ret; } - ret->description = i18n( "Window settings for %1" ).arg( static_cast(wmclass_class) ); + ret->description = i18n( "Window settings for %1" ).tqarg( static_cast(wmclass_class) ); if( type == NET::Unknown ) ret->types = NET::NormalMask; else diff --git a/twin/kcmtwin/twinrules/ruleslistbase.ui b/twin/kcmtwin/twinrules/ruleslistbase.ui index 8ab21412b..5fc5fd6ed 100644 --- a/twin/kcmtwin/twinrules/ruleslistbase.ui +++ b/twin/kcmtwin/twinrules/ruleslistbase.ui @@ -77,7 +77,7 @@ Expanding - + 20 294 diff --git a/twin/kcmtwin/twinrules/ruleswidget.cpp b/twin/kcmtwin/twinrules/ruleswidget.cpp index 8680018d7..cfe96458e 100644 --- a/twin/kcmtwin/twinrules/ruleswidget.cpp +++ b/twin/kcmtwin/twinrules/ruleswidget.cpp @@ -661,7 +661,7 @@ bool RulesWidget::finalCheck() all_types = false; if( wmclass_match->currentItem() == Rules::UnimportantMatch && all_types ) { - if( KMessageBox::warningContinueCancel( topLevelWidget(), + if( KMessageBox::warningContinueCancel( tqtopLevelWidget(), i18n( "You have specified the window class as unimportant.\n" "This means the settings will possibly apply to windows from all applications. " "If you really want to create a generic setting, it is recommended you at least " @@ -680,7 +680,7 @@ void RulesWidget::prepareWindowSpecific( WId window ) void RulesWidget::shortcutEditClicked() { - EditShortcutDialog dlg( topLevelWidget()); + EditShortcutDialog dlg( tqtopLevelWidget()); dlg.setShortcut( shortcut->text()); if( dlg.exec() == TQDialog::Accepted ) shortcut->setText( dlg.shortcut()); @@ -735,7 +735,7 @@ EditShortcut::EditShortcut( TQWidget* parent, const char* name ) void EditShortcut::editShortcut() { - ShortcutDialog dlg( KShortcut( shortcut->text()), topLevelWidget()); + ShortcutDialog dlg( KShortcut( shortcut->text()), tqtopLevelWidget()); if( dlg.exec() == TQDialog::Accepted ) shortcut->setText( dlg.shortcut().toString()); } diff --git a/twin/kcmtwin/twinrules/ruleswidgetbase.ui b/twin/kcmtwin/twinrules/ruleswidgetbase.ui index c83bbef92..5a5640ca2 100644 --- a/twin/kcmtwin/twinrules/ruleswidgetbase.ui +++ b/twin/kcmtwin/twinrules/ruleswidgetbase.ui @@ -87,7 +87,7 @@ Expanding - + 20 40 @@ -129,7 +129,7 @@ Expanding - + 212 20 @@ -157,7 +157,7 @@ Expanding - + 211 20 @@ -199,7 +199,7 @@ Expanding - + 212 20 @@ -230,7 +230,7 @@ Expanding - + 211 20 @@ -271,7 +271,7 @@ Expanding - + 270 20 @@ -296,7 +296,7 @@ Expanding - + 269 20 @@ -470,7 +470,7 @@ Expanding - + 199 20 @@ -501,7 +501,7 @@ Expanding - + 199 20 @@ -543,7 +543,7 @@ Expanding - + 199 20 @@ -574,7 +574,7 @@ Expanding - + 199 20 @@ -616,7 +616,7 @@ Expanding - + 199 20 @@ -647,7 +647,7 @@ Expanding - + 199 20 @@ -1181,7 +1181,7 @@ Expanding - + 20 16 @@ -1347,7 +1347,7 @@ Expanding - + 171 20 @@ -1364,7 +1364,7 @@ Expanding - + 290 20 @@ -1381,7 +1381,7 @@ Expanding - + 290 20 @@ -1398,7 +1398,7 @@ Expanding - + 290 20 @@ -1415,7 +1415,7 @@ Expanding - + 290 20 @@ -1432,7 +1432,7 @@ Expanding - + 290 20 @@ -1449,7 +1449,7 @@ Expanding - + 290 20 @@ -1466,7 +1466,7 @@ Expanding - + 290 20 @@ -1796,7 +1796,7 @@ Expanding - + 20 80 @@ -1847,7 +1847,7 @@ Expanding - + 181 20 @@ -2278,7 +2278,7 @@ Expanding - + 20 160 -- cgit v1.2.3