From 8155225c9be993acc0512956416d195edfef4eb9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 19 Jan 2011 01:42:14 +0000 Subject: Enable compilation with TQt for Qt4 3.4.0 TP2 This should not break compatibility with TQt for Qt3; if it does please fix it ASAP! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kwin/kcmkwin/kwinrules/detectwidget.cpp | 8 +- kwin/kcmkwin/kwinrules/detectwidgetbase.ui | 40 +++---- kwin/kcmkwin/kwinrules/editshortcutbase.ui | 16 +-- kwin/kcmkwin/kwinrules/kcm.cpp | 4 +- kwin/kcmkwin/kwinrules/main.cpp | 8 +- kwin/kcmkwin/kwinrules/ruleslistbase.ui | 4 +- kwin/kcmkwin/kwinrules/ruleswidget.cpp | 6 +- kwin/kcmkwin/kwinrules/ruleswidgetbase.ui | 168 ++++++++++++++--------------- 8 files changed, 127 insertions(+), 127 deletions(-) (limited to 'kwin/kcmkwin/kwinrules') diff --git a/kwin/kcmkwin/kwinrules/detectwidget.cpp b/kwin/kcmkwin/kwinrules/detectwidget.cpp index 1a497c8bc..c30ae24ff 100644 --- a/kwin/kcmkwin/kwinrules/detectwidget.cpp +++ b/kwin/kcmkwin/kwinrules/detectwidget.cpp @@ -161,22 +161,22 @@ void DetectDialog::selectWindow() // use a dialog, so that all user input is blocked // use WX11BypassWM and moving away so that it's not actually visible // grab only mouse, so that keyboard can be used e.g. for switching windows - grabber = new TQDialog( NULL, NULL, true, WX11BypassWM ); + grabber = new TQDialog( NULL, NULL, true, (WFlags)WX11BypassWM ); grabber->move( -1000, -1000 ); grabber->show(); - grabber->grabMouse( crossCursor ); + grabber->grabMouse( tqcrossCursor ); grabber->installEventFilter( this ); } bool DetectDialog::eventFilter( TQObject* o, TQEvent* e ) { - if( o != grabber ) + if( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(grabber) ) return false; if( e->type() != TQEvent::MouseButtonRelease ) return false; delete grabber; grabber = NULL; - if( static_cast< TQMouseEvent* >( e )->button() != LeftButton ) + if( TQT_TQMOUSEEVENT( e )->button() != Qt::LeftButton ) { emit detectionDone( false ); return true; diff --git a/kwin/kcmkwin/kwinrules/detectwidgetbase.ui b/kwin/kcmkwin/kwinrules/detectwidgetbase.ui index 31cae3ef3..af4ca9670 100644 --- a/kwin/kcmkwin/kwinrules/detectwidgetbase.ui +++ b/kwin/kcmkwin/kwinrules/detectwidgetbase.ui @@ -1,6 +1,6 @@ KWinInternal::DetectWidgetBase - + Form3 @@ -29,14 +29,14 @@ Expanding - + 20 40 - + textLabel11 @@ -44,7 +44,7 @@ Extra role: - + textLabel1 @@ -52,7 +52,7 @@ Class: - + textLabel3 @@ -60,7 +60,7 @@ Role: - + type_label @@ -68,7 +68,7 @@ - + textLabel8 @@ -76,7 +76,7 @@ Title: - + class_label @@ -84,7 +84,7 @@ - + role_label @@ -92,7 +92,7 @@ - + title_label @@ -100,7 +100,7 @@ - + machine_label @@ -108,7 +108,7 @@ - + textLabel4 @@ -116,7 +116,7 @@ Type: - + extrarole_label @@ -124,7 +124,7 @@ - + textLabel13 @@ -146,7 +146,7 @@ Horizontal - + textLabel9 @@ -154,7 +154,7 @@ Information About Selected Window - + buttonGroup1 @@ -165,7 +165,7 @@ unnamed - + use_class @@ -179,7 +179,7 @@ For selecting all windows belonging to a specific application, selecting only window class should usually work. - + use_role @@ -190,7 +190,7 @@ For selecting a specific window in an application, both window class and window role should be selected. Window class will determine the application, and window role the specific window in the application; many applications do not provide useful window roles though. - + use_whole_class @@ -201,7 +201,7 @@ With some (non-KDE) applications whole window class can be sufficient for selecting a specific window in an application, as they set whole window class to contain both application and window role. - + match_title diff --git a/kwin/kcmkwin/kwinrules/editshortcutbase.ui b/kwin/kcmkwin/kwinrules/editshortcutbase.ui index 3813ae589..7f03bb946 100644 --- a/kwin/kcmkwin/kwinrules/editshortcutbase.ui +++ b/kwin/kcmkwin/kwinrules/editshortcutbase.ui @@ -1,6 +1,6 @@ EditShortcutBase - + EditShortcutBase @@ -16,7 +16,7 @@ unnamed - + textLabel2 @@ -48,7 +48,7 @@ For example "<b>Shift+Alt+(123) Shift+Ctrl+(ABC)</b>" will first try shortcut - + layout2 @@ -66,14 +66,14 @@ For example "<b>Shift+Alt+(123) Shift+Ctrl+(ABC)</b>" will first try Expanding - + 40 20 - + pushButton1 @@ -91,14 +91,14 @@ For example "<b>Shift+Alt+(123) Shift+Ctrl+(ABC)</b>" will first try Expanding - + 40 20 - + pushButton2 @@ -116,7 +116,7 @@ For example "<b>Shift+Alt+(123) Shift+Ctrl+(ABC)</b>" will first try Expanding - + 40 20 diff --git a/kwin/kcmkwin/kwinrules/kcm.cpp b/kwin/kcmkwin/kwinrules/kcm.cpp index 19b714311..90802c41d 100644 --- a/kwin/kcmkwin/kwinrules/kcm.cpp +++ b/kwin/kcmkwin/kwinrules/kcm.cpp @@ -44,7 +44,7 @@ KCMRules::KCMRules( TQWidget *parent, const char *name ) { TQVBoxLayout *layout = new TQVBoxLayout( this ); widget = new KCMRulesList( this ); - layout->addWidget( widget ); + layout->addWidget( TQT_TQWIDGET(widget) ); connect( widget, TQT_SIGNAL( changed( bool )), TQT_SLOT( moduleChanged( bool ))); KAboutData *about = new KAboutData(I18N_NOOP( "kcmkwinrules" ), I18N_NOOP( "Window-Specific Settings Configuration Module" ), @@ -68,7 +68,7 @@ void KCMRules::save() config.sync(); if( !kapp->dcopClient()->isAttached()) kapp->dcopClient()->attach(); - kapp->dcopClient()->send("kwin*", "", "reconfigure()", ""); + kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); } void KCMRules::defaults() diff --git a/kwin/kcmkwin/kwinrules/main.cpp b/kwin/kcmkwin/kwinrules/main.cpp index b58c96239..1663d88af 100644 --- a/kwin/kcmkwin/kwinrules/main.cpp +++ b/kwin/kcmkwin/kwinrules/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( 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( wmclass_class ); + ret->description = i18n( "Window settings for %1" ).tqarg( static_cast(wmclass_class) ); if( type == NET::Unknown ) ret->types = NET::NormalMask; else @@ -248,7 +248,7 @@ static int edit( Window wid, bool whole_app ) } else if( edited_rule != orig_rule ) { - TQValueList< Rules* >::Iterator pos = rules.find( orig_rule ); + TQValueList< Rules* >::Iterator pos = rules.tqfind( orig_rule ); if( pos != rules.end()) *pos = edited_rule; else @@ -258,7 +258,7 @@ static int edit( Window wid, bool whole_app ) saveRules( rules ); if( !kapp->dcopClient()->isAttached()) kapp->dcopClient()->attach(); - kapp->dcopClient()->send("kwin*", "", "reconfigure()", ""); + kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); return 0; } diff --git a/kwin/kcmkwin/kwinrules/ruleslistbase.ui b/kwin/kcmkwin/kwinrules/ruleslistbase.ui index c2abdaa9d..5fc5fd6ed 100644 --- a/kwin/kcmkwin/kwinrules/ruleslistbase.ui +++ b/kwin/kcmkwin/kwinrules/ruleslistbase.ui @@ -1,6 +1,6 @@ KWinInternal::KCMRulesListBase - + Form1 @@ -77,7 +77,7 @@ Expanding - + 20 294 diff --git a/kwin/kcmkwin/kwinrules/ruleswidget.cpp b/kwin/kcmkwin/kwinrules/ruleswidget.cpp index 2525644d9..7a82a8149 100644 --- a/kwin/kcmkwin/kwinrules/ruleswidget.cpp +++ b/kwin/kcmkwin/kwinrules/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/kwin/kcmkwin/kwinrules/ruleswidgetbase.ui b/kwin/kcmkwin/kwinrules/ruleswidgetbase.ui index 01c1b9918..dbcdbb374 100644 --- a/kwin/kcmkwin/kwinrules/ruleswidgetbase.ui +++ b/kwin/kcmkwin/kwinrules/ruleswidgetbase.ui @@ -1,6 +1,6 @@ KWinInternal::RulesWidgetBase - + Form2 @@ -19,11 +19,11 @@ 0 - + tabs - + tab @@ -34,7 +34,7 @@ unnamed - + textLabel1 @@ -50,7 +50,7 @@ description - + textLabel2 @@ -61,7 +61,7 @@ wmclass - + textLabel3 @@ -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 @@ -242,7 +242,7 @@ wmclass - + whole_wmclass @@ -250,7 +250,7 @@ Match w&hole window class - + groupBox1 @@ -271,7 +271,7 @@ Expanding - + 270 20 @@ -296,7 +296,7 @@ Expanding - + 269 20 @@ -307,7 +307,7 @@ - + tab @@ -318,7 +318,7 @@ unnamed - + textLabel4 @@ -387,7 +387,7 @@ Multi - + textLabel5 @@ -403,7 +403,7 @@ title - + textLabel6 @@ -419,7 +419,7 @@ extra - + textLabel7 @@ -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 @@ -656,7 +656,7 @@ - + TabPage @@ -716,7 +716,7 @@ 0123456789-+,xX: - + enable_size @@ -724,7 +724,7 @@ &Size - + enable_position @@ -781,7 +781,7 @@ false - + maximizevert @@ -830,7 +830,7 @@ false - + fullscreen @@ -841,7 +841,7 @@ - + enable_maximizehoriz @@ -849,7 +849,7 @@ Maximized &horizontally - + maximizehoriz @@ -898,7 +898,7 @@ false - + enable_fullscreen @@ -944,7 +944,7 @@ false - + enable_maximizevert @@ -998,7 +998,7 @@ false - + enable_desktop @@ -1006,7 +1006,7 @@ &Desktop - + enable_shade @@ -1014,7 +1014,7 @@ Sh&aded - + shade @@ -1063,7 +1063,7 @@ false - + minimize @@ -1074,7 +1074,7 @@ - + enable_minimize @@ -1163,7 +1163,7 @@ false - + enable_placement @@ -1181,7 +1181,7 @@ Expanding - + 20 16 @@ -1228,7 +1228,7 @@ - + TabPage @@ -1239,7 +1239,7 @@ unnamed - + enable_above @@ -1247,7 +1247,7 @@ Keep &above - + enable_below @@ -1255,7 +1255,7 @@ Keep &below - + enable_skippager @@ -1263,7 +1263,7 @@ Skip pa&ger - + enable_skiptaskbar @@ -1271,7 +1271,7 @@ Skip &taskbar - + enable_noborder @@ -1279,7 +1279,7 @@ &No border - + enable_acceptfocus @@ -1287,7 +1287,7 @@ Accept &focus - + enable_closeable @@ -1295,7 +1295,7 @@ &Closeable - + enable_opacityactive @@ -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,14 +1466,14 @@ Expanding - + 290 20 - + above @@ -1484,7 +1484,7 @@ - + below @@ -1495,7 +1495,7 @@ - + noborder @@ -1506,7 +1506,7 @@ - + skiptaskbar @@ -1517,7 +1517,7 @@ - + skippager @@ -1528,7 +1528,7 @@ - + acceptfocus @@ -1539,7 +1539,7 @@ - + closeable @@ -1796,7 +1796,7 @@ Expanding - + 20 80 @@ -1847,14 +1847,14 @@ Expanding - + 181 20 - + enable_opacityinactive @@ -1862,7 +1862,7 @@ I&nactive opacity in % - + enable_shortcut @@ -1911,7 +1911,7 @@ false - + shortcut_edit @@ -1929,7 +1929,7 @@ - + TabPage @@ -1940,7 +1940,7 @@ unnamed - + enable_fsplevel @@ -2047,7 +2047,7 @@ false - + enable_type @@ -2055,7 +2055,7 @@ Window &type - + enable_moveresizemode @@ -2153,7 +2153,7 @@ 0123456789-+,xX: - + enable_minsize @@ -2184,7 +2184,7 @@ false - + enable_maxsize @@ -2226,7 +2226,7 @@ false - + enable_ignoreposition @@ -2257,7 +2257,7 @@ false - + ignoreposition @@ -2278,14 +2278,14 @@ Expanding - + 20 160 - + enable_strictgeometry @@ -2319,7 +2319,7 @@ false - + strictgeometry @@ -2330,7 +2330,7 @@ - + disableglobalshortcuts @@ -2341,7 +2341,7 @@ - + enable_disableglobalshortcuts -- cgit v1.2.1