diff options
Diffstat (limited to 'khotkeys')
99 files changed, 782 insertions, 379 deletions
diff --git a/khotkeys/README b/khotkeys/README index 933ebc210..78d9d1014 100644 --- a/khotkeys/README +++ b/khotkeys/README @@ -97,7 +97,7 @@ a .desktop file from the TDE Menu to execute (e.g. 'System/konsole.desktop') - DCOP call tab settings - enter the application, object, DCOP method and arguments (e.g. 'kdesktop', 'KBackgroundIface', - 'setWallpaper(QString,int)' and '"/some/pic.jpg" 1') + 'setWallpaper(TQString,int)' and '"/some/pic.jpg" 1') - Keyboard input tab settings - enter the keyboard input you want to be simulated ( no, sorry, the 'Edit' button doesn't really work yet ). The "keypresses" are separated by a colon ( ':' ) and are written diff --git a/khotkeys/app/app.h b/khotkeys/app/app.h index e23edfcb1..e0b3566ab 100644 --- a/khotkeys/app/app.h +++ b/khotkeys/app/app.h @@ -21,7 +21,7 @@ class Action_data_group; class KHotKeysApp : public KUniqueApplication { - Q_OBJECT + TQ_OBJECT K_DCOP k_dcop: ASYNC reread_configuration(); diff --git a/khotkeys/app/kded.h b/khotkeys/app/kded.h index c0a1526ee..b2740a3a1 100644 --- a/khotkeys/app/kded.h +++ b/khotkeys/app/kded.h @@ -22,7 +22,7 @@ class Action_data_group; class KHotKeysModule : public KDEDModule { - Q_OBJECT + TQ_OBJECT K_DCOP k_dcop: ASYNC reread_configuration(); diff --git a/khotkeys/arts/soundrecorder_arts.cpp b/khotkeys/arts/soundrecorder_arts.cpp index 0fdc48ab9..22732fa97 100644 --- a/khotkeys/arts/soundrecorder_arts.cpp +++ b/khotkeys/arts/soundrecorder_arts.cpp @@ -61,7 +61,7 @@ SoundRecorderArts::SoundRecorderArts(TQObject *parent, const char *name) ( void ) check; m_recStream->usePolling( false ); - connect( m_recStream, TQT_SIGNAL(data (TQByteArray &)), this, TQT_SLOT(slotDataReceived(TQByteArray& ))); + connect( m_recStream, TQ_SIGNAL(data (TQByteArray &)), this, TQ_SLOT(slotDataReceived(TQByteArray& ))); } SoundRecorderArts::~SoundRecorderArts() @@ -80,7 +80,7 @@ void SoundRecorderArts::start() void SoundRecorderArts::stop() { m_recStream->stop(); - TQTimer::singleShot(400,this,TQT_SLOT(slotEmitSignal())); + TQTimer::singleShot(400,this,TQ_SLOT(slotEmitSignal())); } void SoundRecorderArts::abort() diff --git a/khotkeys/arts/soundrecorder_arts.h b/khotkeys/arts/soundrecorder_arts.h index 72e901832..7e279f9ee 100644 --- a/khotkeys/arts/soundrecorder_arts.h +++ b/khotkeys/arts/soundrecorder_arts.h @@ -38,7 +38,7 @@ namespace KHotKeys */ class SoundRecorderArts : public SoundRecorder { -Q_OBJECT +TQ_OBJECT public: SoundRecorderArts(TQObject *parent = 0, const char *name = 0); virtual ~SoundRecorderArts(); diff --git a/khotkeys/kcontrol/CMakeLists.txt b/khotkeys/kcontrol/CMakeLists.txt index 5028763ce..902c5a0e6 100644 --- a/khotkeys/kcontrol/CMakeLists.txt +++ b/khotkeys/kcontrol/CMakeLists.txt @@ -37,7 +37,7 @@ tde_create_translated_desktop( khotkeys.desktop ) tde_add_kpart( kcm_khotkeys AUTOMOC SOURCES menuedit.cpp window_trigger_widget.cpp tab_widget.cpp main_buttons_widget.cpp - actions_listview_widget.cpp menuentry_widget.cpp general_tab.cpp + actions_listview_widget.cpp menuentry_widget.cpp general_tab.cpp waiting_widget.cpp action_group_tab.cpp kcmkhotkeys.cpp command_url_widget.cpp windowdef_list_widget.cpp windowdef_simple_widget.cpp triggers_tab.cpp dcop_widget.cpp info_tab.cpp action_list_widget.cpp keyboard_input_widget.cpp condition_list_widget.cpp diff --git a/khotkeys/kcontrol/Makefile.am b/khotkeys/kcontrol/Makefile.am index 7eb3f2f6d..03a728ae3 100644 --- a/khotkeys/kcontrol/Makefile.am +++ b/khotkeys/kcontrol/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kcm_khotkeys.la kcm_khotkeys_init.la kcm_khotkeys_la_SOURCES = \ menuedit.cpp window_trigger_widget.cpp tab_widget.cpp main_buttons_widget.cpp \ - actions_listview_widget.cpp menuentry_widget.cpp general_tab.cpp \ + actions_listview_widget.cpp menuentry_widget.cpp general_tab.cpp waiting_widget.cpp \ action_group_tab.cpp kcmkhotkeys.cpp command_url_widget.cpp windowdef_list_widget.cpp \ windowdef_simple_widget.cpp triggers_tab.cpp dcop_widget.cpp info_tab.cpp \ action_list_widget.cpp keyboard_input_widget.cpp condition_list_widget.cpp \ diff --git a/khotkeys/kcontrol/action_group_tab.cpp b/khotkeys/kcontrol/action_group_tab.cpp index 1bdeffd75..8ba35f323 100644 --- a/khotkeys/kcontrol/action_group_tab.cpp +++ b/khotkeys/kcontrol/action_group_tab.cpp @@ -36,18 +36,18 @@ Action_group_tab::Action_group_tab( TQWidget* parent_P , const char* name_P ) { clear_data(); // KHotKeys::Module::changed() - connect( action_name_lineedit, TQT_SIGNAL( textChanged( const TQString& )), - module, TQT_SLOT( changed())); - connect( disable_checkbox, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( comment_multilineedit, TQT_SIGNAL( textChanged()), - module, TQT_SLOT( changed())); + connect( action_name_lineedit, TQ_SIGNAL( textChanged( const TQString& )), + module, TQ_SLOT( changed())); + connect( disable_checkbox, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( comment_multilineedit, TQ_SIGNAL( textChanged()), + module, TQ_SLOT( changed())); } void Action_group_tab::clear_data() { - disconnect( action_name_lineedit, TQT_SIGNAL( textChanged( const TQString& )), this, - TQT_SLOT( action_group_name_changed( const TQString& ))); + disconnect( action_name_lineedit, TQ_SIGNAL( textChanged( const TQString& )), this, + TQ_SLOT( action_group_name_changed( const TQString& ))); action_name_lineedit->clear(); action_name_lineedit->setReadOnly( false ); disable_checkbox->setChecked( false ); @@ -71,8 +71,8 @@ void Action_group_tab::set_data( const Action_data_group* data_P ) else disable_checkbox->setText( i18n( "&Disable" )); comment_multilineedit->setText( data_P->comment()); - connect( action_name_lineedit, TQT_SIGNAL( textChanged( const TQString& )), this, - TQT_SLOT( action_group_name_changed( const TQString& ))); + connect( action_name_lineedit, TQ_SIGNAL( textChanged( const TQString& )), this, + TQ_SLOT( action_group_name_changed( const TQString& ))); system_group = data_P->system_group(); } diff --git a/khotkeys/kcontrol/action_group_tab.h b/khotkeys/kcontrol/action_group_tab.h index 970f16379..5b1435346 100644 --- a/khotkeys/kcontrol/action_group_tab.h +++ b/khotkeys/kcontrol/action_group_tab.h @@ -23,7 +23,7 @@ class Windowdef_list; class Action_group_tab : public Action_group_tab_ui { - Q_OBJECT + TQ_OBJECT public: Action_group_tab( TQWidget* parent_P = NULL, const char* name_P = NULL ); void set_data( const Action_data_group* data_P ); diff --git a/khotkeys/kcontrol/action_list_widget.cpp b/khotkeys/kcontrol/action_list_widget.cpp index ffa71bce0..2f87132d8 100644 --- a/khotkeys/kcontrol/action_list_widget.cpp +++ b/khotkeys/kcontrol/action_list_widget.cpp @@ -32,6 +32,7 @@ #include "dcop_widget.h" #include "keyboard_input_widget.h" #include "activate_window_widget.h" +#include "waiting_widget.h" #include "kcmkhotkeys.h" namespace KHotKeys @@ -48,7 +49,8 @@ Action_list_widget::Action_list_widget( TQWidget* parent_P, const char* name_P ) popup->insertItem( i18n( "DCOP Call..." ), TYPE_DCOP_ACTION ); popup->insertItem( i18n( "Keyboard Input..." ), TYPE_KEYBOARD_INPUT_ACTION ); popup->insertItem( i18n( "Activate Window..." ), TYPE_ACTIVATE_WINDOW_ACTION ); - connect( popup, TQT_SIGNAL( activated( int )), TQT_SLOT( new_selected( int ))); + popup->insertItem( i18n( "Waiting..." ), TYPE_WAITING_ACTION ); + connect( popup, TQ_SIGNAL( activated( int )), TQ_SLOT( new_selected( int ))); new_button->setPopup( popup ); actions_listview->header()->hide(); actions_listview->addColumn( "" ); @@ -58,20 +60,17 @@ Action_list_widget::Action_list_widget( TQWidget* parent_P, const char* name_P ) modify_button->setEnabled( false ); delete_button->setEnabled( false ); clear_data(); - connect( actions_listview, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( modify_pressed() ) ); + connect( actions_listview, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( modify_pressed() ) ); // KHotKeys::Module::changed() - connect( new_button, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( copy_button, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( modify_button, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( delete_button, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( comment_lineedit, TQT_SIGNAL( textChanged( const TQString& )), - module, TQT_SLOT( changed())); + connect(new_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed())); + connect(copy_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed())); + connect(modify_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed())); + connect(delete_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed())); + connect(move_up_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed())); + connect(move_down_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed())); + connect(comment_lineedit, TQ_SIGNAL(textChanged(const TQString&)), module, TQ_SLOT(changed())); } Action_list_widget::~Action_list_widget() @@ -132,6 +131,9 @@ void Action_list_widget::new_selected( int type_P ) case TYPE_ACTIVATE_WINDOW_ACTION: // Activate_window_action_dialog dlg = new Activate_window_action_dialog( NULL ); break; + case TYPE_WAITING_ACTION: // Waiting_action_dialog + dlg = new Waiting_action_dialog( NULL ); + break; default: assert( false ); } @@ -189,6 +191,42 @@ void Action_list_widget::modify_pressed() edit_listview_item( selected_item ); } +void Action_list_widget::move_up_pressed() + { + if ( !selected_item ) + { + return; + } + + Action_list_item *prevItem = nullptr; + TQListViewItem *currItem = actions_listview->firstChild(); + while (currItem != selected_item) + { + prevItem = static_cast< Action_list_item* >(currItem); + currItem = currItem->nextSibling(); + } + if (prevItem) + { + prevItem->moveItem(selected_item); + current_changed(selected_item); + } + } + +void Action_list_widget::move_down_pressed() + { + if ( !selected_item ) + { + return; + } + + Action_list_item *nextItem = static_cast< Action_list_item* >(selected_item->nextSibling()); + if (nextItem) + { + selected_item->moveItem(nextItem); + current_changed(selected_item); + } + } + void Action_list_widget::current_changed( TQListViewItem* item_P ) { // if( item_P == selected_item ) @@ -198,6 +236,8 @@ void Action_list_widget::current_changed( TQListViewItem* item_P ) copy_button->setEnabled( item_P != NULL ); modify_button->setEnabled( item_P != NULL ); delete_button->setEnabled( item_P != NULL ); + move_up_button->setEnabled(selected_item != actions_listview->firstChild()); + move_down_button->setEnabled(selected_item != actions_listview->lastChild()); } Action_list_item* Action_list_widget::create_listview_item( Action* action_P, @@ -236,6 +276,8 @@ void Action_list_widget::edit_listview_item( Action_list_item* item_P ) else if( Activate_window_action* action = dynamic_cast< Activate_window_action* >( item_P->action())) dlg = new Activate_window_action_dialog( action ); + else if( Waiting_action* action = dynamic_cast< Waiting_action* >( item_P->action())) + dlg = new Waiting_action_dialog( action ); else // CHECKME TODO pridat dalsi assert( false ); Action* new_action = dlg->edit_action(); @@ -370,6 +412,28 @@ void Activate_window_action_dialog::accept() action = new Activate_window_action( NULL, widget->get_data()); // CHECKME NULL ? } +// Waiting_action_dialog + +Waiting_action_dialog::Waiting_action_dialog( Waiting_action* action_P ) + : KDialogBase( NULL, NULL, true, "", Ok | Cancel ), action( NULL ) + { + widget = new Waiting_widget( this ); + widget->set_data( action_P ); + setMainWidget( widget ); + } + +Action* Waiting_action_dialog::edit_action() + { + exec(); + return action; + } + +void Waiting_action_dialog::accept() + { + KDialogBase::accept(); + action = widget->get_data( NULL ); + } + } // namespace KHotKeys #include "action_list_widget.moc" diff --git a/khotkeys/kcontrol/action_list_widget.h b/khotkeys/kcontrol/action_list_widget.h index c2f32477e..eb3ca7995 100644 --- a/khotkeys/kcontrol/action_list_widget.h +++ b/khotkeys/kcontrol/action_list_widget.h @@ -1,11 +1,11 @@ /**************************************************************************** KHotKeys - + Copyright (C) 1999-2001 Lubos Lunak <l.lunak@kde.org> Distributed under the terms of the GNU General Public License version 2. - + ****************************************************************************/ #ifndef _ACTION_LIST_WIDGET_H_ @@ -28,13 +28,14 @@ class Command_url_widget; class Menuentry_widget; class Dcop_widget; class Keyboard_input_widget; +class Waiting_widget; class Action_list_item; class Action_list_widget : public Action_list_widget_ui { - Q_OBJECT + TQ_OBJECT public: Action_list_widget( TQWidget* parent_P = NULL, const char* name_P = NULL ); virtual ~Action_list_widget(); @@ -47,12 +48,14 @@ class Action_list_widget TQListViewItem* parent2_P, TQListViewItem* after_P, bool copy_P ); void edit_listview_item( Action_list_item* item_P ); enum type_t { TYPE_COMMAND_URL_ACTION, TYPE_MENUENTRY_ACTION, TYPE_DCOP_ACTION, - TYPE_KEYBOARD_INPUT_ACTION, TYPE_ACTIVATE_WINDOW_ACTION }; + TYPE_KEYBOARD_INPUT_ACTION, TYPE_ACTIVATE_WINDOW_ACTION, TYPE_WAITING_ACTION }; protected slots: void new_selected( int type_P ); virtual void copy_pressed(); virtual void delete_pressed(); virtual void modify_pressed(); + virtual void move_up_pressed(); + virtual void move_down_pressed(); virtual void current_changed( TQListViewItem* item_P ); protected: Action_list_item* selected_item; @@ -75,18 +78,18 @@ class Action_list_item protected: Action* _action; // owns it }; - + class Action_dialog { public: virtual Action* edit_action() = 0; virtual ~Action_dialog(); }; - + class Command_url_action_dialog : public KDialogBase, public Action_dialog { - Q_OBJECT + TQ_OBJECT public: Command_url_action_dialog( Command_url_action* action_P ); virtual Action* edit_action(); @@ -95,11 +98,11 @@ class Command_url_action_dialog Command_url_widget* widget; Command_url_action* action; }; - + class Menuentry_action_dialog : public KDialogBase, public Action_dialog { - Q_OBJECT + TQ_OBJECT public: Menuentry_action_dialog( Menuentry_action* action_P ); virtual Action* edit_action(); @@ -108,11 +111,11 @@ class Menuentry_action_dialog Menuentry_widget* widget; Menuentry_action* action; }; - + class Dcop_action_dialog : public KDialogBase, public Action_dialog { - Q_OBJECT + TQ_OBJECT public: Dcop_action_dialog( Dcop_action* action_P ); virtual Action* edit_action(); @@ -121,11 +124,11 @@ class Dcop_action_dialog Dcop_widget* widget; Dcop_action* action; }; - + class Keyboard_input_action_dialog : public KDialogBase, public Action_dialog { - Q_OBJECT + TQ_OBJECT public: Keyboard_input_action_dialog( Keyboard_input_action* action_P ); virtual Action* edit_action(); @@ -134,11 +137,11 @@ class Keyboard_input_action_dialog Keyboard_input_widget* widget; Keyboard_input_action* action; }; - + class Activate_window_action_dialog : public KDialogBase, public Action_dialog { - Q_OBJECT + TQ_OBJECT public: Activate_window_action_dialog( Activate_window_action* action_P ); virtual Action* edit_action(); @@ -147,7 +150,20 @@ class Activate_window_action_dialog Activate_window_widget* widget; Activate_window_action* action; }; - + +class Waiting_action_dialog + : public KDialogBase, public Action_dialog + { + TQ_OBJECT + public: + Waiting_action_dialog( Waiting_action* action_P ); + virtual Action* edit_action(); + protected: + virtual void accept(); + Waiting_widget* widget; + Waiting_action* action; + }; + //*************************************************************************** // Inline //*************************************************************************** @@ -159,7 +175,7 @@ Action_list_item::Action_list_item( TQListView* parent_P, Action* action_P ) : TQListViewItem( parent_P ), _action( action_P ) { } - + inline Action_list_item::Action_list_item( TQListViewItem* parent_P, Action* action_P ) : TQListViewItem( parent_P ), _action( action_P ) @@ -185,7 +201,7 @@ Action* Action_list_item::action() const { return _action; } - + inline void Action_list_item::set_action( Action* action_P ) { diff --git a/khotkeys/kcontrol/actions_listview_widget.cpp b/khotkeys/kcontrol/actions_listview_widget.cpp index e528005ed..9fe4716c2 100644 --- a/khotkeys/kcontrol/actions_listview_widget.cpp +++ b/khotkeys/kcontrol/actions_listview_widget.cpp @@ -1,11 +1,11 @@ /**************************************************************************** KHotKeys - + Copyright (C) 1999-2001 Lubos Lunak <l.lunak@kde.org> Distributed under the terms of the GNU General Public License version 2. - + ****************************************************************************/ #define _ACTIONS_LISTVIEW_WIDGET_CPP_ @@ -39,10 +39,10 @@ Actions_listview_widget::Actions_listview_widget( TQWidget* parent_P, const char actions_listview->header()->hide(); actions_listview->addColumn( "" ); actions_listview->setRootIsDecorated( true ); // CHECKME - connect( actions_listview, TQT_SIGNAL( current_changed( TQListViewItem* )), - TQT_SLOT( current_changed( TQListViewItem* ))); - connect( actions_listview, TQT_SIGNAL( moved( TQListViewItem*, TQListViewItem*, TQListViewItem* )), - TQT_SLOT( item_moved( TQListViewItem*, TQListViewItem*, TQListViewItem* ))); + connect( actions_listview, TQ_SIGNAL( current_changed( TQListViewItem* )), + TQ_SLOT( current_changed( TQListViewItem* ))); + connect( actions_listview, TQ_SIGNAL( moved( TQListViewItem*, TQListViewItem*, TQListViewItem* )), + TQ_SLOT( item_moved( TQListViewItem*, TQListViewItem*, TQListViewItem* ))); // KHotKeys::Module::changed() } @@ -138,7 +138,7 @@ void Actions_listview_widget::build_up() { build_up_recursively( module->actions_root(), NULL ); } - + void Actions_listview_widget::build_up_recursively( Action_data_group* parent_P, Action_listview_item* item_parent_P ) { @@ -147,13 +147,13 @@ void Actions_listview_widget::build_up_recursively( Action_data_group* parent_P, it; ++it ) { - prev = create_item( item_parent_P, prev, ( *it )); + prev = create_item( item_parent_P, prev, ( *it )); Action_data_group* grp = dynamic_cast< Action_data_group* >( *it ); if( grp != NULL ) build_up_recursively( grp, prev ); } } - + Action_listview_item* Actions_listview_widget::create_item( TQListViewItem* parent_P, TQListViewItem* after_P, Action_data_base* data_P ) { diff --git a/khotkeys/kcontrol/actions_listview_widget.h b/khotkeys/kcontrol/actions_listview_widget.h index 0f3a632f4..cfad501f5 100644 --- a/khotkeys/kcontrol/actions_listview_widget.h +++ b/khotkeys/kcontrol/actions_listview_widget.h @@ -1,11 +1,11 @@ /**************************************************************************** KHotKeys - + Copyright (C) 1999-2001 Lubos Lunak <l.lunak@kde.org> Distributed under the terms of the GNU General Public License version 2. - + ****************************************************************************/ #ifndef _ACTIONS_LISTVIEW_WIDGET_H_ @@ -27,13 +27,13 @@ class Action_data_base; class Actions_listview_widget : public Actions_listview_widget_ui - { - Q_OBJECT + { + TQ_OBJECT public: Actions_listview_widget( TQWidget* parent_P = NULL, const char* name_P = NULL ); Action_listview_item* current_action() const; void set_current_action( Action_listview_item* item ); - Action_data_base* current_action_data() const; + Action_data_base* current_action_data() const; void set_action_data( Action_data_base* data_P, bool recent_action_P = false ); void action_name_changed( const TQString& name_P ); void clear(); @@ -54,9 +54,9 @@ class Actions_listview_widget }; class Actions_listview - : public KHListView + : public KHListView { - Q_OBJECT + TQ_OBJECT public: Actions_listview( TQWidget* parent_P = NULL, const char* name_P = NULL ); Actions_listview_widget* widget(); @@ -78,7 +78,7 @@ class Action_listview_item Action_data_base* data_P ); protected: Action_data_base* _data; // CHECKME doesn't own !!! - }; + }; //*************************************************************************** // Inline @@ -113,7 +113,7 @@ Actions_listview_widget* Actions_listview::widget() { return _widget; } - + // Action_listview_item inline @@ -139,7 +139,7 @@ Action_data_base* Action_listview_item::data() const { return _data; } - + inline void Action_listview_item::set_data( Action_data_base* data_P ) { diff --git a/khotkeys/kcontrol/command_url_widget.cpp b/khotkeys/kcontrol/command_url_widget.cpp index 133913360..5d06c1a16 100644 --- a/khotkeys/kcontrol/command_url_widget.cpp +++ b/khotkeys/kcontrol/command_url_widget.cpp @@ -37,8 +37,8 @@ Command_url_widget::Command_url_widget( TQWidget* parent_P, const char* name_P ) { clear_data(); // KHotKeys::Module::changed() - connect( command_url_lineedit, TQT_SIGNAL( textChanged( const TQString& )), - module, TQT_SLOT( changed())); + connect( command_url_lineedit, TQ_SIGNAL( textChanged( const TQString& )), + module, TQ_SLOT( changed())); } void Command_url_widget::clear_data() diff --git a/khotkeys/kcontrol/command_url_widget.h b/khotkeys/kcontrol/command_url_widget.h index af9a9dc2a..3465bfa96 100644 --- a/khotkeys/kcontrol/command_url_widget.h +++ b/khotkeys/kcontrol/command_url_widget.h @@ -22,7 +22,7 @@ class Action_data; class Command_url_widget : public Command_url_widget_ui { - Q_OBJECT + TQ_OBJECT public: Command_url_widget( TQWidget* parent_P = NULL, const char* name_P = NULL ); void set_data( const Command_url_action* data_P ); diff --git a/khotkeys/kcontrol/condition_list_widget.cpp b/khotkeys/kcontrol/condition_list_widget.cpp index 864c2d4a5..f0a43cb93 100644 --- a/khotkeys/kcontrol/condition_list_widget.cpp +++ b/khotkeys/kcontrol/condition_list_widget.cpp @@ -49,10 +49,10 @@ Condition_list_widget::Condition_list_widget( TQWidget* parent_P, const char* na popup->insertItem( i18n( "Not_condition", "Not" ), TYPE_NOT ); popup->insertItem( i18n( "And_condition", "And" ), TYPE_AND ); popup->insertItem( i18n( "Or_condition", "Or" ), TYPE_OR ); - connect( conditions_listview, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( modify_pressed() ) ); + connect( conditions_listview, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( modify_pressed() ) ); - connect( popup, TQT_SIGNAL( activated( int )), TQT_SLOT( new_selected( int ))); + connect( popup, TQ_SIGNAL( activated( int )), TQ_SLOT( new_selected( int ))); new_button->setPopup( popup ); conditions_listview->header()->hide(); conditions_listview->addColumn( "" ); @@ -62,18 +62,18 @@ Condition_list_widget::Condition_list_widget( TQWidget* parent_P, const char* na copy_button->setEnabled( false ); modify_button->setEnabled( false ); delete_button->setEnabled( false ); + move_up_button->setEnabled( false ); + move_down_button->setEnabled( false ); clear_data(); // KHotKeys::Module::changed() - connect( new_button, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( copy_button, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( modify_button, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( delete_button, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( comment_lineedit, TQT_SIGNAL( textChanged( const TQString& )), - module, TQT_SLOT( changed())); + connect(new_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed())); + connect(copy_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed())); + connect(modify_button, TQ_SIGNAL(clicked()), module, TQ_SLOT( changed())); + connect(delete_button, TQ_SIGNAL(clicked()), module, TQ_SLOT( changed())); + connect(move_up_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed())); + connect(move_down_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed())); + connect(comment_lineedit, TQ_SIGNAL(textChanged(const TQString&)), + module, TQ_SLOT(changed())); } Condition_list_widget::~Condition_list_widget() @@ -256,6 +256,42 @@ void Condition_list_widget::modify_pressed() edit_listview_item( selected_item ); } +void Condition_list_widget::move_up_pressed() + { + if ( !selected_item ) + { + return; + } + + Condition_list_item *prevItem = nullptr; + TQListViewItem *currItem = conditions_listview->firstChild(); + while (currItem != selected_item) + { + prevItem = static_cast< Condition_list_item* >(currItem); + currItem = currItem->nextSibling(); + } + if (prevItem) + { + prevItem->moveItem(selected_item); + current_changed(selected_item); + } + } + +void Condition_list_widget::move_down_pressed() + { + if ( !selected_item ) + { + return; + } + + Condition_list_item *nextItem = static_cast< Condition_list_item* >(selected_item->nextSibling()); + if (nextItem) + { + selected_item->moveItem(nextItem); + current_changed(selected_item); + } + } + void Condition_list_widget::current_changed( TQListViewItem* item_P ) { // if( item_P == selected_item ) @@ -277,6 +313,8 @@ void Condition_list_widget::current_changed( TQListViewItem* item_P ) } else modify_button->setEnabled( false ); + move_up_button->setEnabled(selected_item != conditions_listview->firstChild()); + move_down_button->setEnabled(selected_item != conditions_listview->lastChild()); } Condition_list_item* Condition_list_widget::create_listview_item( Condition* condition_P, diff --git a/khotkeys/kcontrol/condition_list_widget.h b/khotkeys/kcontrol/condition_list_widget.h index 0c99fd46c..35f401205 100644 --- a/khotkeys/kcontrol/condition_list_widget.h +++ b/khotkeys/kcontrol/condition_list_widget.h @@ -1,11 +1,11 @@ /**************************************************************************** KHotKeys - + Copyright (C) 1999-2001 Lubos Lunak <l.lunak@kde.org> Distributed under the terms of the GNU General Public License version 2. - + ****************************************************************************/ #ifndef _CONDITIONS_LIST_WIDGET_H_ @@ -30,7 +30,7 @@ class Condition_list_item; class Condition_list_widget : public Condition_list_widget_ui { - Q_OBJECT + TQ_OBJECT public: Condition_list_widget( TQWidget* parent_P = NULL, const char* name_P = NULL ); virtual ~Condition_list_widget(); @@ -48,6 +48,8 @@ class Condition_list_widget virtual void copy_pressed(); virtual void delete_pressed(); virtual void modify_pressed(); + virtual void move_up_pressed(); + virtual void move_down_pressed(); virtual void current_changed( TQListViewItem* item_P ); private: void insert_listview_items( const Condition_list_base* parent_P, @@ -74,18 +76,18 @@ class Condition_list_item protected: Condition* _condition; // owns it }; - + class Condition_dialog { public: virtual Condition* edit_condition() = 0; virtual ~Condition_dialog(); }; - + class Active_window_condition_dialog : public KDialogBase, public Condition_dialog { - Q_OBJECT + TQ_OBJECT public: Active_window_condition_dialog( Active_window_condition* condition_P ); virtual Condition* edit_condition(); @@ -94,11 +96,11 @@ class Active_window_condition_dialog Windowdef_list_widget* widget; Active_window_condition* condition; }; - + class Existing_window_condition_dialog : public KDialogBase, public Condition_dialog { - Q_OBJECT + TQ_OBJECT public: Existing_window_condition_dialog( Existing_window_condition* condition_P ); virtual Condition* edit_condition(); @@ -107,7 +109,7 @@ class Existing_window_condition_dialog Windowdef_list_widget* widget; Existing_window_condition* condition; }; - + //*************************************************************************** // Inline @@ -120,7 +122,7 @@ Condition_list_item::Condition_list_item( TQListView* parent_P, Condition* condi : TQListViewItem( parent_P ), _condition( condition_P ) { } - + inline Condition_list_item::Condition_list_item( TQListViewItem* parent_P, Condition* condition_P ) : TQListViewItem( parent_P ), _condition( condition_P ) @@ -146,7 +148,7 @@ Condition* Condition_list_item::condition() const { return _condition; } - + inline void Condition_list_item::set_condition( Condition* condition_P ) { diff --git a/khotkeys/kcontrol/dcop_widget.cpp b/khotkeys/kcontrol/dcop_widget.cpp index bee149860..d986e5a51 100644 --- a/khotkeys/kcontrol/dcop_widget.cpp +++ b/khotkeys/kcontrol/dcop_widget.cpp @@ -36,14 +36,14 @@ Dcop_widget::Dcop_widget( TQWidget* parent_P, const char* name_P ) clear_data(); try_button->setText( i18n( "to try", "&Try" )); // Qt designer can't do this // KHotKeys::Module::changed() - connect( remote_app_lineedit, TQT_SIGNAL( textChanged( const TQString& )), - module, TQT_SLOT( changed())); - connect( remote_object_lineedit, TQT_SIGNAL( textChanged( const TQString& )), - module, TQT_SLOT( changed())); - connect( called_function_lineedit, TQT_SIGNAL( textChanged( const TQString& )), - module, TQT_SLOT( changed())); - connect( arguments_lineedit, TQT_SIGNAL( textChanged( const TQString& )), - module, TQT_SLOT( changed())); + connect( remote_app_lineedit, TQ_SIGNAL( textChanged( const TQString& )), + module, TQ_SLOT( changed())); + connect( remote_object_lineedit, TQ_SIGNAL( textChanged( const TQString& )), + module, TQ_SLOT( changed())); + connect( called_function_lineedit, TQ_SIGNAL( textChanged( const TQString& )), + module, TQ_SLOT( changed())); + connect( arguments_lineedit, TQ_SIGNAL( textChanged( const TQString& )), + module, TQ_SLOT( changed())); } void Dcop_widget::clear_data() diff --git a/khotkeys/kcontrol/dcop_widget.h b/khotkeys/kcontrol/dcop_widget.h index 43523f00d..a7b6f1bca 100644 --- a/khotkeys/kcontrol/dcop_widget.h +++ b/khotkeys/kcontrol/dcop_widget.h @@ -22,7 +22,7 @@ class Action_data; class Dcop_widget : public Dcop_widget_ui { - Q_OBJECT + TQ_OBJECT public: Dcop_widget( TQWidget* parent_P = NULL, const char* name_P = NULL ); void set_data( const Dcop_action* data_P ); diff --git a/khotkeys/kcontrol/general_settings_tab.cpp b/khotkeys/kcontrol/general_settings_tab.cpp index cf2337446..a0e1e84c7 100644 --- a/khotkeys/kcontrol/general_settings_tab.cpp +++ b/khotkeys/kcontrol/general_settings_tab.cpp @@ -27,8 +27,8 @@ General_settings_tab::General_settings_tab( TQWidget* parent_P, const char* name : General_settings_tab_ui( parent_P, name_P ) { // KHotKeys::Module::changed() - connect( disable_daemon_checkbox, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); + connect( disable_daemon_checkbox, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); } void General_settings_tab::import_clicked() diff --git a/khotkeys/kcontrol/general_settings_tab.h b/khotkeys/kcontrol/general_settings_tab.h index 8bcd5cd21..ba76bf68e 100644 --- a/khotkeys/kcontrol/general_settings_tab.h +++ b/khotkeys/kcontrol/general_settings_tab.h @@ -19,7 +19,7 @@ namespace KHotKeys class General_settings_tab : public General_settings_tab_ui { - Q_OBJECT + TQ_OBJECT public: General_settings_tab( TQWidget* parent = NULL, const char* name = NULL ); void read_data(); diff --git a/khotkeys/kcontrol/general_tab.cpp b/khotkeys/kcontrol/general_tab.cpp index 1cd98d461..21ca6f952 100644 --- a/khotkeys/kcontrol/general_tab.cpp +++ b/khotkeys/kcontrol/general_tab.cpp @@ -73,22 +73,22 @@ General_tab::General_tab( TQWidget* parent_P, const char* name_P ) } clear_data(); // KHotKeys::Module::changed() - connect( action_name_lineedit, TQT_SIGNAL( textChanged( const TQString& )), - module, TQT_SLOT( changed())); - connect( disable_checkbox, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( comment_multilineedit, TQT_SIGNAL( textChanged()), - module, TQT_SLOT( changed())); - connect( action_type_combo, TQT_SIGNAL( activated( int )), - module, TQT_SLOT( changed())); + connect( action_name_lineedit, TQ_SIGNAL( textChanged( const TQString& )), + module, TQ_SLOT( changed())); + connect( disable_checkbox, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( comment_multilineedit, TQ_SIGNAL( textChanged()), + module, TQ_SLOT( changed())); + connect( action_type_combo, TQ_SIGNAL( activated( int )), + module, TQ_SLOT( changed())); } void General_tab::clear_data() { - disconnect( action_name_lineedit, TQT_SIGNAL( textChanged( const TQString& )), - this, TQT_SLOT( action_name_changed( const TQString& ))); - disconnect( action_type_combo, TQT_SIGNAL( activated( int )), - this, TQT_SIGNAL( action_type_changed( int ))); // CHECKME neodpoji to sloty od nej ? + disconnect( action_name_lineedit, TQ_SIGNAL( textChanged( const TQString& )), + this, TQ_SLOT( action_name_changed( const TQString& ))); + disconnect( action_type_combo, TQ_SIGNAL( activated( int )), + this, TQ_SIGNAL( action_type_changed( int ))); // CHECKME neodpoji to sloty od nej ? action_name_lineedit->clear(); disable_checkbox->setChecked( false ); disable_checkbox->setText( i18n( "&Disable" )); @@ -113,10 +113,10 @@ void General_tab::set_data( const Action_data* data_P ) comment_multilineedit->setText( data_P->comment()); action_type_combo->setCurrentItem( Tab_widget::type( data_P )); // module->set_action_type( data_P->type()); - connect( action_name_lineedit, TQT_SIGNAL( textChanged( const TQString& )), - TQT_SLOT( action_name_changed( const TQString& ))); - connect( action_type_combo, TQT_SIGNAL( activated( int )), - TQT_SIGNAL( action_type_changed( int ))); + connect( action_name_lineedit, TQ_SIGNAL( textChanged( const TQString& )), + TQ_SLOT( action_name_changed( const TQString& ))); + connect( action_type_combo, TQ_SIGNAL( activated( int )), + TQ_SIGNAL( action_type_changed( int ))); } void General_tab::get_data( TQString& name_O, TQString& comment_O, bool& enabled_O ) diff --git a/khotkeys/kcontrol/general_tab.h b/khotkeys/kcontrol/general_tab.h index 58f670a68..bd738f6a1 100644 --- a/khotkeys/kcontrol/general_tab.h +++ b/khotkeys/kcontrol/general_tab.h @@ -25,7 +25,7 @@ class Action_list; class General_tab : public General_tab_ui { - Q_OBJECT + TQ_OBJECT public: General_tab( TQWidget* parent_P = NULL, const char* name_P = NULL ); void set_data( const Action_data* data_P ); diff --git a/khotkeys/kcontrol/gesture_triggers_tab.cpp b/khotkeys/kcontrol/gesture_triggers_tab.cpp index b00f60963..52c41cd9e 100644 --- a/khotkeys/kcontrol/gesture_triggers_tab.cpp +++ b/khotkeys/kcontrol/gesture_triggers_tab.cpp @@ -35,12 +35,12 @@ Gesture_triggers_tab::Gesture_triggers_tab( TQWidget* parent_P, const char* name { clear_data(); // KHotKeys::Module::changed() - connect( gesture_edit_button1, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( gesture_edit_button2, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( gesture_edit_button3, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); + connect( gesture_edit_button1, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( gesture_edit_button2, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( gesture_edit_button3, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); } void Gesture_triggers_tab::clear_data() @@ -142,8 +142,8 @@ Gesture_edit_dialog::Gesture_edit_dialog( const TQString& gesture_P ) _page = new GestureRecordPage( _gesture, this, "GestureRecordPage"); -// connect(_page, TQT_SIGNAL(gestureRecorded(bool)), // allow clearing the gesture -// this, TQT_SLOT(enableButtonOK(bool))); +// connect(_page, TQ_SIGNAL(gestureRecorded(bool)), // allow clearing the gesture +// this, TQ_SLOT(enableButtonOK(bool))); setMainWidget( _page ); } diff --git a/khotkeys/kcontrol/gesture_triggers_tab.h b/khotkeys/kcontrol/gesture_triggers_tab.h index c11787d03..95bdebe94 100644 --- a/khotkeys/kcontrol/gesture_triggers_tab.h +++ b/khotkeys/kcontrol/gesture_triggers_tab.h @@ -26,7 +26,7 @@ class Action_data; class Gesture_triggers_tab : public Gesture_triggers_tab_ui { - Q_OBJECT + TQ_OBJECT public: Gesture_triggers_tab( TQWidget* parent_P = NULL, const char* name_P = NULL ); void set_data( const Trigger_list* triggers_P ); @@ -46,7 +46,7 @@ class GestureRecordPage; class Gesture_edit_dialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: Gesture_edit_dialog( const TQString& gesture_P ); TQString edit_gesture(); diff --git a/khotkeys/kcontrol/gesturedrawer.h b/khotkeys/kcontrol/gesturedrawer.h index ee3af6809..c3476348e 100644 --- a/khotkeys/kcontrol/gesturedrawer.h +++ b/khotkeys/kcontrol/gesturedrawer.h @@ -24,7 +24,7 @@ namespace KHotKeys class GestureDrawer : public TQFrame { - Q_OBJECT + TQ_OBJECT public: GestureDrawer(TQWidget *parent, const char *name); ~GestureDrawer(); diff --git a/khotkeys/kcontrol/gesturerecorder.cpp b/khotkeys/kcontrol/gesturerecorder.cpp index 6e4395a5b..db946cf06 100644 --- a/khotkeys/kcontrol/gesturerecorder.cpp +++ b/khotkeys/kcontrol/gesturerecorder.cpp @@ -32,7 +32,7 @@ GestureRecorder::~GestureRecorder() void GestureRecorder::mousePressEvent(TQMouseEvent *ev) { - if (ev->button() == Qt::LeftButton) + if (ev->button() == TQt::LeftButton) { _mouseButtonDown = true; stroke.reset(); @@ -43,7 +43,7 @@ void GestureRecorder::mousePressEvent(TQMouseEvent *ev) void GestureRecorder::mouseReleaseEvent(TQMouseEvent *ev) { - if ((ev->button() == Qt::LeftButton) && (_mouseButtonDown)) + if ((ev->button() == TQt::LeftButton) && (_mouseButtonDown)) { TQPoint pos = ev->pos(); stroke.record(pos.x(), pos.y()); diff --git a/khotkeys/kcontrol/gesturerecorder.h b/khotkeys/kcontrol/gesturerecorder.h index e42de2c0e..07e5f88a4 100644 --- a/khotkeys/kcontrol/gesturerecorder.h +++ b/khotkeys/kcontrol/gesturerecorder.h @@ -24,7 +24,7 @@ namespace KHotKeys class GestureRecorder : public TQFrame { - Q_OBJECT + TQ_OBJECT public: GestureRecorder(TQWidget *parent, const char *name); diff --git a/khotkeys/kcontrol/gesturerecordpage.cpp b/khotkeys/kcontrol/gesturerecordpage.cpp index e9e768bb0..bc254a878 100644 --- a/khotkeys/kcontrol/gesturerecordpage.cpp +++ b/khotkeys/kcontrol/gesturerecordpage.cpp @@ -49,8 +49,8 @@ GestureRecordPage::GestureRecordPage(const TQString &gesture, _recorder = new GestureRecorder(this, "recorder"); _recorder->setMinimumHeight(150); setStretchFactor(_recorder, 1); - connect(_recorder, TQT_SIGNAL(recorded(const TQString &)), - this, TQT_SLOT(slotRecorded(const TQString &))); + connect(_recorder, TQ_SIGNAL(recorded(const TQString &)), + this, TQ_SLOT(slotRecorded(const TQString &))); TQHBox *hBox = new TQHBox(this, "hbox"); @@ -62,8 +62,8 @@ GestureRecordPage::GestureRecordPage(const TQString &gesture, hBox->setStretchFactor(spacer, 1); _resetButton = new TQPushButton(i18n("&Reset"), hBox, "resetButton"); - connect(_resetButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotResetClicked())); + connect(_resetButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotResetClicked())); diff --git a/khotkeys/kcontrol/gesturerecordpage.h b/khotkeys/kcontrol/gesturerecordpage.h index 306710c0e..5b498577c 100644 --- a/khotkeys/kcontrol/gesturerecordpage.h +++ b/khotkeys/kcontrol/gesturerecordpage.h @@ -28,7 +28,7 @@ class GestureRecorder; class GestureRecordPage : public TQVBox { - Q_OBJECT + TQ_OBJECT public: GestureRecordPage(const TQString &gesture, diff --git a/khotkeys/kcontrol/gestures_settings_tab.cpp b/khotkeys/kcontrol/gestures_settings_tab.cpp index 8585fedbc..200fa6b97 100644 --- a/khotkeys/kcontrol/gestures_settings_tab.cpp +++ b/khotkeys/kcontrol/gestures_settings_tab.cpp @@ -39,12 +39,12 @@ Gestures_settings_tab::Gestures_settings_tab( TQWidget* parent_P, const char* na mouse_button_combo->insertItem( i18n( "Button 8 (if available)" ), 6 ); mouse_button_combo->insertItem( i18n( "Button 9 (if available)" ), 7 ); // KHotKeys::Module::changed() - connect( mouse_gestures_globally, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( mouse_button_combo, TQT_SIGNAL( activated( int )), - module, TQT_SLOT( changed())); - connect( timeout_input, TQT_SIGNAL( valueChanged( int )), - module, TQT_SLOT( changed())); + connect( mouse_gestures_globally, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( mouse_button_combo, TQ_SIGNAL( activated( int )), + module, TQ_SLOT( changed())); + connect( timeout_input, TQ_SIGNAL( valueChanged( int )), + module, TQ_SLOT( changed())); } void Gestures_settings_tab::read_data() diff --git a/khotkeys/kcontrol/gestures_settings_tab.h b/khotkeys/kcontrol/gestures_settings_tab.h index 813209439..bf4b2611b 100644 --- a/khotkeys/kcontrol/gestures_settings_tab.h +++ b/khotkeys/kcontrol/gestures_settings_tab.h @@ -19,7 +19,7 @@ namespace KHotKeys class Gestures_settings_tab : public Gestures_settings_tab_ui { - Q_OBJECT + TQ_OBJECT public: Gestures_settings_tab( TQWidget* parent = NULL, const char* name = NULL ); void read_data(); diff --git a/khotkeys/kcontrol/info_tab.h b/khotkeys/kcontrol/info_tab.h index 32212ae98..451f58514 100644 --- a/khotkeys/kcontrol/info_tab.h +++ b/khotkeys/kcontrol/info_tab.h @@ -19,7 +19,7 @@ namespace KHotKeys class Info_tab : public Info_tab_ui { - Q_OBJECT + TQ_OBJECT public: Info_tab( TQWidget* parent_P = NULL, const char* name_P = NULL ); public slots: diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp index 85dbaaaa8..48349a65c 100644 --- a/khotkeys/kcontrol/kcmkhotkeys.cpp +++ b/khotkeys/kcontrol/kcmkhotkeys.cpp @@ -67,7 +67,7 @@ Module::Module( TQWidget* parent_P, const char* ) { setButtons( Help | Cancel | Apply | Ok ); module = this; - init_global_data( false, TQT_TQOBJECT(this) ); // don't grab keys + init_global_data( false, this ); // don't grab keys init_arts(); TQVBoxLayout* vbox = new TQVBoxLayout( this ); vbox->setSpacing( 6 ); @@ -78,12 +78,12 @@ Module::Module( TQWidget* parent_P, const char* ) vbox->addWidget( splt ); buttons_widget = new Main_buttons_widget( this ); vbox->addWidget( buttons_widget ); - connect( actions_listview_widget, TQT_SIGNAL( current_action_changed()), - TQT_SLOT( listview_current_action_changed())); - connect( buttons_widget, TQT_SIGNAL( new_action_pressed()), TQT_SLOT( new_action())); - connect( buttons_widget, TQT_SIGNAL( new_action_group_pressed()), TQT_SLOT( new_action_group())); - connect( buttons_widget, TQT_SIGNAL( delete_action_pressed()), TQT_SLOT( delete_action())); - connect( buttons_widget, TQT_SIGNAL( global_settings_pressed()), TQT_SLOT( global_settings())); + connect( actions_listview_widget, TQ_SIGNAL( current_action_changed()), + TQ_SLOT( listview_current_action_changed())); + connect( buttons_widget, TQ_SIGNAL( new_action_pressed()), TQ_SLOT( new_action())); + connect( buttons_widget, TQ_SIGNAL( new_action_group_pressed()), TQ_SLOT( new_action_group())); + connect( buttons_widget, TQ_SIGNAL( delete_action_pressed()), TQ_SLOT( delete_action())); + connect( buttons_widget, TQ_SIGNAL( global_settings_pressed()), TQ_SLOT( global_settings())); // listview_current_action_changed(); // init TDEAboutData* about = new TDEAboutData("kcmkhotkeys", I18N_NOOP("KHotKeys"), KHOTKEYS_VERSION, diff --git a/khotkeys/kcontrol/kcmkhotkeys.h b/khotkeys/kcontrol/kcmkhotkeys.h index 2fffc2b16..7d1876d8d 100644 --- a/khotkeys/kcontrol/kcmkhotkeys.h +++ b/khotkeys/kcontrol/kcmkhotkeys.h @@ -30,7 +30,7 @@ class Main_buttons_widget; class Module : public TDECModule { - Q_OBJECT + TQ_OBJECT public: Module( TQWidget *parent_P, const char *name_P ); virtual ~Module(); diff --git a/khotkeys/kcontrol/keyboard_input_widget.cpp b/khotkeys/kcontrol/keyboard_input_widget.cpp index 4d5727482..a518fa02d 100644 --- a/khotkeys/kcontrol/keyboard_input_widget.cpp +++ b/khotkeys/kcontrol/keyboard_input_widget.cpp @@ -36,16 +36,16 @@ Keyboard_input_widget::Keyboard_input_widget( TQWidget* parent_P, const char* na { clear_data(); // KHotKeys::Module::changed() - connect( action_window_radio, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( active_window_radio, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( specific_window_radio, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( keyboard_input_multilineedit, TQT_SIGNAL( textChanged()), - module, TQT_SLOT( changed())); - connect( modify_button, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); + connect( action_window_radio, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( active_window_radio, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( specific_window_radio, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( keyboard_input_multilineedit, TQ_SIGNAL( textChanged()), + module, TQ_SLOT( changed())); + connect( modify_button, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); } void Keyboard_input_widget::clear_data() diff --git a/khotkeys/kcontrol/keyboard_input_widget.h b/khotkeys/kcontrol/keyboard_input_widget.h index 32690f44e..1d1a141bd 100644 --- a/khotkeys/kcontrol/keyboard_input_widget.h +++ b/khotkeys/kcontrol/keyboard_input_widget.h @@ -22,7 +22,7 @@ class Action_data; class Keyboard_input_widget : public Keyboard_input_widget_ui { - Q_OBJECT + TQ_OBJECT public: Keyboard_input_widget( TQWidget* parent_P = NULL, const char* name_P = NULL ); void set_data( const Keyboard_input_action* data_P ); diff --git a/khotkeys/kcontrol/main_buttons_widget.cpp b/khotkeys/kcontrol/main_buttons_widget.cpp index 3532cc13f..4a1e258b5 100644 --- a/khotkeys/kcontrol/main_buttons_widget.cpp +++ b/khotkeys/kcontrol/main_buttons_widget.cpp @@ -26,18 +26,18 @@ namespace KHotKeys Main_buttons_widget::Main_buttons_widget( TQWidget* parent_P, const char* name_P ) : Main_buttons_widget_ui( parent_P, name_P ) { - connect( new_action_button, TQT_SIGNAL( clicked()), TQT_SIGNAL( new_action_pressed())); - connect( new_action_group_button, TQT_SIGNAL( clicked()), TQT_SIGNAL( new_action_group_pressed())); - connect( delete_action_button, TQT_SIGNAL( clicked()), TQT_SIGNAL( delete_action_pressed())); - connect( global_settings_button, TQT_SIGNAL( clicked()), TQT_SIGNAL( global_settings_pressed())); + connect( new_action_button, TQ_SIGNAL( clicked()), TQ_SIGNAL( new_action_pressed())); + connect( new_action_group_button, TQ_SIGNAL( clicked()), TQ_SIGNAL( new_action_group_pressed())); + connect( delete_action_button, TQ_SIGNAL( clicked()), TQ_SIGNAL( delete_action_pressed())); + connect( global_settings_button, TQ_SIGNAL( clicked()), TQ_SIGNAL( global_settings_pressed())); enable_delete( false ); // KHotKeys::Module::changed() - connect( new_action_button, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( new_action_group_button, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( delete_action_button, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); + connect( new_action_button, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( new_action_group_button, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( delete_action_button, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); setMaximumHeight( sizeHint().height()); // it gets too high and I have no idea why } diff --git a/khotkeys/kcontrol/main_buttons_widget.h b/khotkeys/kcontrol/main_buttons_widget.h index e4410d9d0..ce08570bf 100644 --- a/khotkeys/kcontrol/main_buttons_widget.h +++ b/khotkeys/kcontrol/main_buttons_widget.h @@ -19,7 +19,7 @@ namespace KHotKeys class Main_buttons_widget : public Main_buttons_widget_ui { - Q_OBJECT + TQ_OBJECT public: Main_buttons_widget( TQWidget* parent_P = NULL, const char* name_P = NULL ); void enable_delete( bool enable_P ); diff --git a/khotkeys/kcontrol/menuentry_widget.cpp b/khotkeys/kcontrol/menuentry_widget.cpp index 9b313d20d..8fac287b8 100644 --- a/khotkeys/kcontrol/menuentry_widget.cpp +++ b/khotkeys/kcontrol/menuentry_widget.cpp @@ -37,8 +37,8 @@ Menuentry_widget::Menuentry_widget( TQWidget* parent_P, const char* name_P ) { clear_data(); // KHotKeys::Module::changed() - connect( menuentry_lineedit, TQT_SIGNAL( textChanged( const TQString& )), - module, TQT_SLOT( changed())); + connect( menuentry_lineedit, TQ_SIGNAL( textChanged( const TQString& )), + module, TQ_SLOT( changed())); } void Menuentry_widget::clear_data() diff --git a/khotkeys/kcontrol/menuentry_widget.h b/khotkeys/kcontrol/menuentry_widget.h index f4b61677d..c9cc8e36c 100644 --- a/khotkeys/kcontrol/menuentry_widget.h +++ b/khotkeys/kcontrol/menuentry_widget.h @@ -22,7 +22,7 @@ class Action_data; class Menuentry_widget : public Menuentry_widget_ui { - Q_OBJECT + TQ_OBJECT public: Menuentry_widget( TQWidget* parent_P = NULL, const char* name_P = NULL ); void set_data( const Menuentry_action* data_P ); diff --git a/khotkeys/kcontrol/tab_widget.cpp b/khotkeys/kcontrol/tab_widget.cpp index d3ca4afbe..236d755d2 100644 --- a/khotkeys/kcontrol/tab_widget.cpp +++ b/khotkeys/kcontrol/tab_widget.cpp @@ -59,8 +59,8 @@ Tab_widget::Tab_widget( TQWidget* parent_P, const char* name_P ) pages[ TAB_GESTURES_SETTINGS ] = new Gestures_settings_tab; General_tab* general_tab; pages[ TAB_GENERAL ] = general_tab = new General_tab; - connect( general_tab, TQT_SIGNAL( action_type_changed( int )), - TQT_SLOT( set_action_type_slot( int ))); + connect( general_tab, TQ_SIGNAL( action_type_changed( int )), + TQ_SLOT( set_action_type_slot( int ))); pages[ TAB_GROUP_GENERAL ] = new Action_group_tab; pages[ TAB_CONDITIONS ] = new Condition_list_tab; pages[ TAB_ACTIONS ] = new Action_list_tab; @@ -76,7 +76,7 @@ Tab_widget::Tab_widget( TQWidget* parent_P, const char* name_P ) for( tab_pos_t i = TAB_FIRST; i < TAB_END; ++i ) - connect( this, TQT_SIGNAL( clear_pages_signal()), pages[ i ], TQT_SLOT( clear_data())); + connect( this, TQ_SIGNAL( clear_pages_signal()), pages[ i ], TQ_SLOT( clear_data())); #ifdef HAVE_ARTS if( haveArts()) show_pages(( TAB_INFO, TAB_GENERAL_SETTINGS, TAB_GESTURES_SETTINGS, TAB_VOICE_SETTINGS )); @@ -441,18 +441,18 @@ void Tab_widget::show_pages( const Pages_set& pages_P ) { removePage( pages[ i ] ); if( pages_P.is_set( i )) // don't clear page contents if it stays visible - disconnect( this, TQT_SIGNAL( clear_pages_signal()), pages[ i ], TQT_SLOT( clear_data())); + disconnect( this, TQ_SIGNAL( clear_pages_signal()), pages[ i ], TQ_SLOT( clear_data())); } clear_pages(); // reconnect all pages to this signal - disconnect( this, TQT_SIGNAL( clear_pages_signal()), NULL, NULL ); + disconnect( this, TQ_SIGNAL( clear_pages_signal()), NULL, NULL ); for( tab_pos_t i = TAB_FIRST; i < TAB_END; ++i ) { if( pages_P.is_set( i )) addTab( pages[ i ], i18n( tab_labels[ i ] )); - connect( this, TQT_SIGNAL( clear_pages_signal()), pages[ i ], TQT_SLOT( clear_data())); + connect( this, TQ_SIGNAL( clear_pages_signal()), pages[ i ], TQ_SLOT( clear_data())); } show(); } diff --git a/khotkeys/kcontrol/tab_widget.h b/khotkeys/kcontrol/tab_widget.h index 81fb9e4ad..1439864f1 100644 --- a/khotkeys/kcontrol/tab_widget.h +++ b/khotkeys/kcontrol/tab_widget.h @@ -21,7 +21,7 @@ namespace KHotKeys class Tab_widget : public TQTabWidget { - Q_OBJECT + TQ_OBJECT public: enum action_type_t { diff --git a/khotkeys/kcontrol/triggers_tab.cpp b/khotkeys/kcontrol/triggers_tab.cpp index d4f7ff9d3..d3773c3f3 100644 --- a/khotkeys/kcontrol/triggers_tab.cpp +++ b/khotkeys/kcontrol/triggers_tab.cpp @@ -55,9 +55,9 @@ Triggers_tab::Triggers_tab( TQWidget* parent_P, const char* name_P ) if( haveArts()) popup->insertItem( i18n( "Voice Trigger..." ), TYPE_VOICE_TRIGGER ); #endif - connect( popup, TQT_SIGNAL( activated( int )), TQT_SLOT( new_selected( int ))); - connect( triggers_listview, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( modify_pressed() ) ); + connect( popup, TQ_SIGNAL( activated( int )), TQ_SLOT( new_selected( int ))); + connect( triggers_listview, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( modify_pressed() ) ); new_button->setPopup( popup ); copy_button->setEnabled( false ); @@ -69,16 +69,16 @@ Triggers_tab::Triggers_tab( TQWidget* parent_P, const char* name_P ) triggers_listview->setForceSelect( true ); clear_data(); // KHotKeys::Module::changed() - connect( new_button, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( copy_button, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( modify_button, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( delete_button, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( comment_lineedit, TQT_SIGNAL( textChanged( const TQString& )), - module, TQT_SLOT( changed())); + connect( new_button, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( copy_button, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( modify_button, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( delete_button, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( comment_lineedit, TQ_SIGNAL( textChanged( const TQString& )), + module, TQ_SLOT( changed())); } Triggers_tab::~Triggers_tab() @@ -227,11 +227,11 @@ Shortcut_trigger_widget::Shortcut_trigger_widget( TQWidget* parent_P, const char lay->addWidget( lbl ); lay->addSpacing( 10 ); bt = new KKeyButton( this ); - lay->addWidget( bt, 0 , Qt::AlignHCenter ); + lay->addWidget( bt, 0 , TQt::AlignHCenter ); lay->addStretch(); clear_data(); - connect( bt, TQT_SIGNAL( capturedShortcut( const TDEShortcut& )), - this, TQT_SLOT( capturedShortcut( const TDEShortcut& ))); + connect( bt, TQ_SIGNAL( capturedShortcut( const TDEShortcut& )), + this, TQ_SLOT( capturedShortcut( const TDEShortcut& ))); } void Shortcut_trigger_widget::clear_data() @@ -320,8 +320,8 @@ Gesture_trigger_dialog::Gesture_trigger_dialog( Gesture_trigger* trigger_P ) _page = new GestureRecordPage( _trigger->gesturecode(), this, "GestureRecordPage"); - connect(_page, TQT_SIGNAL(gestureRecorded(bool)), - this, TQT_SLOT(enableButtonOK(bool))); + connect(_page, TQ_SIGNAL(gestureRecorded(bool)), + this, TQ_SLOT(enableButtonOK(bool))); setMainWidget( _page ); } @@ -343,7 +343,7 @@ _trigger( trigger_P ), _page( NULL ) { _page = new VoiceRecordPage( _trigger ? _trigger->voicecode() : TQString::null , this, "VoiceRecordPage"); - connect(_page, TQT_SIGNAL(voiceRecorded(bool)), this, TQT_SLOT(enableButtonOK(bool))); + connect(_page, TQ_SIGNAL(voiceRecorded(bool)), this, TQ_SLOT(enableButtonOK(bool))); setMainWidget( _page ); } diff --git a/khotkeys/kcontrol/triggers_tab.h b/khotkeys/kcontrol/triggers_tab.h index c4d6160fe..dc99bda5c 100644 --- a/khotkeys/kcontrol/triggers_tab.h +++ b/khotkeys/kcontrol/triggers_tab.h @@ -35,7 +35,7 @@ class KHotKeysShortcutList; class Triggers_tab : public Triggers_tab_ui { - Q_OBJECT + TQ_OBJECT public: Triggers_tab( TQWidget* parent_P = NULL, const char* name_P = NULL ); virtual ~Triggers_tab(); @@ -82,7 +82,7 @@ class Trigger_dialog class Shortcut_trigger_widget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: Shortcut_trigger_widget( TQWidget* parent_P = NULL, const char* name_P = NULL ); void set_data( const Shortcut_trigger* trigger_P ); @@ -100,7 +100,7 @@ typedef Shortcut_trigger_widget Shortcut_trigger_tab; class Shortcut_trigger_dialog : public KDialogBase, public Trigger_dialog { - Q_OBJECT + TQ_OBJECT public: Shortcut_trigger_dialog( Shortcut_trigger* trigger_P ); virtual Trigger* edit_trigger(); @@ -113,7 +113,7 @@ class Shortcut_trigger_dialog class Window_trigger_dialog : public KDialogBase, public Trigger_dialog { - Q_OBJECT + TQ_OBJECT public: Window_trigger_dialog( Window_trigger* trigger_P ); virtual Trigger* edit_trigger(); @@ -128,7 +128,7 @@ class GestureRecordPage; class Gesture_trigger_dialog : public KDialogBase, public Trigger_dialog { - Q_OBJECT + TQ_OBJECT public: Gesture_trigger_dialog( Gesture_trigger* trigger_P ); virtual Trigger* edit_trigger(); @@ -144,7 +144,7 @@ class VoiceRecordPage; class Voice_trigger_dialog : public KDialogBase, public Trigger_dialog { - Q_OBJECT + TQ_OBJECT public: Voice_trigger_dialog( Voice_trigger* trigger_P ); virtual Trigger* edit_trigger(); diff --git a/khotkeys/kcontrol/ui/CMakeLists.txt b/khotkeys/kcontrol/ui/CMakeLists.txt index 85212affb..ab8db9e78 100644 --- a/khotkeys/kcontrol/ui/CMakeLists.txt +++ b/khotkeys/kcontrol/ui/CMakeLists.txt @@ -28,7 +28,7 @@ link_directories( tde_add_library( ui STATIC_PIC AUTOMOC SOURCES windowdef_simple_widget_ui.ui windowdef_list_widget_ui.ui - command_url_widget_ui.ui menuentry_widget_ui.ui + command_url_widget_ui.ui menuentry_widget_ui.ui waiting_widget_ui.ui triggers_tab_ui.ui general_tab_ui.ui action_group_tab_ui.ui dcop_widget_ui.ui main_buttons_widget_ui.ui voice_settings_tab_ui.ui info_tab_ui.ui window_trigger_widget_ui.ui action_list_widget_ui.ui diff --git a/khotkeys/kcontrol/ui/Makefile.am b/khotkeys/kcontrol/ui/Makefile.am index 14ea5c44d..ee63c6871 100644 --- a/khotkeys/kcontrol/ui/Makefile.am +++ b/khotkeys/kcontrol/ui/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libui.la libui_la_SOURCES = dummy.cpp windowdef_simple_widget_ui.ui windowdef_list_widget_ui.ui \ - command_url_widget_ui.ui menuentry_widget_ui.ui triggers_tab_ui.ui general_tab_ui.ui \ + command_url_widget_ui.ui menuentry_widget_ui.ui triggers_tab_ui.ui general_tab_ui.ui waiting_widget_ui.ui \ action_group_tab_ui.ui dcop_widget_ui.ui main_buttons_widget_ui.ui \ actions_listview_widget_ui.ui info_tab_ui.ui window_trigger_widget_ui.ui \ action_list_widget_ui.ui keyboard_input_widget_ui.ui condition_list_widget_ui.ui \ diff --git a/khotkeys/kcontrol/ui/action_group_tab_ui.ui b/khotkeys/kcontrol/ui/action_group_tab_ui.ui index 69d51ef55..5e56226a9 100644 --- a/khotkeys/kcontrol/ui/action_group_tab_ui.ui +++ b/khotkeys/kcontrol/ui/action_group_tab_ui.ui @@ -98,9 +98,9 @@ </widget> </vbox> </widget> -<Q_SLOTS> +<slots> <slot access="protected" specifier="pure virtual">action_group_name_changed( const TQString& )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">ktextedit.h</include> diff --git a/khotkeys/kcontrol/ui/action_list_widget_ui.ui b/khotkeys/kcontrol/ui/action_list_widget_ui.ui index d78c6b5f1..12537d770 100644 --- a/khotkeys/kcontrol/ui/action_list_widget_ui.ui +++ b/khotkeys/kcontrol/ui/action_list_widget_ui.ui @@ -97,6 +97,22 @@ <string>Delete</string> </property> </widget> + <widget class="TQPushButton"> + <property name="name"> + <cstring>move_up_button</cstring> + </property> + <property name="text"> + <string>Move &up</string> + </property> + </widget> + <widget class="TQPushButton"> + <property name="name"> + <cstring>move_down_button</cstring> + </property> + <property name="text"> + <string>Move &down</string> + </property> + </widget> </vbox> </widget> </hbox> @@ -148,6 +164,18 @@ <slot>delete_pressed()</slot> </connection> <connection> + <sender>move_up_button</sender> + <signal>clicked()</signal> + <receiver>Action_list_widget_ui</receiver> + <slot>move_up_pressed()</slot> + </connection> + <connection> + <sender>move_down_button</sender> + <signal>clicked()</signal> + <receiver>Action_list_widget_ui</receiver> + <slot>move_down_pressed()</slot> + </connection> + <connection> <sender>actions_listview</sender> <signal>current_changed(TQListViewItem*)</signal> <receiver>Action_list_widget_ui</receiver> @@ -157,12 +185,14 @@ <forwards> <forward>class TQListViewItem;</forward> </forwards> -<Q_SLOTS> +<slots> <slot access="protected" specifier="pure virtual">copy_pressed()</slot> <slot access="protected" specifier="pure virtual">current_changed(TQListViewItem*)</slot> <slot access="protected" specifier="pure virtual">delete_pressed()</slot> <slot access="protected" specifier="pure virtual">modify_pressed()</slot> -</Q_SLOTS> + <slot access="protected" specifier="pure virtual">move_up_pressed()</slot> + <slot access="protected" specifier="pure virtual">move_down_pressed()</slot> +</slots> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> diff --git a/khotkeys/kcontrol/ui/command_url_widget_ui.ui b/khotkeys/kcontrol/ui/command_url_widget_ui.ui index 5a285b32e..375ae4138 100644 --- a/khotkeys/kcontrol/ui/command_url_widget_ui.ui +++ b/khotkeys/kcontrol/ui/command_url_widget_ui.ui @@ -50,9 +50,9 @@ </widget> </vbox> </widget> -<Q_SLOTS> +<slots> <slot access="protected" specifier="pure virtual">browse_pressed()</slot> -</Q_SLOTS> +</slots> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/khotkeys/kcontrol/ui/condition_list_widget_ui.ui b/khotkeys/kcontrol/ui/condition_list_widget_ui.ui index 9b3727ffd..98b13c653 100644 --- a/khotkeys/kcontrol/ui/condition_list_widget_ui.ui +++ b/khotkeys/kcontrol/ui/condition_list_widget_ui.ui @@ -94,7 +94,23 @@ <cstring>delete_button</cstring> </property> <property name="text"> - <string>Delete</string> + <string>D&elete</string> + </property> + </widget> + <widget class="TQPushButton"> + <property name="name"> + <cstring>move_up_button</cstring> + </property> + <property name="text"> + <string>Move &up</string> + </property> + </widget> + <widget class="TQPushButton"> + <property name="name"> + <cstring>move_down_button</cstring> + </property> + <property name="text"> + <string>Move &down</string> </property> </widget> </vbox> @@ -147,6 +163,18 @@ <slot>delete_pressed()</slot> </connection> <connection> + <sender>move_up_button</sender> + <signal>clicked()</signal> + <receiver>Condition_list_widget_ui</receiver> + <slot>move_up_pressed()</slot> + </connection> + <connection> + <sender>move_down_button</sender> + <signal>clicked()</signal> + <receiver>Condition_list_widget_ui</receiver> + <slot>move_down_pressed()</slot> + </connection> + <connection> <sender>conditions_listview</sender> <signal>current_changed(TQListViewItem*)</signal> <receiver>Condition_list_widget_ui</receiver> @@ -156,12 +184,14 @@ <forwards> <forward>class TQListViewItem;</forward> </forwards> -<Q_SLOTS> +<slots> <slot access="protected" specifier="pure virtual">copy_pressed()</slot> <slot access="protected" specifier="pure virtual">current_changed(TQListViewItem*)</slot> <slot access="protected" specifier="pure virtual">delete_pressed()</slot> <slot access="protected" specifier="pure virtual">modify_pressed()</slot> -</Q_SLOTS> + <slot access="protected" specifier="pure virtual">move_up_pressed()</slot> + <slot access="protected" specifier="pure virtual">move_down_pressed()</slot> +</slots> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> diff --git a/khotkeys/kcontrol/ui/dcop_widget_ui.ui b/khotkeys/kcontrol/ui/dcop_widget_ui.ui index feeae535d..a9dc2e8c6 100644 --- a/khotkeys/kcontrol/ui/dcop_widget_ui.ui +++ b/khotkeys/kcontrol/ui/dcop_widget_ui.ui @@ -261,10 +261,10 @@ <tabstop>try_button</tabstop> <tabstop>PushButton1</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected" specifier="pure virtual">run_kdcop_pressed()</slot> <slot access="protected" specifier="pure virtual">try_pressed()</slot> -</Q_SLOTS> +</slots> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> diff --git a/khotkeys/kcontrol/ui/general_settings_tab_ui.ui b/khotkeys/kcontrol/ui/general_settings_tab_ui.ui index 9dc10309e..9242b6da9 100644 --- a/khotkeys/kcontrol/ui/general_settings_tab_ui.ui +++ b/khotkeys/kcontrol/ui/general_settings_tab_ui.ui @@ -107,9 +107,9 @@ <include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in implementation">kpushbutton.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected" specifier="pure virtual">import_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/khotkeys/kcontrol/ui/general_tab_ui.ui b/khotkeys/kcontrol/ui/general_tab_ui.ui index 9deef2245..b422d09cc 100644 --- a/khotkeys/kcontrol/ui/general_tab_ui.ui +++ b/khotkeys/kcontrol/ui/general_tab_ui.ui @@ -133,10 +133,10 @@ </widget> </vbox> </widget> -<Q_SLOTS> +<slots> <slot access="protected" specifier="pure virtual">action_name_changed( const TQString& )</slot> <slot access="protected" specifier="pure virtual">action_type_changed(int)</slot> -</Q_SLOTS> +</slots> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in implementation">ktextedit.h</include> diff --git a/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui b/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui index 068806a02..c848ef4fe 100644 --- a/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui +++ b/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui @@ -506,11 +506,11 @@ <slot>edit_gesture_pressed3()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected" specifier="pure virtual">edit_gesture_pressed1()</slot> <slot access="protected" specifier="pure virtual">edit_gesture_pressed2()</slot> <slot access="protected" specifier="pure virtual">edit_gesture_pressed3()</slot> -</Q_SLOTS> +</slots> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> diff --git a/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui b/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui index 521e44f46..ff00fbf6e 100644 --- a/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui +++ b/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui @@ -183,9 +183,9 @@ <include location="global" impldecl="in implementation">kdialog.h</include> <include location="global" impldecl="in implementation">ktextedit.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="protected" specifier="pure virtual">modify_pressed()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/khotkeys/kcontrol/ui/menuentry_widget_ui.ui b/khotkeys/kcontrol/ui/menuentry_widget_ui.ui index 6af0aefc6..a24d36665 100644 --- a/khotkeys/kcontrol/ui/menuentry_widget_ui.ui +++ b/khotkeys/kcontrol/ui/menuentry_widget_ui.ui @@ -89,9 +89,9 @@ <slot>browse_pressed()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected" specifier="pure virtual">browse_pressed()</slot> -</Q_SLOTS> +</slots> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> diff --git a/khotkeys/kcontrol/ui/triggers_tab_ui.ui b/khotkeys/kcontrol/ui/triggers_tab_ui.ui index 557be7dd4..e1d110522 100644 --- a/khotkeys/kcontrol/ui/triggers_tab_ui.ui +++ b/khotkeys/kcontrol/ui/triggers_tab_ui.ui @@ -157,12 +157,12 @@ <forwards> <forward>class TQListViewItem;</forward> </forwards> -<Q_SLOTS> +<slots> <slot access="protected" specifier="pure virtual">copy_pressed()</slot> <slot access="protected" specifier="pure virtual">current_changed(TQListViewItem*)</slot> <slot access="protected" specifier="pure virtual">delete_pressed()</slot> <slot access="protected" specifier="pure virtual">modify_pressed()</slot> -</Q_SLOTS> +</slots> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> diff --git a/khotkeys/kcontrol/ui/voice_input_widget_ui.ui b/khotkeys/kcontrol/ui/voice_input_widget_ui.ui index bcd113c57..8ccb8a9e2 100644 --- a/khotkeys/kcontrol/ui/voice_input_widget_ui.ui +++ b/khotkeys/kcontrol/ui/voice_input_widget_ui.ui @@ -90,11 +90,11 @@ <slot>slotPlayPressed()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected" specifier="pure virtual">slotRecordPressed()</slot> <slot access="protected" specifier="pure virtual">slotPlayPressed()</slot> <slot access="protected" specifier="pure virtual">slotStopPressed()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/khotkeys/kcontrol/ui/waiting_widget_ui.ui b/khotkeys/kcontrol/ui/waiting_widget_ui.ui new file mode 100644 index 000000000..5942a34ba --- /dev/null +++ b/khotkeys/kcontrol/ui/waiting_widget_ui.ui @@ -0,0 +1,72 @@ +<!DOCTYPE UI><UI version="3.1" stdsetdef="1"> +<class>KHotKeys::Waiting_widget_ui</class> +<widget class="TQWidget"> + <property name="name"> + <cstring>Waiting_widget_ui</cstring> + </property> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>580</width> + <height>480</height> + </rect> + </property> + <hbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <property name="margin"> + <number>11</number> + </property> + <property name="spacing"> + <number>6</number> + </property> + <widget class="TQLabel"> + <property name="name"> + <cstring>waiting_label</cstring> + </property> + <property name="text"> + <string>Waiting time (ms): </string> + </property> + <property name="buddy" stdset="0"> + <cstring>waiting_spinbox</cstring> + </property> + </widget> + <widget class="KIntSpinBox"> + <property name="name"> + <cstring>waiting_spinbox</cstring> + </property> + <property name="minValue"> + <number>0</number> + </property> + <property name="maxValue"> + <number>20000</number> + </property> + </widget> + <spacer> + <property name="name"> + <cstring>Spacer16</cstring> + </property> + <property name="orientation"> + <enum>Horizontal</enum> + </property> + <property name="sizeType"> + <enum>Expanding</enum> + </property> + <property name="sizeHint"> + <size> + <width>0</width> + <height>20</height> + </size> + </property> + </spacer> + </hbox> +</widget> +<includes> + <include location="global" impldecl="in implementation">kdialog.h</include> + <include location="global" impldecl="in implementation">knuminput.h</include> +</includes> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +</UI> diff --git a/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui b/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui index aaa52e891..78a106a81 100644 --- a/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui +++ b/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui @@ -156,12 +156,12 @@ <forwards> <forward>class TQListViewItem;</forward> </forwards> -<Q_SLOTS> +<slots> <slot access="protected" specifier="pure virtual">copy_pressed()</slot> <slot access="protected" specifier="pure virtual">current_changed(TQListViewItem*)</slot> <slot access="protected" specifier="pure virtual">delete_pressed()</slot> <slot access="protected" specifier="pure virtual">modify_pressed()</slot> -</Q_SLOTS> +</slots> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> diff --git a/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui b/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui index d15dab5df..a21633852 100644 --- a/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui +++ b/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui @@ -480,11 +480,11 @@ <tabstop>window_role_lineedit</tabstop> <tabstop>autodetect_button</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected" specifier="pure virtual">window_class_combo_changed(int)</slot> <slot access="protected" specifier="pure virtual">window_role_combo_changed(int)</slot> <slot access="protected" specifier="pure virtual">window_title_combo_changed(int)</slot> -</Q_SLOTS> +</slots> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> diff --git a/khotkeys/kcontrol/voice_settings_tab.cpp b/khotkeys/kcontrol/voice_settings_tab.cpp index 1d97d69ab..952cc0dbe 100644 --- a/khotkeys/kcontrol/voice_settings_tab.cpp +++ b/khotkeys/kcontrol/voice_settings_tab.cpp @@ -26,7 +26,7 @@ namespace KHotKeys Voice_settings_tab::Voice_settings_tab( TQWidget* parent_P, const char* name_P ) : Voice_settings_tab_ui( parent_P, name_P ) { - connect( keyButton , TQT_SIGNAL(capturedShortcut (const TDEShortcut &)) , this, TQT_SLOT(slotCapturedKey( const TDEShortcut& ))); + connect( keyButton , TQ_SIGNAL(capturedShortcut (const TDEShortcut &)) , this, TQ_SLOT(slotCapturedKey( const TDEShortcut& ))); } void Voice_settings_tab::read_data() diff --git a/khotkeys/kcontrol/voice_settings_tab.h b/khotkeys/kcontrol/voice_settings_tab.h index c59a911a2..57b5905c5 100644 --- a/khotkeys/kcontrol/voice_settings_tab.h +++ b/khotkeys/kcontrol/voice_settings_tab.h @@ -21,7 +21,7 @@ namespace KHotKeys class Voice_settings_tab : public Voice_settings_tab_ui { - Q_OBJECT + TQ_OBJECT public: Voice_settings_tab( TQWidget* parent = NULL, const char* name = NULL ); void read_data(); diff --git a/khotkeys/kcontrol/voicerecorder.cpp b/khotkeys/kcontrol/voicerecorder.cpp index fc231a82c..9af645045 100644 --- a/khotkeys/kcontrol/voicerecorder.cpp +++ b/khotkeys/kcontrol/voicerecorder.cpp @@ -46,13 +46,13 @@ bool VoiceRecorder::init( KLibrary* lib ) } VoiceRecorder::VoiceRecorder(const Sound& sound_P, const TQString &voiceId, TQWidget *parent, const char *name) - : Voice_input_widget_ui(parent, name) , _recorder( SoundRecorder::create(TQT_TQOBJECT(this))) , _state(sNotModified), _tempFile(0L) , _voiceId(voiceId) + : Voice_input_widget_ui(parent, name) , _recorder( SoundRecorder::create(this)) , _state(sNotModified), _tempFile(0L) , _voiceId(voiceId) { _sound=sound_P; buttonPlay->setEnabled(sound_P.size() > 50); buttonStop->setEnabled(false); - connect (_recorder , TQT_SIGNAL(recorded(const Sound& )) , this , TQT_SLOT(slotSoundRecorded(const Sound& ) )); + connect (_recorder , TQ_SIGNAL(recorded(const Sound& )) , this , TQ_SLOT(slotSoundRecorded(const Sound& ) )); //if(voiceid_P.isEmpty()) emit recorded(false); @@ -168,7 +168,7 @@ bool VoiceRecorder::drawSound() uint lx=0; uint ly=height/2; - /*** DRAW THE TQT_SIGNAL ******/ + /*** DRAW THE TQ_SIGNAL ******/ for(uint f=1; f<length; f++) { uint nx=f*width/length; diff --git a/khotkeys/kcontrol/voicerecorder.h b/khotkeys/kcontrol/voicerecorder.h index 30d03acdc..6edb20f37 100644 --- a/khotkeys/kcontrol/voicerecorder.h +++ b/khotkeys/kcontrol/voicerecorder.h @@ -30,7 +30,7 @@ namespace KHotKeys class VoiceRecorder : public Voice_input_widget_ui { - Q_OBJECT + TQ_OBJECT public: VoiceRecorder(const Sound& sound_P, const TQString &voiceId, TQWidget *parent, const char *name); diff --git a/khotkeys/kcontrol/voicerecordpage.cpp b/khotkeys/kcontrol/voicerecordpage.cpp index 1c7f8c938..c450abe44 100644 --- a/khotkeys/kcontrol/voicerecordpage.cpp +++ b/khotkeys/kcontrol/voicerecordpage.cpp @@ -59,9 +59,9 @@ VoiceRecordPage::VoiceRecordPage( const TQString &voiceid_P, TQWidget *parent, c setStretchFactor(spacer, 1); - connect(_recorder1, TQT_SIGNAL(recorded(bool)) , this, TQT_SLOT(slotChanged())); - connect(_recorder2, TQT_SIGNAL(recorded(bool)) , this, TQT_SLOT(slotChanged())); - connect(_lineEdit , TQT_SIGNAL( textChanged (const TQString&)) , this , TQT_SLOT(slotChanged())); + connect(_recorder1, TQ_SIGNAL(recorded(bool)) , this, TQ_SLOT(slotChanged())); + connect(_recorder2, TQ_SIGNAL(recorded(bool)) , this, TQ_SLOT(slotChanged())); + connect(_lineEdit , TQ_SIGNAL( textChanged (const TQString&)) , this , TQ_SLOT(slotChanged())); } diff --git a/khotkeys/kcontrol/voicerecordpage.h b/khotkeys/kcontrol/voicerecordpage.h index 9cb934b61..970ccf83b 100644 --- a/khotkeys/kcontrol/voicerecordpage.h +++ b/khotkeys/kcontrol/voicerecordpage.h @@ -31,7 +31,7 @@ class VoiceSignature; class VoiceRecordPage : public TQVBox { - Q_OBJECT + TQ_OBJECT public: VoiceRecordPage(const TQString &voiceip_P, TQWidget *parent, const char *name); diff --git a/khotkeys/kcontrol/waiting_widget.cpp b/khotkeys/kcontrol/waiting_widget.cpp new file mode 100644 index 000000000..135261e30 --- /dev/null +++ b/khotkeys/kcontrol/waiting_widget.cpp @@ -0,0 +1,56 @@ +/**************************************************************************** + + KHotKeys + + Copyright (C) 1999-2001 Lubos Lunak <l.lunak@kde.org> + + Distributed under the terms of the GNU General Public License version 2. + +****************************************************************************/ + +#define _WAITING_WIDGET_CPP_ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include "waiting_widget.h" + +#include <knuminput.h> + +#include <kdebug.h> + +#include <actions.h> +#include <action_data.h> + +#include "windowdef_list_widget.h" +#include "kcmkhotkeys.h" + +namespace KHotKeys +{ + +Waiting_widget::Waiting_widget( TQWidget* parent_P, const char* name_P ) + : Waiting_widget_ui( parent_P, name_P ) + { + // KHotKeys::Module::changed() + connect(waiting_spinbox, TQ_SIGNAL(valueChanged(int)), + module, TQ_SLOT(changed())); + } + +void Waiting_widget::set_data( const Waiting_action* data_P ) + { + if( data_P == NULL ) + { + return; + } + waiting_spinbox->setValue(data_P->_waiting_time); + } + +Waiting_action* Waiting_widget::get_data( Action_data* data_P ) const + { + return new Waiting_action( data_P, waiting_spinbox->value()); + } + +} // namespace KHotKeys + +#include "waiting_widget.moc" diff --git a/khotkeys/kcontrol/waiting_widget.h b/khotkeys/kcontrol/waiting_widget.h new file mode 100644 index 000000000..a339e2b98 --- /dev/null +++ b/khotkeys/kcontrol/waiting_widget.h @@ -0,0 +1,36 @@ +/**************************************************************************** + + KHotKeys + + Copyright (C) 1999-2001 Lubos Lunak <l.lunak@kde.org> + + Distributed under the terms of the GNU General Public License version 2. + +****************************************************************************/ + +#ifndef _WAITING_WIDGET_H_ +#define _WAITING_WIDGET_H_ + +#include <waiting_widget_ui.h> + +namespace KHotKeys +{ + +class Waiting_action; +class Action_data; + +class Waiting_widget + : public Waiting_widget_ui + { + TQ_OBJECT + public: + Waiting_widget( TQWidget* parent_P = NULL, const char* name_P = NULL ); + void set_data( const Waiting_action* data_P ); + Waiting_action* get_data( Action_data* data_P ) const; + }; + +typedef Waiting_widget Waiting_tab; + +} // namespace KHotKeys + +#endif diff --git a/khotkeys/kcontrol/window_trigger_widget.cpp b/khotkeys/kcontrol/window_trigger_widget.cpp index c897cf14a..ad8871504 100644 --- a/khotkeys/kcontrol/window_trigger_widget.cpp +++ b/khotkeys/kcontrol/window_trigger_widget.cpp @@ -33,14 +33,14 @@ Window_trigger_widget::Window_trigger_widget( TQWidget* parent_P, const char* na { clear_data(); // KHotKeys::Module::changed() - connect( window_appears_checkbox, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( window_disappears_checkbox, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( window_activates_checkbox, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( window_deactivates_checkbox, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); + connect( window_appears_checkbox, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( window_disappears_checkbox, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( window_activates_checkbox, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( window_deactivates_checkbox, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); } void Window_trigger_widget::clear_data() diff --git a/khotkeys/kcontrol/window_trigger_widget.h b/khotkeys/kcontrol/window_trigger_widget.h index c012a0bca..60efdf317 100644 --- a/khotkeys/kcontrol/window_trigger_widget.h +++ b/khotkeys/kcontrol/window_trigger_widget.h @@ -22,7 +22,7 @@ class Action_data; class Window_trigger_widget : public Window_trigger_widget_ui { - Q_OBJECT + TQ_OBJECT public: Window_trigger_widget( TQWidget* parent_P = NULL, const char* name_P = NULL ); void set_data( const Window_trigger* trigger_P ); diff --git a/khotkeys/kcontrol/windowdef_list_widget.cpp b/khotkeys/kcontrol/windowdef_list_widget.cpp index dc16d780f..b36e46e0d 100644 --- a/khotkeys/kcontrol/windowdef_list_widget.cpp +++ b/khotkeys/kcontrol/windowdef_list_widget.cpp @@ -43,10 +43,10 @@ Windowdef_list_widget::Windowdef_list_widget( TQWidget* parent_P, const char* na { TQPopupMenu* popup = new TQPopupMenu; // CHECKME looks like setting parent doesn't work popup->insertItem( i18n( "Simple Window..." ), TYPE_WINDOWDEF_SIMPLE ); - connect( popup, TQT_SIGNAL( activated( int )), TQT_SLOT( new_selected( int ))); + connect( popup, TQ_SIGNAL( activated( int )), TQ_SLOT( new_selected( int ))); - connect( windows_listview, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( modify_pressed() ) ); + connect( windows_listview, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( modify_pressed() ) ); new_button->setPopup( popup ); windows_listview->header()->hide(); windows_listview->addColumn( "" ); @@ -57,16 +57,16 @@ Windowdef_list_widget::Windowdef_list_widget( TQWidget* parent_P, const char* na delete_button->setEnabled( false ); clear_data(); // KHotKeys::Module::changed() - connect( new_button, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( copy_button, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( modify_button, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( delete_button, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( comment_lineedit, TQT_SIGNAL( textChanged( const TQString& )), - module, TQT_SLOT( changed())); + connect( new_button, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( copy_button, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( modify_button, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( delete_button, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( comment_lineedit, TQ_SIGNAL( textChanged( const TQString& )), + module, TQ_SLOT( changed())); } Windowdef_list_widget::~Windowdef_list_widget() diff --git a/khotkeys/kcontrol/windowdef_list_widget.h b/khotkeys/kcontrol/windowdef_list_widget.h index 6e923c902..972bbdb05 100644 --- a/khotkeys/kcontrol/windowdef_list_widget.h +++ b/khotkeys/kcontrol/windowdef_list_widget.h @@ -30,7 +30,7 @@ class Windowdef_list_item; class Windowdef_list_widget : public Windowdef_list_widget_ui { - Q_OBJECT + TQ_OBJECT public: Windowdef_list_widget( TQWidget* parent_P = NULL, const char* name_P = NULL ); virtual ~Windowdef_list_widget(); @@ -84,7 +84,7 @@ class Windowdef_dialog class Windowdef_simple_dialog : public KDialogBase, public Windowdef_dialog { - Q_OBJECT + TQ_OBJECT public: Windowdef_simple_dialog( Windowdef_simple* window_P, TQObject* obj_P, const char* slot_P ); virtual Windowdef* edit_windowdef(); diff --git a/khotkeys/kcontrol/windowdef_simple_widget.cpp b/khotkeys/kcontrol/windowdef_simple_widget.cpp index e0a6671e7..381287166 100644 --- a/khotkeys/kcontrol/windowdef_simple_widget.cpp +++ b/khotkeys/kcontrol/windowdef_simple_widget.cpp @@ -37,31 +37,31 @@ Windowdef_simple_widget::Windowdef_simple_widget( TQWidget* parent_P, const char window_title_lineedit->setEnabled( false ); window_class_lineedit->setEnabled( false ); window_role_lineedit->setEnabled( false ); - connect( autodetect_button, TQT_SIGNAL( clicked()), TQT_SLOT( autodetect_clicked())); + connect( autodetect_button, TQ_SIGNAL( clicked()), TQ_SLOT( autodetect_clicked())); clear_data(); // KHotKeys::Module::changed() - connect( window_title_combo, TQT_SIGNAL( activated( int )), - module, TQT_SLOT( changed())); - connect( window_title_lineedit, TQT_SIGNAL( textChanged( const TQString& )), - module, TQT_SLOT( changed())); - connect( window_class_combo, TQT_SIGNAL( activated( int )), - module, TQT_SLOT( changed())); - connect( window_class_lineedit, TQT_SIGNAL( textChanged( const TQString& )), - module, TQT_SLOT( changed())); - connect( window_role_combo, TQT_SIGNAL( activated( int )), - module, TQT_SLOT( changed())); - connect( window_role_lineedit, TQT_SIGNAL( textChanged( const TQString& )), - module, TQT_SLOT( changed())); - connect( type_normal_checkbox, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( type_dialog_checkbox, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( type_dock_checkbox, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( type_desktop_checkbox, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( comment_lineedit, TQT_SIGNAL( textChanged( const TQString& )), - module, TQT_SLOT( changed())); + connect( window_title_combo, TQ_SIGNAL( activated( int )), + module, TQ_SLOT( changed())); + connect( window_title_lineedit, TQ_SIGNAL( textChanged( const TQString& )), + module, TQ_SLOT( changed())); + connect( window_class_combo, TQ_SIGNAL( activated( int )), + module, TQ_SLOT( changed())); + connect( window_class_lineedit, TQ_SIGNAL( textChanged( const TQString& )), + module, TQ_SLOT( changed())); + connect( window_role_combo, TQ_SIGNAL( activated( int )), + module, TQ_SLOT( changed())); + connect( window_role_lineedit, TQ_SIGNAL( textChanged( const TQString& )), + module, TQ_SLOT( changed())); + connect( type_normal_checkbox, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( type_dialog_checkbox, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( type_dock_checkbox, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( type_desktop_checkbox, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( comment_lineedit, TQ_SIGNAL( textChanged( const TQString& )), + module, TQ_SLOT( changed())); } void Windowdef_simple_widget::clear_data() @@ -144,9 +144,9 @@ void Windowdef_simple_widget::window_title_combo_changed( int item_P ) void Windowdef_simple_widget::set_autodetect( TQObject* obj_P, const char* slot_P ) { - disconnect( TQT_SIGNAL( autodetect_signal())); + disconnect( TQ_SIGNAL( autodetect_signal())); if( obj_P != NULL ) - connect( this, TQT_SIGNAL( autodetect_signal()), obj_P, slot_P ); + connect( this, TQ_SIGNAL( autodetect_signal()), obj_P, slot_P ); } void Windowdef_simple_widget::autodetect_clicked() @@ -157,7 +157,7 @@ void Windowdef_simple_widget::autodetect_clicked() void Windowdef_simple_widget::autodetect() { - WindowSelector* sel = new WindowSelector( TQT_TQOBJECT(this), TQT_SLOT( autodetect_window_selected( WId ))); + WindowSelector* sel = new WindowSelector( this, TQ_SLOT( autodetect_window_selected( WId ))); sel->select(); } diff --git a/khotkeys/kcontrol/windowdef_simple_widget.h b/khotkeys/kcontrol/windowdef_simple_widget.h index 26db6fd87..0c21d3b2d 100644 --- a/khotkeys/kcontrol/windowdef_simple_widget.h +++ b/khotkeys/kcontrol/windowdef_simple_widget.h @@ -22,7 +22,7 @@ class Windowdef_list_item; class Windowdef_simple_widget : public Windowdef_simple_widget_ui { - Q_OBJECT + TQ_OBJECT public: Windowdef_simple_widget( TQWidget* parent_P = NULL, const char* name_P = NULL ); void set_data( const Windowdef_simple* data_P ); diff --git a/khotkeys/kcontrol/windowselector.cpp b/khotkeys/kcontrol/windowselector.cpp index d1cbe8f5f..d5a1f4859 100644 --- a/khotkeys/kcontrol/windowselector.cpp +++ b/khotkeys/kcontrol/windowselector.cpp @@ -29,13 +29,13 @@ namespace KHotKeys WindowSelector::WindowSelector( TQObject* receiver_P, const char* slot_P ) { - connect( this, TQT_SIGNAL( selected_signal( WId )), receiver_P, slot_P ); + connect( this, TQ_SIGNAL( selected_signal( WId )), receiver_P, slot_P ); } void WindowSelector::select() { - kapp->desktop()->grabMouse( TQCursor( tqcrossCursor )); - kapp->installX11EventFilter( TQT_TQWIDGET(this) ); + kapp->desktop()->grabMouse( TQCursor( TQt::crossCursor )); + kapp->installX11EventFilter( this ); } bool WindowSelector::x11Event( XEvent* e ) diff --git a/khotkeys/kcontrol/windowselector.h b/khotkeys/kcontrol/windowselector.h index 4f52312ea..0abb41811 100644 --- a/khotkeys/kcontrol/windowselector.h +++ b/khotkeys/kcontrol/windowselector.h @@ -17,9 +17,9 @@ namespace KHotKeys { class WindowSelector - : public QWidget + : public TQWidget { - Q_OBJECT + TQ_OBJECT public: WindowSelector( TQObject* receiver, const char* slot ); void select(); diff --git a/khotkeys/shared/actions.cpp b/khotkeys/shared/actions.cpp index c8590789a..69c853fed 100644 --- a/khotkeys/shared/actions.cpp +++ b/khotkeys/shared/actions.cpp @@ -54,7 +54,9 @@ Action* Action::create_cfg_read( TDEConfig& cfg_P, Action_data* data_P ) return new Keyboard_input_action( cfg_P, data_P ); if( type == "ACTIVATE_WINDOW" ) return new Activate_window_action( cfg_P, data_P ); - kdWarning( 1217 ) << "Unknown Action type read from cfg file\n"; + if( type == "WAITING" ) + return new Waiting_action( cfg_P, data_P ); + kdWarning( 1217 ) << "Unknown Action type read from cfg file: " << type << endl; return NULL; } @@ -452,4 +454,34 @@ Action* Activate_window_action::copy( Action_data* data_P ) const return new Activate_window_action( data_P, window()->copy()); } +// Waiting_action + +Waiting_action::Waiting_action( TDEConfig& cfg_P, Action_data* data_P ) + : Action( cfg_P, data_P ) + { + _waiting_time = cfg_P.readNumEntry("Time"); + } + +void Waiting_action::cfg_write( TDEConfig& cfg_P ) const + { + base::cfg_write( cfg_P ); + cfg_P.writeEntry( "Type", "WAITING" ); // overwrites value set in base::cfg_write() + cfg_P.writeEntry( "Time", _waiting_time); + } + +void Waiting_action::execute() + { + usleep(_waiting_time * 1000); + } + +TQString Waiting_action::description() const + { + return i18n( "Waiting %1 ms" ).arg(_waiting_time); + } + +Action* Waiting_action::copy( Action_data* data_P ) const + { + return new Waiting_action( data_P, _waiting_time); + } + } // namespace KHotKeys diff --git a/khotkeys/shared/actions.h b/khotkeys/shared/actions.h index f381683e1..c7cabf0fc 100644 --- a/khotkeys/shared/actions.h +++ b/khotkeys/shared/actions.h @@ -50,7 +50,7 @@ class KDE_EXPORT Action_list : public TQPtrList< Action > { public: - Action_list( const TQString& comment_P ); // CHECKME nebo i data ? + Action_list( const TQString& comment_P ); Action_list( TDEConfig& cfg_P, Action_data* data_P ); void cfg_write( TDEConfig& cfg_P ) const; typedef TQPtrListIterator< Action > Iterator; @@ -111,7 +111,7 @@ class KDE_EXPORT Dcop_action virtual TQString description() const; virtual Action* copy( Action_data* data_P ) const; private: - TQString app; // CHECKME TQCString ? + TQString app; TQString obj; TQString call; TQString args; @@ -159,6 +159,21 @@ class KDE_EXPORT Activate_window_action const Windowdef_list* _window; }; +class KDE_EXPORT Waiting_action + : public Action + { + typedef Action base; + public: + Waiting_action( Action_data* data_P, const int waiting_time ); + Waiting_action( TDEConfig& cfg_P, Action_data* data_P ); + virtual void cfg_write( TDEConfig& cfg_P ) const; + virtual void execute(); + virtual TQString description() const; + virtual Action* copy( Action_data* data_P ) const; + + int _waiting_time; + }; + //*************************************************************************** // Inline //*************************************************************************** @@ -300,6 +315,14 @@ const Windowdef_list* Activate_window_action::window() const return _window; } +// Waiting_action + +inline +Waiting_action::Waiting_action( Action_data* data_P, const int waiting_time) + : Action( data_P ), _waiting_time(waiting_time) + { + } + } // namespace KHotKeys - + #endif diff --git a/khotkeys/shared/conditions.cpp b/khotkeys/shared/conditions.cpp index b09284b44..1d9f37b9c 100644 --- a/khotkeys/shared/conditions.cpp +++ b/khotkeys/shared/conditions.cpp @@ -257,8 +257,8 @@ Active_window_condition::Active_window_condition( TDEConfig& cfg_P, Condition_li void Active_window_condition::init() { - connect( windows_handler, TQT_SIGNAL( active_window_changed( WId )), - this, TQT_SLOT( active_window_changed( WId ))); + connect( windows_handler, TQ_SIGNAL( active_window_changed( WId )), + this, TQ_SLOT( active_window_changed( WId ))); } bool Active_window_condition::match() const @@ -323,8 +323,8 @@ Existing_window_condition::Existing_window_condition( TDEConfig& cfg_P, Conditio void Existing_window_condition::init() { - connect( windows_handler, TQT_SIGNAL( window_added( WId )), this, TQT_SLOT( window_added( WId ))); - connect( windows_handler, TQT_SIGNAL( window_removed( WId )), this, TQT_SLOT( window_removed( WId ))); + connect( windows_handler, TQ_SIGNAL( window_added( WId )), this, TQ_SLOT( window_added( WId ))); + connect( windows_handler, TQ_SIGNAL( window_removed( WId )), this, TQ_SLOT( window_removed( WId ))); } bool Existing_window_condition::match() const diff --git a/khotkeys/shared/conditions.h b/khotkeys/shared/conditions.h index ff1af7d07..8e5b9e813 100644 --- a/khotkeys/shared/conditions.h +++ b/khotkeys/shared/conditions.h @@ -87,7 +87,7 @@ class KDE_EXPORT Condition_list class KDE_EXPORT Active_window_condition : public TQObject, public Condition { - Q_OBJECT + TQ_OBJECT typedef Condition base; public: Active_window_condition( Windowdef_list* window_P, Condition_list_base* parent_P ); @@ -114,7 +114,7 @@ class KDE_EXPORT Active_window_condition class KDE_EXPORT Existing_window_condition : public TQObject, public Condition { - Q_OBJECT + TQ_OBJECT typedef Condition base; public: Existing_window_condition( Windowdef_list* window_P, Condition_list_base* parent_P ); diff --git a/khotkeys/shared/gestures.cpp b/khotkeys/shared/gestures.cpp index 9933ba74f..5777f9a4f 100644 --- a/khotkeys/shared/gestures.cpp +++ b/khotkeys/shared/gestures.cpp @@ -49,9 +49,9 @@ Gesture::Gesture( bool /*enabled_P*/, TQObject* parent_P ) (void) new DeleteObject( this, parent_P ); assert( gesture_handler == NULL ); gesture_handler = this; - connect( &nostroke_timer, TQT_SIGNAL( timeout()), TQT_SLOT( stroke_timeout())); - connect( windows_handler, TQT_SIGNAL( active_window_changed( WId )), - TQT_SLOT( active_window_changed( WId ))); + connect( &nostroke_timer, TQ_SIGNAL( timeout()), TQ_SLOT( stroke_timeout())); + connect( windows_handler, TQ_SIGNAL( active_window_changed( WId )), + TQ_SLOT( active_window_changed( WId ))); } Gesture::~Gesture() @@ -108,7 +108,7 @@ void Gesture::register_handler( TQObject* receiver_P, const char* slot_P ) if( handlers.contains( receiver_P )) return; handlers[ receiver_P ] = true; - connect( this, TQT_SIGNAL( handle_gesture( const TQString&, WId )), + connect( this, TQ_SIGNAL( handle_gesture( const TQString&, WId )), receiver_P, slot_P ); if( handlers.count() == 1 ) update_grab(); @@ -119,7 +119,7 @@ void Gesture::unregister_handler( TQObject* receiver_P, const char* slot_P ) if( !handlers.contains( receiver_P )) return; handlers.remove( receiver_P ); - disconnect( this, TQT_SIGNAL( handle_gesture( const TQString&, WId )), + disconnect( this, TQ_SIGNAL( handle_gesture( const TQString&, WId )), receiver_P, slot_P ); if( handlers.count() == 0 ) update_grab(); diff --git a/khotkeys/shared/gestures.h b/khotkeys/shared/gestures.h index 4f0f3f94c..01da65d00 100644 --- a/khotkeys/shared/gestures.h +++ b/khotkeys/shared/gestures.h @@ -65,7 +65,7 @@ class KDE_EXPORT Stroke class KDE_EXPORT Gesture : public TQWidget // not TQObject because of x11EventFilter() { - Q_OBJECT + TQ_OBJECT public: Gesture( bool enabled_P, TQObject* parent_P ); virtual ~Gesture(); @@ -103,7 +103,7 @@ class KDE_EXPORT Gesture class DeleteObject : public TQObject { - Q_OBJECT + TQ_OBJECT public: DeleteObject( TQWidget* widget_P, TQObject* parent_P ) : TQObject( parent_P ), widget( widget_P ) {} diff --git a/khotkeys/shared/input.cpp b/khotkeys/shared/input.cpp index 7b9696c7e..96338b055 100644 --- a/khotkeys/shared/input.cpp +++ b/khotkeys/shared/input.cpp @@ -106,12 +106,12 @@ void Kbd::grab_shortcut( const TDEShortcut& shortcut_P ) // CHECKME ugly ugly hack TQString name = ' ' + TQString::number( keycode_P ); kga->insertItem( "", name, keycode_P ); - kga->connectItem( name, this, TQT_SLOT( key_slot( int ))); + kga->connectItem( name, this, TQ_SLOT( key_slot( int ))); #endif TQString name = ' ' + shortcut_P.toStringInternal(); kga->insert( name, name, TQString::null, shortcut_P, shortcut_P, - this, TQT_SLOT( key_slot( TQString ))); - TQTimer::singleShot( 0, this, TQT_SLOT( update_connections())); + this, TQ_SLOT( key_slot( TQString ))); + TQTimer::singleShot( 0, this, TQ_SLOT( update_connections())); } } @@ -129,7 +129,7 @@ void Kbd::ungrab_shortcut( const TDEShortcut& shortcut_P ) #endif kga->remove( ' ' + shortcut_P.toStringInternal()); grabs.remove( shortcut_P ); - TQTimer::singleShot( 0, this, TQT_SLOT( update_connections())); + TQTimer::singleShot( 0, this, TQ_SLOT( update_connections())); } } diff --git a/khotkeys/shared/input.h b/khotkeys/shared/input.h index c6bbdf1e5..e810cea80 100644 --- a/khotkeys/shared/input.h +++ b/khotkeys/shared/input.h @@ -35,7 +35,7 @@ class Kbd_receiver class Kbd : public TQObject { - Q_OBJECT + TQ_OBJECT public: Kbd( bool grabbing_enabled_P, TQObject* parent_P ); virtual ~Kbd(); diff --git a/khotkeys/shared/khlistbox.cpp b/khotkeys/shared/khlistbox.cpp index ff6d96221..f0080d6de 100644 --- a/khotkeys/shared/khlistbox.cpp +++ b/khotkeys/shared/khlistbox.cpp @@ -25,15 +25,15 @@ KHListBox::KHListBox( TQWidget* parent_P, const char* name_P ) : TQListBox( parent_P, name_P ), saved_current_item( NULL ), in_clear( false ), force_select( false ) { - connect( this, TQT_SIGNAL( selectionChanged( TQListBoxItem* )), - TQT_SLOT( slot_selection_changed( TQListBoxItem* ))); - connect( this, TQT_SIGNAL( currentChanged( TQListBoxItem* )), - TQT_SLOT( slot_current_changed( TQListBoxItem* ))); + connect( this, TQ_SIGNAL( selectionChanged( TQListBoxItem* )), + TQ_SLOT( slot_selection_changed( TQListBoxItem* ))); + connect( this, TQ_SIGNAL( currentChanged( TQListBoxItem* )), + TQ_SLOT( slot_current_changed( TQListBoxItem* ))); // CHECKME grrr - connect( this, TQT_SIGNAL( selectionChanged()), - TQT_SLOT( slot_selection_changed())); - connect( &insert_select_timer, TQT_SIGNAL( timeout()), - TQT_SLOT( slot_insert_select())); + connect( this, TQ_SIGNAL( selectionChanged()), + TQ_SLOT( slot_selection_changed())); + connect( &insert_select_timer, TQ_SIGNAL( timeout()), + TQ_SLOT( slot_insert_select())); } void KHListBox::slot_selection_changed() diff --git a/khotkeys/shared/khlistbox.h b/khotkeys/shared/khlistbox.h index d0f9b51ae..8f4a77138 100644 --- a/khotkeys/shared/khlistbox.h +++ b/khotkeys/shared/khlistbox.h @@ -21,7 +21,7 @@ namespace KHotKeys class KHListBox : public TQListBox { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( bool forceSelect READ forceSelect WRITE setForceSelect ) public: KHListBox( TQWidget* parent_P, const char* name_P = NULL ); diff --git a/khotkeys/shared/khlistview.cpp b/khotkeys/shared/khlistview.cpp index ae348af33..a9943996a 100644 --- a/khotkeys/shared/khlistview.cpp +++ b/khotkeys/shared/khlistview.cpp @@ -25,15 +25,15 @@ KHListView::KHListView( TQWidget* parent_P, const char* name_P ) : TDEListView( parent_P, name_P ), saved_current_item( NULL ), in_clear( false ), ignore( false ), force_select( false ) { - connect( this, TQT_SIGNAL( selectionChanged( TQListViewItem* )), - TQT_SLOT( slot_selection_changed( TQListViewItem* ))); - connect( this, TQT_SIGNAL( currentChanged( TQListViewItem* )), - TQT_SLOT( slot_current_changed( TQListViewItem* ))); + connect( this, TQ_SIGNAL( selectionChanged( TQListViewItem* )), + TQ_SLOT( slot_selection_changed( TQListViewItem* ))); + connect( this, TQ_SIGNAL( currentChanged( TQListViewItem* )), + TQ_SLOT( slot_current_changed( TQListViewItem* ))); // CHECKME grrr - connect( this, TQT_SIGNAL( selectionChanged()), - TQT_SLOT( slot_selection_changed())); - connect( &insert_select_timer, TQT_SIGNAL( timeout()), - TQT_SLOT( slot_insert_select())); + connect( this, TQ_SIGNAL( selectionChanged()), + TQ_SLOT( slot_selection_changed())); + connect( &insert_select_timer, TQ_SIGNAL( timeout()), + TQ_SLOT( slot_insert_select())); } void KHListView::slot_selection_changed() diff --git a/khotkeys/shared/khlistview.h b/khotkeys/shared/khlistview.h index 2cee34617..1a0f27e2b 100644 --- a/khotkeys/shared/khlistview.h +++ b/khotkeys/shared/khlistview.h @@ -22,7 +22,7 @@ namespace KHotKeys class KDE_EXPORT KHListView : public TDEListView { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( bool forceSelect READ forceSelect WRITE setForceSelect ) public: KHListView( TQWidget* parent_P, const char* name_P = NULL ); diff --git a/khotkeys/shared/settings.cpp b/khotkeys/shared/settings.cpp index 76adac6b9..becacd5d1 100644 --- a/khotkeys/shared/settings.cpp +++ b/khotkeys/shared/settings.cpp @@ -145,9 +145,11 @@ void Settings::write_settings() gestures_exclude->cfg_write( cfg ); } else + { cfg.deleteGroup( "GesturesExclude" ); - cfg.setGroup( "Voice" ); - cfg.writeEntry("Shortcut" , voice_shortcut.toStringInternal() ); + } + cfg.setGroup( "Voice" ); + cfg.writeEntry("Shortcut" , voice_shortcut.toStringInternal() ); } diff --git a/khotkeys/shared/soundrecorder.h b/khotkeys/shared/soundrecorder.h index c7e55fc22..5a770abbe 100644 --- a/khotkeys/shared/soundrecorder.h +++ b/khotkeys/shared/soundrecorder.h @@ -36,7 +36,7 @@ namespace KHotKeys */ class KDE_EXPORT SoundRecorder : public TQObject { -Q_OBJECT +TQ_OBJECT public: static SoundRecorder* create( TQObject* parent = 0, const char* name = 0 ); virtual ~SoundRecorder(); diff --git a/khotkeys/shared/triggers.cpp b/khotkeys/shared/triggers.cpp index 115bc6687..1b6e903b7 100644 --- a/khotkeys/shared/triggers.cpp +++ b/khotkeys/shared/triggers.cpp @@ -197,13 +197,13 @@ Window_trigger::~Window_trigger() void Window_trigger::init() { kdDebug( 1217 ) << "Window_trigger::init()" << endl; - connect( windows_handler, TQT_SIGNAL( window_added( WId )), this, TQT_SLOT( window_added( WId ))); - connect( windows_handler, TQT_SIGNAL( window_removed( WId )), this, TQT_SLOT( window_removed( WId ))); + connect( windows_handler, TQ_SIGNAL( window_added( WId )), this, TQ_SLOT( window_added( WId ))); + connect( windows_handler, TQ_SIGNAL( window_removed( WId )), this, TQ_SLOT( window_removed( WId ))); if( window_actions & ( WINDOW_ACTIVATES | WINDOW_DEACTIVATES /*| WINDOW_DISAPPEARS*/ )) - connect( windows_handler, TQT_SIGNAL( active_window_changed( WId )), - this, TQT_SLOT( active_window_changed( WId ))); - connect( windows_handler, TQT_SIGNAL( window_changed( WId, unsigned int )), - this, TQT_SLOT( window_changed( WId, unsigned int ))); + connect( windows_handler, TQ_SIGNAL( active_window_changed( WId )), + this, TQ_SLOT( active_window_changed( WId ))); + connect( windows_handler, TQ_SIGNAL( window_changed( WId, unsigned int )), + this, TQ_SLOT( window_changed( WId, unsigned int ))); } void Window_trigger::activate( bool activate_P ) @@ -277,6 +277,7 @@ void Window_trigger::window_changed( WId window_P, unsigned int dirty_P ) bool matches = windows()->match( Window_data( window_P )); existing_windows[ window_P ] = matches; if( active && matches && !was_match ) + { if( window_actions & WINDOW_APPEARS ) { windows_handler->set_action_window( window_P ); @@ -287,6 +288,7 @@ void Window_trigger::window_changed( WId window_P, unsigned int dirty_P ) windows_handler->set_action_window( window_P ); data->execute(); } + } kdDebug( 1217 ) << "Window_trigger::w_changed() : " << was_match << "|" << matches << endl; } @@ -333,7 +335,7 @@ Gesture_trigger::Gesture_trigger( TDEConfig& cfg_P, Action_data* data_P ) Gesture_trigger::~Gesture_trigger() { - gesture_handler->unregister_handler( this, TQT_SLOT( handle_gesture( const TQString&, WId ))); + gesture_handler->unregister_handler( this, TQ_SLOT( handle_gesture( const TQString&, WId ))); } void Gesture_trigger::cfg_write( TDEConfig& cfg_P ) const @@ -366,9 +368,9 @@ void Gesture_trigger::handle_gesture( const TQString &gesture_P, WId window_P ) void Gesture_trigger::activate( bool activate_P ) { if( activate_P ) - gesture_handler->register_handler( this, TQT_SLOT( handle_gesture( const TQString&, WId ))); + gesture_handler->register_handler( this, TQ_SLOT( handle_gesture( const TQString&, WId ))); else - gesture_handler->unregister_handler( this, TQT_SLOT( handle_gesture( const TQString&, WId ))); + gesture_handler->unregister_handler( this, TQ_SLOT( handle_gesture( const TQString&, WId ))); } diff --git a/khotkeys/shared/triggers.h b/khotkeys/shared/triggers.h index c74a3a54a..3ed2171f0 100644 --- a/khotkeys/shared/triggers.h +++ b/khotkeys/shared/triggers.h @@ -82,7 +82,7 @@ class KDE_EXPORT Shortcut_trigger class KDE_EXPORT Window_trigger : public TQObject, public Trigger { - Q_OBJECT + TQ_OBJECT typedef Trigger base; public: enum window_action_t @@ -124,7 +124,7 @@ class KDE_EXPORT Window_trigger class KDE_EXPORT Gesture_trigger : public TQObject, public Trigger { - Q_OBJECT + TQ_OBJECT typedef Trigger base; public: Gesture_trigger( Action_data* data_P, const TQString& gesture_P ); @@ -145,7 +145,7 @@ class KDE_EXPORT Gesture_trigger class KDE_EXPORT Voice_trigger : public TQObject, public Trigger { - Q_OBJECT + TQ_OBJECT typedef Trigger base; public: Voice_trigger( Action_data* data_P, const TQString& Voice_P, const VoiceSignature & signature1_P, const VoiceSignature & signature2_P ); diff --git a/khotkeys/shared/voices.cpp b/khotkeys/shared/voices.cpp index a31ac8237..031f75c78 100644 --- a/khotkeys/shared/voices.cpp +++ b/khotkeys/shared/voices.cpp @@ -95,7 +95,7 @@ void Voice::record_start() if(!_recorder) { _recorder= SoundRecorder::create(this); - connect(_recorder, TQT_SIGNAL(recorded(const Sound& )), this, TQT_SLOT(slot_sound_recorded(const Sound& ))); + connect(_recorder, TQ_SIGNAL(recorded(const Sound& )), this, TQ_SLOT(slot_sound_recorded(const Sound& ))); } _recorder->start(); @@ -208,7 +208,7 @@ void Voice::set_shortcut( const TDEShortcut &shortcut) _kga = new TDEGlobalAccel( this ); _kga->remove("voice"); - _kga->insert( "voice", i18n("Voice"), TQString::null, shortcut, 0, this, TQT_SLOT(slot_key_pressed())) ; + _kga->insert( "voice", i18n("Voice"), TQString::null, shortcut, 0, this, TQ_SLOT(slot_key_pressed())) ; _kga->updateConnections(); } @@ -224,7 +224,7 @@ void Voice::slot_key_pressed() if(!_timer) { _timer=new TQTimer(this); - connect(_timer, TQT_SIGNAL(timeout()) , this, TQT_SLOT(slot_timeout())); + connect(_timer, TQ_SIGNAL(timeout()) , this, TQ_SLOT(slot_timeout())); } _timer->start(1000*20,true); diff --git a/khotkeys/shared/voices.h b/khotkeys/shared/voices.h index ccd07563f..ccf7943fc 100644 --- a/khotkeys/shared/voices.h +++ b/khotkeys/shared/voices.h @@ -30,7 +30,7 @@ class VoiceSignature; class KDE_EXPORT Voice : public TQObject { - Q_OBJECT + TQ_OBJECT public: Voice( bool enabled_P, TQObject* parent_P ); virtual ~Voice(); diff --git a/khotkeys/shared/windows.cpp b/khotkeys/shared/windows.cpp index 077bf7b1d..e91e41df3 100644 --- a/khotkeys/shared/windows.cpp +++ b/khotkeys/shared/windows.cpp @@ -45,10 +45,10 @@ Windows::Windows( bool enable_signal_P, TQObject* parent_P ) windows_handler = this; if( signals_enabled ) { - connect( twin_module, TQT_SIGNAL( windowAdded( WId )), TQT_SLOT( window_added_slot( WId ))); - connect( twin_module, TQT_SIGNAL( windowRemoved( WId )), TQT_SLOT( window_removed_slot( WId ))); - connect( twin_module, TQT_SIGNAL( activeWindowChanged( WId )), - TQT_SLOT( active_window_changed_slot( WId ))); + connect( twin_module, TQ_SIGNAL( windowAdded( WId )), TQ_SLOT( window_added_slot( WId ))); + connect( twin_module, TQ_SIGNAL( windowRemoved( WId )), TQ_SLOT( window_removed_slot( WId ))); + connect( twin_module, TQ_SIGNAL( activeWindowChanged( WId )), + TQ_SLOT( active_window_changed_slot( WId ))); } } diff --git a/khotkeys/shared/windows.h b/khotkeys/shared/windows.h index 4fa403436..e9868e52b 100644 --- a/khotkeys/shared/windows.h +++ b/khotkeys/shared/windows.h @@ -37,7 +37,7 @@ class Windowdef_list; class KDE_EXPORT Windows : public TQObject { - Q_OBJECT + TQ_OBJECT public: Windows( bool enable_signals_P, TQObject* parent_P ); virtual ~Windows(); diff --git a/khotkeys/update/update.cpp b/khotkeys/update/update.cpp index 3368ee21e..19e503ac5 100644 --- a/khotkeys/update/update.cpp +++ b/khotkeys/update/update.cpp @@ -46,7 +46,7 @@ int main( int argc, char* argv[] ) kdWarning() << "File " << id << " not found!" << endl; return 1; } - init_global_data( false, TQT_TQOBJECT(&app) ); + init_global_data( false, &app ); Settings settings; settings.read_settings( true ); TDEConfig cfg( file, true ); |