summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/assistant/helpdialogimpl.cpp2
-rw-r--r--tools/assistant/lib/qassistantclient.cpp2
-rw-r--r--tools/assistant/main.cpp6
-rw-r--r--tools/assistant/mainwindow.ui.h6
-rw-r--r--tools/designer/app/main.cpp2
-rw-r--r--tools/designer/designer/designerapp.cpp6
-rw-r--r--tools/designer/designer/designerapp.h2
-rw-r--r--tools/designer/designer/formwindow.cpp8
-rw-r--r--tools/designer/designer/mainwindow.cpp4
-rw-r--r--tools/designer/designer/mainwindowactions.cpp2
-rw-r--r--tools/designer/designer/project.cpp2
-rw-r--r--tools/designer/designer/propertyeditor.cpp4
-rw-r--r--tools/designer/designer/resource.cpp4
-rw-r--r--tools/designer/designer/workspace.cpp2
-rw-r--r--tools/designer/uic/embed.cpp2
-rw-r--r--tools/linguist/linguist/trwindow.cpp2
-rw-r--r--tools/maketqpf/main.cpp8
-rw-r--r--tools/qembed/qembed.cpp2
-rw-r--r--tools/qtconfig/mainwindow.cpp10
-rw-r--r--tools/tqvfb/skin.cpp4
-rw-r--r--tools/tqvfb/tqvfb.cpp4
-rw-r--r--tools/tqvfb/tqvfbview.cpp4
22 files changed, 44 insertions, 44 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();
diff --git a/tools/designer/app/main.cpp b/tools/designer/app/main.cpp
index 230097646..6d7a90c40 100644
--- a/tools/designer/app/main.cpp
+++ b/tools/designer/app/main.cpp
@@ -57,7 +57,7 @@
# undef raise
#endif
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
#include <qt_windows.h>
#include <process.h>
#endif
diff --git a/tools/designer/designer/designerapp.cpp b/tools/designer/designer/designerapp.cpp
index caa4b0b30..370558d76 100644
--- a/tools/designer/designer/designerapp.cpp
+++ b/tools/designer/designer/designerapp.cpp
@@ -41,7 +41,7 @@
#include <ntqsettings.h>
#include <ntqsplashscreen.h>
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
#include <qt_windows.h>
#include <process.h>
#endif
@@ -61,7 +61,7 @@ void set_splash_status( const TQString &txt )
TQ_EXPORT DesignerApplication::DesignerApplication( int &argc, char **argv )
: TQApplication( argc, argv )
{
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
if ( winVersion() & TQt::WV_NT_based )
DESIGNER_OPENFILE = RegisterWindowMessage((TCHAR*)"QT_DESIGNER_OPEN_FILE");
else
@@ -136,7 +136,7 @@ void DesignerApplication::setSettingsKey( const TQString &key )
*settings_key = key;
}
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
bool DesignerApplication::winEventFilter( MSG *msg )
{
if ( msg->message == DESIGNER_OPENFILE ) {
diff --git a/tools/designer/designer/designerapp.h b/tools/designer/designer/designerapp.h
index 703443f93..296572e5b 100644
--- a/tools/designer/designer/designerapp.h
+++ b/tools/designer/designer/designerapp.h
@@ -55,7 +55,7 @@ public:
protected:
TQDateTime lastMod;
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
bool winEventFilter( MSG *msg );
uint DESIGNER_OPENFILE;
#endif
diff --git a/tools/designer/designer/formwindow.cpp b/tools/designer/designer/formwindow.cpp
index 9e02b2b1d..caf9d0030 100644
--- a/tools/designer/designer/formwindow.cpp
+++ b/tools/designer/designer/formwindow.cpp
@@ -111,7 +111,7 @@ static void restoreCursors( TQWidget *start, FormWindow *fw )
}
}
-#if defined(Q_WS_WIN32) // #### needed for the workaround for repaint problem on windows
+#if defined(TQ_WS_WIN32) // #### needed for the workaround for repaint problem on windows
#include <qt_windows.h>
static void flickerfree_update( TQWidget *w )
{
@@ -844,7 +844,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w )
sizePreviewLabel->setGeometry( lg );
sizePreviewLabel->raise();
sizePreviewLabel->show();
-#if defined(Q_WS_WIN32)
+#if defined(TQ_WS_WIN32)
windowsRepaintWorkaroundTimer->start( 100, TRUE );
#endif
} else { // if we don't need to move, do some indication
@@ -1605,14 +1605,14 @@ void FormWindow::resizeEvent( TQResizeEvent *e )
if ( isVisible() )
formFile()->setModified( TRUE, FormFile::WFormWindow );
-#if defined(Q_WS_WIN32)
+#if defined(TQ_WS_WIN32)
windowsRepaintWorkaroundTimer->start( 100, TRUE );
#endif
}
void FormWindow::windowsRepaintWorkaroundTimerTimeout()
{
-#if defined(Q_WS_WIN32)
+#if defined(TQ_WS_WIN32)
TQObjectList *l = queryList( "TQWidget" );
for ( TQObject *o = l->first(); o; o = l->next() ) {
flickerfree_update( (TQWidget*)o );
diff --git a/tools/designer/designer/mainwindow.cpp b/tools/designer/designer/mainwindow.cpp
index 93d0eeac5..ba2dfb9e4 100644
--- a/tools/designer/designer/mainwindow.cpp
+++ b/tools/designer/designer/mainwindow.cpp
@@ -187,7 +187,7 @@ TQ_EXPORT MainWindow::MainWindow( bool asClient, bool single, const TQString &pl
if ( !single )
tqApp->setMainWidget( this );
TQWidgetFactory::addWidgetFactory( new CustomWidgetFactory );
-#ifndef Q_WS_MACX
+#ifndef TQ_WS_MACX
setIcon( TQPixmap::fromMimeSource( "designer_appicon.png" ) );
#endif
@@ -2400,7 +2400,7 @@ void MainWindow::readConfig()
if ( !restoreConfig )
return;
-#ifndef Q_WS_MAC
+#ifndef TQ_WS_MAC
/* I'm sorry to make this not happen on the Mac, but it seems to hang somewhere deep
in TQLayout, it gets into a very large loop - and seems it has to do with clever
things the designer does ###Sam */
diff --git a/tools/designer/designer/mainwindowactions.cpp b/tools/designer/designer/mainwindowactions.cpp
index b9418913a..d7699dca6 100644
--- a/tools/designer/designer/mainwindowactions.cpp
+++ b/tools/designer/designer/mainwindowactions.cpp
@@ -159,7 +159,7 @@ void MainWindow::setupEditActions()
actionEditDelete->setWhatsThis( whatsThisFrom( "Edit|Delete" ) );
connect( actionEditDelete, TQ_SIGNAL( activated() ), this, TQ_SLOT( editDelete() ) );
actionEditDelete->setEnabled( FALSE );
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
TQAction *macDelete = new TQAction( tr( "Delete" ), TQPixmap(), tr( "&Delete" ), Key_Backspace, this, 0 );
connect( macDelete, TQ_SIGNAL( activated() ), this, TQ_SLOT( editDelete() ) );
#endif
diff --git a/tools/designer/designer/project.cpp b/tools/designer/designer/project.cpp
index 02899830a..024d9a181 100644
--- a/tools/designer/designer/project.cpp
+++ b/tools/designer/designer/project.cpp
@@ -588,7 +588,7 @@ TQString Project::makeRelative( const TQString &f )
return f;
TQString p = TQFileInfo( filename ).dirPath( TRUE );
TQString f2 = f;
-#if defined(Q_WS_WIN32)
+#if defined(TQ_WS_WIN32)
if ( p.endsWith("/") )
p = p.left( p.length() - 1 );
if ( f2.left( p.length() ).lower() == p.lower() )
diff --git a/tools/designer/designer/propertyeditor.cpp b/tools/designer/designer/propertyeditor.cpp
index 5058a3618..78bb88b78 100644
--- a/tools/designer/designer/propertyeditor.cpp
+++ b/tools/designer/designer/propertyeditor.cpp
@@ -95,7 +95,7 @@
static TQFontDatabase *fontDataBase = 0;
TQString assistantPath();
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
#include <ntqwindowsstyle.h>
static void setupStyle(TQWidget *w)
{
@@ -443,7 +443,7 @@ void PropertyItem::placeEditor( TQWidget *w )
TQRect r = listview->itemRect( this );
if ( !r.size().isValid() ) {
listview->ensureItemVisible( this );
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
listview->repaintContents( FALSE );
#endif
r = listview->itemRect( this );
diff --git a/tools/designer/designer/resource.cpp b/tools/designer/designer/resource.cpp
index 9818bd280..f683d3ec3 100644
--- a/tools/designer/designer/resource.cpp
+++ b/tools/designer/designer/resource.cpp
@@ -108,7 +108,7 @@ static TQString entitize( const TQString &s, bool attribute = FALSE )
return s2;
}
-#ifdef Q_WS_MACX
+#ifdef TQ_WS_MACX
static struct {
int key;
const char* name;
@@ -205,7 +205,7 @@ static struct {
#endif
static TQString platformNeutralKeySequence(const TQKeySequence &ks)
{
-#ifndef Q_WS_MACX
+#ifndef TQ_WS_MACX
return TQString(ks);
#else
uint k;
diff --git a/tools/designer/designer/workspace.cpp b/tools/designer/designer/workspace.cpp
index 2a7f194f0..be050bce5 100644
--- a/tools/designer/designer/workspace.cpp
+++ b/tools/designer/designer/workspace.cpp
@@ -286,7 +286,7 @@ Workspace::Workspace( TQWidget *parent, MainWindow *mw )
header()->hide();
setSorting( 0 );
setResizePolicy( TQScrollView::Manual );
-#ifndef Q_WS_MAC
+#ifndef TQ_WS_MAC
TQPalette p( palette() );
p.setColor( TQColorGroup::Base, TQColor( *backColor2 ) );
(void)*selectedBack; // hack
diff --git a/tools/designer/uic/embed.cpp b/tools/designer/uic/embed.cpp
index b4618618c..5a272e33d 100644
--- a/tools/designer/uic/embed.cpp
+++ b/tools/designer/uic/embed.cpp
@@ -43,7 +43,7 @@
// on embedded, we do not compress image data. Rationale: by mapping
// the ready-only data directly into memory we are both faster and
// more memory efficient
-#if defined(Q_WS_QWS) && !defined(TQT_NO_IMAGE_COLLECTION_COMPRESSION)
+#if defined(TQ_WS_QWS) && !defined(TQT_NO_IMAGE_COLLECTION_COMPRESSION)
#define TQT_NO_IMAGE_COLLECTION_COMPRESSION
#endif
diff --git a/tools/linguist/linguist/trwindow.cpp b/tools/linguist/linguist/trwindow.cpp
index f94cf8b29..7b3ce9880 100644
--- a/tools/linguist/linguist/trwindow.cpp
+++ b/tools/linguist/linguist/trwindow.cpp
@@ -231,7 +231,7 @@ TrWindow::TrWindow()
: TQMainWindow( 0, "translation window", WType_TopLevel | WDestructiveClose )
{
-#ifndef Q_WS_MACX
+#ifndef TQ_WS_MACX
setIcon( TQPixmap::fromMimeSource( "appicon.png" ) );
#endif
diff --git a/tools/maketqpf/main.cpp b/tools/maketqpf/main.cpp
index d105a1689..94dc2e143 100644
--- a/tools/maketqpf/main.cpp
+++ b/tools/maketqpf/main.cpp
@@ -43,7 +43,7 @@
#include <ntqmainwindow.h>
#include <ntqmessagebox.h>
#include <ntqpainter.h>
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
#include <qmemorymanager_qws.h>
#endif
@@ -67,7 +67,7 @@ public:
void renderAndSave()
{
font = TQFont(family,pointSize,weight,italic);
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
memorymanager->savePrerenderedFont((TQMemoryManager::FontID)font.handle());
#endif
setHeight(TQFontMetrics(font).lineSpacing());
@@ -77,7 +77,7 @@ public:
void render(int from, int to)
{
font = TQFont(family,pointSize,weight,italic);
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
for (int i=from; i<=to; i++) {
if ( memorymanager->inFont((TQMemoryManager::FontID)font.handle(),TQChar(i))) {
memorymanager->lockGlyph((TQMemoryManager::FontID)font.handle(),TQChar(i));
@@ -90,7 +90,7 @@ public:
void save()
{
font = TQFont(family,pointSize,weight,italic);
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
memorymanager->savePrerenderedFont((TQMemoryManager::FontID)font.handle(),FALSE);
#endif
setHeight(TQFontMetrics(font).lineSpacing());
diff --git a/tools/qembed/qembed.cpp b/tools/qembed/qembed.cpp
index 9a3336e41..d13cf46a7 100644
--- a/tools/qembed/qembed.cpp
+++ b/tools/qembed/qembed.cpp
@@ -77,7 +77,7 @@ int main( int argc, char **argv )
TQStringList args;
for ( int i = 1; i < argc; ++i ) {
TQString file( argv[i] );
-#ifdef Q_WS_WIN
+#ifdef TQ_WS_WIN
// Since wildcards are not expanded automatically for us on Windows, we need to do
// it ourselves
if ( file.contains( '*' ) || file.contains( '?' ) ) {
diff --git a/tools/qtconfig/mainwindow.cpp b/tools/qtconfig/mainwindow.cpp
index 6b116a48b..b01b0dba0 100644
--- a/tools/qtconfig/mainwindow.cpp
+++ b/tools/qtconfig/mainwindow.cpp
@@ -375,14 +375,14 @@ MainWindow::MainWindow()
rtlExtensions->setChecked( settings.readBoolEntry( "/qt/useRtlExtensions", FALSE ) );
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
inputStyle->setCurrentText( settings.readEntry( "/qt/XIMInputStyle", trUtf8( "On The Spot" ) ) );
#else
inputStyle->hide();
inputStyleLabel->hide();
#endif
-#if defined(Q_WS_X11) && !defined(TQT_NO_IM_EXTENSIONS)
+#if defined(TQ_WS_X11) && !defined(TQT_NO_IM_EXTENSIONS)
/*
This code makes it possible to set up default input method.
@@ -508,7 +508,7 @@ void MainWindow::fileSave()
settings.writeEntry("/qt/useRtlExtensions", rtlExtensions->isChecked() );
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
TQString style = inputStyle->currentText();
TQString str = "On The Spot";
if ( style == trUtf8( "Over The Spot" ) )
@@ -561,9 +561,9 @@ void MainWindow::fileSave()
}
}
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
TQApplication::x11_apply_settings();
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
setModified(FALSE);
statusBar()->message("Saved changes.");
diff --git a/tools/tqvfb/skin.cpp b/tools/tqvfb/skin.cpp
index ccee4fd8a..02a65b65b 100644
--- a/tools/tqvfb/skin.cpp
+++ b/tools/tqvfb/skin.cpp
@@ -40,7 +40,7 @@
#include <ntqtextstream.h>
#include <ntqfile.h>
#include <ntqpainter.h>
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
# include <qt_mac.h>
#endif
@@ -97,7 +97,7 @@ void Skin::setView( TQVFbView *v )
{
view = v;
view->move( viewX1, viewY1 );
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
TQMacSavedPortInfo::setAlphaTransparancy(view, transparancy);
#endif
}
diff --git a/tools/tqvfb/tqvfb.cpp b/tools/tqvfb/tqvfb.cpp
index 1fb8ade04..5a5497432 100644
--- a/tools/tqvfb/tqvfb.cpp
+++ b/tools/tqvfb/tqvfb.cpp
@@ -229,10 +229,10 @@ void TQVFb::changeRate()
void TQVFb::about()
{
-#if defined( Q_WS_MAC )
+#if defined( TQ_WS_MAC )
TQString platform("Mac OS X");
TQString qt("Mac");
-#elif defined( Q_WS_WIN )
+#elif defined( TQ_WS_WIN )
TQString platform("Windows");
TQString qt("Windows");
#else
diff --git a/tools/tqvfb/tqvfbview.cpp b/tools/tqvfb/tqvfbview.cpp
index d3ce8460b..b7639a6cf 100644
--- a/tools/tqvfb/tqvfbview.cpp
+++ b/tools/tqvfb/tqvfbview.cpp
@@ -32,7 +32,7 @@
**********************************************************************/
#include "ntqglobal.h"
-#if !defined( Q_WS_QWS ) || defined( TQT_NO_QWS_MULTIPROCESS )
+#if !defined( TQ_WS_QWS ) || defined( TQT_NO_QWS_MULTIPROCESS )
#define TQLock TQWSSemaphore
#undef TQT_NO_QWS_MULTIPROCESS
#include "../../src/kernel/qlock.cpp"
@@ -269,7 +269,7 @@ void TQVFbView::setRate( int r )
timer->start( 1000/r );
}
-#ifndef Q_WS_QWS
+#ifndef TQ_WS_QWS
// Get the name of the directory where TQt/Embedded temporary data should
// live.
static TQString qws_dataDir()
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-16 01:27:56 +0000