From 01af686382f4f661407988d918292ccfbafd9273 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:34:37 -0600 Subject: [PATCH] Remove additional unneeded tq method conversions --- .../conversion_scripts/convert_qt_itself | 36 +++++++++---------- .../conversion_scripts/convert_qt_itself10 | 22 ++++++------ .../conversion_scripts/convert_qt_itself5 | 6 ++-- .../conversion_scripts/convert_qt_itself9 | 24 ++++++------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/tqtinterface/conversion_scripts/convert_qt_itself b/tqtinterface/conversion_scripts/convert_qt_itself index d3bb3c4..e8f8f79 100755 --- a/tqtinterface/conversion_scripts/convert_qt_itself +++ b/tqtinterface/conversion_scripts/convert_qt_itself @@ -78,7 +78,7 @@ find ./ -type f -iname "*" -exec sed -i 's/qRgba/tqRgba/g' {} \; find ./ -type f -iname "*" -exec sed -i 's/qGray/tqGray/g' {} \; find ./ -type f -iname "*" -exec sed -i 's/qCompress/tqCompress/g' {} \; find ./ -type f -iname "*" -exec sed -i 's/qInstallMsgHandler/tqInstallMsgHandler/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/parentWidget/tqparentWidget/g' {} \; + find ./ -type f -iname "*" -exec sed -i 's/qAppName/tqAppName/g' {} \; find ./ -type f -iname "*" -exec sed -i 's/qApp/tqApp/g' {} \; @@ -86,34 +86,30 @@ find ./ -type f -iname "*" -exec sed -i 's/ttq/tq/g' {} \; find ./ -type f -iname "*" -exec sed -i 's/ttq/tq/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/shape/tqshape/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/find/tqfind/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/children/tqchildren/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/parent/tqparent/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/mask/tqmask/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/contains/tqcontains/g' {} \; + + + + + + find ./ -type f -iname "*" -exec sed -i 's/unicode/tqunicode/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/replace/tqreplace/g' {} \; + find ./ -type f -iname "*" -exec sed -i 's/signals/tqsignals/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/slots/tqslots/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/geometry/tqgeometry/g' {} \; + + find ./ -type f -iname "*" -exec sed -i 's/layout/tqlayout/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/invalidate/tqinvalidate/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/alignment/tqalignment/g' {} \; -#find ./ -type f -iname "*" -exec sed -i 's/device/tqdevice/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/receivers/tqreceivers/g' {} \; @@ -123,16 +119,20 @@ find ./ -type f -iname "*" -exec sed -i 's/receivers/tqreceivers/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/repaint/tqrepaint/g' {} \; + + + + + find ./ -type f -iname "*" -exec sed -i 's/tqtq/tq/g' {} \; find ./ -type f -iname "*" -exec sed -i 's/tqtq/tq/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/retqparent/reparent/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/tqshape.h/shape.h/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/xtqshape.test/xshape.test/g' {} \; + + + find ./ -type f -iname "*" -exec sed -i 's/::mapper/::wmapper()/g' {} \; diff --git a/tqtinterface/conversion_scripts/convert_qt_itself10 b/tqtinterface/conversion_scripts/convert_qt_itself10 index 4585b21..d2fc532 100755 --- a/tqtinterface/conversion_scripts/convert_qt_itself10 +++ b/tqtinterface/conversion_scripts/convert_qt_itself10 @@ -88,25 +88,25 @@ find ./ -type f -iname "*.ui" -exec sed -i 's/TQLAYOUTWIDGET_OBJECT_NAME_STRING/ find ./ -type f -iname "*.ui" -exec sed -i 's/TQMOTIFPLUSSTYLE_OBJECT_NAME_STRING/\"TQMotifPlusStyle\"/g' {} \; # Undo a few other problems -find ./ -type f -iname "*" -exec sed -i 's/tqrepaint\([_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]\)/repaint\1/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/tqinvalidate\([_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]\)/invalidate\1/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/tqparent\([_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]\)/parent\1/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/tqmask\([_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]\)/mask\1/g' {} \; + + + + find ./ -type f -iname "*" -exec sed -i 's/tqlayout\([_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]\)/layout\1/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/tqalignment\([_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]\)/alignment\1/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/tqgeometry\([_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]\)/geometry\1/g' {} \; + + find ./ -type f -iname "*" -exec sed -i 's/layoutengine_p\.h/tqlayoutengine_p\.h/g' {} \; find ./ -type f -iname "*" -exec sed -i 's/Qt::Orientation\"/Orientation\"/g' {} \; # Undo some of the original changes that are no longer needed -find ./ -type f -iname "*" -exec sed -i 's/tqfind/find/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/tqreplace/replace/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/tqcontains/contains/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/tqparent/parent/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/tqmask/mask/g' {} \; + + + + + diff --git a/tqtinterface/conversion_scripts/convert_qt_itself5 b/tqtinterface/conversion_scripts/convert_qt_itself5 index db4f735..57a472a 100755 --- a/tqtinterface/conversion_scripts/convert_qt_itself5 +++ b/tqtinterface/conversion_scripts/convert_qt_itself5 @@ -11,7 +11,7 @@ find ./ -type f -iname "*" -exec sed -i 's/TQt::Qt::/Qt::/g' {} \; find ./ -type f -iname "*" -exec sed -i 's/Qt::Qt::/Qt::/g' {} \; find ./ -type f -iname "*" -exec sed -i 's/tqtqlayout\.h/tqlayout\.h/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/_tqparent/_parent/g' {} \; + find ./ -type f -iname "*" -exec sed -i 's/_tqlayout/_layout/g' {} \; find ./ -type f -iname "*" -exec sed -i 's/[ ,(]Horizontal/Qt::Horizontal/g' {} \; @@ -37,7 +37,7 @@ find ./ -type f -iname "*" -exec sed -i 's/TQUANT/QUANT/g' {} \; find ./ -type f -iname "*" -exec sed -i 's/FRETQ/FREQ/g' {} \; find ./ -type f -iname "*" -exec sed -i 's/_SETQ_/_SEQ_/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/rtqfind/rfind/g' {} \; + find ./ -type f -iname "*" -exec sed -i 's/_ETQUAL/_EQUAL/g' {} \; find ./ -type f -iname "*" -exec sed -i 's/ComplexETQ/ComplexEQ/g' {} \; find ./ -type f -iname "*" -exec sed -i 's/STQRT/SQRT/g' {} \; @@ -52,4 +52,4 @@ find ./ -type f -iname "*" -exec sed -i 's/TQStringToTString/QStringToTString/g' find ./ -type f -iname "*" -exec sed -i 's/::qt_cast/::tqqt_cast/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/\"tqgeometry\"/\"geometry\"/g' {} \; + diff --git a/tqtinterface/conversion_scripts/convert_qt_itself9 b/tqtinterface/conversion_scripts/convert_qt_itself9 index 41f77c9..60885c8 100755 --- a/tqtinterface/conversion_scripts/convert_qt_itself9 +++ b/tqtinterface/conversion_scripts/convert_qt_itself9 @@ -2,28 +2,28 @@ find ./ -type f -iname "*" -exec sed -i 's/TQT_VERSION/\[\[\[TQT_VERSION IS DEPRECATED\]\]\]/g' {} \; find ./ -type f -iname "*" -exec sed -i 's/CONSETQUENTIAL/CONSEQUENTIAL/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/tqfind\./find\./g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/tqdevice\./device\./g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/tqfind\([abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_]\)/find\1/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/tqreplace\([abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_]\)/replace\1/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/tqcontains\([abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_]\)/contains\1/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/tqfind \([abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_]\)/find \1/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/tqreplace \([abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_]\)/replace \1/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/tqcontains \([abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_]\)/contains \1/g' {} \; + + + + + + + + find ./ -type f -iname "*" -exec sed -i 's/tqstatus\([abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_]\)/status\1/g' {} \; find ./ -type f -iname "*" -exec sed -i 's/qMakePair/tqMakePair/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/\.arg(/\.tqarg(/g' {} \; + find ./ -type f -iname "*" -exec sed -i 's/::clipboard()/::tqclipboard()/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/ranstqparent/ransparent/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/painttqdevice/paintdevice/g' {} \; + + find ./ -type f -iname "*" -exec sed -i 's/staticTQString/staticQString/g' {} \; -find ./ -type f -iname "*" -exec sed -i 's/utqmask/umask/g' {} \; + find ./ -type f -iname "*" -exec sed -i 's/TQGpgME/QGpgME/g' {} \; find ./ -type f -iname "*" -exec sed -i 's/xTQGantt/xQGantt/g' {} \; find ./ -type f -iname "*" -exec sed -i 's/TQSync/QSync/g' {} \;