Revert automated changes

Sorry guys, they are just not ready for prime time
Work will continue as always


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

17 files changed, 32 insertions, 32 deletions

diff --git a/arts/kde/kartsdispatcher.h b/arts/kde/kartsdispatcher.h
index 26eb115d9..dcd094844 100644
--- a/arts/kde/kartsdispatcher.h
+++ b/arts/kde/kartsdispatcher.h
@@ -61,7 +61,7 @@ namespace Arts
  * }
  * \endcode
  */
-class KDE_EXPORT KArtsDispatcher : public TQObject
+class KDE_EXPORT KArtsDispatcher : public QObject
 {
 Q_OBJECT
 public:
diff --git a/arts/kde/kartsserver.cpp b/arts/kde/kartsserver.cpp
index b4c3f963b..ee220be17 100644
--- a/arts/kde/kartsserver.cpp
+++ b/arts/kde/kartsserver.cpp
@@ -77,12 +77,12 @@ Arts::SoundServerV2 KArtsServer::server(void)
 
 	X11CommConfig.sync();
 	
-	proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("kdeinit_wrapper")));
+	proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("kdeinit_wrapper")));
 
 	if(rt)
-		proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("artswrapper")));
+		proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("artswrapper")));
 	else
-		proc << TQFile::encodeName(KStandardDirs::findExe(TQString::tqfromLatin1("artsd")));
+		proc << TQFile::encodeName(KStandardDirs::findExe(TQString::fromLatin1("artsd")));
 
 	proc << TQStringList::split( " ", config.readEntry( "Arguments", "-F 10 -S 4096 -s 60 -m artsmessage -l 3 -f" ) );
 
diff --git a/arts/kde/kartsserver.h b/arts/kde/kartsserver.h
index 0735e2082..c01829cf1 100644
--- a/arts/kde/kartsserver.h
+++ b/arts/kde/kartsserver.h
@@ -34,7 +34,7 @@
  * artsd on KDE startup, but at the very least there will always be third
  * party PlayObjects that will crash.  So, this is necessary.
  */
-class KDE_ARTS_EXPORT KArtsServer : public TQObject
+class KDE_ARTS_EXPORT KArtsServer : public QObject
 {
 Q_OBJECT
 
diff --git a/arts/kde/kaudioconverter.h b/arts/kde/kaudioconverter.h
index 0022d9bba..21876e037 100644
--- a/arts/kde/kaudioconverter.h
+++ b/arts/kde/kaudioconverter.h
@@ -29,7 +29,7 @@
 class KURL;
 class TQString;
 
-class KAudioConverter : public TQObject
+class KAudioConverter : public QObject
 {
 Q_OBJECT
 public:
diff --git a/arts/kde/kaudiorecordstream.h b/arts/kde/kaudiorecordstream.h
index 8caab8325..fdd4353fe 100644
--- a/arts/kde/kaudiorecordstream.h
+++ b/arts/kde/kaudiorecordstream.h
@@ -38,7 +38,7 @@ namespace Arts { class StereoEffectStack; }
  * @author Matthias Kretz <kretz@kde.org>
  * @since 3.2
 */
-class KDE_ARTS_EXPORT KAudioRecordStream : public TQObject
+class KDE_ARTS_EXPORT KAudioRecordStream : public QObject
 {
 	Q_OBJECT
 
diff --git a/arts/kde/kconverttest.h b/arts/kde/kconverttest.h
index 7e7cc6c50..1d0b10f87 100644
--- a/arts/kde/kconverttest.h
+++ b/arts/kde/kconverttest.h
@@ -24,7 +24,7 @@
 
 #include <tqobject.h>
 
-class KConvertTest : public TQObject
+class KConvertTest : public QObject
 {
 Q_OBJECT
 public:
diff --git a/arts/kde/kioinputstream_impl.cpp b/arts/kde/kioinputstream_impl.cpp
index e88d5a3c0..f7df6347c 100644
--- a/arts/kde/kioinputstream_impl.cpp
+++ b/arts/kde/kioinputstream_impl.cpp
@@ -78,7 +78,7 @@ void KIOInputStream_impl::streamStart()
 	m_job = KIO::get(m_url, false, false);
 
 	m_job->addMetaData("accept", "audio/x-mp3, video/mpeg, application/ogg");
-	m_job->addMetaData("UserAgent", TQString::tqfromLatin1("aRts/") + TQString::tqfromLatin1(ARTS_VERSION));
+	m_job->addMetaData("UserAgent", TQString::fromLatin1("aRts/") + TQString::fromLatin1(ARTS_VERSION));
 
 	TQObject::connect(m_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)),
 			 this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &)));		     
diff --git a/arts/kde/kplayobject.cc b/arts/kde/kplayobject.cc
index 7c71be31f..becb20a58 100644
--- a/arts/kde/kplayobject.cc
+++ b/arts/kde/kplayobject.cc
@@ -65,7 +65,7 @@ void KPlayObject::halt()
 
 TQString KPlayObject::description()
 {
-	return TQString::tqfromLatin1(object().description().c_str());
+	return TQString::fromLatin1(object().description().c_str());
 }
 
 Arts::poTime KPlayObject::currentTime()
@@ -85,7 +85,7 @@ Arts::poCapabilities KPlayObject::capabilities()
 
 TQString KPlayObject::mediaName()
 {
-	return TQString::tqfromLatin1(object().mediaName().c_str());
+	return TQString::fromLatin1(object().mediaName().c_str());
 }
 
 Arts::poState KPlayObject::state()
@@ -243,7 +243,7 @@ TQString KDE::PlayObject::description()
 {
 	if ( object().isNull() )
 		return TQString();
-	return TQString::tqfromLatin1(object().description().c_str());
+	return TQString::fromLatin1(object().description().c_str());
 }
 
 Arts::poTime KDE::PlayObject::currentTime()
@@ -271,7 +271,7 @@ TQString KDE::PlayObject::mediaName()
 {
 	if ( object().isNull() )
 		return TQString();
-	return TQString::tqfromLatin1(object().mediaName().c_str());
+	return TQString::fromLatin1(object().mediaName().c_str());
 }
 
 Arts::poState KDE::PlayObject::state()
diff --git a/arts/kde/kplayobject.h b/arts/kde/kplayobject.h
index 4aafe0b58..907723cf3 100644
--- a/arts/kde/kplayobject.h
+++ b/arts/kde/kplayobject.h
@@ -27,7 +27,7 @@
 #include <kurl.h>
 #include <tqobject.h>
 
-class KDE_EXPORT KPlayObject : public TQObject
+class KDE_EXPORT KPlayObject : public QObject
 {
 Q_OBJECT
 public:
@@ -185,7 +185,7 @@ class PlayObjectFactory;
   * internal state until the real Arts::PlayObject got created, afterwards
   * the state of the Arts::PlayObject will be returned.
   */
-class KDE_EXPORT PlayObject : public TQObject
+class KDE_EXPORT PlayObject : public QObject
 {
 Q_OBJECT
 public:
diff --git a/arts/kde/kplayobjectcreator.h b/arts/kde/kplayobjectcreator.h
index d52e18a1e..f012de2cd 100644
--- a/arts/kde/kplayobjectcreator.h
+++ b/arts/kde/kplayobjectcreator.h
@@ -29,7 +29,7 @@
 
 namespace KDE {
 
-class PlayObjectCreator : public TQObject
+class PlayObjectCreator : public QObject
 {
 Q_OBJECT
 public:
diff --git a/arts/kde/kplayobjectfactory.cc b/arts/kde/kplayobjectfactory.cc
index c02b896a5..99a2e2edb 100644
--- a/arts/kde/kplayobjectfactory.cc
+++ b/arts/kde/kplayobjectfactory.cc
@@ -155,7 +155,7 @@ KDE::PlayObject *KDE::PlayObjectFactory::createPlayObject(const KURL& _url, cons
 	}
 
 	// decide if it's a local file. mpeglib provides cdda reading and decoding, so we prefer that over kio_audiocd
-	if ( url.isLocalFile() || !d->allowStreaming || (url.protocol() == "audiocd" && mimetype == "application/x-cda" && mimeTypes().tqcontains( "application/x-cda" ) ) )
+	if ( url.isLocalFile() || !d->allowStreaming || (url.protocol() == "audiocd" && mimetype == "application/x-cda" && mimeTypes().contains( "application/x-cda" ) ) )
 	{
 		// we rely on the delivered mimetype if it's a local file
 		d->playObj = new KDE::PlayObject( d->server.createPlayObjectForURL( string( TQFile::encodeName( url.path() ) ), string( mimetype.latin1() ), createBUS ), false );
diff --git a/arts/kde/kplayobjectfactory_p.h b/arts/kde/kplayobjectfactory_p.h
index 6d4b1fa26..f81349251 100644
--- a/arts/kde/kplayobjectfactory_p.h
+++ b/arts/kde/kplayobjectfactory_p.h
@@ -29,7 +29,7 @@ namespace KDE
 /**
  * @internal
  */
-class POFHelper : public TQObject
+class POFHelper : public QObject
 {
 	friend class PlayObjectFactory;
 	Q_OBJECT
diff --git a/arts/kde/kvideowidget.cpp b/arts/kde/kvideowidget.cpp
index cea85bd2c..6aeeb8e8f 100644
--- a/arts/kde/kvideowidget.cpp
+++ b/arts/kde/kvideowidget.cpp
@@ -92,7 +92,7 @@ KVideoWidget::KVideoWidget( TQWidget *parent, const char *name, WFlags f )
 void KVideoWidget::init(void)
 {
     setMinimumSize(0, 0);
-    tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
+    setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
     setFocusPolicy( ClickFocus );
 
     fullscreenWidget = 0;
@@ -147,7 +147,7 @@ void KVideoWidget::embed( Arts::VideoPlayObject vpo )
 	}
 
 	setBackgroundMode( PaletteBackground );
-	tqrepaint();
+	repaint();
 
 	// Resize GUI
 	videoWidth  = 0;
@@ -286,7 +286,7 @@ void KVideoWidget::setDoubleSize()
     doubleSizeActivated();
 }
 
-TQSize KVideoWidget::tqsizeHint() const
+TQSize KVideoWidget::sizeHint() const
 {
     return TQSize( videoWidth, videoHeight );
 }
diff --git a/arts/kde/kvideowidget.h b/arts/kde/kvideowidget.h
index 734fe4b01..0e3881a93 100644
--- a/arts/kde/kvideowidget.h
+++ b/arts/kde/kvideowidget.h
@@ -36,7 +36,7 @@ public:
     bool isNormalSize();
     bool isDoubleSize();
 
-    TQSize tqsizeHint() const;
+    TQSize sizeHint() const;
 
     virtual int heightForWidth ( int w ) const;
 
diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp
index 6105cbf4a..ea20608ba 100644
--- a/arts/knotify/knotify.cpp
+++ b/arts/knotify/knotify.cpp
@@ -351,13 +351,13 @@ void KNotify::notify(const TQString &event, const TQString &fromApp,
     if ( !event.isEmpty() ) {
 
         // get config file
-        if ( d->events.tqcontains( fromApp ) ) {
+        if ( d->events.contains( fromApp ) ) {
             eventsFile = d->events[fromApp];
         } else {
             eventsFile=new KConfig(locate("data", fromApp+"/eventsrc"),true,false);
             d->events.insert( fromApp, eventsFile );
         }
-        if ( d->configs.tqcontains( fromApp) ) {
+        if ( d->configs.contains( fromApp) ) {
             configFile = d->configs[fromApp];
         } else {
             configFile=new KConfig(fromApp+".eventsrc",true,false);
@@ -642,7 +642,7 @@ bool KNotify::notifyByLogfile(const TQString &text, const TQString &file)
 
     // append msg
     TQTextStream strm( &logFile );
-    strm << "- KNotify " << TQDateTime::tqcurrentDateTime().toString() << ": ";
+    strm << "- KNotify " << TQDateTime::currentDateTime().toString() << ": ";
     strm << text << endl;
 
     // close file
@@ -660,7 +660,7 @@ bool KNotify::notifyByStderr(const TQString &text)
     TQTextStream strm( stderr, IO_WriteOnly );
 
     // output msg
-    strm << "KNotify " << TQDateTime::tqcurrentDateTime().toString() << ": ";
+    strm << "KNotify " << TQDateTime::currentDateTime().toString() << ": ";
     strm << text << endl;
 
     return true;
@@ -695,7 +695,7 @@ void KNotify::playTimeout()
         ++it;
         if ( (*current)->state() != Arts::posPlaying )
         {
-            TQMap<KDE::PlayObject*,int>::Iterator eit = d->playObjectEventMap.tqfind( *current );
+            TQMap<KDE::PlayObject*,int>::Iterator eit = d->playObjectEventMap.find( *current );
             if ( eit != d->playObjectEventMap.end() )
             {
                 soundFinished( *eit, PlayedOK );
@@ -730,7 +730,7 @@ void KNotify::slotPlayerProcessExited( KProcess *proc )
 void KNotify::abortFirstPlayObject()
 {
 #ifndef WITHOUT_ARTS
-    TQMap<KDE::PlayObject*,int>::Iterator it = d->playObjectEventMap.tqfind( d->playObjects.getFirst() );
+    TQMap<KDE::PlayObject*,int>::Iterator it = d->playObjectEventMap.find( d->playObjects.getFirst() );
     if ( it != d->playObjectEventMap.end() )
     {
         soundFinished( it.data(), Aborted );
@@ -740,7 +740,7 @@ void KNotify::abortFirstPlayObject()
 #endif
 }
 
-void KNotify::soundFinished( int eventId, PlayingFinishedtqStatus reason )
+void KNotify::soundFinished( int eventId, PlayingFinishedStatus reason )
 {
     TQByteArray data;
     TQDataStream stream( data, IO_WriteOnly );
diff --git a/arts/knotify/knotify.h b/arts/knotify/knotify.h
index f35d9ad79..12e699299 100644
--- a/arts/knotify/knotify.h
+++ b/arts/knotify/knotify.h
@@ -37,7 +37,7 @@ public:
 	KNotify( bool useArts );
 	~KNotify();
 
-    enum PlayingFinishedtqStatus
+    enum PlayingFinishedStatus
     {
         PlayedOK = 0,        // success, all following mean failure
         NoSoundFile,
@@ -86,7 +86,7 @@ private:
 	
 	bool isPlaying( const TQString& soundFile ) const;
 
-    void soundFinished( int eventId, PlayingFinishedtqStatus reason );
+    void soundFinished( int eventId, PlayingFinishedStatus reason );
     void abortFirstPlayObject();
 	
         WId checkWinId( const TQString& appName, WId senderWinId );
diff --git a/arts/message/artsmessage.cc b/arts/message/artsmessage.cc
index cef8c2ca6..f77ecd581 100644
--- a/arts/message/artsmessage.cc
+++ b/arts/message/artsmessage.cc
@@ -83,7 +83,7 @@ int main(int argc, char **argv) {
 		KMessageBox::sorry(0, msg, i18n("Warning"), notifyOptions);
 	} else if (args->isSet("i")) {
 		TQString id = msg;
-		id.tqreplace(TQRegExp("[\\[\\]\\s=]"), "_");
+		id.replace(TQRegExp("[\\[\\]\\s=]"), "_");
 		KMessageBox::information(0, msg, i18n("Informational"), id, notifyOptions);
 	} else {
 		KMessageBox::error(0, msg, i18n("Error"), notifyOptions);