summaryrefslogtreecommitdiffstats
path: root/src/widgets/ntqtextedit.h
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 /src/widgets/ntqtextedit.h
parenta829bcdc533e154000803d517200d32fe762e85c (diff)
downloadtqt3-359640943bcf155faa9a067dde9e00a123276290.tar.gz
tqt3-359640943bcf155faa9a067dde9e00a123276290.zip
Automated update from Qt3
Diffstat (limited to 'src/widgets/ntqtextedit.h')
-rw-r--r--src/widgets/ntqtextedit.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/ntqtextedit.h b/src/widgets/ntqtextedit.h
index b3e28463d..fd3c4e021 100644
--- a/src/widgets/ntqtextedit.h
+++ b/src/widgets/ntqtextedit.h
@@ -137,7 +137,7 @@ class Q_EXPORT TQTextEdit : public TQScrollView
friend class TQTextBrowser;
friend class TQSyntaxHighlighter;
- Q_OBJECT
+ TQ_OBJECT
Q_ENUMS( WordWrap WrapPolicy )
Q_SETS( AutoFormatting )
Q_PROPERTY( TextFormat textFormat READ textFormat WRITE setTextFormat )
@@ -458,7 +458,7 @@ protected:
protected slots:
virtual void doChangeInterval();
void sliderReleased(); // ### make virtual in 4.0
-#if (QT_VERSION >= 0x040000)
+#if (TQT_VERSION >= 0x040000)
#error "Some functions need to be changed to virtual for TQt 4.0"
#endif
@@ -591,7 +591,7 @@ private:
bool overWrite : 1;
private: // Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
TQTextEdit( const TQTextEdit & );
TQTextEdit &operator=( const TQTextEdit & );
#endif