summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2018-09-27 17:59:04 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2018-09-27 17:59:04 +0900
commit89389861b375ade194e7a8bd5b5b15e7f36cde2c (patch)
tree3603192ae2c41f9edff90914bfa3d97a798f477a
parent2518c29202d07d42d3220963b4596f5252e52937 (diff)
downloadtdelibs-89389861b375ade194e7a8bd5b5b15e7f36cde2c.tar.gz
tdelibs-89389861b375ade194e7a8bd5b5b15e7f36cde2c.zip
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>
-rw-r--r--kate/data/qt4.xml4
-rw-r--r--tdecore/tdeapplication.cpp4
-rw-r--r--tdeio/tests/dataprotocoltest.cpp4
-rw-r--r--tdespell2/Makefile.am2
-rw-r--r--tdespell2/tests/Makefile.am2
-rw-r--r--tdespell2/ui/Makefile.am2
-rw-r--r--tdestyles/keramik/CMakeLists.txt2
-rw-r--r--tdestyles/keramik/Makefile.am2
-rw-r--r--tdewallet/tests/CMakeLists.txt4
-rw-r--r--tdewallet/tests/Makefile.am2
-rw-r--r--win/pro_files/tdemdi/test/test.pro2
-rw-r--r--win/tdelibs_global_win.h2
12 files changed, 16 insertions, 16 deletions
diff --git a/kate/data/qt4.xml b/kate/data/qt4.xml
index 6ce265e3..06557e08 100644
--- a/kate/data/qt4.xml
+++ b/kate/data/qt4.xml
@@ -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>
diff --git a/tdecore/tdeapplication.cpp b/tdecore/tdeapplication.cpp
index d19b4d94..cae6b708 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 <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>
diff --git a/tdeio/tests/dataprotocoltest.cpp b/tdeio/tests/dataprotocoltest.cpp
index 2cdcf36d..ed0a63ed 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 00ee8a81..455b1f5c 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 362f5920..fc94843b 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 23399625..a2d3757d 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 ae536516..1d7bd62e 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 340f6041..c76269ea 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 a5f9435b..9c64ac9a 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 eacd9e95..085c0630 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 4a60cd71..62b30c18 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 8e7d39d9..06e31e06 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