summaryrefslogtreecommitdiffstats
path: root/tools/assistant
diff options
context:
space:
mode:
Diffstat (limited to 'tools/assistant')
-rw-r--r--tools/assistant/config.cpp8
-rw-r--r--tools/assistant/docuparser.cpp2
-rw-r--r--tools/assistant/helpdialogimpl.cpp2
-rw-r--r--tools/assistant/helpdialogimpl.h4
-rw-r--r--tools/assistant/helpwindow.h2
-rw-r--r--tools/assistant/index.h2
-rw-r--r--tools/assistant/lib/ntqassistantclient.h2
-rw-r--r--tools/assistant/main.cpp4
-rw-r--r--tools/assistant/mainwindow.ui.h2
-rw-r--r--tools/assistant/settingsdialogimpl.h2
-rw-r--r--tools/assistant/topicchooserimpl.h2
11 files changed, 16 insertions, 16 deletions
diff --git a/tools/assistant/config.cpp b/tools/assistant/config.cpp
index 9a8295893..e47e38bdc 100644
--- a/tools/assistant/config.cpp
+++ b/tools/assistant/config.cpp
@@ -46,8 +46,8 @@ static Config *static_configuration = 0;
inline TQString getVersionString()
{
- return TQString::number( (QT_VERSION >> 16) & 0xff )
- + "." + TQString::number( (QT_VERSION >> 8) & 0xff );
+ return TQString::number( (TQT_VERSION >> 16) & 0xff )
+ + "." + TQString::number( (TQT_VERSION >> 8) & 0xff );
}
Config::Config()
@@ -193,7 +193,7 @@ void Config::loadDefaultProfile()
{
TQSettings settings;
settings.insertSearchPath( TQSettings::Windows, "/Trolltech" );
- const TQString key = "/TQt Assistant/" + TQString(QT_VERSION_STR) + "/Profile";
+ const TQString key = "/TQt Assistant/" + TQString(TQT_VERSION_STR) + "/Profile";
const TQString profKey = key + "/default/";
if( settings.entryList( key + "/default" ).count() == 0 ) {
@@ -242,7 +242,7 @@ void Config::saveProfile( Profile *profile )
TQSettings settings;
settings.insertSearchPath( TQSettings::Windows, "/Trolltech" );
TQString versionString = (profile->props["name"] == "default")
- ? TQString(QT_VERSION_STR)
+ ? TQString(TQT_VERSION_STR)
: getVersionString();
const TQString key = "/TQt Assistant/" + versionString + "/";
const TQString profKey = key + "Profile/" + profile->props["name"] + "/";
diff --git a/tools/assistant/docuparser.cpp b/tools/assistant/docuparser.cpp
index 158d10d97..c819b766d 100644
--- a/tools/assistant/docuparser.cpp
+++ b/tools/assistant/docuparser.cpp
@@ -57,7 +57,7 @@ TQDataStream &operator<<( TQDataStream &s, const ContentItem &ci )
return s;
}
-const TQString DocuParser::DocumentKey = "/TQt Assistant/" + TQString(QT_VERSION_STR) + "/";
+const TQString DocuParser::DocumentKey = "/TQt Assistant/" + TQString(TQT_VERSION_STR) + "/";
DocuParser *DocuParser::createParser( const TQString &fileName )
{
diff --git a/tools/assistant/helpdialogimpl.cpp b/tools/assistant/helpdialogimpl.cpp
index f299ee8e2..c447c4cb4 100644
--- a/tools/assistant/helpdialogimpl.cpp
+++ b/tools/assistant/helpdialogimpl.cpp
@@ -288,7 +288,7 @@ void HelpDialog::timerEvent(TQTimerEvent *e)
{
static int opacity = 255;
// To allow patching of 3.2.3 assistant for qsa.
-#if QT_VERSION >= 0x030300
+#if TQT_VERSION >= 0x030300
help->setWindowOpacity((opacity-=4)/255.0);
if (opacity<=0)
#endif
diff --git a/tools/assistant/helpdialogimpl.h b/tools/assistant/helpdialogimpl.h
index 04faa1f56..ecb3bf3e2 100644
--- a/tools/assistant/helpdialogimpl.h
+++ b/tools/assistant/helpdialogimpl.h
@@ -66,7 +66,7 @@ private:
class SearchValidator : public TQValidator
{
- Q_OBJECT
+ TQ_OBJECT
public:
SearchValidator( TQObject *parent, const char *name = 0 )
: TQValidator( parent, name ) {}
@@ -89,7 +89,7 @@ private:
class HelpDialog : public HelpDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
HelpDialog( TQWidget *parent, MainWindow *h );
diff --git a/tools/assistant/helpwindow.h b/tools/assistant/helpwindow.h
index db89947d2..8ec8f04a6 100644
--- a/tools/assistant/helpwindow.h
+++ b/tools/assistant/helpwindow.h
@@ -43,7 +43,7 @@ class TQMouseEvent;
class HelpWindow : public TQTextBrowser
{
- Q_OBJECT
+ TQ_OBJECT
public:
HelpWindow( MainWindow *m, TQWidget *parent = 0, const char *name = 0 );
void setSource( const TQString &name );
diff --git a/tools/assistant/index.h b/tools/assistant/index.h
index 333e41b77..2bd32f20e 100644
--- a/tools/assistant/index.h
+++ b/tools/assistant/index.h
@@ -63,7 +63,7 @@ TQDataStream &operator<<( TQDataStream &s, const Document &l );
class Index : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
struct Entry {
Entry( int d ) { documents.append( Document( d, 1 ) ); }
diff --git a/tools/assistant/lib/ntqassistantclient.h b/tools/assistant/lib/ntqassistantclient.h
index 28fd6693e..a30c72b0e 100644
--- a/tools/assistant/lib/ntqassistantclient.h
+++ b/tools/assistant/lib/ntqassistantclient.h
@@ -41,7 +41,7 @@ class TQProcess;
class TQAssistantClient : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
Q_PROPERTY( bool open READ isOpen )
public:
diff --git a/tools/assistant/main.cpp b/tools/assistant/main.cpp
index dc99b7a1a..64bb8ee98 100644
--- a/tools/assistant/main.cpp
+++ b/tools/assistant/main.cpp
@@ -58,7 +58,7 @@ static bool allowFirstRun = TRUE;
class AssistantSocket : public TQSocket
{
- Q_OBJECT
+ TQ_OBJECT
public:
AssistantSocket( int sock, TQObject *parent = 0 );
~AssistantSocket() {}
@@ -74,7 +74,7 @@ private slots:
class AssistantServer : public TQServerSocket
{
- Q_OBJECT
+ TQ_OBJECT
public:
AssistantServer( TQObject* parent = 0 );
void newConnection( int socket );
diff --git a/tools/assistant/mainwindow.ui.h b/tools/assistant/mainwindow.ui.h
index a0824271f..d257c7cf9 100644
--- a/tools/assistant/mainwindow.ui.h
+++ b/tools/assistant/mainwindow.ui.h
@@ -253,7 +253,7 @@ void MainWindow::about()
{
TQMessageBox box( this );
box.setText( "<center><img src=\"splash.png\">"
- "<p>Version " + TQString(QT_VERSION_STR) + "</p>"
+ "<p>Version " + TQString(TQT_VERSION_STR) + "</p>"
"<p>Copyright (C) 2000-2008 Trolltech ASA. All rights reserved."
"</p></center><p></p>"
"<p>TQt Commercial Edition license holders: This program is"
diff --git a/tools/assistant/settingsdialogimpl.h b/tools/assistant/settingsdialogimpl.h
index 77273dc81..6402dc619 100644
--- a/tools/assistant/settingsdialogimpl.h
+++ b/tools/assistant/settingsdialogimpl.h
@@ -42,7 +42,7 @@
class SettingsDialog : public SettingsDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
SettingsDialog( TQWidget *parent, const char* name = 0 );
diff --git a/tools/assistant/topicchooserimpl.h b/tools/assistant/topicchooserimpl.h
index bc3fbd411..11216fa0a 100644
--- a/tools/assistant/topicchooserimpl.h
+++ b/tools/assistant/topicchooserimpl.h
@@ -40,7 +40,7 @@
class TopicChooser : public TopicChooserBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
TopicChooser( TQWidget *parent, const TQStringList &lnkNames,