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 --- khotkeys/kcontrol/ui/action_group_tab_ui.ui | 14 ++--- khotkeys/kcontrol/ui/action_list_widget_ui.ui | 18 +++---- khotkeys/kcontrol/ui/actions_listview_widget_ui.ui | 6 +-- khotkeys/kcontrol/ui/command_url_widget_ui.ui | 6 +-- khotkeys/kcontrol/ui/condition_list_widget_ui.ui | 18 +++---- khotkeys/kcontrol/ui/dcop_widget_ui.ui | 38 +++++++------- khotkeys/kcontrol/ui/general_settings_tab_ui.ui | 12 ++--- khotkeys/kcontrol/ui/general_tab_ui.ui | 20 ++++---- khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui | 60 +++++++++++----------- khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui | 18 +++---- khotkeys/kcontrol/ui/info_tab_ui.ui | 8 +-- khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui | 18 +++---- khotkeys/kcontrol/ui/main_buttons_widget_ui.ui | 10 ++-- khotkeys/kcontrol/ui/menuentry_widget_ui.ui | 12 ++--- khotkeys/kcontrol/ui/triggers_tab_ui.ui | 18 +++---- khotkeys/kcontrol/ui/voice_input_widget_ui.ui | 6 +-- khotkeys/kcontrol/ui/voice_settings_tab_ui.ui | 16 +++--- khotkeys/kcontrol/ui/window_trigger_widget_ui.ui | 14 ++--- khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui | 18 +++---- khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui | 58 ++++++++++----------- 20 files changed, 194 insertions(+), 194 deletions(-) (limited to 'khotkeys/kcontrol/ui') diff --git a/khotkeys/kcontrol/ui/action_group_tab_ui.ui b/khotkeys/kcontrol/ui/action_group_tab_ui.ui index ad4bcceaf..16a4ebee1 100644 --- a/khotkeys/kcontrol/ui/action_group_tab_ui.ui +++ b/khotkeys/kcontrol/ui/action_group_tab_ui.ui @@ -1,6 +1,6 @@ KHotKeys::Action_group_tab_ui - + Action_group_tab_ui @@ -22,7 +22,7 @@ 6 - + action_group_name_label @@ -33,7 +33,7 @@ action_name_lineedit - + action_name_lineedit @@ -48,14 +48,14 @@ Fixed - + 20 20 - + disable_checkbox @@ -73,14 +73,14 @@ Fixed - + 20 20 - + comment_label diff --git a/khotkeys/kcontrol/ui/action_list_widget_ui.ui b/khotkeys/kcontrol/ui/action_list_widget_ui.ui index 696b5106a..8cd292afd 100644 --- a/khotkeys/kcontrol/ui/action_list_widget_ui.ui +++ b/khotkeys/kcontrol/ui/action_list_widget_ui.ui @@ -1,6 +1,6 @@ KHotKeys::Action_list_widget_ui - + Action_list_widget_ui @@ -22,7 +22,7 @@ 6 - + comment_label @@ -33,12 +33,12 @@ comment_lineedit - + comment_lineedit - + layout3 @@ -51,7 +51,7 @@ actions_listview - + Layout3 @@ -65,7 +65,7 @@ 6 - + new_button @@ -73,7 +73,7 @@ &New - + modify_button @@ -81,7 +81,7 @@ &Modify... - + copy_button @@ -89,7 +89,7 @@ &Copy - + delete_button diff --git a/khotkeys/kcontrol/ui/actions_listview_widget_ui.ui b/khotkeys/kcontrol/ui/actions_listview_widget_ui.ui index 7c0a88a6f..a2589fc48 100644 --- a/khotkeys/kcontrol/ui/actions_listview_widget_ui.ui +++ b/khotkeys/kcontrol/ui/actions_listview_widget_ui.ui @@ -1,6 +1,6 @@ KHotKeys::Actions_listview_widget_ui - + Actions_listview_widget_ui @@ -22,7 +22,7 @@ 6 - + actions_listview_groupbox @@ -72,7 +72,7 @@ - class QListViewItem; + class TQListViewItem; kdialog.h diff --git a/khotkeys/kcontrol/ui/command_url_widget_ui.ui b/khotkeys/kcontrol/ui/command_url_widget_ui.ui index 266dd90d9..041aeacf4 100644 --- a/khotkeys/kcontrol/ui/command_url_widget_ui.ui +++ b/khotkeys/kcontrol/ui/command_url_widget_ui.ui @@ -1,6 +1,6 @@ KHotKeys::Command_url_widget_ui - + Command_url_widget_ui @@ -22,7 +22,7 @@ 6 - + layout2 @@ -30,7 +30,7 @@ unnamed - + command_url_label diff --git a/khotkeys/kcontrol/ui/condition_list_widget_ui.ui b/khotkeys/kcontrol/ui/condition_list_widget_ui.ui index a64ef33c1..c8969d531 100644 --- a/khotkeys/kcontrol/ui/condition_list_widget_ui.ui +++ b/khotkeys/kcontrol/ui/condition_list_widget_ui.ui @@ -1,6 +1,6 @@ KHotKeys::Condition_list_widget_ui - + Condition_list_widget_ui @@ -22,7 +22,7 @@ 6 - + comment_label @@ -33,12 +33,12 @@ comment_lineedit - + comment_lineedit - + layout6 @@ -51,7 +51,7 @@ conditions_listview - + Layout3 @@ -65,7 +65,7 @@ 6 - + new_button @@ -73,7 +73,7 @@ &New - + modify_button @@ -81,7 +81,7 @@ &Modify... - + copy_button @@ -89,7 +89,7 @@ &Copy - + delete_button diff --git a/khotkeys/kcontrol/ui/dcop_widget_ui.ui b/khotkeys/kcontrol/ui/dcop_widget_ui.ui index ed6e90337..173e7d7aa 100644 --- a/khotkeys/kcontrol/ui/dcop_widget_ui.ui +++ b/khotkeys/kcontrol/ui/dcop_widget_ui.ui @@ -1,6 +1,6 @@ KHotKeys::Dcop_widget_ui - + Dcop_widget_ui @@ -22,7 +22,7 @@ 6 - + remote_app_label @@ -33,7 +33,7 @@ remote_app_lineedit - + remote_app_lineedit @@ -48,14 +48,14 @@ Expanding - + 0 20 - + remote_object_label @@ -66,7 +66,7 @@ remote_object_lineedit - + remote_object_lineedit @@ -81,14 +81,14 @@ Expanding - + 0 20 - + called_function_label @@ -99,7 +99,7 @@ called_function_lineedit - + called_function_lineedit @@ -114,14 +114,14 @@ Expanding - + 0 20 - + arguments_label @@ -132,7 +132,7 @@ arguments_lineedit - + arguments_lineedit @@ -147,14 +147,14 @@ Expanding - + 0 20 - + Layout2 @@ -178,14 +178,14 @@ Expanding - + 20 0 - + try_button @@ -203,14 +203,14 @@ Expanding - + 20 0 - + PushButton1 @@ -228,7 +228,7 @@ Expanding - + 20 0 diff --git a/khotkeys/kcontrol/ui/general_settings_tab_ui.ui b/khotkeys/kcontrol/ui/general_settings_tab_ui.ui index 60dc34237..2463d3f2c 100644 --- a/khotkeys/kcontrol/ui/general_settings_tab_ui.ui +++ b/khotkeys/kcontrol/ui/general_settings_tab_ui.ui @@ -1,6 +1,6 @@ General_settings_tab_ui - + General_settings_tab_ui @@ -16,7 +16,7 @@ unnamed - + disable_daemon_checkbox @@ -24,7 +24,7 @@ Disable KHotKeys daemon - + layout1 @@ -42,7 +42,7 @@ Expanding - + 40 20 @@ -67,7 +67,7 @@ Expanding - + 40 20 @@ -86,7 +86,7 @@ Expanding - + 20 40 diff --git a/khotkeys/kcontrol/ui/general_tab_ui.ui b/khotkeys/kcontrol/ui/general_tab_ui.ui index 93f3a6a2c..3d19b3256 100644 --- a/khotkeys/kcontrol/ui/general_tab_ui.ui +++ b/khotkeys/kcontrol/ui/general_tab_ui.ui @@ -1,6 +1,6 @@ KHotKeys::General_tab_ui - + General_tab_ui @@ -22,7 +22,7 @@ 6 - + action_name_label @@ -33,12 +33,12 @@ action_name_lineedit - + action_name_lineedit - + Layout1 @@ -52,7 +52,7 @@ 6 - + action_type_label @@ -63,7 +63,7 @@ action_type_combo - + action_type_combo @@ -80,14 +80,14 @@ Fixed - + 20 20 - + disable_checkbox @@ -105,14 +105,14 @@ Fixed - + 20 20 - + comment_label diff --git a/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui b/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui index 29f8f88d5..9e843764f 100644 --- a/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui +++ b/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui @@ -1,6 +1,6 @@ KHotKeys::Gesture_triggers_tab_ui - + Gesture_triggers_tab_ui @@ -22,7 +22,7 @@ 6 - + TextLabel1 @@ -46,14 +46,14 @@ Expanding - + 0 30 - + Layout5 @@ -77,14 +77,14 @@ Expanding - + 30 0 - + gesture_lineedit1 @@ -102,7 +102,7 @@ Expanding - + 30 0 @@ -121,7 +121,7 @@ 0 - + 100 100 @@ -138,14 +138,14 @@ Expanding - + 30 0 - + gesture_edit_button1 @@ -163,7 +163,7 @@ Expanding - + 30 0 @@ -182,14 +182,14 @@ Expanding - + 0 30 - + Layout6 @@ -213,14 +213,14 @@ Expanding - + 30 0 - + gesture_lineedit2 @@ -238,7 +238,7 @@ Expanding - + 30 0 @@ -257,7 +257,7 @@ 0 - + 100 100 @@ -274,14 +274,14 @@ Expanding - + 30 0 - + gesture_edit_button2 @@ -299,7 +299,7 @@ Expanding - + 30 0 @@ -318,14 +318,14 @@ Expanding - + 0 30 - + Layout7 @@ -349,14 +349,14 @@ Expanding - + 30 0 - + gesture_lineedit3 @@ -374,7 +374,7 @@ Expanding - + 30 0 @@ -393,7 +393,7 @@ 0 - + 100 100 @@ -410,14 +410,14 @@ Expanding - + 30 0 - + gesture_edit_button3 @@ -435,7 +435,7 @@ Expanding - + 30 0 @@ -454,7 +454,7 @@ Expanding - + 0 30 diff --git a/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui b/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui index 3bee7daf0..698392402 100644 --- a/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui +++ b/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui @@ -1,6 +1,6 @@ Gestures_settings_tab_ui - + Gestures_settings_tab_ui @@ -16,7 +16,7 @@ unnamed - + mouse_gestures_globally @@ -24,7 +24,7 @@ Disable mouse gestures globally - + layout1 @@ -32,7 +32,7 @@ unnamed - + mouse_button_label @@ -43,14 +43,14 @@ mouse_button_combo - + mouse_button_combo - + layout2 @@ -58,7 +58,7 @@ unnamed - + timeout_label @@ -82,7 +82,7 @@ - + window_groupbox @@ -116,7 +116,7 @@ Expanding - + 20 50 diff --git a/khotkeys/kcontrol/ui/info_tab_ui.ui b/khotkeys/kcontrol/ui/info_tab_ui.ui index 9f82ccdcc..53868495c 100644 --- a/khotkeys/kcontrol/ui/info_tab_ui.ui +++ b/khotkeys/kcontrol/ui/info_tab_ui.ui @@ -1,6 +1,6 @@ KHotKeys::Info_tab_ui - + Info_tab_ui @@ -25,7 +25,7 @@ 6 - + warning_label @@ -33,7 +33,7 @@ <p>This module allows configuring input actions, like mouse gestures, keyboard shortcuts for performing commands, launching applications or DCOP calls, and similar.</p> <p><b>NOTE: </b>If you are not an experienced user, you should be careful with modifying the actions, and should limit your changes mainly to enabling/disabling actions, and changing triggers.</p> - + WordBreak|AlignVCenter @@ -47,7 +47,7 @@ Expanding - + 20 20 diff --git a/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui b/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui index f3947dd54..55a7d6188 100644 --- a/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui +++ b/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui @@ -1,6 +1,6 @@ KHotKeys::Keyboard_input_widget_ui - + Keyboard_input_widget_ui @@ -25,7 +25,7 @@ 6 - + keyboard_input_label @@ -36,7 +36,7 @@ keyboard_input_multilineedit - + Layout2 @@ -58,7 +58,7 @@ PlainText - + modify_button @@ -68,7 +68,7 @@ - + buttonGroup1 @@ -86,7 +86,7 @@ unnamed - + action_window_radio @@ -97,7 +97,7 @@ true - + active_window_radio @@ -105,7 +105,7 @@ Active window - + specific_window_radio @@ -115,7 +115,7 @@ - + window_groupbox diff --git a/khotkeys/kcontrol/ui/main_buttons_widget_ui.ui b/khotkeys/kcontrol/ui/main_buttons_widget_ui.ui index a46ee0a0f..f559dd7bc 100644 --- a/khotkeys/kcontrol/ui/main_buttons_widget_ui.ui +++ b/khotkeys/kcontrol/ui/main_buttons_widget_ui.ui @@ -1,6 +1,6 @@ KHotKeys::Main_buttons_widget_ui - + Main_buttons_widget_ui @@ -30,7 +30,7 @@ 6 - + new_action_button @@ -38,7 +38,7 @@ &New Action - + new_action_group_button @@ -46,7 +46,7 @@ New &Group - + delete_action_button @@ -68,7 +68,7 @@ Vertical - + global_settings_button diff --git a/khotkeys/kcontrol/ui/menuentry_widget_ui.ui b/khotkeys/kcontrol/ui/menuentry_widget_ui.ui index ae6c613f3..ed3cc119e 100644 --- a/khotkeys/kcontrol/ui/menuentry_widget_ui.ui +++ b/khotkeys/kcontrol/ui/menuentry_widget_ui.ui @@ -1,6 +1,6 @@ KHotKeys::Menuentry_widget_ui - + Menuentry_widget_ui @@ -22,7 +22,7 @@ 6 - + menuentry_label @@ -33,7 +33,7 @@ command_url_lineedit - + Layout7 @@ -47,12 +47,12 @@ 6 - + menuentry_lineedit - + browse_button @@ -72,7 +72,7 @@ Expanding - + 0 20 diff --git a/khotkeys/kcontrol/ui/triggers_tab_ui.ui b/khotkeys/kcontrol/ui/triggers_tab_ui.ui index 13ac0530b..44b9d6d56 100644 --- a/khotkeys/kcontrol/ui/triggers_tab_ui.ui +++ b/khotkeys/kcontrol/ui/triggers_tab_ui.ui @@ -1,6 +1,6 @@ KHotKeys::Triggers_tab_ui - + Triggers_tab_ui @@ -22,7 +22,7 @@ 6 - + comment_label @@ -33,12 +33,12 @@ comment_lineedit - + comment_lineedit - + layout3 @@ -51,7 +51,7 @@ triggers_listview - + Layout3 @@ -65,7 +65,7 @@ 6 - + new_button @@ -73,7 +73,7 @@ &New - + modify_button @@ -81,7 +81,7 @@ &Modify... - + copy_button @@ -89,7 +89,7 @@ &Copy - + delete_button diff --git a/khotkeys/kcontrol/ui/voice_input_widget_ui.ui b/khotkeys/kcontrol/ui/voice_input_widget_ui.ui index 007610fca..71c724aff 100644 --- a/khotkeys/kcontrol/ui/voice_input_widget_ui.ui +++ b/khotkeys/kcontrol/ui/voice_input_widget_ui.ui @@ -1,6 +1,6 @@ Voice_input_widget_ui - + Form1 @@ -16,7 +16,7 @@ unnamed - + label @@ -28,7 +28,7 @@ 0 - + 150 0 diff --git a/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui b/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui index 2c254dcc8..1a4eed270 100644 --- a/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui +++ b/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui @@ -1,6 +1,6 @@ Voice_settings_tab_ui - + Voice_settings_tab_ui @@ -16,18 +16,18 @@ unnamed - + textLabel2 In order to trigger a spoken action, you have to press the key (or combination of keys) configured below, speak the command and then press the same key again once you have finished speaking. - + WordBreak|AlignVCenter - + layout4 @@ -35,7 +35,7 @@ unnamed - + textLabel1 @@ -61,7 +61,7 @@ Expanding - + 241 21 @@ -80,14 +80,14 @@ Expanding - + 31 90 - + textLabel1_2 diff --git a/khotkeys/kcontrol/ui/window_trigger_widget_ui.ui b/khotkeys/kcontrol/ui/window_trigger_widget_ui.ui index 58d15e3cf..c6a8ae73e 100644 --- a/khotkeys/kcontrol/ui/window_trigger_widget_ui.ui +++ b/khotkeys/kcontrol/ui/window_trigger_widget_ui.ui @@ -1,6 +1,6 @@ KHotKeys::Window_trigger_widget_ui - + Window_trigger_widget_ui @@ -22,7 +22,7 @@ 6 - + GroupBox4 @@ -39,7 +39,7 @@ 6 - + window_appears_checkbox @@ -47,7 +47,7 @@ Window appears - + window_disappears_checkbox @@ -55,7 +55,7 @@ Window disappears - + window_activates_checkbox @@ -63,7 +63,7 @@ Window activates - + window_deactivates_checkbox @@ -73,7 +73,7 @@ - + window_groupbox diff --git a/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui b/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui index 5e9007e9e..fca2934d7 100644 --- a/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui +++ b/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui @@ -1,6 +1,6 @@ KHotKeys::Windowdef_list_widget_ui - + Windowdef_list_widget_ui @@ -22,7 +22,7 @@ 6 - + comment_label @@ -33,12 +33,12 @@ comment_lineedit - + comment_lineedit - + layout3 @@ -51,7 +51,7 @@ windows_listview - + Layout3 @@ -65,7 +65,7 @@ 6 - + new_button @@ -73,7 +73,7 @@ &New - + modify_button @@ -81,7 +81,7 @@ &Modify... - + copy_button @@ -89,7 +89,7 @@ &Copy - + delete_button diff --git a/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui b/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui index 01d54da98..6e96e06ab 100644 --- a/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui +++ b/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui @@ -1,6 +1,6 @@ KHotKeys::Windowdef_simple_widget_ui - + Windowdef_simple_widget_ui @@ -22,7 +22,7 @@ 6 - + comment_label @@ -33,7 +33,7 @@ comment_lineedit - + comment_lineedit @@ -48,14 +48,14 @@ Expanding - + 0 20 - + Layout1 @@ -69,7 +69,7 @@ 6 - + window_title_label @@ -80,7 +80,7 @@ window_title_lineedit - + Is Not Important @@ -122,7 +122,7 @@ - + window_title_lineedit @@ -137,14 +137,14 @@ Expanding - + 0 20 - + Layout2 @@ -158,7 +158,7 @@ 6 - + window_class_label @@ -169,7 +169,7 @@ window_class_lineedit - + Is Not Important @@ -211,7 +211,7 @@ - + window_class_lineedit @@ -226,14 +226,14 @@ Expanding - + 0 20 - + Layout3 @@ -247,7 +247,7 @@ 6 - + window_role_label @@ -258,7 +258,7 @@ window_role_lineedit - + Is Not Important @@ -300,7 +300,7 @@ - + window_role_lineedit @@ -315,14 +315,14 @@ Expanding - + 0 20 - + Layout6 @@ -346,14 +346,14 @@ Expanding - + 20 0 - + autodetect_button @@ -371,7 +371,7 @@ Expanding - + 20 0 @@ -390,14 +390,14 @@ Expanding - + 0 20 - + window_types_groupbox @@ -414,7 +414,7 @@ 6 - + type_normal_checkbox @@ -422,7 +422,7 @@ Normal - + type_dialog_checkbox @@ -430,7 +430,7 @@ Dialog - + type_desktop_checkbox @@ -438,7 +438,7 @@ Desktop - + type_dock_checkbox -- cgit v1.2.1