summaryrefslogtreecommitdiffstats
path: root/tools/designer/editor
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2012-02-13 17:43:39 -0600
committerTimothy Pearson <[email protected]>2012-02-13 17:43:39 -0600
commit359640943bcf155faa9a067dde9e00a123276290 (patch)
treefb3d55ea5e18949042fb0064123fb73d2b1eb932 /tools/designer/editor
parenta829bcdc533e154000803d517200d32fe762e85c (diff)
downloadtqt3-359640943bcf155faa9a067dde9e00a123276290.tar.gz
tqt3-359640943bcf155faa9a067dde9e00a123276290.zip
Automated update from Qt3
Diffstat (limited to 'tools/designer/editor')
-rw-r--r--tools/designer/editor/arghintwidget.cpp2
-rw-r--r--tools/designer/editor/arghintwidget.h2
-rw-r--r--tools/designer/editor/browser.h2
-rw-r--r--tools/designer/editor/completion.h2
-rw-r--r--tools/designer/editor/editor.h2
-rw-r--r--tools/designer/editor/markerwidget.h2
-rw-r--r--tools/designer/editor/viewmanager.h2
-rw-r--r--tools/designer/editor/yyindent.cpp6
8 files changed, 10 insertions, 10 deletions
diff --git a/tools/designer/editor/arghintwidget.cpp b/tools/designer/editor/arghintwidget.cpp
index e16708d0d..c49066c0c 100644
--- a/tools/designer/editor/arghintwidget.cpp
+++ b/tools/designer/editor/arghintwidget.cpp
@@ -128,7 +128,7 @@ static const char * right_disabled_xpm[] = {
class ArrowButton : public TQButton
{
- Q_OBJECT
+ TQ_OBJECT
public:
enum Dir { Left, Right };
diff --git a/tools/designer/editor/arghintwidget.h b/tools/designer/editor/arghintwidget.h
index 09937e3d2..5de4a129f 100644
--- a/tools/designer/editor/arghintwidget.h
+++ b/tools/designer/editor/arghintwidget.h
@@ -41,7 +41,7 @@ class ArrowButton;
class ArgHintWidget : public TQFrame
{
- Q_OBJECT
+ TQ_OBJECT
public:
ArgHintWidget( TQWidget *parent, const char*name );
diff --git a/tools/designer/editor/browser.h b/tools/designer/editor/browser.h
index a19e2bcca..ac8ada282 100644
--- a/tools/designer/editor/browser.h
+++ b/tools/designer/editor/browser.h
@@ -43,7 +43,7 @@ class TQTextFormat;
class EditorBrowser : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
EditorBrowser( Editor *e );
diff --git a/tools/designer/editor/completion.h b/tools/designer/editor/completion.h
index 6328315c7..cb46fed8a 100644
--- a/tools/designer/editor/completion.h
+++ b/tools/designer/editor/completion.h
@@ -64,7 +64,7 @@ struct CompletionEntry
class EditorCompletion : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
EditorCompletion( Editor *e );
diff --git a/tools/designer/editor/editor.h b/tools/designer/editor/editor.h
index 768c5f530..060394312 100644
--- a/tools/designer/editor/editor.h
+++ b/tools/designer/editor/editor.h
@@ -44,7 +44,7 @@ class TQAccel;
class Editor : public TQTextEdit
{
- Q_OBJECT
+ TQ_OBJECT
public:
enum Selection {
diff --git a/tools/designer/editor/markerwidget.h b/tools/designer/editor/markerwidget.h
index 2ab70a420..67e4e3bc2 100644
--- a/tools/designer/editor/markerwidget.h
+++ b/tools/designer/editor/markerwidget.h
@@ -42,7 +42,7 @@ class TQTextParagraph;
class MarkerWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
MarkerWidget( ViewManager *parent, const char*name );
diff --git a/tools/designer/editor/viewmanager.h b/tools/designer/editor/viewmanager.h
index 46e4839de..ea8addc53 100644
--- a/tools/designer/editor/viewmanager.h
+++ b/tools/designer/editor/viewmanager.h
@@ -47,7 +47,7 @@ class TQTimer;
class ViewManager : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
ViewManager( TQWidget *parent, const char *name );
diff --git a/tools/designer/editor/yyindent.cpp b/tools/designer/editor/yyindent.cpp
index f0014d37b..11adb7f94 100644
--- a/tools/designer/editor/yyindent.cpp
+++ b/tools/designer/editor/yyindent.cpp
@@ -72,7 +72,7 @@
#include <ntqregexp.h>
-/* qmake ignore Q_OBJECT */
+/* qmake ignore TQ_OBJECT */
/*
The indenter avoids getting stuck in almost infinite loops by
@@ -629,9 +629,9 @@ static bool isUnfinishedLine()
if ( TQString("{};").find(lastCh) == -1 && !yyLine->endsWith("...") ) {
/*
It doesn't end with ';' or similar. If it's neither
- "Q_OBJECT" nor "if ( x )", it must be an unfinished line.
+ "TQ_OBJECT" nor "if ( x )", it must be an unfinished line.
*/
- unf = ( yyLine->contains("Q_OBJECT") == 0 &&
+ unf = ( yyLine->contains("TQ_OBJECT") == 0 &&
!matchBracelessControlStatement() );
} else if ( lastCh == TQChar(';') ) {
if ( lastParen(*yyLine) == TQChar('(') ) {