diff options
Diffstat (limited to 'khotkeys')
64 files changed, 320 insertions, 320 deletions
diff --git a/khotkeys/app/app.cpp b/khotkeys/app/app.cpp index 3391ca1aa..d56ff1eb2 100644 --- a/khotkeys/app/app.cpp +++ b/khotkeys/app/app.cpp @@ -112,7 +112,7 @@ int KDE_EXPORT kdemain( int argc, char** argv ) XCloseDisplay(dpy); dpy = 0; - if ((pos = displayname.findRev('.')) != -1) + if ((pos = displayname.tqfindRev('.')) != -1) displayname.remove(pos, 10); TQCString env; diff --git a/khotkeys/arts/soundrecorder_arts.cpp b/khotkeys/arts/soundrecorder_arts.cpp index e600e1730..0faf71002 100644 --- a/khotkeys/arts/soundrecorder_arts.cpp +++ b/khotkeys/arts/soundrecorder_arts.cpp @@ -95,7 +95,7 @@ Sound SoundRecorderArts::sound() Sound s; uint BytePS=BITS/8; uint length=m_data.size()/BytePS; - TQMemArray<Q_INT32> da(length); + TQMemArray<TQ_INT32> da(length); s.max=0; s._fs=FS; for(uint f=0;f<length; f++) diff --git a/khotkeys/kcontrol/action_list_widget.cpp b/khotkeys/kcontrol/action_list_widget.cpp index 95aa7db89..b4a4d5693 100644 --- a/khotkeys/kcontrol/action_list_widget.cpp +++ b/khotkeys/kcontrol/action_list_widget.cpp @@ -151,7 +151,7 @@ void Action_list_widget::copy_pressed() if ( !selected_item ) return; actions_listview->setSelected( create_listview_item( selected_item->action(), - selected_item->parent() ? NULL : actions_listview, selected_item->parent(), + selected_item->tqparent() ? NULL : actions_listview, selected_item->tqparent(), selected_item, true ), true ); } @@ -222,7 +222,7 @@ void Action_list_widget::edit_listview_item( Action_list_item* item_P ) { item_P->set_action( new_action ); item_P->widthChanged( 0 ); - actions_listview->repaintItem( item_P ); + actions_listview->tqrepaintItem( item_P ); } delete dlg; } diff --git a/khotkeys/kcontrol/action_list_widget.h b/khotkeys/kcontrol/action_list_widget.h index b49a1315a..c2f32477e 100644 --- a/khotkeys/kcontrol/action_list_widget.h +++ b/khotkeys/kcontrol/action_list_widget.h @@ -61,7 +61,7 @@ class Action_list_widget typedef Action_list_widget Action_list_tab; class Action_list_item - : public QListViewItem + : public TQListViewItem { public: Action_list_item( TQListView* parent_P, Action* action_P ); diff --git a/khotkeys/kcontrol/actions_listview_widget.cpp b/khotkeys/kcontrol/actions_listview_widget.cpp index 5048289df..f9f390fe2 100644 --- a/khotkeys/kcontrol/actions_listview_widget.cpp +++ b/khotkeys/kcontrol/actions_listview_widget.cpp @@ -49,7 +49,7 @@ Actions_listview_widget::Actions_listview_widget( TQWidget* parent_P, const char void Actions_listview_widget::action_name_changed( const TQString& ) { current_action()->widthChanged( 0 ); - actions_listview->repaintItem( current_action()); + actions_listview->tqrepaintItem( current_action()); } void Actions_listview_widget::set_action_data( Action_data_base* data_P, bool recent_action_P ) @@ -92,7 +92,7 @@ void Actions_listview_widget::new_action( Action_data_base* data_P ) if( dynamic_cast< Action_data_group* >( current_action()->data()) != NULL ) parent = current_action(); else - parent = current_action()->parent(); + parent = current_action()->tqparent(); } if( parent ) parent->setOpen( true ); @@ -124,7 +124,7 @@ void Actions_listview_widget::delete_action() 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()); + Action_listview_item* parent = static_cast< Action_listview_item* >( item->tqparent()); if( parent == NULL ) item->data()->reparent( module->actions_root()); else if( Action_data_group* group = dynamic_cast< Action_data_group* >( parent->data())) diff --git a/khotkeys/kcontrol/actions_listview_widget.h b/khotkeys/kcontrol/actions_listview_widget.h index a5a810aa1..0f3a632f4 100644 --- a/khotkeys/kcontrol/actions_listview_widget.h +++ b/khotkeys/kcontrol/actions_listview_widget.h @@ -66,7 +66,7 @@ class Actions_listview // CHECKME a jak to bude s parent itemu, kdyz Action_data uz maji vlastni parent ? class Action_listview_item - : public QListViewItem + : public TQListViewItem { public: virtual TQString text( int column_P ) const; diff --git a/khotkeys/kcontrol/condition_list_widget.cpp b/khotkeys/kcontrol/condition_list_widget.cpp index 86ff8f47c..3076883ca 100644 --- a/khotkeys/kcontrol/condition_list_widget.cpp +++ b/khotkeys/kcontrol/condition_list_widget.cpp @@ -165,9 +165,9 @@ void Condition_list_widget::new_selected( int type_P ) parent = NULL; } } - if( parent == NULL && selected_item != NULL && selected_item->parent() != NULL ) + if( parent == NULL && selected_item != NULL && selected_item->tqparent() != NULL ) { - parent = static_cast< Condition_list_item* >( selected_item->parent()); + parent = static_cast< Condition_list_item* >( selected_item->tqparent()); after = selected_item; } Condition_list_base* parent_cond = parent @@ -217,8 +217,8 @@ void Condition_list_widget::copy_pressed() return; conditions_listview->setSelected( create_listview_item( selected_item->condition()->copy( selected_item->condition()->parent()), - selected_item->parent() ? NULL : conditions_listview, - static_cast< Condition_list_item* >( selected_item->parent()), + selected_item->tqparent() ? NULL : conditions_listview, + static_cast< Condition_list_item* >( selected_item->tqparent()), selected_item, true ), true ); } @@ -321,14 +321,14 @@ void Condition_list_widget::edit_listview_item( Condition_list_item* item_P ) { Condition* old_cond = item_P->condition(); item_P->set_condition( new_condition ); - int pos = conditions.find( old_cond ); + int pos = conditions.tqfind( old_cond ); if( pos >= 0 ) { conditions.remove( pos ); // we own it conditions.insert( pos, new_condition ); } item_P->widthChanged( 0 ); - conditions_listview->repaintItem( item_P ); + conditions_listview->tqrepaintItem( item_P ); } #ifdef KHOTKEYS_DEBUG kdDebug( 1217 ) << "Condition_list_widget::edit_listview_item():" << endl; diff --git a/khotkeys/kcontrol/condition_list_widget.h b/khotkeys/kcontrol/condition_list_widget.h index 9dd441ae3..0c99fd46c 100644 --- a/khotkeys/kcontrol/condition_list_widget.h +++ b/khotkeys/kcontrol/condition_list_widget.h @@ -60,7 +60,7 @@ class Condition_list_widget typedef Condition_list_widget Condition_list_tab; class Condition_list_item - : public QListViewItem + : public TQListViewItem { public: Condition_list_item( TQListView* parent_P, Condition* condition_P ); diff --git a/khotkeys/kcontrol/gesturedrawer.cpp b/khotkeys/kcontrol/gesturedrawer.cpp index 817eeab89..d0d144382 100644 --- a/khotkeys/kcontrol/gesturedrawer.cpp +++ b/khotkeys/kcontrol/gesturedrawer.cpp @@ -20,7 +20,7 @@ namespace KHotKeys GestureDrawer::GestureDrawer(TQWidget *parent, const char *name) : TQFrame(parent, name), _data(TQString::null) { - setBackgroundColor( colorGroup().base()); + setBackgroundColor( tqcolorGroup().base()); setFrameStyle(TQFrame::Panel | TQFrame::Sunken); setMinimumSize(30, 30); } @@ -33,14 +33,14 @@ void GestureDrawer::setData(const TQString &data) { _data = data; - repaint(); + tqrepaint(); } 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; + TQ_UINT32 startCell = 0; + TQ_UINT32 endCell = 0; TQPoint startPoint; TQPoint endPoint; @@ -51,7 +51,7 @@ void GestureDrawer::paintEvent(TQPaintEvent *ev) startCell = TQString(_data[0]).toUInt(); } - for (Q_UINT32 index = 1; index < _data.length(); ++index) + for (TQ_UINT32 index = 1; index < _data.length(); ++index) { endCell = TQString(_data[index]).toUInt(); @@ -77,14 +77,14 @@ void GestureDrawer::paintEvent(TQPaintEvent *ev) TQFrame::paintEvent(ev); } -TQPoint GestureDrawer::lookupCellCoords(Q_UINT32 cell) +TQPoint GestureDrawer::lookupCellCoords(TQ_UINT32 cell) { // First divide the widget into thirds, horizontally and vertically - Q_UINT32 w = width(); - Q_UINT32 h = height(); + TQ_UINT32 w = width(); + TQ_UINT32 h = height(); - Q_UINT32 wThird = w / 3; - Q_UINT32 hThird = h / 3; + TQ_UINT32 wThird = w / 3; + TQ_UINT32 hThird = h / 3; switch(cell) { diff --git a/khotkeys/kcontrol/gesturedrawer.h b/khotkeys/kcontrol/gesturedrawer.h index 50fe5db67..b199ab64a 100644 --- a/khotkeys/kcontrol/gesturedrawer.h +++ b/khotkeys/kcontrol/gesturedrawer.h @@ -22,7 +22,7 @@ namespace KHotKeys { -class GestureDrawer : public QFrame +class GestureDrawer : public TQFrame { Q_OBJECT public: @@ -31,13 +31,13 @@ class GestureDrawer : public QFrame void setData(const TQString &data); - virtual TQSize sizeHint() const { return TQSize(30, 30); } + virtual TQSize tqsizeHint() const { return TQSize(30, 30); } protected: void paintEvent(TQPaintEvent *ev); private: - TQPoint lookupCellCoords(Q_UINT32 cell); + TQPoint lookupCellCoords(TQ_UINT32 cell); void drawArrowHead(TQPoint &start, TQPoint &end, TQPainter &p); diff --git a/khotkeys/kcontrol/gesturerecorder.cpp b/khotkeys/kcontrol/gesturerecorder.cpp index 58a177910..b4bba18d9 100644 --- a/khotkeys/kcontrol/gesturerecorder.cpp +++ b/khotkeys/kcontrol/gesturerecorder.cpp @@ -20,7 +20,7 @@ namespace KHotKeys GestureRecorder::GestureRecorder(TQWidget *parent, const char *name) : TQFrame(parent, name), _mouseButtonDown(false) { - setBackgroundColor( colorGroup().base()); + setBackgroundColor( tqcolorGroup().base()); setFrameStyle(TQFrame::Sunken | TQFrame::Panel); setLineWidth(2); setMidLineWidth(0); @@ -32,7 +32,7 @@ GestureRecorder::~GestureRecorder() void GestureRecorder::mousePressEvent(TQMouseEvent *ev) { - if (ev->button() == TQMouseEvent::LeftButton) + if (ev->button() == Qt::LeftButton) { _mouseButtonDown = true; stroke.reset(); @@ -43,7 +43,7 @@ void GestureRecorder::mousePressEvent(TQMouseEvent *ev) void GestureRecorder::mouseReleaseEvent(TQMouseEvent *ev) { - if ((ev->button() == TQMouseEvent::LeftButton) && (_mouseButtonDown)) + if ((ev->button() == Qt::LeftButton) && (_mouseButtonDown)) { TQPoint pos = ev->pos(); stroke.record(pos.x(), pos.y()); diff --git a/khotkeys/kcontrol/gesturerecorder.h b/khotkeys/kcontrol/gesturerecorder.h index d8ca34a72..e42de2c0e 100644 --- a/khotkeys/kcontrol/gesturerecorder.h +++ b/khotkeys/kcontrol/gesturerecorder.h @@ -22,7 +22,7 @@ class TQMouseEvent; namespace KHotKeys { -class GestureRecorder : public QFrame +class GestureRecorder : public TQFrame { Q_OBJECT diff --git a/khotkeys/kcontrol/gesturerecordpage.cpp b/khotkeys/kcontrol/gesturerecordpage.cpp index af2fb8cdc..ef59a4a99 100644 --- a/khotkeys/kcontrol/gesturerecordpage.cpp +++ b/khotkeys/kcontrol/gesturerecordpage.cpp @@ -43,7 +43,7 @@ GestureRecordPage::GestureRecordPage(const TQString &gesture, "button below.\n\nDraw here:"); TQLabel *label = new TQLabel(message, this, "label"); - label->setAlignment(TQLabel::AlignLeft | TQLabel::WordBreak | + label->tqsetAlignment(TQLabel::AlignLeft | TQLabel::WordBreak | TQLabel::AlignVCenter); _recorder = new GestureRecorder(this, "recorder"); diff --git a/khotkeys/kcontrol/gesturerecordpage.h b/khotkeys/kcontrol/gesturerecordpage.h index 99242c518..306710c0e 100644 --- a/khotkeys/kcontrol/gesturerecordpage.h +++ b/khotkeys/kcontrol/gesturerecordpage.h @@ -26,7 +26,7 @@ namespace KHotKeys class Gesture; class GestureRecorder; -class GestureRecordPage : public QVBox +class GestureRecordPage : public TQVBox { Q_OBJECT @@ -53,7 +53,7 @@ class GestureRecordPage : public QVBox TQString _gest; - Q_UINT32 _tryCount; + TQ_UINT32 _tryCount; }; } // namespace KHotKeys diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp index 5d540d4c9..eb38ef7cc 100644 --- a/khotkeys/kcontrol/kcmkhotkeys.cpp +++ b/khotkeys/kcontrol/kcmkhotkeys.cpp @@ -67,7 +67,7 @@ Module::Module( TQWidget* parent_P, const char* ) { setButtons( Help | Cancel | Apply | Ok ); module = this; - init_global_data( false, this ); // don't grab keys + init_global_data( false, TQT_TQOBJECT(this) ); // don't grab keys init_arts(); TQVBoxLayout* vbox = new TQVBoxLayout( this ); vbox->setSpacing( 6 ); @@ -272,14 +272,14 @@ void Module::set_gestures_exclude( Windowdef_list* windows ) void Module::import() { - TQString file = KFileDialog::getOpenFileName( TQString::null, "*.khotkeys", topLevelWidget(), + TQString file = KFileDialog::getOpenFileName( TQString::null, "*.khotkeys", tqtopLevelWidget(), i18n( "Select File with Actions to Be Imported" )); if( file.isEmpty()) return; KSimpleConfig cfg( file, true ); if( !settings.import( cfg, true )) { - KMessageBox::error( topLevelWidget(), + KMessageBox::error( tqtopLevelWidget(), i18n( "Import of the specified file failed. Most probably the file is not a valid " "file with actions." )); return; diff --git a/khotkeys/kcontrol/main_buttons_widget.cpp b/khotkeys/kcontrol/main_buttons_widget.cpp index 3532cc13f..ec0671e40 100644 --- a/khotkeys/kcontrol/main_buttons_widget.cpp +++ b/khotkeys/kcontrol/main_buttons_widget.cpp @@ -38,7 +38,7 @@ Main_buttons_widget::Main_buttons_widget( TQWidget* parent_P, const char* name_P 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 + setMaximumHeight( tqsizeHint().height()); // it gets too high and I have no idea why } void Main_buttons_widget::enable_delete( bool enable_P ) diff --git a/khotkeys/kcontrol/tab_widget.cpp b/khotkeys/kcontrol/tab_widget.cpp index 243543519..7f8aa1396 100644 --- a/khotkeys/kcontrol/tab_widget.cpp +++ b/khotkeys/kcontrol/tab_widget.cpp @@ -434,7 +434,7 @@ const char* const Tab_widget::tab_labels[ Tab_widget::TAB_END ] = { void Tab_widget::show_pages( const Pages_set& pages_P ) { - hide(); // this seems to be necessary, otherwise it's not repainter properly + hide(); // this seems to be necessary, otherwise it's not tqrepainter properly for( tab_pos_t i = TAB_FIRST; i < TAB_END; ++i ) diff --git a/khotkeys/kcontrol/tab_widget.h b/khotkeys/kcontrol/tab_widget.h index 84fd6af84..81fb9e4ad 100644 --- a/khotkeys/kcontrol/tab_widget.h +++ b/khotkeys/kcontrol/tab_widget.h @@ -19,7 +19,7 @@ namespace KHotKeys { class Tab_widget - : public QTabWidget + : public TQTabWidget { Q_OBJECT public: diff --git a/khotkeys/kcontrol/triggers_tab.cpp b/khotkeys/kcontrol/triggers_tab.cpp index 2533b58a0..12cd12452 100644 --- a/khotkeys/kcontrol/triggers_tab.cpp +++ b/khotkeys/kcontrol/triggers_tab.cpp @@ -241,8 +241,8 @@ void Shortcut_trigger_widget::clear_data() void Shortcut_trigger_widget::capturedShortcut( const KShortcut& s_P ) { - if( KKeyChooser::checkGlobalShortcutsConflict( s_P, true, topLevelWidget()) - || KKeyChooser::checkStandardShortcutsConflict( s_P, true, topLevelWidget())) + if( KKeyChooser::checkGlobalShortcutsConflict( s_P, true, tqtopLevelWidget()) + || KKeyChooser::checkStandardShortcutsConflict( s_P, true, tqtopLevelWidget())) return; // KHotKeys::Module::changed() module->changed(); diff --git a/khotkeys/kcontrol/triggers_tab.h b/khotkeys/kcontrol/triggers_tab.h index 824b31173..89b674a7b 100644 --- a/khotkeys/kcontrol/triggers_tab.h +++ b/khotkeys/kcontrol/triggers_tab.h @@ -58,7 +58,7 @@ class Triggers_tab }; class Trigger_list_item - : public QListViewItem + : public TQListViewItem { public: Trigger_list_item( TQListView* parent_P, Trigger* trigger_P ); @@ -80,7 +80,7 @@ class Trigger_dialog // TODO no need for such extra class? class Shortcut_trigger_widget - : public QWidget + : public TQWidget { Q_OBJECT public: diff --git a/khotkeys/kcontrol/ui/action_group_tab_ui.ui b/khotkeys/kcontrol/ui/action_group_tab_ui.ui index ad4bcceaf..16a4ebee1 100644 --- a/khotkeys/kcontrol/ui/action_group_tab_ui.ui +++ b/khotkeys/kcontrol/ui/action_group_tab_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>KHotKeys::Action_group_tab_ui</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Action_group_tab_ui</cstring> </property> @@ -22,7 +22,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>action_group_name_label</cstring> </property> @@ -33,7 +33,7 @@ <cstring>action_name_lineedit</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>action_name_lineedit</cstring> </property> @@ -48,14 +48,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>disable_checkbox</cstring> </property> @@ -73,14 +73,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>comment_label</cstring> </property> diff --git a/khotkeys/kcontrol/ui/action_list_widget_ui.ui b/khotkeys/kcontrol/ui/action_list_widget_ui.ui index 696b5106a..8cd292afd 100644 --- a/khotkeys/kcontrol/ui/action_list_widget_ui.ui +++ b/khotkeys/kcontrol/ui/action_list_widget_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>KHotKeys::Action_list_widget_ui</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Action_list_widget_ui</cstring> </property> @@ -22,7 +22,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>comment_label</cstring> </property> @@ -33,12 +33,12 @@ <cstring>comment_lineedit</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>comment_lineedit</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout3</cstring> </property> @@ -51,7 +51,7 @@ <cstring>actions_listview</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -65,7 +65,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>new_button</cstring> </property> @@ -73,7 +73,7 @@ <string>&New</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>modify_button</cstring> </property> @@ -81,7 +81,7 @@ <string>&Modify...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>copy_button</cstring> </property> @@ -89,7 +89,7 @@ <string>&Copy</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>delete_button</cstring> </property> diff --git a/khotkeys/kcontrol/ui/actions_listview_widget_ui.ui b/khotkeys/kcontrol/ui/actions_listview_widget_ui.ui index 7c0a88a6f..a2589fc48 100644 --- a/khotkeys/kcontrol/ui/actions_listview_widget_ui.ui +++ b/khotkeys/kcontrol/ui/actions_listview_widget_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KHotKeys::Actions_listview_widget_ui</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Actions_listview_widget_ui</cstring> </property> @@ -22,7 +22,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>actions_listview_groupbox</cstring> </property> @@ -72,7 +72,7 @@ </image> </images> <forwards> - <forward>class QListViewItem;</forward> + <forward>class TQListViewItem;</forward> </forwards> <includes> <include location="global" impldecl="in implementation">kdialog.h</include> diff --git a/khotkeys/kcontrol/ui/command_url_widget_ui.ui b/khotkeys/kcontrol/ui/command_url_widget_ui.ui index 266dd90d9..041aeacf4 100644 --- a/khotkeys/kcontrol/ui/command_url_widget_ui.ui +++ b/khotkeys/kcontrol/ui/command_url_widget_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>KHotKeys::Command_url_widget_ui</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Command_url_widget_ui</cstring> </property> @@ -22,7 +22,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout2</cstring> </property> @@ -30,7 +30,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>command_url_label</cstring> </property> diff --git a/khotkeys/kcontrol/ui/condition_list_widget_ui.ui b/khotkeys/kcontrol/ui/condition_list_widget_ui.ui index a64ef33c1..c8969d531 100644 --- a/khotkeys/kcontrol/ui/condition_list_widget_ui.ui +++ b/khotkeys/kcontrol/ui/condition_list_widget_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>KHotKeys::Condition_list_widget_ui</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Condition_list_widget_ui</cstring> </property> @@ -22,7 +22,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>comment_label</cstring> </property> @@ -33,12 +33,12 @@ <cstring>comment_lineedit</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>comment_lineedit</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout6</cstring> </property> @@ -51,7 +51,7 @@ <cstring>conditions_listview</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -65,7 +65,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>new_button</cstring> </property> @@ -73,7 +73,7 @@ <string>&New</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>modify_button</cstring> </property> @@ -81,7 +81,7 @@ <string>&Modify...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>copy_button</cstring> </property> @@ -89,7 +89,7 @@ <string>&Copy</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>delete_button</cstring> </property> diff --git a/khotkeys/kcontrol/ui/dcop_widget_ui.ui b/khotkeys/kcontrol/ui/dcop_widget_ui.ui index ed6e90337..173e7d7aa 100644 --- a/khotkeys/kcontrol/ui/dcop_widget_ui.ui +++ b/khotkeys/kcontrol/ui/dcop_widget_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>KHotKeys::Dcop_widget_ui</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Dcop_widget_ui</cstring> </property> @@ -22,7 +22,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>remote_app_label</cstring> </property> @@ -33,7 +33,7 @@ <cstring>remote_app_lineedit</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>remote_app_lineedit</cstring> </property> @@ -48,14 +48,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>remote_object_label</cstring> </property> @@ -66,7 +66,7 @@ <cstring>remote_object_lineedit</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>remote_object_lineedit</cstring> </property> @@ -81,14 +81,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>called_function_label</cstring> </property> @@ -99,7 +99,7 @@ <cstring>called_function_lineedit</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>called_function_lineedit</cstring> </property> @@ -114,14 +114,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>arguments_label</cstring> </property> @@ -132,7 +132,7 @@ <cstring>arguments_lineedit</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>arguments_lineedit</cstring> </property> @@ -147,14 +147,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -178,14 +178,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>try_button</cstring> </property> @@ -203,14 +203,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>PushButton1</cstring> </property> @@ -228,7 +228,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> diff --git a/khotkeys/kcontrol/ui/general_settings_tab_ui.ui b/khotkeys/kcontrol/ui/general_settings_tab_ui.ui index 60dc34237..2463d3f2c 100644 --- a/khotkeys/kcontrol/ui/general_settings_tab_ui.ui +++ b/khotkeys/kcontrol/ui/general_settings_tab_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>General_settings_tab_ui</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>General_settings_tab_ui</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>disable_daemon_checkbox</cstring> </property> @@ -24,7 +24,7 @@ <string>Disable KHotKeys daemon</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout1</cstring> </property> @@ -42,7 +42,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -67,7 +67,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> diff --git a/khotkeys/kcontrol/ui/general_tab_ui.ui b/khotkeys/kcontrol/ui/general_tab_ui.ui index 93f3a6a2c..3d19b3256 100644 --- a/khotkeys/kcontrol/ui/general_tab_ui.ui +++ b/khotkeys/kcontrol/ui/general_tab_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>KHotKeys::General_tab_ui</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>General_tab_ui</cstring> </property> @@ -22,7 +22,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>action_name_label</cstring> </property> @@ -33,12 +33,12 @@ <cstring>action_name_lineedit</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>action_name_lineedit</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -52,7 +52,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>action_type_label</cstring> </property> @@ -63,7 +63,7 @@ <cstring>action_type_combo</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>action_type_combo</cstring> </property> @@ -80,14 +80,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>disable_checkbox</cstring> </property> @@ -105,14 +105,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>comment_label</cstring> </property> diff --git a/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui b/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui index 29f8f88d5..9e843764f 100644 --- a/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui +++ b/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>KHotKeys::Gesture_triggers_tab_ui</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Gesture_triggers_tab_ui</cstring> </property> @@ -22,7 +22,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -46,14 +46,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>30</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout5</cstring> </property> @@ -77,14 +77,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>0</height> </size> </property> </spacer> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>gesture_lineedit1</cstring> </property> @@ -102,7 +102,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>0</height> @@ -121,7 +121,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>100</height> @@ -138,14 +138,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>0</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>gesture_edit_button1</cstring> </property> @@ -163,7 +163,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>0</height> @@ -182,14 +182,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>30</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout6</cstring> </property> @@ -213,14 +213,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>0</height> </size> </property> </spacer> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>gesture_lineedit2</cstring> </property> @@ -238,7 +238,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>0</height> @@ -257,7 +257,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>100</height> @@ -274,14 +274,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>0</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>gesture_edit_button2</cstring> </property> @@ -299,7 +299,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>0</height> @@ -318,14 +318,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>30</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout7</cstring> </property> @@ -349,14 +349,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>0</height> </size> </property> </spacer> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>gesture_lineedit3</cstring> </property> @@ -374,7 +374,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>0</height> @@ -393,7 +393,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>100</height> @@ -410,14 +410,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>0</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>gesture_edit_button3</cstring> </property> @@ -435,7 +435,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>0</height> @@ -454,7 +454,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>30</height> diff --git a/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui b/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui index 3bee7daf0..698392402 100644 --- a/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui +++ b/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>Gestures_settings_tab_ui</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Gestures_settings_tab_ui</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>mouse_gestures_globally</cstring> </property> @@ -24,7 +24,7 @@ <string>Disable mouse gestures globally</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout1</cstring> </property> @@ -32,7 +32,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>mouse_button_label</cstring> </property> @@ -43,14 +43,14 @@ <cstring>mouse_button_combo</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>mouse_button_combo</cstring> </property> </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout2</cstring> </property> @@ -58,7 +58,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>timeout_label</cstring> </property> @@ -82,7 +82,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>window_groupbox</cstring> </property> @@ -116,7 +116,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>50</height> diff --git a/khotkeys/kcontrol/ui/info_tab_ui.ui b/khotkeys/kcontrol/ui/info_tab_ui.ui index 9f82ccdcc..53868495c 100644 --- a/khotkeys/kcontrol/ui/info_tab_ui.ui +++ b/khotkeys/kcontrol/ui/info_tab_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KHotKeys::Info_tab_ui</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Info_tab_ui</cstring> </property> @@ -25,7 +25,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>warning_label</cstring> </property> @@ -33,7 +33,7 @@ <string><p>This module allows configuring input actions, like mouse gestures, keyboard shortcuts for performing commands, launching applications or DCOP calls, and similar.</p> <p><b>NOTE: </b>If you are not an experienced user, you should be careful with modifying the actions, and should limit your changes mainly to enabling/disabling actions, and changing triggers.</p></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -47,7 +47,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui b/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui index f3947dd54..55a7d6188 100644 --- a/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui +++ b/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KHotKeys::Keyboard_input_widget_ui</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Keyboard_input_widget_ui</cstring> </property> @@ -25,7 +25,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>keyboard_input_label</cstring> </property> @@ -36,7 +36,7 @@ <cstring>keyboard_input_multilineedit</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -58,7 +58,7 @@ <enum>PlainText</enum> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>modify_button</cstring> </property> @@ -68,7 +68,7 @@ </widget> </hbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -86,7 +86,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>action_window_radio</cstring> </property> @@ -97,7 +97,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>active_window_radio</cstring> </property> @@ -105,7 +105,7 @@ <string>Active window</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>specific_window_radio</cstring> </property> @@ -115,7 +115,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>window_groupbox</cstring> </property> diff --git a/khotkeys/kcontrol/ui/main_buttons_widget_ui.ui b/khotkeys/kcontrol/ui/main_buttons_widget_ui.ui index a46ee0a0f..f559dd7bc 100644 --- a/khotkeys/kcontrol/ui/main_buttons_widget_ui.ui +++ b/khotkeys/kcontrol/ui/main_buttons_widget_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>KHotKeys::Main_buttons_widget_ui</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Main_buttons_widget_ui</cstring> </property> @@ -30,7 +30,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>new_action_button</cstring> </property> @@ -38,7 +38,7 @@ <string>&New Action</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>new_action_group_button</cstring> </property> @@ -46,7 +46,7 @@ <string>New &Group</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>delete_action_button</cstring> </property> @@ -68,7 +68,7 @@ <enum>Vertical</enum> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>global_settings_button</cstring> </property> diff --git a/khotkeys/kcontrol/ui/menuentry_widget_ui.ui b/khotkeys/kcontrol/ui/menuentry_widget_ui.ui index ae6c613f3..ed3cc119e 100644 --- a/khotkeys/kcontrol/ui/menuentry_widget_ui.ui +++ b/khotkeys/kcontrol/ui/menuentry_widget_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>KHotKeys::Menuentry_widget_ui</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Menuentry_widget_ui</cstring> </property> @@ -22,7 +22,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>menuentry_label</cstring> </property> @@ -33,7 +33,7 @@ <cstring>command_url_lineedit</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout7</cstring> </property> @@ -47,12 +47,12 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>menuentry_lineedit</cstring> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>browse_button</cstring> </property> @@ -72,7 +72,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>20</height> diff --git a/khotkeys/kcontrol/ui/triggers_tab_ui.ui b/khotkeys/kcontrol/ui/triggers_tab_ui.ui index 13ac0530b..44b9d6d56 100644 --- a/khotkeys/kcontrol/ui/triggers_tab_ui.ui +++ b/khotkeys/kcontrol/ui/triggers_tab_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>KHotKeys::Triggers_tab_ui</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Triggers_tab_ui</cstring> </property> @@ -22,7 +22,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>comment_label</cstring> </property> @@ -33,12 +33,12 @@ <cstring>comment_lineedit</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>comment_lineedit</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout3</cstring> </property> @@ -51,7 +51,7 @@ <cstring>triggers_listview</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -65,7 +65,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>new_button</cstring> </property> @@ -73,7 +73,7 @@ <string>&New</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>modify_button</cstring> </property> @@ -81,7 +81,7 @@ <string>&Modify...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>copy_button</cstring> </property> @@ -89,7 +89,7 @@ <string>&Copy</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>delete_button</cstring> </property> diff --git a/khotkeys/kcontrol/ui/voice_input_widget_ui.ui b/khotkeys/kcontrol/ui/voice_input_widget_ui.ui index 007610fca..71c724aff 100644 --- a/khotkeys/kcontrol/ui/voice_input_widget_ui.ui +++ b/khotkeys/kcontrol/ui/voice_input_widget_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>Voice_input_widget_ui</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>label</cstring> </property> @@ -28,7 +28,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>0</height> diff --git a/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui b/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui index 2c254dcc8..1a4eed270 100644 --- a/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui +++ b/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>Voice_settings_tab_ui</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Voice_settings_tab_ui</cstring> </property> @@ -16,18 +16,18 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> <property name="text"> <string>In order to trigger a spoken action, you have to press the key (or combination of keys) configured below, speak the command and then press the same key again once you have finished speaking.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout4</cstring> </property> @@ -35,7 +35,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -61,7 +61,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>241</width> <height>21</height> @@ -80,14 +80,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>90</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2</cstring> </property> diff --git a/khotkeys/kcontrol/ui/window_trigger_widget_ui.ui b/khotkeys/kcontrol/ui/window_trigger_widget_ui.ui index 58d15e3cf..c6a8ae73e 100644 --- a/khotkeys/kcontrol/ui/window_trigger_widget_ui.ui +++ b/khotkeys/kcontrol/ui/window_trigger_widget_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>KHotKeys::Window_trigger_widget_ui</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Window_trigger_widget_ui</cstring> </property> @@ -22,7 +22,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox4</cstring> </property> @@ -39,7 +39,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>window_appears_checkbox</cstring> </property> @@ -47,7 +47,7 @@ <string>Window appears</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>window_disappears_checkbox</cstring> </property> @@ -55,7 +55,7 @@ <string>Window disappears</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>window_activates_checkbox</cstring> </property> @@ -63,7 +63,7 @@ <string>Window activates</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>window_deactivates_checkbox</cstring> </property> @@ -73,7 +73,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>window_groupbox</cstring> </property> diff --git a/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui b/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui index 5e9007e9e..fca2934d7 100644 --- a/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui +++ b/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>KHotKeys::Windowdef_list_widget_ui</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Windowdef_list_widget_ui</cstring> </property> @@ -22,7 +22,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>comment_label</cstring> </property> @@ -33,12 +33,12 @@ <cstring>comment_lineedit</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>comment_lineedit</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layout3</cstring> </property> @@ -51,7 +51,7 @@ <cstring>windows_listview</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -65,7 +65,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>new_button</cstring> </property> @@ -73,7 +73,7 @@ <string>&New</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>modify_button</cstring> </property> @@ -81,7 +81,7 @@ <string>&Modify...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>copy_button</cstring> </property> @@ -89,7 +89,7 @@ <string>&Copy</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>delete_button</cstring> </property> diff --git a/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui b/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui index 01d54da98..6e96e06ab 100644 --- a/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui +++ b/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KHotKeys::Windowdef_simple_widget_ui</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Windowdef_simple_widget_ui</cstring> </property> @@ -22,7 +22,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>comment_label</cstring> </property> @@ -33,7 +33,7 @@ <cstring>comment_lineedit</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>comment_lineedit</cstring> </property> @@ -48,14 +48,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -69,7 +69,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>window_title_label</cstring> </property> @@ -80,7 +80,7 @@ <cstring>window_title_lineedit</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>Is Not Important</string> @@ -122,7 +122,7 @@ </widget> </hbox> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>window_title_lineedit</cstring> </property> @@ -137,14 +137,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -158,7 +158,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>window_class_label</cstring> </property> @@ -169,7 +169,7 @@ <cstring>window_class_lineedit</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>Is Not Important</string> @@ -211,7 +211,7 @@ </widget> </hbox> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>window_class_lineedit</cstring> </property> @@ -226,14 +226,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -247,7 +247,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>window_role_label</cstring> </property> @@ -258,7 +258,7 @@ <cstring>window_role_lineedit</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>Is Not Important</string> @@ -300,7 +300,7 @@ </widget> </hbox> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>window_role_lineedit</cstring> </property> @@ -315,14 +315,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout6</cstring> </property> @@ -346,14 +346,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>autodetect_button</cstring> </property> @@ -371,7 +371,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> @@ -390,14 +390,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>20</height> </size> </property> </spacer> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>window_types_groupbox</cstring> </property> @@ -414,7 +414,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>type_normal_checkbox</cstring> </property> @@ -422,7 +422,7 @@ <string>Normal</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>type_dialog_checkbox</cstring> </property> @@ -430,7 +430,7 @@ <string>Dialog</string> </property> </widget> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>type_desktop_checkbox</cstring> </property> @@ -438,7 +438,7 @@ <string>Desktop</string> </property> </widget> - <widget class="QCheckBox" row="0" column="1"> + <widget class="TQCheckBox" row="0" column="1"> <property name="name"> <cstring>type_dock_checkbox</cstring> </property> diff --git a/khotkeys/kcontrol/voicerecorder.cpp b/khotkeys/kcontrol/voicerecorder.cpp index 31578298d..50d1fa2f9 100644 --- a/khotkeys/kcontrol/voicerecorder.cpp +++ b/khotkeys/kcontrol/voicerecorder.cpp @@ -46,7 +46,7 @@ bool VoiceRecorder::init( KLibrary* lib ) } VoiceRecorder::VoiceRecorder(const Sound& sound_P, const TQString &voiceId, TQWidget *parent, const char *name) - : Voice_input_widget_ui(parent, name) , _recorder( SoundRecorder::create(this)) , _state(sNotModified), _tempFile(0L) , _voiceId(voiceId) + : Voice_input_widget_ui(parent, name) , _recorder( SoundRecorder::create(TQT_TQOBJECT(this))) , _state(sNotModified), _tempFile(0L) , _voiceId(voiceId) { _sound=sound_P; buttonPlay->setEnabled(sound_P.size() > 50); diff --git a/khotkeys/kcontrol/voicerecordpage.cpp b/khotkeys/kcontrol/voicerecordpage.cpp index fec07e22f..fa103e6b1 100644 --- a/khotkeys/kcontrol/voicerecordpage.cpp +++ b/khotkeys/kcontrol/voicerecordpage.cpp @@ -31,7 +31,7 @@ VoiceRecordPage::VoiceRecordPage( const TQString &voiceid_P, TQWidget *parent, c _message = i18n("Enter a code for the sound (e.g. the word you are saying) and record the same word twice."); _label = new TQLabel(_message, this, "label"); - _label->setAlignment(TQLabel::AlignLeft | TQLabel::WordBreak | + _label->tqsetAlignment(TQLabel::AlignLeft | TQLabel::WordBreak | TQLabel::AlignVCenter); _lineEdit = new KLineEdit( this ); diff --git a/khotkeys/kcontrol/voicerecordpage.h b/khotkeys/kcontrol/voicerecordpage.h index 57d585bb9..9cb934b61 100644 --- a/khotkeys/kcontrol/voicerecordpage.h +++ b/khotkeys/kcontrol/voicerecordpage.h @@ -29,7 +29,7 @@ class Voice; class VoiceRecorder; class VoiceSignature; -class VoiceRecordPage : public QVBox +class VoiceRecordPage : public TQVBox { Q_OBJECT diff --git a/khotkeys/kcontrol/windowdef_list_widget.cpp b/khotkeys/kcontrol/windowdef_list_widget.cpp index 471aab743..f0891af78 100644 --- a/khotkeys/kcontrol/windowdef_list_widget.cpp +++ b/khotkeys/kcontrol/windowdef_list_widget.cpp @@ -134,7 +134,7 @@ void Windowdef_list_widget::new_selected( int type_P ) void Windowdef_list_widget::copy_pressed() { windows_listview->setSelected( create_listview_item( selected_item->window(), - selected_item->parent() ? NULL : windows_listview, selected_item->parent(), + selected_item->tqparent() ? NULL : windows_listview, selected_item->tqparent(), selected_item, true ), true ); } @@ -192,7 +192,7 @@ void Windowdef_list_widget::edit_listview_item( Windowdef_list_item* item_P ) { item_P->set_window( new_window ); item_P->widthChanged( 0 ); // SELI tohle i u dalsich listview? - windows_listview->repaintItem( item_P ); + windows_listview->tqrepaintItem( item_P ); } delete dlg; } diff --git a/khotkeys/kcontrol/windowdef_list_widget.h b/khotkeys/kcontrol/windowdef_list_widget.h index b49146a85..6e923c902 100644 --- a/khotkeys/kcontrol/windowdef_list_widget.h +++ b/khotkeys/kcontrol/windowdef_list_widget.h @@ -59,7 +59,7 @@ class Windowdef_list_widget typedef Windowdef_list_widget Windowdef_list_tab; class Windowdef_list_item - : public QListViewItem + : public TQListViewItem { public: Windowdef_list_item( TQListView* parent_P, Windowdef* window_P ); diff --git a/khotkeys/kcontrol/windowdef_simple_widget.cpp b/khotkeys/kcontrol/windowdef_simple_widget.cpp index f79d81ea1..e0a6671e7 100644 --- a/khotkeys/kcontrol/windowdef_simple_widget.cpp +++ b/khotkeys/kcontrol/windowdef_simple_widget.cpp @@ -157,7 +157,7 @@ void Windowdef_simple_widget::autodetect_clicked() void Windowdef_simple_widget::autodetect() { - WindowSelector* sel = new WindowSelector( this, TQT_SLOT( autodetect_window_selected( WId ))); + WindowSelector* sel = new WindowSelector( TQT_TQOBJECT(this), TQT_SLOT( autodetect_window_selected( WId ))); sel->select(); } diff --git a/khotkeys/kcontrol/windowselector.cpp b/khotkeys/kcontrol/windowselector.cpp index d6e562df3..e2942201c 100644 --- a/khotkeys/kcontrol/windowselector.cpp +++ b/khotkeys/kcontrol/windowselector.cpp @@ -34,8 +34,8 @@ WindowSelector::WindowSelector( TQObject* receiver_P, const char* slot_P ) void WindowSelector::select() { - kapp->desktop()->grabMouse( TQCursor( crossCursor )); - kapp->installX11EventFilter( this ); + kapp->desktop()->grabMouse( TQCursor( tqcrossCursor )); + kapp->installX11EventFilter( TQT_TQWIDGET(this) ); } bool WindowSelector::x11Event( XEvent* e ) diff --git a/khotkeys/shared/actions.cpp b/khotkeys/shared/actions.cpp index e37ef395f..a58b85c8c 100644 --- a/khotkeys/shared/actions.cpp +++ b/khotkeys/shared/actions.cpp @@ -124,7 +124,7 @@ void Command_url_action::execute() kapp->propagateSessionManager(); sm_ready = true; } -// int space_pos = command_url().find( ' ' ); +// int space_pos = command_url().tqfind( ' ' ); // if( command_url()[ 0 ] != '\'' && command_url()[ 0 ] != '"' && space_pos > -1 // && command_url()[ space_pos - 1 ] != '\\' ) // cmd = command_url().left( space_pos ); // get first 'word' @@ -286,7 +286,7 @@ void Dcop_action::execute() // one word if( pos != 0 ) args_str = args_str.mid( pos ); - int nxt_pos = args_str.find( ' ' ); + int nxt_pos = args_str.tqfind( ' ' ); args_list.append( args_str.left( nxt_pos )); // should be ok if nxt_pos is -1 args_str = nxt_pos >= 0 ? args_str.mid( nxt_pos ) : ""; } @@ -372,7 +372,7 @@ void Keyboard_input_action::execute() w = InputFocus; } int last_index = -1, start = 0; - while(( last_index = input().find( ':', last_index + 1 )) != -1 ) // find next ';' + while(( last_index = input().tqfind( ':', last_index + 1 )) != -1 ) // find next ';' { TQString key = input().mid( start, last_index - start ).stripWhiteSpace(); if( key == "Enter" && KKey( key ).keyCodeQt() == 0 ) @@ -391,7 +391,7 @@ void Keyboard_input_action::execute() TQString Keyboard_input_action::description() const { TQString tmp = input(); - tmp.replace( '\n', ' ' ); + tmp.tqreplace( '\n', ' ' ); tmp.truncate( 30 ); return i18n( "Keyboard input : " ) + tmp; } diff --git a/khotkeys/shared/gestures.cpp b/khotkeys/shared/gestures.cpp index 60b1d93b4..620d8d2ed 100644 --- a/khotkeys/shared/gestures.cpp +++ b/khotkeys/shared/gestures.cpp @@ -105,7 +105,7 @@ void Gesture::active_window_changed( WId ) void Gesture::register_handler( TQObject* receiver_P, const char* slot_P ) { - if( handlers.contains( receiver_P )) + if( handlers.tqcontains( receiver_P )) return; handlers[ receiver_P ] = true; connect( this, TQT_SIGNAL( handle_gesture( const TQString&, WId )), @@ -116,7 +116,7 @@ void Gesture::register_handler( TQObject* receiver_P, const char* slot_P ) void Gesture::unregister_handler( TQObject* receiver_P, const char* slot_P ) { - if( !handlers.contains( receiver_P )) + if( !handlers.tqcontains( receiver_P )) return; handlers.remove( receiver_P ); disconnect( this, TQT_SIGNAL( handle_gesture( const TQString&, WId )), diff --git a/khotkeys/shared/gestures.h b/khotkeys/shared/gestures.h index d423be8a6..4f0f3f94c 100644 --- a/khotkeys/shared/gestures.h +++ b/khotkeys/shared/gestures.h @@ -101,7 +101,7 @@ class KDE_EXPORT Gesture // Gesture class must be TQWidget derived because of x11Event() // but it should be TQObject owned -> use a TQObject proxy that will delete it class DeleteObject - : public QObject + : public TQObject { Q_OBJECT public: diff --git a/khotkeys/shared/input.cpp b/khotkeys/shared/input.cpp index f9bfec6d3..90e789282 100644 --- a/khotkeys/shared/input.cpp +++ b/khotkeys/shared/input.cpp @@ -55,7 +55,7 @@ Kbd::~Kbd() void Kbd::insert_item( const KShortcut& shortcut_P, Kbd_receiver* receiver_P ) { - Receiver_data& rcv = receivers[ receiver_P ]; + Receiver_data& rcv = tqreceivers[ receiver_P ]; rcv.shortcuts.append( shortcut_P ); if( rcv.active ) grab_shortcut( shortcut_P ); @@ -63,17 +63,17 @@ void Kbd::insert_item( const KShortcut& shortcut_P, Kbd_receiver* receiver_P ) void Kbd::remove_item( const KShortcut& shortcut_P, Kbd_receiver* receiver_P ) { - Receiver_data& rcv = receivers[ receiver_P ]; + Receiver_data& rcv = tqreceivers[ receiver_P ]; rcv.shortcuts.remove( shortcut_P ); if( rcv.active ) ungrab_shortcut( shortcut_P ); if( rcv.shortcuts.count() == 0 ) - receivers.remove( receiver_P ); + tqreceivers.remove( receiver_P ); } void Kbd::activate_receiver( Kbd_receiver* receiver_P ) { - Receiver_data& rcv = receivers[ receiver_P ]; + Receiver_data& rcv = tqreceivers[ receiver_P ]; if( rcv.active ) return; rcv.active = true; @@ -85,7 +85,7 @@ void Kbd::activate_receiver( Kbd_receiver* receiver_P ) void Kbd::deactivate_receiver( Kbd_receiver* receiver_P ) { - Receiver_data& rcv = receivers[ receiver_P ]; + Receiver_data& rcv = tqreceivers[ receiver_P ]; if( !rcv.active ) return; rcv.active = false; @@ -97,7 +97,7 @@ void Kbd::deactivate_receiver( Kbd_receiver* receiver_P ) void Kbd::grab_shortcut( const KShortcut& shortcut_P ) { - if( grabs.contains( shortcut_P )) + if( grabs.tqcontains( shortcut_P )) ++grabs[ shortcut_P ]; else { @@ -117,7 +117,7 @@ void Kbd::grab_shortcut( const KShortcut& shortcut_P ) void Kbd::ungrab_shortcut( const KShortcut& shortcut_P ) { - if( !grabs.contains( shortcut_P )) + if( !grabs.tqcontains( shortcut_P )) return; if( --grabs[ shortcut_P ] == 0 ) { @@ -142,12 +142,12 @@ void Kbd::key_slot( TQString key_P ) { kdDebug( 1217 ) << "Key pressed:" << key_P << endl; KShortcut shortcut( key_P ); - if( !grabs.contains( shortcut )) + if( !grabs.tqcontains( shortcut )) return; - for( TQMap< Kbd_receiver*, Receiver_data >::ConstIterator it = receivers.begin(); - it != receivers.end(); + for( TQMap< Kbd_receiver*, Receiver_data >::ConstIterator it = tqreceivers.begin(); + it != tqreceivers.end(); ++it ) - if( ( *it ).shortcuts.contains( shortcut ) && ( *it ).active + if( ( *it ).shortcuts.tqcontains( shortcut ) && ( *it ).active && it.key()->handle_key( shortcut )) return; } diff --git a/khotkeys/shared/input.h b/khotkeys/shared/input.h index 22df89284..a9f19240d 100644 --- a/khotkeys/shared/input.h +++ b/khotkeys/shared/input.h @@ -33,7 +33,7 @@ class Kbd_receiver }; class Kbd - : public QObject + : public TQObject { Q_OBJECT public: @@ -58,7 +58,7 @@ class Kbd TQValueList< KShortcut > shortcuts; bool active; }; - TQMap< Kbd_receiver*, Receiver_data > receivers; + TQMap< Kbd_receiver*, Receiver_data > tqreceivers; TQMap< KShortcut, int > grabs; KGlobalAccel* kga; }; diff --git a/khotkeys/shared/khlistbox.h b/khotkeys/shared/khlistbox.h index ddb988c36..ad2cdb3b6 100644 --- a/khotkeys/shared/khlistbox.h +++ b/khotkeys/shared/khlistbox.h @@ -19,7 +19,7 @@ namespace KHotKeys { class KHListBox - : public QListBox + : public TQListBox { Q_OBJECT Q_PROPERTY( bool forceSelect READ forceSelect WRITE setForceSelect ) diff --git a/khotkeys/shared/khotkeysglobal.cpp b/khotkeys/shared/khotkeysglobal.cpp index 4c6b8360c..8eb159d3c 100644 --- a/khotkeys/shared/khotkeysglobal.cpp +++ b/khotkeys/shared/khotkeysglobal.cpp @@ -65,7 +65,7 @@ TQString get_menu_entry_from_path( const TQString& path_P ) for( TQStringList::ConstIterator it = dirs.begin(); it != dirs.end(); ++it ) - if( path_P.find( *it ) == 0 ) + if( path_P.tqfind( *it ) == 0 ) { TQString ret = path_P; ret.remove( 0, (*it).length()); diff --git a/khotkeys/shared/settings.cpp b/khotkeys/shared/settings.cpp index fdab2be56..a6434be06 100644 --- a/khotkeys/shared/settings.cpp +++ b/khotkeys/shared/settings.cpp @@ -63,7 +63,7 @@ bool Settings::read_settings( KConfig& cfg_P, bool include_disabled_P, ImportTyp TQString import_id = cfg_P.readEntry( "ImportId" ); if( !import_id.isEmpty()) { - if( already_imported.contains( import_id )) + if( already_imported.tqcontains( import_id )) { if( import_P == ImportSilent || KMessageBox::warningContinueCancel( NULL, diff --git a/khotkeys/shared/sound.cpp b/khotkeys/shared/sound.cpp index c90eb2e02..cb2ef54d1 100644 --- a/khotkeys/shared/sound.cpp +++ b/khotkeys/shared/sound.cpp @@ -50,7 +50,7 @@ Sound::~Sound() void Sound::load(const TQString& filename) { kdDebug() << k_funcinfo << filename << endl; - data=TQMemArray<Q_INT32>(); + data=TQMemArray<TQ_INT32>(); TQFile file(filename); if(!file.open(IO_ReadOnly)) { @@ -59,20 +59,20 @@ void Sound::load(const TQString& filename) } TQDataStream stream(&file); stream.setByteOrder( TQDataStream::LittleEndian ); - Q_INT32 magic; + TQ_INT32 magic; MAGIC("RIFF"); - READ_FROM_STREAM(Q_UINT32,ChunkSize); + READ_FROM_STREAM(TQ_UINT32,ChunkSize); MAGIC("WAVE"); MAGIC("fmt "); - READ_FROM_STREAM(Q_UINT32,ChunkSize2); - READ_FROM_STREAM(Q_INT16,AudioFormat); - READ_FROM_STREAM(Q_UINT16,NumberOfChannels); - READ_FROM_STREAM(Q_UINT32,SampleRate); + READ_FROM_STREAM(TQ_UINT32,ChunkSize2); + READ_FROM_STREAM(TQ_INT16,AudioFormat); + READ_FROM_STREAM(TQ_UINT16,NumberOfChannels); + READ_FROM_STREAM(TQ_UINT32,SampleRate); _fs=SampleRate; - READ_FROM_STREAM(Q_UINT32,ByteRate); - READ_FROM_STREAM(Q_UINT16,BlockAlign); - READ_FROM_STREAM(Q_UINT16,BitsPerSample); + READ_FROM_STREAM(TQ_UINT32,ByteRate); + READ_FROM_STREAM(TQ_UINT16,BlockAlign); + READ_FROM_STREAM(TQ_UINT16,BitsPerSample); MAGIC("data"); READ_FROM_STREAM(TQByteArray,SoundData); NumberOfChannels=1; //Wav i play are broken @@ -90,10 +90,10 @@ void Sound::load(const TQString& filename) max=0; for(unsigned long int f=0;f<NumberOfSamples;f++) { - Q_INT32 nb=0; + TQ_INT32 nb=0; for(uint k=0;k<BytePS;k++) { - nb |= (SoundData[f*BytePS+k]&0x000000FF) << (k*8); + nb |= (SoundData.at(f*BytePS+k)&0x000000FF) << (k*8); } if(nb & (1 << (BytePS*8 -1)) ) nb = nb-(1<<BytePS*8); @@ -110,7 +110,7 @@ void Sound::load(const TQString& filename) } -#define SMAGIC(CH) { stream << ( Q_INT32) ( (CH)[0] | (CH)[1]<<8 | (CH)[2]<< 16 | (CH)[3] << 24 ) ; } +#define SMAGIC(CH) { stream << ( TQ_INT32) ( (CH)[0] | (CH)[1]<<8 | (CH)[2]<< 16 | (CH)[3] << 24 ) ; } void Sound::save(const TQString& filename) const { @@ -129,35 +129,35 @@ void Sound::save(const TQString& filename) const for(unsigned long int f=0;f<data.size();f++) { - Q_UINT16 val= (signed short int) ( (data.at(f) * ((double)(1<<13)/(signed)max) ) ); - SoundData[ 2*f ]= val & 0x00FF; - SoundData[2*f+1]= (val & 0xFF00) >> 8; + TQ_UINT16 val= (signed short int) ( (data.at(f) * ((double)(1<<13)/(signed)max) ) ); + SoundData.tqat( 2*f )= val & 0x00FF; + SoundData.tqat(2*f+1)= (val & 0xFF00) >> 8; // kdDebug( 1217 ) << k_funcinfo << data.at(f) << " / " << max << " = " << val << " | " << SoundData[ 2*f ] << " "<< SoundData[ 2*f+1 ] << endl; } - Q_UINT16 NumberOfChannels=2; - Q_UINT32 SampleRate=_fs; + TQ_UINT16 NumberOfChannels=2; + TQ_UINT32 SampleRate=_fs; SMAGIC("RIFF"); - //READ_FROM_STREAM(Q_UINT32,ChunkSize); - stream << (Q_UINT32)(36+ SoundData.size()); + //READ_FROM_STREAM(TQ_UINT32,ChunkSize); + stream << (TQ_UINT32)(36+ SoundData.size()); SMAGIC("WAVE"); SMAGIC("fmt "); - //READ_FROM_STREAM(Q_UINT32,ChunkSize2); - stream << (Q_UINT32)(16); - //READ_FROM_STREAM(Q_INT16,AudioFormat); - stream << (Q_INT16)(1); - //READ_FROM_STREAM(Q_UINT16,NumberOfChannels); - stream << (Q_UINT16)(NumberOfChannels); - //READ_FROM_STREAM(Q_UINT32,SampleRate); - stream << (Q_UINT32)(SampleRate); - //READ_FROM_STREAM(Q_UINT32,ByteRate); - stream << (Q_UINT32)(NumberOfChannels*SampleRate*16/8); - //READ_FROM_STREAM(Q_UINT16,BlockAlign); - stream << (Q_UINT16)(16/8 *NumberOfChannels); - //READ_FROM_STREAM(Q_UINT16,BitsPerSample); - stream << (Q_UINT16)(16); + //READ_FROM_STREAM(TQ_UINT32,ChunkSize2); + stream << (TQ_UINT32)(16); + //READ_FROM_STREAM(TQ_INT16,AudioFormat); + stream << (TQ_INT16)(1); + //READ_FROM_STREAM(TQ_UINT16,NumberOfChannels); + stream << (TQ_UINT16)(NumberOfChannels); + //READ_FROM_STREAM(TQ_UINT32,SampleRate); + stream << (TQ_UINT32)(SampleRate); + //READ_FROM_STREAM(TQ_UINT32,ByteRate); + stream << (TQ_UINT32)(NumberOfChannels*SampleRate*16/8); + //READ_FROM_STREAM(TQ_UINT16,BlockAlign); + stream << (TQ_UINT16)(16/8 *NumberOfChannels); + //READ_FROM_STREAM(TQ_UINT16,BitsPerSample); + stream << (TQ_UINT16)(16); SMAGIC("data"); //READ_FROM_STREAM(TQByteArray,SoundData); stream << SoundData; diff --git a/khotkeys/shared/sound.h b/khotkeys/shared/sound.h index 2c2d97d93..6453563de 100644 --- a/khotkeys/shared/sound.h +++ b/khotkeys/shared/sound.h @@ -50,8 +50,8 @@ public: return _fs; } - TQMemArray<Q_INT32> data; - Q_UINT32 max; + TQMemArray<TQ_INT32> data; + TQ_UINT32 max; uint _fs; }; diff --git a/khotkeys/shared/soundrecorder.h b/khotkeys/shared/soundrecorder.h index c00f73527..c7e55fc22 100644 --- a/khotkeys/shared/soundrecorder.h +++ b/khotkeys/shared/soundrecorder.h @@ -34,7 +34,7 @@ namespace KHotKeys /** @author Olivier Goffart */ -class KDE_EXPORT SoundRecorder : public QObject +class KDE_EXPORT SoundRecorder : public TQObject { Q_OBJECT public: diff --git a/khotkeys/shared/triggers.cpp b/khotkeys/shared/triggers.cpp index 7cac2b98c..b3042f00f 100644 --- a/khotkeys/shared/triggers.cpp +++ b/khotkeys/shared/triggers.cpp @@ -225,7 +225,7 @@ void Window_trigger::window_added( WId window_P ) void Window_trigger::window_removed( WId window_P ) { - if( existing_windows.contains( window_P )) + if( existing_windows.tqcontains( window_P )) { bool matches = existing_windows[ window_P ]; kdDebug( 1217 ) << "Window_trigger::w_removed() : " << matches << endl; @@ -244,7 +244,7 @@ void Window_trigger::window_removed( WId window_P ) void Window_trigger::active_window_changed( WId window_P ) { bool was_match = false; - if( existing_windows.contains( last_active_window )) + if( existing_windows.tqcontains( last_active_window )) was_match = existing_windows[ last_active_window ]; if( active && was_match && ( window_actions & WINDOW_DEACTIVATES )) { @@ -253,7 +253,7 @@ void Window_trigger::active_window_changed( WId window_P ) } /* bool matches = windows()->match( Window_data( window_P )); existing_windows[ window_P ] = matches;*/ - bool matches = existing_windows.contains( window_P ) + bool matches = existing_windows.tqcontains( window_P ) ? existing_windows[ window_P ] : false; if( active && matches && ( window_actions & WINDOW_ACTIVATES )) { @@ -272,7 +272,7 @@ void Window_trigger::window_changed( WId window_P, unsigned int dirty_P ) return; kdDebug( 1217 ) << "Window_trigger::w_changed()" << endl; bool was_match = false; - if( existing_windows.contains( window_P )) + if( existing_windows.tqcontains( window_P )) was_match = existing_windows[ window_P ]; bool matches = windows()->match( Window_data( window_P )); existing_windows[ window_P ] = matches; diff --git a/khotkeys/shared/voices.cpp b/khotkeys/shared/voices.cpp index a6515fecf..e19f66eec 100644 --- a/khotkeys/shared/voices.cpp +++ b/khotkeys/shared/voices.cpp @@ -79,7 +79,7 @@ void Voice::enable( bool enabled_P ) void Voice::register_handler( Voice_trigger *trigger_P ) { - if( !_references.contains( trigger_P )) + if( !_references.tqcontains( trigger_P )) _references.append(trigger_P); } @@ -179,7 +179,7 @@ void Voice::slot_sound_recorded(const Sound &sound_P) //kdDebug(1217) << k_funcinfo << keyNative.key().toString() << endl; - if(_shortcut.contains(keyNative)) + if(_shortcut.tqcontains(keyNative)) { if(pEvent->type == XKeyPress && !_recording ) { diff --git a/khotkeys/shared/voices.h b/khotkeys/shared/voices.h index f03d2b040..0f8496d8a 100644 --- a/khotkeys/shared/voices.h +++ b/khotkeys/shared/voices.h @@ -28,7 +28,7 @@ class Voice_trigger; class VoiceSignature; -class KDE_EXPORT Voice : public QObject +class KDE_EXPORT Voice : public TQObject { Q_OBJECT public: diff --git a/khotkeys/shared/windows.cpp b/khotkeys/shared/windows.cpp index b8e86f694..a1394b731 100644 --- a/khotkeys/shared/windows.cpp +++ b/khotkeys/shared/windows.cpp @@ -339,7 +339,7 @@ bool Windowdef_simple::is_substr_match( const TQString& str1_P, const TQString& case NOT_IMPORTANT : return true; case CONTAINS : - return str1_P.contains( str2_P ) > 0; + return str1_P.tqcontains( str2_P ) > 0; case IS : return str1_P == str2_P; case REGEXP : @@ -348,7 +348,7 @@ bool Windowdef_simple::is_substr_match( const TQString& str1_P, const TQString& return rg.search( str1_P ) >= 0; } case CONTAINS_NOT : - return str1_P.contains( str2_P ) == 0; + return str1_P.tqcontains( str2_P ) == 0; case IS_NOT : return str1_P != str2_P; case REGEXP_NOT : diff --git a/khotkeys/shared/windows.h b/khotkeys/shared/windows.h index d145efa87..8aad308c9 100644 --- a/khotkeys/shared/windows.h +++ b/khotkeys/shared/windows.h @@ -35,7 +35,7 @@ class Windowdef_list; /*class Action_data_base;*/ class KDE_EXPORT Windows - : public QObject + : public TQObject { Q_OBJECT public: diff --git a/khotkeys/update/update.cpp b/khotkeys/update/update.cpp index c99efda49..91456ed70 100644 --- a/khotkeys/update/update.cpp +++ b/khotkeys/update/update.cpp @@ -46,7 +46,7 @@ int main( int argc, char* argv[] ) kdWarning() << "File " << id << " not found!" << endl; return 1; } - init_global_data( false, &app ); + init_global_data( false, TQT_TQOBJECT(&app) ); Settings settings; settings.read_settings( true ); KConfig cfg( file, true ); |