diff options
Diffstat (limited to 'khotkeys/kcontrol')
57 files changed, 633 insertions, 633 deletions
diff --git a/khotkeys/kcontrol/action_group_tab.cpp b/khotkeys/kcontrol/action_group_tab.cpp index fbe681555..8a297b933 100644 --- a/khotkeys/kcontrol/action_group_tab.cpp +++ b/khotkeys/kcontrol/action_group_tab.cpp @@ -16,8 +16,8 @@ #include "action_group_tab.h" -#include <qlineedit.h> -#include <qcheckbox.h> +#include <tqlineedit.h> +#include <tqcheckbox.h> #include <klocale.h> #include <kmessagebox.h> @@ -31,23 +31,23 @@ namespace KHotKeys { -Action_group_tab::Action_group_tab( QWidget* parent_P , const char* name_P ) +Action_group_tab::Action_group_tab( TQWidget* parent_P , const char* name_P ) : Action_group_tab_ui( parent_P, name_P ) { clear_data(); // KHotKeys::Module::changed() - connect( action_name_lineedit, SIGNAL( textChanged( const QString& )), - module, SLOT( changed())); - connect( disable_checkbox, SIGNAL( clicked()), - module, SLOT( changed())); - connect( comment_multilineedit, SIGNAL( textChanged()), - module, SLOT( 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())); } void Action_group_tab::clear_data() { - disconnect( action_name_lineedit, SIGNAL( textChanged( const QString& )), this, - SLOT( action_group_name_changed( const QString& ))); + disconnect( action_name_lineedit, TQT_SIGNAL( textChanged( const TQString& )), this, + TQT_SLOT( action_group_name_changed( const TQString& ))); action_name_lineedit->clear(); action_name_lineedit->setReadOnly( false ); disable_checkbox->setChecked( false ); @@ -71,20 +71,20 @@ 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, SIGNAL( textChanged( const QString& )), this, - SLOT( action_group_name_changed( const QString& ))); + connect( action_name_lineedit, TQT_SIGNAL( textChanged( const TQString& )), this, + TQT_SLOT( action_group_name_changed( const TQString& ))); system_group = data_P->system_group(); } Action_data_group* Action_group_tab::get_data( Action_data_group* parent_P, Condition_list* conditions_P ) const { - QString name = action_name_lineedit->text(); + TQString name = action_name_lineedit->text(); return new Action_data_group( parent_P, name, comment_multilineedit->text(), conditions_P, system_group, !disable_checkbox->isChecked()); } -void Action_group_tab::action_group_name_changed( const QString& name_P ) +void Action_group_tab::action_group_name_changed( const TQString& name_P ) { module->action_name_changed( name_P ); } diff --git a/khotkeys/kcontrol/action_group_tab.h b/khotkeys/kcontrol/action_group_tab.h index aa5237073..970f16379 100644 --- a/khotkeys/kcontrol/action_group_tab.h +++ b/khotkeys/kcontrol/action_group_tab.h @@ -25,14 +25,14 @@ class Action_group_tab { Q_OBJECT public: - Action_group_tab( QWidget* parent_P = NULL, const char* name_P = NULL ); + Action_group_tab( TQWidget* parent_P = NULL, const char* name_P = NULL ); void set_data( const Action_data_group* data_P ); Action_data_group* get_data( Action_data_group* parent_P, Condition_list* conditions_P ) const; public slots: void clear_data(); protected slots: - virtual void action_group_name_changed( const QString& name_P ); + virtual void action_group_name_changed( const TQString& name_P ); protected: Action_data_group::system_group_t system_group; }; diff --git a/khotkeys/kcontrol/action_list_widget.cpp b/khotkeys/kcontrol/action_list_widget.cpp index c12a2df86..b32daca1f 100644 --- a/khotkeys/kcontrol/action_list_widget.cpp +++ b/khotkeys/kcontrol/action_list_widget.cpp @@ -17,10 +17,10 @@ #include "action_list_widget.h" #include <assert.h> -#include <qpopupmenu.h> -#include <qpushbutton.h> -#include <qheader.h> -#include <qlineedit.h> +#include <tqpopupmenu.h> +#include <tqpushbutton.h> +#include <tqheader.h> +#include <tqlineedit.h> #include <klocale.h> #include <kdebug.h> @@ -39,16 +39,16 @@ namespace KHotKeys // Action_list_widget -Action_list_widget::Action_list_widget( QWidget* parent_P, const char* name_P ) +Action_list_widget::Action_list_widget( TQWidget* parent_P, const char* name_P ) : Action_list_widget_ui( parent_P, name_P ), selected_item( NULL ) { - QPopupMenu* popup = new QPopupMenu; // CHECKME looks like setting parent doesn't work + TQPopupMenu* popup = new QPopupMenu; // CHECKME looks like setting parent doesn't work popup->insertItem( i18n( "Command/URL..." ), TYPE_COMMAND_URL_ACTION ); popup->insertItem( i18n( "K-Menu Entry..." ), TYPE_MENUENTRY_ACTION ); 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, SIGNAL( activated( int )), SLOT( new_selected( int ))); + connect( popup, TQT_SIGNAL( activated( int )), TQT_SLOT( new_selected( int ))); new_button->setPopup( popup ); actions_listview->header()->hide(); actions_listview->addColumn( "" ); @@ -58,20 +58,20 @@ Action_list_widget::Action_list_widget( QWidget* parent_P, const char* name_P ) modify_button->setEnabled( false ); delete_button->setEnabled( false ); clear_data(); - connect( actions_listview, SIGNAL( doubleClicked ( QListViewItem *, const QPoint &, int ) ), - this, SLOT( modify_pressed() ) ); + connect( actions_listview, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), + this, TQT_SLOT( modify_pressed() ) ); // KHotKeys::Module::changed() - connect( new_button, SIGNAL( clicked()), - module, SLOT( changed())); - connect( copy_button, SIGNAL( clicked()), - module, SLOT( changed())); - connect( modify_button, SIGNAL( clicked()), - module, SLOT( changed())); - connect( delete_button, SIGNAL( clicked()), - module, SLOT( changed())); - connect( comment_lineedit, SIGNAL( textChanged( const QString& )), - module, SLOT( 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())); } Action_list_widget::~Action_list_widget() @@ -105,7 +105,7 @@ Action_list* Action_list_widget::get_data( Action_data* data_P ) const { // CHECKME TODO hmm, tady to bude chtit asi i children :( Action_list* list = new Action_list( comment_lineedit->text()); - for( QListViewItem* pos = actions_listview->firstChild(); + for( TQListViewItem* pos = actions_listview->firstChild(); pos != NULL; pos = pos->nextSibling()) list->append( static_cast< Action_list_item* >( pos )->action()->copy( data_P )); @@ -168,7 +168,7 @@ void Action_list_widget::modify_pressed() edit_listview_item( selected_item ); } -void Action_list_widget::current_changed( QListViewItem* item_P ) +void Action_list_widget::current_changed( TQListViewItem* item_P ) { // if( item_P == selected_item ) // return; @@ -180,7 +180,7 @@ void Action_list_widget::current_changed( QListViewItem* item_P ) } Action_list_item* Action_list_widget::create_listview_item( Action* action_P, - QListView* parent1_P, QListViewItem* parent2_P, QListViewItem* after_P, bool copy_P ) + TQListView* parent1_P, TQListViewItem* parent2_P, TQListViewItem* after_P, bool copy_P ) { Action* new_win = copy_P ? action_P->copy( NULL ) : action_P; // CHECKME uz by nemelo byt treba @@ -229,9 +229,9 @@ void Action_list_widget::edit_listview_item( Action_list_item* item_P ) // Action_list_item -QString Action_list_item::text( int column_P ) const +TQString Action_list_item::text( int column_P ) const { - return column_P == 0 ? action()->description() : QString::null; + return column_P == 0 ? action()->description() : TQString::null; } Action_list_item::~Action_list_item() diff --git a/khotkeys/kcontrol/action_list_widget.h b/khotkeys/kcontrol/action_list_widget.h index f1f965db6..b49a1315a 100644 --- a/khotkeys/kcontrol/action_list_widget.h +++ b/khotkeys/kcontrol/action_list_widget.h @@ -11,7 +11,7 @@ #ifndef _ACTION_LIST_WIDGET_H_ #define _ACTION_LIST_WIDGET_H_ -#include <qlistview.h> +#include <tqlistview.h> #include <actions.h> #include <kdialogbase.h> @@ -36,15 +36,15 @@ class Action_list_widget { Q_OBJECT public: - Action_list_widget( QWidget* parent_P = NULL, const char* name_P = NULL ); + Action_list_widget( TQWidget* parent_P = NULL, const char* name_P = NULL ); virtual ~Action_list_widget(); void set_data( const Action_list* data_P ); Action_list* get_data( Action_data* data_P ) const; public slots: void clear_data(); protected: - Action_list_item* create_listview_item( Action* action_P, QListView* parent1_P, - QListViewItem* parent2_P, QListViewItem* after_P, bool copy_P ); + Action_list_item* create_listview_item( Action* action_P, TQListView* parent1_P, + 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 }; @@ -53,7 +53,7 @@ class Action_list_widget virtual void copy_pressed(); virtual void delete_pressed(); virtual void modify_pressed(); - virtual void current_changed( QListViewItem* item_P ); + virtual void current_changed( TQListViewItem* item_P ); protected: Action_list_item* selected_item; }; @@ -64,12 +64,12 @@ class Action_list_item : public QListViewItem { public: - Action_list_item( QListView* parent_P, Action* action_P ); - Action_list_item( QListViewItem* parent_P, Action* action_P ); - Action_list_item( QListView* parent_P, QListViewItem* after_P, Action* action_P ); - Action_list_item( QListViewItem* parent_P, QListViewItem* after_P, Action* action_P ); + Action_list_item( TQListView* parent_P, Action* action_P ); + Action_list_item( TQListViewItem* parent_P, Action* action_P ); + Action_list_item( TQListView* parent_P, TQListViewItem* after_P, Action* action_P ); + Action_list_item( TQListViewItem* parent_P, TQListViewItem* after_P, Action* action_P ); virtual ~Action_list_item(); - virtual QString text( int column_P ) const; + virtual TQString text( int column_P ) const; Action* action() const; void set_action( Action* action_P ); protected: @@ -155,28 +155,28 @@ class Activate_window_action_dialog // Action_list_item inline -Action_list_item::Action_list_item( QListView* parent_P, Action* action_P ) - : QListViewItem( parent_P ), _action( action_P ) +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( QListViewItem* parent_P, Action* action_P ) - : QListViewItem( parent_P ), _action( action_P ) +Action_list_item::Action_list_item( TQListViewItem* parent_P, Action* action_P ) + : TQListViewItem( parent_P ), _action( action_P ) { } inline -Action_list_item::Action_list_item( QListView* parent_P, QListViewItem* after_P, +Action_list_item::Action_list_item( TQListView* parent_P, TQListViewItem* after_P, Action* action_P ) - : QListViewItem( parent_P, after_P ), _action( action_P ) + : TQListViewItem( parent_P, after_P ), _action( action_P ) { } inline -Action_list_item::Action_list_item( QListViewItem* parent_P, QListViewItem* after_P, +Action_list_item::Action_list_item( TQListViewItem* parent_P, TQListViewItem* after_P, Action* action_P ) - : QListViewItem( parent_P, after_P ), _action( action_P ) + : TQListViewItem( parent_P, after_P ), _action( action_P ) { } diff --git a/khotkeys/kcontrol/actions_listview_widget.cpp b/khotkeys/kcontrol/actions_listview_widget.cpp index 4d0534e9d..5048289df 100644 --- a/khotkeys/kcontrol/actions_listview_widget.cpp +++ b/khotkeys/kcontrol/actions_listview_widget.cpp @@ -16,11 +16,11 @@ #include "actions_listview_widget.h" -#include <qheader.h> +#include <tqheader.h> #include <klocale.h> #include <kdebug.h> -#include <qdragobject.h> +#include <tqdragobject.h> #include <khlistview.h> #include <actions.h> @@ -31,7 +31,7 @@ namespace KHotKeys { -Actions_listview_widget::Actions_listview_widget( QWidget* parent_P, const char* name_P ) +Actions_listview_widget::Actions_listview_widget( TQWidget* parent_P, const char* name_P ) : Actions_listview_widget_ui( parent_P, name_P ), recent_item( NULL ), saved_current_item( NULL ) { @@ -39,14 +39,14 @@ Actions_listview_widget::Actions_listview_widget( QWidget* parent_P, const char* actions_listview->header()->hide(); actions_listview->addColumn( "" ); actions_listview->setRootIsDecorated( true ); // CHECKME - connect( actions_listview, SIGNAL( current_changed( QListViewItem* )), - SLOT( current_changed( QListViewItem* ))); - connect( actions_listview, SIGNAL( moved( QListViewItem*, QListViewItem*, QListViewItem* )), - SLOT( item_moved( QListViewItem*, QListViewItem*, QListViewItem* ))); + 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* ))); // KHotKeys::Module::changed() } -void Actions_listview_widget::action_name_changed( const QString& ) +void Actions_listview_widget::action_name_changed( const TQString& ) { current_action()->widthChanged( 0 ); actions_listview->repaintItem( current_action()); @@ -63,7 +63,7 @@ void Actions_listview_widget::set_action_data( Action_data_base* data_P, bool re saved_current_item->set_data( data_P ); } -void Actions_listview_widget::current_changed( QListViewItem* item_P ) +void Actions_listview_widget::current_changed( TQListViewItem* item_P ) { kdDebug( 1217 ) << "current_changed:" << item_P << endl; set_current_action( static_cast< Action_listview_item* >( item_P )); @@ -86,7 +86,7 @@ void Actions_listview_widget::set_current_action( Action_listview_item* item_P ) void Actions_listview_widget::new_action( Action_data_base* data_P ) { - QListViewItem* parent = NULL; + TQListViewItem* parent = NULL; if( current_action() != NULL ) { if( dynamic_cast< Action_data_group* >( current_action()->data()) != NULL ) @@ -104,9 +104,9 @@ void Actions_listview_widget::new_action( Action_data_base* data_P ) void Actions_listview_widget::delete_action() { -// while( QListViewItem* child = current_action()->firstChild()) +// while( TQListViewItem* child = current_action()->firstChild()) // delete child; -// QListViewItem* nw = current_action()->itemAbove(); +// TQListViewItem* nw = current_action()->itemAbove(); // if( nw == NULL ) // nw = current_action()->itemBelow(); delete saved_current_item; @@ -121,7 +121,7 @@ void Actions_listview_widget::delete_action() // saved_current_item = NULL; } -void Actions_listview_widget::item_moved( QListViewItem* item_P, QListViewItem*, QListViewItem* ) +void Actions_listview_widget::item_moved( TQListViewItem* item_P, TQListViewItem*, TQListViewItem* ) { Action_listview_item* item = static_cast< Action_listview_item* >( item_P ); Action_listview_item* parent = static_cast< Action_listview_item* >( item->parent()); @@ -154,8 +154,8 @@ void Actions_listview_widget::build_up_recursively( Action_data_group* parent_P, } } -Action_listview_item* Actions_listview_widget::create_item( QListViewItem* parent_P, - QListViewItem* after_P, Action_data_base* data_P ) +Action_listview_item* Actions_listview_widget::create_item( TQListViewItem* parent_P, + TQListViewItem* after_P, Action_data_base* data_P ) { if( parent_P != NULL ) return new Action_listview_item( parent_P, after_P, data_P ); @@ -165,7 +165,7 @@ Action_listview_item* Actions_listview_widget::create_item( QListViewItem* paren // Actions_listview -Actions_listview::Actions_listview( QWidget* parent_P, const char* name_P ) +Actions_listview::Actions_listview( TQWidget* parent_P, const char* name_P ) : KHListView( parent_P, name_P ), _widget( static_cast< Actions_listview_widget* >( parent_P->parent())) { // this relies on the way designer creates the .cpp file from .ui (yes, I'm lazy) @@ -177,9 +177,9 @@ Actions_listview::Actions_listview( QWidget* parent_P, const char* name_P ) // Action_listview_item -QString Action_listview_item::text( int column_P ) const +TQString Action_listview_item::text( int column_P ) const { - return column_P == 0 ? data()->name() : QString::null; + return column_P == 0 ? data()->name() : TQString::null; } // CHECKME poradne tohle zkontrolovat po tom prekopani diff --git a/khotkeys/kcontrol/actions_listview_widget.h b/khotkeys/kcontrol/actions_listview_widget.h index 4b0d937a3..b2d35c693 100644 --- a/khotkeys/kcontrol/actions_listview_widget.h +++ b/khotkeys/kcontrol/actions_listview_widget.h @@ -30,25 +30,25 @@ class Actions_listview_widget { Q_OBJECT public: - Actions_listview_widget( QWidget* parent_P = NULL, const char* name_P = NULL ); + 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; void set_action_data( Action_data_base* data_P, bool recent_action_P = false ); - void action_name_changed( const QString& name_P ); + void action_name_changed( const TQString& name_P ); void clear(); void build_up(); void new_action( Action_data_base* data_P ); void delete_action(); private: - Action_listview_item* create_item( QListViewItem* parent_P, QListViewItem* after_P, Action_data_base* data_P ); + Action_listview_item* create_item( TQListViewItem* parent_P, TQListViewItem* after_P, Action_data_base* data_P ); void build_up_recursively( Action_data_group* parent_P, Action_listview_item* item_parent_P ); Action_listview_item* recent_item; Action_listview_item* saved_current_item; private slots: - void item_moved( QListViewItem* item_P, QListViewItem* was_after_P, QListViewItem* after_P ); - void current_changed( QListViewItem* item_P ); + void item_moved( TQListViewItem* item_P, TQListViewItem* was_after_P, TQListViewItem* after_P ); + void current_changed( TQListViewItem* item_P ); signals: void current_action_changed(); }; @@ -58,7 +58,7 @@ class Actions_listview { Q_OBJECT public: - Actions_listview( QWidget* parent_P = NULL, const char* name_P = NULL ); + Actions_listview( TQWidget* parent_P = NULL, const char* name_P = NULL ); Actions_listview_widget* widget(); private: Actions_listview_widget* _widget; @@ -69,12 +69,12 @@ class Action_listview_item : public QListViewItem { public: - virtual QString text( int column_P ) const; + virtual TQString text( int column_P ) const; Action_data_base* data() const; void set_data( Action_data_base* data_P ); - Action_listview_item( QListView* parent_P, QListViewItem* after_P, + Action_listview_item( TQListView* parent_P, TQListViewItem* after_P, Action_data_base* data_P ); - Action_listview_item( QListViewItem* parent_P, QListViewItem* after_P, + Action_listview_item( TQListViewItem* parent_P, TQListViewItem* after_P, Action_data_base* data_P ); protected: Action_data_base* _data; // CHECKME doesn't own !!! @@ -117,18 +117,18 @@ Actions_listview_widget* Actions_listview::widget() // Action_listview_item inline -Action_listview_item::Action_listview_item( QListView* parent_P, QListViewItem* after_P, +Action_listview_item::Action_listview_item( TQListView* parent_P, TQListViewItem* after_P, Action_data_base* data_P ) - : QListViewItem( parent_P, after_P ), _data( data_P ) + : TQListViewItem( parent_P, after_P ), _data( data_P ) { if( dynamic_cast< Action_data_group* >( data_P )) setExpandable( true ); } inline -Action_listview_item::Action_listview_item( QListViewItem* parent_P, QListViewItem* after_P, +Action_listview_item::Action_listview_item( TQListViewItem* parent_P, TQListViewItem* after_P, Action_data_base* data_P ) - : QListViewItem( parent_P, after_P ), _data( data_P ) + : TQListViewItem( parent_P, after_P ), _data( data_P ) { if( dynamic_cast< Action_data_group* >( data_P )) setExpandable( true ); diff --git a/khotkeys/kcontrol/command_url_widget.cpp b/khotkeys/kcontrol/command_url_widget.cpp index 936ceca99..133913360 100644 --- a/khotkeys/kcontrol/command_url_widget.cpp +++ b/khotkeys/kcontrol/command_url_widget.cpp @@ -16,11 +16,11 @@ #include "command_url_widget.h" -#include <qpushbutton.h> -#include <qlineedit.h> +#include <tqpushbutton.h> +#include <tqlineedit.h> #include <klineedit.h> -#include <qcheckbox.h> -#include <qgroupbox.h> +#include <tqcheckbox.h> +#include <tqgroupbox.h> #include <kurlrequester.h> #include <actions.h> @@ -32,13 +32,13 @@ namespace KHotKeys { -Command_url_widget::Command_url_widget( QWidget* parent_P, const char* name_P ) +Command_url_widget::Command_url_widget( TQWidget* parent_P, const char* name_P ) : Command_url_widget_ui( parent_P, name_P ) { clear_data(); // KHotKeys::Module::changed() - connect( command_url_lineedit, SIGNAL( textChanged( const QString& )), - module, SLOT( changed())); + connect( command_url_lineedit, TQT_SIGNAL( textChanged( const TQString& )), + module, TQT_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 cc7e7430d..af9a9dc2a 100644 --- a/khotkeys/kcontrol/command_url_widget.h +++ b/khotkeys/kcontrol/command_url_widget.h @@ -24,7 +24,7 @@ class Command_url_widget { Q_OBJECT public: - Command_url_widget( QWidget* parent_P = NULL, const char* name_P = NULL ); + Command_url_widget( TQWidget* parent_P = NULL, const char* name_P = NULL ); void set_data( const Command_url_action* data_P ); Command_url_action* get_data( Action_data* data_P ) const; public slots: diff --git a/khotkeys/kcontrol/condition_list_widget.cpp b/khotkeys/kcontrol/condition_list_widget.cpp index 407798d58..0cce085ec 100644 --- a/khotkeys/kcontrol/condition_list_widget.cpp +++ b/khotkeys/kcontrol/condition_list_widget.cpp @@ -17,10 +17,10 @@ #include "condition_list_widget.h" #include <assert.h> -#include <qpushbutton.h> -#include <qheader.h> -#include <qlineedit.h> -#include <qpopupmenu.h> +#include <tqpushbutton.h> +#include <tqheader.h> +#include <tqlineedit.h> +#include <tqpopupmenu.h> #include <kdebug.h> #include <klocale.h> @@ -39,20 +39,20 @@ namespace KHotKeys // Condition_list_widget -Condition_list_widget::Condition_list_widget( QWidget* parent_P, const char* name_P ) +Condition_list_widget::Condition_list_widget( TQWidget* parent_P, const char* name_P ) : Condition_list_widget_ui( parent_P, name_P ), selected_item( NULL ) { conditions.setAutoDelete( true ); - QPopupMenu* popup = new QPopupMenu; // CHECKME looks like setting parent doesn't work + TQPopupMenu* popup = new QPopupMenu; // CHECKME looks like setting parent doesn't work popup->insertItem( i18n( "Active Window..." ), TYPE_ACTIVE_WINDOW ); popup->insertItem( i18n( "Existing Window..." ), TYPE_EXISTING_WINDOW ); 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, SIGNAL( doubleClicked ( QListViewItem *, const QPoint &, int ) ), - this, SLOT( modify_pressed() ) ); + connect( conditions_listview, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), + this, TQT_SLOT( modify_pressed() ) ); - connect( popup, SIGNAL( activated( int )), SLOT( new_selected( int ))); + connect( popup, TQT_SIGNAL( activated( int )), TQT_SLOT( new_selected( int ))); new_button->setPopup( popup ); conditions_listview->header()->hide(); conditions_listview->addColumn( "" ); @@ -64,16 +64,16 @@ Condition_list_widget::Condition_list_widget( QWidget* parent_P, const char* nam delete_button->setEnabled( false ); clear_data(); // KHotKeys::Module::changed() - connect( new_button, SIGNAL( clicked()), - module, SLOT( changed())); - connect( copy_button, SIGNAL( clicked()), - module, SLOT( changed())); - connect( modify_button, SIGNAL( clicked()), - module, SLOT( changed())); - connect( delete_button, SIGNAL( clicked()), - module, SLOT( changed())); - connect( comment_lineedit, SIGNAL( textChanged( const QString& )), - module, SLOT( 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())); } Condition_list_widget::~Condition_list_widget() @@ -106,7 +106,7 @@ void Condition_list_widget::set_data( const Condition_list* data_P ) } void Condition_list_widget::insert_listview_items( const Condition_list_base* parent_P, - QListView* parent1_P, Condition_list_item* parent2_P ) + TQListView* parent1_P, Condition_list_item* parent2_P ) { Condition_list_item* prev = NULL; for( Condition_list_base::Iterator it( *parent_P ); @@ -132,10 +132,10 @@ Condition_list* Condition_list_widget::get_data( Action_data_base* data_P ) cons } void Condition_list_widget::get_listview_items( Condition_list_base* list_P, - QListViewItem* first_item_P ) const + TQListViewItem* first_item_P ) const { list_P->clear(); - for( QListViewItem* pos = first_item_P; + for( TQListViewItem* pos = first_item_P; pos != NULL; pos = pos->nextSibling()) { @@ -156,7 +156,7 @@ void Condition_list_widget::new_selected( int type_P ) if( tmp && tmp->accepts_children()) { int ret = KMessageBox::questionYesNoCancel( NULL, - i18n( "A group is selected.\nAdd the new condition in this selected group?" ), QString::null, i18n("Add in Group"), i18n("Ignore Group")); + i18n( "A group is selected.\nAdd the new condition in this selected group?" ), TQString::null, i18n("Add in Group"), i18n("Ignore Group")); if( ret == KMessageBox::Cancel ) return; else if( ret == KMessageBox::Yes ) @@ -239,7 +239,7 @@ void Condition_list_widget::modify_pressed() edit_listview_item( selected_item ); } -void Condition_list_widget::current_changed( QListViewItem* item_P ) +void Condition_list_widget::current_changed( TQListViewItem* item_P ) { // if( item_P == selected_item ) // return; @@ -263,7 +263,7 @@ void Condition_list_widget::current_changed( QListViewItem* item_P ) } Condition_list_item* Condition_list_widget::create_listview_item( Condition* condition_P, - QListView* parent1_P, Condition_list_item* parent2_P, QListViewItem* after_P, bool copy_P ) + TQListView* parent1_P, Condition_list_item* parent2_P, TQListViewItem* after_P, bool copy_P ) { #ifdef KHOTKEYS_DEBUG kdDebug( 1217 ) << "Condition_list_widget::create_listview_item():" << endl; @@ -339,9 +339,9 @@ void Condition_list_widget::edit_listview_item( Condition_list_item* item_P ) // Condition_list_item -QString Condition_list_item::text( int column_P ) const +TQString Condition_list_item::text( int column_P ) const { - return column_P == 0 ? condition()->description() : QString::null; + return column_P == 0 ? condition()->description() : TQString::null; } // Active_window_condition_dialog diff --git a/khotkeys/kcontrol/condition_list_widget.h b/khotkeys/kcontrol/condition_list_widget.h index e24739763..9dd441ae3 100644 --- a/khotkeys/kcontrol/condition_list_widget.h +++ b/khotkeys/kcontrol/condition_list_widget.h @@ -11,8 +11,8 @@ #ifndef _CONDITIONS_LIST_WIDGET_H_ #define _CONDITIONS_LIST_WIDGET_H_ -#include <qlistview.h> -#include <qptrlist.h> +#include <tqlistview.h> +#include <tqptrlist.h> #include <kdialogbase.h> @@ -32,15 +32,15 @@ class Condition_list_widget { Q_OBJECT public: - Condition_list_widget( QWidget* parent_P = NULL, const char* name_P = NULL ); + Condition_list_widget( TQWidget* parent_P = NULL, const char* name_P = NULL ); virtual ~Condition_list_widget(); void set_data( const Condition_list* data_P ); Condition_list* get_data( Action_data_base* data_P ) const; public slots: void clear_data(); protected: - Condition_list_item* create_listview_item( Condition* condition_P, QListView* parent1_P, - Condition_list_item* parent2_P, QListViewItem* after_P, bool copy_P ); + Condition_list_item* create_listview_item( Condition* condition_P, TQListView* parent1_P, + Condition_list_item* parent2_P, TQListViewItem* after_P, bool copy_P ); void edit_listview_item( Condition_list_item* item_P ); enum type_t { TYPE_ACTIVE_WINDOW, TYPE_EXISTING_WINDOW, TYPE_NOT, TYPE_AND, TYPE_OR }; protected slots: @@ -48,13 +48,13 @@ class Condition_list_widget virtual void copy_pressed(); virtual void delete_pressed(); virtual void modify_pressed(); - virtual void current_changed( QListViewItem* item_P ); + virtual void current_changed( TQListViewItem* item_P ); private: void insert_listview_items( const Condition_list_base* parent_P, - QListView* parent1_P, Condition_list_item* parent2_P ); - void get_listview_items( Condition_list_base* list_P, QListViewItem* first_item_P ) const; + TQListView* parent1_P, Condition_list_item* parent2_P ); + void get_listview_items( Condition_list_base* list_P, TQListViewItem* first_item_P ) const; Condition_list_item* selected_item; - QPtrList< Condition > conditions; + TQPtrList< Condition > conditions; }; typedef Condition_list_widget Condition_list_tab; @@ -63,12 +63,12 @@ class Condition_list_item : public QListViewItem { public: - Condition_list_item( QListView* parent_P, Condition* condition_P ); - Condition_list_item( QListViewItem* parent_P, Condition* condition_P ); - Condition_list_item( QListView* parent_P, QListViewItem* after_P, Condition* condition_P ); - Condition_list_item( QListViewItem* parent_P, QListViewItem* after_P, + Condition_list_item( TQListView* parent_P, Condition* condition_P ); + Condition_list_item( TQListViewItem* parent_P, Condition* condition_P ); + Condition_list_item( TQListView* parent_P, TQListViewItem* after_P, Condition* condition_P ); + Condition_list_item( TQListViewItem* parent_P, TQListViewItem* after_P, Condition* condition_P ); - virtual QString text( int column_P ) const; + virtual TQString text( int column_P ) const; Condition* condition() const; void set_condition( Condition* condition_P ); protected: @@ -116,28 +116,28 @@ class Existing_window_condition_dialog // Condition_list_item inline -Condition_list_item::Condition_list_item( QListView* parent_P, Condition* condition_P ) - : QListViewItem( parent_P ), _condition( condition_P ) +Condition_list_item::Condition_list_item( TQListView* parent_P, Condition* condition_P ) + : TQListViewItem( parent_P ), _condition( condition_P ) { } inline -Condition_list_item::Condition_list_item( QListViewItem* parent_P, Condition* condition_P ) - : QListViewItem( parent_P ), _condition( condition_P ) +Condition_list_item::Condition_list_item( TQListViewItem* parent_P, Condition* condition_P ) + : TQListViewItem( parent_P ), _condition( condition_P ) { } inline -Condition_list_item::Condition_list_item( QListView* parent_P, QListViewItem* after_P, +Condition_list_item::Condition_list_item( TQListView* parent_P, TQListViewItem* after_P, Condition* condition_P ) - : QListViewItem( parent_P, after_P ), _condition( condition_P ) + : TQListViewItem( parent_P, after_P ), _condition( condition_P ) { } inline -Condition_list_item::Condition_list_item( QListViewItem* parent_P, QListViewItem* after_P, +Condition_list_item::Condition_list_item( TQListViewItem* parent_P, TQListViewItem* after_P, Condition* condition_P ) - : QListViewItem( parent_P, after_P ), _condition( condition_P ) + : TQListViewItem( parent_P, after_P ), _condition( condition_P ) { } diff --git a/khotkeys/kcontrol/dcop_widget.cpp b/khotkeys/kcontrol/dcop_widget.cpp index 6cc8773a1..a410109fd 100644 --- a/khotkeys/kcontrol/dcop_widget.cpp +++ b/khotkeys/kcontrol/dcop_widget.cpp @@ -16,8 +16,8 @@ #include "dcop_widget.h" -#include <qlineedit.h> -#include <qpushbutton.h> +#include <tqlineedit.h> +#include <tqpushbutton.h> #include <krun.h> #include <kmessagebox.h> @@ -30,20 +30,20 @@ namespace KHotKeys { -Dcop_widget::Dcop_widget( QWidget* parent_P, const char* name_P ) +Dcop_widget::Dcop_widget( TQWidget* parent_P, const char* name_P ) : Dcop_widget_ui( parent_P, name_P ) { clear_data(); try_button->setText( i18n( "to try", "&Try" )); // Qt designer can't do this // KHotKeys::Module::changed() - connect( remote_app_lineedit, SIGNAL( textChanged( const QString& )), - module, SLOT( changed())); - connect( remote_object_lineedit, SIGNAL( textChanged( const QString& )), - module, SLOT( changed())); - connect( called_function_lineedit, SIGNAL( textChanged( const QString& )), - module, SLOT( changed())); - connect( arguments_lineedit, SIGNAL( textChanged( const QString& )), - module, SLOT( 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())); } void Dcop_widget::clear_data() diff --git a/khotkeys/kcontrol/dcop_widget.h b/khotkeys/kcontrol/dcop_widget.h index 83cb6fabe..43523f00d 100644 --- a/khotkeys/kcontrol/dcop_widget.h +++ b/khotkeys/kcontrol/dcop_widget.h @@ -24,7 +24,7 @@ class Dcop_widget { Q_OBJECT public: - Dcop_widget( QWidget* parent_P = NULL, const char* name_P = NULL ); + Dcop_widget( TQWidget* parent_P = NULL, const char* name_P = NULL ); void set_data( const Dcop_action* data_P ); Dcop_action* get_data( Action_data* data_P ) const; public slots: diff --git a/khotkeys/kcontrol/general_settings_tab.cpp b/khotkeys/kcontrol/general_settings_tab.cpp index 77a262a31..cf2337446 100644 --- a/khotkeys/kcontrol/general_settings_tab.cpp +++ b/khotkeys/kcontrol/general_settings_tab.cpp @@ -16,19 +16,19 @@ #include "general_settings_tab.h" -#include <qcheckbox.h> +#include <tqcheckbox.h> #include "kcmkhotkeys.h" namespace KHotKeys { -General_settings_tab::General_settings_tab( QWidget* parent_P, const char* name_P ) +General_settings_tab::General_settings_tab( TQWidget* parent_P, const char* name_P ) : General_settings_tab_ui( parent_P, name_P ) { // KHotKeys::Module::changed() - connect( disable_daemon_checkbox, SIGNAL( clicked()), - module, SLOT( changed())); + connect( disable_daemon_checkbox, TQT_SIGNAL( clicked()), + module, TQT_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 5140b1110..8bcd5cd21 100644 --- a/khotkeys/kcontrol/general_settings_tab.h +++ b/khotkeys/kcontrol/general_settings_tab.h @@ -21,7 +21,7 @@ class General_settings_tab { Q_OBJECT public: - General_settings_tab( QWidget* parent = NULL, const char* name = NULL ); + General_settings_tab( TQWidget* parent = NULL, const char* name = NULL ); void read_data(); void write_data() const; public slots: diff --git a/khotkeys/kcontrol/general_tab.cpp b/khotkeys/kcontrol/general_tab.cpp index 8c7025e69..dcc4301b5 100644 --- a/khotkeys/kcontrol/general_tab.cpp +++ b/khotkeys/kcontrol/general_tab.cpp @@ -16,9 +16,9 @@ #include "general_tab.h" -#include <qlineedit.h> -#include <qcheckbox.h> -#include <qcombobox.h> +#include <tqlineedit.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> #include <klocale.h> #include <kdebug.h> @@ -33,7 +33,7 @@ namespace KHotKeys { -General_tab::General_tab( QWidget* parent_P, const char* name_P ) +General_tab::General_tab( TQWidget* parent_P, const char* name_P ) : General_tab_ui( parent_P, name_P ) { for( Tab_widget::action_type_t i = Tab_widget::TYPE_FIRST; @@ -73,22 +73,22 @@ General_tab::General_tab( QWidget* parent_P, const char* name_P ) } clear_data(); // KHotKeys::Module::changed() - connect( action_name_lineedit, SIGNAL( textChanged( const QString& )), - module, SLOT( changed())); - connect( disable_checkbox, SIGNAL( clicked()), - module, SLOT( changed())); - connect( comment_multilineedit, SIGNAL( textChanged()), - module, SLOT( changed())); - connect( action_type_combo, SIGNAL( activated( int )), - module, SLOT( 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())); } void General_tab::clear_data() { - disconnect( action_name_lineedit, SIGNAL( textChanged( const QString& )), - this, SLOT( action_name_changed( const QString& ))); - disconnect( action_type_combo, SIGNAL( activated( int )), - this, SIGNAL( action_type_changed( int ))); // CHECKME neodpoji to sloty od nej ? + 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 ? action_name_lineedit->clear(); disable_checkbox->setChecked( false ); disable_checkbox->setText( i18n( "&Disable" )); @@ -113,20 +113,20 @@ 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, SIGNAL( textChanged( const QString& )), - SLOT( action_name_changed( const QString& ))); - connect( action_type_combo, SIGNAL( activated( int )), - SIGNAL( action_type_changed( int ))); + 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 ))); } -void General_tab::get_data( QString& name_O, QString& comment_O, bool& enabled_O ) +void General_tab::get_data( TQString& name_O, TQString& comment_O, bool& enabled_O ) { name_O = action_name_lineedit->text(); comment_O = comment_multilineedit->text(); enabled_O = !disable_checkbox->isChecked(); } -void General_tab::action_name_changed( const QString& name_P ) +void General_tab::action_name_changed( const TQString& name_P ) { module->action_name_changed( name_P ); } diff --git a/khotkeys/kcontrol/general_tab.h b/khotkeys/kcontrol/general_tab.h index f9096b3ad..58f670a68 100644 --- a/khotkeys/kcontrol/general_tab.h +++ b/khotkeys/kcontrol/general_tab.h @@ -27,15 +27,15 @@ class General_tab { Q_OBJECT public: - General_tab( QWidget* parent_P = NULL, const char* name_P = NULL ); + General_tab( TQWidget* parent_P = NULL, const char* name_P = NULL ); void set_data( const Action_data* data_P ); - void get_data( QString& name_O, QString& comment_O, bool& enabled_O ); + void get_data( TQString& name_O, TQString& comment_O, bool& enabled_O ); public slots: void clear_data(); signals: void action_type_changed( int type_P ); protected slots: - void action_name_changed( const QString& name_P ); + void action_name_changed( const TQString& name_P ); }; //*************************************************************************** diff --git a/khotkeys/kcontrol/gesture_triggers_tab.cpp b/khotkeys/kcontrol/gesture_triggers_tab.cpp index bfcad0295..b00f60963 100644 --- a/khotkeys/kcontrol/gesture_triggers_tab.cpp +++ b/khotkeys/kcontrol/gesture_triggers_tab.cpp @@ -16,8 +16,8 @@ #include "gesture_triggers_tab.h" -#include <qpushbutton.h> -#include <qlineedit.h> +#include <tqpushbutton.h> +#include <tqlineedit.h> #include <triggers.h> #include <actions.h> @@ -30,28 +30,28 @@ namespace KHotKeys { -Gesture_triggers_tab::Gesture_triggers_tab( QWidget* parent_P, const char* name_P ) +Gesture_triggers_tab::Gesture_triggers_tab( TQWidget* parent_P, const char* name_P ) : Gesture_triggers_tab_ui( parent_P, name_P ) { clear_data(); // KHotKeys::Module::changed() - connect( gesture_edit_button1, SIGNAL( clicked()), - module, SLOT( changed())); - connect( gesture_edit_button2, SIGNAL( clicked()), - module, SLOT( changed())); - connect( gesture_edit_button3, SIGNAL( clicked()), - module, SLOT( 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())); } void Gesture_triggers_tab::clear_data() { - gesture1 = gesture2 = gesture3 = QString::null; + gesture1 = gesture2 = gesture3 = TQString::null; gesture_lineedit1->clear(); gesture_lineedit2->clear(); gesture_lineedit3->clear(); - gesture_drawer1->setData( QString::null ); - gesture_drawer2->setData( QString::null ); - gesture_drawer3->setData( QString::null ); + gesture_drawer1->setData( TQString::null ); + gesture_drawer2->setData( TQString::null ); + gesture_drawer3->setData( TQString::null ); } void Gesture_triggers_tab::set_data( const Trigger_list* triggers_P ) @@ -70,7 +70,7 @@ void Gesture_triggers_tab::set_data( const Trigger_list* triggers_P ) } else trig = NULL; - gesture1 = trig ? trig->gesturecode() : QString::null; + gesture1 = trig ? trig->gesturecode() : TQString::null; gesture_lineedit1->setText( gesture1 ); gesture_drawer1->setData( gesture1 ); ++it; @@ -81,7 +81,7 @@ void Gesture_triggers_tab::set_data( const Trigger_list* triggers_P ) } else trig = NULL; - gesture2 = trig ? trig->gesturecode() : QString::null; + gesture2 = trig ? trig->gesturecode() : TQString::null; gesture_lineedit2->setText( gesture2 ); gesture_drawer2->setData( gesture2 ); ++it; @@ -92,7 +92,7 @@ void Gesture_triggers_tab::set_data( const Trigger_list* triggers_P ) } else trig = NULL; - gesture3 = trig ? trig->gesturecode() : QString::null; + gesture3 = trig ? trig->gesturecode() : TQString::null; gesture_lineedit3->setText( gesture3 ); gesture_drawer3->setData( gesture3 ); } @@ -135,20 +135,20 @@ void Gesture_triggers_tab::edit_gesture_pressed3() // Gesture_edit_dialog -Gesture_edit_dialog::Gesture_edit_dialog( const QString& gesture_P ) +Gesture_edit_dialog::Gesture_edit_dialog( const TQString& gesture_P ) : KDialogBase( NULL, NULL, true, "", Ok | Cancel ), // CHECKME caption _gesture( gesture_P ), _page( NULL ) { _page = new GestureRecordPage( _gesture, this, "GestureRecordPage"); -// connect(_page, SIGNAL(gestureRecorded(bool)), // allow clearing the gesture -// this, SLOT(enableButtonOK(bool))); +// connect(_page, TQT_SIGNAL(gestureRecorded(bool)), // allow clearing the gesture +// this, TQT_SLOT(enableButtonOK(bool))); setMainWidget( _page ); } -QString Gesture_edit_dialog::edit_gesture() +TQString Gesture_edit_dialog::edit_gesture() { if( exec()) return _page->getGesture(); diff --git a/khotkeys/kcontrol/gesture_triggers_tab.h b/khotkeys/kcontrol/gesture_triggers_tab.h index 1bdaaf694..c11787d03 100644 --- a/khotkeys/kcontrol/gesture_triggers_tab.h +++ b/khotkeys/kcontrol/gesture_triggers_tab.h @@ -13,7 +13,7 @@ #include <gesture_triggers_tab_ui.h> -#include <qstring.h> +#include <tqstring.h> #include <kdialogbase.h> @@ -28,7 +28,7 @@ class Gesture_triggers_tab { Q_OBJECT public: - Gesture_triggers_tab( QWidget* parent_P = NULL, const char* name_P = NULL ); + Gesture_triggers_tab( TQWidget* parent_P = NULL, const char* name_P = NULL ); void set_data( const Trigger_list* triggers_P ); Trigger_list* get_data( Action_data* data_P ) const; protected: @@ -38,7 +38,7 @@ class Gesture_triggers_tab public slots: void clear_data(); private: - QString gesture1, gesture2, gesture3; + TQString gesture1, gesture2, gesture3; }; class GestureRecordPage; @@ -48,11 +48,11 @@ class Gesture_edit_dialog { Q_OBJECT public: - Gesture_edit_dialog( const QString& gesture_P ); - QString edit_gesture(); + Gesture_edit_dialog( const TQString& gesture_P ); + TQString edit_gesture(); private: // CHECKME accept() ? - QString _gesture; + TQString _gesture; GestureRecordPage *_page; }; diff --git a/khotkeys/kcontrol/gesturedrawer.cpp b/khotkeys/kcontrol/gesturedrawer.cpp index 646d2e469..817eeab89 100644 --- a/khotkeys/kcontrol/gesturedrawer.cpp +++ b/khotkeys/kcontrol/gesturedrawer.cpp @@ -9,19 +9,19 @@ ****************************************************************************/ -#include <qcolor.h> -#include <qpainter.h> +#include <tqcolor.h> +#include <tqpainter.h> #include "gesturedrawer.h" namespace KHotKeys { -GestureDrawer::GestureDrawer(QWidget *parent, const char *name) - : QFrame(parent, name), _data(QString::null) +GestureDrawer::GestureDrawer(TQWidget *parent, const char *name) + : TQFrame(parent, name), _data(TQString::null) { setBackgroundColor( colorGroup().base()); - setFrameStyle(QFrame::Panel | QFrame::Sunken); + setFrameStyle(TQFrame::Panel | TQFrame::Sunken); setMinimumSize(30, 30); } @@ -29,31 +29,31 @@ GestureDrawer::~GestureDrawer() { } -void GestureDrawer::setData(const QString &data) +void GestureDrawer::setData(const TQString &data) { _data = data; repaint(); } -void GestureDrawer::paintEvent(QPaintEvent *ev) +void GestureDrawer::paintEvent(TQPaintEvent *ev) { // Iterate through the data points and draw a line to each of them Q_UINT32 startCell = 0; Q_UINT32 endCell = 0; - QPoint startPoint; - QPoint endPoint; + TQPoint startPoint; + TQPoint endPoint; - QPainter p(this); + TQPainter p(this); if (_data.length() > 0) { - startCell = QString(_data[0]).toUInt(); + startCell = TQString(_data[0]).toUInt(); } for (Q_UINT32 index = 1; index < _data.length(); ++index) { - endCell = QString(_data[index]).toUInt(); + endCell = TQString(_data[index]).toUInt(); startPoint = lookupCellCoords(startCell); endPoint = lookupCellCoords(endCell); @@ -63,7 +63,7 @@ void GestureDrawer::paintEvent(QPaintEvent *ev) // Draw something to show the starting point p.drawRect(startPoint.x()-2, startPoint.y()-2, 4, 4); p.fillRect(startPoint.x()-2, startPoint.y()-2, 4, 4, - QBrush(black)); + TQBrush(black)); } p.drawLine(startPoint, endPoint); @@ -74,10 +74,10 @@ void GestureDrawer::paintEvent(QPaintEvent *ev) p.end(); - QFrame::paintEvent(ev); + TQFrame::paintEvent(ev); } -QPoint GestureDrawer::lookupCellCoords(Q_UINT32 cell) +TQPoint GestureDrawer::lookupCellCoords(Q_UINT32 cell) { // First divide the widget into thirds, horizontally and vertically Q_UINT32 w = width(); @@ -89,38 +89,38 @@ QPoint GestureDrawer::lookupCellCoords(Q_UINT32 cell) switch(cell) { case 1: - return QPoint(wThird/2, 2*hThird+hThird/2); + return TQPoint(wThird/2, 2*hThird+hThird/2); case 2: - return QPoint(wThird+wThird/2, 2*hThird+hThird/2); + return TQPoint(wThird+wThird/2, 2*hThird+hThird/2); case 3: - return QPoint(2*wThird+wThird/2, 2*hThird+hThird/2); + return TQPoint(2*wThird+wThird/2, 2*hThird+hThird/2); case 4: - return QPoint(wThird/2, hThird+hThird/2); + return TQPoint(wThird/2, hThird+hThird/2); case 5: - return QPoint(wThird+wThird/2, hThird+hThird/2); + return TQPoint(wThird+wThird/2, hThird+hThird/2); case 6: - return QPoint(2*wThird+wThird/2, hThird+hThird/2); + return TQPoint(2*wThird+wThird/2, hThird+hThird/2); case 7: - return QPoint(wThird/2, hThird/2); + return TQPoint(wThird/2, hThird/2); case 8: - return QPoint(wThird+wThird/2, hThird/2); + return TQPoint(wThird+wThird/2, hThird/2); case 9: - return QPoint(2*wThird+wThird/2, hThird/2); + return TQPoint(2*wThird+wThird/2, hThird/2); } - return QPoint(0, 0); + return TQPoint(0, 0); } -void GestureDrawer::drawArrowHead(QPoint &start, QPoint &end, - QPainter &p) +void GestureDrawer::drawArrowHead(TQPoint &start, TQPoint &end, + TQPainter &p) { int deltaX = end.x() - start.x(); int deltaY = end.y() - start.y(); @@ -134,8 +134,8 @@ void GestureDrawer::drawArrowHead(QPoint &start, QPoint &end, else offset = 3; - p.drawLine(QPoint(end.x()+offset, end.y()+2), end); - p.drawLine(QPoint(end.x()+offset, end.y()-2), end); + p.drawLine(TQPoint(end.x()+offset, end.y()+2), end); + p.drawLine(TQPoint(end.x()+offset, end.y()-2), end); } else if (deltaX == 0) { @@ -146,8 +146,8 @@ void GestureDrawer::drawArrowHead(QPoint &start, QPoint &end, else offset = +3; - p.drawLine(QPoint(end.x()+2, end.y()+offset), end); - p.drawLine(QPoint(end.x()-2, end.y()+offset), end); + p.drawLine(TQPoint(end.x()+2, end.y()+offset), end); + p.drawLine(TQPoint(end.x()-2, end.y()+offset), end); } else { diff --git a/khotkeys/kcontrol/gesturedrawer.h b/khotkeys/kcontrol/gesturedrawer.h index bcc8ba7e8..50fe5db67 100644 --- a/khotkeys/kcontrol/gesturedrawer.h +++ b/khotkeys/kcontrol/gesturedrawer.h @@ -12,12 +12,12 @@ #ifndef GESTURE_DRAWER_H #define GESTURE_DRAWER_H -#include <qframe.h> -#include <qstring.h> -#include <qevent.h> -#include <qpoint.h> -#include <qwidget.h> -#include <qsize.h> +#include <tqframe.h> +#include <tqstring.h> +#include <tqevent.h> +#include <tqpoint.h> +#include <tqwidget.h> +#include <tqsize.h> namespace KHotKeys { @@ -26,23 +26,23 @@ class GestureDrawer : public QFrame { Q_OBJECT public: - GestureDrawer(QWidget *parent, const char *name); + GestureDrawer(TQWidget *parent, const char *name); ~GestureDrawer(); - void setData(const QString &data); + void setData(const TQString &data); - virtual QSize sizeHint() const { return QSize(30, 30); } + virtual TQSize sizeHint() const { return TQSize(30, 30); } protected: - void paintEvent(QPaintEvent *ev); + void paintEvent(TQPaintEvent *ev); private: - QPoint lookupCellCoords(Q_UINT32 cell); - void drawArrowHead(QPoint &start, QPoint &end, - QPainter &p); + TQPoint lookupCellCoords(Q_UINT32 cell); + void drawArrowHead(TQPoint &start, TQPoint &end, + TQPainter &p); - QString _data; + TQString _data; }; } // namespace KHotKeys diff --git a/khotkeys/kcontrol/gesturerecorder.cpp b/khotkeys/kcontrol/gesturerecorder.cpp index d14614c77..58a177910 100644 --- a/khotkeys/kcontrol/gesturerecorder.cpp +++ b/khotkeys/kcontrol/gesturerecorder.cpp @@ -9,19 +9,19 @@ ****************************************************************************/ -#include <qcolor.h> -#include <qevent.h> +#include <tqcolor.h> +#include <tqevent.h> #include "gesturerecorder.h" namespace KHotKeys { -GestureRecorder::GestureRecorder(QWidget *parent, const char *name) - : QFrame(parent, name), _mouseButtonDown(false) +GestureRecorder::GestureRecorder(TQWidget *parent, const char *name) + : TQFrame(parent, name), _mouseButtonDown(false) { setBackgroundColor( colorGroup().base()); - setFrameStyle(QFrame::Sunken | QFrame::Panel); + setFrameStyle(TQFrame::Sunken | TQFrame::Panel); setLineWidth(2); setMidLineWidth(0); } @@ -30,34 +30,34 @@ GestureRecorder::~GestureRecorder() { } -void GestureRecorder::mousePressEvent(QMouseEvent *ev) +void GestureRecorder::mousePressEvent(TQMouseEvent *ev) { - if (ev->button() == QMouseEvent::LeftButton) + if (ev->button() == TQMouseEvent::LeftButton) { _mouseButtonDown = true; stroke.reset(); - QPoint pos = ev->pos(); + TQPoint pos = ev->pos(); stroke.record(pos.x(), pos.y()); } } -void GestureRecorder::mouseReleaseEvent(QMouseEvent *ev) +void GestureRecorder::mouseReleaseEvent(TQMouseEvent *ev) { - if ((ev->button() == QMouseEvent::LeftButton) && (_mouseButtonDown)) + if ((ev->button() == TQMouseEvent::LeftButton) && (_mouseButtonDown)) { - QPoint pos = ev->pos(); + TQPoint pos = ev->pos(); stroke.record(pos.x(), pos.y()); - QString data( stroke.translate()); + TQString data( stroke.translate()); if( !data.isEmpty()) emit recorded(data); } } -void GestureRecorder::mouseMoveEvent(QMouseEvent *ev) +void GestureRecorder::mouseMoveEvent(TQMouseEvent *ev) { if (_mouseButtonDown) { - QPoint pos = ev->pos(); + TQPoint pos = ev->pos(); stroke.record(pos.x(), pos.y()); } } diff --git a/khotkeys/kcontrol/gesturerecorder.h b/khotkeys/kcontrol/gesturerecorder.h index 707243d81..a995a5531 100644 --- a/khotkeys/kcontrol/gesturerecorder.h +++ b/khotkeys/kcontrol/gesturerecorder.h @@ -12,8 +12,8 @@ #ifndef GESTURE_RECORDER_H #define GESTURE_RECORDER_H -#include <qframe.h> -#include <qstring.h> +#include <tqframe.h> +#include <tqstring.h> #include <gestures.h> @@ -27,16 +27,16 @@ class GestureRecorder : public QFrame Q_OBJECT public: - GestureRecorder(QWidget *parent, const char *name); + GestureRecorder(TQWidget *parent, const char *name); ~GestureRecorder(); protected: - void mousePressEvent(QMouseEvent *); - void mouseReleaseEvent(QMouseEvent *); - void mouseMoveEvent(QMouseEvent *); + void mousePressEvent(TQMouseEvent *); + void mouseReleaseEvent(TQMouseEvent *); + void mouseMoveEvent(TQMouseEvent *); signals: - void recorded(const QString &data); + void recorded(const TQString &data); private: bool _mouseButtonDown; diff --git a/khotkeys/kcontrol/gesturerecordpage.cpp b/khotkeys/kcontrol/gesturerecordpage.cpp index e24beaaf3..af2fb8cdc 100644 --- a/khotkeys/kcontrol/gesturerecordpage.cpp +++ b/khotkeys/kcontrol/gesturerecordpage.cpp @@ -9,9 +9,9 @@ ****************************************************************************/ -#include <qwidget.h> -#include <qlabel.h> -#include <qpushbutton.h> +#include <tqwidget.h> +#include <tqlabel.h> +#include <tqpushbutton.h> #include <klocale.h> #include <kmessagebox.h> @@ -23,14 +23,14 @@ namespace KHotKeys { -GestureRecordPage::GestureRecordPage(const QString &gesture, - QWidget *parent, const char *name) - : QVBox(parent, name), +GestureRecordPage::GestureRecordPage(const TQString &gesture, + TQWidget *parent, const char *name) + : TQVBox(parent, name), _recorder(NULL), _resetButton(NULL), - _tryOne(NULL), _tryTwo(NULL), _tryThree(NULL), _gest(QString::null), + _tryOne(NULL), _tryTwo(NULL), _tryThree(NULL), _gest(TQString::null), _tryCount(1) { - QString message; + TQString message; message = i18n("Draw the gesture you would like to record below. Press " "and hold the left mouse button while drawing, and release " @@ -42,28 +42,28 @@ GestureRecordPage::GestureRecordPage(const QString &gesture, "restart. If you want to force a restart, use the reset " "button below.\n\nDraw here:"); - QLabel *label = new QLabel(message, this, "label"); - label->setAlignment(QLabel::AlignLeft | QLabel::WordBreak | - QLabel::AlignVCenter); + TQLabel *label = new TQLabel(message, this, "label"); + label->setAlignment(TQLabel::AlignLeft | TQLabel::WordBreak | + TQLabel::AlignVCenter); _recorder = new GestureRecorder(this, "recorder"); _recorder->setMinimumHeight(150); setStretchFactor(_recorder, 1); - connect(_recorder, SIGNAL(recorded(const QString &)), - this, SLOT(slotRecorded(const QString &))); + connect(_recorder, TQT_SIGNAL(recorded(const TQString &)), + this, TQT_SLOT(slotRecorded(const TQString &))); - QHBox *hBox = new QHBox(this, "hbox"); + TQHBox *hBox = new TQHBox(this, "hbox"); _tryOne = new GestureDrawer(hBox, "tryOne"); _tryTwo = new GestureDrawer(hBox, "tryTwo"); _tryThree = new GestureDrawer(hBox, "tryThree"); - QWidget *spacer = new QWidget(hBox, "spacer"); + TQWidget *spacer = new TQWidget(hBox, "spacer"); hBox->setStretchFactor(spacer, 1); - _resetButton = new QPushButton(i18n("&Reset"), hBox, "resetButton"); - connect(_resetButton, SIGNAL(clicked()), - this, SLOT(slotResetClicked())); + _resetButton = new TQPushButton(i18n("&Reset"), hBox, "resetButton"); + connect(_resetButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotResetClicked())); @@ -82,7 +82,7 @@ GestureRecordPage::~GestureRecordPage() { } -void GestureRecordPage::slotRecorded(const QString &data) +void GestureRecordPage::slotRecorded(const TQString &data) { switch (_tryCount) { @@ -131,11 +131,11 @@ void GestureRecordPage::slotRecorded(const QString &data) void GestureRecordPage::slotResetClicked() { - _gest = QString::null; + _gest = TQString::null; - _tryOne->setData(QString::null); - _tryTwo->setData(QString::null); - _tryThree->setData(QString::null); + _tryOne->setData(TQString::null); + _tryTwo->setData(TQString::null); + _tryThree->setData(TQString::null); _tryCount = 1; diff --git a/khotkeys/kcontrol/gesturerecordpage.h b/khotkeys/kcontrol/gesturerecordpage.h index 2636b47b3..1b95b86fe 100644 --- a/khotkeys/kcontrol/gesturerecordpage.h +++ b/khotkeys/kcontrol/gesturerecordpage.h @@ -12,7 +12,7 @@ #ifndef GESTURE_RECORD_PAGE_H #define GESTURE_RECORD_PAGE_H -#include <qvbox.h> +#include <tqvbox.h> #include "gesturedrawer.h" @@ -31,14 +31,14 @@ class GestureRecordPage : public QVBox Q_OBJECT public: - GestureRecordPage(const QString &gesture, - QWidget *parent, const char *name); + GestureRecordPage(const TQString &gesture, + TQWidget *parent, const char *name); ~GestureRecordPage(); - const QString &getGesture() const { return _gest; } + const TQString &getGesture() const { return _gest; } protected slots: - void slotRecorded(const QString &data); + void slotRecorded(const TQString &data); void slotResetClicked(); signals: @@ -46,12 +46,12 @@ class GestureRecordPage : public QVBox private: GestureRecorder *_recorder; - QPushButton *_resetButton; + TQPushButton *_resetButton; GestureDrawer *_tryOne; GestureDrawer *_tryTwo; GestureDrawer *_tryThree; - QString _gest; + TQString _gest; Q_UINT32 _tryCount; }; diff --git a/khotkeys/kcontrol/gestures_settings_tab.cpp b/khotkeys/kcontrol/gestures_settings_tab.cpp index e3c71c66a..2b5a8ff42 100644 --- a/khotkeys/kcontrol/gestures_settings_tab.cpp +++ b/khotkeys/kcontrol/gestures_settings_tab.cpp @@ -17,9 +17,9 @@ #include "gestures_settings_tab.h" #include <klocale.h> -#include <qcombobox.h> +#include <tqcombobox.h> #include <knuminput.h> -#include <qcheckbox.h> +#include <tqcheckbox.h> #include "kcmkhotkeys.h" #include "windowdef_list_widget.h" @@ -27,7 +27,7 @@ namespace KHotKeys { -Gestures_settings_tab::Gestures_settings_tab( QWidget* parent_P, const char* name_P ) +Gestures_settings_tab::Gestures_settings_tab( TQWidget* parent_P, const char* name_P ) : Gestures_settings_tab_ui( parent_P, name_P ) { mouse_button_combo->insertItem( i18n( "Button 2 (middle)" ), 0 ); @@ -39,12 +39,12 @@ Gestures_settings_tab::Gestures_settings_tab( QWidget* parent_P, const char* nam 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, SIGNAL( clicked()), - module, SLOT( changed())); - connect( mouse_button_combo, SIGNAL( activated( int )), - module, SLOT( changed())); - connect( timeout_input, SIGNAL( valueChanged( int )), - module, SLOT( 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())); } void Gestures_settings_tab::read_data() diff --git a/khotkeys/kcontrol/gestures_settings_tab.h b/khotkeys/kcontrol/gestures_settings_tab.h index a02126d8f..813209439 100644 --- a/khotkeys/kcontrol/gestures_settings_tab.h +++ b/khotkeys/kcontrol/gestures_settings_tab.h @@ -21,7 +21,7 @@ class Gestures_settings_tab { Q_OBJECT public: - Gestures_settings_tab( QWidget* parent = NULL, const char* name = NULL ); + Gestures_settings_tab( TQWidget* parent = NULL, const char* name = NULL ); void read_data(); void write_data() const; public slots: diff --git a/khotkeys/kcontrol/info_tab.cpp b/khotkeys/kcontrol/info_tab.cpp index 7363d27a1..7a2e0c916 100644 --- a/khotkeys/kcontrol/info_tab.cpp +++ b/khotkeys/kcontrol/info_tab.cpp @@ -16,15 +16,15 @@ #include "info_tab.h" -#include <qpushbutton.h> -#include <qlabel.h> +#include <tqpushbutton.h> +#include <tqlabel.h> #include <klocale.h> namespace KHotKeys { -Info_tab::Info_tab( QWidget* parent_P, const char* name_P ) +Info_tab::Info_tab( TQWidget* parent_P, const char* name_P ) : Info_tab_ui( parent_P, name_P ) { clear_data(); diff --git a/khotkeys/kcontrol/info_tab.h b/khotkeys/kcontrol/info_tab.h index 72628fe75..32212ae98 100644 --- a/khotkeys/kcontrol/info_tab.h +++ b/khotkeys/kcontrol/info_tab.h @@ -21,7 +21,7 @@ class Info_tab { Q_OBJECT public: - Info_tab( QWidget* parent_P = NULL, const char* name_P = NULL ); + Info_tab( TQWidget* parent_P = NULL, const char* name_P = NULL ); public slots: void clear_data(); }; diff --git a/khotkeys/kcontrol/init.cpp b/khotkeys/kcontrol/init.cpp index 3468690e2..67dc2ee6e 100644 --- a/khotkeys/kcontrol/init.cpp +++ b/khotkeys/kcontrol/init.cpp @@ -31,13 +31,13 @@ extern "C" // Non-xinerama multhead support in KDE is just a hack // involving forking apps per-screen. Don't bother with // kded modules in such case. - QCString multiHead = getenv("KDE_MULTIHEAD"); + TQCString multiHead = getenv("KDE_MULTIHEAD"); if (multiHead.lower() == "true") kapp->kdeinitExec( "khotkeys" ); else { DCOPRef ref( "kded", "kded" ); - if( !ref.call( "loadModule", QCString( "khotkeys" ))) + if( !ref.call( "loadModule", TQCString( "khotkeys" ))) { kdWarning( 1217 ) << "Loading of khotkeys module failed." << endl; kapp->kdeinitExec( "khotkeys" ); diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp index 8ffc1ff19..5d540d4c9 100644 --- a/khotkeys/kcontrol/kcmkhotkeys.cpp +++ b/khotkeys/kcontrol/kcmkhotkeys.cpp @@ -19,8 +19,8 @@ #include <unistd.h> #include <stdlib.h> -#include <qlayout.h> -#include <qsplitter.h> +#include <tqlayout.h> +#include <tqsplitter.h> #include <kcmodule.h> #include <kaboutdata.h> @@ -48,7 +48,7 @@ extern "C" { - KDE_EXPORT KCModule* create_khotkeys( QWidget* parent_P, const char* name_P ) + KDE_EXPORT KCModule* create_khotkeys( TQWidget* parent_P, const char* name_P ) { // sleep( 20 ); // CHECKME DEBUG KGlobal::locale()->insertCatalogue("khotkeys"); @@ -61,7 +61,7 @@ extern "C" namespace KHotKeys { -Module::Module( QWidget* parent_P, const char* ) +Module::Module( TQWidget* parent_P, const char* ) : KCModule( parent_P, "khotkeys" ), _actions_root( NULL ), _current_action_data( NULL ), listview_is_changed( false ), deleting_action( false ) { @@ -69,21 +69,21 @@ Module::Module( QWidget* parent_P, const char* ) module = this; init_global_data( false, this ); // don't grab keys init_arts(); - QVBoxLayout* vbox = new QVBoxLayout( this ); + TQVBoxLayout* vbox = new TQVBoxLayout( this ); vbox->setSpacing( 6 ); vbox->setMargin( 11 ); - QSplitter* splt = new QSplitter( this ); + TQSplitter* splt = new TQSplitter( this ); actions_listview_widget = new Actions_listview_widget( splt ); tab_widget = new Tab_widget( splt ); vbox->addWidget( splt ); buttons_widget = new Main_buttons_widget( this ); vbox->addWidget( buttons_widget ); - connect( actions_listview_widget, SIGNAL( current_action_changed()), - SLOT( listview_current_action_changed())); - connect( buttons_widget, SIGNAL( new_action_pressed()), SLOT( new_action())); - connect( buttons_widget, SIGNAL( new_action_group_pressed()), SLOT( new_action_group())); - connect( buttons_widget, SIGNAL( delete_action_pressed()), SLOT( delete_action())); - connect( buttons_widget, SIGNAL( global_settings_pressed()), SLOT( global_settings())); + 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())); // listview_current_action_changed(); // init KAboutData* about = new KAboutData("kcmkhotkeys", I18N_NOOP("KHotKeys"), KHOTKEYS_VERSION, @@ -124,7 +124,7 @@ void Module::save() settings.write_settings(); if( daemon_disabled()) { - QByteArray data; + TQByteArray data; kapp->dcopClient()->send( "khotkeys*", "khotkeys", "quit()", data ); kdDebug( 1217 ) << "disabling khotkeys daemon" << endl; } @@ -137,7 +137,7 @@ void Module::save() } else { - QByteArray data; + TQByteArray data; kapp->dcopClient()->send( "khotkeys*", "khotkeys", "reread_configuration()", data ); kdDebug( 1217 ) << "telling khotkeys daemon to reread configuration" << endl; } @@ -146,12 +146,12 @@ void Module::save() } -QString Module::quickHelp() const +TQString Module::quickHelp() const { return i18n( "" ); // TODO CHECKME } -void Module::action_name_changed( const QString& name_P ) +void Module::action_name_changed( const TQString& name_P ) { current_action_data()->set_name( name_P ); actions_listview_widget->action_name_changed( name_P ); @@ -272,7 +272,7 @@ void Module::set_gestures_exclude( Windowdef_list* windows ) void Module::import() { - QString file = KFileDialog::getOpenFileName( QString::null, "*.khotkeys", topLevelWidget(), + TQString file = KFileDialog::getOpenFileName( TQString::null, "*.khotkeys", topLevelWidget(), i18n( "Select File with Actions to Be Imported" )); if( file.isEmpty()) return; diff --git a/khotkeys/kcontrol/kcmkhotkeys.h b/khotkeys/kcontrol/kcmkhotkeys.h index 3061fa9ec..b406df8fe 100644 --- a/khotkeys/kcontrol/kcmkhotkeys.h +++ b/khotkeys/kcontrol/kcmkhotkeys.h @@ -32,16 +32,16 @@ class Module { Q_OBJECT public: - Module( QWidget *parent_P, const char *name_P ); + Module( TQWidget *parent_P, const char *name_P ); virtual ~Module(); virtual void load(); virtual void save(); // virtual void defaults(); not used - QString quickHelp() const; + TQString quickHelp() const; int buttons(); void set_current_action_data( Action_data_base* data_P ); Action_data_base* current_action_data(); - void action_name_changed( const QString& name_P ); + void action_name_changed( const TQString& name_P ); Action_data_group* actions_root() const; void set_gestures_disabled( bool set ); bool gestures_disabled() const; diff --git a/khotkeys/kcontrol/keyboard_input_widget.cpp b/khotkeys/kcontrol/keyboard_input_widget.cpp index 3d60d8e13..4d5727482 100644 --- a/khotkeys/kcontrol/keyboard_input_widget.cpp +++ b/khotkeys/kcontrol/keyboard_input_widget.cpp @@ -16,9 +16,9 @@ #include "keyboard_input_widget.h" -#include <qgroupbox.h> -#include <qpushbutton.h> -#include <qradiobutton.h> +#include <tqgroupbox.h> +#include <tqpushbutton.h> +#include <tqradiobutton.h> #include <ktextedit.h> @@ -31,21 +31,21 @@ namespace KHotKeys { -Keyboard_input_widget::Keyboard_input_widget( QWidget* parent_P, const char* name_P ) +Keyboard_input_widget::Keyboard_input_widget( TQWidget* parent_P, const char* name_P ) : Keyboard_input_widget_ui( parent_P, name_P ) { clear_data(); // KHotKeys::Module::changed() - connect( action_window_radio, SIGNAL( clicked()), - module, SLOT( changed())); - connect( active_window_radio, SIGNAL( clicked()), - module, SLOT( changed())); - connect( specific_window_radio, SIGNAL( clicked()), - module, SLOT( changed())); - connect( keyboard_input_multilineedit, SIGNAL( textChanged()), - module, SLOT( changed())); - connect( modify_button, SIGNAL( clicked()), - module, SLOT( 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())); } void Keyboard_input_widget::clear_data() diff --git a/khotkeys/kcontrol/keyboard_input_widget.h b/khotkeys/kcontrol/keyboard_input_widget.h index 7c1f15b95..32690f44e 100644 --- a/khotkeys/kcontrol/keyboard_input_widget.h +++ b/khotkeys/kcontrol/keyboard_input_widget.h @@ -24,7 +24,7 @@ class Keyboard_input_widget { Q_OBJECT public: - Keyboard_input_widget( QWidget* parent_P = NULL, const char* name_P = NULL ); + Keyboard_input_widget( TQWidget* parent_P = NULL, const char* name_P = NULL ); void set_data( const Keyboard_input_action* data_P ); Keyboard_input_action* get_data( Action_data* data_P ) const; public slots: diff --git a/khotkeys/kcontrol/main_buttons_widget.cpp b/khotkeys/kcontrol/main_buttons_widget.cpp index fb8718a1c..3532cc13f 100644 --- a/khotkeys/kcontrol/main_buttons_widget.cpp +++ b/khotkeys/kcontrol/main_buttons_widget.cpp @@ -16,28 +16,28 @@ #include "main_buttons_widget.h" -#include <qpushbutton.h> +#include <tqpushbutton.h> #include "kcmkhotkeys.h" namespace KHotKeys { -Main_buttons_widget::Main_buttons_widget( QWidget* parent_P, const char* name_P ) +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, SIGNAL( clicked()), SIGNAL( new_action_pressed())); - connect( new_action_group_button, SIGNAL( clicked()), SIGNAL( new_action_group_pressed())); - connect( delete_action_button, SIGNAL( clicked()), SIGNAL( delete_action_pressed())); - connect( global_settings_button, SIGNAL( clicked()), SIGNAL( global_settings_pressed())); + 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())); enable_delete( false ); // KHotKeys::Module::changed() - connect( new_action_button, SIGNAL( clicked()), - module, SLOT( changed())); - connect( new_action_group_button, SIGNAL( clicked()), - module, SLOT( changed())); - connect( delete_action_button, SIGNAL( clicked()), - module, SLOT( 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())); 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 cd13b3cbc..e4410d9d0 100644 --- a/khotkeys/kcontrol/main_buttons_widget.h +++ b/khotkeys/kcontrol/main_buttons_widget.h @@ -21,7 +21,7 @@ class Main_buttons_widget { Q_OBJECT public: - Main_buttons_widget( QWidget* parent_P = NULL, const char* name_P = NULL ); + Main_buttons_widget( TQWidget* parent_P = NULL, const char* name_P = NULL ); void enable_delete( bool enable_P ); signals: void new_action_pressed(); diff --git a/khotkeys/kcontrol/menuedit.cpp b/khotkeys/kcontrol/menuedit.cpp index dd0035dfa..78de7dee6 100644 --- a/khotkeys/kcontrol/menuedit.cpp +++ b/khotkeys/kcontrol/menuedit.cpp @@ -23,9 +23,9 @@ #include <kaccel.h> #include <kapplication.h> #include <dcopclient.h> -#include <qlabel.h> -#include <qlineedit.h> -#include <qlayout.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqlayout.h> #include <kkeydialog.h> #include <settings.h> @@ -34,7 +34,7 @@ namespace KHotKeys { -static QObject* owner = NULL; +static TQObject* owner = NULL; void khotkeys_init() { @@ -53,7 +53,7 @@ void khotkeys_cleanup() } Menuentry_shortcut_action_data* khotkeys_get_menu_entry_internal2( - const Action_data_group* data_P, const QString& entry_P ) + const Action_data_group* data_P, const TQString& entry_P ) { if( !data_P->enabled( false )) return NULL; @@ -97,19 +97,19 @@ Action_data_group* khotkeys_get_menu_root( Action_data_group* data_P ) } Menuentry_shortcut_action_data* khotkeys_get_menu_entry_internal( Action_data_group* data_P, - const QString& entry_P ) + const TQString& entry_P ) { return khotkeys_get_menu_entry_internal2( khotkeys_get_menu_root( data_P ), entry_P ); } -QString khotkeys_get_menu_shortcut( Menuentry_shortcut_action_data* data_P ) +TQString khotkeys_get_menu_shortcut( Menuentry_shortcut_action_data* data_P ) { if( data_P->trigger() != NULL ) return data_P->trigger()->shortcut().toString(); return ""; } -void khotkeys_get_all_shortcuts_internal(const Action_data_group* data_P, QStringList &result) +void khotkeys_get_all_shortcuts_internal(const Action_data_group* data_P, TQStringList &result) { if( !data_P->enabled( false )) return; @@ -133,9 +133,9 @@ void khotkeys_get_all_shortcuts_internal(const Action_data_group* data_P, QStrin } -QStringList khotkeys_get_all_shortcuts( ) +TQStringList khotkeys_get_all_shortcuts( ) { - QStringList result; + TQStringList result; Settings settings; settings.read_settings( true ); @@ -145,7 +145,7 @@ QStringList khotkeys_get_all_shortcuts( ) } -KService::Ptr khotkeys_find_menu_entry_internal(const Action_data_group* data_P, const QString &shortcut_P) +KService::Ptr khotkeys_find_menu_entry_internal(const Action_data_group* data_P, const TQString &shortcut_P) { if( !data_P->enabled( false )) return 0; @@ -177,7 +177,7 @@ KService::Ptr khotkeys_find_menu_entry_internal(const Action_data_group* data_P, } -KService::Ptr khotkeys_find_menu_entry( const QString& shortcut_P ) +KService::Ptr khotkeys_find_menu_entry( const TQString& shortcut_P ) { Settings settings; settings.read_settings( true ); @@ -188,7 +188,7 @@ KService::Ptr khotkeys_find_menu_entry( const QString& shortcut_P ) void khotkeys_send_reread_config() { - QByteArray data; + TQByteArray data; if( !kapp->dcopClient()->isAttached()) kapp->dcopClient()->attach(); if( !kapp->dcopClient()->isApplicationRegistered( "khotkeys" )) @@ -198,13 +198,13 @@ void khotkeys_send_reread_config() } else { - QByteArray data; + TQByteArray data; kapp->dcopClient()->send( "khotkeys*", "khotkeys", "reread_configuration()", data ); kdDebug( 1217 ) << "telling khotkeys daemon to reread configuration" << endl; } } -QString khotkeys_get_menu_entry_shortcut( const QString& entry_P ) +TQString khotkeys_get_menu_entry_shortcut( const TQString& entry_P ) { Settings settings; settings.read_settings( true ); @@ -215,12 +215,12 @@ QString khotkeys_get_menu_entry_shortcut( const QString& entry_P ) delete settings.actions; return ""; } - QString shortcut = khotkeys_get_menu_shortcut( entry ); + TQString shortcut = khotkeys_get_menu_shortcut( entry ); delete settings.actions; return shortcut; } -bool khotkeys_menu_entry_moved( const QString& new_P, const QString& old_P ) +bool khotkeys_menu_entry_moved( const TQString& new_P, const TQString& old_P ) { Settings settings; settings.read_settings( true ); @@ -232,7 +232,7 @@ bool khotkeys_menu_entry_moved( const QString& new_P, const QString& old_P ) return false; } Action_data_group* parent = entry->parent(); - QString new_name = new_P; + TQString new_name = new_P; if( entry->name().startsWith( i18n( "K Menu - " ))) new_name = i18n( "K Menu - " ) + new_P; Menuentry_shortcut_action_data* new_entry = new Menuentry_shortcut_action_data( parent, @@ -246,7 +246,7 @@ bool khotkeys_menu_entry_moved( const QString& new_P, const QString& old_P ) return true; } -void khotkeys_menu_entry_deleted( const QString& entry_P ) +void khotkeys_menu_entry_deleted( const TQString& entry_P ) { Settings settings; settings.read_settings( true ); @@ -263,8 +263,8 @@ void khotkeys_menu_entry_deleted( const QString& entry_P ) khotkeys_send_reread_config(); } -QString khotkeys_change_menu_entry_shortcut( const QString& entry_P, - const QString& shortcut_P ) +TQString khotkeys_change_menu_entry_shortcut( const TQString& entry_P, + const TQString& shortcut_P ) { Settings settings; settings.read_settings( true ); @@ -286,7 +286,7 @@ QString khotkeys_change_menu_entry_shortcut( const QString& entry_P, delete entry; entry = entry_tmp; } - QString shortcut = ""; + TQString shortcut = ""; // make sure the shortcut is valid shortcut = (KShortcut( shortcut_P )).toStringInternal(); if( !shortcut.isEmpty()) @@ -327,33 +327,33 @@ void khotkeys_cleanup() KHotKeys::khotkeys_cleanup(); } -QString khotkeys_get_menu_entry_shortcut( const QString& entry_P ) +TQString khotkeys_get_menu_entry_shortcut( const TQString& entry_P ) { return KHotKeys::khotkeys_get_menu_entry_shortcut( entry_P ); } -bool khotkeys_menu_entry_moved( const QString& new_P, const QString& old_P ) +bool khotkeys_menu_entry_moved( const TQString& new_P, const TQString& old_P ) { return KHotKeys::khotkeys_menu_entry_moved( new_P, old_P ); } -void khotkeys_menu_entry_deleted( const QString& entry_P ) +void khotkeys_menu_entry_deleted( const TQString& entry_P ) { KHotKeys::khotkeys_menu_entry_deleted( entry_P ); } -QString khotkeys_change_menu_entry_shortcut( const QString& entry_P, - const QString& shortcut_P ) +TQString khotkeys_change_menu_entry_shortcut( const TQString& entry_P, + const TQString& shortcut_P ) { return KHotKeys::khotkeys_change_menu_entry_shortcut( entry_P, shortcut_P ); } -QStringList khotkeys_get_all_shortcuts( ) +TQStringList khotkeys_get_all_shortcuts( ) { return KHotKeys::khotkeys_get_all_shortcuts(); } -KService::Ptr khotkeys_find_menu_entry( const QString& shortcut_P ) +KService::Ptr khotkeys_find_menu_entry( const TQString& shortcut_P ) { return KHotKeys::khotkeys_find_menu_entry( shortcut_P ); } diff --git a/khotkeys/kcontrol/menuedit.h b/khotkeys/kcontrol/menuedit.h index 0986d1cca..325a3050e 100644 --- a/khotkeys/kcontrol/menuedit.h +++ b/khotkeys/kcontrol/menuedit.h @@ -11,7 +11,7 @@ #ifndef _MENUEDIT_H_ #define _MENUEDIT_H_ -#include <qstring.h> +#include <tqstring.h> #include <kdialogbase.h> #include <kaccel.h> #include <kservice.h> @@ -27,18 +27,18 @@ KDE_EXPORT void khotkeys_init( void ); KDE_EXPORT void khotkeys_cleanup( void ); // return keyboard shortcut ( e.g. "ALT+T" ) for given menu entry ( e.g. // "System/Konsole.desktop" -KDE_EXPORT QString khotkeys_get_menu_entry_shortcut( const QString& entry_P ); +KDE_EXPORT TQString khotkeys_get_menu_entry_shortcut( const TQString& entry_P ); // changes assigned shortcut to menu entry a updates config file -KDE_EXPORT QString khotkeys_change_menu_entry_shortcut( const QString& entry_P, - const QString& shortcut_P ); +KDE_EXPORT TQString khotkeys_change_menu_entry_shortcut( const TQString& entry_P, + const TQString& shortcut_P ); // menu entry was moved in K Menu -KDE_EXPORT bool khotkeys_menu_entry_moved( const QString& new_P, const QString& old_P ); +KDE_EXPORT bool khotkeys_menu_entry_moved( const TQString& new_P, const TQString& old_P ); // menu entry was removed -KDE_EXPORT void khotkeys_menu_entry_deleted( const QString& entry_P ); +KDE_EXPORT void khotkeys_menu_entry_deleted( const TQString& entry_P ); // List of all hotkeys in use -KDE_EXPORT QStringList khotkeys_get_all_shortcuts( ); +KDE_EXPORT TQStringList khotkeys_get_all_shortcuts( ); // Find menu entry that uses shortcut -KDE_EXPORT KService::Ptr khotkeys_find_menu_entry( const QString& shortcut_P ); +KDE_EXPORT KService::Ptr khotkeys_find_menu_entry( const TQString& shortcut_P ); } // extern "C" #endif diff --git a/khotkeys/kcontrol/menuentry_widget.cpp b/khotkeys/kcontrol/menuentry_widget.cpp index 2bad5597c..9b313d20d 100644 --- a/khotkeys/kcontrol/menuentry_widget.cpp +++ b/khotkeys/kcontrol/menuentry_widget.cpp @@ -16,10 +16,10 @@ #include "menuentry_widget.h" -#include <qpushbutton.h> -#include <qlineedit.h> -#include <qcheckbox.h> -#include <qgroupbox.h> +#include <tqpushbutton.h> +#include <tqlineedit.h> +#include <tqcheckbox.h> +#include <tqgroupbox.h> #include <kdebug.h> @@ -32,13 +32,13 @@ namespace KHotKeys { -Menuentry_widget::Menuentry_widget( QWidget* parent_P, const char* name_P ) +Menuentry_widget::Menuentry_widget( TQWidget* parent_P, const char* name_P ) : Menuentry_widget_ui( parent_P, name_P ) { clear_data(); // KHotKeys::Module::changed() - connect( menuentry_lineedit, SIGNAL( textChanged( const QString& )), - module, SLOT( changed())); + connect( menuentry_lineedit, TQT_SIGNAL( textChanged( const TQString& )), + module, TQT_SLOT( changed())); } void Menuentry_widget::clear_data() diff --git a/khotkeys/kcontrol/menuentry_widget.h b/khotkeys/kcontrol/menuentry_widget.h index 0c871ec79..f4b61677d 100644 --- a/khotkeys/kcontrol/menuentry_widget.h +++ b/khotkeys/kcontrol/menuentry_widget.h @@ -24,7 +24,7 @@ class Menuentry_widget { Q_OBJECT public: - Menuentry_widget( QWidget* parent_P = NULL, const char* name_P = NULL ); + Menuentry_widget( TQWidget* parent_P = NULL, const char* name_P = NULL ); void set_data( const Menuentry_action* data_P ); Menuentry_action* get_data( Action_data* data_P ) const; public slots: diff --git a/khotkeys/kcontrol/tab_widget.cpp b/khotkeys/kcontrol/tab_widget.cpp index 2a484529a..243543519 100644 --- a/khotkeys/kcontrol/tab_widget.cpp +++ b/khotkeys/kcontrol/tab_widget.cpp @@ -51,16 +51,16 @@ namespace KHotKeys { -Tab_widget::Tab_widget( QWidget* parent_P, const char* name_P ) - : QTabWidget( parent_P, name_P ) +Tab_widget::Tab_widget( TQWidget* parent_P, const char* name_P ) + : TQTabWidget( parent_P, name_P ) { pages[ TAB_INFO ] = new Info_tab; pages[ TAB_GENERAL_SETTINGS ] = new General_settings_tab; pages[ TAB_GESTURES_SETTINGS ] = new Gestures_settings_tab; General_tab* general_tab; pages[ TAB_GENERAL ] = general_tab = new General_tab; - connect( general_tab, SIGNAL( action_type_changed( int )), - SLOT( set_action_type_slot( int ))); + connect( general_tab, TQT_SIGNAL( action_type_changed( int )), + TQT_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( QWidget* parent_P, const char* name_P ) for( tab_pos_t i = TAB_FIRST; i < TAB_END; ++i ) - connect( this, SIGNAL( clear_pages_signal()), pages[ i ], SLOT( clear_data())); + connect( this, TQT_SIGNAL( clear_pages_signal()), pages[ i ], TQT_SLOT( clear_data())); #ifdef HAVE_ARTS if( haveArts()) show_pages(( TAB_INFO, TAB_GENERAL_SETTINGS, TAB_GESTURES_SETTINGS, TAB_VOICE_SETTINGS )); @@ -127,7 +127,7 @@ void Tab_widget::save_current_action_changes() } else if( current_type == DATA ) { - QString name, comment; + TQString name, comment; bool enabled; static_cast< General_tab* >( pages[ TAB_GENERAL ] )->get_data( name, comment, enabled ); switch( current_data_type ) @@ -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, SIGNAL( clear_pages_signal()), pages[ i ], SLOT( clear_data())); + disconnect( this, TQT_SIGNAL( clear_pages_signal()), pages[ i ], TQT_SLOT( clear_data())); } clear_pages(); // reconnect all pages to this signal - disconnect( this, SIGNAL( clear_pages_signal()), NULL, NULL ); + disconnect( this, TQT_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, SIGNAL( clear_pages_signal()), pages[ i ], SLOT( clear_data())); + connect( this, TQT_SIGNAL( clear_pages_signal()), pages[ i ], TQT_SLOT( clear_data())); } show(); } diff --git a/khotkeys/kcontrol/tab_widget.h b/khotkeys/kcontrol/tab_widget.h index eedaa541a..84fd6af84 100644 --- a/khotkeys/kcontrol/tab_widget.h +++ b/khotkeys/kcontrol/tab_widget.h @@ -11,7 +11,7 @@ #ifndef _TAB_WIDGET_H_ #define _TAB_WIDGET_H_ -#include <qtabwidget.h> +#include <tqtabwidget.h> #include <actions.h> @@ -35,7 +35,7 @@ class Tab_widget TYPE_ACTIVATE_WINDOW_SHORTCUT, TYPE_END }; - Tab_widget( QWidget* parent_P = NULL, const char* name_P = NULL ); + Tab_widget( TQWidget* parent_P = NULL, const char* name_P = NULL ); virtual ~Tab_widget(); void set_action_type( action_type_t type_P, bool force_P = false ); void save_current_action_changes(); @@ -54,7 +54,7 @@ class Tab_widget TAB_GENERAL, TAB_GROUP_GENERAL, TAB_TRIGGERS, TAB_SHORTCUT_TRIGGER, TAB_GESTURE_TRIGGER, TAB_ACTIONS, TAB_COMMAND_URL, TAB_MENUENTRY, TAB_DCOP, TAB_KEYBOARD_INPUT, TAB_WINDOW, TAB_CONDITIONS, TAB_VOICE_SETTINGS, TAB_END }; - QWidget* pages[ TAB_END ]; + TQWidget* pages[ TAB_END ]; enum tab_show_type_t { NONE, DATA, GROUP }; tab_show_type_t current_type; action_type_t current_data_type; diff --git a/khotkeys/kcontrol/triggers_tab.cpp b/khotkeys/kcontrol/triggers_tab.cpp index 8c4a13fda..39ff6933f 100644 --- a/khotkeys/kcontrol/triggers_tab.cpp +++ b/khotkeys/kcontrol/triggers_tab.cpp @@ -17,12 +17,12 @@ #include "triggers_tab.h" #include <assert.h> -#include <qpushbutton.h> -#include <qlineedit.h> -#include <qpopupmenu.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qheader.h> +#include <tqpushbutton.h> +#include <tqlineedit.h> +#include <tqpopupmenu.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqheader.h> #include <kdebug.h> #include <klocale.h> @@ -44,10 +44,10 @@ namespace KHotKeys // Triggers_tab -Triggers_tab::Triggers_tab( QWidget* parent_P, const char* name_P ) +Triggers_tab::Triggers_tab( TQWidget* parent_P, const char* name_P ) : Triggers_tab_ui( parent_P, name_P ), selected_item( NULL ) { - QPopupMenu* popup = new QPopupMenu; // CHECKME looks like setting parent doesn't work + TQPopupMenu* popup = new QPopupMenu; // CHECKME looks like setting parent doesn't work popup->insertItem( i18n( "Shortcut Trigger..." ), TYPE_SHORTCUT_TRIGGER ); popup->insertItem( i18n( "Gesture Trigger..." ), TYPE_GESTURE_TRIGGER ); popup->insertItem( i18n( "Window Trigger..." ), TYPE_WINDOW_TRIGGER ); @@ -55,9 +55,9 @@ Triggers_tab::Triggers_tab( QWidget* parent_P, const char* name_P ) if( haveArts()) popup->insertItem( i18n( "Voice Trigger..." ), TYPE_VOICE_TRIGGER ); #endif - connect( popup, SIGNAL( activated( int )), SLOT( new_selected( int ))); - connect( triggers_listview, SIGNAL( doubleClicked ( QListViewItem *, const QPoint &, int ) ), - this, SLOT( modify_pressed() ) ); + 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() ) ); new_button->setPopup( popup ); copy_button->setEnabled( false ); @@ -69,16 +69,16 @@ Triggers_tab::Triggers_tab( QWidget* parent_P, const char* name_P ) triggers_listview->setForceSelect( true ); clear_data(); // KHotKeys::Module::changed() - connect( new_button, SIGNAL( clicked()), - module, SLOT( changed())); - connect( copy_button, SIGNAL( clicked()), - module, SLOT( changed())); - connect( modify_button, SIGNAL( clicked()), - module, SLOT( changed())); - connect( delete_button, SIGNAL( clicked()), - module, SLOT( changed())); - connect( comment_lineedit, SIGNAL( textChanged( const QString& )), - module, SLOT( 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())); } Triggers_tab::~Triggers_tab() @@ -111,7 +111,7 @@ void Triggers_tab::set_data( const Trigger_list* data_P ) Trigger_list* Triggers_tab::get_data( Action_data* data_P ) const { Trigger_list* list = new Trigger_list( comment_lineedit->text()); - for( QListViewItem* pos = triggers_listview->firstChild(); + for( TQListViewItem* pos = triggers_listview->firstChild(); pos != NULL; pos = pos->nextSibling()) list->append( static_cast< Trigger_list_item* >( pos )->trigger()->copy( data_P )); @@ -129,14 +129,14 @@ void Triggers_tab::new_selected( int type_P ) break; case TYPE_GESTURE_TRIGGER: // Gesture trigger dlg = new Gesture_trigger_dialog( - new Gesture_trigger( NULL, QString::null )); // CHECKME NULL ? + new Gesture_trigger( NULL, TQString::null )); // CHECKME NULL ? break; case TYPE_WINDOW_TRIGGER: // Window trigger dlg = new Window_trigger_dialog( new Window_trigger( NULL, new Windowdef_list( "" ), 0 )); // CHECKME NULL ? break; case TYPE_VOICE_TRIGGER: // Voice trigger - dlg = new Voice_trigger_dialog( new Voice_trigger(NULL,QString::null,VoiceSignature(),VoiceSignature())); // CHECKME NULL ? + dlg = new Voice_trigger_dialog( new Voice_trigger(NULL,TQString::null,VoiceSignature(),VoiceSignature())); // CHECKME NULL ? break; } if( dlg != NULL ) @@ -169,7 +169,7 @@ void Triggers_tab::modify_pressed() edit_listview_item( selected_item ); } -void Triggers_tab::current_changed( QListViewItem* item_P ) +void Triggers_tab::current_changed( TQListViewItem* item_P ) { // if( item_P == selected_item ) // return; @@ -181,7 +181,7 @@ void Triggers_tab::current_changed( QListViewItem* item_P ) } Trigger_list_item* Triggers_tab::create_listview_item( Trigger* trigger_P, - QListView* parent_P, QListViewItem* after_P, bool copy_P ) + TQListView* parent_P, TQListViewItem* after_P, bool copy_P ) { Trigger* new_trg = copy_P ? trigger_P->copy( NULL ) : trigger_P; // CHECKME NULL ? // CHECKME uz by nemelo byt treba if( after_P == NULL ) @@ -212,26 +212,26 @@ void Triggers_tab::edit_listview_item( Trigger_list_item* item_P ) // Trigger_list_item -QString Trigger_list_item::text( int column_P ) const +TQString Trigger_list_item::text( int column_P ) const { - return column_P == 0 ? trigger()->description() : QString::null; + return column_P == 0 ? trigger()->description() : TQString::null; } // Shortcut_trigger_widget -Shortcut_trigger_widget::Shortcut_trigger_widget( QWidget* parent_P, const char* ) - : QWidget( parent_P ) +Shortcut_trigger_widget::Shortcut_trigger_widget( TQWidget* parent_P, const char* ) + : TQWidget( parent_P ) { - QVBoxLayout* lay = new QVBoxLayout( this, 11, 6 ); - QLabel* lbl = new QLabel( i18n( "Select keyboard shortcut:" ), this ); + TQVBoxLayout* lay = new TQVBoxLayout( this, 11, 6 ); + TQLabel* lbl = new TQLabel( i18n( "Select keyboard shortcut:" ), this ); lay->addWidget( lbl ); lay->addSpacing( 10 ); bt = new KKeyButton( this ); lay->addWidget( bt, 0 , Qt::AlignHCenter ); lay->addStretch(); clear_data(); - connect( bt, SIGNAL( capturedShortcut( const KShortcut& )), - this, SLOT( capturedShortcut( const KShortcut& ))); + connect( bt, TQT_SIGNAL( capturedShortcut( const KShortcut& )), + this, TQT_SLOT( capturedShortcut( const KShortcut& ))); } 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, SIGNAL(gestureRecorded(bool)), - this, SLOT(enableButtonOK(bool))); + connect(_page, TQT_SIGNAL(gestureRecorded(bool)), + this, TQT_SLOT(enableButtonOK(bool))); setMainWidget( _page ); } @@ -341,9 +341,9 @@ Voice_trigger_dialog::Voice_trigger_dialog( Voice_trigger* trigger_P ) : KDialogBase( NULL, NULL, true, "", Ok | Cancel ), // CHECKME caption _trigger( trigger_P ), _page( NULL ) { - _page = new VoiceRecordPage( _trigger ? _trigger->voicecode() : QString::null , this, "VoiceRecordPage"); + _page = new VoiceRecordPage( _trigger ? _trigger->voicecode() : TQString::null , this, "VoiceRecordPage"); - connect(_page, SIGNAL(voiceRecorded(bool)), this, SLOT(enableButtonOK(bool))); + connect(_page, TQT_SIGNAL(voiceRecorded(bool)), this, TQT_SLOT(enableButtonOK(bool))); setMainWidget( _page ); } diff --git a/khotkeys/kcontrol/triggers_tab.h b/khotkeys/kcontrol/triggers_tab.h index 57cce3e3e..824b31173 100644 --- a/khotkeys/kcontrol/triggers_tab.h +++ b/khotkeys/kcontrol/triggers_tab.h @@ -30,22 +30,22 @@ class Action_data; class Trigger_list_item; class KHotKeysShortcutList; -// A listbox here would do too, but unlike QListView, QListBox now even cannot be subclassed +// A listbox here would do too, but unlike TQListView, TQListBox now even cannot be subclassed // to behave sanely WRT selecting and the current item class Triggers_tab : public Triggers_tab_ui { Q_OBJECT public: - Triggers_tab( QWidget* parent_P = NULL, const char* name_P = NULL ); + Triggers_tab( TQWidget* parent_P = NULL, const char* name_P = NULL ); virtual ~Triggers_tab(); void set_data( const Trigger_list* data_P ); Trigger_list* get_data( Action_data* data_P ) const; public slots: void clear_data(); protected: - Trigger_list_item* create_listview_item( Trigger* trigger_P, QListView* parent_P, - QListViewItem* after_P, bool copy_P ); + Trigger_list_item* create_listview_item( Trigger* trigger_P, TQListView* parent_P, + TQListViewItem* after_P, bool copy_P ); void edit_listview_item( Trigger_list_item* item_P ); Trigger_list_item* selected_item; enum type_t { TYPE_SHORTCUT_TRIGGER, TYPE_GESTURE_TRIGGER, TYPE_WINDOW_TRIGGER, TYPE_VOICE_TRIGGER }; @@ -54,17 +54,17 @@ class Triggers_tab virtual void copy_pressed(); virtual void delete_pressed(); virtual void modify_pressed(); - virtual void current_changed( QListViewItem* item_P ); + virtual void current_changed( TQListViewItem* item_P ); }; class Trigger_list_item : public QListViewItem { public: - Trigger_list_item( QListView* parent_P, Trigger* trigger_P ); - Trigger_list_item( QListView* parent_P, QListViewItem* after_P, Trigger* trigger_P ); + Trigger_list_item( TQListView* parent_P, Trigger* trigger_P ); + Trigger_list_item( TQListView* parent_P, TQListViewItem* after_P, Trigger* trigger_P ); virtual ~Trigger_list_item(); - virtual QString text( int column_P ) const; + virtual TQString text( int column_P ) const; Trigger* trigger() const; void set_trigger( Trigger* trigger_P ); protected: @@ -84,7 +84,7 @@ class Shortcut_trigger_widget { Q_OBJECT public: - Shortcut_trigger_widget( QWidget* parent_P = NULL, const char* name_P = NULL ); + Shortcut_trigger_widget( TQWidget* parent_P = NULL, const char* name_P = NULL ); void set_data( const Shortcut_trigger* trigger_P ); Shortcut_trigger* get_data( Action_data* data_P ) const; public slots: @@ -163,15 +163,15 @@ class Voice_trigger_dialog // Trigger_list_item inline -Trigger_list_item::Trigger_list_item( QListView* parent_P, Trigger* trigger_P ) - : QListViewItem( parent_P ), _trigger( trigger_P ) +Trigger_list_item::Trigger_list_item( TQListView* parent_P, Trigger* trigger_P ) + : TQListViewItem( parent_P ), _trigger( trigger_P ) { } inline -Trigger_list_item::Trigger_list_item( QListView* parent_P, QListViewItem* after_P, +Trigger_list_item::Trigger_list_item( TQListView* parent_P, TQListViewItem* after_P, Trigger* trigger_P ) - : QListViewItem( parent_P, after_P ), _trigger( trigger_P ) + : TQListViewItem( parent_P, after_P ), _trigger( trigger_P ) { } diff --git a/khotkeys/kcontrol/voice_settings_tab.cpp b/khotkeys/kcontrol/voice_settings_tab.cpp index 684ca0cdf..612498536 100644 --- a/khotkeys/kcontrol/voice_settings_tab.cpp +++ b/khotkeys/kcontrol/voice_settings_tab.cpp @@ -11,9 +11,9 @@ #include "voice_settings_tab.h" #include <klocale.h> -#include <qcombobox.h> +#include <tqcombobox.h> #include <knuminput.h> -#include <qcheckbox.h> +#include <tqcheckbox.h> #include <kkeybutton.h> #include <kkeydialog.h> @@ -23,10 +23,10 @@ namespace KHotKeys { -Voice_settings_tab::Voice_settings_tab( QWidget* parent_P, const char* name_P ) +Voice_settings_tab::Voice_settings_tab( TQWidget* parent_P, const char* name_P ) : Voice_settings_tab_ui( parent_P, name_P ) { - connect( keyButton , SIGNAL(capturedShortcut (const KShortcut &)) , this, SLOT(slotCapturedKey( const KShortcut& ))); + connect( keyButton , TQT_SIGNAL(capturedShortcut (const KShortcut &)) , this, TQT_SLOT(slotCapturedKey( const KShortcut& ))); } void Voice_settings_tab::read_data() diff --git a/khotkeys/kcontrol/voice_settings_tab.h b/khotkeys/kcontrol/voice_settings_tab.h index 7b7abd3c5..68e37af3a 100644 --- a/khotkeys/kcontrol/voice_settings_tab.h +++ b/khotkeys/kcontrol/voice_settings_tab.h @@ -23,7 +23,7 @@ class Voice_settings_tab { Q_OBJECT public: - Voice_settings_tab( QWidget* parent = NULL, const char* name = NULL ); + Voice_settings_tab( TQWidget* parent = NULL, const char* name = NULL ); void read_data(); void write_data() const; public slots: diff --git a/khotkeys/kcontrol/voicerecorder.cpp b/khotkeys/kcontrol/voicerecorder.cpp index 92458c2ee..31578298d 100644 --- a/khotkeys/kcontrol/voicerecorder.cpp +++ b/khotkeys/kcontrol/voicerecorder.cpp @@ -8,8 +8,8 @@ ****************************************************************************/ -#include <qcolor.h> -#include <qevent.h> +#include <tqcolor.h> +#include <tqevent.h> #include "voicerecorder.h" #include "soundrecorder.h" @@ -20,8 +20,8 @@ #include <klineedit.h> #include <klocale.h> #include <ktempfile.h> -#include <qlabel.h> -#include <qpainter.h> +#include <tqlabel.h> +#include <tqpainter.h> #include <kmessagebox.h> #include <klibloader.h> #include <kstandarddirs.h> @@ -45,14 +45,14 @@ bool VoiceRecorder::init( KLibrary* lib ) return arts_play != NULL; } -VoiceRecorder::VoiceRecorder(const Sound& sound_P, const QString &voiceId, QWidget *parent, const char *name) +VoiceRecorder::VoiceRecorder(const Sound& sound_P, const TQString &voiceId, TQWidget *parent, const char *name) : 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 , SIGNAL(recorded(const Sound& )) , this , SLOT(slotSoundRecorded(const Sound& ) )); + connect (_recorder , TQT_SIGNAL(recorded(const Sound& )) , this , TQT_SLOT(slotSoundRecorded(const Sound& ) )); //if(voiceid_P.isEmpty()) emit recorded(false); @@ -89,14 +89,14 @@ void VoiceRecorder::slotPlayPressed() return; /*if(!_modified) { - QString fileName = locateLocal( "appdata", _original_voiuceid + ".wav" ); + TQString fileName = locateLocal( "appdata", _original_voiuceid + ".wav" ); arts_play( fileName ); } else {*/ if(!_tempFile) { - _tempFile=new KTempFile(QString::null,".wav"); + _tempFile=new KTempFile(TQString::null,".wav"); _tempFile->setAutoDelete(true); } _sound.save(_tempFile->name()); @@ -118,7 +118,7 @@ void VoiceRecorder::slotSoundRecorded(const Sound &sound) bool correct=drawSound() && sound.size()>50; if(correct) { - QString vm=voice_handler->isNewSoundFarEnough( VoiceSignature(sound), _voiceId); + TQString vm=voice_handler->isNewSoundFarEnough( VoiceSignature(sound), _voiceId); if(!vm.isNull()) { KMessageBox::sorry (this, i18n("The word you recorded is too close to the existing reference '%1'. Please record another word.").arg(vm) ); @@ -140,14 +140,14 @@ void VoiceRecorder::slotSoundRecorded(const Sound &sound) { if(voiceId().isEmpty()) return VoiceSignature(); - QString fileName = locateLocal( "appdata", voiceId() + ".wav" ); + TQString fileName = locateLocal( "appdata", voiceId() + ".wav" ); _sound.save( fileName ); return VoiceSignature(_sound); }*/ bool VoiceRecorder::drawSound() { - label->setText(QString::null); + label->setText(TQString::null); uint length=_sound.size(); if(length < 2) @@ -155,20 +155,20 @@ bool VoiceRecorder::drawSound() int width=label->width(); int height=label->height(); - QPixmap pix(width,height); - pix.fill(QColor(255,255,255)); - QPainter p; + TQPixmap pix(width,height); + pix.fill(TQColor(255,255,255)); + TQPainter p; p.begin(&pix); - p.setPen(QPen(QColor("green"),1)); + p.setPen(TQPen(TQColor("green"),1)); p.drawLine(0,height/2,width,height/2); - p.setPen(QPen(QColor("red"),1)); + p.setPen(TQPen(TQColor("red"),1)); uint lx=0; uint ly=height/2; - /*** DRAW THE SIGNAL ******/ + /*** DRAW THE TQT_SIGNAL ******/ for(uint f=1; f<length; f++) { uint nx=f*width/length; @@ -179,7 +179,7 @@ bool VoiceRecorder::drawSound() unsigned int start=0 , stop=0; bool res=KHotKeys::VoiceSignature::window(_sound,&start,&stop); - p.setPen(QPen(QColor("blue"),1)); + p.setPen(TQPen(TQColor("blue"),1)); if(res) { p.drawLine(start*width/length ,0,start*width/length ,height); diff --git a/khotkeys/kcontrol/voicerecorder.h b/khotkeys/kcontrol/voicerecorder.h index 579f53893..c1ac57b85 100644 --- a/khotkeys/kcontrol/voicerecorder.h +++ b/khotkeys/kcontrol/voicerecorder.h @@ -11,9 +11,9 @@ #ifndef VOICE_RECORDER_H #define VOICE_RECORDER_H -#include <qframe.h> +#include <tqframe.h> #include "ui/voice_input_widget_ui.h" -#include <qmemarray.h> +#include <tqmemarray.h> #include "sound.h" class QMouseEvent; @@ -33,7 +33,7 @@ class VoiceRecorder : public Voice_input_widget_ui Q_OBJECT public: - VoiceRecorder(const Sound& sound_P, const QString &voiceId, QWidget *parent, const char *name); + VoiceRecorder(const Sound& sound_P, const TQString &voiceId, TQWidget *parent, const char *name); ~VoiceRecorder(); Sound sound() const; @@ -46,7 +46,7 @@ class VoiceRecorder : public Voice_input_widget_ui } static bool init( KLibrary* lib ); - typedef void (*arts_play_fun)( const QString& file ); + typedef void (*arts_play_fun)( const TQString& file ); protected slots: void slotStopPressed(); @@ -64,7 +64,7 @@ class VoiceRecorder : public Voice_input_widget_ui Sound _sound; State _state; KTempFile *_tempFile; - QString _voiceId; + TQString _voiceId; static arts_play_fun arts_play; }; diff --git a/khotkeys/kcontrol/voicerecordpage.cpp b/khotkeys/kcontrol/voicerecordpage.cpp index 385d78dda..fec07e22f 100644 --- a/khotkeys/kcontrol/voicerecordpage.cpp +++ b/khotkeys/kcontrol/voicerecordpage.cpp @@ -8,9 +8,9 @@ ****************************************************************************/ -#include <qwidget.h> -#include <qlabel.h> -#include <qpushbutton.h> +#include <tqwidget.h> +#include <tqlabel.h> +#include <tqpushbutton.h> #include <klineedit.h> #include <kstandarddirs.h> @@ -25,29 +25,29 @@ namespace KHotKeys { -VoiceRecordPage::VoiceRecordPage( const QString &voiceid_P, QWidget *parent, const char *name) - : QVBox(parent, name) , _original_voiceId(voiceid_P) +VoiceRecordPage::VoiceRecordPage( const TQString &voiceid_P, TQWidget *parent, const char *name) + : TQVBox(parent, name) , _original_voiceId(voiceid_P) { _message = i18n("Enter a code for the sound (e.g. the word you are saying) and record the same word twice."); - _label = new QLabel(_message, this, "label"); - _label->setAlignment(QLabel::AlignLeft | QLabel::WordBreak | - QLabel::AlignVCenter); + _label = new TQLabel(_message, this, "label"); + _label->setAlignment(TQLabel::AlignLeft | TQLabel::WordBreak | + TQLabel::AlignVCenter); _lineEdit = new KLineEdit( this ); _lineEdit->setText(voiceid_P); Sound s; - if(voiceid_P!=QString::null) + if(voiceid_P!=TQString::null) { - QString fileName = locateLocal( "data", "khotkeys/" + voiceid_P + "1.wav" ); + TQString fileName = locateLocal( "data", "khotkeys/" + voiceid_P + "1.wav" ); s.load(fileName); } _recorder1 = new VoiceRecorder(s, voiceid_P, this, "recorder"); - if(voiceid_P!=QString::null) + if(voiceid_P!=TQString::null) { - QString fileName = locateLocal( "data", "khotkeys/" + voiceid_P + "2.wav" ); + TQString fileName = locateLocal( "data", "khotkeys/" + voiceid_P + "2.wav" ); s.load(fileName); } _recorder2 = new VoiceRecorder(s, voiceid_P, this, "recorder"); @@ -55,13 +55,13 @@ VoiceRecordPage::VoiceRecordPage( const QString &voiceid_P, QWidget *parent, con //_recorder->setMinimumHeight(150); //setStretchFactor(_recorder, 1); - QWidget *spacer = new QWidget(this, "spacer"); + TQWidget *spacer = new TQWidget(this, "spacer"); setStretchFactor(spacer, 1); - connect(_recorder1, SIGNAL(recorded(bool)) , this, SLOT(slotChanged())); - connect(_recorder2, SIGNAL(recorded(bool)) , this, SLOT(slotChanged())); - connect(_lineEdit , SIGNAL( textChanged (const QString&)) , this , SLOT(slotChanged())); + 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())); } @@ -98,7 +98,7 @@ void VoiceRecordPage::slotChanged() || (_recorder1->state()==VoiceRecorder::sModified && _recorder2->state()==VoiceRecorder::sModified ) ) ); } -QString VoiceRecordPage::getVoiceId() const +TQString VoiceRecordPage::getVoiceId() const { return _lineEdit->text(); } @@ -106,7 +106,7 @@ QString VoiceRecordPage::getVoiceId() const VoiceSignature VoiceRecordPage::getVoiceSignature(int ech) const { VoiceRecorder *recorder= (ech==1) ? _recorder1 : _recorder2 ; - QString fileName = locateLocal( "data", "khotkeys/" + getVoiceId() + QString::number(ech) + ".wav" ); + TQString fileName = locateLocal( "data", "khotkeys/" + getVoiceId() + TQString::number(ech) + ".wav" ); Sound s=recorder->sound(); s.save(fileName); return VoiceSignature(s); diff --git a/khotkeys/kcontrol/voicerecordpage.h b/khotkeys/kcontrol/voicerecordpage.h index 13389b9dc..a4a7e4d71 100644 --- a/khotkeys/kcontrol/voicerecordpage.h +++ b/khotkeys/kcontrol/voicerecordpage.h @@ -11,7 +11,7 @@ #ifndef VOICE_RECORD_PAGE_H #define VOICE_RECORD_PAGE_H -#include <qvbox.h> +#include <tqvbox.h> @@ -34,10 +34,10 @@ class VoiceRecordPage : public QVBox Q_OBJECT public: - VoiceRecordPage(const QString &voiceip_P, QWidget *parent, const char *name); + VoiceRecordPage(const TQString &voiceip_P, TQWidget *parent, const char *name); ~VoiceRecordPage(); - QString getVoiceId() const ; + TQString getVoiceId() const ; VoiceSignature getVoiceSignature(int) const; bool isModifiedSignature(int) const; @@ -51,10 +51,10 @@ class VoiceRecordPage : public QVBox VoiceRecorder *_recorder1; VoiceRecorder *_recorder2; KLineEdit *_lineEdit; - QLabel *_label; - QString _message; + TQLabel *_label; + TQString _message; - QString _original_voiceId; + TQString _original_voiceId; }; diff --git a/khotkeys/kcontrol/window_trigger_widget.cpp b/khotkeys/kcontrol/window_trigger_widget.cpp index 882112cce..c897cf14a 100644 --- a/khotkeys/kcontrol/window_trigger_widget.cpp +++ b/khotkeys/kcontrol/window_trigger_widget.cpp @@ -16,7 +16,7 @@ #include "window_trigger_widget.h" -#include <qcheckbox.h> +#include <tqcheckbox.h> #include <triggers.h> #include <actions.h> @@ -28,19 +28,19 @@ namespace KHotKeys { -Window_trigger_widget::Window_trigger_widget( QWidget* parent_P, const char* name_P ) +Window_trigger_widget::Window_trigger_widget( TQWidget* parent_P, const char* name_P ) : Window_trigger_widget_ui( parent_P, name_P ) { clear_data(); // KHotKeys::Module::changed() - connect( window_appears_checkbox, SIGNAL( clicked()), - module, SLOT( changed())); - connect( window_disappears_checkbox, SIGNAL( clicked()), - module, SLOT( changed())); - connect( window_activates_checkbox, SIGNAL( clicked()), - module, SLOT( changed())); - connect( window_deactivates_checkbox, SIGNAL( clicked()), - module, SLOT( 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())); } void Window_trigger_widget::clear_data() diff --git a/khotkeys/kcontrol/window_trigger_widget.h b/khotkeys/kcontrol/window_trigger_widget.h index 02f54df1d..c012a0bca 100644 --- a/khotkeys/kcontrol/window_trigger_widget.h +++ b/khotkeys/kcontrol/window_trigger_widget.h @@ -24,7 +24,7 @@ class Window_trigger_widget { Q_OBJECT public: - Window_trigger_widget( QWidget* parent_P = NULL, const char* name_P = NULL ); + Window_trigger_widget( TQWidget* parent_P = NULL, const char* name_P = NULL ); void set_data( const Window_trigger* trigger_P ); Window_trigger* get_data( Action_data* data_P ) const; public slots: diff --git a/khotkeys/kcontrol/windowdef_list_widget.cpp b/khotkeys/kcontrol/windowdef_list_widget.cpp index e4dffc9c4..c0bfb1529 100644 --- a/khotkeys/kcontrol/windowdef_list_widget.cpp +++ b/khotkeys/kcontrol/windowdef_list_widget.cpp @@ -17,10 +17,10 @@ #include "windowdef_list_widget.h" #include <assert.h> -#include <qpushbutton.h> -#include <qheader.h> -#include <qlineedit.h> -#include <qpopupmenu.h> +#include <tqpushbutton.h> +#include <tqheader.h> +#include <tqlineedit.h> +#include <tqpopupmenu.h> #include <kdebug.h> #include <klocale.h> @@ -37,16 +37,16 @@ namespace KHotKeys // Windowdef_list_widget -Windowdef_list_widget::Windowdef_list_widget( QWidget* parent_P, const char* name_P ) +Windowdef_list_widget::Windowdef_list_widget( TQWidget* parent_P, const char* name_P ) : Windowdef_list_widget_ui( parent_P, name_P ), autodetect_object( NULL ), autodetect_slot( NULL ), selected_item( NULL ) { - QPopupMenu* popup = new QPopupMenu; // CHECKME looks like setting parent doesn't work + TQPopupMenu* popup = new QPopupMenu; // CHECKME looks like setting parent doesn't work popup->insertItem( i18n( "Simple Window..." ), TYPE_WINDOWDEF_SIMPLE ); - connect( popup, SIGNAL( activated( int )), SLOT( new_selected( int ))); + connect( popup, TQT_SIGNAL( activated( int )), TQT_SLOT( new_selected( int ))); - connect( windows_listview, SIGNAL( doubleClicked ( QListViewItem *, const QPoint &, int ) ), - this, SLOT( modify_pressed() ) ); + connect( windows_listview, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), + this, TQT_SLOT( modify_pressed() ) ); new_button->setPopup( popup ); windows_listview->header()->hide(); windows_listview->addColumn( "" ); @@ -57,16 +57,16 @@ Windowdef_list_widget::Windowdef_list_widget( QWidget* parent_P, const char* nam delete_button->setEnabled( false ); clear_data(); // KHotKeys::Module::changed() - connect( new_button, SIGNAL( clicked()), - module, SLOT( changed())); - connect( copy_button, SIGNAL( clicked()), - module, SLOT( changed())); - connect( modify_button, SIGNAL( clicked()), - module, SLOT( changed())); - connect( delete_button, SIGNAL( clicked()), - module, SLOT( changed())); - connect( comment_lineedit, SIGNAL( textChanged( const QString& )), - module, SLOT( 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())); } Windowdef_list_widget::~Windowdef_list_widget() @@ -100,7 +100,7 @@ Windowdef_list* Windowdef_list_widget::get_data() const { // CHECKME TODO hmm, tady to bude chtit asi i children :( Windowdef_list* list = new Windowdef_list( comment_lineedit->text()); - for( QListViewItem* pos = windows_listview->firstChild(); + for( TQListViewItem* pos = windows_listview->firstChild(); pos != NULL; pos = pos->nextSibling()) list->append( static_cast< Windowdef_list_item* >( pos )->window()->copy()); @@ -148,7 +148,7 @@ void Windowdef_list_widget::modify_pressed() edit_listview_item( selected_item ); } -void Windowdef_list_widget::current_changed( QListViewItem* item_P ) +void Windowdef_list_widget::current_changed( TQListViewItem* item_P ) { // if( item_P == selected_item ) // return; @@ -160,7 +160,7 @@ void Windowdef_list_widget::current_changed( QListViewItem* item_P ) } Windowdef_list_item* Windowdef_list_widget::create_listview_item( Windowdef* window_P, - QListView* parent1_P, QListViewItem* parent2_P, QListViewItem* after_P, bool copy_P ) + TQListView* parent1_P, TQListViewItem* parent2_P, TQListViewItem* after_P, bool copy_P ) { Windowdef* new_win = copy_P ? window_P->copy() : window_P; // CHECKME uz by nemelo byt treba @@ -199,9 +199,9 @@ void Windowdef_list_widget::edit_listview_item( Windowdef_list_item* item_P ) // Windowdef_list_item -QString Windowdef_list_item::text( int column_P ) const +TQString Windowdef_list_item::text( int column_P ) const { - return column_P == 0 ? window()->description() : QString::null; + return column_P == 0 ? window()->description() : TQString::null; } Windowdef_list_item::~Windowdef_list_item() @@ -211,7 +211,7 @@ Windowdef_list_item::~Windowdef_list_item() // Windowdef_simple_dialog -Windowdef_simple_dialog::Windowdef_simple_dialog( Windowdef_simple* window_P, QObject* obj_P, +Windowdef_simple_dialog::Windowdef_simple_dialog( Windowdef_simple* window_P, TQObject* obj_P, const char* slot_P ) : KDialogBase( NULL, NULL, true, i18n( "Window Details" ), Ok | Cancel ), window( NULL ) { diff --git a/khotkeys/kcontrol/windowdef_list_widget.h b/khotkeys/kcontrol/windowdef_list_widget.h index 8a69fc5eb..b49146a85 100644 --- a/khotkeys/kcontrol/windowdef_list_widget.h +++ b/khotkeys/kcontrol/windowdef_list_widget.h @@ -11,7 +11,7 @@ #ifndef _WINDOWDEF_LIST_WIDGET_H_ #define _WINDOWDEF_LIST_WIDGET_H_ -#include <qlistview.h> +#include <tqlistview.h> #include <kdialogbase.h> @@ -32,16 +32,16 @@ class Windowdef_list_widget { Q_OBJECT public: - Windowdef_list_widget( QWidget* parent_P = NULL, const char* name_P = NULL ); + Windowdef_list_widget( TQWidget* parent_P = NULL, const char* name_P = NULL ); virtual ~Windowdef_list_widget(); void set_data( const Windowdef_list* data_P ); Windowdef_list* get_data() const; - void set_autodetect( QObject* obj_P, const char* slot_P ); + void set_autodetect( TQObject* obj_P, const char* slot_P ); public slots: void clear_data(); protected: - Windowdef_list_item* create_listview_item( Windowdef* window_P, QListView* parent1_P, - QListViewItem* parent2_P, QListViewItem* after_P, bool copy_P ); + Windowdef_list_item* create_listview_item( Windowdef* window_P, TQListView* parent1_P, + TQListViewItem* parent2_P, TQListViewItem* after_P, bool copy_P ); void edit_listview_item( Windowdef_list_item* item_P ); enum type_t { TYPE_WINDOWDEF_SIMPLE }; protected slots: @@ -49,9 +49,9 @@ class Windowdef_list_widget virtual void copy_pressed(); virtual void delete_pressed(); virtual void modify_pressed(); - virtual void current_changed( QListViewItem* item_P ); + virtual void current_changed( TQListViewItem* item_P ); protected: - QObject* autodetect_object; + TQObject* autodetect_object; const char* autodetect_slot; Windowdef_list_item* selected_item; }; @@ -62,12 +62,12 @@ class Windowdef_list_item : public QListViewItem { public: - Windowdef_list_item( QListView* parent_P, Windowdef* window_P ); - Windowdef_list_item( QListViewItem* parent_P, Windowdef* window_P ); - Windowdef_list_item( QListView* parent_P, QListViewItem* after_P, Windowdef* window_P ); - Windowdef_list_item( QListViewItem* parent_P, QListViewItem* after_P, Windowdef* window_P ); + Windowdef_list_item( TQListView* parent_P, Windowdef* window_P ); + Windowdef_list_item( TQListViewItem* parent_P, Windowdef* window_P ); + Windowdef_list_item( TQListView* parent_P, TQListViewItem* after_P, Windowdef* window_P ); + Windowdef_list_item( TQListViewItem* parent_P, TQListViewItem* after_P, Windowdef* window_P ); virtual ~Windowdef_list_item(); - virtual QString text( int column_P ) const; + virtual TQString text( int column_P ) const; Windowdef* window() const; void set_window( Windowdef* window_P ); protected: @@ -86,7 +86,7 @@ class Windowdef_simple_dialog { Q_OBJECT public: - Windowdef_simple_dialog( Windowdef_simple* window_P, QObject* obj_P, const char* slot_P ); + Windowdef_simple_dialog( Windowdef_simple* window_P, TQObject* obj_P, const char* slot_P ); virtual Windowdef* edit_windowdef(); protected: virtual void accept(); @@ -101,7 +101,7 @@ class Windowdef_simple_dialog // Windowdef_list_widget inline -void Windowdef_list_widget::set_autodetect( QObject* obj_P, const char* slot_P ) +void Windowdef_list_widget::set_autodetect( TQObject* obj_P, const char* slot_P ) { autodetect_object = obj_P; autodetect_slot = slot_P; @@ -110,28 +110,28 @@ void Windowdef_list_widget::set_autodetect( QObject* obj_P, const char* slot_P ) // Windowdef_list_item inline -Windowdef_list_item::Windowdef_list_item( QListView* parent_P, Windowdef* window_P ) - : QListViewItem( parent_P ), _window( window_P ) +Windowdef_list_item::Windowdef_list_item( TQListView* parent_P, Windowdef* window_P ) + : TQListViewItem( parent_P ), _window( window_P ) { } inline -Windowdef_list_item::Windowdef_list_item( QListViewItem* parent_P, Windowdef* window_P ) - : QListViewItem( parent_P ), _window( window_P ) +Windowdef_list_item::Windowdef_list_item( TQListViewItem* parent_P, Windowdef* window_P ) + : TQListViewItem( parent_P ), _window( window_P ) { } inline -Windowdef_list_item::Windowdef_list_item( QListView* parent_P, QListViewItem* after_P, +Windowdef_list_item::Windowdef_list_item( TQListView* parent_P, TQListViewItem* after_P, Windowdef* window_P ) - : QListViewItem( parent_P, after_P ), _window( window_P ) + : TQListViewItem( parent_P, after_P ), _window( window_P ) { } inline -Windowdef_list_item::Windowdef_list_item( QListViewItem* parent_P, QListViewItem* after_P, +Windowdef_list_item::Windowdef_list_item( TQListViewItem* parent_P, TQListViewItem* after_P, Windowdef* window_P ) - : QListViewItem( parent_P, after_P ), _window( window_P ) + : TQListViewItem( parent_P, after_P ), _window( window_P ) { } diff --git a/khotkeys/kcontrol/windowdef_simple_widget.cpp b/khotkeys/kcontrol/windowdef_simple_widget.cpp index f0749e476..f79d81ea1 100644 --- a/khotkeys/kcontrol/windowdef_simple_widget.cpp +++ b/khotkeys/kcontrol/windowdef_simple_widget.cpp @@ -16,10 +16,10 @@ #include "windowdef_simple_widget.h" -#include <qlineedit.h> -#include <qcombobox.h> -#include <qcheckbox.h> -#include <qpushbutton.h> +#include <tqlineedit.h> +#include <tqcombobox.h> +#include <tqcheckbox.h> +#include <tqpushbutton.h> #include <kdebug.h> #include <windows.h> @@ -31,37 +31,37 @@ namespace KHotKeys { -Windowdef_simple_widget::Windowdef_simple_widget( QWidget* parent_P, const char* name_P ) +Windowdef_simple_widget::Windowdef_simple_widget( TQWidget* parent_P, const char* name_P ) : Windowdef_simple_widget_ui( parent_P, name_P ) { window_title_lineedit->setEnabled( false ); window_class_lineedit->setEnabled( false ); window_role_lineedit->setEnabled( false ); - connect( autodetect_button, SIGNAL( clicked()), SLOT( autodetect_clicked())); + connect( autodetect_button, TQT_SIGNAL( clicked()), TQT_SLOT( autodetect_clicked())); clear_data(); // KHotKeys::Module::changed() - connect( window_title_combo, SIGNAL( activated( int )), - module, SLOT( changed())); - connect( window_title_lineedit, SIGNAL( textChanged( const QString& )), - module, SLOT( changed())); - connect( window_class_combo, SIGNAL( activated( int )), - module, SLOT( changed())); - connect( window_class_lineedit, SIGNAL( textChanged( const QString& )), - module, SLOT( changed())); - connect( window_role_combo, SIGNAL( activated( int )), - module, SLOT( changed())); - connect( window_role_lineedit, SIGNAL( textChanged( const QString& )), - module, SLOT( changed())); - connect( type_normal_checkbox, SIGNAL( clicked()), - module, SLOT( changed())); - connect( type_dialog_checkbox, SIGNAL( clicked()), - module, SLOT( changed())); - connect( type_dock_checkbox, SIGNAL( clicked()), - module, SLOT( changed())); - connect( type_desktop_checkbox, SIGNAL( clicked()), - module, SLOT( changed())); - connect( comment_lineedit, SIGNAL( textChanged( const QString& )), - module, SLOT( 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())); } void Windowdef_simple_widget::clear_data() @@ -142,11 +142,11 @@ void Windowdef_simple_widget::window_title_combo_changed( int item_P ) window_title_lineedit->setEnabled( item_P != 0 ); } -void Windowdef_simple_widget::set_autodetect( QObject* obj_P, const char* slot_P ) +void Windowdef_simple_widget::set_autodetect( TQObject* obj_P, const char* slot_P ) { - disconnect( SIGNAL( autodetect_signal())); + disconnect( TQT_SIGNAL( autodetect_signal())); if( obj_P != NULL ) - connect( this, SIGNAL( autodetect_signal()), obj_P, slot_P ); + connect( this, TQT_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( this, SLOT( autodetect_window_selected( WId ))); + WindowSelector* sel = new WindowSelector( this, TQT_SLOT( autodetect_window_selected( WId ))); sel->select(); } diff --git a/khotkeys/kcontrol/windowdef_simple_widget.h b/khotkeys/kcontrol/windowdef_simple_widget.h index e6777b6ee..26db6fd87 100644 --- a/khotkeys/kcontrol/windowdef_simple_widget.h +++ b/khotkeys/kcontrol/windowdef_simple_widget.h @@ -24,10 +24,10 @@ class Windowdef_simple_widget { Q_OBJECT public: - Windowdef_simple_widget( QWidget* parent_P = NULL, const char* name_P = NULL ); + Windowdef_simple_widget( TQWidget* parent_P = NULL, const char* name_P = NULL ); void set_data( const Windowdef_simple* data_P ); Windowdef_simple* get_data() const; - void set_autodetect( QObject* obj_P, const char* slot_P ); + void set_autodetect( TQObject* obj_P, const char* slot_P ); public slots: void clear_data(); protected: diff --git a/khotkeys/kcontrol/windowselector.cpp b/khotkeys/kcontrol/windowselector.cpp index a754b422d..d6e562df3 100644 --- a/khotkeys/kcontrol/windowselector.cpp +++ b/khotkeys/kcontrol/windowselector.cpp @@ -18,7 +18,7 @@ #include "voices.h" -#include <qcursor.h> +#include <tqcursor.h> #include <kdebug.h> #include <kapplication.h> #include <X11/Xlib.h> @@ -27,14 +27,14 @@ namespace KHotKeys { -WindowSelector::WindowSelector( QObject* receiver_P, const char* slot_P ) +WindowSelector::WindowSelector( TQObject* receiver_P, const char* slot_P ) { - connect( this, SIGNAL( selected_signal( WId )), receiver_P, slot_P ); + connect( this, TQT_SIGNAL( selected_signal( WId )), receiver_P, slot_P ); } void WindowSelector::select() { - kapp->desktop()->grabMouse( QCursor( crossCursor )); + kapp->desktop()->grabMouse( TQCursor( crossCursor )); kapp->installX11EventFilter( this ); } diff --git a/khotkeys/kcontrol/windowselector.h b/khotkeys/kcontrol/windowselector.h index 3a28853ed..4f52312ea 100644 --- a/khotkeys/kcontrol/windowselector.h +++ b/khotkeys/kcontrol/windowselector.h @@ -11,7 +11,7 @@ #ifndef _WINDOWSELECTOR_H_ #define _WINDOWSELECTOR_H_ -#include <qwidget.h> +#include <tqwidget.h> namespace KHotKeys { @@ -21,7 +21,7 @@ class WindowSelector { Q_OBJECT public: - WindowSelector( QObject* receiver, const char* slot ); + WindowSelector( TQObject* receiver, const char* slot ); void select(); protected: virtual bool x11Event( XEvent* e ); |