diff --git a/dcop/dcopidlng/kalyptus b/dcop/dcopidlng/kalyptus
index f03c42b09..bde755236 100644
--- a/dcop/dcopidlng/kalyptus
+++ b/dcop/dcopidlng/kalyptus
@@ -108,7 +108,7 @@ $allowed_k_dcop_accesors_re = join("|", @allowed_k_dcop_accesors);
QM_EXPORT_NETWORK => '',
QM_EXPORT_SQL => '',
QM_EXPORT_WORKSPACE => '',
- QT_NO_REMOTE => 'QT_NO_REMOTE',
+ TQT_NO_REMOTE => 'TQT_NO_REMOTE',
QT_ACCESSIBILITY_SUPPORT => 'QT_ACCESSIBILITY_SUPPORT',
Q_WS_X11 => 'Q_WS_X11',
TQ_DISABLE_COPY => 'TQ_DISABLE_COPY',
@@ -225,7 +225,7 @@ else
sub
{
my $s = shift;
- $s =~ m/^\#\s*ifndef\s+QT_NO_(?:REMOTE| # not in the default compile options
+ $s =~ m/^\#\s*ifndef\s+TQT_NO_(?:REMOTE| # not in the default compile options
NIS| # ...
XINERAMA|
IMAGEIO_(?:MNG|JPEG)|
@@ -473,7 +473,7 @@ LOOP:
last if !defined $p;
$if_depth++ if $p =~ m/^#\s*if/;
$if_depth-- if $p =~ m/^#\s*endif/;
- # Exit at #else in the #ifdef QT_NO_ACCEL/#else/#endif case
+ # Exit at #else in the #ifdef TQT_NO_ACCEL/#else/#endif case
last if $if_depth == 1 && $p =~ m/^#\s*else\s/;
#ignore elif for now
print "Skipping ifdef'ed line: $p" if $debug;
diff --git a/kate/data/qt4.xml b/kate/data/qt4.xml
index 6ce265e35..0a2a52f5d 100644
--- a/kate/data/qt4.xml
+++ b/kate/data/qt4.xml
@@ -61,10 +61,10 @@
http://qt-project.org/doc/qt-4.8/qurl.html#macros
-->
- Q_DECLARE_METATYPE
- - QT_NO_CAST_FROM_BYTEARRAY
- - QT_NO_CAST_FROM_ASCII
- - QT_NO_CAST_TO_ASCII
- - QT_NO_URL_CAST_FROM_STRING
+ - TQT_NO_CAST_FROM_BYTEARRAY
+ - TQT_NO_CAST_FROM_ASCII
+ - TQT_NO_CAST_TO_ASCII
+ - TQT_NO_URL_CAST_FROM_STRING
- QT_USE_QSTRINGBUILDER
- QBENCHMARK
@@ -189,181 +189,181 @@
- QT_MODULE_TEST
- QT_MODULE_XML
- QT_MODULE_XMLPATTERNS
- - QT_NO_ACCESSIBILITY
- - QT_NO_ANIMATION
- - QT_NO_ARM_EABI
- - QT_NO_BEARERMANAGEMENT
- - QT_NO_BUTTONGROUP
- - QT_NO_CALENDARWIDGET
- - QT_NO_CLIPBOARD
- - QT_NO_CODECS
- - QT_NO_COLORDIALOG
- - QT_NO_COLUMNVIEW
- - QT_NO_COMBOBOX
- - QT_NO_COMPLETER
- - QT_NO_CONCURRENT
- - QT_NO_CONCURRENT_FILTER
- - QT_NO_CONCURRENT_MAP
- - QT_NO_CONTEXTMENU
- - QT_NO_COP
- - QT_NO_CRASHHANDLER
- - QT_NO_CUPS
- - QT_NO_DATAWIDGETMAPPER
- - QT_NO_DATESTRING
- - QT_NO_DATETIMEEDIT
- - QT_NO_DBUS
- - QT_NO_DEBUG
- - QT_NO_DEBUG_STREAM
- - QT_NO_DECLARATIVE
- - QT_NO_DIAL
- - QT_NO_DIRMODEL
- - QT_NO_DOCKWIDGET
- - QT_NO_DRAGANDDROP
- - QT_NO_EGL
- - QT_NO_ERRORMESSAGE
- - QT_NO_EXCEPTIONS
- - QT_NO_FILEDIALOG
- - QT_NO_FILESYSTEMMODEL
- - QT_NO_FONTCOMBOBOX
- - QT_NO_FONTCONFIG
- - QT_NO_FONTDIALOG
- - QT_NO_FPU
- - QT_NO_FSCOMPLETER
- - QT_NO_FTP
- - QT_NO_GETIFADDRS
- - QT_NO_GRAPHICSEFFECT
- - QT_NO_GRAPHICSSVGITEM
- - QT_NO_GRAPHICSVIEW
- - QT_NO_GSTREAMER
- - QT_NO_HOSTINFO
- - QT_NO_HTTP
- - QT_NO_ICD
- - QT_NO_IM
- - QT_NO_IMAGEFORMAT_JPEG
- - QT_NO_IMAGEFORMAT_MNG
- - QT_NO_IMAGEFORMAT_PNG
- - QT_NO_IMAGEFORMAT_TIFF
- - QT_NO_IMAGEFORMAT_XPM
- - QT_NO_INPUTDIALOG
- - QT_NO_ITEMVIEWS
- - QT_NO_LIBRARY
- - QT_NO_LISTVIEW
- - QT_NO_LISTWIDGET
- - QT_NO_LPR
- - QT_NO_MAINWINDOW
- - QT_NO_MDIAREA
- - QT_NO_MENU
- - QT_NO_MENUBAR
- - QT_NO_MITSHM
- - QT_NO_MULTIMEDIA
- - QT_NO_NAS
- - QT_NO_NETWORKDISKCACHE
- - QT_NO_OPENGL
- - QT_NO_OPENVG
- - QT_NO_PAINT_DEBUG
- - QT_NO_PHONON
- - QT_NO_PHONON_EFFECTWIDGET
- - QT_NO_PHONON_PLATFORMPLUGIN
- - QT_NO_PHONON_SEEKSLIDER
- - QT_NO_PHONON_SETTINGSGROUP
- - QT_NO_PHONON_VIDEOPLAYER
- - QT_NO_PHONON_VOLUMEFADEREFFECT
- - QT_NO_PHONON_VOLUMESLIDER
- - QT_NO_PRINTDIALOG
- - QT_NO_PRINTER
- - QT_NO_PRINTPREVIEWDIALOG
- - QT_NO_PRINTPREVIEWWIDGET
- - QT_NO_PROCESS
- - QT_NO_PROGRESSDIALOG
- - QT_NO_PROXYMODEL
- - QT_NO_PULSEAUDIO
- - QT_NO_QDEBUG_MACRO
- - QT_NO_QFUTURE
- - QT_NO_QWARNING_MACRO
- - QT_NO_QWS_CURSOR
- - QT_NO_QWS_DECORATION_STYLED
- - QT_NO_QWS_DECORATION_WINDOWS
- - QT_NO_QWS_DYNAMICSCREENTRANSFORMATION
- - QT_NO_QWS_INPUTMETHODS
- - QT_NO_QWS_MANAGER
- - QT_NO_QWS_MULTIPROCESS
- - QT_NO_QWS_SOUNDSERVER
- - QT_NO_QWS_TRANSFORMED
- - QT_NO_QWS_VNC
- - QT_NO_RAWFONT
- - QT_NO_S60
- - QT_NO_SCRIPT
- - QT_NO_SCRIPTTOOLS
- - QT_NO_SCROLLAREA
- - QT_NO_SCROLLBAR
- - QT_NO_SESSIONMANAGER
- - QT_NO_SHAPE
- - QT_NO_SHAREDMEMORY
- - QT_NO_SOCKS5
- - QT_NO_SOFTKEYMANAGER
- - QT_NO_SORTFILTERPROXYMODEL
- - QT_NO_SPINBOX
- - QT_NO_SPLITTER
- - QT_NO_STANDARDITEMMODEL
- - QT_NO_STATEMACHINE
- - QT_NO_STL_WCHAR
- - QT_NO_STRINGLISTMODEL
- - QT_NO_STYLE_CDE
- - QT_NO_STYLE_CLEANLOOKS
- - QT_NO_STYLE_GTK
- - QT_NO_STYLE_PLASTIQUE
- - QT_NO_STYLE_S60
- - QT_NO_STYLE_STYLESHEET
- - QT_NO_STYLE_WINDOWSCE
- - QT_NO_STYLE_WINDOWSMOBILE
- - QT_NO_STYLE_WINDOWSVISTA
- - QT_NO_STYLE_WINDOWSXP
- - QT_NO_SVG
- - QT_NO_SVGGENERATOR
- - QT_NO_SVGRENDERER
- - QT_NO_SVGWIDGET
- - QT_NO_SXE
- - QT_NO_SYNTAXHIGHLIGHTER
- - QT_NO_SYSTEMSEMAPHORE
- - QT_NO_TABBAR
- - QT_NO_TABDIALOG
- - QT_NO_TABLET
- - QT_NO_TABLEVIEW
- - QT_NO_TABLEWIDGET
- - QT_NO_TABWIDGET
- - QT_NO_TEMPLATE_TEMPLATE_PARAMETERS
- - QT_NO_TEXTBROWSER
- - QT_NO_TEXTCODECPLUGIN
- - QT_NO_TEXTEDIT
- - QT_NO_TEXTODFWRITER
- - QT_NO_TOOLBAR
- - QT_NO_TOOLBOX
- - QT_NO_TOOLBUTTON
- - QT_NO_TRANSLATION_UTF8
- - QT_NO_TREEVIEW
- - QT_NO_TREEWIDGET
- - QT_NO_UNDOGROUP
- - QT_NO_UNDOSTACK
- - QT_NO_UNDOVIEW
- - QT_NO_WARNINGS
- - QT_NO_WEBKIT
- - QT_NO_WHATSTHIS
- - QT_NO_WIN_ACTIVEQT
- - QT_NO_WIZARD
- - QT_NO_WORKSPACE
- - QT_NO_XCURSOR
- - QT_NO_XFIXES
- - QT_NO_XINERAMA
- - QT_NO_XINPUT
- - QT_NO_XKB
- - QT_NO_XMLPATTERNS
- - QT_NO_XMLSTREAMREADER
- - QT_NO_XMLSTREAMWRITER
- - QT_NO_XRANDR
- - QT_NO_XRENDER
- - QT_NO_XSYNC
- - QT_NO_XVIDEO
- - QT_NO_ZLIB
+ - TQT_NO_ACCESSIBILITY
+ - TQT_NO_ANIMATION
+ - TQT_NO_ARM_EABI
+ - TQT_NO_BEARERMANAGEMENT
+ - TQT_NO_BUTTONGROUP
+ - TQT_NO_CALENDARWIDGET
+ - TQT_NO_CLIPBOARD
+ - TQT_NO_CODECS
+ - TQT_NO_COLORDIALOG
+ - TQT_NO_COLUMNVIEW
+ - TQT_NO_COMBOBOX
+ - TQT_NO_COMPLETER
+ - TQT_NO_CONCURRENT
+ - TQT_NO_CONCURRENT_FILTER
+ - TQT_NO_CONCURRENT_MAP
+ - TQT_NO_CONTEXTMENU
+ - TQT_NO_COP
+ - TQT_NO_CRASHHANDLER
+ - TQT_NO_CUPS
+ - TQT_NO_DATAWIDGETMAPPER
+ - TQT_NO_DATESTRING
+ - TQT_NO_DATETIMEEDIT
+ - TQT_NO_DBUS
+ - TQT_NO_DEBUG
+ - TQT_NO_DEBUG_STREAM
+ - TQT_NO_DECLARATIVE
+ - TQT_NO_DIAL
+ - TQT_NO_DIRMODEL
+ - TQT_NO_DOCKWIDGET
+ - TQT_NO_DRAGANDDROP
+ - TQT_NO_EGL
+ - TQT_NO_ERRORMESSAGE
+ - TQT_NO_EXCEPTIONS
+ - TQT_NO_FILEDIALOG
+ - TQT_NO_FILESYSTEMMODEL
+ - TQT_NO_FONTCOMBOBOX
+ - TQT_NO_FONTCONFIG
+ - TQT_NO_FONTDIALOG
+ - TQT_NO_FPU
+ - TQT_NO_FSCOMPLETER
+ - TQT_NO_FTP
+ - TQT_NO_GETIFADDRS
+ - TQT_NO_GRAPHICSEFFECT
+ - TQT_NO_GRAPHICSSVGITEM
+ - TQT_NO_GRAPHICSVIEW
+ - TQT_NO_GSTREAMER
+ - TQT_NO_HOSTINFO
+ - TQT_NO_HTTP
+ - TQT_NO_ICD
+ - TQT_NO_IM
+ - TQT_NO_IMAGEFORMAT_JPEG
+ - TQT_NO_IMAGEFORMAT_MNG
+ - TQT_NO_IMAGEFORMAT_PNG
+ - TQT_NO_IMAGEFORMAT_TIFF
+ - TQT_NO_IMAGEFORMAT_XPM
+ - TQT_NO_INPUTDIALOG
+ - TQT_NO_ITEMVIEWS
+ - TQT_NO_LIBRARY
+ - TQT_NO_LISTVIEW
+ - TQT_NO_LISTWIDGET
+ - TQT_NO_LPR
+ - TQT_NO_MAINWINDOW
+ - TQT_NO_MDIAREA
+ - TQT_NO_MENU
+ - TQT_NO_MENUBAR
+ - TQT_NO_MITSHM
+ - TQT_NO_MULTIMEDIA
+ - TQT_NO_NAS
+ - TQT_NO_NETWORKDISKCACHE
+ - TQT_NO_OPENGL
+ - TQT_NO_OPENVG
+ - TQT_NO_PAINT_DEBUG
+ - TQT_NO_PHONON
+ - TQT_NO_PHONON_EFFECTWIDGET
+ - TQT_NO_PHONON_PLATFORMPLUGIN
+ - TQT_NO_PHONON_SEEKSLIDER
+ - TQT_NO_PHONON_SETTINGSGROUP
+ - TQT_NO_PHONON_VIDEOPLAYER
+ - TQT_NO_PHONON_VOLUMEFADEREFFECT
+ - TQT_NO_PHONON_VOLUMESLIDER
+ - TQT_NO_PRINTDIALOG
+ - TQT_NO_PRINTER
+ - TQT_NO_PRINTPREVIEWDIALOG
+ - TQT_NO_PRINTPREVIEWWIDGET
+ - TQT_NO_PROCESS
+ - TQT_NO_PROGRESSDIALOG
+ - TQT_NO_PROXYMODEL
+ - TQT_NO_PULSEAUDIO
+ - TQT_NO_QDEBUG_MACRO
+ - TQT_NO_QFUTURE
+ - TQT_NO_QWARNING_MACRO
+ - TQT_NO_QWS_CURSOR
+ - TQT_NO_QWS_DECORATION_STYLED
+ - TQT_NO_QWS_DECORATION_WINDOWS
+ - TQT_NO_QWS_DYNAMICSCREENTRANSFORMATION
+ - TQT_NO_QWS_INPUTMETHODS
+ - TQT_NO_QWS_MANAGER
+ - TQT_NO_QWS_MULTIPROCESS
+ - TQT_NO_QWS_SOUNDSERVER
+ - TQT_NO_QWS_TRANSFORMED
+ - TQT_NO_QWS_VNC
+ - TQT_NO_RAWFONT
+ - TQT_NO_S60
+ - TQT_NO_SCRIPT
+ - TQT_NO_SCRIPTTOOLS
+ - TQT_NO_SCROLLAREA
+ - TQT_NO_SCROLLBAR
+ - TQT_NO_SESSIONMANAGER
+ - TQT_NO_SHAPE
+ - TQT_NO_SHAREDMEMORY
+ - TQT_NO_SOCKS5
+ - TQT_NO_SOFTKEYMANAGER
+ - TQT_NO_SORTFILTERPROXYMODEL
+ - TQT_NO_SPINBOX
+ - TQT_NO_SPLITTER
+ - TQT_NO_STANDARDITEMMODEL
+ - TQT_NO_STATEMACHINE
+ - TQT_NO_STL_WCHAR
+ - TQT_NO_STRINGLISTMODEL
+ - TQT_NO_STYLE_CDE
+ - TQT_NO_STYLE_CLEANLOOKS
+ - TQT_NO_STYLE_GTK
+ - TQT_NO_STYLE_PLASTIQUE
+ - TQT_NO_STYLE_S60
+ - TQT_NO_STYLE_STYLESHEET
+ - TQT_NO_STYLE_WINDOWSCE
+ - TQT_NO_STYLE_WINDOWSMOBILE
+ - TQT_NO_STYLE_WINDOWSVISTA
+ - TQT_NO_STYLE_WINDOWSXP
+ - TQT_NO_SVG
+ - TQT_NO_SVGGENERATOR
+ - TQT_NO_SVGRENDERER
+ - TQT_NO_SVGWIDGET
+ - TQT_NO_SXE
+ - TQT_NO_SYNTAXHIGHLIGHTER
+ - TQT_NO_SYSTEMSEMAPHORE
+ - TQT_NO_TABBAR
+ - TQT_NO_TABDIALOG
+ - TQT_NO_TABLET
+ - TQT_NO_TABLEVIEW
+ - TQT_NO_TABLEWIDGET
+ - TQT_NO_TABWIDGET
+ - TQT_NO_TEMPLATE_TEMPLATE_PARAMETERS
+ - TQT_NO_TEXTBROWSER
+ - TQT_NO_TEXTCODECPLUGIN
+ - TQT_NO_TEXTEDIT
+ - TQT_NO_TEXTODFWRITER
+ - TQT_NO_TOOLBAR
+ - TQT_NO_TOOLBOX
+ - TQT_NO_TOOLBUTTON
+ - TQT_NO_TRANSLATION_UTF8
+ - TQT_NO_TREEVIEW
+ - TQT_NO_TREEWIDGET
+ - TQT_NO_UNDOGROUP
+ - TQT_NO_UNDOSTACK
+ - TQT_NO_UNDOVIEW
+ - TQT_NO_WARNINGS
+ - TQT_NO_WEBKIT
+ - TQT_NO_WHATSTHIS
+ - TQT_NO_WIN_ACTIVEQT
+ - TQT_NO_WIZARD
+ - TQT_NO_WORKSPACE
+ - TQT_NO_XCURSOR
+ - TQT_NO_XFIXES
+ - TQT_NO_XINERAMA
+ - TQT_NO_XINPUT
+ - TQT_NO_XKB
+ - TQT_NO_XMLPATTERNS
+ - TQT_NO_XMLSTREAMREADER
+ - TQT_NO_XMLSTREAMWRITER
+ - TQT_NO_XRANDR
+ - TQT_NO_XRENDER
+ - TQT_NO_XSYNC
+ - TQT_NO_XVIDEO
+ - TQT_NO_ZLIB
- QT_PACKAGEDATE_STR
- QT_PACKAGE_TAG
- QT_POINTER_SIZE
diff --git a/tdecore/kurl.cpp b/tdecore/kurl.cpp
index 7fd8ad26a..290355552 100644
--- a/tdecore/kurl.cpp
+++ b/tdecore/kurl.cpp
@@ -533,7 +533,7 @@ TQDataStream & operator>> (TQDataStream & s, KURL & a)
return s;
}
-#ifndef QT_NO_NETWORKPROTOCOL
+#ifndef TQT_NO_NETWORKPROTOCOL
KURL::KURL( const TQUrl &u )
{
d = new KURLPrivate();
@@ -1065,7 +1065,7 @@ KURL& KURL::operator=( const char * _url )
return *this;
}
-#ifndef QT_NO_NETWORKPROTOCOL
+#ifndef TQT_NO_NETWORKPROTOCOL
KURL& KURL::operator=( const TQUrl & u )
{
m_strProtocol = u.protocol();
diff --git a/tdecore/tdeapplication.cpp b/tdecore/tdeapplication.cpp
index cae6b708d..fbc986de2 100644
--- a/tdecore/tdeapplication.cpp
+++ b/tdecore/tdeapplication.cpp
@@ -64,7 +64,7 @@
#include
#include
#include
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
#include
#endif
@@ -2610,7 +2610,7 @@ void TDEApplication::propagateSettings(SettingsCategory arg)
void TDEApplication::installKDEPropertyMap()
{
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
static bool installed = false;
if (installed) return;
installed = true;
diff --git a/tdecore/tdeconfig_compiler/tests/CMakeLists.txt b/tdecore/tdeconfig_compiler/tests/CMakeLists.txt
index 3034773b0..2715d19b9 100644
--- a/tdecore/tdeconfig_compiler/tests/CMakeLists.txt
+++ b/tdecore/tdeconfig_compiler/tests/CMakeLists.txt
@@ -25,7 +25,7 @@ link_directories(
)
add_definitions(
- -DQT_NO_CAST_ASCII
+ -DTQT_NO_CAST_ASCII
-DSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}"
)
diff --git a/tdecore/tdeconfig_compiler/tests/Makefile.am b/tdecore/tdeconfig_compiler/tests/Makefile.am
index ee0e95af2..48157b473 100644
--- a/tdecore/tdeconfig_compiler/tests/Makefile.am
+++ b/tdecore/tdeconfig_compiler/tests/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir)/tdeunittest $(all_includes) -DQT_NO_CAST_ASCII -DSRCDIR=\"$(srcdir)\"
+AM_CPPFLAGS = -I$(top_srcdir)/tdecore -I$(top_srcdir)/tdeunittest $(all_includes) -DTQT_NO_CAST_ASCII -DSRCDIR=\"$(srcdir)\"
check_PROGRAMS = test1 test2 test3 test4 test5 test6 test7 test8 test9 test_dpointer
diff --git a/tdecore/tdemultipledrag.cpp b/tdecore/tdemultipledrag.cpp
index db71c9e87..c3d63cbde 100644
--- a/tdecore/tdemultipledrag.cpp
+++ b/tdecore/tdemultipledrag.cpp
@@ -20,7 +20,7 @@
#include "tdemultipledrag.h"
#include "kdebug.h"
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
KMultipleDrag::KMultipleDrag( TQWidget *dragSource, const char *name )
: TQDragObject( dragSource, name )
diff --git a/tdecore/tdemultipledrag.h b/tdecore/tdemultipledrag.h
index 4b9a05e80..bfc408019 100644
--- a/tdecore/tdemultipledrag.h
+++ b/tdecore/tdemultipledrag.h
@@ -20,7 +20,7 @@
#ifndef TDEMULTIPLEDRAG_H
#define TDEMULTIPLEDRAG_H
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
#include
#include
@@ -100,6 +100,6 @@ private:
KMultipleDragPrivate* d;
};
-#endif // QT_NO_DRAGANDDROP
+#endif // TQT_NO_DRAGANDDROP
#endif // TDEMULTIPLEDRAG_H
diff --git a/tdehtml/rendering/bidi.cpp b/tdehtml/rendering/bidi.cpp
index c8abf52d0..4c72c477d 100644
--- a/tdehtml/rendering/bidi.cpp
+++ b/tdehtml/rendering/bidi.cpp
@@ -939,7 +939,7 @@ void RenderBlock::bidiReorderLine(const BidiIterator &start, const BidiIterator
dirCurrent = bidi.current.direction();
}
-#ifndef QT_NO_UNICODETABLES
+#ifndef TQT_NO_UNICODETABLES
#if BIDI_DEBUG > 1
kdDebug(6041) << "directions: dir=" << (int)dir << " current=" << (int)dirCurrent << " last=" << status.last << " eor=" << status.eor << " lastStrong=" << status.lastStrong << " embedding=" << (int)context->dir << " level =" << (int)context->level << endl;
@@ -1620,7 +1620,7 @@ BidiIterator RenderBlock::findNextLineBreak(BidiIterator &start, BidiState &bidi
// remove leading spaces. Any inline flows we encounter will be empty and should also
// be skipped.
while (!start.atEnd() && (start.obj->isInlineFlow() || (!start.obj->style()->preserveWS() && !start.obj->isBR() &&
-#ifndef QT_NO_UNICODETABLES
+#ifndef TQT_NO_UNICODETABLES
( (start.current().unicode() == (ushort)0x0020) || // ASCII space
(start.current().unicode() == (ushort)0x0009) || // ASCII tab
(start.current().unicode() == (ushort)0x000A) || // ASCII line feed
diff --git a/tdehtml/tdehtml_ext.cpp b/tdehtml/tdehtml_ext.cpp
index 9c1ab2aaf..0391345f3 100644
--- a/tdehtml/tdehtml_ext.cpp
+++ b/tdehtml/tdehtml_ext.cpp
@@ -225,7 +225,7 @@ void TDEHTMLPartBrowserExtension::copy()
TQClipboard *cb = TQApplication::clipboard();
disconnect( cb, TQT_SIGNAL( selectionChanged() ), m_part, TQT_SLOT( slotClearSelection() ) );
-#ifndef QT_NO_MIMECLIPBOARD
+#ifndef TQT_NO_MIMECLIPBOARD
TQString htmltext;
/*
* When selectionModeEnabled, that means the user has just selected
@@ -334,7 +334,7 @@ void TDEHTMLPartBrowserExtension::updateEditActions()
}
// ### duplicated from KonqMainWindow::slotClipboardDataChanged
-#ifndef QT_NO_MIMECLIPBOARD // Handle minimalized versions of Qt Embedded
+#ifndef TQT_NO_MIMECLIPBOARD // Handle minimalized versions of Qt Embedded
TQMimeSource *data = TQApplication::clipboard()->data();
enableAction( "paste", data->provides( "text/plain" ) );
#else
@@ -604,12 +604,12 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri
actionCollection(), "sendimage" );
-#ifndef QT_NO_MIMECLIPBOARD
+#ifndef TQT_NO_MIMECLIPBOARD
(new TDEAction( i18n( "Copy Image" ), 0, this, TQT_SLOT( slotCopyImage() ),
actionCollection(), "copyimage" ))->setEnabled(!d->m_pixmap.isNull());
#endif
- if(d->m_pixmap.isNull()) { //fallback to image location if still loading the image. this will always be true if ifdef QT_NO_MIMECLIPBOARD
+ if(d->m_pixmap.isNull()) { //fallback to image location if still loading the image. this will always be true if ifdef TQT_NO_MIMECLIPBOARD
new TDEAction( i18n( "Copy Image Location" ), 0, this, TQT_SLOT( slotCopyImageLocation() ),
actionCollection(), "copyimagelocation" );
}
@@ -711,7 +711,7 @@ void TDEHTMLPopupGUIClient::slotCopyLinkLocation()
{
KURL safeURL(d->m_url);
safeURL.setPass(TQString::null);
-#ifndef QT_NO_MIMECLIPBOARD
+#ifndef TQT_NO_MIMECLIPBOARD
// Set it in both the mouse selection and in the clipboard
KURL::List lst;
lst.append( safeURL );
@@ -729,7 +729,7 @@ void TDEHTMLPopupGUIClient::slotStopAnimations()
void TDEHTMLPopupGUIClient::slotCopyImage()
{
-#ifndef QT_NO_MIMECLIPBOARD
+#ifndef TQT_NO_MIMECLIPBOARD
KURL safeURL(d->m_imageURL);
safeURL.setPass(TQString::null);
@@ -752,7 +752,7 @@ void TDEHTMLPopupGUIClient::slotCopyImageLocation()
{
KURL safeURL(d->m_imageURL);
safeURL.setPass(TQString::null);
-#ifndef QT_NO_MIMECLIPBOARD
+#ifndef TQT_NO_MIMECLIPBOARD
// Set it in both the mouse selection and in the clipboard
KURL::List lst;
lst.append( safeURL );
diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp
index 9c3613372..6f32a839e 100644
--- a/tdehtml/tdehtml_part.cpp
+++ b/tdehtml/tdehtml_part.cpp
@@ -93,7 +93,7 @@ using namespace DOM;
#include
#include
#include
-#if !defined(QT_NO_DRAGANDDROP)
+#if !defined(TQT_NO_DRAGANDDROP)
#include
#endif
#include "../tdeutils/kfinddialog.h"
@@ -1483,7 +1483,7 @@ void TDEHTMLPart::clear()
d->m_selectionEnd = DOM::Node();
d->m_startOffset = 0;
d->m_endOffset = 0;
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), TQT_SLOT( slotClearSelection()));
#endif
@@ -3008,7 +3008,7 @@ void TDEHTMLPart::findText()
}
// The lineedit of the dialog would make tdehtml lose its selection, otherwise
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
disconnect( kapp->clipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotClearSelection()) );
#endif
@@ -3039,7 +3039,7 @@ void TDEHTMLPart::findText( const TQString &str, long options, TQWidget *parent,
if ( !d->m_doc )
return;
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
connect( kapp->clipboard(), TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotClearSelection()) );
#endif
@@ -6392,7 +6392,7 @@ void TDEHTMLPart::tdehtmlMouseMoveEvent( tdehtml::MouseMoveEvent *event )
DOM::DOMString target = event->target();
DOM::Node innerNode = event->innerNode();
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
if( d->m_bDnd && d->m_bMousePressed &&
( (!d->m_strSelectedURL.isEmpty() && !isEditable())
|| (!d->m_mousePressNode.isNull() && d->m_mousePressNode.elementId() == ID_IMG) ) ) {
@@ -6539,7 +6539,7 @@ void TDEHTMLPart::tdehtmlMouseReleaseEvent( tdehtml::MouseReleaseEvent *event )
tmp_iface->callMethod( "goHistory(int)", -1 );
}
}
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
if ((d->m_guiProfile == BrowserViewGUI) && (_mouse->button() == Qt::MidButton) && (event->url().isNull())) {
kdDebug( 6050 ) << "TDEHTMLPart::tdehtmlMouseReleaseEvent() MMB shouldOpen="
<< d->m_bOpenMiddleClick << endl;
@@ -6613,7 +6613,7 @@ void TDEHTMLPart::tdehtmlMouseReleaseEvent( tdehtml::MouseReleaseEvent *event )
emitCaretPositionChanged(v ? d->caretNode() : 0, d->caretOffset());
#endif
// get selected text and paste to the clipboard
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
TQString text = selectedText();
text.replace(TQChar(0xa0), ' ');
disconnect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), this, TQT_SLOT( slotClearSelection()));
diff --git a/tdehtml/tdehtmlview.cpp b/tdehtml/tdehtmlview.cpp
index 901c02321..b3679c6cc 100644
--- a/tdehtml/tdehtmlview.cpp
+++ b/tdehtml/tdehtmlview.cpp
@@ -112,7 +112,7 @@ using namespace tdehtml;
class TDEHTMLToolTip;
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
class TDEHTMLToolTip : public TQToolTip
{
@@ -412,7 +412,7 @@ public:
#endif
};
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
/** calculates the client-side image map rectangle for the given image element
* @param img image element
@@ -507,7 +507,7 @@ TDEHTMLView::TDEHTMLView( TDEHTMLPart *part, TQWidget *parent, const char *name)
KImageIO::registerFormats();
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
d->tooltip = new TDEHTMLToolTip( this, d );
#endif
@@ -2866,7 +2866,7 @@ void TDEHTMLView::print(bool quick)
bool scalePage = false;
double scale = 0.0;
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
if(root->docWidth() > metrics.width()) {
scalePage = true;
scale = ((double) metrics.width())/((double) root->docWidth());
@@ -2921,7 +2921,7 @@ void TDEHTMLView::print(bool quick)
}
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
if (scalePage)
p->scale(scale, scale);
#endif
@@ -2993,7 +2993,7 @@ void TDEHTMLView::paint(TQPainter *p, const TQRect &rc, int yOff, bool *more)
p->translate(rc.left(), rc.top());
double scale = ((double) rc.width()/(double) root->docWidth());
int height = (int) ((double) rc.height() / scale);
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
p->scale(scale, scale);
#endif
root->setPageTop(yOff);
@@ -3267,7 +3267,7 @@ void TDEHTMLView::setIgnoreWheelEvents( bool e )
d->ignoreWheelEvents = e;
}
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
void TDEHTMLView::viewportWheelEvent(TQWheelEvent* e)
{
diff --git a/tdehtml/tdehtmlview.h b/tdehtml/tdehtmlview.h
index f67f712f0..797db99fa 100644
--- a/tdehtml/tdehtmlview.h
+++ b/tdehtml/tdehtmlview.h
@@ -203,7 +203,7 @@ protected:
virtual void viewportMouseMoveEvent(TQMouseEvent *);
virtual void viewportMouseReleaseEvent(TQMouseEvent *);
virtual void viewportResizeEvent(TQResizeEvent*);
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
virtual void viewportWheelEvent(TQWheelEvent*);
#endif
virtual void dragEnterEvent( TQDragEnterEvent* );
@@ -220,7 +220,7 @@ protected:
#ifndef NO_SMOOTH_SCROLL_HACK
void startScrolling();
void stopScrolling();
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
void scrollViewWheelEvent( TQWheelEvent* e );
#endif
#endif
diff --git a/tdehtml/test_regression_fontoverload.cpp b/tdehtml/test_regression_fontoverload.cpp
index d09a3dbd1..0faf49fcc 100644
--- a/tdehtml/test_regression_fontoverload.cpp
+++ b/tdehtml/test_regression_fontoverload.cpp
@@ -21,8 +21,8 @@
*/
#include "ecma/kjs_proxy.h"
-#define QT_NO_XRANDR 1
-#define QT_NO_XFTFREETYPE 1
+#define TQT_NO_XRANDR 1
+#define TQT_NO_XFTFREETYPE 1
#include
#include
#include
diff --git a/tdeinit/tdedostartupconfig.cpp b/tdeinit/tdedostartupconfig.cpp
index bbfdf88a4..9125b6cbf 100644
--- a/tdeinit/tdedostartupconfig.cpp
+++ b/tdeinit/tdedostartupconfig.cpp
@@ -22,7 +22,7 @@ DEALINGS IN THE SOFTWARE.
****************************************************************************/
-#undef QT_NO_CAST_ASCII
+#undef TQT_NO_CAST_ASCII
// See description in tdestartupconfig.cpp .
diff --git a/tdeio/kssl/ksslcertdlg.cc b/tdeio/kssl/ksslcertdlg.cc
index 26550e715..53904f10d 100644
--- a/tdeio/kssl/ksslcertdlg.cc
+++ b/tdeio/kssl/ksslcertdlg.cc
@@ -80,7 +80,7 @@ KSSLCertDlg::KSSLCertDlg(TQWidget *parent, const char *name, bool modal)
h->addWidget(d->p_pb_dontsend);
connect(d->p_pb_dontsend, TQT_SIGNAL(clicked()), TQT_SLOT(slotDont()));
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
setCaption(i18n("KDE SSL Certificate Dialog"));
#endif
}
diff --git a/tdeio/tdeio/paste.cpp b/tdeio/tdeio/paste.cpp
index 549575c29..c348757dd 100644
--- a/tdeio/tdeio/paste.cpp
+++ b/tdeio/tdeio/paste.cpp
@@ -93,7 +93,7 @@ static TDEIO::CopyJob* pasteDataAsyncTo( const KURL& new_url, const TQByteArray&
return TDEIO::move( orig_url, new_url );
}
-#ifndef QT_NO_MIMECLIPBOARD
+#ifndef TQT_NO_MIMECLIPBOARD
static TDEIO::CopyJob* chooseAndPaste( const KURL& u, TQMimeSource* data,
const TQValueVector& formats,
const TQString& text,
@@ -145,7 +145,7 @@ static TDEIO::CopyJob* chooseAndPaste( const KURL& u, TQMimeSource* data,
// KDE4: remove
TDEIO_EXPORT bool TDEIO::isClipboardEmpty()
{
-#ifndef QT_NO_MIMECLIPBOARD
+#ifndef TQT_NO_MIMECLIPBOARD
TQMimeSource *data = TQApplication::clipboard()->data();
if ( data->provides( "text/uri-list" ) && data->encodedData( "text/uri-list" ).size() > 0 )
return false;
@@ -159,7 +159,7 @@ TDEIO_EXPORT bool TDEIO::isClipboardEmpty()
return true;
}
-#ifndef QT_NO_MIMECLIPBOARD
+#ifndef TQT_NO_MIMECLIPBOARD
// The main method for dropping
TDEIO::CopyJob* TDEIO::pasteMimeSource( TQMimeSource* data, const KURL& dest_url,
const TQString& dialogText, TQWidget* widget, bool clipboard )
@@ -214,7 +214,7 @@ TDEIO_EXPORT TDEIO::Job *TDEIO::pasteClipboard( const KURL& dest_url, bool move
return 0;
}
-#ifndef QT_NO_MIMECLIPBOARD
+#ifndef TQT_NO_MIMECLIPBOARD
TQMimeSource *data = TQApplication::clipboard()->data();
// First check for URLs.
diff --git a/tdeioslave/http/kcookiejar/kcookiewin.cpp b/tdeioslave/http/kcookiejar/kcookiewin.cpp
index faa9cdc65..5b78d6956 100644
--- a/tdeioslave/http/kcookiejar/kcookiewin.cpp
+++ b/tdeioslave/http/kcookiejar/kcookiewin.cpp
@@ -26,13 +26,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// KDE File Manager -- HTTP Cookie Dialogs
// $Id$
-// The purpose of the QT_NO_TOOLTIP and QT_NO_WHATSTHIS ifdefs is because
+// The purpose of the TQT_NO_TOOLTIP and TQT_NO_WHATSTHIS ifdefs is because
// this file is also used in Konqueror/Embedded. One of the aims of
// Konqueror/Embedded is to be a small as possible to fit on embedded
// devices. For this it's also useful to strip out unneeded features of
// Qt, like for example TQToolTip or TQWhatsThis. The availability (or the
// lack thereof) can be determined using these preprocessor defines.
-// The same applies to the QT_NO_ACCEL ifdef below. I hope it doesn't make
+// The same applies to the TQT_NO_ACCEL ifdef below. I hope it doesn't make
// too much trouble... (Simon)
#include
@@ -48,11 +48,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include
#include
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
#include
#endif
-#ifndef QT_NO_WHATSTHIS
+#ifndef TQT_NO_WHATSTHIS
#include
#endif
@@ -145,14 +145,14 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList,
txt = (count == 1)? i18n("&Only this cookie") : i18n("&Only these cookies");
TQRadioButton* rb = new TQRadioButton( txt, m_btnGrp );
-#ifndef QT_NO_WHATSTHIS
+#ifndef TQT_NO_WHATSTHIS
TQWhatsThis::add( rb, i18n("Select this option to accept/reject only this cookie. "
"You will be prompted if another cookie is received. "
"(see WebBrowsing/Cookies in the Control Center)." ) );
#endif
m_btnGrp->insert( rb );
rb = new TQRadioButton( i18n("All cookies from this do&main"), m_btnGrp );
-#ifndef QT_NO_WHATSTHIS
+#ifndef TQT_NO_WHATSTHIS
TQWhatsThis::add( rb, i18n("Select this option to accept/reject all cookies from "
"this site. Choosing this option will add a new policy for "
"the site this cookie originated from. This policy will be "
@@ -161,7 +161,7 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList,
#endif
m_btnGrp->insert( rb );
rb = new TQRadioButton( i18n("All &cookies"), m_btnGrp );
-#ifndef QT_NO_WHATSTHIS
+#ifndef TQT_NO_WHATSTHIS
TQWhatsThis::add( rb, i18n("Select this option to accept/reject all cookies from "
"anywhere. Choosing this option will change the global "
"cookie policy set in the Control Center for all cookies "
@@ -188,7 +188,7 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList,
connect( btn, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) );
bbLay->addWidget( btn );
bbLay->addStretch( 1 );
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
TQAccel* a = new TQAccel( this );
a->connectItem( a->insertItem(Qt::Key_Escape), btn, TQT_SLOT(animateClick()) );
#endif
@@ -197,7 +197,7 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList,
m_button->setText( m_showDetails ? i18n("&Details <<"):i18n("&Details >>") );
connect( m_button, TQT_SIGNAL(clicked()), TQT_SLOT(slotCookieDetails()) );
bbLay->addWidget( m_button );
-#ifndef QT_NO_WHATSTHIS
+#ifndef TQT_NO_WHATSTHIS
TQWhatsThis::add( m_button, i18n("See or modify the cookie information") );
#endif
@@ -316,7 +316,7 @@ KCookieDetail::KCookieDetail( KHttpCookieList cookieList, int cookieCount,
btnNext->setFixedSize( btnNext->sizeHint() );
grid->addMultiCellWidget( btnNext, 8, 8, 0, 1 );
connect( btnNext, TQT_SIGNAL(clicked()), TQT_SLOT(slotNextCookie()) );
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
TQToolTip::add( btnNext, i18n("Show details of the next cookie") );
#endif
}
diff --git a/tdeprint/tests/drawdemo.cpp b/tdeprint/tests/drawdemo.cpp
index 76226e200..e60aae845 100644
--- a/tdeprint/tests/drawdemo.cpp
+++ b/tdeprint/tests/drawdemo.cpp
@@ -176,7 +176,7 @@ DrawView::DrawView()
//
DrawView::~DrawView()
{
-#ifndef QT_NO_PRINTER
+#ifndef TQT_NO_PRINTER
delete printer;
#endif
}
@@ -208,7 +208,7 @@ void DrawView::drawIt( TQPainter *p )
void DrawView::printIt()
{
-#ifndef QT_NO_PRINTER
+#ifndef TQT_NO_PRINTER
if ( printer->setup( this ) ) {
TQPainter paint( printer );
drawIt( &paint );
diff --git a/tdeprint/tests/helpwindow.cpp b/tdeprint/tests/helpwindow.cpp
index 54d160c73..2f172acc0 100644
--- a/tdeprint/tests/helpwindow.cpp
+++ b/tdeprint/tests/helpwindow.cpp
@@ -227,7 +227,7 @@ void HelpWindow::aboutQt()
void HelpWindow::openFile()
{
-#ifndef QT_NO_FILEDIALOG
+#ifndef TQT_NO_FILEDIALOG
TQString fn = TQFileDialog::getOpenFileName( TQString::null, TQString::null, this );
if ( !fn.isEmpty() )
browser->setSource( fn );
diff --git a/tdeui/kiconview.cpp b/tdeui/kiconview.cpp
index 1699a6919..04b78f389 100644
--- a/tdeui/kiconview.cpp
+++ b/tdeui/kiconview.cpp
@@ -504,7 +504,7 @@ void TDEIconViewItem::calcRect( const TQString& text_ )
int pw = 0;
int ph = 0;
-#ifndef QT_NO_PICTURE
+#ifndef TQT_NO_PICTURE
if ( picture() ) {
TQRect br = picture()->boundingRect();
pw = br.width() + 2;
@@ -685,7 +685,7 @@ void TDEIconViewItem::paintPixmap( TQPainter *p, const TQColorGroup &cg )
{
TDEIconView *kview = static_cast(iconView());
-#ifndef QT_NO_PICTURE
+#ifndef TQT_NO_PICTURE
if ( picture() ) {
TQPicture *pic = picture();
if ( isSelected() ) {
diff --git a/tdeui/ktabbar.cpp b/tdeui/ktabbar.cpp
index a49719519..29479c0e9 100644
--- a/tdeui/ktabbar.cpp
+++ b/tdeui/ktabbar.cpp
@@ -279,7 +279,7 @@ void KTabBar::dropEvent( TQDropEvent *e )
TQTabBar::dropEvent( e );
}
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
void KTabBar::wheelEvent( TQWheelEvent *e )
{
if ( e->orientation() == Qt::Horizontal )
diff --git a/tdeui/ktabbar.h b/tdeui/ktabbar.h
index 3877994ec..c5ea25c6d 100644
--- a/tdeui/ktabbar.h
+++ b/tdeui/ktabbar.h
@@ -69,7 +69,7 @@ signals:
void receivedDropEvent( int, TQDropEvent * );
void moveTab( int, int );
void closeRequest( int );
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
void wheelDelta( int );
#endif
@@ -78,7 +78,7 @@ protected:
virtual void mousePressEvent( TQMouseEvent *e );
virtual void mouseMoveEvent( TQMouseEvent *e );
virtual void mouseReleaseEvent( TQMouseEvent *e );
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
virtual void wheelEvent( TQWheelEvent *e );
#endif
diff --git a/tdeui/ktabwidget.cpp b/tdeui/ktabwidget.cpp
index f5c463a6c..d6800ab9a 100644
--- a/tdeui/ktabwidget.cpp
+++ b/tdeui/ktabwidget.cpp
@@ -66,7 +66,7 @@ KTabWidget::KTabWidget( TQWidget *parent, const char *name, WFlags f )
connect(tabBar(), TQT_SIGNAL(receivedDropEvent( int, TQDropEvent * )), TQT_SLOT(receivedDropEvent( int, TQDropEvent * )));
connect(tabBar(), TQT_SIGNAL(moveTab( int, int )), TQT_SLOT(moveTab( int, int )));
connect(tabBar(), TQT_SIGNAL(closeRequest( int )), TQT_SLOT(closeRequest( int )));
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
connect(tabBar(), TQT_SIGNAL(wheelDelta( int )), TQT_SLOT(wheelDelta( int )));
#endif
}
@@ -325,7 +325,7 @@ void KTabWidget::dropEvent( TQDropEvent *e )
TQTabWidget::dropEvent( e );
}
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
void KTabWidget::wheelEvent( TQWheelEvent *e )
{
if ( e->orientation() == Qt::Horizontal )
diff --git a/tdeui/ktabwidget.h b/tdeui/ktabwidget.h
index 4718c5753..d0a75b38b 100644
--- a/tdeui/ktabwidget.h
+++ b/tdeui/ktabwidget.h
@@ -277,7 +277,7 @@ protected:
virtual void dragMoveEvent( TQDragMoveEvent * );
virtual void dropEvent( TQDropEvent * );
unsigned int tabBarWidthForMaxChars( uint maxLength );
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
virtual void wheelEvent( TQWheelEvent *e );
#endif
virtual void resizeEvent( TQResizeEvent * );
@@ -289,7 +289,7 @@ protected slots:
virtual void mouseDoubleClick( int );
virtual void mouseMiddleClick( int );
virtual void closeRequest( int );
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
virtual void wheelDelta( int );
#endif
diff --git a/tdeutils/tdemultitabbar.cpp b/tdeutils/tdemultitabbar.cpp
index aa4554141..b2246e104 100644
--- a/tdeutils/tdemultitabbar.cpp
+++ b/tdeutils/tdemultitabbar.cpp
@@ -463,7 +463,7 @@ TQSize KMultiTabBarButton::sizeHint() const
int w = 0, h = 0;
// calculate contents size...
-#ifndef QT_NO_ICONSET
+#ifndef TQT_NO_ICONSET
if ( iconSet() && !iconSet()->isNull() ) {
int iw = iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4;
int ih = iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).height();