diff options
author | Darrell Anderson <[email protected]> | 2012-10-21 13:28:34 -0500 |
---|---|---|
committer | Darrell Anderson <[email protected]> | 2012-10-21 13:28:34 -0500 |
commit | 4c24fca1c28058c39e5793ce7b0813c270b603d6 (patch) | |
tree | 4109dd1ce599e4dca1b993cafd77f4b9d7ba8fd9 | |
parent | 2f8924b06027d022536b79e0f3399802fab6f35a (diff) | |
download | amarok-4c24fca1c28058c39e5793ce7b0813c270b603d6.tar.gz amarok-4c24fca1c28058c39e5793ce7b0813c270b603d6.zip |
Fix inadvertent tqt changes.
-rw-r--r-- | amarok/src/analyzers/analyzerbase.h | 6 | ||||
-rw-r--r-- | amarok/src/mediadevice/daap/daapclient.h | 2 | ||||
-rw-r--r-- | amarok/src/playlistloader.h | 2 | ||||
-rw-r--r-- | amarok/src/threadmanager.h | 2 | ||||
-rw-r--r-- | amarok/src/xmlloader.h | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/amarok/src/analyzers/analyzerbase.h b/amarok/src/analyzers/analyzerbase.h index 50b1b624..5fc7a938 100644 --- a/amarok/src/analyzers/analyzerbase.h +++ b/amarok/src/analyzers/analyzerbase.h @@ -27,7 +27,7 @@ #include <GL/glu.h> //included for convenience #endif //#else -////this is a workaround for compile problems due to tqmoc +////this is a workaround for compile problems due to moc //#define TQGLWidget TQWidget //#endif @@ -106,12 +106,12 @@ private: -//This mess is because tqmoc generates an entry for this class despite the #if block +//This mess is because moc generates an entry for this class despite the #if block //1. the Q_OBJECT macro must be exposed //2. we have to define the class //3. we have to declare a ctor (to satisfy the inheritance) //4. the slot must also by visible (!) -//TODO find out how to stop tqmoc generating a metaobject for this class +//TODO find out how to stop moc generating a metaobject for this class class Base3D : public Base<TQGLWidget> { Q_OBJECT diff --git a/amarok/src/mediadevice/daap/daapclient.h b/amarok/src/mediadevice/daap/daapclient.h index 5354423c..1eb4d123 100644 --- a/amarok/src/mediadevice/daap/daapclient.h +++ b/amarok/src/mediadevice/daap/daapclient.h @@ -29,7 +29,7 @@ #else namespace DNSSD { namespace RemoteService { - class Ptr {}; //HACK Dummy class, so that daapclient.tqmoc compiles + class Ptr {}; //HACK Dummy class, so that daapclient.moc compiles } } #endif diff --git a/amarok/src/playlistloader.h b/amarok/src/playlistloader.h index 0f95f5ee..40432e9e 100644 --- a/amarok/src/playlistloader.h +++ b/amarok/src/playlistloader.h @@ -199,7 +199,7 @@ private slots: void abort() { delete this; } }; -// PRIVATE -- should be in the .cpp, but fucking tqmoc. +// PRIVATE -- should be in the .cpp, but fucking moc. class MyXmlLoader: public MetaBundle::XmlLoader { diff --git a/amarok/src/threadmanager.h b/amarok/src/threadmanager.h index d96bca79..2c5c8153 100644 --- a/amarok/src/threadmanager.h +++ b/amarok/src/threadmanager.h @@ -76,7 +76,7 @@ */ -/// This class is because tqmoc "is really good" (no nested Q_OBJECT classes) +/// This class is because moc "is really good" (no nested Q_OBJECT classes) class JobBase : public TQObject { Q_OBJECT diff --git a/amarok/src/xmlloader.h b/amarok/src/xmlloader.h index 4a6f1d76..f9bdfcd6 100644 --- a/amarok/src/xmlloader.h +++ b/amarok/src/xmlloader.h @@ -172,7 +172,7 @@ class MetaBundle::XmlLoader: public TQObject, public TQXmlDefaultHandler virtual bool endDocument(); virtual bool fatalError( const TQXmlParseException &exception ); - public: //fucking tqmoc, these should be private + public: //fucking moc, these should be private class ThreadedLoader; class SimpleLoader; }; |