diff options
Diffstat (limited to 'tools/assistant')
-rw-r--r-- | tools/assistant/helpdialogimpl.cpp | 2 | ||||
-rw-r--r-- | tools/assistant/lib/qassistantclient.cpp | 2 | ||||
-rw-r--r-- | tools/assistant/main.cpp | 6 | ||||
-rw-r--r-- | tools/assistant/mainwindow.ui.h | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/tools/assistant/helpdialogimpl.cpp b/tools/assistant/helpdialogimpl.cpp index b0e558d81..a75573f3c 100644 --- a/tools/assistant/helpdialogimpl.cpp +++ b/tools/assistant/helpdialogimpl.cpp @@ -323,7 +323,7 @@ void HelpDialog::loadIndexFile() if (!indexFile.open(IO_ReadOnly)) { TQMessageBox::warning(help, tr("TQt Assistant"), tr("Failed to load keyword index file\n" "Assistant will not work!")); -#if defined Q_WS_WIN || defined Q_WS_MACX +#if defined TQ_WS_WIN || defined TQ_WS_MACX startTimer(50); #endif return; diff --git a/tools/assistant/lib/qassistantclient.cpp b/tools/assistant/lib/qassistantclient.cpp index 0e0ba4b09..56eda22e5 100644 --- a/tools/assistant/lib/qassistantclient.cpp +++ b/tools/assistant/lib/qassistantclient.cpp @@ -146,7 +146,7 @@ TQAssistantClient::TQAssistantClient( const TQString &path, TQObject *parent, co #if defined(Q_OS_MACX) assistantCommand += ".app/Contents/MacOS/assistant"; -#elif defined(Q_WS_WIN) +#elif defined(TQ_WS_WIN) if (!assistantCommand.endsWith(".exe")) assistantCommand += ".exe"; #endif diff --git a/tools/assistant/main.cpp b/tools/assistant/main.cpp index b2e2a62df..4f7d21b9d 100644 --- a/tools/assistant/main.cpp +++ b/tools/assistant/main.cpp @@ -48,7 +48,7 @@ #include <stdio.h> #include <ntqtextcodec.h> -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN #define INDEX_CHECK( text ) if( i+1 >= argc ) { TQMessageBox::information( 0, "TQt Assistant", text ); return 1; } #else #define INDEX_CHECK( text ) if( i+1 >= argc ) { fprintf( stderr, text "\n" ); return 1; } @@ -148,7 +148,7 @@ int main( int argc, char ** argv ) arg = arg.lower(); if ( arg == "-addcontentfile" || arg == "-removecontentfile" -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN || arg == "-help" #endif ) @@ -267,7 +267,7 @@ int main( int argc, char ** argv ) " -resourceDir assistant will load translations from\n" " this directory.\n" " -help shows this help."); -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN TQMessageBox::information( 0, "TQt Assistant", "<pre>" + helpText + "</pre>" ); #else printf( "%s\n", helpText.latin1() ); diff --git a/tools/assistant/mainwindow.ui.h b/tools/assistant/mainwindow.ui.h index 0afab0aac..480ba7283 100644 --- a/tools/assistant/mainwindow.ui.h +++ b/tools/assistant/mainwindow.ui.h @@ -46,13 +46,13 @@ TQPtrList<MainWindow> *MainWindow::windows = 0; -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) extern TQ_EXPORT int qt_ntfs_permission_lookup; #endif void MainWindow::init() { -#if defined(Q_WS_WIN) +#if defined(TQ_WS_WIN) // Workaround for TQMimeSourceFactory failing in TQFileInfo::isReadable() for // certain user configs. See task: 34372 qt_ntfs_permission_lookup = 0; @@ -679,7 +679,7 @@ void MainWindow::forwardAvailable( bool enable ) void MainWindow::updateProfileSettings() { Config *config = Config::configuration(); -#ifndef Q_WS_MACX +#ifndef TQ_WS_MACX setIcon( config->applicationIcon() ); #endif helpMenu->clear(); |