Fix inadvertent tqt changes.

pull/1/head
Darrell Anderson 10 years ago
parent 2f8924b060
commit 4c24fca1c2
  1. 6
      amarok/src/analyzers/analyzerbase.h
  2. 2
      amarok/src/mediadevice/daap/daapclient.h
  3. 2
      amarok/src/playlistloader.h
  4. 2
      amarok/src/threadmanager.h
  5. 2
      amarok/src/xmlloader.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

@ -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

@ -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
{

@ -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

@ -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;
};

Loading…
Cancel
Save