Update TQt3 property/enum macros

pull/1/head
Timothy Pearson 12 years ago
parent 4d7f4e8654
commit dd066e0dec

@ -47,7 +47,7 @@ JAVA
Here are some of the shell commands that were used in the conversion process: 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 KDE headers
# Generate Java and C++ sources. Copy all the target headers to directory 'test/tmp' # Generate Java and C++ sources. Copy all the target headers to directory 'test/tmp'

@ -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*TQ_OBJECT/ # and TQ_OBJECT
|| $p =~ /^\s*Q_FLAGS/ # and Q_FLAGS || $p =~ /^\s*Q_FLAGS/ # and Q_FLAGS
|| $p =~ /^\s*Q_DECLARE_FLAGS/ # and Q_DECLARE_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*TQDOC_PROPERTY/
|| $p =~ /^\s*Q_GADGET/ || $p =~ /^\s*Q_GADGET/
|| $p =~ /^\s*Q_OVERRIDE/ # and Q_OVERRIDE || $p =~ /^\s*TQ_OVERRIDE/ # and TQ_OVERRIDE
|| $p =~ /^\s*Q_SETS/ || $p =~ /^\s*TQ_SETS/
|| $p =~ /^\s*Q_DUMMY_COMPARISON_OPERATOR/ || $p =~ /^\s*Q_DUMMY_COMPARISON_OPERATOR/
|| $p =~ /^\s*K_SYCOCATYPE/ # and K_SYCOCA stuff || $p =~ /^\s*K_SYCOCATYPE/ # and K_SYCOCA stuff
|| $p =~ /^\s*K_SYCOCAFACTORY/ # || $p =~ /^\s*K_SYCOCAFACTORY/ #
@ -727,7 +727,7 @@ sub readDecl
$declNodeType = "c"; $declNodeType = "c";
return $l; return $l;
} }
elsif ( $l =~ /Q_PROPERTY/ ) { # property elsif ( $l =~ /TQ_PROPERTY/ ) { # property
return $l; return $l;
} }
@ -810,7 +810,7 @@ sub identifyDecl
$cNode->AddProp( "DcopExported", 1 ); $cNode->AddProp( "DcopExported", 1 );
} }
# properties # properties
elsif ( $decl =~ s/Q_PROPERTY// ) { elsif ( $decl =~ s/TQ_PROPERTY// ) {
print "Property: <$1>\n" if $debug; print "Property: <$1>\n" if $debug;
$newNode = newProperty( $decl ); $newNode = newProperty( $decl );

@ -23,7 +23,7 @@ import org.kde.qt.TQObject;
the following functionality through this interface: the following functionality through this interface:
Qt properties: Qt properties:
<code> <code>
Q_PROPERTY( uint historyLength READ historyLength ); TQ_PROPERTY( uint historyLength READ historyLength );
</code> </code>
Callable methods: Callable methods:
<code> <code>

@ -188,7 +188,7 @@ EXPAND_ONLY_PREDEF = YES
SEARCH_INCLUDES = YES SEARCH_INCLUDES = YES
INCLUDE_PATH = INCLUDE_PATH =
INCLUDE_FILE_PATTERNS = INCLUDE_FILE_PATTERNS =
PREDEFINED = Q_PROPERTY()= PREDEFINED = TQ_PROPERTY()=
EXPAND_AS_DEFINED = KJSEMBED_EXPORT EXPAND_AS_DEFINED = KJSEMBED_EXPORT
SKIP_FUNCTION_MACROS = NO SKIP_FUNCTION_MACROS = NO
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------

@ -669,7 +669,7 @@ INCLUDE_FILE_PATTERNS =
# or name=definition (no spaces). If the definition and the = are # or name=definition (no spaces). If the definition and the = are
# omitted =1 is assumed. # omitted =1 is assumed.
PREDEFINED = Q_PROPERTY()= PREDEFINED = TQ_PROPERTY()=
# If the MACRO_EXPANSION and EXPAND_PREDEF_ONLY tags are set to YES then # 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. # this tag can be used to specify a list of macro names that should be expanded.

@ -45,10 +45,10 @@ namespace Bindings {
class Config : public BindingObject class Config : public BindingObject
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY( bool forceGlobal READ forceGlobal WRITE setForceGlobal ) TQ_PROPERTY( bool forceGlobal READ forceGlobal WRITE setForceGlobal )
Q_PROPERTY( bool dollarExpansion READ isDollarExpansion WRITE setDollarExpansion ) TQ_PROPERTY( bool dollarExpansion READ isDollarExpansion WRITE setDollarExpansion )
Q_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly ) TQ_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly )
Q_PROPERTY( bool readDefaults READ readDefaults WRITE setReadDefaults ) TQ_PROPERTY( bool readDefaults READ readDefaults WRITE setReadDefaults )
public: public:
Config( TQObject *parent=0, const char *name=0); Config( TQObject *parent=0, const char *name=0);

@ -39,8 +39,8 @@ class Movie : public BindingObject
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY( TQColor setBackgroundColor READ backgroundColor ) TQ_PROPERTY( TQColor setBackgroundColor READ backgroundColor )
Q_PROPERTY( int setSpeed READ speed ) TQ_PROPERTY( int setSpeed READ speed )
public: public:
Movie( TQObject *parent=0, const char *name=0 ); Movie( TQObject *parent=0, const char *name=0 );

@ -36,14 +36,14 @@ namespace Bindings {
class SqlQuery : public BindingObject class SqlQuery : public BindingObject
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY( int size READ size) TQ_PROPERTY( int size READ size)
Q_PROPERTY( int at READ at) TQ_PROPERTY( int at READ at)
Q_PROPERTY( int numRowsAffected READ numRowsAffected ) TQ_PROPERTY( int numRowsAffected READ numRowsAffected )
Q_PROPERTY( bool select READ isSelect) TQ_PROPERTY( bool select READ isSelect)
Q_PROPERTY( bool valid READ isValid) TQ_PROPERTY( bool valid READ isValid)
Q_PROPERTY( bool active READ isActive) TQ_PROPERTY( bool active READ isActive)
Q_PROPERTY( TQString lastError READ lastError) TQ_PROPERTY( TQString lastError READ lastError)
Q_PROPERTY( TQString lastQuery READ lastQuery) TQ_PROPERTY( TQString lastQuery READ lastQuery)
public: public:
SqlQuery( TQObject *parent=0, const char *name=0 ); SqlQuery( TQObject *parent=0, const char *name=0 );
@ -89,13 +89,13 @@ private:
class SqlDatabase : public BindingObject class SqlDatabase : public BindingObject
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY( TQString databaseName READ databaseName WRITE setDatabaseName) TQ_PROPERTY( TQString databaseName READ databaseName WRITE setDatabaseName)
Q_PROPERTY( TQString userName READ userName WRITE setUserName) TQ_PROPERTY( TQString userName READ userName WRITE setUserName)
Q_PROPERTY( TQString password READ password WRITE setPassword) TQ_PROPERTY( TQString password READ password WRITE setPassword)
Q_PROPERTY( TQString hostName READ hostName WRITE setHostName) TQ_PROPERTY( TQString hostName READ hostName WRITE setHostName)
Q_PROPERTY( int port READ port WRITE setPort) TQ_PROPERTY( int port READ port WRITE setPort)
Q_PROPERTY( TQString driverName READ driverName) TQ_PROPERTY( TQString driverName READ driverName)
Q_PROPERTY( TQString lastError READ lastError) TQ_PROPERTY( TQString lastError READ lastError)
public: public:
SqlDatabase( TQObject *parent=0, const char *name=0 ); SqlDatabase( TQObject *parent=0, const char *name=0 );

@ -669,7 +669,7 @@ INCLUDE_FILE_PATTERNS =
# or name=definition (no spaces). If the definition and the = are # or name=definition (no spaces). If the definition and the = are
# omitted =1 is assumed. # omitted =1 is assumed.
PREDEFINED = Q_PROPERTY()= PREDEFINED = TQ_PROPERTY()=
# If the MACRO_EXPANSION and EXPAND_PREDEF_ONLY tags are set to YES then # 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. # this tag can be used to specify a list of macro names that should be expanded.

@ -74,10 +74,10 @@ class JSBuiltIn;
class KJSEMBED_EXPORT KJSEmbedPart : public KParts::ReadOnlyPart class KJSEMBED_EXPORT KJSEmbedPart : public KParts::ReadOnlyPart
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY( TQStringList constructorNames READ constructorNames ) TQ_PROPERTY( TQStringList constructorNames READ constructorNames )
Q_PROPERTY( TQCString versionString READ versionString ) TQ_PROPERTY( TQCString versionString READ versionString )
Q_PROPERTY( int versionMajor READ versionMajor ) TQ_PROPERTY( int versionMajor READ versionMajor )
Q_PROPERTY( int versionMinor READ versionMinor ) TQ_PROPERTY( int versionMinor READ versionMinor )
public: public:
/** Create a KJSEmbedPart. */ /** Create a KJSEmbedPart. */

@ -31,7 +31,7 @@ namespace KJSEmbed {
class JavaScript : public KScriptInterface class JavaScript : public KScriptInterface
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY( TQString appID READ appID ) TQ_PROPERTY( TQString appID READ appID )
public: public:
JavaScript(KScriptClientInterface *parent, const char *name, const TQStringList &args); JavaScript(KScriptClientInterface *parent, const char *name, const TQStringList &args);

@ -44,9 +44,9 @@ Q_OBJECT
/** Identifiers for the methods provided by this class. */ /** Identifiers for the methods provided by this class. */
enum Mode { On, Off }; enum Mode { On, Off };
Q_PROPERTY(Mode mode READ mode WRITE setMode) TQ_PROPERTY(Mode mode READ mode WRITE setMode)
Q_PROPERTY(TQString thing READ thing WRITE setThing) TQ_PROPERTY(TQString thing READ thing WRITE setThing)
Q_ENUMS(Mode) TQ_ENUMS(Mode)
public: public:
MyCustomTQObjectImp( TQObject *parent, const char *name); MyCustomTQObjectImp( TQObject *parent, const char *name);
virtual ~MyCustomTQObjectImp(); virtual ~MyCustomTQObjectImp();

@ -46,14 +46,14 @@ Q_OBJECT
/** Identifiers for the methods provided by this class. */ /** Identifiers for the methods provided by this class. */
enum Communication { Stdin = 0x01, Stdout = 0x02, Stderr = 0x04, DupStderr = 0x08 }; enum Communication { Stdin = 0x01, Stdout = 0x02, Stderr = 0x04, DupStderr = 0x08 };
Q_PROPERTY(TQStringList arguments READ arguments WRITE setArguments ) TQ_PROPERTY(TQStringList arguments READ arguments WRITE setArguments )
Q_PROPERTY(Communication communication READ communication WRITE setCommunication) TQ_PROPERTY(Communication communication READ communication WRITE setCommunication)
Q_PROPERTY(bool canReadLineStdout READ canReadLineStdout ) TQ_PROPERTY(bool canReadLineStdout READ canReadLineStdout )
Q_PROPERTY(bool canReadLineStderr READ canReadLineStderr ) TQ_PROPERTY(bool canReadLineStderr READ canReadLineStderr )
Q_PROPERTY(bool isRunning READ isRunning ) TQ_PROPERTY(bool isRunning READ isRunning )
Q_PROPERTY(bool normalExit READ normalExit ) TQ_PROPERTY(bool normalExit READ normalExit )
Q_PROPERTY(int exitStatus READ exitStatus ) TQ_PROPERTY(int exitStatus READ exitStatus )
Q_ENUMS(Communication) TQ_ENUMS(Communication)
public: public:
ProcessImp( TQObject *parent = 0, const char *name = 0); ProcessImp( TQObject *parent = 0, const char *name = 0);

@ -669,7 +669,7 @@ INCLUDE_FILE_PATTERNS =
# or name=definition (no spaces). If the definition and the = are # or name=definition (no spaces). If the definition and the = are
# omitted =1 is assumed. # omitted =1 is assumed.
PREDEFINED = Q_PROPERTY()= PREDEFINED = TQ_PROPERTY()=
# If the MACRO_EXPANSION and EXPAND_PREDEF_ONLY tags are set to YES then # 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. # this tag can be used to specify a list of macro names that should be expanded.

Loading…
Cancel
Save