From f7e71d47719ab6094cf4a9fafffa5ea351973522 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 13 Jan 2011 08:32:36 +0000 Subject: Initial conversion for TQt for Qt4 3.4.0 TP2 This will also compile with TQt for Qt3, and should not cause any problems with dependent modules such as kdebase. If it does then it needs to be fixed! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kspell2/backgroundchecker.h | 2 +- kspell2/backgroundengine.h | 2 +- kspell2/backgroundthread.h | 2 +- kspell2/broker.cpp | 4 ++-- kspell2/client.h | 2 +- kspell2/plugins/ispell/ispell_checker.h | 2 +- kspell2/plugins/ispell/makedent.cpp | 2 +- kspell2/settings.cpp | 2 +- kspell2/tests/backgroundtest.h | 2 +- kspell2/tests/test_dialog.cpp | 2 +- kspell2/tests/test_dialog.h | 2 +- kspell2/threadevents.h | 4 ++-- kspell2/ui/configwidget.h | 2 +- kspell2/ui/highlighter.cpp | 2 +- kspell2/ui/highlighter.h | 2 +- kspell2/ui/kspell2ui.ui | 10 +++++----- 16 files changed, 22 insertions(+), 22 deletions(-) (limited to 'kspell2') diff --git a/kspell2/backgroundchecker.h b/kspell2/backgroundchecker.h index e5418d7ec..9346b0c89 100644 --- a/kspell2/backgroundchecker.h +++ b/kspell2/backgroundchecker.h @@ -46,7 +46,7 @@ namespace KSpell2 * @author Zack Rusin * @short class used for spell checking in the background */ - class KDE_EXPORT BackgroundChecker : public QObject + class KDE_EXPORT BackgroundChecker : public TQObject { Q_OBJECT public: diff --git a/kspell2/backgroundengine.h b/kspell2/backgroundengine.h index 9534e970c..d5bee8ca5 100644 --- a/kspell2/backgroundengine.h +++ b/kspell2/backgroundengine.h @@ -31,7 +31,7 @@ namespace KSpell2 class Filter; class Broker; class Dictionary; - class BackgroundEngine : public QObject + class BackgroundEngine : public TQObject { Q_OBJECT public: diff --git a/kspell2/backgroundthread.h b/kspell2/backgroundthread.h index 90432a1b8..12c631c2b 100644 --- a/kspell2/backgroundthread.h +++ b/kspell2/backgroundthread.h @@ -33,7 +33,7 @@ namespace KSpell2 class Filter; class Broker; class Dictionary; - class BackgroundThread : public QThread + class BackgroundThread : public TQThread { public: BackgroundThread(); diff --git a/kspell2/broker.cpp b/kspell2/broker.cpp index 7f572bb01..0149dace1 100644 --- a/kspell2/broker.cpp +++ b/kspell2/broker.cpp @@ -189,8 +189,8 @@ void Broker::loadPlugin( const TQString& pluginId ) kdDebug()<<"Loading plugin " << pluginId << endl; Client *client = KParts::ComponentFactory::createInstanceFromQuery( - TQString::fromLatin1( "KSpell/Client" ), - TQString::fromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).arg( pluginId ), + TQString::tqfromLatin1( "KSpell/Client" ), + TQString::tqfromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).arg( pluginId ), this, 0, TQStringList(), &error ); if ( client ) diff --git a/kspell2/client.h b/kspell2/client.h index 86046e204..f06b760bf 100644 --- a/kspell2/client.h +++ b/kspell2/client.h @@ -38,7 +38,7 @@ namespace KSpell2 * I don't really feel like writting my own KLibFactory * that would load anything else then TQObject derivatives. */ - class KDE_EXPORT Client : public QObject + class KDE_EXPORT Client : public TQObject { Q_OBJECT public: diff --git a/kspell2/plugins/ispell/ispell_checker.h b/kspell2/plugins/ispell/ispell_checker.h index 08783922a..df72fe7b4 100644 --- a/kspell2/plugins/ispell/ispell_checker.h +++ b/kspell2/plugins/ispell/ispell_checker.h @@ -112,7 +112,7 @@ private: /* HACK: macros replaced with function implementations - so we could do a side-effect-free check for unicode + so we could do a side-effect-free check for tqunicode characters which aren't in hashheader */ char myupper(ichar_t c); diff --git a/kspell2/plugins/ispell/makedent.cpp b/kspell2/plugins/ispell/makedent.cpp index 9c168dc17..0aeba8a1c 100644 --- a/kspell2/plugins/ispell/makedent.cpp +++ b/kspell2/plugins/ispell/makedent.cpp @@ -903,7 +903,7 @@ ISpellChecker::findfiletype (const char *name, int searchnames, int *deformatter /* HACK: macros replaced with function implementations - so we could do a side-effect-free check for unicode + so we could do a side-effect-free check for tqunicode characters which aren't in hashheader TODO: this is just a workaround to keep us from crashing. diff --git a/kspell2/settings.cpp b/kspell2/settings.cpp index 664ae24e0..9e10913bf 100644 --- a/kspell2/settings.cpp +++ b/kspell2/settings.cpp @@ -75,7 +75,7 @@ KSharedConfig *Settings::sharedConfig() const void Settings::setDefaultLanguage( const TQString& lang ) { TQStringList cs = d->broker->languages(); - if ( cs.find( lang ) != cs.end() && + if ( cs.tqfind( lang ) != cs.end() && d->defaultLanguage != lang ) { d->defaultLanguage = lang; readIgnoreList(); diff --git a/kspell2/tests/backgroundtest.h b/kspell2/tests/backgroundtest.h index fcdf9db55..2f08e9ce0 100644 --- a/kspell2/tests/backgroundtest.h +++ b/kspell2/tests/backgroundtest.h @@ -26,7 +26,7 @@ #include "backgroundchecker.h" -class BackgroundTest : public QObject +class BackgroundTest : public TQObject { Q_OBJECT public: diff --git a/kspell2/tests/test_dialog.cpp b/kspell2/tests/test_dialog.cpp index f0ee1ab3b..bc5d808a8 100644 --- a/kspell2/tests/test_dialog.cpp +++ b/kspell2/tests/test_dialog.cpp @@ -49,7 +49,7 @@ void TestDialog::check( const TQString& buffer ) void TestDialog::doneChecking( const TQString& buf ) { kdDebug()<<"Done with :"<quit(); + tqApp->quit(); } int main( int argc, char** argv ) diff --git a/kspell2/tests/test_dialog.h b/kspell2/tests/test_dialog.h index 5ef2dd189..e8a6cf970 100644 --- a/kspell2/tests/test_dialog.h +++ b/kspell2/tests/test_dialog.h @@ -26,7 +26,7 @@ #include -class TestDialog : public QObject +class TestDialog : public TQObject { Q_OBJECT public: diff --git a/kspell2/threadevents.h b/kspell2/threadevents.h index e6b52293e..87a516148 100644 --- a/kspell2/threadevents.h +++ b/kspell2/threadevents.h @@ -30,7 +30,7 @@ namespace KSpell2 FoundMisspelling = 2003, FinishedChecking = 2004 }; - class MisspellingEvent : public QCustomEvent + class MisspellingEvent : public TQCustomEvent { public: MisspellingEvent( const TQString& word, @@ -49,7 +49,7 @@ namespace KSpell2 TQString m_word; int m_position; }; - class FinishedCheckingEvent : public QCustomEvent + class FinishedCheckingEvent : public TQCustomEvent { public: FinishedCheckingEvent() diff --git a/kspell2/ui/configwidget.h b/kspell2/ui/configwidget.h index ed49ca20e..e51be6b89 100644 --- a/kspell2/ui/configwidget.h +++ b/kspell2/ui/configwidget.h @@ -27,7 +27,7 @@ namespace KSpell2 { class Broker; - class KDE_EXPORT ConfigWidget : public QWidget + class KDE_EXPORT ConfigWidget : public TQWidget { Q_OBJECT public: diff --git a/kspell2/ui/highlighter.cpp b/kspell2/ui/highlighter.cpp index 2d185462d..a3c33d7ae 100644 --- a/kspell2/ui/highlighter.cpp +++ b/kspell2/ui/highlighter.cpp @@ -110,7 +110,7 @@ TQString Highlighter::currentLanguage() const void Highlighter::setCurrentLanguage( const TQString& lang ) { - if ( !d->dictCache.find( lang ) ) { + if ( !d->dictCache.tqfind( lang ) ) { Dictionary *dict = d->broker->dictionary( lang ); if ( dict ) { d->dictCache.insert( lang, dict ); diff --git a/kspell2/ui/highlighter.h b/kspell2/ui/highlighter.h index 543bbe01f..2309c3a64 100644 --- a/kspell2/ui/highlighter.h +++ b/kspell2/ui/highlighter.h @@ -29,7 +29,7 @@ class TQTextEdit; namespace KSpell2 { - class Highlighter : public QSyntaxHighlighter + class Highlighter : public TQSyntaxHighlighter { public: Highlighter( TQTextEdit *textEdit, diff --git a/kspell2/ui/kspell2ui.ui b/kspell2/ui/kspell2ui.ui index b8870f2f5..b8a5d662b 100644 --- a/kspell2/ui/kspell2ui.ui +++ b/kspell2/ui/kspell2ui.ui @@ -20,7 +20,7 @@ 0 - + 430 300 @@ -87,7 +87,7 @@ ... the <b>misspelled</b> word shown in context ... - + WordBreak|AlignCenter @@ -123,7 +123,7 @@ Click here if you consider that the unknown word is not misspelled and you want Expanding - + 74 20 @@ -204,7 +204,7 @@ Click here if you consider that the unknown word is not misspelled and you want </qt> - + layout1 @@ -298,7 +298,7 @@ Click here if you consider that the unknown word is not misspelled and you want Expanding - + 20 20 -- cgit v1.2.1