From d7401b1d182b94c4a849567aae7d4ef5580e0b6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 4 Mar 2014 04:19:00 +0100 Subject: [PATCH] Initial TQt conversion of katesort --- kate/katesort/acinclude.m4 | 48 ++++++++++++------------- kate/katesort/src/plugin_sort.cpp | 52 +++++++++++++-------------- kate/katesort/src/plugin_sort.h | 10 +++--- kate/katesort/src/sortdialog.cpp | 34 +++++++++--------- kate/katesort/src/sortdialog.h | 22 ++++++------ kate/katesort/src/sortdialoglayout.ui | 46 ++++++++++++------------ 6 files changed, 106 insertions(+), 106 deletions(-) diff --git a/kate/katesort/acinclude.m4 b/kate/katesort/acinclude.m4 index a0ff256..37a7f77 100644 --- a/kate/katesort/acinclude.m4 +++ b/kate/katesort/acinclude.m4 @@ -1060,7 +1060,7 @@ elif test "$kde_use_qt_emb" = "yes"; then x_includes="" x_libraries="" elif test "$kde_use_qt_mac" = "yes"; then - dnl We're using QT/Mac (I use QT_MAC so that qglobal.h doesn't *have* to + dnl We're using QT/Mac (I use QT_MAC so that ntqglobal.h doesn't *have* to dnl be included to get the information) --Sam CXXFLAGS="$CXXFLAGS -DQT_MAC -no-cpp-precomp" CFLAGS="$CFLAGS -DQT_MAC -no-cpp-precomp" @@ -1092,19 +1092,19 @@ AC_DEFUN([KDE_PRINT_QT_PROGRAM], AC_REQUIRE([KDE_USE_QT]) cat > conftest.$ac_ext < -#include +#include +#include EOF if test "$kde_qtver" = "2"; then cat >> conftest.$ac_ext < -#include -#include +#include +#include +#include EOF if test $kde_qtsubver -gt 0; then cat >> conftest.$ac_ext <> conftest.$ac_ext < -#include +#include +#include #include EOF fi @@ -1201,22 +1201,22 @@ fi if test -z "$3"; then if test $kde_qtver = 3; then if test $kde_qtsubver -gt 0; then - kde_qt_verstring="QT_VERSION >= 0x03@VER@00 && QT_VERSION < 0x040000" + kde_qt_verstring="TQT_VERSION >= 0x03@VER@00 && TQT_VERSION < 0x040000" qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'` kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"` else - kde_qt_verstring="QT_VERSION >= 300 && QT_VERSION < 0x040000" + kde_qt_verstring="TQT_VERSION >= 300 && TQT_VERSION < 0x040000" fi fi if test $kde_qtver = 2; then if test $kde_qtsubver -gt 0; then - kde_qt_verstring="QT_VERSION >= 222" + kde_qt_verstring="TQT_VERSION >= 222" else - kde_qt_verstring="QT_VERSION >= 200" + kde_qt_verstring="TQT_VERSION >= 200" fi fi if test $kde_qtver = 1; then - kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200" + kde_qt_verstring="TQT_VERSION >= 142 && TQT_VERSION < 200" fi else kde_qt_verstring="$3" @@ -1325,7 +1325,7 @@ AC_ARG_ENABLE( USING_QT_MT="" dnl ------------------------------------------------------------------------ -dnl If we not get --disable-qt-mt then adjust some vars for the host. +dnl If we not get --disable-tqt-mt then adjust some vars for the host. dnl ------------------------------------------------------------------------ KDE_MT_LDFLAGS= @@ -1383,7 +1383,7 @@ dnl ------------------------------------------------------------ fi dnl ------------------------------------------------------------------------ -dnl If we got --enable-qt-mt then adjust the Qt library name for the host. +dnl If we got --enable-tqt-mt then adjust the Qt library name for the host. dnl ------------------------------------------------------------------------ if test "x$kde_use_qt_mt" = "xyes"; then @@ -1449,9 +1449,9 @@ if test ! "$ac_qt_includes" = "NO"; then fi if test "$kde_qtver" != "1"; then - kde_qt_header=qstyle.h + kde_qt_header=ntqstyle.h else - kde_qt_header=qglobal.h + kde_qt_header=ntqglobal.h fi AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir) @@ -2034,7 +2034,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon, LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" AC_TRY_LINK([ - #include + #include ], [ QDomDocument doc; @@ -2595,7 +2595,7 @@ LIBS=`echo $LIBS | sed "s/$LIBJPEG//"` ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES" AC_TRY_LINK( -[#include ], +[#include ], [ int argc; char** argv; @@ -3439,7 +3439,7 @@ AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY], AC_TRY_COMPILE( [ -#include +#include #if Q_EXPORT - 0 != 0 /* if this compiles, then Q_EXPORT is undefined */ /* if Q_EXPORT is nonempty, this will break compilation */ @@ -4689,7 +4689,7 @@ CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes" AC_TRY_RUN(dnl [ #include -#include +#include int main() { QString t = "hallo"; t.fill('t'); @@ -5534,7 +5534,7 @@ if test "${with_qt_dir+set}" = set; then kde_qtdir="$with_qt_dir" fi -AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR) +AC_FIND_FILE(ntqsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR) AC_MSG_RESULT($QTDOCDIR) AC_SUBST(QTDOCDIR) @@ -5555,7 +5555,7 @@ AC_SUBST(DOXYGEN_PROJECT_NAME) AC_SUBST(DOXYGEN_PROJECT_NUMBER) KDE_HAS_DOXYGEN=no -if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/qsql.html; then +if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/ntqsql.html; then KDE_HAS_DOXYGEN=yes fi AC_SUBST(KDE_HAS_DOXYGEN) diff --git a/kate/katesort/src/plugin_sort.cpp b/kate/katesort/src/plugin_sort.cpp index f74213a..95f53c6 100644 --- a/kate/katesort/src/plugin_sort.cpp +++ b/kate/katesort/src/plugin_sort.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include class PluginView : public KXMLGUIClient { @@ -55,14 +55,14 @@ KatePluginFactory::~KatePluginFactory() delete s_instance; } -QObject* KatePluginFactory::createObject( QObject* parent, const char* name, const char*, const QStringList & ) +TQObject* KatePluginFactory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & ) { return new KatePluginSort( parent, name ); } KInstance* KatePluginFactory::s_instance = 0L; -KatePluginSort::KatePluginSort( QObject* parent, const char* name ) +KatePluginSort::KatePluginSort( TQObject* parent, const char* name ) : Kate::Plugin ( (Kate::Application*)parent, name ) { } @@ -120,13 +120,13 @@ void KatePluginSort::slotSort() if (! (sel_sc == 0 && (int) sel_ec == kv->getDoc()->lineLength(kv->getDoc()->selStartLine()))) { m_sortDialog.m_checkBoxByCol->setChecked(true); - m_sortDialog.m_lineEditStartCol->setText(QString::number(sel_sc,10)); - m_sortDialog.m_lineEditEndCol->setText(QString::number(sel_ec,10)); + m_sortDialog.m_lineEditStartCol->setText(TQString::number(sel_sc,10)); + m_sortDialog.m_lineEditEndCol->setText(TQString::number(sel_ec,10)); } } kv->getDoc()->clearSelection(); } - if (m_sortDialog.exec() == QDialog::Rejected) + if (m_sortDialog.exec() == TQDialog::Rejected) return; if (kv->getDoc()->selection().isEmpty()) @@ -142,15 +142,15 @@ void KatePluginSort::slotSort() sel_el-- ; // split string to lines - QStringMultiMap strMLines; // alphabetical sort multimap + TQStringMultiMap strMLines; // alphabetical sort multimap LongMultiMap longMLines; // numerical sort multimap // Map filling... - QString skey; - QString sdata; + TQString skey; + TQString sdata; int ikey, non_num_ind; - QRegExp rx("[^0-9]"); // Search regexp for not number character + TQRegExp rx("[^0-9]"); // Search regexp for not number character for (uint i = sel_sl; i <= sel_el; i++) { sdata = kv->getDoc()->textLine(i); @@ -159,22 +159,22 @@ void KatePluginSort::slotSort() { skey = skey.mid(m_sortDialog.m_lineEditStartCol->text().toInt() - 1, m_sortDialog.m_lineEditEndCol->text().toInt() - m_sortDialog.m_lineEditStartCol->text().toInt()); -// qDebug("skey: %s", skey.ascii()); +// tqDebug("skey: %s", skey.ascii()); } -// qDebug("\tLine: %d",i); -// qDebug("Key: %s, Line content: %s", skey.ascii(),sdata.ascii()); +// tqDebug("\tLine: %d",i); +// tqDebug("Key: %s, Line content: %s", skey.ascii(),sdata.ascii()); if (m_sortDialog.m_radioButtonAlphaSort->isChecked()) { if (m_sortDialog.m_checkBoxCase->isChecked()) { // Case sensitive sort - strMLines.insert(std::pair(skey ,sdata)); + strMLines.insert(std::pair(skey ,sdata)); } else { // Case insensitive sort - strMLines.insert(std::pair(skey.lower(), sdata)); + strMLines.insert(std::pair(skey.lower(), sdata)); } } else @@ -186,7 +186,7 @@ void KatePluginSort::slotSort() non_num_ind = skey.find(rx,0); if (non_num_ind != -1) { // beginning of key is number -// qDebug("non_num_ind: %d",non_num_ind); +// tqDebug("non_num_ind: %d",non_num_ind); skey.truncate(non_num_ind); } else @@ -194,8 +194,8 @@ void KatePluginSort::slotSort() skey = "0"; } } -// qDebug("Key: %s",skey.ascii()); - longMLines.insert(std::pair(skey.toLong(), sdata)); +// tqDebug("Key: %s",skey.ascii()); + longMLines.insert(std::pair(skey.toLong(), sdata)); } } @@ -204,12 +204,12 @@ void KatePluginSort::slotSort() kv->getDoc()->removeText(sel_sl,0,sel_el,kv->getDoc()->lineLength(sel_el)); // kv->updateView(false); - QStringMultiMap::iterator smit, smsit, emsit; + TQStringMultiMap::iterator smit, smsit, emsit; LongMultiMap::iterator lmit, slmit, elmit; bool fasc; uint i=sel_sl; // insert start line bool first=true; // First line flag - QString prevLine; // Store previous line (for unique purpose) + TQString prevLine; // Store previous line (for unique purpose) if (m_sortDialog.m_radioButtonAlphaSort->isChecked()) { @@ -233,13 +233,13 @@ void KatePluginSort::slotSort() { sdata = smit->second; skey = smit->first; -// qDebug("Key: %s, Line content: %s", skey.ascii(),sdata.ascii()); +// tqDebug("Key: %s, Line content: %s", skey.ascii(),sdata.ascii()); if (m_sortDialog.m_checkBoxUnique->isChecked()) { if ( prevLine.compare(sdata) != 0 || first ) //remove duplicities { -// qDebug("Inserting line: %d",i); +// tqDebug("Inserting line: %d",i); first = false; prevLine = sdata; kv->getDoc()->insertLine(i, sdata); @@ -249,7 +249,7 @@ void KatePluginSort::slotSort() else { prevLine = sdata; -// qDebug("Inserting line: %d",i); +// tqDebug("Inserting line: %d",i); kv->getDoc()->insertLine(i, sdata); i++; } // m_sortDialog.m_checkBoxUnique->isChecked() @@ -278,12 +278,12 @@ void KatePluginSort::slotSort() sdata = lmit->second; ikey = lmit->first; -// qDebug("Key: %d, Line content: %s", ikey,sdata.ascii()); +// tqDebug("Key: %d, Line content: %s", ikey,sdata.ascii()); if (m_sortDialog.m_checkBoxUnique->isChecked()) { if ( prevLine.compare(sdata) != 0 || first ) //remove duplicities { -// qDebug("Inserting line: %d",i); +// tqDebug("Inserting line: %d",i); first = false; prevLine = sdata; kv->getDoc()->insertLine(i, sdata); @@ -293,7 +293,7 @@ void KatePluginSort::slotSort() else { prevLine = sdata; -// qDebug("Inserting line: %d",i); +// tqDebug("Inserting line: %d",i); kv->getDoc()->insertLine(i, sdata); i++; } // m_sortDialog.m_checkBoxUnique->isChecked() diff --git a/kate/katesort/src/plugin_sort.h b/kate/katesort/src/plugin_sort.h index db3c093..f37dd86 100644 --- a/kate/katesort/src/plugin_sort.h +++ b/kate/katesort/src/plugin_sort.h @@ -44,7 +44,7 @@ class KatePluginFactory : public KLibFactory KatePluginFactory(); virtual ~KatePluginFactory(); - virtual QObject* createObject( QObject* parent = 0, const char* pname = 0, const char* name = "QObject", const QStringList &args = QStringList() ); + virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = "TQObject", const TQStringList &args = TQStringList() ); private: static KInstance* s_instance; @@ -55,7 +55,7 @@ class KatePluginSort : public Kate::Plugin, Kate::PluginViewInterface Q_OBJECT public: - KatePluginSort( QObject* parent = 0, const char* name = 0 ); + KatePluginSort( TQObject* parent = 0, const char* name = 0 ); virtual ~KatePluginSort(); void addView (Kate::MainWindow *win); @@ -65,9 +65,9 @@ class KatePluginSort : public Kate::Plugin, Kate::PluginViewInterface void slotSort(); private: - QPtrList m_views; - typedef std::multimap QStringMultiMap; - typedef std::multimap LongMultiMap; + TQPtrList m_views; + typedef std::multimap TQStringMultiMap; + typedef std::multimap LongMultiMap; }; #endif // _PLUGIN_SORT_H_ diff --git a/kate/katesort/src/sortdialog.cpp b/kate/katesort/src/sortdialog.cpp index d46746b..0ebaed8 100644 --- a/kate/katesort/src/sortdialog.cpp +++ b/kate/katesort/src/sortdialog.cpp @@ -21,34 +21,34 @@ #include "sortdialog.h" #include "kconfig.h" -#include +#include -SortDialog::SortDialog ( QWidget* parent, const char* name, bool modal, WFlags fl ) +SortDialog::SortDialog ( TQWidget* parent, const char* name, bool modal, WFlags fl ) : sortdialoglayout ( parent,name, modal,fl ) { // set labels - QWhatsThis::add(m_radioButtonAsc,i18n( + TQWhatsThis::add(m_radioButtonAsc,i18n( "Sort in ascending order " "(from A to Z or 0 to 9).")); - QWhatsThis::add(m_radioButtonDesc,i18n( + TQWhatsThis::add(m_radioButtonDesc,i18n( "Sort in descending order " "(from Z to A or 9 to 0).")); - QWhatsThis::add(m_checkBoxCase,i18n( + TQWhatsThis::add(m_checkBoxCase,i18n( "Check this for case sensitive sort.")); - QWhatsThis::add(m_checkBoxUnique,i18n( + TQWhatsThis::add(m_checkBoxUnique,i18n( "Check this to removed all duplicated records.")); - QWhatsThis::add(m_checkBoxByCol,i18n( + TQWhatsThis::add(m_checkBoxByCol,i18n( "Check this for sorting by specific column.\n\n" "If a part of one line is selected, " "this checkbox is automatically selected. " "Start and end fields are filled according to selection.")); - QWhatsThis::add(m_lineEditStartCol,i18n( + TQWhatsThis::add(m_lineEditStartCol,i18n( "Start column of the sorting area.")); - QWhatsThis::add(m_lineEditEndCol,i18n( + TQWhatsThis::add(m_lineEditEndCol,i18n( "End column of the sorting area.")); - QWhatsThis::add(m_radioButtonAlphaSort,i18n( + TQWhatsThis::add(m_radioButtonAlphaSort,i18n( "Alphabetical sorting (A-Z).")); - QWhatsThis::add(m_radioButtonNumSort,i18n( + TQWhatsThis::add(m_radioButtonNumSort,i18n( "Numeric sorting (0-9)")); config_load(); @@ -60,7 +60,7 @@ SortDialog::~SortDialog() /*$SPECIALIZATION$*/ void SortDialog::reject() { - QDialog::reject(); + TQDialog::reject(); } void SortDialog::accept() @@ -72,19 +72,19 @@ void SortDialog::accept() m_lineEditEndCol->text().isEmpty() || m_lineEditEndCol->text().toInt() == 0) { - QMessageBox::warning(this,i18n("Error"), + TQMessageBox::warning(this,i18n("Error"), i18n("Fields:\n\"Starting at\" and \"Ending at\"\nhave to contains numbers."), i18n("OK")); return; } } config_save(); - QDialog::accept(); + TQDialog::accept(); } int SortDialog::exec() { - return QDialog::exec(); + return TQDialog::exec(); } void SortDialog::toggledCol() @@ -111,7 +111,7 @@ void SortDialog::toggledType() void SortDialog::config_load () { -// qDebug("config_load()"); +// tqDebug("config_load()"); KConfig *config = new KConfig("katesortpluginrc"); m_radioButtonAsc->setChecked(config->readBoolEntry("Asc",true)); m_radioButtonDesc->setChecked(config->readBoolEntry("Desc",false)); @@ -126,7 +126,7 @@ void SortDialog::config_load () void SortDialog::config_save () { -// qDebug("config_save()"); +// tqDebug("config_save()"); KConfig *config = new KConfig("katesortpluginrc"); config->writeEntry("Asc",m_radioButtonAsc->isOn()); config->writeEntry("Desc", m_radioButtonDesc->isOn()); diff --git a/kate/katesort/src/sortdialog.h b/kate/katesort/src/sortdialog.h index 516efef..06af3d5 100644 --- a/kate/katesort/src/sortdialog.h +++ b/kate/katesort/src/sortdialog.h @@ -22,25 +22,25 @@ #define SORTDIALOG_H #include "sortdialoglayout.h" -#include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include class SortDialog : public sortdialoglayout { Q_OBJECT public: - SortDialog ( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + SortDialog ( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~SortDialog(); -// QCheckBox* m_checkBoxUnique; +// TQCheckBox* m_checkBoxUnique; /*$PUBLIC_FUNCTIONS$*/ public slots: diff --git a/kate/katesort/src/sortdialoglayout.ui b/kate/katesort/src/sortdialoglayout.ui index 7e29409..665aed9 100644 --- a/kate/katesort/src/sortdialoglayout.ui +++ b/kate/katesort/src/sortdialoglayout.ui @@ -1,6 +1,6 @@ sortdialoglayout - + sortdialoglayout @@ -22,7 +22,7 @@ unnamed - + Layout1 @@ -53,7 +53,7 @@ - + buttonOk @@ -70,7 +70,7 @@ true - + buttonCancel @@ -86,7 +86,7 @@ - + m_groupSortOrder @@ -97,7 +97,7 @@ unnamed - + layout2 @@ -105,7 +105,7 @@ unnamed - + m_radioButtonAsc @@ -119,7 +119,7 @@ true - + m_radioButtonDesc @@ -134,7 +134,7 @@ - + m_groupAdvanced @@ -145,7 +145,7 @@ unnamed - + layout4 @@ -153,7 +153,7 @@ unnamed - + m_checkBoxCase @@ -164,7 +164,7 @@ Alt+C - + m_checkBoxUnique @@ -172,7 +172,7 @@ Uni&que - + m_checkBoxByCol @@ -185,7 +185,7 @@ - + layout5 @@ -193,7 +193,7 @@ unnamed - + m_textLabelStartCol @@ -221,7 +221,7 @@ - + m_lineEditStartCol @@ -237,7 +237,7 @@ - + layout6 @@ -245,7 +245,7 @@ unnamed - + m_textLabelEndCol @@ -273,7 +273,7 @@ - + m_lineEditEndCol @@ -308,7 +308,7 @@ - + m_groupSortType @@ -319,7 +319,7 @@ unnamed - + layout3 @@ -327,7 +327,7 @@ unnamed - + m_radioButtonAlphaSort @@ -341,7 +341,7 @@ true - + m_radioButtonNumSort