summaryrefslogtreecommitdiffstats
path: root/khotkeys
diff options
context:
space:
mode:
Diffstat (limited to 'khotkeys')
-rw-r--r--khotkeys/kcontrol/gesturedrawer.cpp2
-rw-r--r--khotkeys/kcontrol/ui/info_tab_ui.ui2
-rw-r--r--khotkeys/kcontrol/ui/voice_settings_tab_ui.ui2
-rw-r--r--khotkeys/shared/input.cpp14
-rw-r--r--khotkeys/shared/input.h2
-rw-r--r--khotkeys/shared/sound.cpp10
-rw-r--r--khotkeys/shared/sound.h2
-rw-r--r--khotkeys/shared/voicesignature.cpp2
8 files changed, 18 insertions, 18 deletions
diff --git a/khotkeys/kcontrol/gesturedrawer.cpp b/khotkeys/kcontrol/gesturedrawer.cpp
index c05d73945..2364e6e51 100644
--- a/khotkeys/kcontrol/gesturedrawer.cpp
+++ b/khotkeys/kcontrol/gesturedrawer.cpp
@@ -33,7 +33,7 @@ void GestureDrawer::setData(const TQString &data)
{
_data = data;
- tqrepaint();
+ repaint();
}
void GestureDrawer::paintEvent(TQPaintEvent *ev)
diff --git a/khotkeys/kcontrol/ui/info_tab_ui.ui b/khotkeys/kcontrol/ui/info_tab_ui.ui
index e082fd6c8..2aeaee5c6 100644
--- a/khotkeys/kcontrol/ui/info_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/info_tab_ui.ui
@@ -33,7 +33,7 @@
<string>&lt;p&gt;This module allows configuring input actions, like mouse gestures, keyboard shortcuts for performing commands, launching applications or DCOP calls, and similar.&lt;/p&gt;
&lt;p&gt;&lt;b&gt;NOTE: &lt;/b&gt;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.&lt;/p&gt;</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
diff --git a/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui b/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui
index 6029f0522..f80ebae1b 100644
--- a/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui
@@ -23,7 +23,7 @@
<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="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
diff --git a/khotkeys/shared/input.cpp b/khotkeys/shared/input.cpp
index 190b5dd04..f9bfec6d3 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<BytePS;k++)
{
- nb |= (SoundData.tqat(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);
@@ -129,11 +129,11 @@ void Sound::save(const TQString& filename) const
for(unsigned long int f=0;f<data.size();f++)
{
- TQ_UINT16 val= (signed short int) ( (data.tqat(f) * ((double)(1<<13)/(signed)max) ) );
- SoundData.tqat( 2*f )= val & 0x00FF;
- SoundData.tqat(2*f+1)= (val & 0xFF00) >> 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<double> VoiceSignature::fft(const Sound& sound, unsigned int start, u
for(uint x=start; x<stop; x++)
{
- Complex s(sound.tqat(x));
+ Complex s(sound.at(x));
double angle=-2*PI*f*x/8000;
s*= Complex( cos(angle) , sin(angle) );
c+=s;
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-18 17:52:15 +0000