[Uml-devel] branches/trinity
Timothy Pearson
kb9vqf at pearsoncomputing.net
Fri Aug 5 17:12:18 UTC 2011
SVN commit 1245170 by tpearson:
Fix missing Q_OBJECT macros
M +1 -1 applications/amarok/amarok/src/analyzers/analyzerbase.h
M +2 -0 applications/amarok/amarok/src/scripts/graphequalizer/stdinreader.h
M +1 -1 applications/amarok/amarok/src/threadmanager.h
M +1 -0 applications/kima/src/kima.h
M +1 -0 applications/kima/src/sourcelistitem.h
M +1 -0 applications/kima/src/sources/acpithermalsrc.h
M +1 -0 applications/kima/src/sources/batterysrc.h
M +1 -0 applications/kima/src/sources/cpuinfofreqsrc.h
M +1 -0 applications/kima/src/sources/hddtempsrc.h
M +1 -0 applications/kima/src/sources/hwmonfansrc.h
M +1 -0 applications/kima/src/sources/hwmonthermalsrc.h
M +1 -0 applications/kima/src/sources/i8ksrc.h
M +1 -0 applications/kima/src/sources/ibmacpifansrc.h
M +1 -0 applications/kima/src/sources/ibmacpithermalsrc.h
M +1 -0 applications/kima/src/sources/ibmhdaps.h
M +1 -0 applications/kima/src/sources/ibookg4thermalsrc.h
M +1 -0 applications/kima/src/sources/labelsource.h
M +1 -0 applications/kima/src/sources/nvidiathermalsrc.h
M +1 -0 applications/kima/src/sources/omnibookthermalsrc.h
M +1 -0 applications/kima/src/sources/sysfreqsrc.h
M +1 -0 applications/kima/src/sources/threadedtrigger.h
M +1 -0 applications/kima/src/sources/uptimesrc.h
M +1 -1 applications/koffice/kexi/kexidb/driver.h
M +1 -1 applications/koffice/kexi/migration/keximigrate.h
M +1 -1 applications/koffice/kexi/widget/tableview/kexidataawareobjectiface.h
M +1 -1 applications/rosegarden/src/gui/editors/matrix/MatrixView.h
M +1 -0 dependencies/dbus-1-tqt/tqdbusconnection.h
M +1 -0 dependencies/dbus-1-tqt/tqdbusproxy.h
M +2 -0 dependencies/dbus-tqt/dbus-qt.h
M +7 -1 kdegames/kolf/objects/poolball/poolball.h
M +7 -1 kdegames/kolf/objects/test/test.h
M +2 -1 kdenetwork/kopete/protocols/sms/services/kopete_unix_serial.h
M +2 -0 kdepim/kode/printer.cpp
M +2 -1 kdesdk/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.h
M +1 -0 kdesdk/umbrello/umbrello/codeimport/kdevcppparser/lexer.h
M +1 -1 kdesdk/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp
M +1 -1 kdevelop/languages/cpp/cppimplementationwidget.cpp
M +1 -1 kdevelop/languages/cpp/cppnewclassdlg.cpp
M +1 -0 kdevelop/lib/cppparser/driver.cpp
M +1 -0 kdevelop/lib/cppparser/keywords.h
M +1 -0 kdevelop/lib/cppparser/lexer.h
M +1 -1 kdevelop/lib/cppparser/parser.cpp
--- branches/trinity/applications/amarok/amarok/src/analyzers/analyzerbase.h #1245169:1245170
@@ -107,7 +107,7 @@
//This mess is because tqmoc generates an entry for this class despite the #if block
-//1. the TQ_OBJECT macro must be exposed
+//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 (!)
--- branches/trinity/applications/amarok/amarok/src/scripts/graphequalizer/stdinreader.h #1245169:1245170
@@ -11,7 +11,9 @@
class StdinReader : public TQObject
{
+ Q_OBJECT
TQ_OBJECT
+
public:
StdinReader(TQObject * tqparent = 0, const char * name = 0)
:TQObject(tqparent,name)
--- branches/trinity/applications/amarok/amarok/src/threadmanager.h #1245169:1245170
@@ -76,7 +76,7 @@
*/
-/// This class is because tqmoc "is really good" (no nested TQ_OBJECT classes)
+/// This class is because tqmoc "is really good" (no nested Q_OBJECT classes)
class JobBase : public TQObject {
Q_OBJECT
TQ_OBJECT
--- branches/trinity/applications/kima/src/kima.h #1245169:1245170
@@ -51,6 +51,7 @@
@author Ken Werner
*/
class Kima : public KPanelApplet, TQToolTip {
+ Q_OBJECT
TQ_OBJECT //macro which activates signals and slots (tqmoc)
public:
--- branches/trinity/applications/kima/src/sourcelistitem.h #1245169:1245170
@@ -30,6 +30,7 @@
* @author Ken Werner
*/
class SourceListItem : public TQObject, public TQCheckListItem {
+ Q_OBJECT
TQ_OBJECT //macro which activates signals and slots (tqmoc)
public:
/**
--- branches/trinity/applications/kima/src/sources/acpithermalsrc.h #1245169:1245170
@@ -31,6 +31,7 @@
* @author Ken Werner
*/
class ACPIThermalSrc : public LabelSource {
+ Q_OBJECT
TQ_OBJECT //macro which activates signals and slots (tqmoc)
public:
/**
--- branches/trinity/applications/kima/src/sources/batterysrc.h #1245169:1245170
@@ -32,6 +32,7 @@
* @author Ken Werner
*/
class BatterySrc : public LabelSource {
+ Q_OBJECT
TQ_OBJECT //macro which activates signals and slots (tqmoc)
public:
/**
--- branches/trinity/applications/kima/src/sources/cpuinfofreqsrc.h #1245169:1245170
@@ -29,6 +29,7 @@
* CpuinfoFreqSrc reads temperature values from /proc/cpuinfo
*/
class CpuinfoFreqSrc : public LabelSource {
+ Q_OBJECT
TQ_OBJECT //macro which activates signals and slots (tqmoc)
public:
/**
--- branches/trinity/applications/kima/src/sources/hddtempsrc.h #1245169:1245170
@@ -28,6 +28,7 @@
* HDDTempSrc reads temperature of your harddisk provided by hddtemp
*/
class HDDTempSrc : public LabelSource {
+ Q_OBJECT
TQ_OBJECT //macro which activates signals and slots (tqmoc)
/**
--- branches/trinity/applications/kima/src/sources/hwmonfansrc.h #1245169:1245170
@@ -32,6 +32,7 @@
* see /usr/src/linux/Documentation/hwmon/sysfs-interface
*/
class HwMonFanSrc : public LabelSource {
+ Q_OBJECT
TQ_OBJECT //macro which activates signals and slots (tqmoc)
public:
/**
--- branches/trinity/applications/kima/src/sources/hwmonthermalsrc.h #1245169:1245170
@@ -32,6 +32,7 @@
* see /usr/src/linux/Documentation/hwmon/sysfs-interface
*/
class HwMonThermalSrc : public LabelSource {
+ Q_OBJECT
TQ_OBJECT //macro which activates signals and slots (tqmoc)
public:
/**
--- branches/trinity/applications/kima/src/sources/i8ksrc.h #1245169:1245170
@@ -30,6 +30,7 @@
* which is provided by the i8k kernel module.
*/
class I8kSrc : public LabelSource {
+ Q_OBJECT
TQ_OBJECT //macro which activates signals and slots (tqmoc)
public:
/**
--- branches/trinity/applications/kima/src/sources/ibmacpifansrc.h #1245169:1245170
@@ -30,6 +30,7 @@
* which is provided by the ibm-acpi kernel module.
*/
class IBMACPIFanSrc : public LabelSource {
+ Q_OBJECT
TQ_OBJECT //macro which activates signals and slots (tqmoc)
public:
/**
--- branches/trinity/applications/kima/src/sources/ibmacpithermalsrc.h #1245169:1245170
@@ -30,6 +30,7 @@
* which is provided by the ibm-acpi kernel module.
*/
class IBMACPIThermalSrc : public LabelSource {
+ Q_OBJECT
TQ_OBJECT //macro which activates signals and slots (tqmoc)
public:
/**
--- branches/trinity/applications/kima/src/sources/ibmhdaps.h #1245169:1245170
@@ -32,6 +32,7 @@
* @author Ken Werner
*/
class IBMHDAPSSrc : public LabelSource {
+ Q_OBJECT
TQ_OBJECT //macro which activates signals and slots (tqmoc)
public:
/**
--- branches/trinity/applications/kima/src/sources/ibookg4thermalsrc.h #1245169:1245170
@@ -33,6 +33,7 @@
* It may work on other Apple machines as well (please let me know)
*/
class IbookG4ThermalSrc : public LabelSource {
+ Q_OBJECT
TQ_OBJECT //macro which activates signals and slots (tqmoc)
public:
/**
--- branches/trinity/applications/kima/src/sources/labelsource.h #1245169:1245170
@@ -31,6 +31,7 @@
* @author Ken Werner
*/
class LabelSource : public TriggeredSource{
+ Q_OBJECT
TQ_OBJECT //macro which activates signals and slots (tqmoc)
public:
/**
--- branches/trinity/applications/kima/src/sources/nvidiathermalsrc.h #1245169:1245170
@@ -32,6 +32,7 @@
* @author Ken Werner
*/
class NVidiaThermalSrc : public LabelSource {
+ Q_OBJECT
TQ_OBJECT //macro which activates signals and slots (tqmoc)
public:
/**
--- branches/trinity/applications/kima/src/sources/omnibookthermalsrc.h #1245169:1245170
@@ -30,6 +30,7 @@
* which is provided by the omnibook kernel module.
*/
class OmnibookThermalSrc : public LabelSource {
+ Q_OBJECT
TQ_OBJECT //macro which activates signals and slots (tqmoc)
public:
/**
--- branches/trinity/applications/kima/src/sources/sysfreqsrc.h #1245169:1245170
@@ -29,6 +29,7 @@
* SysFreqSrc reads frequency values from /sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq
*/
class SysFreqSrc : public LabelSource {
+ Q_OBJECT
TQ_OBJECT //macro which activates signals and slots (tqmoc)
public:
/**
--- branches/trinity/applications/kima/src/sources/threadedtrigger.h #1245169:1245170
@@ -35,6 +35,7 @@
* @author Ken Werner
*/
class ThreadedTrigger : public TQObject, TQThread{
+ Q_OBJECT
TQ_OBJECT //macro which activates signals and slots (tqmoc)
public:
/**
--- branches/trinity/applications/kima/src/sources/uptimesrc.h #1245169:1245170
@@ -30,6 +30,7 @@
* which is provided by the ibm-acpi kernel module.
*/
class UptimeSrc : public LabelSource {
+ Q_OBJECT
TQ_OBJECT //macro which activates signals and slots (tqmoc)
public:
/**
--- branches/trinity/applications/koffice/kexi/kexidb/driver.h #1245169:1245170
@@ -367,7 +367,7 @@
} //namespace KexiDB
/*! Driver's static version information, automatically impemented for KexiDB drivers.
- Put this into driver class declaration just like TQ_OBJECT macro. */
+ Put this into driver class declaration just like Q_OBJECT macro. */
#define KEXIDB_DRIVER \
public: \
virtual DatabaseVersionInfo version() const;
--- branches/trinity/applications/koffice/kexi/migration/keximigrate.h #1245169:1245170
@@ -305,7 +305,7 @@
KGenericFactory<KexiMigration::class_name>( "keximigrate_" #internal_name ))
/*! Driver's static version information, automatically implemented for KexiDB drivers.
- Put this into migration driver class declaration just like TQ_OBJECT macro. */
+ Put this into migration driver class declaration just like Q_OBJECT macro. */
#define KEXIMIGRATION_DRIVER \
public: \
virtual int versionMajor() const; \
--- branches/trinity/applications/koffice/kexi/widget/tableview/kexidataawareobjectiface.h #1245169:1245170
@@ -54,7 +54,7 @@
//! \brief The KexiDataAwareObjectInterface is an interface for record-based data object.
/** This interface is implemented by KexiTableView and KexiFormView
and used by KexiDataAwareView. If yu're implementing this interface,
- add KEXI_DATAAWAREOBJECTINTERFACE convenience macro just after TQ_OBJECT.
+ add KEXI_DATAAWAREOBJECTINTERFACE convenience macro just after Q_OBJECT.
You should add following code to your destructor so data is deleted:
\code
--- branches/trinity/applications/rosegarden/src/gui/editors/matrix/MatrixView.h #1245169:1245170
@@ -669,7 +669,7 @@
};
// Commented this out - was a MatrixView inner class, but we get a warning
-// that TQ_OBJECT can't be used in an inner class - gl
+// that Q_OBJECT can't be used in an inner class - gl
//
// class NoteSender : public TQObject
--- branches/trinity/dependencies/dbus-1-tqt/tqdbusconnection.h #1245169:1245170
@@ -471,6 +471,7 @@
* @code
* class DBusSignalReceiver : public TQObject
* {
+ * Q_OBJECT
* TQ_OBJECT
* public slots:
* void dbusSignal(const TQT_DBusMessage&);
--- branches/trinity/dependencies/dbus-1-tqt/tqdbusproxy.h #1245169:1245170
@@ -174,6 +174,7 @@
* @code
* class MyReceiver : public TQObject
* {
+ * Q_OBJECT
* TQ_OBJECT
* public slots:
* void handleDBusSignal(const TQT_DBusMessage&);
--- branches/trinity/dependencies/dbus-tqt/dbus-qt.h #1245169:1245170
@@ -30,6 +30,7 @@
* Two approaches - one presented below a DBusQtConnection
* object which is a TQt wrapper around DBusConnection
class DBusQtConnection : public TQObject {
+ Q_OBJECT
TQ_OBJECT
public:
DBusQtConnection( const char *address=0, TQObject *tqparent=0,
@@ -55,6 +56,7 @@
*
* Second approach is to have a static TQt dispatcher like:
class DBusQtNotifier : public TQObject {
+ Q_OBJECT
TQ_OBJECT
public:
static DBusQtNotifier* dbus_qt_notifier();
--- branches/trinity/kdegames/kolf/objects/poolball/poolball.h #1245169:1245170
@@ -15,8 +15,14 @@
class StateDB;
class KConfig;
-class PoolBallFactory : KLibFactory { TQ_OBJECT public: TQObject *createObject(TQObject *, const char *, const char *, const TQStringList & = TQStringList()); };
+class PoolBallFactory : KLibFactory {
+ Q_OBJECT
+ TQ_OBJECT
+public:
+ TQObject *createObject(TQObject *, const char *, const char *, const TQStringList & = TQStringList());
+};
+
class PoolBall : public Ball
{
public:
--- branches/trinity/kdegames/kolf/objects/test/test.h #1245169:1245170
@@ -11,8 +11,14 @@
class KConfig;
-class TestFactory : KLibFactory { TQ_OBJECT public: TQObject *createObject(TQObject *, const char *, const char *, const TQStringList & = TQStringList()); };
+class TestFactory : KLibFactory {
+ Q_OBJECT
+ TQ_OBJECT
+public:
+ TQObject *createObject(TQObject *, const char *, const char *, const TQStringList & = TQStringList());
+};
+
class Test : public TQCanvasEllipse, public CanvasItem
{
public:
--- branches/trinity/kdenetwork/kopete/protocols/sms/services/kopete_unix_serial.h #1245169:1245170
@@ -32,7 +32,8 @@
class KopeteUnixSerialPort : public TQObject, public Port
{
- TQ_OBJECT;
+ Q_OBJECT
+ TQ_OBJECT
protected:
int _fd; // file descriptor for device
--- branches/trinity/kdepim/kode/printer.cpp #1245169:1245170
@@ -200,6 +200,8 @@
code.indent();
if ( c.isTQObject() ) {
+ code += "Q_OBJECT";
+ code.newLine();
code += "TQ_OBJECT";
code.newLine();
}
--- branches/trinity/kdesdk/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.h #1245169:1245170
@@ -71,7 +71,8 @@
class PoScanner : public TQObject
{
- TQ_OBJECT;
+ Q_OBJECT
+ TQ_OBJECT
public:
--- branches/trinity/kdesdk/umbrello/umbrello/codeimport/kdevcppparser/lexer.h #1245169:1245170
@@ -56,6 +56,7 @@
Token_k_dcop,
Token_k_dcop_signals,
+ Token_Q_OBJECT,
Token_TQ_OBJECT,
Token_signals,
Token_slots,
--- branches/trinity/kdesdk/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp #1245169:1245170
@@ -1980,7 +1980,7 @@
if ( !comment.isEmpty() )
node->setComment( comment );
return true;
- } else if( lex->lookAhead(0) == Token_TQ_OBJECT || lex->lookAhead(0) == Token_K_DCOP ){
+ } else if( lex->lookAhead(0) == Token_Q_OBJECT || lex->lookAhead(0) == Token_TQ_OBJECT || lex->lookAhead(0) == Token_K_DCOP ){
lex->nextToken();
return true;
} else if( lex->lookAhead(0) == Token_signals || lex->lookAhead(0) == Token_k_dcop || lex->lookAhead(0) == Token_k_dcop_signals ){
--- branches/trinity/kdevelop/languages/cpp/cppimplementationwidget.cpp #1245169:1245170
@@ -43,7 +43,7 @@
TQStringList CppImplementationWidget::createClassFiles()
{
- TQString template_h = "#ifndef $DEFTEXT$_H\n#define $DEFTEXT$_H\n\n#include \"$BASEINCLUDE$\"\n\nclass $CLASSNAME$: public $BASECLASSNAME$ {\nTQ_OBJECT\npublic:\n $CLASSNAME$(TQWidget *tqparent = 0, const char *name = 0);\n};\n\n#endif\n";
+ TQString template_h = "#ifndef $DEFTEXT$_H\n#define $DEFTEXT$_H\n\n#include \"$BASEINCLUDE$\"\n\nclass $CLASSNAME$: public $BASECLASSNAME$ {\nQ_OBJECT\nTQ_OBJECT\npublic:\n $CLASSNAME$(TQWidget *tqparent = 0, const char *name = 0);\n};\n\n#endif\n";
TQString template_cpp = "#include \"$CLASSINCLUDE$\"\n\n$CLASSNAME$::$CLASSNAME$(TQWidget *tqparent, const char *name)\n :$BASECLASSNAME$(tqparent, name)\n{\n}\n";
if ( m_part->project() ->options() == KDevProject::UsesAutotoolsBuildSystem )
template_cpp += "\n#include \"$TQMOCINCLUDE$\"\n";
--- branches/trinity/kdevelop/languages/cpp/cppnewclassdlg.cpp #1245169:1245170
@@ -2013,7 +2013,7 @@
TQString qobjectStr;
if ( childClass || qobject )
- qobjectStr = "TQ_OBJECT";
+ qobjectStr = "Q_OBJECT\nTQ_OBJECT";
TQString baseclass;
--- branches/trinity/kdevelop/lib/cppparser/driver.cpp #1245169:1245170
@@ -597,6 +597,7 @@
lexer->addSkipWord( "KDE_DEPRECATED" );
// qt
+ lexer->addSkipWord( "Q_OBJECT" );
lexer->addSkipWord( "TQ_OBJECT" );
lexer->addSkipWord( "TQ_OVERRIDE", SkipWordAndArguments );
lexer->addSkipWord( "Q_ENUMS", SkipWordAndArguments );
--- branches/trinity/kdevelop/lib/cppparser/keywords.h #1245169:1245170
@@ -9,6 +9,7 @@
INSERT( "k_dcop_signals", Token_k_dcop_signals );
// TQt Keywords
+INSERT( "Q_OBJECT", Token_Q_OBJECT );
INSERT( "TQ_OBJECT", Token_TQ_OBJECT );
INSERT( "signals", Token_signals );
INSERT( "slots", Token_slots );
--- branches/trinity/kdevelop/lib/cppparser/lexer.h #1245169:1245170
@@ -60,6 +60,7 @@
Token_k_dcop,
Token_k_dcop_signals,
+ Token_Q_OBJECT,
Token_TQ_OBJECT,
Token_signals,
Token_slots,
--- branches/trinity/kdevelop/lib/cppparser/parser.cpp #1245169:1245170
@@ -2005,7 +2005,7 @@
if( lex->lookAhead(0) == ';' ){
nextToken();
return true;
- } else if( lex->lookAhead(0) == Token_TQ_OBJECT || lex->lookAhead(0) == Token_K_DCOP ){
+ } else if( lex->lookAhead(0) == Token_Q_OBJECT || lex->lookAhead(0) == Token_TQ_OBJECT || lex->lookAhead(0) == Token_K_DCOP ){
nextToken();
return true;
} else if( lex->lookAhead(0) == Token_signals || lex->lookAhead(0) == Token_k_dcop || lex->lookAhead(0) == Token_k_dcop_signals ){
More information about the umbrello-devel
mailing list