From 73c08b592db45af554b9f21029bc549d70f683ab Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 15 Dec 2011 15:46:05 -0600
Subject: Rename a number of old tq methods that are no longer tq specific

---
 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 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'khotkeys/shared')

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<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;
-- 
cgit v1.2.1