From dd066e0decc815fe919173830c7110e656f27f18 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 20 Oct 2012 21:00:46 -0500 Subject: [PATCH] Update TQt3 property/enum macros --- kalyptus/README | 2 +- kalyptus/kalyptus | 12 ++++---- .../koala/org/kde/koala/BrowserInterface.java | 2 +- kjsembed/Doxyfile | 2 +- kjsembed/Doxyfile-Internal | 2 +- kjsembed/bindings/kconfig_imp.h | 8 ++--- kjsembed/bindings/movie_imp.h | 4 +-- kjsembed/bindings/sql_imp.h | 30 +++++++++---------- kjsembed/bindwizard/Doxyfile.in | 2 +- kjsembed/kjsembedpart.h | 8 ++--- kjsembed/kscript/javascript.h | 2 +- kjsembed/plugins/customqobject_plugin.h | 6 ++-- kjsembed/plugins/qprocess_plugin.h | 16 +++++----- kjsembed/tools/Doxyfile | 2 +- 14 files changed, 49 insertions(+), 49 deletions(-) diff --git a/kalyptus/README b/kalyptus/README index a966384d..e56448e4 100644 --- a/kalyptus/README +++ b/kalyptus/README @@ -47,7 +47,7 @@ JAVA Here are some of the shell commands that were used in the conversion process: -Remove any Q_OVERRIDE macros from the Qt headers, and remove EXPORT_DOCKCLASS from the +Remove any TQ_OVERRIDE macros from the Qt headers, and remove EXPORT_DOCKCLASS from the KDE headers # Generate Java and C++ sources. Copy all the target headers to directory 'test/tmp' diff --git a/kalyptus/kalyptus b/kalyptus/kalyptus index 3de8b858..056a7d4b 100644 --- a/kalyptus/kalyptus +++ b/kalyptus/kalyptus @@ -535,15 +535,15 @@ LOOP: # ); # - next if ( $p =~ /^\s*Q_ENUMS/ # ignore Q_ENUMS + next if ( $p =~ /^\s*TQ_ENUMS/ # ignore TQ_ENUMS || $p =~ /^\s*TQ_OBJECT/ # and TQ_OBJECT || $p =~ /^\s*Q_FLAGS/ # and Q_FLAGS || $p =~ /^\s*Q_DECLARE_FLAGS/ # and Q_DECLARE_FLAGS - || ( !$qt4 && $p =~ /^\s*Q_PROPERTY/ ) # and Q_PROPERTY + || ( !$qt4 && $p =~ /^\s*TQ_PROPERTY/ ) # and TQ_PROPERTY || $p =~ /^\s*TQDOC_PROPERTY/ || $p =~ /^\s*Q_GADGET/ - || $p =~ /^\s*Q_OVERRIDE/ # and Q_OVERRIDE - || $p =~ /^\s*Q_SETS/ + || $p =~ /^\s*TQ_OVERRIDE/ # and TQ_OVERRIDE + || $p =~ /^\s*TQ_SETS/ || $p =~ /^\s*Q_DUMMY_COMPARISON_OPERATOR/ || $p =~ /^\s*K_SYCOCATYPE/ # and K_SYCOCA stuff || $p =~ /^\s*K_SYCOCAFACTORY/ # @@ -727,7 +727,7 @@ sub readDecl $declNodeType = "c"; return $l; } - elsif ( $l =~ /Q_PROPERTY/ ) { # property + elsif ( $l =~ /TQ_PROPERTY/ ) { # property return $l; } @@ -810,7 +810,7 @@ sub identifyDecl $cNode->AddProp( "DcopExported", 1 ); } # properties - elsif ( $decl =~ s/Q_PROPERTY// ) { + elsif ( $decl =~ s/TQ_PROPERTY// ) { print "Property: <$1>\n" if $debug; $newNode = newProperty( $decl ); diff --git a/kdejava/koala/org/kde/koala/BrowserInterface.java b/kdejava/koala/org/kde/koala/BrowserInterface.java index 330ad419..c725c9d9 100644 --- a/kdejava/koala/org/kde/koala/BrowserInterface.java +++ b/kdejava/koala/org/kde/koala/BrowserInterface.java @@ -23,7 +23,7 @@ import org.kde.qt.TQObject; the following functionality through this interface: Qt properties: - Q_PROPERTY( uint historyLength READ historyLength ); + TQ_PROPERTY( uint historyLength READ historyLength ); Callable methods: diff --git a/kjsembed/Doxyfile b/kjsembed/Doxyfile index 2fc6e61d..86e4368a 100644 --- a/kjsembed/Doxyfile +++ b/kjsembed/Doxyfile @@ -188,7 +188,7 @@ EXPAND_ONLY_PREDEF = YES SEARCH_INCLUDES = YES INCLUDE_PATH = INCLUDE_FILE_PATTERNS = -PREDEFINED = Q_PROPERTY()= +PREDEFINED = TQ_PROPERTY()= EXPAND_AS_DEFINED = KJSEMBED_EXPORT SKIP_FUNCTION_MACROS = NO #--------------------------------------------------------------------------- diff --git a/kjsembed/Doxyfile-Internal b/kjsembed/Doxyfile-Internal index 1f3df859..ca1f823e 100644 --- a/kjsembed/Doxyfile-Internal +++ b/kjsembed/Doxyfile-Internal @@ -669,7 +669,7 @@ INCLUDE_FILE_PATTERNS = # or name=definition (no spaces). If the definition and the = are # omitted =1 is assumed. -PREDEFINED = Q_PROPERTY()= +PREDEFINED = TQ_PROPERTY()= # If the MACRO_EXPANSION and EXPAND_PREDEF_ONLY tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. diff --git a/kjsembed/bindings/kconfig_imp.h b/kjsembed/bindings/kconfig_imp.h index 5eb99973..be27b24d 100644 --- a/kjsembed/bindings/kconfig_imp.h +++ b/kjsembed/bindings/kconfig_imp.h @@ -45,10 +45,10 @@ namespace Bindings { class Config : public BindingObject { Q_OBJECT - Q_PROPERTY( bool forceGlobal READ forceGlobal WRITE setForceGlobal ) - Q_PROPERTY( bool dollarExpansion READ isDollarExpansion WRITE setDollarExpansion ) - Q_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly ) - Q_PROPERTY( bool readDefaults READ readDefaults WRITE setReadDefaults ) + TQ_PROPERTY( bool forceGlobal READ forceGlobal WRITE setForceGlobal ) + TQ_PROPERTY( bool dollarExpansion READ isDollarExpansion WRITE setDollarExpansion ) + TQ_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly ) + TQ_PROPERTY( bool readDefaults READ readDefaults WRITE setReadDefaults ) public: Config( TQObject *parent=0, const char *name=0); diff --git a/kjsembed/bindings/movie_imp.h b/kjsembed/bindings/movie_imp.h index 74508e99..5a3bfcee 100644 --- a/kjsembed/bindings/movie_imp.h +++ b/kjsembed/bindings/movie_imp.h @@ -39,8 +39,8 @@ class Movie : public BindingObject { Q_OBJECT - Q_PROPERTY( TQColor setBackgroundColor READ backgroundColor ) - Q_PROPERTY( int setSpeed READ speed ) + TQ_PROPERTY( TQColor setBackgroundColor READ backgroundColor ) + TQ_PROPERTY( int setSpeed READ speed ) public: Movie( TQObject *parent=0, const char *name=0 ); diff --git a/kjsembed/bindings/sql_imp.h b/kjsembed/bindings/sql_imp.h index 950ef156..08555e84 100644 --- a/kjsembed/bindings/sql_imp.h +++ b/kjsembed/bindings/sql_imp.h @@ -36,14 +36,14 @@ namespace Bindings { class SqlQuery : public BindingObject { Q_OBJECT - Q_PROPERTY( int size READ size) - Q_PROPERTY( int at READ at) - Q_PROPERTY( int numRowsAffected READ numRowsAffected ) - Q_PROPERTY( bool select READ isSelect) - Q_PROPERTY( bool valid READ isValid) - Q_PROPERTY( bool active READ isActive) - Q_PROPERTY( TQString lastError READ lastError) - Q_PROPERTY( TQString lastQuery READ lastQuery) + TQ_PROPERTY( int size READ size) + TQ_PROPERTY( int at READ at) + TQ_PROPERTY( int numRowsAffected READ numRowsAffected ) + TQ_PROPERTY( bool select READ isSelect) + TQ_PROPERTY( bool valid READ isValid) + TQ_PROPERTY( bool active READ isActive) + TQ_PROPERTY( TQString lastError READ lastError) + TQ_PROPERTY( TQString lastQuery READ lastQuery) public: SqlQuery( TQObject *parent=0, const char *name=0 ); @@ -89,13 +89,13 @@ private: class SqlDatabase : public BindingObject { Q_OBJECT - Q_PROPERTY( TQString databaseName READ databaseName WRITE setDatabaseName) - Q_PROPERTY( TQString userName READ userName WRITE setUserName) - Q_PROPERTY( TQString password READ password WRITE setPassword) - Q_PROPERTY( TQString hostName READ hostName WRITE setHostName) - Q_PROPERTY( int port READ port WRITE setPort) - Q_PROPERTY( TQString driverName READ driverName) - Q_PROPERTY( TQString lastError READ lastError) + TQ_PROPERTY( TQString databaseName READ databaseName WRITE setDatabaseName) + TQ_PROPERTY( TQString userName READ userName WRITE setUserName) + TQ_PROPERTY( TQString password READ password WRITE setPassword) + TQ_PROPERTY( TQString hostName READ hostName WRITE setHostName) + TQ_PROPERTY( int port READ port WRITE setPort) + TQ_PROPERTY( TQString driverName READ driverName) + TQ_PROPERTY( TQString lastError READ lastError) public: SqlDatabase( TQObject *parent=0, const char *name=0 ); diff --git a/kjsembed/bindwizard/Doxyfile.in b/kjsembed/bindwizard/Doxyfile.in index a23353eb..3ef3847c 100644 --- a/kjsembed/bindwizard/Doxyfile.in +++ b/kjsembed/bindwizard/Doxyfile.in @@ -669,7 +669,7 @@ INCLUDE_FILE_PATTERNS = # or name=definition (no spaces). If the definition and the = are # omitted =1 is assumed. -PREDEFINED = Q_PROPERTY()= +PREDEFINED = TQ_PROPERTY()= # If the MACRO_EXPANSION and EXPAND_PREDEF_ONLY tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. diff --git a/kjsembed/kjsembedpart.h b/kjsembed/kjsembedpart.h index e89c482e..84080138 100644 --- a/kjsembed/kjsembedpart.h +++ b/kjsembed/kjsembedpart.h @@ -74,10 +74,10 @@ class JSBuiltIn; class KJSEMBED_EXPORT KJSEmbedPart : public KParts::ReadOnlyPart { Q_OBJECT - Q_PROPERTY( TQStringList constructorNames READ constructorNames ) - Q_PROPERTY( TQCString versionString READ versionString ) - Q_PROPERTY( int versionMajor READ versionMajor ) - Q_PROPERTY( int versionMinor READ versionMinor ) + TQ_PROPERTY( TQStringList constructorNames READ constructorNames ) + TQ_PROPERTY( TQCString versionString READ versionString ) + TQ_PROPERTY( int versionMajor READ versionMajor ) + TQ_PROPERTY( int versionMinor READ versionMinor ) public: /** Create a KJSEmbedPart. */ diff --git a/kjsembed/kscript/javascript.h b/kjsembed/kscript/javascript.h index fa76a341..9ca87f24 100644 --- a/kjsembed/kscript/javascript.h +++ b/kjsembed/kscript/javascript.h @@ -31,7 +31,7 @@ namespace KJSEmbed { class JavaScript : public KScriptInterface { Q_OBJECT - Q_PROPERTY( TQString appID READ appID ) + TQ_PROPERTY( TQString appID READ appID ) public: JavaScript(KScriptClientInterface *parent, const char *name, const TQStringList &args); diff --git a/kjsembed/plugins/customqobject_plugin.h b/kjsembed/plugins/customqobject_plugin.h index 42d7236b..d1e9608e 100644 --- a/kjsembed/plugins/customqobject_plugin.h +++ b/kjsembed/plugins/customqobject_plugin.h @@ -44,9 +44,9 @@ Q_OBJECT /** Identifiers for the methods provided by this class. */ enum Mode { On, Off }; - Q_PROPERTY(Mode mode READ mode WRITE setMode) - Q_PROPERTY(TQString thing READ thing WRITE setThing) - Q_ENUMS(Mode) + TQ_PROPERTY(Mode mode READ mode WRITE setMode) + TQ_PROPERTY(TQString thing READ thing WRITE setThing) + TQ_ENUMS(Mode) public: MyCustomTQObjectImp( TQObject *parent, const char *name); virtual ~MyCustomTQObjectImp(); diff --git a/kjsembed/plugins/qprocess_plugin.h b/kjsembed/plugins/qprocess_plugin.h index c5ffe4a5..fa1825ed 100644 --- a/kjsembed/plugins/qprocess_plugin.h +++ b/kjsembed/plugins/qprocess_plugin.h @@ -46,14 +46,14 @@ Q_OBJECT /** Identifiers for the methods provided by this class. */ enum Communication { Stdin = 0x01, Stdout = 0x02, Stderr = 0x04, DupStderr = 0x08 }; - Q_PROPERTY(TQStringList arguments READ arguments WRITE setArguments ) - Q_PROPERTY(Communication communication READ communication WRITE setCommunication) - Q_PROPERTY(bool canReadLineStdout READ canReadLineStdout ) - Q_PROPERTY(bool canReadLineStderr READ canReadLineStderr ) - Q_PROPERTY(bool isRunning READ isRunning ) - Q_PROPERTY(bool normalExit READ normalExit ) - Q_PROPERTY(int exitStatus READ exitStatus ) - Q_ENUMS(Communication) + TQ_PROPERTY(TQStringList arguments READ arguments WRITE setArguments ) + TQ_PROPERTY(Communication communication READ communication WRITE setCommunication) + TQ_PROPERTY(bool canReadLineStdout READ canReadLineStdout ) + TQ_PROPERTY(bool canReadLineStderr READ canReadLineStderr ) + TQ_PROPERTY(bool isRunning READ isRunning ) + TQ_PROPERTY(bool normalExit READ normalExit ) + TQ_PROPERTY(int exitStatus READ exitStatus ) + TQ_ENUMS(Communication) public: ProcessImp( TQObject *parent = 0, const char *name = 0); diff --git a/kjsembed/tools/Doxyfile b/kjsembed/tools/Doxyfile index 59a92abd..9ab51d9c 100644 --- a/kjsembed/tools/Doxyfile +++ b/kjsembed/tools/Doxyfile @@ -669,7 +669,7 @@ INCLUDE_FILE_PATTERNS = # or name=definition (no spaces). If the definition and the = are # omitted =1 is assumed. -PREDEFINED = Q_PROPERTY()= +PREDEFINED = TQ_PROPERTY()= # If the MACRO_EXPANSION and EXPAND_PREDEF_ONLY tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded.