From 89389861b375ade194e7a8bd5b5b15e7f36cde2c Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 27 Sep 2018 17:59:04 +0900 Subject: 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 --- kate/data/qt4.xml | 4 ++-- tdecore/tdeapplication.cpp | 4 ++-- tdeio/tests/dataprotocoltest.cpp | 4 ++-- tdespell2/Makefile.am | 2 +- tdespell2/tests/Makefile.am | 2 +- tdespell2/ui/Makefile.am | 2 +- tdestyles/keramik/CMakeLists.txt | 2 +- tdestyles/keramik/Makefile.am | 2 +- tdewallet/tests/CMakeLists.txt | 4 ++-- tdewallet/tests/Makefile.am | 2 +- win/pro_files/tdemdi/test/test.pro | 2 +- win/tdelibs_global_win.h | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/kate/data/qt4.xml b/kate/data/qt4.xml index 6ce265e35..06557e08f 100644 --- a/kate/data/qt4.xml +++ b/kate/data/qt4.xml @@ -306,7 +306,7 @@ QT_NO_SPLITTER QT_NO_STANDARDITEMMODEL QT_NO_STATEMACHINE - QT_NO_STL_WCHAR + TQT_NO_STL_WCHAR QT_NO_STRINGLISTMODEL QT_NO_STYLE_CDE QT_NO_STYLE_CLEANLOOKS @@ -339,7 +339,7 @@ QT_NO_TOOLBAR QT_NO_TOOLBOX QT_NO_TOOLBUTTON - QT_NO_TRANSLATION_UTF8 + TQT_NO_TRANSLATION_UTF8 QT_NO_TREEVIEW QT_NO_TREEWIDGET QT_NO_UNDOGROUP diff --git a/tdecore/tdeapplication.cpp b/tdecore/tdeapplication.cpp index d19b4d942..cae6b708d 100644 --- a/tdecore/tdeapplication.cpp +++ b/tdecore/tdeapplication.cpp @@ -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 @@ -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 #include diff --git a/tdeio/tests/dataprotocoltest.cpp b/tdeio/tests/dataprotocoltest.cpp index 2cdcf36d4..ed0a63ed9 100644 --- a/tdeio/tests/dataprotocoltest.cpp +++ b/tdeio/tests/dataprotocoltest.cpp @@ -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 diff --git a/tdespell2/Makefile.am b/tdespell2/Makefile.am index 00ee8a81d..455b1f5c5 100644 --- a/tdespell2/Makefile.am +++ b/tdespell2/Makefile.am @@ -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 diff --git a/tdespell2/tests/Makefile.am b/tdespell2/tests/Makefile.am index 362f59202..fc94843b5 100644 --- a/tdespell2/tests/Makefile.am +++ b/tdespell2/tests/Makefile.am @@ -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 diff --git a/tdespell2/ui/Makefile.am b/tdespell2/ui/Makefile.am index 233996251..a2d3757d3 100644 --- a/tdespell2/ui/Makefile.am +++ b/tdespell2/ui/Makefile.am @@ -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 diff --git a/tdestyles/keramik/CMakeLists.txt b/tdestyles/keramik/CMakeLists.txt index ae536516e..1d7bd62e8 100644 --- a/tdestyles/keramik/CMakeLists.txt +++ b/tdestyles/keramik/CMakeLists.txt @@ -10,7 +10,7 @@ ################################################# add_definitions( - -UQT_NO_ASCII_CAST + -UTQT_NO_ASCII_CAST -DQT_PLUGIN ) diff --git a/tdestyles/keramik/Makefile.am b/tdestyles/keramik/Makefile.am index 340f6041e..c76269eaf 100644 --- a/tdestyles/keramik/Makefile.am +++ b/tdestyles/keramik/Makefile.am @@ -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 diff --git a/tdewallet/tests/CMakeLists.txt b/tdewallet/tests/CMakeLists.txt index a5f9435be..9c64ac9af 100644 --- a/tdewallet/tests/CMakeLists.txt +++ b/tdewallet/tests/CMakeLists.txt @@ -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 ) diff --git a/tdewallet/tests/Makefile.am b/tdewallet/tests/Makefile.am index eacd9e958..085c0630e 100644 --- a/tdewallet/tests/Makefile.am +++ b/tdewallet/tests/Makefile.am @@ -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 diff --git a/win/pro_files/tdemdi/test/test.pro b/win/pro_files/tdemdi/test/test.pro index 4a60cd714..62b30c186 100644 --- a/win/pro_files/tdemdi/test/test.pro +++ b/win/pro_files/tdemdi/test/test.pro @@ -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 diff --git a/win/tdelibs_global_win.h b/win/tdelibs_global_win.h index 8e7d39d99..06e31e067 100644 --- a/win/tdelibs_global_win.h +++ b/win/tdelibs_global_win.h @@ -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 -- cgit v1.2.3