TDE
/
tqtinterface
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tqtinterface
0
0
Fork 0
Code Issues Releases Wiki Activity

Replace Q_OBJECT with TQ_OBJECT

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/9/head
Michele Calgaro 10 months ago
parent d6c39b276a
commit abc07a72ce
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
10 changed files with 11 additions and 163 deletions
Show Stats Download Patch File Download Diff File

2
qtinterface/CMakeLists.txt
Unescape View File

@ -95,7 +95,6 @@ install( FILES
configure_file( ${IFACE}/tmoc.cmake tmoc @ONLY )
configure_file( uic-tqt.cmake uic-tqt @ONLY )
configure_file( tqt-replace-tqt3.cmake tqt-replace @ONLY )
configure_file( tqt-replace-stream-tqt3.cmake tqt-replace-stream @ONLY )
install( PROGRAMS
moc-tqt ${CMAKE_CURRENT_BINARY_DIR}/uic-tqt
@ -103,7 +102,6 @@ install( PROGRAMS
dcopidl2cpp-tqt convert_qt_tqt1 convert_qt_tqt2
convert_qt_tqt3 ${CMAKE_CURRENT_BINARY_DIR}/tmoc
${CMAKE_CURRENT_BINARY_DIR}/tqt-replace
${CMAKE_CURRENT_BINARY_DIR}/tqt-replace-stream
DESTINATION ${BIN_INSTALL_DIR} )

4
qtinterface/TODO
Unescape View File

@ -3,7 +3,7 @@ qaccessible
All headers that contain the keywork Q_OBJECT have been ported,
All headers that contain the keywork TQ_OBJECT have been ported,
exept for these due to *@#$ private functions
qclipboard
@ -19,7 +19,7 @@ qwidgetplugin (TQWidgetContainerPlugin, weird compilation failure)
And these that do not contain Q_OBJECT are failing:
And these that do not contain TQ_OBJECT are failing:
qasciicache
qasciidict

23
qtinterface/interface_tqt3/tmoc.cmake
Unescape View File

@ -4,21 +4,16 @@
# Very simple moc wrapper, for using with cmake
#
if [ -f @BIN_INSTALL_DIR@/tqt-replace-stream ]; then
if [ -z "$1" ]; then
echo "Usage: tmoc <input_file> -o <out_file>"
else
input_file="$1"
out_file="$3"
@BIN_INSTALL_DIR@/tqt-replace-stream "${input_file}" | \
@MOC_EXECUTABLE@ | \
sed "/#include <ntqmetaobject.h>/ i\\
if [ -z "$1" ]; then
echo "Usage: tmoc <input_file> -o <out_file>"
else
input_file="$1"
out_file="$3"
cat "${input_file}" | \
@MOC_EXECUTABLE@ | \
sed "/#include <ntqmetaobject.h>/ i\\
#undef TQT_NO_COMPAT\\
#include \"${input_file}\"\\
" \
> "${out_file}"
fi
else
echo "ERROR: @BIN_INSTALL_DIR@/tqt-replace-stream is not available. tmoc will fail!"
exit 1;
> "${out_file}"
fi

34
qtinterface/tqt-replace
Unescape View File

@ -1,34 +0,0 @@
#!/bin/bash
QT_VER=X
if [[ "$1" == "" ]]; then
echo "Usage: tqt-replace <input_file>"
else
sed -i 's/^TQ\([^T_]\)/Q\1/g' "$1"
sed -i 's/\([^_]\)TQ\([^T_]\)/\1Q\2/g' "$1"
sed -i 's/TQT\([^_]\)/QT\1/g' "$1"
sed -i 's/Q_SLOTS>/slots>/g' "$1"
sed -i 's/Q_SIGNALS>/signals>/g' "$1"
sed -i 's/Q\([^ _]*\)_OBJECT_NAME_STRING/TQ\1_OBJECT_NAME_STRING/g' "$1"
sed -i 's/tqApp/qApp/g' "$1"
sed -i 's/\([ \t]\)tq\([^:(_)\t ]\)/\1\2/g' "$1"
sed -i 's/TQ_PROPERTY/Q_PROPERTY/g' "$1"
sed -i 's/TQ_ENUMS/Q_ENUMS/g' "$1"
sed -i 's/TQ_SETS/Q_SETS/g' "$1"
sed -i 's/TQ_OVERRIDE/Q_OVERRIDE/g' "$1"
sed -i 's/TQ_CLASSINFO/Q_CLASSINFO/g' "$1"
sed -i 's/Qt::Orientation/Orientation/g' "$1"
sed -i 's/TQ_INT8/Q_INT8/g' "$1"
sed -i 's/TQ_INT16/Q_INT16/g' "$1"
sed -i 's/TQ_INT32/Q_INT32/g' "$1"
sed -i 's/TQ_INT64/Q_INT64/g' "$1"
sed -i 's/TQ_UINT8/Q_UINT8/g' "$1"
sed -i 's/TQ_UINT16/Q_UINT16/g' "$1"
sed -i 's/TQ_UINT32/Q_UINT32/g' "$1"
sed -i 's/TQ_UINT64/Q_UINT64/g' "$1"
sed -i 's/TQ_LONG/Q_LONG/g' "$1"
sed -i 's/TQ_LLONG/Q_LLONG/g' "$1"
sed -i 's/TQ_ULONG/Q_ULONG/g' "$1"
sed -i 's/TQ_ULLONG/Q_ULLONG/g' "$1"
exit 0
fi

32
qtinterface/tqt-replace-stream
Unescape View File

@ -1,32 +0,0 @@
#!/bin/bash
QT_VER=X
if [[ "$1" == "" ]]; then
echo "Usage: tqt-replace-stream <filename>"
else
cat "$1" | \
sed 's/^TQ\([^T_]\)/Q\1/g' | \
sed 's/\([^_]\)TQ\([^T_]\)/\1Q\2/g' | \
sed 's/TQT\([^_]\)/QT\1/g' | \
sed 's/Q\([^ _]*\)_OBJECT_NAME_STRING/TQ\1_OBJECT_NAME_STRING/g' | \
sed 's/tqApp/qApp/g' | \
sed 's/\([ \t]\)tq\([^:(_)\t ]\)/\1\2/g' | \
sed 's/TQ_PROPERTY/Q_PROPERTY/g' | \
sed 's/TQ_ENUMS/Q_ENUMS/g' | \
sed 's/TQ_SETS/Q_SETS/g' | \
sed 's/TQ_OVERRIDE/Q_OVERRIDE/g' | \
sed 's/TQ_CLASSINFO/Q_CLASSINFO/g' | \
sed 's/Qt::Orientation/Orientation/g' | \
sed 's/TQ_INT8/Q_INT8/g' | \
sed 's/TQ_INT16/Q_INT16/g' | \
sed 's/TQ_INT32/Q_INT32/g' | \
sed 's/TQ_INT64/Q_INT64/g' | \
sed 's/TQ_UINT8/Q_UINT8/g' | \
sed 's/TQ_UINT16/Q_UINT16/g' | \
sed 's/TQ_UINT32/Q_UINT32/g' | \
sed 's/TQ_UINT64/Q_UINT64/g' | \
sed 's/TQ_LONG/Q_LONG/g' | \
sed 's/TQ_LLONG/Q_LLONG/g' | \
sed 's/TQ_ULONG/Q_ULONG/g' | \
sed 's/TQ_ULLONG/Q_ULLONG/g'
fi

8
qtinterface/tqt-replace-stream-tqt3.cmake
Unescape View File

@ -1,8 +0,0 @@
#!/bin/bash
QT_VERSION=@QT_VERSION@
if [[ "$1" == "" ]]; then
echo "Usage: tqt-replace-stream <filename>"
else
cat "$1" | sed 's/^Q_OBJECT/TQ_OBJECT/g' | sed 's/\([^T]\)Q_OBJECT/\1TQ_OBJECT/g'
fi

32
qtinterface/tqt-replace-stream.cmake
Unescape View File

@ -1,32 +0,0 @@
#!/bin/bash
QT_VERSION=@QT_VERSION@
if [[ "$1" == "" ]]; then
echo "Usage: tqt-replace-stream <filename>"
else
cat "$1" | \
sed 's/^TQ\([^T_]\)/Q\1/g' | \
sed 's/\([^_]\)TQ\([^T_]\)/\1Q\2/g' | \
sed 's/TQT\([^_]\)/QT\1/g' | \
sed 's/Q\([^ _]*\)_OBJECT_NAME_STRING/TQ\1_OBJECT_NAME_STRING/g' | \
sed 's/tqApp/qApp/g' | \
sed 's/\([ \t]\)tq\([^:(_)\t ]\)/\1\2/g' | \
sed 's/TQ_PROPERTY/Q_PROPERTY/g' | \
sed 's/TQ_ENUMS/Q_ENUMS/g' | \
sed 's/TQ_SETS/Q_SETS/g' | \
sed 's/TQ_OVERRIDE/Q_OVERRIDE/g' | \
sed 's/TQ_CLASSINFO/Q_CLASSINFO/g' | \
sed 's/Qt::Orientation/Orientation/g' | \
sed 's/TQ_INT8/Q_INT8/g' | \
sed 's/TQ_INT16/Q_INT16/g' | \
sed 's/TQ_INT32/Q_INT32/g' | \
sed 's/TQ_INT64/Q_INT64/g' | \
sed 's/TQ_UINT8/Q_UINT8/g' | \
sed 's/TQ_UINT16/Q_UINT16/g' | \
sed 's/TQ_UINT32/Q_UINT32/g' | \
sed 's/TQ_UINT64/Q_UINT64/g' | \
sed 's/TQ_LONG/Q_LONG/g' | \
sed 's/TQ_LLONG/Q_LLONG/g' | \
sed 's/TQ_ULONG/Q_ULONG/g' | \
sed 's/TQ_ULLONG/Q_ULLONG/g'
fi

2
qtinterface/tqt-replace-tqt3.cmake
Unescape View File

@ -6,7 +6,5 @@ if [[ "$1" == "" ]]; then
else
sed -i 's/Q_SLOTS>/slots>/g' "$1"
sed -i 's/Q_SIGNALS>/signals>/g' "$1"
sed -i 's/^Q_OBJECT/TQ_OBJECT/g' "$1"
sed -i 's/\([^T]\)Q_OBJECT/\1TQ_OBJECT/g' "$1"
exit 0
fi

34
qtinterface/tqt-replace.cmake
Unescape View File

@ -1,34 +0,0 @@
#!/bin/bash
QT_VERSION=@QT_VERSION@
if [[ "$1" == "" ]]; then
echo "Usage: tqt-replace <input_file>"
else
sed -i 's/^TQ\([^T_]\)/Q\1/g' "$1"
sed -i 's/\([^_]\)TQ\([^T_]\)/\1Q\2/g' "$1"
sed -i 's/TQT\([^_]\)/QT\1/g' "$1"
sed -i 's/Q_SLOTS>/slots>/g' "$1"
sed -i 's/Q_SIGNALS>/signals>/g' "$1"
sed -i 's/Q\([^ _]*\)_OBJECT_NAME_STRING/TQ\1_OBJECT_NAME_STRING/g' "$1"
sed -i 's/tqApp/qApp/g' "$1"
sed -i 's/\([ \t]\)tq\([^:(_)\t ]\)/\1\2/g' "$1"
sed -i 's/TQ_PROPERTY/Q_PROPERTY/g' "$1"
sed -i 's/TQ_ENUMS/Q_ENUMS/g' "$1"
sed -i 's/TQ_SETS/Q_SETS/g' "$1"
sed -i 's/TQ_OVERRIDE/Q_OVERRIDE/g' "$1"
sed -i 's/TQ_CLASSINFO/Q_CLASSINFO/g' "$1"
sed -i 's/Qt::Orientation/Orientation/g' "$1"
sed -i 's/TQ_INT8/Q_INT8/g' "$1"
sed -i 's/TQ_INT16/Q_INT16/g' "$1"
sed -i 's/TQ_INT32/Q_INT32/g' "$1"
sed -i 's/TQ_INT64/Q_INT64/g' "$1"
sed -i 's/TQ_UINT8/Q_UINT8/g' "$1"
sed -i 's/TQ_UINT16/Q_UINT16/g' "$1"
sed -i 's/TQ_UINT32/Q_UINT32/g' "$1"
sed -i 's/TQ_UINT64/Q_UINT64/g' "$1"
sed -i 's/TQ_LONG/Q_LONG/g' "$1"
sed -i 's/TQ_LLONG/Q_LLONG/g' "$1"
sed -i 's/TQ_ULONG/Q_ULONG/g' "$1"
sed -i 's/TQ_ULLONG/Q_ULLONG/g' "$1"
exit 0
fi

3
qtinterface/tqt.h.cmake
Unescape View File

@ -54,9 +54,6 @@ Boston, MA 02110-1301, USA.
#endif /* Q_WS_X11 */
#define Qt TQt
#ifndef TQT_NO_COMPAT_NAMES
#define Q_OBJECT TQ_OBJECT
#endif /* TQT_NO_COMPAT_NAMES */
#define TQ_INLINE_TEMPLATES Q_INLINE_TEMPLATES
#define TQ_DUMMY_COMPARISON_OPERATOR Q_DUMMY_COMPARISON_OPERATOR

Write Preview
Loading…
Cancel
Save