瀏覽代碼

QT_NO_* -> TQT_NO_* renaming.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/4/head
Michele Calgaro 1 年之前
父節點
當前提交
2e0398f755
簽署人: Michele Calgaro <michele.calgaro@yahoo.it> GPG Key ID: 2A75B7CA8ADED5CF
共有 26 個文件被更改,包括 247 次插入247 次删除
  1. +3
    -3
      dcop/dcopidlng/kalyptus
  2. +179
    -179
      kate/data/qt4.xml
  3. +2
    -2
      tdecore/kurl.cpp
  4. +2
    -2
      tdecore/tdeapplication.cpp
  5. +1
    -1
      tdecore/tdeconfig_compiler/tests/CMakeLists.txt
  6. +1
    -1
      tdecore/tdeconfig_compiler/tests/Makefile.am
  7. +1
    -1
      tdecore/tdemultipledrag.cpp
  8. +2
    -2
      tdecore/tdemultipledrag.h
  9. +2
    -2
      tdehtml/rendering/bidi.cpp
  10. +7
    -7
      tdehtml/tdehtml_ext.cpp
  11. +7
    -7
      tdehtml/tdehtml_part.cpp
  12. +7
    -7
      tdehtml/tdehtmlview.cpp
  13. +2
    -2
      tdehtml/tdehtmlview.h
  14. +2
    -2
      tdehtml/test_regression_fontoverload.cpp
  15. +1
    -1
      tdeinit/tdedostartupconfig.cpp
  16. +1
    -1
      tdeio/kssl/ksslcertdlg.cc
  17. +4
    -4
      tdeio/tdeio/paste.cpp
  18. +10
    -10
      tdeioslave/http/kcookiejar/kcookiewin.cpp
  19. +2
    -2
      tdeprint/tests/drawdemo.cpp
  20. +1
    -1
      tdeprint/tests/helpwindow.cpp
  21. +2
    -2
      tdeui/kiconview.cpp
  22. +1
    -1
      tdeui/ktabbar.cpp
  23. +2
    -2
      tdeui/ktabbar.h
  24. +2
    -2
      tdeui/ktabwidget.cpp
  25. +2
    -2
      tdeui/ktabwidget.h
  26. +1
    -1
      tdeutils/tdemultitabbar.cpp

+ 3
- 3
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;

+ 179
- 179
kate/data/qt4.xml 查看文件

@@ -61,10 +61,10 @@
http://qt-project.org/doc/qt-4.8/qurl.html#macros
-->
<item> Q_DECLARE_METATYPE </item>
<item> QT_NO_CAST_FROM_BYTEARRAY </item>
<item> QT_NO_CAST_FROM_ASCII </item>
<item> QT_NO_CAST_TO_ASCII </item>
<item> QT_NO_URL_CAST_FROM_STRING </item>
<item> TQT_NO_CAST_FROM_BYTEARRAY </item>
<item> TQT_NO_CAST_FROM_ASCII </item>
<item> TQT_NO_CAST_TO_ASCII </item>
<item> TQT_NO_URL_CAST_FROM_STRING </item>
<item> QT_USE_QSTRINGBUILDER </item>
<!-- QtTest macros: http://qt-project.org/doc/qt-4.8/qtest.html#macros -->
<item> QBENCHMARK </item>
@@ -189,181 +189,181 @@
<item> QT_MODULE_TEST </item>
<item> QT_MODULE_XML </item>
<item> QT_MODULE_XMLPATTERNS </item>
<item> QT_NO_ACCESSIBILITY </item>
<item> QT_NO_ANIMATION </item>
<item> QT_NO_ARM_EABI </item>
<item> QT_NO_BEARERMANAGEMENT </item>
<item> QT_NO_BUTTONGROUP </item>
<item> QT_NO_CALENDARWIDGET </item>
<item> QT_NO_CLIPBOARD </item>
<item> QT_NO_CODECS </item>
<item> QT_NO_COLORDIALOG </item>
<item> QT_NO_COLUMNVIEW </item>
<item> QT_NO_COMBOBOX </item>
<item> QT_NO_COMPLETER </item>
<item> QT_NO_CONCURRENT </item>
<item> QT_NO_CONCURRENT_FILTER </item>
<item> QT_NO_CONCURRENT_MAP </item>
<item> QT_NO_CONTEXTMENU </item>
<item> QT_NO_COP </item>
<item> QT_NO_CRASHHANDLER </item>
<item> QT_NO_CUPS </item>
<item> QT_NO_DATAWIDGETMAPPER </item>
<item> QT_NO_DATESTRING </item>
<item> QT_NO_DATETIMEEDIT </item>
<item> QT_NO_DBUS </item>
<item> QT_NO_DEBUG </item>
<item> QT_NO_DEBUG_STREAM </item>
<item> QT_NO_DECLARATIVE </item>
<item> QT_NO_DIAL </item>
<item> QT_NO_DIRMODEL </item>
<item> QT_NO_DOCKWIDGET </item>
<item> QT_NO_DRAGANDDROP </item>
<item> QT_NO_EGL </item>
<item> QT_NO_ERRORMESSAGE </item>
<item> QT_NO_EXCEPTIONS </item>
<item> QT_NO_FILEDIALOG </item>
<item> QT_NO_FILESYSTEMMODEL </item>
<item> QT_NO_FONTCOMBOBOX </item>
<item> QT_NO_FONTCONFIG </item>
<item> QT_NO_FONTDIALOG </item>
<item> QT_NO_FPU </item>
<item> QT_NO_FSCOMPLETER </item>
<item> QT_NO_FTP </item>
<item> QT_NO_GETIFADDRS </item>
<item> QT_NO_GRAPHICSEFFECT </item>
<item> QT_NO_GRAPHICSSVGITEM </item>
<item> QT_NO_GRAPHICSVIEW </item>
<item> QT_NO_GSTREAMER </item>
<item> QT_NO_HOSTINFO </item>
<item> QT_NO_HTTP </item>
<item> QT_NO_ICD </item>
<item> QT_NO_IM </item>
<item> QT_NO_IMAGEFORMAT_JPEG </item>
<item> QT_NO_IMAGEFORMAT_MNG </item>
<item> QT_NO_IMAGEFORMAT_PNG </item>
<item> QT_NO_IMAGEFORMAT_TIFF </item>
<item> QT_NO_IMAGEFORMAT_XPM </item>
<item> QT_NO_INPUTDIALOG </item>
<item> QT_NO_ITEMVIEWS </item>
<item> QT_NO_LIBRARY </item>
<item> QT_NO_LISTVIEW </item>
<item> QT_NO_LISTWIDGET </item>
<item> QT_NO_LPR </item>
<item> QT_NO_MAINWINDOW </item>
<item> QT_NO_MDIAREA </item>
<item> QT_NO_MENU </item>
<item> QT_NO_MENUBAR </item>
<item> QT_NO_MITSHM </item>
<item> QT_NO_MULTIMEDIA </item>
<item> QT_NO_NAS </item>
<item> QT_NO_NETWORKDISKCACHE </item>
<item> QT_NO_OPENGL </item>
<item> QT_NO_OPENVG </item>
<item> QT_NO_PAINT_DEBUG </item>
<item> QT_NO_PHONON </item>
<item> QT_NO_PHONON_EFFECTWIDGET </item>
<item> QT_NO_PHONON_PLATFORMPLUGIN </item>
<item> QT_NO_PHONON_SEEKSLIDER </item>
<item> QT_NO_PHONON_SETTINGSGROUP </item>
<item> QT_NO_PHONON_VIDEOPLAYER </item>
<item> QT_NO_PHONON_VOLUMEFADEREFFECT </item>
<item> QT_NO_PHONON_VOLUMESLIDER </item>
<item> QT_NO_PRINTDIALOG </item>
<item> QT_NO_PRINTER </item>
<item> QT_NO_PRINTPREVIEWDIALOG </item>
<item> QT_NO_PRINTPREVIEWWIDGET </item>
<item> QT_NO_PROCESS </item>
<item> QT_NO_PROGRESSDIALOG </item>
<item> QT_NO_PROXYMODEL </item>
<item> QT_NO_PULSEAUDIO </item>
<item> QT_NO_QDEBUG_MACRO </item>
<item> QT_NO_QFUTURE </item>
<item> QT_NO_QWARNING_MACRO </item>
<item> QT_NO_QWS_CURSOR </item>
<item> QT_NO_QWS_DECORATION_STYLED </item>
<item> QT_NO_QWS_DECORATION_WINDOWS </item>
<item> QT_NO_QWS_DYNAMICSCREENTRANSFORMATION </item>
<item> QT_NO_QWS_INPUTMETHODS </item>
<item> QT_NO_QWS_MANAGER </item>
<item> QT_NO_QWS_MULTIPROCESS </item>
<item> QT_NO_QWS_SOUNDSERVER </item>
<item> QT_NO_QWS_TRANSFORMED </item>
<item> QT_NO_QWS_VNC </item>
<item> QT_NO_RAWFONT </item>
<item> QT_NO_S60 </item>
<item> QT_NO_SCRIPT </item>
<item> QT_NO_SCRIPTTOOLS </item>
<item> QT_NO_SCROLLAREA </item>
<item> QT_NO_SCROLLBAR </item>
<item> QT_NO_SESSIONMANAGER </item>
<item> QT_NO_SHAPE </item>
<item> QT_NO_SHAREDMEMORY </item>
<item> QT_NO_SOCKS5 </item>
<item> QT_NO_SOFTKEYMANAGER </item>
<item> QT_NO_SORTFILTERPROXYMODEL </item>
<item> QT_NO_SPINBOX </item>
<item> QT_NO_SPLITTER </item>
<item> QT_NO_STANDARDITEMMODEL </item>
<item> QT_NO_STATEMACHINE </item>
<item> QT_NO_STL_WCHAR </item>
<item> QT_NO_STRINGLISTMODEL </item>
<item> QT_NO_STYLE_CDE </item>
<item> QT_NO_STYLE_CLEANLOOKS </item>
<item> QT_NO_STYLE_GTK </item>
<item> QT_NO_STYLE_PLASTIQUE </item>
<item> QT_NO_STYLE_S60 </item>
<item> QT_NO_STYLE_STYLESHEET </item>
<item> QT_NO_STYLE_WINDOWSCE </item>
<item> QT_NO_STYLE_WINDOWSMOBILE </item>
<item> QT_NO_STYLE_WINDOWSVISTA </item>
<item> QT_NO_STYLE_WINDOWSXP </item>
<item> QT_NO_SVG </item>
<item> QT_NO_SVGGENERATOR </item>
<item> QT_NO_SVGRENDERER </item>
<item> QT_NO_SVGWIDGET </item>
<item> QT_NO_SXE </item>
<item> QT_NO_SYNTAXHIGHLIGHTER </item>
<item> QT_NO_SYSTEMSEMAPHORE </item>
<item> QT_NO_TABBAR </item>
<item> QT_NO_TABDIALOG </item>
<item> QT_NO_TABLET </item>
<item> QT_NO_TABLEVIEW </item>
<item> QT_NO_TABLEWIDGET </item>
<item> QT_NO_TABWIDGET </item>
<item> QT_NO_TEMPLATE_TEMPLATE_PARAMETERS </item>
<item> QT_NO_TEXTBROWSER </item>
<item> QT_NO_TEXTCODECPLUGIN </item>
<item> QT_NO_TEXTEDIT </item>
<item> QT_NO_TEXTODFWRITER </item>
<item> QT_NO_TOOLBAR </item>
<item> QT_NO_TOOLBOX </item>
<item> QT_NO_TOOLBUTTON </item>
<item> QT_NO_TRANSLATION_UTF8 </item>
<item> QT_NO_TREEVIEW </item>
<item> QT_NO_TREEWIDGET </item>
<item> QT_NO_UNDOGROUP </item>
<item> QT_NO_UNDOSTACK </item>
<item> QT_NO_UNDOVIEW </item>
<item> QT_NO_WARNINGS </item>
<item> QT_NO_WEBKIT </item>
<item> QT_NO_WHATSTHIS </item>
<item> QT_NO_WIN_ACTIVEQT </item>
<item> QT_NO_WIZARD </item>
<item> QT_NO_WORKSPACE </item>
<item> QT_NO_XCURSOR </item>
<item> QT_NO_XFIXES </item>
<item> QT_NO_XINERAMA </item>
<item> QT_NO_XINPUT </item>
<item> QT_NO_XKB </item>
<item> QT_NO_XMLPATTERNS </item>
<item> QT_NO_XMLSTREAMREADER </item>
<item> QT_NO_XMLSTREAMWRITER </item>
<item> QT_NO_XRANDR </item>
<item> QT_NO_XRENDER </item>
<item> QT_NO_XSYNC </item>
<item> QT_NO_XVIDEO </item>
<item> QT_NO_ZLIB </item>
<item> TQT_NO_ACCESSIBILITY </item>
<item> TQT_NO_ANIMATION </item>
<item> TQT_NO_ARM_EABI </item>
<item> TQT_NO_BEARERMANAGEMENT </item>
<item> TQT_NO_BUTTONGROUP </item>
<item> TQT_NO_CALENDARWIDGET </item>
<item> TQT_NO_CLIPBOARD </item>
<item> TQT_NO_CODECS </item>
<item> TQT_NO_COLORDIALOG </item>
<item> TQT_NO_COLUMNVIEW </item>
<item> TQT_NO_COMBOBOX </item>
<item> TQT_NO_COMPLETER </item>
<item> TQT_NO_CONCURRENT </item>
<item> TQT_NO_CONCURRENT_FILTER </item>
<item> TQT_NO_CONCURRENT_MAP </item>
<item> TQT_NO_CONTEXTMENU </item>
<item> TQT_NO_COP </item>
<item> TQT_NO_CRASHHANDLER </item>
<item> TQT_NO_CUPS </item>
<item> TQT_NO_DATAWIDGETMAPPER </item>
<item> TQT_NO_DATESTRING </item>
<item> TQT_NO_DATETIMEEDIT </item>
<item> TQT_NO_DBUS </item>
<item> TQT_NO_DEBUG </item>
<item> TQT_NO_DEBUG_STREAM </item>
<item> TQT_NO_DECLARATIVE </item>
<item> TQT_NO_DIAL </item>
<item> TQT_NO_DIRMODEL </item>
<item> TQT_NO_DOCKWIDGET </item>
<item> TQT_NO_DRAGANDDROP </item>
<item> TQT_NO_EGL </item>
<item> TQT_NO_ERRORMESSAGE </item>
<item> TQT_NO_EXCEPTIONS </item>
<item> TQT_NO_FILEDIALOG </item>
<item> TQT_NO_FILESYSTEMMODEL </item>
<item> TQT_NO_FONTCOMBOBOX </item>
<item> TQT_NO_FONTCONFIG </item>
<item> TQT_NO_FONTDIALOG </item>
<item> TQT_NO_FPU </item>
<item> TQT_NO_FSCOMPLETER </item>
<item> TQT_NO_FTP </item>
<item> TQT_NO_GETIFADDRS </item>
<item> TQT_NO_GRAPHICSEFFECT </item>
<item> TQT_NO_GRAPHICSSVGITEM </item>
<item> TQT_NO_GRAPHICSVIEW </item>
<item> TQT_NO_GSTREAMER </item>
<item> TQT_NO_HOSTINFO </item>
<item> TQT_NO_HTTP </item>
<item> TQT_NO_ICD </item>
<item> TQT_NO_IM </item>
<item> TQT_NO_IMAGEFORMAT_JPEG </item>
<item> TQT_NO_IMAGEFORMAT_MNG </item>
<item> TQT_NO_IMAGEFORMAT_PNG </item>
<item> TQT_NO_IMAGEFORMAT_TIFF </item>
<item> TQT_NO_IMAGEFORMAT_XPM </item>
<item> TQT_NO_INPUTDIALOG </item>
<item> TQT_NO_ITEMVIEWS </item>
<item> TQT_NO_LIBRARY </item>
<item> TQT_NO_LISTVIEW </item>
<item> TQT_NO_LISTWIDGET </item>
<item> TQT_NO_LPR </item>
<item> TQT_NO_MAINWINDOW </item>
<item> TQT_NO_MDIAREA </item>
<item> TQT_NO_MENU </item>
<item> TQT_NO_MENUBAR </item>
<item> TQT_NO_MITSHM </item>
<item> TQT_NO_MULTIMEDIA </item>
<item> TQT_NO_NAS </item>
<item> TQT_NO_NETWORKDISKCACHE </item>
<item> TQT_NO_OPENGL </item>
<item> TQT_NO_OPENVG </item>
<item> TQT_NO_PAINT_DEBUG </item>
<item> TQT_NO_PHONON </item>
<item> TQT_NO_PHONON_EFFECTWIDGET </item>
<item> TQT_NO_PHONON_PLATFORMPLUGIN </item>
<item> TQT_NO_PHONON_SEEKSLIDER </item>
<item> TQT_NO_PHONON_SETTINGSGROUP </item>
<item> TQT_NO_PHONON_VIDEOPLAYER </item>
<item> TQT_NO_PHONON_VOLUMEFADEREFFECT </item>
<item> TQT_NO_PHONON_VOLUMESLIDER </item>
<item> TQT_NO_PRINTDIALOG </item>
<item> TQT_NO_PRINTER </item>
<item> TQT_NO_PRINTPREVIEWDIALOG </item>
<item> TQT_NO_PRINTPREVIEWWIDGET </item>
<item> TQT_NO_PROCESS </item>
<item> TQT_NO_PROGRESSDIALOG </item>
<item> TQT_NO_PROXYMODEL </item>
<item> TQT_NO_PULSEAUDIO </item>
<item> TQT_NO_QDEBUG_MACRO </item>
<item> TQT_NO_QFUTURE </item>
<item> TQT_NO_QWARNING_MACRO </item>
<item> TQT_NO_QWS_CURSOR </item>
<item> TQT_NO_QWS_DECORATION_STYLED </item>
<item> TQT_NO_QWS_DECORATION_WINDOWS </item>
<item> TQT_NO_QWS_DYNAMICSCREENTRANSFORMATION </item>
<item> TQT_NO_QWS_INPUTMETHODS </item>
<item> TQT_NO_QWS_MANAGER </item>
<item> TQT_NO_QWS_MULTIPROCESS </item>
<item> TQT_NO_QWS_SOUNDSERVER </item>
<item> TQT_NO_QWS_TRANSFORMED </item>
<item> TQT_NO_QWS_VNC </item>
<item> TQT_NO_RAWFONT </item>
<item> TQT_NO_S60 </item>
<item> TQT_NO_SCRIPT </item>
<item> TQT_NO_SCRIPTTOOLS </item>
<item> TQT_NO_SCROLLAREA </item>
<item> TQT_NO_SCROLLBAR </item>
<item> TQT_NO_SESSIONMANAGER </item>
<item> TQT_NO_SHAPE </item>
<item> TQT_NO_SHAREDMEMORY </item>
<item> TQT_NO_SOCKS5 </item>
<item> TQT_NO_SOFTKEYMANAGER </item>
<item> TQT_NO_SORTFILTERPROXYMODEL </item>
<item> TQT_NO_SPINBOX </item>
<item> TQT_NO_SPLITTER </item>
<item> TQT_NO_STANDARDITEMMODEL </item>
<item> TQT_NO_STATEMACHINE </item>
<item> TQT_NO_STL_WCHAR </item>
<item> TQT_NO_STRINGLISTMODEL </item>
<item> TQT_NO_STYLE_CDE </item>
<item> TQT_NO_STYLE_CLEANLOOKS </item>
<item> TQT_NO_STYLE_GTK </item>
<item> TQT_NO_STYLE_PLASTIQUE </item>
<item> TQT_NO_STYLE_S60 </item>
<item> TQT_NO_STYLE_STYLESHEET </item>
<item> TQT_NO_STYLE_WINDOWSCE </item>
<item> TQT_NO_STYLE_WINDOWSMOBILE </item>
<item> TQT_NO_STYLE_WINDOWSVISTA </item>
<item> TQT_NO_STYLE_WINDOWSXP </item>
<item> TQT_NO_SVG </item>
<item> TQT_NO_SVGGENERATOR </item>
<item> TQT_NO_SVGRENDERER </item>
<item> TQT_NO_SVGWIDGET </item>
<item> TQT_NO_SXE </item>
<item> TQT_NO_SYNTAXHIGHLIGHTER </item>
<item> TQT_NO_SYSTEMSEMAPHORE </item>
<item> TQT_NO_TABBAR </item>
<item> TQT_NO_TABDIALOG </item>
<item> TQT_NO_TABLET </item>
<item> TQT_NO_TABLEVIEW </item>
<item> TQT_NO_TABLEWIDGET </item>
<item> TQT_NO_TABWIDGET </item>
<item> TQT_NO_TEMPLATE_TEMPLATE_PARAMETERS </item>
<item> TQT_NO_TEXTBROWSER </item>
<item> TQT_NO_TEXTCODECPLUGIN </item>
<item> TQT_NO_TEXTEDIT </item>
<item> TQT_NO_TEXTODFWRITER </item>
<item> TQT_NO_TOOLBAR </item>
<item> TQT_NO_TOOLBOX </item>
<item> TQT_NO_TOOLBUTTON </item>
<item> TQT_NO_TRANSLATION_UTF8 </item>
<item> TQT_NO_TREEVIEW </item>
<item> TQT_NO_TREEWIDGET </item>
<item> TQT_NO_UNDOGROUP </item>
<item> TQT_NO_UNDOSTACK </item>
<item> TQT_NO_UNDOVIEW </item>
<item> TQT_NO_WARNINGS </item>
<item> TQT_NO_WEBKIT </item>
<item> TQT_NO_WHATSTHIS </item>
<item> TQT_NO_WIN_ACTIVEQT </item>
<item> TQT_NO_WIZARD </item>
<item> TQT_NO_WORKSPACE </item>
<item> TQT_NO_XCURSOR </item>
<item> TQT_NO_XFIXES </item>
<item> TQT_NO_XINERAMA </item>
<item> TQT_NO_XINPUT </item>
<item> TQT_NO_XKB </item>
<item> TQT_NO_XMLPATTERNS </item>
<item> TQT_NO_XMLSTREAMREADER </item>
<item> TQT_NO_XMLSTREAMWRITER </item>
<item> TQT_NO_XRANDR </item>
<item> TQT_NO_XRENDER </item>
<item> TQT_NO_XSYNC </item>
<item> TQT_NO_XVIDEO </item>
<item> TQT_NO_ZLIB </item>
<item> QT_PACKAGEDATE_STR </item>
<item> QT_PACKAGE_TAG </item>
<item> QT_POINTER_SIZE </item>

+ 2
- 2
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();

+ 2
- 2
tdecore/tdeapplication.cpp 查看文件

@@ -64,7 +64,7 @@
#include <tqstylefactory.h>
#include <tqmetaobject.h>
#include <tqimage.h>
#ifndef QT_NO_SQL
#ifndef TQT_NO_SQL
#include <tqsqlpropertymap.h>
#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;

+ 1
- 1
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}"
)


+ 1
- 1
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


+ 1
- 1
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 )

+ 2
- 2
tdecore/tdemultipledrag.h 查看文件

@@ -20,7 +20,7 @@
#ifndef TDEMULTIPLEDRAG_H
#define TDEMULTIPLEDRAG_H

#ifndef QT_NO_DRAGANDDROP
#ifndef TQT_NO_DRAGANDDROP

#include <tqdragobject.h>
#include <tqvaluelist.h>
@@ -100,6 +100,6 @@ private:
KMultipleDragPrivate* d;
};

#endif // QT_NO_DRAGANDDROP
#endif // TQT_NO_DRAGANDDROP

#endif // TDEMULTIPLEDRAG_H

+ 2
- 2
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

+ 7
- 7
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 );

+ 7
- 7
tdehtml/tdehtml_part.cpp 查看文件

@@ -93,7 +93,7 @@ using namespace DOM;
#include <kurldrag.h>
#include <tdeapplication.h>
#include <tdeparts/browserinterface.h>
#if !defined(QT_NO_DRAGANDDROP)
#if !defined(TQT_NO_DRAGANDDROP)
#include <tdemultipledrag.h>
#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()));

+ 7
- 7
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)
{

+ 2
- 2
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

+ 2
- 2
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 <private/qfontengine_p.h>
#include <tqfontdatabase.h>
#include <tqfont.h>

+ 1
- 1
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 .


+ 1
- 1
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
}

+ 4
- 4
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<TQCString>& 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.

+ 10
- 10
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 <tqhbox.h>
@@ -48,11 +48,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqradiobutton.h>
#include <tqvbuttongroup.h>

#ifndef QT_NO_TOOLTIP
#ifndef TQT_NO_TOOLTIP
#include <tqtooltip.h>
#endif

#ifndef QT_NO_WHATSTHIS
#ifndef TQT_NO_WHATSTHIS
#include <tqwhatsthis.h>
#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. "
"<em>(see WebBrowsing/Cookies in the Control Center)</em>." ) );
#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
}

+ 2
- 2
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 );

+ 1
- 1
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 );

+ 2
- 2
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<TDEIconView *>(iconView());

#ifndef QT_NO_PICTURE
#ifndef TQT_NO_PICTURE
if ( picture() ) {
TQPicture *pic = picture();
if ( isSelected() ) {

+ 1
- 1
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 )

+ 2
- 2
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


+ 2
- 2
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 )

+ 2
- 2
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


+ 1
- 1
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();

Loading…
取消
儲存