From 73c08b592db45af554b9f21029bc549d70f683ab Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:46:05 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- khotkeys/kcontrol/gesturedrawer.cpp | 4 +-- khotkeys/kcontrol/gesturedrawer.h | 2 +- khotkeys/kcontrol/gesturerecorder.cpp | 2 +- khotkeys/kcontrol/gesturerecordpage.cpp | 2 +- khotkeys/kcontrol/kcmkhotkeys.cpp | 6 ++-- khotkeys/kcontrol/main_buttons_widget.cpp | 2 +- khotkeys/kcontrol/menuedit.cpp | 2 +- khotkeys/kcontrol/triggers_tab.cpp | 6 ++-- khotkeys/kcontrol/ui/action_group_tab_ui.ui | 4 +-- khotkeys/kcontrol/ui/dcop_widget_ui.ui | 14 ++++---- khotkeys/kcontrol/ui/general_settings_tab_ui.ui | 6 ++-- khotkeys/kcontrol/ui/general_tab_ui.ui | 4 +-- khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui | 38 +++++++++++----------- khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui | 2 +- khotkeys/kcontrol/ui/info_tab_ui.ui | 4 +-- khotkeys/kcontrol/ui/menuentry_widget_ui.ui | 2 +- khotkeys/kcontrol/ui/voice_input_widget_ui.ui | 2 +- khotkeys/kcontrol/ui/voice_settings_tab_ui.ui | 6 ++-- khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui | 14 ++++---- khotkeys/kcontrol/voicerecordpage.cpp | 2 +- khotkeys/shared/input.cpp | 14 ++++---- khotkeys/shared/input.h | 2 +- khotkeys/shared/sound.cpp | 10 +++--- khotkeys/shared/sound.h | 2 +- khotkeys/shared/voicesignature.cpp | 2 +- 25 files changed, 77 insertions(+), 77 deletions(-) (limited to 'khotkeys') diff --git a/khotkeys/kcontrol/gesturedrawer.cpp b/khotkeys/kcontrol/gesturedrawer.cpp index d0d144382..2364e6e51 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( tqcolorGroup().base()); + setBackgroundColor( colorGroup().base()); setFrameStyle(TQFrame::Panel | TQFrame::Sunken); setMinimumSize(30, 30); } @@ -33,7 +33,7 @@ void GestureDrawer::setData(const TQString &data) { _data = data; - tqrepaint(); + repaint(); } void GestureDrawer::paintEvent(TQPaintEvent *ev) diff --git a/khotkeys/kcontrol/gesturedrawer.h b/khotkeys/kcontrol/gesturedrawer.h index b199ab64a..ee3af6809 100644 --- a/khotkeys/kcontrol/gesturedrawer.h +++ b/khotkeys/kcontrol/gesturedrawer.h @@ -31,7 +31,7 @@ class GestureDrawer : public TQFrame void setData(const TQString &data); - virtual TQSize tqsizeHint() const { return TQSize(30, 30); } + virtual TQSize sizeHint() const { return TQSize(30, 30); } protected: void paintEvent(TQPaintEvent *ev); diff --git a/khotkeys/kcontrol/gesturerecorder.cpp b/khotkeys/kcontrol/gesturerecorder.cpp index b4bba18d9..6e4395a5b 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( tqcolorGroup().base()); + setBackgroundColor( colorGroup().base()); setFrameStyle(TQFrame::Sunken | TQFrame::Panel); setLineWidth(2); setMidLineWidth(0); diff --git a/khotkeys/kcontrol/gesturerecordpage.cpp b/khotkeys/kcontrol/gesturerecordpage.cpp index ef59a4a99..af2fb8cdc 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->tqsetAlignment(TQLabel::AlignLeft | TQLabel::WordBreak | + label->setAlignment(TQLabel::AlignLeft | TQLabel::WordBreak | TQLabel::AlignVCenter); _recorder = new GestureRecorder(this, "recorder"); diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp index 54b3125a0..0f66bdd72 100644 --- a/khotkeys/kcontrol/kcmkhotkeys.cpp +++ b/khotkeys/kcontrol/kcmkhotkeys.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include @@ -272,14 +272,14 @@ void Module::set_gestures_exclude( Windowdef_list* windows ) void Module::import() { - TQString file = KFileDialog::getOpenFileName( TQString::null, "*.khotkeys", tqtopLevelWidget(), + TQString file = KFileDialog::getOpenFileName( TQString::null, "*.khotkeys", topLevelWidget(), i18n( "Select File with Actions to Be Imported" )); if( file.isEmpty()) return; KSimpleConfig cfg( file, true ); if( !settings.import( cfg, true )) { - KMessageBox::error( tqtopLevelWidget(), + KMessageBox::error( topLevelWidget(), 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 ec0671e40..3532cc13f 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( tqsizeHint().height()); // it gets too high and I have no idea why + setMaximumHeight( sizeHint().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/menuedit.cpp b/khotkeys/kcontrol/menuedit.cpp index efab89d8b..0ba2e6f44 100644 --- a/khotkeys/kcontrol/menuedit.cpp +++ b/khotkeys/kcontrol/menuedit.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/khotkeys/kcontrol/triggers_tab.cpp b/khotkeys/kcontrol/triggers_tab.cpp index 12cd12452..c2a300848 100644 --- a/khotkeys/kcontrol/triggers_tab.cpp +++ b/khotkeys/kcontrol/triggers_tab.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include @@ -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, tqtopLevelWidget()) - || KKeyChooser::checkStandardShortcutsConflict( s_P, true, tqtopLevelWidget())) + if( KKeyChooser::checkGlobalShortcutsConflict( s_P, true, topLevelWidget()) + || KKeyChooser::checkStandardShortcutsConflict( s_P, true, topLevelWidget())) return; // KHotKeys::Module::changed() module->changed(); diff --git a/khotkeys/kcontrol/ui/action_group_tab_ui.ui b/khotkeys/kcontrol/ui/action_group_tab_ui.ui index c25f7e0ef..ce982399e 100644 --- a/khotkeys/kcontrol/ui/action_group_tab_ui.ui +++ b/khotkeys/kcontrol/ui/action_group_tab_ui.ui @@ -48,7 +48,7 @@ Fixed - + 20 20 @@ -73,7 +73,7 @@ Fixed - + 20 20 diff --git a/khotkeys/kcontrol/ui/dcop_widget_ui.ui b/khotkeys/kcontrol/ui/dcop_widget_ui.ui index fdb849ea5..feeae535d 100644 --- a/khotkeys/kcontrol/ui/dcop_widget_ui.ui +++ b/khotkeys/kcontrol/ui/dcop_widget_ui.ui @@ -48,7 +48,7 @@ Expanding - + 0 20 @@ -81,7 +81,7 @@ Expanding - + 0 20 @@ -114,7 +114,7 @@ Expanding - + 0 20 @@ -147,7 +147,7 @@ Expanding - + 0 20 @@ -178,7 +178,7 @@ Expanding - + 20 0 @@ -203,7 +203,7 @@ Expanding - + 20 0 @@ -228,7 +228,7 @@ Expanding - + 20 0 diff --git a/khotkeys/kcontrol/ui/general_settings_tab_ui.ui b/khotkeys/kcontrol/ui/general_settings_tab_ui.ui index bf7c5321a..95c175a98 100644 --- a/khotkeys/kcontrol/ui/general_settings_tab_ui.ui +++ b/khotkeys/kcontrol/ui/general_settings_tab_ui.ui @@ -42,7 +42,7 @@ Expanding - + 40 20 @@ -67,7 +67,7 @@ Expanding - + 40 20 @@ -86,7 +86,7 @@ Expanding - + 20 40 diff --git a/khotkeys/kcontrol/ui/general_tab_ui.ui b/khotkeys/kcontrol/ui/general_tab_ui.ui index 24192fed3..4817d8662 100644 --- a/khotkeys/kcontrol/ui/general_tab_ui.ui +++ b/khotkeys/kcontrol/ui/general_tab_ui.ui @@ -80,7 +80,7 @@ Fixed - + 20 20 @@ -105,7 +105,7 @@ Fixed - + 20 20 diff --git a/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui b/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui index 5fc15b458..068806a02 100644 --- a/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui +++ b/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui @@ -46,7 +46,7 @@ Expanding - + 0 30 @@ -77,7 +77,7 @@ Expanding - + 30 0 @@ -102,7 +102,7 @@ Expanding - + 30 0 @@ -121,7 +121,7 @@ 0 - + 100 100 @@ -138,7 +138,7 @@ Expanding - + 30 0 @@ -163,7 +163,7 @@ Expanding - + 30 0 @@ -182,7 +182,7 @@ Expanding - + 0 30 @@ -213,7 +213,7 @@ Expanding - + 30 0 @@ -238,7 +238,7 @@ Expanding - + 30 0 @@ -257,7 +257,7 @@ 0 - + 100 100 @@ -274,7 +274,7 @@ Expanding - + 30 0 @@ -299,7 +299,7 @@ Expanding - + 30 0 @@ -318,7 +318,7 @@ Expanding - + 0 30 @@ -349,7 +349,7 @@ Expanding - + 30 0 @@ -374,7 +374,7 @@ Expanding - + 30 0 @@ -393,7 +393,7 @@ 0 - + 100 100 @@ -410,7 +410,7 @@ Expanding - + 30 0 @@ -435,7 +435,7 @@ Expanding - + 30 0 @@ -454,7 +454,7 @@ Expanding - + 0 30 diff --git a/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui b/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui index 698392402..17b881de9 100644 --- a/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui +++ b/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui @@ -116,7 +116,7 @@ Expanding - + 20 50 diff --git a/khotkeys/kcontrol/ui/info_tab_ui.ui b/khotkeys/kcontrol/ui/info_tab_ui.ui index 53868495c..2aeaee5c6 100644 --- a/khotkeys/kcontrol/ui/info_tab_ui.ui +++ b/khotkeys/kcontrol/ui/info_tab_ui.ui @@ -33,7 +33,7 @@ <p>This module allows configuring input actions, like mouse gestures, keyboard shortcuts for performing commands, launching applications or DCOP calls, and similar.</p> <p><b>NOTE: </b>If you are not an experienced user, you should be careful with modifying the actions, and should limit your changes mainly to enabling/disabling actions, and changing triggers.</p> - + WordBreak|AlignVCenter @@ -47,7 +47,7 @@ Expanding - + 20 20 diff --git a/khotkeys/kcontrol/ui/menuentry_widget_ui.ui b/khotkeys/kcontrol/ui/menuentry_widget_ui.ui index 4bc827575..6af0aefc6 100644 --- a/khotkeys/kcontrol/ui/menuentry_widget_ui.ui +++ b/khotkeys/kcontrol/ui/menuentry_widget_ui.ui @@ -72,7 +72,7 @@ Expanding - + 0 20 diff --git a/khotkeys/kcontrol/ui/voice_input_widget_ui.ui b/khotkeys/kcontrol/ui/voice_input_widget_ui.ui index ee5968743..c30ff6293 100644 --- a/khotkeys/kcontrol/ui/voice_input_widget_ui.ui +++ b/khotkeys/kcontrol/ui/voice_input_widget_ui.ui @@ -28,7 +28,7 @@ 0 - + 150 0 diff --git a/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui b/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui index 1a4eed270..f80ebae1b 100644 --- a/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui +++ b/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui @@ -23,7 +23,7 @@ In order to trigger a spoken action, you have to press the key (or combination of keys) configured below, speak the command and then press the same key again once you have finished speaking. - + WordBreak|AlignVCenter @@ -61,7 +61,7 @@ Expanding - + 241 21 @@ -80,7 +80,7 @@ Expanding - + 31 90 diff --git a/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui b/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui index 8cdc03d05..d15dab5df 100644 --- a/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui +++ b/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui @@ -48,7 +48,7 @@ Expanding - + 0 20 @@ -137,7 +137,7 @@ Expanding - + 0 20 @@ -226,7 +226,7 @@ Expanding - + 0 20 @@ -315,7 +315,7 @@ Expanding - + 0 20 @@ -346,7 +346,7 @@ Expanding - + 20 0 @@ -371,7 +371,7 @@ Expanding - + 20 0 @@ -390,7 +390,7 @@ Expanding - + 0 20 diff --git a/khotkeys/kcontrol/voicerecordpage.cpp b/khotkeys/kcontrol/voicerecordpage.cpp index fa103e6b1..fec07e22f 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->tqsetAlignment(TQLabel::AlignLeft | TQLabel::WordBreak | + _label->setAlignment(TQLabel::AlignLeft | TQLabel::WordBreak | TQLabel::AlignVCenter); _lineEdit = new KLineEdit( this ); diff --git a/khotkeys/shared/input.cpp b/khotkeys/shared/input.cpp index 00f35f1f0..19536a5e9 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 = tqreceivers[ receiver_P ]; + Receiver_data& rcv = receivers[ 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 = tqreceivers[ receiver_P ]; + Receiver_data& rcv = receivers[ receiver_P ]; rcv.shortcuts.remove( shortcut_P ); if( rcv.active ) ungrab_shortcut( shortcut_P ); if( rcv.shortcuts.count() == 0 ) - tqreceivers.remove( receiver_P ); + receivers.remove( receiver_P ); } void Kbd::activate_receiver( Kbd_receiver* receiver_P ) { - Receiver_data& rcv = tqreceivers[ receiver_P ]; + Receiver_data& rcv = receivers[ 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 = tqreceivers[ receiver_P ]; + Receiver_data& rcv = receivers[ receiver_P ]; if( !rcv.active ) return; rcv.active = false; @@ -144,8 +144,8 @@ void Kbd::key_slot( TQString key_P ) KShortcut shortcut( key_P ); if( !grabs.contains( shortcut )) return; - for( TQMap< Kbd_receiver*, Receiver_data >::ConstIterator it = tqreceivers.begin(); - it != tqreceivers.end(); + for( TQMap< Kbd_receiver*, Receiver_data >::ConstIterator it = receivers.begin(); + it != receivers.end(); ++it ) if( ( *it ).shortcuts.contains( shortcut ) && ( *it ).active && it.key()->handle_key( shortcut )) diff --git a/khotkeys/shared/input.h b/khotkeys/shared/input.h index a9f19240d..f74368944 100644 --- a/khotkeys/shared/input.h +++ b/khotkeys/shared/input.h @@ -58,7 +58,7 @@ class Kbd TQValueList< KShortcut > shortcuts; bool active; }; - TQMap< Kbd_receiver*, Receiver_data > tqreceivers; + TQMap< Kbd_receiver*, Receiver_data > receivers; TQMap< KShortcut, int > grabs; KGlobalAccel* kga; }; diff --git a/khotkeys/shared/sound.cpp b/khotkeys/shared/sound.cpp index 5b99a1cba..393b02f46 100644 --- a/khotkeys/shared/sound.cpp +++ b/khotkeys/shared/sound.cpp @@ -93,7 +93,7 @@ void Sound::load(const TQString& filename) TQ_INT32 nb=0; for(uint k=0;k> 8; + TQ_UINT16 val= (signed short int) ( (data.at(f) * ((double)(1<<13)/(signed)max) ) ); + SoundData.at( 2*f )= val & 0x00FF; + SoundData.at(2*f+1)= (val & 0xFF00) >> 8; -// kdDebug( 1217 ) << k_funcinfo << data.tqat(f) << " / " << max << " = " << val << " | " << SoundData[ 2*f ] << " "<< SoundData[ 2*f+1 ] << endl; +// kdDebug( 1217 ) << k_funcinfo << data.at(f) << " / " << max << " = " << val << " | " << SoundData[ 2*f ] << " "<< SoundData[ 2*f+1 ] << endl; } TQ_UINT16 NumberOfChannels=2; diff --git a/khotkeys/shared/sound.h b/khotkeys/shared/sound.h index 9dca03a99..6453563de 100644 --- a/khotkeys/shared/sound.h +++ b/khotkeys/shared/sound.h @@ -42,7 +42,7 @@ public: inline float at(int pos) const { - return (float)(data.tqat(pos))/max; + return (float)(data.at(pos))/max; } inline uint fs() const diff --git a/khotkeys/shared/voicesignature.cpp b/khotkeys/shared/voicesignature.cpp index b40c8fd6a..8ef817933 100644 --- a/khotkeys/shared/voicesignature.cpp +++ b/khotkeys/shared/voicesignature.cpp @@ -210,7 +210,7 @@ TQMemArray VoiceSignature::fft(const Sound& sound, unsigned int start, u for(uint x=start; x