Browse Source

qt -> tqt conversion:

QT_NO_ASCII_CAST -> TQT_NO_ASCII_CAST
QT_NO_STL -> TQT_NO_STL
QT_NO_COMPAT -> TQT_NO_COMPAT
QT_NO_TRANSLATION -> TQT_NO_TRANSLATION

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/4/head
Michele Calgaro 11 months ago
parent
commit
89389861b3
Signed by: Michele Calgaro <michele.calgaro@yahoo.it> GPG Key ID: 2A75B7CA8ADED5CF

+ 2
- 2
kate/data/qt4.xml View File

@@ -306,7 +306,7 @@
<item> QT_NO_SPLITTER </item>
<item> QT_NO_STANDARDITEMMODEL </item>
<item> QT_NO_STATEMACHINE </item>
<item> QT_NO_STL_WCHAR </item>
<item> TQT_NO_STL_WCHAR </item>
<item> QT_NO_STRINGLISTMODEL </item>
<item> QT_NO_STYLE_CDE </item>
<item> QT_NO_STYLE_CLEANLOOKS </item>
@@ -339,7 +339,7 @@
<item> QT_NO_TOOLBAR </item>
<item> QT_NO_TOOLBOX </item>
<item> QT_NO_TOOLBUTTON </item>
<item> QT_NO_TRANSLATION_UTF8 </item>
<item> TQT_NO_TRANSLATION_UTF8 </item>
<item> QT_NO_TREEVIEW </item>
<item> QT_NO_TREEWIDGET </item>
<item> QT_NO_UNDOGROUP </item>

+ 2
- 2
tdecore/tdeapplication.cpp View File

@@ -32,7 +32,7 @@
// #error tqtranslator.h was already included
// #endif // TQTRANSLATOR_H

#undef QT_NO_TRANSLATION
#undef TQT_NO_TRANSLATION
#undef TQT_NO_TRANSLATION
#include <tqtranslator.h>

@@ -43,7 +43,7 @@
#include "tdeapplication.h"
#undef TDEAPPLICATION_BINARY_COMPAT_HACK

#define QT_NO_TRANSLATION
#define TQT_NO_TRANSLATION
#define TQT_NO_TRANSLATION
#include <tqdir.h>
#include <tqptrcollection.h>

+ 2
- 2
tdeio/tests/dataprotocoltest.cpp View File

@@ -5,8 +5,8 @@
// invoke "make test" to generate the binary outside KDE CVS

// fix the symptoms, not the illness ;-)
#ifdef QT_NO_ASCII_CAST
# undef QT_NO_ASCII_CAST
#ifdef TQT_NO_ASCII_CAST
# undef TQT_NO_ASCII_CAST
#endif

#ifdef DATAKIOSLAVE

+ 1
- 1
tdespell2/Makefile.am View File

@@ -3,7 +3,7 @@ METASOURCES = AUTO

noinst_LTLIBRARIES = libtdespell2base.la

AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT -I$(top_srcdir)/tdeutils $(all_includes)
AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_COMPAT -I$(top_srcdir)/tdeutils $(all_includes)

tdespell2baseincludedir = $(includedir)/tdespell2


+ 1
- 1
tdespell2/tests/Makefile.am View File

@@ -1,4 +1,4 @@
AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT -I$(top_srcdir)/tdespell2 -I$(top_srcdir)/tdespell2/ui $(all_includes)
AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_COMPAT -I$(top_srcdir)/tdespell2 -I$(top_srcdir)/tdespell2/ui $(all_includes)
METASOURCES = AUTO



+ 1
- 1
tdespell2/ui/Makefile.am View File

@@ -4,7 +4,7 @@ lib_LTLIBRARIES = libtdespell2.la
# Put most of the code in a noinst lib, for the unit tests to be able to use internal classes.
noinst_LTLIBRARIES = libtdespell2_noinst.la

KDE_CXXFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT
KDE_CXXFLAGS = -DKDE_NO_COMPAT -DTQT_NO_COMPAT
INCLUDES = -I$(top_srcdir)/tdespell2 $(all_includes)

tdespell2includedir = $(includedir)/tdespell2

+ 1
- 1
tdestyles/keramik/CMakeLists.txt View File

@@ -10,7 +10,7 @@
#################################################

add_definitions(
-UQT_NO_ASCII_CAST
-UTQT_NO_ASCII_CAST
-DQT_PLUGIN
)


+ 1
- 1
tdestyles/keramik/Makefile.am View File

@@ -2,7 +2,7 @@ AM_CPPFLAGS = -DQT_PLUGIN

INCLUDES = -I$(top_srcdir)/tdefx $(all_includes)
# qembed's output needs that...
KDE_CXXFLAGS = -UQT_NO_ASCII_CAST
KDE_CXXFLAGS = -UTQT_NO_ASCII_CAST
noinst_HEADERS = keramik.h pixmaploader.h keramikimage.h bitmaps.h gradients.h colorutil.h
kde_style_LTLIBRARIES = keramik.la
keramik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module

+ 2
- 2
tdewallet/tests/CMakeLists.txt View File

@@ -26,8 +26,8 @@ link_directories(

add_definitions (
-DKDE_NO_COMPAT
-DQT_NO_COMPAT
-DQT_NO_ASCII_CAST
-DTQT_NO_COMPAT
-DTQT_NO_ASCII_CAST
)

tde_add_check_executable( tdewalletsync AUTOMOC LINK tdewalletclient-shared )

+ 1
- 1
tdewallet/tests/Makefile.am View File

@@ -1,4 +1,4 @@
AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT -DQT_NO_ASCII_CAST $(all_includes)
AM_CPPFLAGS = -DKDE_NO_COMPAT -DTQT_NO_COMPAT -DTQT_NO_ASCII_CAST $(all_includes)

METASOURCES = AUTO
check_PROGRAMS = tdewalletasync tdewalletsync tdewalletboth

+ 1
- 1
win/pro_files/tdemdi/test/test.pro View File

@@ -9,7 +9,7 @@ CONFIG -= windows
CONFIG += debug
CONFIG += console

unix:DEFINES = NO_INCLUDE_MOCFILES QT_NO_COMPAT
unix:DEFINES = NO_INCLUDE_MOCFILES TQT_NO_COMPAT
unix:LIBS += -ltdemdi -L$(TDEDIR)/lib -ltdecore -ltdeui -lDCOP -ltdeparts
unix:INCLUDEPATH += . .. $(TDEDIR)/include


+ 1
- 1
win/tdelibs_global_win.h View File

@@ -136,7 +136,7 @@ typedef int mode_t;
# endif

//operator (char*) caused errors
//#define QT_NO_ASCII_CAST
//#define TQT_NO_ASCII_CAST

/* warning C4150: deletion of pointer to incomplete type 'type'; no destructor called


Loading…
Cancel
Save