Trinity Qt initial conversion

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1157639 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 13 insertions, 13 deletions

diff --git a/khotkeys/shared/voices.cpp b/khotkeys/shared/voices.cpp
index e0dc95613..a6515fecf 100644
--- a/khotkeys/shared/voices.cpp
+++ b/khotkeys/shared/voices.cpp
@@ -27,7 +27,7 @@
 #include <kdebug.h>
 #include <kxerrorhandler.h>
 #include <kkeynative.h>
-#include <qtimer.h>
+#include <tqtimer.h>
 #include <kglobalaccel.h>
 
 
@@ -39,8 +39,8 @@ namespace KHotKeys
 
 Voice* voice_handler;
 
-Voice::Voice( bool enabled_P, QObject* parent_P )
-	: QObject( parent_P) ,_enabled( enabled_P ), _recording( false ), _recorder(0)
+Voice::Voice( bool enabled_P, TQObject* parent_P )
+	: TQObject( parent_P) ,_enabled( enabled_P ), _recording( false ), _recorder(0)
     {
     assert( voice_handler == NULL );
     voice_handler = this;
@@ -95,7 +95,7 @@ void Voice::record_start()
 	if(!_recorder)
 	{
 		_recorder= SoundRecorder::create(this);
-		connect(_recorder, SIGNAL(recorded(const Sound& )), this, SLOT(slot_sound_recorded(const Sound& )));
+		connect(_recorder, TQT_SIGNAL(recorded(const Sound& )), this, TQT_SLOT(slot_sound_recorded(const Sound& )));
 	}
 
 	_recorder->start();
@@ -125,7 +125,7 @@ void Voice::slot_sound_recorded(const Sound &sound_P)
 	double minimum=800000;
 	double second_minimum=80000;
 	int got_count=0;
-	QValueList<Voice_trigger*>::Iterator it;
+	TQValueList<Voice_trigger*>::Iterator it;
 	for ( it = _references.begin(); it != _references.end(); ++it )
 	{
 		for(int ech=1; ech<=2 ; ech++)
@@ -208,7 +208,7 @@ void Voice::set_shortcut( const KShortcut &shortcut)
         _kga = new KGlobalAccel( this );	
     _kga->remove("voice");
 
-	_kga->insert( "voice", i18n("Voice"), QString::null,  shortcut, 0, this, SLOT(slot_key_pressed())) ;
+	_kga->insert( "voice", i18n("Voice"), TQString::null,  shortcut, 0, this, TQT_SLOT(slot_key_pressed())) ;
         _kga->updateConnections();
 }
 
@@ -223,8 +223,8 @@ void Voice::slot_key_pressed()
 		record_start();
 		if(!_timer)
 		{
-			_timer=new QTimer(this);
-			connect(_timer, SIGNAL(timeout()) , this, SLOT(slot_timeout()));
+			_timer=new TQTimer(this);
+			connect(_timer, TQT_SIGNAL(timeout()) , this, TQT_SLOT(slot_timeout()));
 		}
 		
 		_timer->start(1000*20,true);
@@ -244,14 +244,14 @@ void Voice::slot_timeout()
 }
 
 
-QString Voice::isNewSoundFarEnough(const VoiceSignature& signature, const QString &currentTrigger)
+TQString Voice::isNewSoundFarEnough(const VoiceSignature& signature, const TQString &currentTrigger)
 {
 	Voice_trigger *trig=0L;
 	Voice_trigger *sec_trig=0L;
 	double minimum=800000;
 	double second_minimum=80000;
 	int got_count=0;
-	QValueList<Voice_trigger*>::Iterator it;
+	TQValueList<Voice_trigger*>::Iterator it;
 	for ( it = _references.begin(); it != _references.end(); ++it )
 	{
 		Voice_trigger *t=*it;
@@ -283,12 +283,12 @@ QString Voice::isNewSoundFarEnough(const VoiceSignature& signature, const QStrin
 		kdDebug(1217) << k_funcinfo << "**** " << trig->voicecode() << " : " << minimum << endl;
 
 	bool selected=trig &&  ((got_count==1 && minimum < REJECT_FACTOR_DIFF*0.7 ) || ( minimum < REJECT_FACTOR_DIFF   &&  trig==sec_trig  ) );
-	return selected ? trig->voicecode() : QString::null;
+	return selected ? trig->voicecode() : TQString::null;
 }
 
-bool Voice::doesVoiceCodeExists(const QString &vc)
+bool Voice::doesVoiceCodeExists(const TQString &vc)
 {
-	QValueList<Voice_trigger*>::Iterator it;
+	TQValueList<Voice_trigger*>::Iterator it;
 	for ( it = _references.begin(); it != _references.end(); ++it )
 	{
 		Voice_trigger *t=*it;