diff options
Diffstat (limited to 'bibletime/frontend')
116 files changed, 2699 insertions, 2699 deletions
diff --git a/bibletime/frontend/btinstallmgr.cpp b/bibletime/frontend/btinstallmgr.cpp index 1332d10..c3cb859 100644 --- a/bibletime/frontend/btinstallmgr.cpp +++ b/bibletime/frontend/btinstallmgr.cpp @@ -12,8 +12,8 @@ #include "util/cpointers.h" //Qt includes -#include <qfile.h> -#include <qfileinfo.h> +#include <tqfile.h> +#include <tqfileinfo.h> //KDE includes #include <kapplication.h> @@ -35,21 +35,21 @@ using namespace sword; namespace BookshelfManager { - const QString BTInstallMgr::Tool::LocalConfig::swordConfigFilename() { + const TQString BTInstallMgr::Tool::LocalConfig::swordConfigFilename() { // Q_ASSERT( CPointers::backend()->sysconfig ); - return QString::fromLatin1("%1/.sword/sword.conf").arg(getenv("HOME")); + return TQString::fromLatin1("%1/.sword/sword.conf").arg(getenv("HOME")); } - QStringList BTInstallMgr::Tool::RemoteConfig::sourceList( sword::InstallMgr* mgr ) { + TQStringList BTInstallMgr::Tool::RemoteConfig::sourceList( sword::InstallMgr* mgr ) { // qWarning("BTInstallMgr::Tool::sourceList( sword::InstallMgr* mgr )"); Q_ASSERT(mgr); Q_ASSERT(mgr->installConf); - QStringList names; + TQStringList names; //add Sword remote sources for (InstallSourceMap::iterator it = mgr->sources.begin(); it != mgr->sources.end(); it++) { - names << QString::fromLocal8Bit(it->second->caption); + names << TQString::fromLocal8Bit(it->second->caption); } // Add local directory sources @@ -61,7 +61,7 @@ namespace BookshelfManager { while (sourceBegin != sourceEnd) { InstallSource is("DIR", sourceBegin->second.c_str()); - names << QString::fromLatin1(is.caption.c_str()); + names << TQString::fromLatin1(is.caption.c_str()); sourceBegin++; } @@ -70,18 +70,18 @@ namespace BookshelfManager { return names; } - QStringList BTInstallMgr::Tool::LocalConfig::targetList() { - QStringList names = CPointers::backend()->swordDirList(); + TQStringList BTInstallMgr::Tool::LocalConfig::targetList() { + TQStringList names = CPointers::backend()->swordDirList(); return names; } - void BTInstallMgr::Tool::LocalConfig::setTargetList( const QStringList& targets ) { + void BTInstallMgr::Tool::LocalConfig::setTargetList( const TQStringList& targets ) { //saves a new Sworc config using the provided target list - QString filename = KGlobal::dirs()->saveLocation("data", "bibletime/") + "sword.conf"; //default is to assume the real location isn't writable + TQString filename = KGlobal::dirs()->saveLocation("data", "bibletime/") + "sword.conf"; //default is to assume the real location isn't writable bool directAccess = false; - QFileInfo i(LocalConfig::swordConfigFilename()); - QFileInfo dirInfo(i.dirPath(true)); + TQFileInfo i(LocalConfig::swordConfigFilename()); + TQFileInfo dirInfo(i.dirPath(true)); if ( i.exists() && i.isWritable() ) { //we can write to the file ourself filename = LocalConfig::swordConfigFilename(); @@ -96,9 +96,9 @@ namespace BookshelfManager { SWConfig conf(filename.local8Bit()); conf.Sections.clear(); - for (QStringList::const_iterator it = targets.begin(); it != targets.end(); ++it) { - QString t = *it; - if (t.contains( QString("%1/.sword").arg(getenv("HOME")) )) { + for (TQStringList::const_iterator it = targets.begin(); it != targets.end(); ++it) { + TQString t = *it; + if (t.contains( TQString("%1/.sword").arg(getenv("HOME")) )) { //we don't want HOME/.sword in the config continue; } @@ -113,12 +113,12 @@ namespace BookshelfManager { if (!directAccess) { //use kdesu to move the file to the right place KProcess *proc = new KProcess; *proc << "kdesu"; - *proc << QString::fromLatin1("-c") << QString("mv %1 %2").arg(filename).arg(LocalConfig::swordConfigFilename()); + *proc << TQString::fromLatin1("-c") << TQString("mv %1 %2").arg(filename).arg(LocalConfig::swordConfigFilename()); proc->start(KProcess::Block); } } - sword::InstallSource BTInstallMgr::Tool::RemoteConfig::source( sword::InstallMgr* mgr, const QString& name ) { + sword::InstallSource BTInstallMgr::Tool::RemoteConfig::source( sword::InstallMgr* mgr, const TQString& name ) { Q_ASSERT(mgr); InstallSourceMap::iterator source = mgr->sources.find(name.latin1()); @@ -187,15 +187,15 @@ namespace BookshelfManager { config.Save(); } - const QString BTInstallMgr::Tool::RemoteConfig::configPath() { + const TQString BTInstallMgr::Tool::RemoteConfig::configPath() { const char *envhomedir = getenv("HOME"); - QString confPath = QString(envhomedir ? envhomedir : "."); + TQString confPath = TQString(envhomedir ? envhomedir : "."); confPath.append("/.sword/InstallMgr"); return confPath; } - const QString BTInstallMgr::Tool::RemoteConfig::configFilename() { + const TQString BTInstallMgr::Tool::RemoteConfig::configFilename() { return (configPath() + "/InstallMgr.conf"); } @@ -252,11 +252,11 @@ namespace BookshelfManager { CSwordBackend* ret = 0; if (RemoteConfig::isRemoteSource(is)) { // qWarning("## remote backend for %s", is->localShadow.c_str()); - ret = new CSwordBackend( QString(is->localShadow.c_str()), false ); + ret = new CSwordBackend( TQString(is->localShadow.c_str()), false ); } else { - // qWarning("## local backend for %s", QString(is->directory.c_str()).latin1()); - ret = new CSwordBackend( QString(is->directory.c_str()) ); + // qWarning("## local backend for %s", TQString(is->directory.c_str()).latin1()); + ret = new CSwordBackend( TQString(is->directory.c_str()) ); } Q_ASSERT(ret); diff --git a/bibletime/frontend/btinstallmgr.h b/bibletime/frontend/btinstallmgr.h index 4a366d3..fab0cfd 100644 --- a/bibletime/frontend/btinstallmgr.h +++ b/bibletime/frontend/btinstallmgr.h @@ -22,28 +22,28 @@ #include <ftptrans.h> //Qt includes -#include <qobject.h> -#include <qptrlist.h> -#include <qstring.h> -#include <qstringlist.h> +#include <tqobject.h> +#include <tqptrlist.h> +#include <tqstring.h> +#include <tqstringlist.h> namespace BookshelfManager { - typedef QPtrList<sword::InstallSource> InstallSourceList; + typedef TQPtrList<sword::InstallSource> InstallSourceList; /**Our own reimplementation to provide status bar updates. *@author The BibleTime team */ -class BTInstallMgr : public QObject, public sword::InstallMgr, public sword::StatusReporter { +class BTInstallMgr : public TQObject, public sword::InstallMgr, public sword::StatusReporter { Q_OBJECT public: class Tool { public: class LocalConfig { public: - static const QString swordConfigFilename(); - static QStringList targetList(); - static void setTargetList( const QStringList& ); + static const TQString swordConfigFilename(); + static TQStringList targetList(); + static void setTargetList( const TQStringList& ); private: LocalConfig() {} ; @@ -52,14 +52,14 @@ private: class RemoteConfig { public: static void initConfig(); - static const QString configPath(); - static const QString configFilename(); + static const TQString configPath(); + static const TQString configFilename(); static void resetRemoteSources(); static void resetLocalSources(); - static QStringList sourceList( sword::InstallMgr* ); - static sword::InstallSource source( sword::InstallMgr*, const QString& name ); + static TQStringList sourceList( sword::InstallMgr* ); + static sword::InstallSource source( sword::InstallMgr*, const TQString& name ); static const bool isRemoteSource( sword::InstallSource* is ); static void addSource( sword::InstallSource* ); static void removeSource( sword::InstallMgr*, sword::InstallSource* ); @@ -95,7 +95,7 @@ signals: // Signals /** * Emitted when a new file gets downloaded. */ - void downloadStarted( const QString& ); + void downloadStarted( const TQString& ); }; } diff --git a/bibletime/frontend/cbtconfig.cpp b/bibletime/frontend/cbtconfig.cpp index dbbec1e..33a3793 100644 --- a/bibletime/frontend/cbtconfig.cpp +++ b/bibletime/frontend/cbtconfig.cpp @@ -18,11 +18,11 @@ #include "util/cpointers.h" //Qt includes -#include <qapplication.h> -#include <qfontdatabase.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qmap.h> +#include <tqapplication.h> +#include <tqfontdatabase.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqmap.h> //KDE includes #include <kdeversion.h> @@ -45,33 +45,33 @@ #include <versekey.h> //init statics -QFont* CBTConfig::m_defaultFont = 0; +TQFont* CBTConfig::m_defaultFont = 0; CBTConfig::FontCache* CBTConfig::fontConfigMap = 0; /* No constructor and destructor, because this class only contains static methods. It won't be instantiated. */ -const QString CBTConfig::getKey( const CBTConfig::strings ID) { +const TQString CBTConfig::getKey( const CBTConfig::strings ID) { switch ( ID ) { case bibletimeVersion: return "bibletimeVersion"; case language: return "language"; case displayStyle: return "displayStyle"; case bookshelfCurrentItem: return "bookshelfCurrentItem"; } - return QString::null; + return TQString::null; } -const QString CBTConfig::getDefault( const CBTConfig::strings ID) { +const TQString CBTConfig::getDefault( const CBTConfig::strings ID) { switch ( ID ) { case bibletimeVersion: return "NOT YET INSTALLED"; // main() will realize this and set the value to VERSION case language: return (KGlobal::locale()->language()).local8Bit(); case displayStyle: return CDisplayTemplateMgr::defaultTemplate(); - case bookshelfCurrentItem: return QString(); + case bookshelfCurrentItem: return TQString(); } - return QString::null; + return TQString::null; } -const QString CBTConfig::getKey( const CBTConfig::modules ID) { +const TQString CBTConfig::getKey( const CBTConfig::modules ID) { switch ( ID ) { case standardBible: return "standardBible"; case standardCommentary: return "standardCommentary"; @@ -83,10 +83,10 @@ const QString CBTConfig::getKey( const CBTConfig::modules ID) { case standardGreekMorphLexicon: return "standardGreekMorphLexicon"; } - return QString::null; + return TQString::null; } -const QString CBTConfig::getDefault( const CBTConfig::modules ID) { +const TQString CBTConfig::getDefault( const CBTConfig::modules ID) { // CSwordBackend* b = CPointers::backend(); switch ( ID ) { case standardBible: return "KJV"; @@ -100,10 +100,10 @@ const QString CBTConfig::getDefault( const CBTConfig::modules ID) { case standardGreekMorphLexicon: return "StrongsGreek"; } - return QString::null; + return TQString::null; } -const QString CBTConfig::getKey( const CBTConfig::bools ID) { +const TQString CBTConfig::getKey( const CBTConfig::bools ID) { switch ( ID ) { case firstSearchDialog: return "firstSearchDialog"; case readOldBookmarks: return "readOldBookmarks"; @@ -125,10 +125,10 @@ const QString CBTConfig::getKey( const CBTConfig::bools ID) { case crashedLastTime: return "crashedLastTime"; case crashedTwoTimes: return "crashedTwoTimes"; } - return QString::null; + return TQString::null; } -const QString CBTConfig::getKey( const CBTConfig::ints ID) { +const TQString CBTConfig::getKey( const CBTConfig::ints ID) { switch ( ID ) { case footnotes: return "footnotes"; case strongNumbers: return "strongNumbers"; @@ -145,7 +145,7 @@ const QString CBTConfig::getKey( const CBTConfig::ints ID) { case bookshelfContentsY: return "bookshelfContentsY"; case magDelay: return "magDelay"; } - return QString::null; + return TQString::null; } const bool CBTConfig::getDefault( const CBTConfig::bools ID) { @@ -193,70 +193,70 @@ const int CBTConfig::getDefault( const CBTConfig::ints ID) { return 0; } -const QString CBTConfig::getKey( const CBTConfig::intLists ID) { +const TQString CBTConfig::getKey( const CBTConfig::intLists ID) { switch ( ID ) { case leftPaneSplitterSizes: return "leftPaneSplitterSizes"; case mainSplitterSizes: return "mainSplitterSizes"; } - return QString::null; + return TQString::null; } -const QValueList<int> CBTConfig::getDefault( const CBTConfig::intLists ID) { +const TQValueList<int> CBTConfig::getDefault( const CBTConfig::intLists ID) { switch ( ID ) { case leftPaneSplitterSizes: //fall through case mainSplitterSizes: { - return QValueList<int>(); + return TQValueList<int>(); } } - return QValueList<int>(); + return TQValueList<int>(); } -const QString CBTConfig::getKey( const CBTConfig::stringLists ID) { +const TQString CBTConfig::getKey( const CBTConfig::stringLists ID) { switch ( ID ) { - case searchCompletionTexts: return QString("searchCompletionTexts"); - case searchTexts: return QString("searchTexts"); - case bookshelfOpenGroups: return QString("bookshelfOpenGroups"); + case searchCompletionTexts: return TQString("searchCompletionTexts"); + case searchTexts: return TQString("searchTexts"); + case bookshelfOpenGroups: return TQString("bookshelfOpenGroups"); } - return QString::null; + return TQString::null; } -const QStringList CBTConfig::getDefault( const CBTConfig::stringLists ID) { +const TQStringList CBTConfig::getDefault( const CBTConfig::stringLists ID) { switch ( ID ) { case searchTexts: { - QStringList list; - list.append(QString::null); + TQStringList list; + list.append(TQString::null); return list; } case searchCompletionTexts: - return QStringList(); + return TQStringList(); case bookshelfOpenGroups: - return QStringList(); + return TQStringList(); } - return QStringList(); + return TQStringList(); } -const QString CBTConfig::getKey( const CBTConfig::stringMaps ID) { +const TQString CBTConfig::getKey( const CBTConfig::stringMaps ID) { switch (ID) { case searchScopes: - return QString("SearchScopes"); + return TQString("SearchScopes"); }; - return QString::null; + return TQString::null; } const CBTConfig::StringMap CBTConfig::getDefault( const CBTConfig::stringMaps ID) { switch ( ID ) { case searchScopes: { CBTConfig::StringMap map; - map.insert(i18n("Old testament"), QString("Gen - Mal")); - map.insert(i18n("Moses/Pentateuch/Torah"),QString("Gen - Deut")); - map.insert(i18n("History"), QString("Jos - Est")); - map.insert(i18n("Prophets"), QString("Isa - Mal")); - map.insert(i18n("New testament"), QString("Mat - Rev")); - map.insert(i18n("Gospels"), QString("Mat - Joh")); - map.insert(i18n("Letters/Epistles"), QString("Rom - Jude")); - map.insert(i18n("Paul's Epistles"), QString("Rom - Phile")); + map.insert(i18n("Old testament"), TQString("Gen - Mal")); + map.insert(i18n("Moses/Pentateuch/Torah"),TQString("Gen - Deut")); + map.insert(i18n("History"), TQString("Jos - Est")); + map.insert(i18n("Prophets"), TQString("Isa - Mal")); + map.insert(i18n("New testament"), TQString("Mat - Rev")); + map.insert(i18n("Gospels"), TQString("Mat - Joh")); + map.insert(i18n("Letters/Epistles"), TQString("Rom - Jude")); + map.insert(i18n("Paul's Epistles"), TQString("Rom - Phile")); //make the list to the current bookname language! CBTConfig::StringMap::Iterator it; @@ -265,9 +265,9 @@ const CBTConfig::StringMap CBTConfig::getDefault( const CBTConfig::stringMaps ID for (it = map.begin(); it != map.end(); ++it) { sword::ListKey list = vk.ParseVerseList(it.data().local8Bit(), "Genesis 1:1", true); - QString data; + TQString data; for (int i = 0; i < list.Count(); ++i) { - data += QString::fromUtf8(list.GetElement(i)->getRangeText()) + "; "; + data += TQString::fromUtf8(list.GetElement(i)->getRangeText()) + "; "; } map[it.key()] = data; //set the new data }; @@ -282,34 +282,34 @@ const CBTConfig::StringMap CBTConfig::getDefault( const CBTConfig::stringMaps ID } -const QString CBTConfig::getKey( const CLanguageMgr::Language* const language ) { +const TQString CBTConfig::getKey( const CLanguageMgr::Language* const language ) { return language->name(); } -const QFont& CBTConfig::getDefault( const CLanguageMgr::Language* const) { +const TQFont& CBTConfig::getDefault( const CLanguageMgr::Language* const) { //language specific lookup of the font name //return KApplication::font(); if (m_defaultFont) { return *m_defaultFont; } - static KStaticDeleter<QFont> sd; + static KStaticDeleter<TQFont> sd; //TODO: We need a better way to get the KDE konqueror KHTML settings KConfig conf("konquerorrc"); KHTMLSettings settings; settings.init(&conf); - const QString fontName = settings.stdFontName(); + const TQString fontName = settings.stdFontName(); const int fontSize = settings.mediumFontSize(); - sd.setObject(m_defaultFont, new QFont(fontName, fontSize)); + sd.setObject(m_defaultFont, new TQFont(fontName, fontSize)); return *m_defaultFont; } -const QString CBTConfig::get +const TQString CBTConfig::get ( const CBTConfig::strings ID) { KConfig* config = CBTConfig::getConfig(); KConfigGroupSaver groupSaver(config, "strings"); @@ -321,7 +321,7 @@ CSwordModuleInfo* const CBTConfig::get KConfig* config = CBTConfig::getConfig(); KConfigGroupSaver groupSaver(config, "modules"); - QString name = config->readEntry(getKey(ID),getDefault(ID)); + TQString name = config->readEntry(getKey(ID),getDefault(ID)); return CPointers::backend()->findModuleByName(name); } @@ -341,14 +341,14 @@ const int CBTConfig::get return config->readNumEntry(getKey(ID), getDefault(ID)); } -const QValueList<int> CBTConfig::get +const TQValueList<int> CBTConfig::get ( const CBTConfig::intLists ID ) { KConfig* config = CBTConfig::getConfig(); KConfigGroupSaver groupSaver(config, "intlists"); return config->readIntListEntry(getKey(ID)); } -const QStringList CBTConfig::get +const TQStringList CBTConfig::get ( const CBTConfig::stringLists ID ) { KConfig* config = CBTConfig::getConfig(); KConfigGroupSaver groupSaver(config, "stringlists"); @@ -369,9 +369,9 @@ const CBTConfig::StringMap CBTConfig::get for (it = map.begin(); it != map.end(); ++it) { sword::ListKey list = vk.ParseVerseList(it.data().utf8(), "Genesis 1:1", true); - QString data; + TQString data; for (int i = 0; i < list.Count(); ++i) { - data += QString::fromUtf8(list.GetElement(i)->getRangeText()) + "; "; + data += TQString::fromUtf8(list.GetElement(i)->getRangeText()) + "; "; } map[it.key()] = data; //set the new data }; @@ -413,7 +413,7 @@ const CBTConfig::FontSettingsPair CBTConfig::get } void CBTConfig::set - ( const CBTConfig::strings ID, const QString value ) { + ( const CBTConfig::strings ID, const TQString value ) { KConfig* config = CBTConfig::getConfig(); KConfigGroupSaver groupSaver(config, "strings"); config->writeEntry(getKey(ID), value); @@ -423,11 +423,11 @@ void CBTConfig::set ( const CBTConfig::modules ID, CSwordModuleInfo* const value ) { KConfig* config = CBTConfig::getConfig(); KConfigGroupSaver groupSaver(config, "modules"); - config->writeEntry(getKey(ID), value ? value->name() : QString::null); + config->writeEntry(getKey(ID), value ? value->name() : TQString::null); } void CBTConfig::set - ( const CBTConfig::modules ID, const QString& value ) { + ( const CBTConfig::modules ID, const TQString& value ) { CSwordModuleInfo* module = CPointers::backend()->findModuleByName(value); if (module) { CBTConfig::set @@ -451,14 +451,14 @@ void CBTConfig::set } void CBTConfig::set - ( const CBTConfig::intLists ID, const QValueList<int> value ) { + ( const CBTConfig::intLists ID, const TQValueList<int> value ) { KConfig* config = CBTConfig::getConfig(); KConfigGroupSaver groupSaver(config, "intlists"); config->writeEntry(getKey(ID), value); } void CBTConfig::set - ( const CBTConfig::stringLists ID, const QStringList value ) { + ( const CBTConfig::stringLists ID, const TQStringList value ) { KConfig* config = CBTConfig::getConfig(); KConfigGroupSaver groupSaver(config, "stringlists"); config->writeEntry(getKey(ID), value); @@ -479,16 +479,16 @@ void CBTConfig::set * will always work with each locale set. */ CBTConfig::StringMap::ConstIterator it; - QString data;// = QString::null; + TQString data;// = TQString::null; sword::VerseKey vk; for (it = value.begin(); it != value.end(); ++it) { sword::ListKey list = vk.ParseVerseList(it.data().utf8(), "Genesis 1:1", true); - data = QString::null; + data = TQString::null; for (int i = 0; i < list.Count(); ++i) { if ( sword::VerseKey* range = dynamic_cast<sword::VerseKey*>(list.GetElement(i)) ) { range->setLocale("en"); - data += QString::fromUtf8( range->getRangeText() ) + ";"; + data += TQString::fromUtf8( range->getRangeText() ) + ";"; } } config->writeEntry(it.key(), data); @@ -556,7 +556,7 @@ const CSwordBackend::FilterOptions CBTConfig::getFilterOptionDefaults() { } void CBTConfig::setupAccelSettings(const CBTConfig::keys type, KActionCollection* const actionCollection) { - QString groupName; + TQString groupName; switch (type) { case allWindows : { groupName = "Displaywindow shortcuts"; @@ -597,7 +597,7 @@ void CBTConfig::setupAccelSettings(const CBTConfig::keys type, KActionCollection } void CBTConfig::saveAccelSettings(const CBTConfig::keys type, KActionCollection* const actionCollection) { - QString groupName; + TQString groupName; switch (type) { case allWindows : { groupName = "Displaywindow shortcuts"; @@ -638,14 +638,14 @@ void CBTConfig::saveAccelSettings(const CBTConfig::keys type, KActionCollection* } -const QString CBTConfig::getModuleEncryptionKey( const QString& module ) { +const TQString CBTConfig::getModuleEncryptionKey( const TQString& module ) { KConfig* config = CBTConfig::getConfig(); KConfigGroupSaver groupSaver(config, "Module keys"); - return config->readEntry(module, QString::null); + return config->readEntry(module, TQString::null); } -void CBTConfig::setModuleEncryptionKey( const QString& module, const QString& key ) { +void CBTConfig::setModuleEncryptionKey( const TQString& module, const TQString& key ) { // if (CSwordModuleInfo* const mod = CPointers::backend()->findModuleByName(module) ) { // // if an empty key is set for an unencrypted module do nothing // if (key.isEmpty() && !mod->isEncrypted()) { diff --git a/bibletime/frontend/cbtconfig.h b/bibletime/frontend/cbtconfig.h index 5c91c71..c949593 100644 --- a/bibletime/frontend/cbtconfig.h +++ b/bibletime/frontend/cbtconfig.h @@ -16,10 +16,10 @@ #include "backend/clanguagemgr.h" //Qt includes -#include <qstring.h> -#include <qfont.h> -#include <qvaluelist.h> -#include <qmap.h> +#include <tqstring.h> +#include <tqfont.h> +#include <tqvaluelist.h> +#include <tqmap.h> //Forward declarations class KAccel; @@ -32,7 +32,7 @@ class KConfig; */ class CBTConfig { public: - typedef QMap<QString, QString> StringMap; + typedef TQMap<TQString, TQString> StringMap; enum strings { bibletimeVersion, @@ -110,10 +110,10 @@ public: enum stringMaps { searchScopes }; - typedef std::pair<bool, QFont> FontSettingsPair; - typedef QMap<const CLanguageMgr::Language*, CBTConfig::FontSettingsPair> FontCache; + typedef std::pair<bool, TQFont> FontSettingsPair; + typedef TQMap<const CLanguageMgr::Language*, CBTConfig::FontSettingsPair> FontCache; - static const QString get + static const TQString get ( const CBTConfig::strings ); static CSwordModuleInfo* const get ( const CBTConfig::modules ); @@ -121,9 +121,9 @@ public: ( const CBTConfig::bools ); static const int get ( const CBTConfig::ints ); - static const QValueList<int> get + static const TQValueList<int> get ( const CBTConfig::intLists ); - static const QStringList get + static const TQStringList get ( const CBTConfig::stringLists ); static const CBTConfig::StringMap get ( const CBTConfig::stringMaps ); @@ -131,29 +131,29 @@ public: static const FontSettingsPair get ( const CLanguageMgr::Language* const ); - static const QString getDefault( const CBTConfig::strings ); - static const QString getDefault( const CBTConfig::modules ); + static const TQString getDefault( const CBTConfig::strings ); + static const TQString getDefault( const CBTConfig::modules ); static const bool getDefault( const CBTConfig::bools ); static const int getDefault( const CBTConfig::ints ); - static const QValueList<int> getDefault( const CBTConfig::intLists ); - static const QStringList getDefault( const CBTConfig::stringLists ); + static const TQValueList<int> getDefault( const CBTConfig::intLists ); + static const TQStringList getDefault( const CBTConfig::stringLists ); static const CBTConfig::StringMap getDefault( const CBTConfig::stringMaps ); - static const QFont& getDefault( const CLanguageMgr::Language* const ); + static const TQFont& getDefault( const CLanguageMgr::Language* const ); static void set - ( const CBTConfig::strings, const QString value ); + ( const CBTConfig::strings, const TQString value ); static void set ( const CBTConfig::modules, CSwordModuleInfo* const module ); static void set - ( const CBTConfig::modules, const QString& moduleName ); + ( const CBTConfig::modules, const TQString& moduleName ); static void set ( const CBTConfig::bools, const bool value ); static void set ( const CBTConfig::ints, const int value ); static void set - ( const CBTConfig::intLists, const QValueList<int> value ); + ( const CBTConfig::intLists, const TQValueList<int> value ); static void set - ( const CBTConfig::stringLists, const QStringList value); + ( const CBTConfig::stringLists, const TQStringList value); static void set ( const CBTConfig::stringMaps, const CBTConfig::StringMap value); static void set @@ -165,8 +165,8 @@ public: static void setupAccelSettings(const CBTConfig::keys type, KActionCollection* const actionCollection); static void saveAccelSettings(const CBTConfig::keys type, KActionCollection* const actionCollection); - static const QString getModuleEncryptionKey( const QString& name ); - static void setModuleEncryptionKey( const QString& name, const QString& key ); + static const TQString getModuleEncryptionKey( const TQString& name ); + static void setModuleEncryptionKey( const TQString& name, const TQString& key ); /** The config object. * @return A config object which is used currently, may be the global config or the session config @@ -174,17 +174,17 @@ public: static KConfig* const getConfig(); private: - static const QString getKey( const CBTConfig::strings ); - static const QString getKey( const CBTConfig::modules ); - static const QString getKey( const CBTConfig::bools ); - static const QString getKey( const CBTConfig::ints ); - static const QString getKey( const CBTConfig::intLists ); - static const QString getKey( const CBTConfig::stringLists ); - static const QString getKey( const CBTConfig::stringMaps ); - static const QString getKey( const CLanguageMgr::Language* const ); + static const TQString getKey( const CBTConfig::strings ); + static const TQString getKey( const CBTConfig::modules ); + static const TQString getKey( const CBTConfig::bools ); + static const TQString getKey( const CBTConfig::ints ); + static const TQString getKey( const CBTConfig::intLists ); + static const TQString getKey( const CBTConfig::stringLists ); + static const TQString getKey( const CBTConfig::stringMaps ); + static const TQString getKey( const CLanguageMgr::Language* const ); //static caches - static QFont* m_defaultFont; + static TQFont* m_defaultFont; static FontCache* fontConfigMap; }; diff --git a/bibletime/frontend/cdragdropmgr.cpp b/bibletime/frontend/cdragdropmgr.cpp index c014eed..5c8cb7b 100644 --- a/bibletime/frontend/cdragdropmgr.cpp +++ b/bibletime/frontend/cdragdropmgr.cpp @@ -20,15 +20,15 @@ #include "versekey.h" //Qt includes -#include <qevent.h> -#include <qdom.h> +#include <tqevent.h> +#include <tqdom.h> -CDragDropMgr::BTDrag::BTDrag( const QString& xml, QWidget* dragSource, const char* name) -: QTextDrag(xml, dragSource, name) {} +CDragDropMgr::BTDrag::BTDrag( const TQString& xml, TQWidget* dragSource, const char* name) +: TQTextDrag(xml, dragSource, name) {} ; //static function to see whether we can decode tje given mime type -bool CDragDropMgr::BTDrag::canDecode( const QMimeSource * mime ) { +bool CDragDropMgr::BTDrag::canDecode( const TQMimeSource * mime ) { if ( mime->provides("BibleTime/DND") ) { //we can decode this type! return true; } @@ -46,37 +46,37 @@ const char* CDragDropMgr::BTDrag::format( int i ) const { return 0; }; -bool CDragDropMgr::BTDrag::decode(const QMimeSource* e, QString& str) { +bool CDragDropMgr::BTDrag::decode(const TQMimeSource* e, TQString& str) { if (canDecode(e)) { - str = QString( e->encodedData( "BibleTime/DND" ) ); + str = TQString( e->encodedData( "BibleTime/DND" ) ); return true; } return false; }; -bool CDragDropMgr::BTDrag::decode(const QMimeSource* e, QString& str, QCString& /*subtype*/) { +bool CDragDropMgr::BTDrag::decode(const TQMimeSource* e, TQString& str, TQCString& /*subtype*/) { return decode(e, str); }; -QByteArray CDragDropMgr::BTDrag::encodedData( const char* /*type*/ ) const { - return QTextDrag::encodedData("text/plain"); //hack because QTextDrag only accepts text/plainand not our BibleTime/DND type +TQByteArray CDragDropMgr::BTDrag::encodedData( const char* /*type*/ ) const { + return TQTextDrag::encodedData("text/plain"); //hack because TQTextDrag only accepts text/plainand not our BibleTime/DND type }; ///////////////////////////// new class ////////////////////// -CDragDropMgr::Item::Item( const QString& text ) +CDragDropMgr::Item::Item( const TQString& text ) : m_type(Text), -m_bookmarkModuleName(QString::null), -m_bookmarkKey(QString::null), -m_bookmarkDescription(QString::null), +m_bookmarkModuleName(TQString::null), +m_bookmarkKey(TQString::null), +m_bookmarkDescription(TQString::null), m_text(text) {} -CDragDropMgr::Item::Item( const QString& moduleName, const QString& key, const QString& description ) +CDragDropMgr::Item::Item( const TQString& moduleName, const TQString& key, const TQString& description ) : m_type(Bookmark), m_bookmarkModuleName(moduleName), m_bookmarkKey(key), m_bookmarkDescription(description), -m_text(QString::null) { +m_text(TQString::null) { //we have to make sure the key is saved in it's english representation, so we convert it if (CSwordModuleInfo* mod = CPointers::backend()->findModuleByName( moduleName )) { if (mod->type() == CSwordModuleInfo::Bible || mod->type() == CSwordModuleInfo::Commentary) { @@ -98,25 +98,25 @@ const CDragDropMgr::Item::Type& CDragDropMgr::Item::type() const { } /** Returns the text which is used by this DragDrop Item, only valid if type() == Text */ -const QString& CDragDropMgr::Item::text() const { +const TQString& CDragDropMgr::Item::text() const { // Q_ASSERT(!m_text.isEmpty()); return m_text; } /** Returns the key, ony valid if type() == Bookmark */ -const QString& CDragDropMgr::Item::bookmarkKey() const { +const TQString& CDragDropMgr::Item::bookmarkKey() const { // Q_ASSERT(!m_bookmarkKey.isEmpty()); return m_bookmarkKey; } /** Returns the bookmark module, ony valid if type() == Bookmark */ -const QString& CDragDropMgr::Item::bookmarkModule() const { +const TQString& CDragDropMgr::Item::bookmarkModule() const { // Q_ASSERT(!m_bookmarkModuleName.isEmpty()); return m_bookmarkModuleName; } /** Returns the bookmark description, ony valid if type() == Bookmark */ -const QString& CDragDropMgr::Item::bookmarkDescription() const { +const TQString& CDragDropMgr::Item::bookmarkDescription() const { // Q_ASSERT(!m_bookmarkDescription.isEmpty()); return m_bookmarkDescription; } @@ -127,23 +127,23 @@ CDragDropMgr::CDragDropMgr() {} CDragDropMgr::~CDragDropMgr() {} -const bool CDragDropMgr::canDecode( const QMimeSource* const mime ) { +const bool CDragDropMgr::canDecode( const TQMimeSource* const mime ) { if (CDragDropMgr::BTDrag::canDecode(mime)) { return true; } - else if( QTextDrag::canDecode(mime) ) { - qWarning("QTextDrag can decode this mime!"); + else if( TQTextDrag::canDecode(mime) ) { + qWarning("TQTextDrag can decode this mime!"); return true; }; return false; }; -QDragObject* const CDragDropMgr::dragObject( CDragDropMgr::ItemList& items, QWidget* dragSource ) { +TQDragObject* const CDragDropMgr::dragObject( CDragDropMgr::ItemList& items, TQWidget* dragSource ) { if ( items.count() ) { //process the items and set the data to the dragobject we return later - QDomDocument doc("DOC"); + TQDomDocument doc("DOC"); doc.appendChild( doc.createProcessingInstruction( "xml", "version=\"1.0\" encoding=\"UTF-8\"" ) ); - QDomElement content = doc.createElement("BibleTimeDND"); + TQDomElement content = doc.createElement("BibleTimeDND"); content.setAttribute("syntaxVersion", "1.0"); doc.appendChild(content); @@ -152,7 +152,7 @@ QDragObject* const CDragDropMgr::dragObject( CDragDropMgr::ItemList& items, QWid Item item = (*it); if (item.type() == Item::Bookmark) { //a bookmark was dragged //append the XML stuff for a bookmark - QDomElement bookmark = doc.createElement("BOOKMARK"); + TQDomElement bookmark = doc.createElement("BOOKMARK"); bookmark.setAttribute("key", item.bookmarkKey()); bookmark.setAttribute("description", item.bookmarkDescription()); bookmark.setAttribute("moduleName", item.bookmarkModule()); @@ -161,7 +161,7 @@ QDragObject* const CDragDropMgr::dragObject( CDragDropMgr::ItemList& items, QWid } else if (item.type() == Item::Text) { //plain text was dragged //append the XML stuff for plain text - QDomElement plainText = doc.createElement("TEXT"); + TQDomElement plainText = doc.createElement("TEXT"); plainText.setAttribute("text", item.text()); content.appendChild(plainText); @@ -175,11 +175,11 @@ QDragObject* const CDragDropMgr::dragObject( CDragDropMgr::ItemList& items, QWid return 0; }; -CDragDropMgr::ItemList CDragDropMgr::decode( const QMimeSource* const src) { - //if the drag was started by another widget which doesn't use CDragDropMgr (a drag created by QTextDrag) - if (canDecode(src) && QTextDrag::canDecode(src)) { //if we can decode but it's a QTextDrag and not a BTDrag object - QString text; - QTextDrag::decode(src, text); +CDragDropMgr::ItemList CDragDropMgr::decode( const TQMimeSource* const src) { + //if the drag was started by another widget which doesn't use CDragDropMgr (a drag created by TQTextDrag) + if (canDecode(src) && TQTextDrag::canDecode(src)) { //if we can decode but it's a TQTextDrag and not a BTDrag object + TQString text; + TQTextDrag::decode(src, text); // qWarning(text.latin1()); CDragDropMgr::ItemList dndItems; @@ -190,7 +190,7 @@ CDragDropMgr::ItemList CDragDropMgr::decode( const QMimeSource* const src) { return CDragDropMgr::ItemList(); }; - QString xmlData; + TQString xmlData; BTDrag::decode(src, xmlData); if (xmlData.isEmpty()) { //something went wrong! @@ -204,27 +204,27 @@ CDragDropMgr::ItemList CDragDropMgr::decode( const QMimeSource* const src) { //we can handle the dropEvent and have xml data to work on! ItemList dndItems; - QDomDocument doc; + TQDomDocument doc; doc.setContent( xmlData ); - QDomElement document = doc.documentElement(); + TQDomElement document = doc.documentElement(); if( document.tagName() != "BibleTimeDND" ) { //BibleTime was used in syntax version 1.0 qWarning("DragDropMgr::decode: Missing BibleTimeDND doc"); return CDragDropMgr::ItemList(); } // see if there's a section with the name MAINWINDOW - QDomElement elem = document.firstChild().toElement(); + TQDomElement elem = document.firstChild().toElement(); while (!elem.isNull()) { if (elem.tagName() == "BOOKMARK") { //we found a bookmark! // qWarning("found a bookmark!"); - const QString key = elem.hasAttribute("key") ? elem.attribute("key") : QString::null; - const QString moduleName = elem.hasAttribute("moduleName") ? elem.attribute("moduleName") : QString::null; - const QString description = elem.hasAttribute("description") ? elem.attribute("description") : QString::null; + const TQString key = elem.hasAttribute("key") ? elem.attribute("key") : TQString::null; + const TQString moduleName = elem.hasAttribute("moduleName") ? elem.attribute("moduleName") : TQString::null; + const TQString description = elem.hasAttribute("description") ? elem.attribute("description") : TQString::null; dndItems.append( CDragDropMgr::Item(moduleName, key, description) ); } else if (elem.tagName() == "TEXT") { //we found a plain text passage! - const QString text = elem.hasAttribute("text") ? elem.attribute("text") : QString::null; + const TQString text = elem.hasAttribute("text") ? elem.attribute("text") : TQString::null; dndItems.append( CDragDropMgr::Item(text) ); }; elem = elem.nextSibling().toElement(); @@ -234,7 +234,7 @@ CDragDropMgr::ItemList CDragDropMgr::decode( const QMimeSource* const src) { }; /** Returns which type the given drop event has, if it's a mixed one (both bookmarks and plain text), which shouldn't happen, it return Item::Unknown. */ -CDragDropMgr::Item::Type CDragDropMgr::dndType( const QMimeSource* e ) { +CDragDropMgr::Item::Type CDragDropMgr::dndType( const TQMimeSource* e ) { ItemList dndItems = decode(e); if (dndItems.isEmpty()) {//wrong dropEvent or something strange return Item::Unknown; diff --git a/bibletime/frontend/cdragdropmgr.h b/bibletime/frontend/cdragdropmgr.h index 01f0ff3..904aa15 100644 --- a/bibletime/frontend/cdragdropmgr.h +++ b/bibletime/frontend/cdragdropmgr.h @@ -13,14 +13,14 @@ #define CDRAGDROPMGR_H //Qt includes -#include <qstring.h> -#include <qcstring.h> -#include <qdragobject.h> -#include <qvaluelist.h> +#include <tqstring.h> +#include <tqcstring.h> +#include <tqdragobject.h> +#include <tqvaluelist.h> //forward declarations -class QDropEvent; -class QWidget; +class TQDropEvent; +class TQWidget; /** This class is the drag'n' drop manager for BibleTime. * The dnd is managed by XML code, which defines the type of the drag/drop, the items and the action (moe, copy etc.). @@ -57,19 +57,19 @@ public: /** * Returns the key, ony valid if type() == Bookmark */ - const QString& bookmarkKey() const; + const TQString& bookmarkKey() const; /** * Returns the module name, ony valid if type() == Bookmark */ - const QString& bookmarkModule() const; + const TQString& bookmarkModule() const; /** * Returns the bookmark description, ony valid if type() == Bookmark */ - const QString& bookmarkDescription() const; + const TQString& bookmarkDescription() const; /** * Returns the text which is used by this DragDrop Item, only valid if type() == Text */ - const QString& text() const; + const TQString& text() const; // protected: friend class CDragDropMgr; @@ -82,69 +82,69 @@ public: * This constructor automatically sets the type member to Text * This is also the default constructor */ - Item(const QString& text = QString::null ); + Item(const TQString& text = TQString::null ); /** Constructor for a Bookmark item * This constructor automatically sets the type member to Bookmark */ - Item(const QString& moduleName, const QString& key, const QString& description); + Item(const TQString& moduleName, const TQString& key, const TQString& description); virtual ~Item(); private: Type m_type; //the member to save the type of the action - QString m_bookmarkModuleName; //the modules which is used by this item, only valid for type() == Bookmark - QString m_bookmarkKey; //the key of a bookmark, only valid if type() == Bookmark - QString m_bookmarkDescription; //the description of a bookmark, only valid if type() == Bookmark - QString m_text; //the text of this item, only valid if type() == Text + TQString m_bookmarkModuleName; //the modules which is used by this item, only valid for type() == Bookmark + TQString m_bookmarkKey; //the key of a bookmark, only valid if type() == Bookmark + TQString m_bookmarkDescription; //the description of a bookmark, only valid if type() == Bookmark + TQString m_text; //the text of this item, only valid if type() == Text } ; //end of class CDragDropMgr::Item //the item list we're using - typedef QValueList<Item> ItemList; + typedef TQValueList<Item> ItemList; /** Return whether the drop should be accepted * This functions tests whether the drop should be accepted or not. It returns true if the drop object * is supported by the CDragDropMgr and if it cotains valid data. Oterwise this function returns false. */ - static const bool canDecode( const QMimeSource* const mime ); + static const bool canDecode( const TQMimeSource* const mime ); /** * This function returns the drag object with the data which represents the items given as parameter * If the list is invalid or empty we return NULL. */ - static QDragObject* const dragObject( CDragDropMgr::ItemList& items, QWidget* dragSource ); + static TQDragObject* const dragObject( CDragDropMgr::ItemList& items, TQWidget* dragSource ); /** * Decodes the XML stuff we passed to the dragObject at creation time. * Returns a list of CDragDropMgr::Item objects. * If it's a wrong dropEvent we return an empty ist */ - static CDragDropMgr::ItemList decode( const QMimeSource* const src ); + static CDragDropMgr::ItemList decode( const TQMimeSource* const src ); /** * Returns which type the given drop event has, if it's a mixed one (both bookmarks and plain text), * which shouldn't happen, it return Item::Unknown. * It also returns Unknown if the drop event is not supported. */ - static CDragDropMgr::Item::Type dndType( const QMimeSource* e ); + static CDragDropMgr::Item::Type dndType( const TQMimeSource* e ); protected: //The class which represents our XML drag object stuff -class BTDrag : public QTextDrag { +class BTDrag : public TQTextDrag { public: - BTDrag( const QString& xml, QWidget* dragSource = 0, const char* name = 0); + BTDrag( const TQString& xml, TQWidget* dragSource = 0, const char* name = 0); //reimplemented static publoc function to provide functionality for BibleTime XML drags - static bool canDecode( const QMimeSource * e ); + static bool canDecode( const TQMimeSource * e ); virtual bool provides( const char* type ) const; virtual const char* format( int i = 0 ) const; - virtual QByteArray encodedData( const char* type ) const; + virtual TQByteArray encodedData( const char* type ) const; protected: friend class CDragDropMgr; //made protected because the BibleTime classes may not manage the data of BTDrag - // virtual void setText(const QString& text); + // virtual void setText(const TQString& text); //made protected because the BibleTime classes should not manage the DRag&Drop stuff themself - static bool decode(const QMimeSource* e, QString& str); - static bool decode(const QMimeSource* e, QString& str, QCString& subtype); + static bool decode(const TQMimeSource* e, TQString& str); + static bool decode(const TQMimeSource* e, TQString& str, TQCString& subtype); }; //protected constructor and destructor because we do not allow inheritance, functionality is provided by static functions diff --git a/bibletime/frontend/cexportmanager.cpp b/bibletime/frontend/cexportmanager.cpp index 1092e5c..279ada6 100644 --- a/bibletime/frontend/cexportmanager.cpp +++ b/bibletime/frontend/cexportmanager.cpp @@ -26,9 +26,9 @@ #include "util/scoped_resource.h" //Qt includes -#include <qclipboard.h> -#include <qptrlist.h> -#include <qprogressdialog.h> +#include <tqclipboard.h> +#include <tqptrlist.h> +#include <tqprogressdialog.h> //KDE includes #include <kprogress.h> @@ -43,8 +43,8 @@ using namespace Rendering; using namespace Printing; -CExportManager::CExportManager(const QString& caption, const bool showProgress, const QString& progressLabel, const CSwordBackend::FilterOptions filterOptions, const CSwordBackend::DisplayOptions displayOptions) { - m_caption = !caption.isEmpty() ? caption : QString::fromLatin1("BibleTime"); +CExportManager::CExportManager(const TQString& caption, const bool showProgress, const TQString& progressLabel, const CSwordBackend::FilterOptions filterOptions, const CSwordBackend::DisplayOptions displayOptions) { + m_caption = !caption.isEmpty() ? caption : TQString::fromLatin1("BibleTime"); m_progressLabel = progressLabel; m_filterOptions = filterOptions; m_displayOptions = displayOptions; @@ -59,7 +59,7 @@ const bool CExportManager::saveKey(CSwordKey* key, const Format format, const bo if (!key->module()) { return false; } - const QString filename = getSaveFileName(format); + const TQString filename = getSaveFileName(format); if (filename.isEmpty()) { return false; } @@ -79,23 +79,23 @@ const bool CExportManager::saveKey(CSwordKey* key, const Format format, const bo : new CPlainTextExportRendering(settings, m_displayOptions, filterOptions) ); - QString text; - QString startKey; - QString stopKey; + TQString text; + TQString startKey; + TQString stopKey; ListCSwordModuleInfo modules; modules.append(key->module()); CSwordVerseKey *vk = dynamic_cast<CSwordVerseKey*>(key); if (vk && vk->isBoundSet()) { - text = render->renderKeyRange( QString::fromUtf8(vk->LowerBound()), QString::fromUtf8(vk->UpperBound()), modules ); + text = render->renderKeyRange( TQString::fromUtf8(vk->LowerBound()), TQString::fromUtf8(vk->UpperBound()), modules ); } else { //no range supported text = render->renderSingleKey(key->key(), modules); } if (!progressWasCancelled()) { - CToolClass::savePlainFile(filename, text, false, (format==HTML) ? QTextStream::UnicodeUTF8 : QTextStream::Locale); + CToolClass::savePlainFile(filename, text, false, (format==HTML) ? TQTextStream::UnicodeUTF8 : TQTextStream::Locale); closeProgressDialog(); return true; } @@ -106,7 +106,7 @@ const bool CExportManager::saveKeyList(sword::ListKey* list, CSwordModuleInfo* m if (!list->Count()) return false; - const QString filename = getSaveFileName(format); + const TQString filename = getSaveFileName(format); if (filename.isEmpty()) { return false; } @@ -134,27 +134,27 @@ const bool CExportManager::saveKeyList(sword::ListKey* list, CSwordModuleInfo* m *list = sword::TOP; while (!list->Error() && !progressWasCancelled()) { - tree.append( new CTextRendering::KeyTreeItem(QString::fromLocal8Bit((const char*)(*list)) , module, itemSettings) ); + tree.append( new CTextRendering::KeyTreeItem(TQString::fromLocal8Bit((const char*)(*list)) , module, itemSettings) ); incProgress(); (*list)++; } - const QString text = render->renderKeyTree(tree); + const TQString text = render->renderKeyTree(tree); if (!progressWasCancelled()) { - CToolClass::savePlainFile(filename, text, false, (format==HTML) ? QTextStream::UnicodeUTF8 : QTextStream::Locale); + CToolClass::savePlainFile(filename, text, false, (format==HTML) ? TQTextStream::UnicodeUTF8 : TQTextStream::Locale); closeProgressDialog(); return true; } return false; }; -const bool CExportManager::saveKeyList(QPtrList<CSwordKey>& list, const Format format, const bool addText ) { +const bool CExportManager::saveKeyList(TQPtrList<CSwordKey>& list, const Format format, const bool addText ) { if (!list.count()) return false; - const QString filename = getSaveFileName(format); + const TQString filename = getSaveFileName(format); if (filename.isEmpty()) { return false; } @@ -185,10 +185,10 @@ const bool CExportManager::saveKeyList(QPtrList<CSwordKey>& list, const Format f incProgress(); }; - const QString text = render->renderKeyTree(tree); + const TQString text = render->renderKeyTree(tree); if (!progressWasCancelled()) { - CToolClass::savePlainFile(filename, text, false, (format==HTML) ? QTextStream::UnicodeUTF8 : QTextStream::Locale); + CToolClass::savePlainFile(filename, text, false, (format==HTML) ? TQTextStream::UnicodeUTF8 : TQTextStream::Locale); closeProgressDialog(); return true; } @@ -218,9 +218,9 @@ const bool CExportManager::copyKey(CSwordKey* key, const Format format, const bo : new CPlainTextExportRendering(settings, m_displayOptions, filterOptions) ); - QString text; - QString startKey; - QString stopKey; + TQString text; + TQString startKey; + TQString stopKey; ListCSwordModuleInfo modules; modules.append(key->module()); @@ -228,8 +228,8 @@ const bool CExportManager::copyKey(CSwordKey* key, const Format format, const bo CSwordVerseKey *vk = dynamic_cast<CSwordVerseKey*>(key); if (vk && vk->isBoundSet()) { text = render->renderKeyRange( - QString::fromUtf8(vk->LowerBound()), - QString::fromUtf8(vk->UpperBound()), + TQString::fromUtf8(vk->LowerBound()), + TQString::fromUtf8(vk->UpperBound()), modules ); } @@ -266,18 +266,18 @@ const bool CExportManager::copyKeyList(sword::ListKey* list, CSwordModuleInfo* m *list = sword::TOP; while (!list->Error() && !progressWasCancelled()) { - tree.append( new CTextRendering::KeyTreeItem(QString::fromLocal8Bit((const char*)(*list)) , module, itemSettings) ); + tree.append( new CTextRendering::KeyTreeItem(TQString::fromLocal8Bit((const char*)(*list)) , module, itemSettings) ); (*list)++; } - const QString text = render->renderKeyTree(tree); + const TQString text = render->renderKeyTree(tree); KApplication::clipboard()->setText(text); return true; }; -const bool CExportManager::copyKeyList(QPtrList<CSwordKey>& list, const Format format, const bool addText ) { +const bool CExportManager::copyKeyList(TQPtrList<CSwordKey>& list, const Format format, const bool addText ) { if (!list.count()) return false; @@ -305,7 +305,7 @@ const bool CExportManager::copyKeyList(QPtrList<CSwordKey>& list, const Format f incProgress(); }; - const QString text = render->renderKeyTree(tree); + const TQString text = render->renderKeyTree(tree); KApplication::clipboard()->setText(text); return true; }; @@ -314,19 +314,19 @@ const bool CExportManager::printKeyList(sword::ListKey* list, CSwordModuleInfo* CPrinter::KeyTreeItem::Settings settings; CPrinter::KeyTree tree; - QString startKey, stopKey; + TQString startKey, stopKey; setProgressRange(list->Count()); (*list) = sword::TOP; while (!list->Error() && !progressWasCancelled()) { sword::VerseKey* vk = dynamic_cast<sword::VerseKey*>(list); if (vk) { - startKey = QString::fromUtf8((const char*)(vk->LowerBound()) ); - stopKey = QString::fromUtf8((const char*)(vk->UpperBound()) ); + startKey = TQString::fromUtf8((const char*)(vk->LowerBound()) ); + stopKey = TQString::fromUtf8((const char*)(vk->UpperBound()) ); tree.append( new CPrinter::KeyTreeItem(startKey, stopKey, module, settings) ); } else { - startKey = QString::fromUtf8((const char*)*list); + startKey = TQString::fromUtf8((const char*)*list); tree.append( new CPrinter::KeyTreeItem(startKey, module, settings) ); } @@ -345,7 +345,7 @@ const bool CExportManager::printKeyList(sword::ListKey* list, CSwordModuleInfo* return false; }; -const bool CExportManager::printKey( CSwordModuleInfo* module, const QString& startKey, const QString& stopKey, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions ) { +const bool CExportManager::printKey( CSwordModuleInfo* module, const TQString& startKey, const TQString& stopKey, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions ) { CPrinter::KeyTreeItem::Settings settings; settings.keyRenderingFace = displayOptions.verseNumbers @@ -381,9 +381,9 @@ const bool CExportManager::printKey( CSwordKey* key, CSwordBackend::DisplayOptio } /** Prints a key using the hyperlink created by CReferenceManager. */ -const bool CExportManager::printByHyperlink( const QString& hyperlink, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions ) { - QString moduleName; - QString keyName; +const bool CExportManager::printByHyperlink( const TQString& hyperlink, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions ) { + TQString moduleName; + TQString keyName; CReferenceManager::Type type; CReferenceManager::decodeHyperlink(hyperlink, moduleName, keyName, type); @@ -409,13 +409,13 @@ const bool CExportManager::printByHyperlink( const QString& hyperlink, CSwordBac for (int i = 0; i < verses.Count(); ++i) { sword::VerseKey* element = dynamic_cast<sword::VerseKey*>(verses.GetElement(i)); if (element) { - const QString startKey = QString::fromUtf8(element->LowerBound().getText()); - const QString stopKey = QString::fromUtf8(element->UpperBound().getText()); + const TQString startKey = TQString::fromUtf8(element->LowerBound().getText()); + const TQString stopKey = TQString::fromUtf8(element->UpperBound().getText()); tree.append( new CPrinter::KeyTreeItem(startKey, stopKey, module, settings) ); } else if (verses.GetElement(i)) { - const QString key = QString::fromUtf8(verses.GetElement(i)->getText()); + const TQString key = TQString::fromUtf8(verses.GetElement(i)->getText()); tree.append( new CPrinter::KeyTreeItem(key, module, settings) ); } @@ -431,7 +431,7 @@ const bool CExportManager::printByHyperlink( const QString& hyperlink, CSwordBac return true; } -const bool CExportManager::printKeyList(const QStringList& list,CSwordModuleInfo* module, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions) { +const bool CExportManager::printKeyList(const TQStringList& list,CSwordModuleInfo* module, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions) { CPrinter::KeyTreeItem::Settings settings; settings.keyRenderingFace = displayOptions.verseNumbers @@ -442,13 +442,13 @@ const bool CExportManager::printKeyList(const QStringList& list,CSwordModuleInfo setProgressRange(list.count()); //ToDo: Fix that as soon as we use Qt > 3.1 - // const QStringList::const_iterator end = list.constEnd(); - const QStringList::const_iterator end = list.end(); + // const TQStringList::const_iterator end = list.constEnd(); + const TQStringList::const_iterator end = list.end(); //ToDo: Fix that as soon as we use Qt > 3.1 - // for (QStringList::const_iterator it = list.constBegin(); (it != end) && !progressWasCancelled(); ++it) { + // for (TQStringList::const_iterator it = list.constBegin(); (it != end) && !progressWasCancelled(); ++it) { - for (QStringList::const_iterator it = list.begin(); (it != end) && !progressWasCancelled(); ++it) { + for (TQStringList::const_iterator it = list.begin(); (it != end) && !progressWasCancelled(); ++it) { tree.append( new CPrinter::KeyTreeItem(*it, module, settings) ); incProgress(); @@ -466,7 +466,7 @@ const bool CExportManager::printKeyList(const QStringList& list,CSwordModuleInfo } /** Returns the string for the filedialogs to show the correct files. */ -const QString CExportManager::filterString( const Format format ) { +const TQString CExportManager::filterString( const Format format ) { switch (format) { case HTML: return i18n("*.html *.htm | HTML files\n *.* | All files (*.*)"); @@ -478,21 +478,21 @@ const QString CExportManager::filterString( const Format format ) { } /** Returns a filename to save a file. */ -const QString CExportManager::getSaveFileName(const Format format) { - return KFileDialog::getSaveFileName(QString::null, filterString(format), 0, m_caption); +const TQString CExportManager::getSaveFileName(const Format format) { + return KFileDialog::getSaveFileName(TQString::null, filterString(format), 0, m_caption); } /** Returns a string containing the linebreak for the current format. */ -const QString CExportManager::lineBreak(const Format format) { +const TQString CExportManager::lineBreak(const Format format) { if (static_cast<bool>(m_displayOptions.lineBreaks)) - return (format == HTML) ? QString::fromLatin1("<br/>\n") : QString::fromLatin1("\n"); + return (format == HTML) ? TQString::fromLatin1("<br/>\n") : TQString::fromLatin1("\n"); - return QString::null; + return TQString::null; } /** No descriptions */ void CExportManager::setProgressRange( const int items ) { - if (QProgressDialog* dlg = progressDialog()) { + if (TQProgressDialog* dlg = progressDialog()) { dlg->setTotalSteps(items); dlg->setProgress(0); dlg->setMinimumDuration(0); @@ -503,13 +503,13 @@ void CExportManager::setProgressRange( const int items ) { } /** Creates the progress dialog with the correct settings. */ -QProgressDialog* const CExportManager::progressDialog() { +TQProgressDialog* const CExportManager::progressDialog() { if (!m_showProgress) { return 0; } if (!m_progressDialog) { - m_progressDialog = new QProgressDialog( m_caption, m_progressLabel, 1, 0, "progress", true ); + m_progressDialog = new TQProgressDialog( m_caption, m_progressLabel, 1, 0, "progress", true ); m_progressDialog->setCaption("BibleTime"); } @@ -518,14 +518,14 @@ QProgressDialog* const CExportManager::progressDialog() { /** Increments the progress by one item. */ void CExportManager::incProgress() { - if (QProgressDialog* dlg = progressDialog()) { + if (TQProgressDialog* dlg = progressDialog()) { dlg->setProgress( dlg->progress() + 1 ); } } /** No descriptions */ const bool CExportManager::progressWasCancelled() { - if (QProgressDialog* dlg = progressDialog()) { + if (TQProgressDialog* dlg = progressDialog()) { return dlg->wasCancelled(); } @@ -534,7 +534,7 @@ const bool CExportManager::progressWasCancelled() { /** Closes the progress dialog immediatly. */ void CExportManager::closeProgressDialog() { - if (QProgressDialog* dlg = progressDialog()) { + if (TQProgressDialog* dlg = progressDialog()) { dlg->close(); dlg->reset(); } diff --git a/bibletime/frontend/cexportmanager.h b/bibletime/frontend/cexportmanager.h index cc654f6..54c98c0 100644 --- a/bibletime/frontend/cexportmanager.h +++ b/bibletime/frontend/cexportmanager.h @@ -19,13 +19,13 @@ #include "util/cpointers.h" //Qt includes -#include <qstring.h> -#include <qptrlist.h> +#include <tqstring.h> +#include <tqptrlist.h> class ListKey; class CSwordKey; class CSwordModuleInfo; -class QProgressDialog; +class TQProgressDialog; /** Contains the functions to export text to disk, clipboard or printer. * @author The BibleTime team @@ -39,49 +39,49 @@ public: Text }; - CExportManager(const QString& caption, const bool showProgress = true, const QString& progressLabel = QString::null, const CSwordBackend::FilterOptions filterOptions = CBTConfig::getFilterOptionDefaults(), const CSwordBackend::DisplayOptions displayOptions = CBTConfig::getDisplayOptionDefaults()); + CExportManager(const TQString& caption, const bool showProgress = true, const TQString& progressLabel = TQString::null, const CSwordBackend::FilterOptions filterOptions = CBTConfig::getFilterOptionDefaults(), const CSwordBackend::DisplayOptions displayOptions = CBTConfig::getDisplayOptionDefaults()); const bool saveKey(CSwordKey* key, const Format format, const bool addText); const bool saveKeyList(sword::ListKey* list, CSwordModuleInfo* module, const Format format, const bool addText); - const bool saveKeyList(QPtrList<CSwordKey>& list, const Format format, const bool addText ); + const bool saveKeyList(TQPtrList<CSwordKey>& list, const Format format, const bool addText ); const bool copyKey(CSwordKey* key, const Format format, const bool addText); const bool copyKeyList(sword::ListKey* list, CSwordModuleInfo* module, const Format format, const bool addText); - const bool copyKeyList(QPtrList<CSwordKey>& list, const Format format, const bool addText ); + const bool copyKeyList(TQPtrList<CSwordKey>& list, const Format format, const bool addText ); const bool printKey(CSwordKey* key, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions); - const bool printKey( CSwordModuleInfo* module, const QString& startKey, const QString& stopKey, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions ); -const bool printByHyperlink(const QString& hyperlink, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions); + const bool printKey( CSwordModuleInfo* module, const TQString& startKey, const TQString& stopKey, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions ); +const bool printByHyperlink(const TQString& hyperlink, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions); const bool printKeyList(sword::ListKey* list, CSwordModuleInfo* module, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions); - const bool printKeyList(const QStringList& list,CSwordModuleInfo* module, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions); + const bool printKeyList(const TQStringList& list,CSwordModuleInfo* module, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions); protected: // Protected methods /** * Returns the string for the filedialogs to show the correct files. */ - const QString filterString( const Format format ); + const TQString filterString( const Format format ); /** * Returns a filename to save a file. */ - const QString getSaveFileName(const Format format); + const TQString getSaveFileName(const Format format); /** * Returns a string containing the linebreak for the current format. */ - const QString lineBreak( const Format format ); + const TQString lineBreak( const Format format ); private: - QString m_caption; - QString m_progressLabel; + TQString m_caption; + TQString m_progressLabel; bool m_showProgress; CSwordBackend::FilterOptions m_filterOptions; CSwordBackend::DisplayOptions m_displayOptions; - QProgressDialog* m_progressDialog; + TQProgressDialog* m_progressDialog; /** * Creates the progress dialog with the correct settings. */ - QProgressDialog* const progressDialog(); + TQProgressDialog* const progressDialog(); /** * Returns the CSS string used in HTML pages. */ diff --git a/bibletime/frontend/cinfodisplay.cpp b/bibletime/frontend/cinfodisplay.cpp index 255a392..70dc05f 100644 --- a/bibletime/frontend/cinfodisplay.cpp +++ b/bibletime/frontend/cinfodisplay.cpp @@ -32,10 +32,10 @@ #include <listkey.h> //Qt includes -#include <qlayout.h> -#include <qlabel.h> -#include <qscrollview.h> -#include <qregexp.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqscrollview.h> +#include <tqregexp.h> //KDE includes #include <klocale.h> @@ -47,20 +47,20 @@ using namespace sword; namespace InfoDisplay { - CInfoDisplay::CInfoDisplay(QWidget *parent, const char *name) -: QWidget(parent, name) { - QVBoxLayout* layout = new QVBoxLayout(this); - QLabel* headingLabel = new QLabel(i18n("Mag (\"shift\" to lock)"),this); + CInfoDisplay::CInfoDisplay(TQWidget *parent, const char *name) +: TQWidget(parent, name) { + TQVBoxLayout* layout = new TQVBoxLayout(this); + TQLabel* headingLabel = new TQLabel(i18n("Mag (\"shift\" to lock)"),this); headingLabel->setMargin(5); m_htmlPart = CDisplay::createReadInstance(0, this); m_htmlPart->setMouseTracking(false); //we don't want strong/lemma/note mouse infos - KStdAction::copy(m_htmlPart->connectionsProxy(), SLOT(copySelection()), 0, "copyMagSelection"); + KStdAction::copy(m_htmlPart->connectionsProxy(), TQT_SLOT(copySelection()), 0, "copyMagSelection"); connect( m_htmlPart->connectionsProxy(), - SIGNAL(referenceClicked(const QString&, const QString&)), - SLOT(lookup(const QString&, const QString&)) + TQT_SIGNAL(referenceClicked(const TQString&, const TQString&)), + TQT_SLOT(lookup(const TQString&, const TQString&)) ); layout->addWidget(headingLabel); @@ -70,7 +70,7 @@ namespace InfoDisplay { CInfoDisplay::~CInfoDisplay() {} - void CInfoDisplay::lookup(const QString &mod_name, const QString &key_text) { + void CInfoDisplay::lookup(const TQString &mod_name, const TQString &key_text) { qWarning("%s %s", mod_name.ascii(), key_text.ascii()); CSwordModuleInfo* m = CPointers::backend()->findModuleByName(mod_name); Q_ASSERT(m); @@ -84,7 +84,7 @@ namespace InfoDisplay { CDisplayTemplateMgr::Settings settings; settings.pageCSS_ID = "infodisplay"; // settings.langAbbrev = ""; - QString content = mgr->fillTemplate(CBTConfig::get + TQString content = mgr->fillTemplate(CBTConfig::get (CBTConfig::displayStyle), key->renderedText(), settings); // qWarning("setting text:\n%s", content.latin1()); @@ -95,7 +95,7 @@ namespace InfoDisplay { } - void CInfoDisplay::setInfo(const InfoType type, const QString& data) { + void CInfoDisplay::setInfo(const InfoType type, const TQString& data) { ListInfoData list; list.append( qMakePair(type, data) ); @@ -114,7 +114,7 @@ namespace InfoDisplay { return; } - QString text; + TQString text; ListInfoData::const_iterator end = list.end(); for (ListInfoData::const_iterator it = list.begin(); it != end; ++it) { @@ -149,7 +149,7 @@ namespace InfoDisplay { CDisplayTemplateMgr::Settings settings; settings.pageCSS_ID = "infodisplay"; // settings.langAbbrev = ""; - QString content = mgr->fillTemplate(CBTConfig::get + TQString content = mgr->fillTemplate(CBTConfig::get (CBTConfig::displayStyle), text, settings); // qWarning("setting text:\n%s", content.latin1()); @@ -158,13 +158,13 @@ namespace InfoDisplay { } - const QString CInfoDisplay::decodeAbbreviation( const QString& data ) { - // QStringList strongs = QStringList::split("|", data); - QString ret; - QString text = data; + const TQString CInfoDisplay::decodeAbbreviation( const TQString& data ) { + // TQStringList strongs = TQStringList::split("|", data); + TQString ret; + TQString text = data; ret.append( - QString("<div class=\"abbreviation\"><h3>%1: %2</h3><p>%3</p></div>") + TQString("<div class=\"abbreviation\"><h3>%1: %2</h3><p>%3</p></div>") .arg(i18n("Abbreviation")) .arg("text") .arg(text)); @@ -172,10 +172,10 @@ namespace InfoDisplay { return ret; } - const QString CInfoDisplay::decodeCrossReference( const QString& data ) { + const TQString CInfoDisplay::decodeCrossReference( const TQString& data ) { Q_ASSERT(!data.isEmpty()); if (data.isEmpty()) { - return QString("<div class=\"crossrefinfo\"><h3>%1</h3></div>") + return TQString("<div class=\"crossrefinfo\"><h3>%1</h3></div>") .arg(i18n("Cross references")); } @@ -201,7 +201,7 @@ namespace InfoDisplay { (CBTConfig::standardBible); //a prefixed module gives the module to look into - QRegExp re("^[^ ]+:"); + TQRegExp re("^[^ ]+:"); // re.setMinimal(true); int pos = re.search(data,0); if (pos != -1) { @@ -209,7 +209,7 @@ namespace InfoDisplay { } if (pos > 0) { - const QString moduleName = data.left(pos); + const TQString moduleName = data.left(pos); // qWarning("found module %s", moduleName.latin1()); module = CPointers::backend()->findModuleByName(moduleName); if (!module) { @@ -237,16 +237,16 @@ namespace InfoDisplay { CTextRendering::KeyTreeItem* i = 0; if (vk && vk->isBoundSet()) { //render a range of keys i = new CTextRendering::KeyTreeItem( - QString::fromUtf8(vk->LowerBound().getText()), - QString::fromUtf8(vk->UpperBound().getText()), + TQString::fromUtf8(vk->LowerBound().getText()), + TQString::fromUtf8(vk->UpperBound().getText()), module, settings ); } else { i = new CTextRendering::KeyTreeItem( - QString::fromUtf8(key->getText()), - QString::fromUtf8(key->getText()), + TQString::fromUtf8(key->getText()), + TQString::fromUtf8(key->getText()), module, settings ); @@ -268,32 +268,32 @@ namespace InfoDisplay { // qWarning("rendered the tree: %s", renderer.renderKeyTree(tree).latin1()); //spanns containing rtl text need dir=rtl on their parent tag to be aligned properly - return QString("<div class=\"crossrefinfo\"><h3>%1</h3><div class=\"para\" dir=\"%2\">%3</div></div>") + return TQString("<div class=\"crossrefinfo\"><h3>%1</h3><div class=\"para\" dir=\"%2\">%3</div></div>") .arg(i18n("Cross references")) .arg(module ? ((module->textDirection() == CSwordModuleInfo::LeftToRight) ? "ltr" : "rtl") : "") .arg(renderer.renderKeyTree(tree)); } /*! - \fn CInfoDisplay::decodeFootnote( const QString& data ) + \fn CInfoDisplay::decodeFootnote( const TQString& data ) */ - const QString CInfoDisplay::decodeFootnote( const QString& data ) { - QStringList list = QStringList::split("/", data); + const TQString CInfoDisplay::decodeFootnote( const TQString& data ) { + TQStringList list = TQStringList::split("/", data); Q_ASSERT(list.count() >= 3); if (!list.count()) { - return QString::null; + return TQString::null; } - const QString modulename = list.first(); - const QString swordFootnote = list.last(); + const TQString modulename = list.first(); + const TQString swordFootnote = list.last(); // remove the first and the last and then rejoin it to get a key list.pop_back(); list.pop_front(); - const QString keyname = list.join("/"); + const TQString keyname = list.join("/"); CSwordModuleInfo* module = CPointers::backend()->findModuleByName(modulename); if (!module) { - return QString::null; + return TQString::null; } util::scoped_ptr<CSwordKey> key( CSwordKey::createInstance(module) ); @@ -302,32 +302,32 @@ namespace InfoDisplay { const char* note = module->module()->getEntryAttributes()["Footnote"][swordFootnote.latin1()]["body"].c_str(); - QString text = module->isUnicode() ? QString::fromUtf8(note) : QString(note); - text = QString::fromUtf8(module->module()->RenderText( + TQString text = module->isUnicode() ? TQString::fromUtf8(note) : TQString(note); + text = TQString::fromUtf8(module->module()->RenderText( module->isUnicode() ? (const char*)text.utf8() : (const char*)text.latin1() )); - return QString("<div class=\"footnoteinfo\"><h3>%1</h3><p>%2</p></div>") + return TQString("<div class=\"footnoteinfo\"><h3>%1</h3><p>%2</p></div>") .arg(i18n("Footnote")) .arg(text); } - const QString CInfoDisplay::decodeStrongs( const QString& data ) { - QStringList strongs = QStringList::split("|", data); - QString ret; + const TQString CInfoDisplay::decodeStrongs( const TQString& data ) { + TQStringList strongs = TQStringList::split("|", data); + TQString ret; - QStringList::const_iterator end = strongs.end(); - for (QStringList::const_iterator it = strongs.begin(); it != end; ++it) { + TQStringList::const_iterator end = strongs.end(); + for (TQStringList::const_iterator it = strongs.begin(); it != end; ++it) { CSwordModuleInfo* const module = CBTConfig::get ( - ((*it).left(1) == QString("H")) ? + ((*it).left(1) == TQString("H")) ? CBTConfig::standardHebrewStrongsLexicon : CBTConfig::standardGreekStrongsLexicon ); - QString text; + TQString text; if (module) { util::scoped_ptr<CSwordKey> key( CSwordKey::createInstance(module) ); key->key( (*it).mid(1) ); //skip H or G (language sign), will have to change later if we have better modules @@ -336,7 +336,7 @@ namespace InfoDisplay { //if the module could not be found just display an empty lemma info ret.append( - QString("<div class=\"strongsinfo\"><h3>%1: %2</h3><p>%3</p></div>") + TQString("<div class=\"strongsinfo\"><h3>%1: %2</h3><p>%3</p></div>") .arg(i18n("Strongs")) .arg(*it) .arg(text) @@ -346,15 +346,15 @@ namespace InfoDisplay { return ret; } - const QString CInfoDisplay::decodeMorph( const QString& data ) { - QStringList morphs = QStringList::split("|", data); - QString ret; + const TQString CInfoDisplay::decodeMorph( const TQString& data ) { + TQStringList morphs = TQStringList::split("|", data); + TQString ret; - for (QStringList::iterator it = morphs.begin(); it != morphs.end(); ++it) { + for (TQStringList::iterator it = morphs.begin(); it != morphs.end(); ++it) { CSwordModuleInfo* module = 0; bool skipFirstChar = false; - QString value = ""; - QString valueClass = ""; + TQString value = ""; + TQString valueClass = ""; int valStart = (*it).find(':'); if (valStart > -1) { @@ -369,7 +369,7 @@ namespace InfoDisplay { // Morphs usually don't have [GH] prepended, but some old OLB // codes do. We should check if we're digit after first char // to better guess this. - // No need to check len, if at(1) is > len QChar::null is + // No need to check len, if at(1) is > len TQChar::null is // returned which is ok to .isDigit() if (value.at(1).isDigit()) { switch (value.at(0).latin1()) { @@ -397,7 +397,7 @@ namespace InfoDisplay { } } - QString text; + TQString text; Q_ASSERT(module); if (module) { util::scoped_ptr<CSwordKey> key( CSwordKey::createInstance(module) ); @@ -415,7 +415,7 @@ namespace InfoDisplay { } //if the module wasn't found just display an empty morph info - ret.append( QString("<div class=\"morphinfo\"><h3>%1: %2</h3><p>%3</p></div>") + ret.append( TQString("<div class=\"morphinfo\"><h3>%1: %2</h3><p>%3</p></div>") .arg(i18n("Morphology")) .arg(value) .arg(text) @@ -425,20 +425,20 @@ namespace InfoDisplay { return ret; } - const QString CInfoDisplay::getWordTranslation( const QString& data ) { + const TQString CInfoDisplay::getWordTranslation( const TQString& data ) { CSwordModuleInfo* const module = CBTConfig::get (CBTConfig::standardLexicon); if (!module) { - return QString::null; + return TQString::null; } util::scoped_ptr<CSwordKey> key( CSwordKey::createInstance(module) ); key->key( data ); if (key->key().upper() != data.upper()) { //key not present in the lexicon - return QString::null; + return TQString::null; } - QString ret = QString("<div class=\"translationinfo\"><h3>%1: %2</h3><p>%3</p></div>") + TQString ret = TQString("<div class=\"translationinfo\"><h3>%1: %2</h3><p>%3</p></div>") .arg(i18n("Word lookup")) .arg(data) .arg(key->renderedText()); @@ -456,7 +456,7 @@ namespace InfoDisplay { settings.pageCSS_ID = "infodisplay"; m_htmlPart->setText( tmgr->fillTemplate(CBTConfig::get - (CBTConfig::displayStyle), QString::null, settings) ); + (CBTConfig::displayStyle), TQString::null, settings) ); } } //end of namespace InfoDisplay diff --git a/bibletime/frontend/cinfodisplay.h b/bibletime/frontend/cinfodisplay.h index 789aab1..4b081b6 100644 --- a/bibletime/frontend/cinfodisplay.h +++ b/bibletime/frontend/cinfodisplay.h @@ -17,9 +17,9 @@ #include "backend/ctextrendering.h" //Qt includes -#include <qwidget.h> -#include <qvaluelist.h> -#include <qpair.h> +#include <tqwidget.h> +#include <tqvaluelist.h> +#include <tqpair.h> //class forward declarations class CReadDisplay; @@ -29,7 +29,7 @@ namespace InfoDisplay { /** @author The BibleTime team */ -class CInfoDisplay : public QWidget { +class CInfoDisplay : public TQWidget { Q_OBJECT public: enum InfoType { @@ -42,26 +42,26 @@ public: WordGloss }; - typedef QPair<InfoType, QString> InfoData; - typedef QValueList<InfoData> ListInfoData; + typedef TQPair<InfoType, TQString> InfoData; + typedef TQValueList<InfoData> ListInfoData; - CInfoDisplay(QWidget *parent = 0, const char *name = 0); + CInfoDisplay(TQWidget *parent = 0, const char *name = 0); virtual ~CInfoDisplay(); - void setInfo(const InfoType, const QString& data); + void setInfo(const InfoType, const TQString& data); void setInfo(const ListInfoData&); void clearInfo(); protected: - const QString decodeAbbreviation( const QString& data ); - const QString decodeCrossReference( const QString& data ); - const QString decodeFootnote( const QString& data ); - const QString decodeStrongs( const QString& data ); - const QString decodeMorph( const QString& data ); - const QString getWordTranslation( const QString& data ); + const TQString decodeAbbreviation( const TQString& data ); + const TQString decodeCrossReference( const TQString& data ); + const TQString decodeFootnote( const TQString& data ); + const TQString decodeStrongs( const TQString& data ); + const TQString decodeMorph( const TQString& data ); + const TQString getWordTranslation( const TQString& data ); protected slots: - void lookup(const QString &, const QString &); + void lookup(const TQString &, const TQString &); private: CReadDisplay* m_htmlPart; diff --git a/bibletime/frontend/cinputdialog.cpp b/bibletime/frontend/cinputdialog.cpp index 1d27a6b..7647a73 100644 --- a/bibletime/frontend/cinputdialog.cpp +++ b/bibletime/frontend/cinputdialog.cpp @@ -13,28 +13,28 @@ #include "cinputdialog.h" //Qt includes -#include <qwidget.h> -#include <qlabel.h> -#include <qtextedit.h> -#include <qpushbutton.h> -#include <qlayout.h> +#include <tqwidget.h> +#include <tqlabel.h> +#include <tqtextedit.h> +#include <tqpushbutton.h> +#include <tqlayout.h> //KDE includes #include <klocale.h> #include <kseparator.h> -CInputDialog::CInputDialog(const QString& caption, const QString& description, const QString& text, QWidget *parent, const char *name, const bool modal ) : KDialog(parent,name,modal) { +CInputDialog::CInputDialog(const TQString& caption, const TQString& description, const TQString& text, TQWidget *parent, const char *name, const bool modal ) : KDialog(parent,name,modal) { setPlainCaption(caption); - QVBoxLayout* topLayout = new QVBoxLayout(this, 5,5); + TQVBoxLayout* topLayout = new TQVBoxLayout(this, 5,5); - QLabel* l = new QLabel(description, this); + TQLabel* l = new TQLabel(description, this); topLayout->addWidget(l); topLayout->addSpacing(10); - m_editWidget = new QTextEdit(this, "edit widget"); - m_editWidget->setWordWrap( QTextEdit::WidgetWidth ); + m_editWidget = new TQTextEdit(this, "edit widget"); + m_editWidget->setWordWrap( TQTextEdit::WidgetWidth ); m_editWidget->setText(text); if (!text.isEmpty()) m_editWidget->selectAll(); @@ -44,41 +44,41 @@ CInputDialog::CInputDialog(const QString& caption, const QString& description, c KSeparator* separator = new KSeparator(KSeparator::HLine, this); topLayout->addWidget(separator); - QHBoxLayout* buttonLayout = new QHBoxLayout(topLayout); + TQHBoxLayout* buttonLayout = new TQHBoxLayout(topLayout); buttonLayout->addStretch(2); - QPushButton* cancel = new QPushButton(this); + TQPushButton* cancel = new TQPushButton(this); cancel->setText(i18n("&Cancel")); - connect(cancel, SIGNAL(clicked()), SLOT(reject())); + connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); buttonLayout->addWidget(cancel,1); buttonLayout->addSpacing(15); - QPushButton* clear = new QPushButton(this); + TQPushButton* clear = new TQPushButton(this); clear->setText(i18n("C&lear")); - connect(clear, SIGNAL(clicked()),m_editWidget, SLOT(clear())); + connect(clear, TQT_SIGNAL(clicked()),m_editWidget, TQT_SLOT(clear())); buttonLayout->addWidget(clear,1); buttonLayout->addSpacing(15); - QPushButton* ok = new QPushButton(this); + TQPushButton* ok = new TQPushButton(this); ok->setText(i18n("&Ok")); - connect(ok, SIGNAL(clicked()), SLOT(accept())); + connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept())); buttonLayout->addWidget(ok,1); m_editWidget->setFocus(); } /** Returns the text entered at the moment. */ -const QString CInputDialog::text() { +const TQString CInputDialog::text() { return m_editWidget->text(); } /** A static function to get some using CInputDialog. */ -const QString CInputDialog::getText( const QString& caption, const QString& description, const QString& text, bool* ok, QWidget* parent, bool modal) { +const TQString CInputDialog::getText( const TQString& caption, const TQString& description, const TQString& text, bool* ok, TQWidget* parent, bool modal) { CInputDialog* dlg = new CInputDialog(caption, description, text, parent, "", modal); - QString ret = QString::null; + TQString ret = TQString::null; const bool isOk = (dlg->exec() == CInputDialog::Accepted); if (isOk) { diff --git a/bibletime/frontend/cinputdialog.h b/bibletime/frontend/cinputdialog.h index d4b0812..a7b24ae 100644 --- a/bibletime/frontend/cinputdialog.h +++ b/bibletime/frontend/cinputdialog.h @@ -15,8 +15,8 @@ //KDE includes #include <kdialog.h> -class QTextEdit; -class QWidget; +class TQTextEdit; +class TQWidget; /** This is a small input dialog with * a multiline edit for the text input. @@ -25,19 +25,19 @@ class QWidget; class CInputDialog : public KDialog { Q_OBJECT public: - CInputDialog(const QString& caption, const QString& description, const QString& text, QWidget *parent=0, const char *name=0, const bool modal = true); + CInputDialog(const TQString& caption, const TQString& description, const TQString& text, TQWidget *parent=0, const char *name=0, const bool modal = true); /** * A static function to get some using CInputDialog. */ - static const QString getText( const QString& caption, const QString& description, const QString& text = QString::null, bool* ok = 0, QWidget* parent = 0, bool modal = true); + static const TQString getText( const TQString& caption, const TQString& description, const TQString& text = TQString::null, bool* ok = 0, TQWidget* parent = 0, bool modal = true); /** * Returns the text entered at the moment. */ - const QString text(); + const TQString text(); // ~CInputDialog(); private: - QTextEdit* m_editWidget; + TQTextEdit* m_editWidget; }; #endif diff --git a/bibletime/frontend/cmanageindiceswidget.cpp b/bibletime/frontend/cmanageindiceswidget.cpp index 1b861b4..9928b49 100644 --- a/bibletime/frontend/cmanageindiceswidget.cpp +++ b/bibletime/frontend/cmanageindiceswidget.cpp @@ -23,14 +23,14 @@ #include "backend/cswordbackend.h" //Qt includes -#include <qlabel.h> -#include <qlayout.h> -#include <qframe.h> -#include <qpushbutton.h> -#include <qdir.h> -#include <qlistview.h> -#include <qfileinfo.h> -#include <qcheckbox.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqframe.h> +#include <tqpushbutton.h> +#include <tqdir.h> +#include <tqlistview.h> +#include <tqfileinfo.h> +#include <tqcheckbox.h> //KDE includes #include <klocale.h> @@ -40,7 +40,7 @@ namespace BookshelfManager { /** Constructor */ -CManageIndicesWidget::CManageIndicesWidget(QWidget* parent, const char* name) : +CManageIndicesWidget::CManageIndicesWidget(TQWidget* parent, const char* name) : ManageIndicesForm(parent, name) { initView(); @@ -57,8 +57,8 @@ CManageIndicesWidget::~CManageIndicesWidget() void CManageIndicesWidget::initView() { // Set description label - QVBoxLayout* box = new QVBoxLayout(m_labelFrame, 0, 0); - QLabel* mainLabel = CToolClass::explanationLabel(m_labelFrame, + TQVBoxLayout* box = new TQVBoxLayout(m_labelFrame, 0, 0); + TQLabel* mainLabel = CToolClass::explanationLabel(m_labelFrame, i18n("Manage module search indices"), i18n("You can use the list below to create and/or delete search indices for your installed works.")); box->addWidget(mainLabel); @@ -78,8 +78,8 @@ void CManageIndicesWidget::initView() m_deleteIndicesButton->setIconSet(SmallIcon("remove", 16)); // connect our signals/slots - connect(m_createIndicesButton, SIGNAL(clicked()), this, SLOT(createIndices())); - connect(m_deleteIndicesButton, SIGNAL(clicked()), this, SLOT(deleteIndices())); + connect(m_createIndicesButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(createIndices())); + connect(m_deleteIndicesButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteIndices())); } /** Populates the module list with installed modules and orphaned indices */ @@ -87,28 +87,28 @@ void CManageIndicesWidget::populateModuleList() { m_moduleList->clear(); // populate installed modules - m_modsWithIndices = new QCheckListItem(m_moduleList, i18n("Modules with indices"), - QCheckListItem::CheckBoxController); + m_modsWithIndices = new TQCheckListItem(m_moduleList, i18n("Modules with indices"), + TQCheckListItem::CheckBoxController); m_modsWithIndices->setOpen(true); - m_modsWithoutIndices = new QCheckListItem(m_moduleList, i18n("Modules without indices"), - QCheckListItem::CheckBoxController); + m_modsWithoutIndices = new TQCheckListItem(m_moduleList, i18n("Modules without indices"), + TQCheckListItem::CheckBoxController); m_modsWithoutIndices->setOpen(true); ListCSwordModuleInfo& modules = CPointers::backend()->moduleList(); ListCSwordModuleInfo::iterator end_it = modules.end(); for (ListCSwordModuleInfo::iterator it = modules.begin(); it != end_it; ++it) { - QCheckListItem* item = 0; + TQCheckListItem* item = 0; if ((*it)->hasIndex()) { - item = new QCheckListItem(m_modsWithIndices, (*it)->name(), - QCheckListItem::CheckBox); - item->setText(1, QString("%1 ").arg((*it)->indexSize() / 1024) + i18n("KiB")); + item = new TQCheckListItem(m_modsWithIndices, (*it)->name(), + TQCheckListItem::CheckBox); + item->setText(1, TQString("%1 ").arg((*it)->indexSize() / 1024) + i18n("KiB")); } else { - item = new QCheckListItem(m_modsWithoutIndices, (*it)->name(), - QCheckListItem::CheckBox); - item->setText(1, QString("0 ") + i18n("KiB")); + item = new TQCheckListItem(m_modsWithoutIndices, (*it)->name(), + TQCheckListItem::CheckBox); + item->setText(1, TQString("0 ") + i18n("KiB")); } } } @@ -116,9 +116,9 @@ void CManageIndicesWidget::populateModuleList() { /** Creates indices for selected modules if no index currently exists */ void CManageIndicesWidget::createIndices() { - QCheckListItem* top = m_modsWithoutIndices; + TQCheckListItem* top = m_modsWithoutIndices; bool indicesCreated = false; - QCheckListItem* item = (QCheckListItem*)top->firstChild(); + TQCheckListItem* item = (TQCheckListItem*)top->firstChild(); ListCSwordModuleInfo moduleList; while (item) { @@ -132,7 +132,7 @@ void CManageIndicesWidget::createIndices() indicesCreated = true; } } - item = (QCheckListItem*)item->nextSibling(); + item = (TQCheckListItem*)item->nextSibling(); } //Shows the progress dialog @@ -146,9 +146,9 @@ void CManageIndicesWidget::createIndices() void CManageIndicesWidget::deleteIndices() { // delete installed module indices - QCheckListItem* top = m_modsWithIndices; + TQCheckListItem* top = m_modsWithIndices; bool indicesDeleted = false; - QCheckListItem* item = (QCheckListItem*)top->firstChild(); + TQCheckListItem* item = (TQCheckListItem*)top->firstChild(); while (item) { if (item->isOn()) { CSwordModuleInfo* module = @@ -158,7 +158,7 @@ void CManageIndicesWidget::deleteIndices() indicesDeleted = true; } } - item = (QCheckListItem*)item->nextSibling(); + item = (TQCheckListItem*)item->nextSibling(); } // repopulate the list if an action was taken @@ -169,8 +169,8 @@ void CManageIndicesWidget::deleteIndices() void CManageIndicesWidget::deleteOrphanedIndices() { - QDir dir(CSwordModuleInfo::getGlobalBaseIndexLocation()); - dir.setFilter(QDir::Dirs); + TQDir dir(CSwordModuleInfo::getGlobalBaseIndexLocation()); + dir.setFilter(TQDir::Dirs); CSwordModuleInfo* module; for (unsigned int i = 0; i < dir.count(); i++) { diff --git a/bibletime/frontend/cmanageindiceswidget.h b/bibletime/frontend/cmanageindiceswidget.h index 47d9cd7..e9adb49 100644 --- a/bibletime/frontend/cmanageindiceswidget.h +++ b/bibletime/frontend/cmanageindiceswidget.h @@ -14,9 +14,9 @@ #include "frontend/manageindicesform.h" // uic generated -#include <qwidget.h> +#include <tqwidget.h> -class QCheckListItem; +class TQCheckListItem; namespace BookshelfManager { @@ -33,7 +33,7 @@ public: /** * Constructor */ - CManageIndicesWidget(QWidget* parent, const char* name = 0); + CManageIndicesWidget(TQWidget* parent, const char* name = 0); /** * Destructor @@ -51,8 +51,8 @@ protected: void populateModuleList(); // member variables - QCheckListItem* m_modsWithIndices; - QCheckListItem* m_modsWithoutIndices; + TQCheckListItem* m_modsWithIndices; + TQCheckListItem* m_modsWithoutIndices; public slots: /** diff --git a/bibletime/frontend/cmdiarea.cpp b/bibletime/frontend/cmdiarea.cpp index 1584466..4da250f 100644 --- a/bibletime/frontend/cmdiarea.cpp +++ b/bibletime/frontend/cmdiarea.cpp @@ -24,21 +24,21 @@ #include <klocale.h> //QT includes -#include <qobjectlist.h> -#include <qtimer.h> -#include <qevent.h> -#include <qtimer.h> +#include <tqobjectlist.h> +#include <tqtimer.h> +#include <tqevent.h> +#include <tqtimer.h> #if QT_VERSION < 0x030200 //We need this to close all windows with Qt < 3.2 -#include <qwidgetlist.h> +#include <tqwidgetlist.h> #endif -CMDIArea::CMDIArea(QWidget *parent, const char *name ) -: QWorkspace(parent, name), +CMDIArea::CMDIArea(TQWidget *parent, const char *name ) +: TQWorkspace(parent, name), m_guiOption(Nothing), m_childEvent(false), -m_appCaption(QString::null) { +m_appCaption(TQString::null) { initView(); initConnections(); readSettings(); @@ -52,12 +52,12 @@ void CMDIArea::initView() { /** Initilizes the connectiosn to SIGNALS */ void CMDIArea::initConnections() { - connect(this, SIGNAL(windowActivated(QWidget*)), - this, SLOT(slotClientActivated(QWidget*))); + connect(this, TQT_SIGNAL(windowActivated(TQWidget*)), + this, TQT_SLOT(slotClientActivated(TQWidget*))); } /** Called whan a client window was activated */ -void CMDIArea::slotClientActivated(QWidget* client) { +void CMDIArea::slotClientActivated(TQWidget* client) { if (!client || !isUpdatesEnabled()) { return; } @@ -68,8 +68,8 @@ void CMDIArea::slotClientActivated(QWidget* client) { return; } - QWidgetList windows = windowList(); - for ( QWidget* w = windows.first(); w; w = windows.next() ) { + TQWidgetList windows = windowList(); + for ( TQWidget* w = windows.first(); w; w = windows.next() ) { //Don't use!! It would disable accel enabling for the active window, see CDisplayWindow::windowActivated /* if (w == client) continue; @@ -83,8 +83,8 @@ void CMDIArea::slotClientActivated(QWidget* client) { } /** Reimplementation. Used to make use of the fixedGUIOption part. */ -void CMDIArea::childEvent( QChildEvent * e ) { - QWorkspace::childEvent(e); +void CMDIArea::childEvent( TQChildEvent * e ) { + TQWorkspace::childEvent(e); if ( m_childEvent || !e) { return; @@ -93,7 +93,7 @@ void CMDIArea::childEvent( QChildEvent * e ) { m_childEvent = true; if (!windowList().count()) { - m_appCaption = QString::null; + m_appCaption = TQString::null; emit sigSetToplevelCaption( KApplication::kApplication()->makeStdCaption(m_appCaption) ); emit sigLastPresenterClosed(); } @@ -113,8 +113,8 @@ void CMDIArea::childEvent( QChildEvent * e ) { } /** Reimplementation */ -void CMDIArea::resizeEvent(QResizeEvent* e) { - QWorkspace::resizeEvent(e); +void CMDIArea::resizeEvent(TQResizeEvent* e) { + TQWorkspace::resizeEvent(e); if (isUpdatesEnabled()) { triggerWindowUpdate(); @@ -132,7 +132,7 @@ void CMDIArea::deleteAll() { #if QT_VERSION >= 0x030200 closeAllWindows(); #else - QWidgetListIt it(windowList()); + TQWidgetListIt it(windowList()); while (it.current() != 0){ it.current()->close(); ++it; @@ -154,15 +154,15 @@ void CMDIArea::myTileVertical() { return; } - QPtrList<QWidget> windows = usableWindowList(); + TQPtrList<TQWidget> windows = usableWindowList(); if ((windows.count() == 1) && windows.at(0)) { m_appCaption = windows.at(0)->caption(); windows.at(0)->showMaximized(); } else { - QWidget* active = activeWindow(); - QWorkspace::tile(); + TQWidget* active = activeWindow(); + TQWorkspace::tile(); active->setFocus(); } } @@ -172,7 +172,7 @@ void CMDIArea::myTileHorizontal() { return; } - QPtrList<QWidget> windows = usableWindowList(); + TQPtrList<TQWidget> windows = usableWindowList(); if ((windows.count() == 1) && windows.at(0)) { m_appCaption = windows.at(0)->caption(); @@ -180,7 +180,7 @@ void CMDIArea::myTileHorizontal() { } else { - QWidget* active = activeWindow(); + TQWidget* active = activeWindow(); if (active->isMaximized()) { active->showNormal(); } @@ -190,9 +190,9 @@ void CMDIArea::myTileHorizontal() { int heightForEach = height() / windows.count(); int y = 0; for ( int i = 0; i < int(windows.count()); ++i ) { - QWidget *window = windows.at(i); + TQWidget *window = windows.at(i); window->parentWidget()->showNormal(); - qApp->sendPostedEvents( 0, QEvent::ShowNormal ); + qApp->sendPostedEvents( 0, TQEvent::ShowNormal ); const int preferredHeight = window->minimumHeight() + window->parentWidget()->baseSize().height(); const int actHeight = QMAX(heightForEach, preferredHeight); @@ -214,7 +214,7 @@ void CMDIArea::myCascade() { return; } - QPtrList<QWidget> windows = usableWindowList(); + TQPtrList<TQWidget> windows = usableWindowList(); if ( !windows.count() ) { return; } @@ -232,7 +232,7 @@ void CMDIArea::myCascade() { int x = 0; int y = 0; - QWidget* const active = activeWindow(); + TQWidget* const active = activeWindow(); if (active->isMaximized()) { active->showNormal(); } @@ -241,7 +241,7 @@ void CMDIArea::myCascade() { setUpdatesEnabled(false); for (int i(0); i < int(windows.count()); ++i) { - QWidget* window = windows.at(i); + TQWidget* window = windows.at(i); if (window == active) { //leave out the active window which should be the top window continue; } @@ -281,11 +281,11 @@ void CMDIArea::emitWindowCaptionChanged() { /*! \fn CMDIArea::usableWindowsCount() */ -QPtrList<QWidget> CMDIArea::usableWindowList() { - QPtrList<QWidget> ret; +TQPtrList<TQWidget> CMDIArea::usableWindowList() { + TQPtrList<TQWidget> ret; - QWidgetList windows = windowList(); - for ( QWidget* w = windows.first(); w; w = windows.next() ) { + TQWidgetList windows = windowList(); + for ( TQWidget* w = windows.first(); w; w = windows.next() ) { if (w->isMinimized() || w->isHidden()) { //not usable for us continue; } @@ -296,15 +296,15 @@ QPtrList<QWidget> CMDIArea::usableWindowList() { return ret; } -bool CMDIArea::eventFilter( QObject *o, QEvent *e ) { +bool CMDIArea::eventFilter( TQObject *o, TQEvent *e ) { Q_ASSERT(o); Q_ASSERT(e); - QWidget* w = dynamic_cast<QWidget*>( o ); - bool ret = QWorkspace::eventFilter(o,e); + TQWidget* w = dynamic_cast<TQWidget*>( o ); + bool ret = TQWorkspace::eventFilter(o,e); #if QT_VERSION >= 0x030300 - if ( w && (e->type() == QEvent::WindowStateChange) ) { + if ( w && (e->type() == TQEvent::WindowStateChange) ) { if (o->inherits("CDisplayWindow") && ((w->windowState() & Qt::WindowMinimized) || w->isHidden())) { //window was minimized, trigger a tile/cascade update if necessary triggerWindowUpdate(); ret = false; @@ -317,8 +317,8 @@ bool CMDIArea::eventFilter( QObject *o, QEvent *e ) { } #else if (w && o->inherits("CDisplayWindow")){ - if ((e->type() == QEvent::ShowMinimized) || - (e->type() == QEvent::Hide)){ + if ((e->type() == TQEvent::ShowMinimized) || + (e->type() == TQEvent::Hide)){ triggerWindowUpdate(); ret = false; } @@ -342,13 +342,13 @@ void CMDIArea::triggerWindowUpdate() { if (isUpdatesEnabled() && usableWindowList().count() ) { switch (m_guiOption) { case autoTileVertical: - QTimer::singleShot(0, this, SLOT(myTileVertical())); + TQTimer::singleShot(0, this, TQT_SLOT(myTileVertical())); break; case autoTileHorizontal: - QTimer::singleShot(0, this, SLOT(myTileHorizontal())); + TQTimer::singleShot(0, this, TQT_SLOT(myTileHorizontal())); break; case autoCascade: - QTimer::singleShot(0, this, SLOT(myCascade())); + TQTimer::singleShot(0, this, TQT_SLOT(myCascade())); break; default: qDebug("CMDIArea::triggerWindowUpdate: no known m_guiType"); diff --git a/bibletime/frontend/cmdiarea.h b/bibletime/frontend/cmdiarea.h index 4178b0a..5877e17 100644 --- a/bibletime/frontend/cmdiarea.h +++ b/bibletime/frontend/cmdiarea.h @@ -17,20 +17,20 @@ #include "backend/cswordmoduleinfo.h" //Qt includes -#include <qworkspace.h> -#include <qptrlist.h> -#include <qstrlist.h> -#include <qevent.h> +#include <tqworkspace.h> +#include <tqptrlist.h> +#include <tqstrlist.h> +#include <tqevent.h> class KPopupMenu; class CSwordModuleInfo; class CSwordKey; /** The MDI widget we use in BibleTime. - * Enhances QWorkspace. + * Enhances TQWorkspace. * @author The BibleTime Team */ -class CMDIArea : public QWorkspace, public CPointers { +class CMDIArea : public TQWorkspace, public CPointers { Q_OBJECT public: @@ -43,7 +43,7 @@ public: autoCascade, Nothing }; - CMDIArea(QWidget *parent, const char *name = 0 ); + CMDIArea(TQWidget *parent, const char *name = 0 ); /** */ void readSettings(); @@ -55,23 +55,23 @@ public: */ void setGUIOption( const MDIOption& newOption ); /** - * This works around a problem/limitation in QWorkspace. QWorkspace sets every time the + * This works around a problem/limitation in TQWorkspace. TQWorkspace sets every time the * application caption on its on way. This confuses BibleTime - wrong captions are generated. * This function returns the right caption (using the MDI child). */ - inline const QString currentApplicationCaption() const; + inline const TQString currentApplicationCaption() const; void emitWindowCaptionChanged(); /** * Forces an update of the currently chosen window arrangement. */ void triggerWindowUpdate(); - QPtrList<QWidget> usableWindowList(); + TQPtrList<TQWidget> usableWindowList(); public slots: /** * Called whan a client window was activated */ - void slotClientActivated(QWidget* client); + void slotClientActivated(TQWidget* client); /** * Deletes all the presenters in the MDI area. */ @@ -91,17 +91,17 @@ public slots: /** * Emits the signal to create a new display window in the MDI area. */ - inline void emitCreateDisplayWindow( ListCSwordModuleInfo modules, const QString keyName ); + inline void emitCreateDisplayWindow( ListCSwordModuleInfo modules, const TQString keyName ); protected: // Protected methods /** * Used to make use of the fixedGUIOption part. */ - virtual void childEvent (QChildEvent * e); + virtual void childEvent (TQChildEvent * e); /** * Reimplementation */ - virtual void resizeEvent(QResizeEvent* e); + virtual void resizeEvent(TQResizeEvent* e); /** * Initializes the connectiosn to SIGNALS */ @@ -110,32 +110,32 @@ protected: // Protected methods * Initializes the view of the MDI area */ void initView(); - bool eventFilter( QObject *o, QEvent *e ); + bool eventFilter( TQObject *o, TQEvent *e ); signals: // Signals /** * Emits a signal to set the acption of the toplevel widget. */ - void sigSetToplevelCaption(const QString&); + void sigSetToplevelCaption(const TQString&); /** * Is emitted when the last presenter was closed. */ void sigLastPresenterClosed(); - void createReadDisplayWindow(ListCSwordModuleInfo modules, const QString& keyName); + void createReadDisplayWindow(ListCSwordModuleInfo modules, const TQString& keyName); private: MDIOption m_guiOption; bool m_childEvent; - QString m_appCaption; + TQString m_appCaption; }; -/** This works around a problem/limitation in QWorkspace. QWorkspace sets every time the application caption on its on way. This confuses BibleTime - wrong captions are generated. This function returns the right caption (using the MDI child). */ -inline const QString CMDIArea::currentApplicationCaption() const { +/** This works around a problem/limitation in TQWorkspace. TQWorkspace sets every time the application caption on its on way. This confuses BibleTime - wrong captions are generated. This function returns the right caption (using the MDI child). */ +inline const TQString CMDIArea::currentApplicationCaption() const { return m_appCaption; } /** Emits the signal to create a new display window in the MDI area. */ -inline void CMDIArea::emitCreateDisplayWindow( ListCSwordModuleInfo modules, const QString keyName ) { +inline void CMDIArea::emitCreateDisplayWindow( ListCSwordModuleInfo modules, const TQString keyName ) { emit createReadDisplayWindow(modules, keyName); } diff --git a/bibletime/frontend/cmoduleindexdialog.cpp b/bibletime/frontend/cmoduleindexdialog.cpp index 172ca41..44af1d5 100644 --- a/bibletime/frontend/cmoduleindexdialog.cpp +++ b/bibletime/frontend/cmoduleindexdialog.cpp @@ -15,7 +15,7 @@ #include "util/scoped_resource.h" //Qt includes -#include <qstring.h> +#include <tqstring.h> //KDE includes #include <kapplication.h> @@ -38,7 +38,7 @@ void CModuleIndexDialog::indexAllModules( const ListCSwordModuleInfo& modules ) } m_currentModuleIndex = 0; - progress = new KProgressDialog(0, "progressDialog", i18n("Preparing instant search"), QString::null, true); + progress = new KProgressDialog(0, "progressDialog", i18n("Preparing instant search"), TQString::null, true); progress->setAllowCancel(false); progress->progressBar()->setTotalSteps( modules.count() * 100 ); progress->setMinimumDuration(0); @@ -47,8 +47,8 @@ void CModuleIndexDialog::indexAllModules( const ListCSwordModuleInfo& modules ) ListCSwordModuleInfo::const_iterator end_it = modules.end(); for( ListCSwordModuleInfo::const_iterator it = modules.begin(); it != end_it; ++it) { - (*it)->connectIndexingFinished(this, SLOT(slotFinished())); - (*it)->connectIndexingProgress(this, SLOT(slotModuleProgress(int))); + (*it)->connectIndexingFinished(this, TQT_SLOT(slotFinished())); + (*it)->connectIndexingProgress(this, TQT_SLOT(slotModuleProgress(int))); progress->setLabel(i18n("Creating index for work %1").arg((*it)->name())); qDebug("Building index for work %s", (*it)->name().latin1()); diff --git a/bibletime/frontend/cmoduleindexdialog.h b/bibletime/frontend/cmoduleindexdialog.h index 6ff4798..f259785 100644 --- a/bibletime/frontend/cmoduleindexdialog.h +++ b/bibletime/frontend/cmoduleindexdialog.h @@ -15,7 +15,7 @@ #include "backend/cswordmoduleinfo.h" //Qt includes -#include <qobject.h> +#include <tqobject.h> //forward declaration class KProgressDialog; @@ -27,7 +27,7 @@ class KProgressDialog; * * @author The BibleTime team <info@bibletime.info> */ -class CModuleIndexDialog : public QObject { +class CModuleIndexDialog : public TQObject { Q_OBJECT public: /** Get the singleton instance. diff --git a/bibletime/frontend/coptionsdialog.cpp b/bibletime/frontend/coptionsdialog.cpp index af01965..cdce01b 100644 --- a/bibletime/frontend/coptionsdialog.cpp +++ b/bibletime/frontend/coptionsdialog.cpp @@ -30,22 +30,22 @@ #include <stdlib.h> //QT includes -#include <qhbox.h> -#include <qlayout.h> -#include <qvbox.h> -#include <qdict.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qbuttongroup.h> -#include <qhbuttongroup.h> -#include <qradiobutton.h> -#include <qcolor.h> -#include <qtooltip.h> -#include <qwidgetstack.h> - -#include <qstringlist.h> -#include <qinputdialog.h> -#include <qdir.h> +#include <tqhbox.h> +#include <tqlayout.h> +#include <tqvbox.h> +#include <tqdict.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqbuttongroup.h> +#include <tqhbuttongroup.h> +#include <tqradiobutton.h> +#include <tqcolor.h> +#include <tqtooltip.h> +#include <tqwidgetstack.h> + +#include <tqstringlist.h> +#include <tqinputdialog.h> +#include <tqdir.h> //KDE includes #include <kapp.h> @@ -71,8 +71,8 @@ using std::string; using std::list; -COptionsDialog::COptionsDialog(QWidget *parent, const char *name, KActionCollection* actionCollection ) -: KDialogBase(IconList, i18n("Configure BibleTime"), Ok | Cancel | Apply, Ok, parent, name, true, true, QString::null, QString::null, QString::null) { +COptionsDialog::COptionsDialog(TQWidget *parent, const char *name, KActionCollection* actionCollection ) +: KDialogBase(IconList, i18n("Configure BibleTime"), Ok | Cancel | Apply, Ok, parent, name, true, true, TQString::null, TQString::null, TQString::null) { m_settings.keys.application.actionCollection = actionCollection; setIconListAllVisible(true); @@ -84,17 +84,17 @@ COptionsDialog::COptionsDialog(QWidget *parent, const char *name, KActionCollect } COptionsDialog::~COptionsDialog() { - //the actionCollections objects are deleted by their QWidget parent + //the actionCollections objects are deleted by their TQWidget parent } /** */ -void COptionsDialog::newDisplayWindowFontSelected(const QFont &newFont) { +void COptionsDialog::newDisplayWindowFontSelected(const TQFont &newFont) { CBTConfig::FontSettingsPair oldSettings = m_settings.fonts.fontMap[ m_settings.fonts.usage->currentText() ]; m_settings.fonts.fontMap.replace( m_settings.fonts.usage->currentText(), CBTConfig::FontSettingsPair(oldSettings.first, newFont) ); } /** Called when the combobox contents is changed */ -void COptionsDialog::newDisplayWindowFontAreaSelected(const QString& usage) { +void COptionsDialog::newDisplayWindowFontAreaSelected(const TQString& usage) { useOwnFontClicked( m_settings.fonts.fontMap[usage].first ); m_settings.fonts.useOwnFontBox->setChecked( m_settings.fonts.fontMap[usage].first ); @@ -135,14 +135,14 @@ const bool COptionsDialog::showPart( COptionsDialog::Parts /*ID*/ ) { /** Initializes the startup section of the OD. */ void COptionsDialog::initDisplay() { - QFrame* page = addPage(i18n("Display"), QString::null, DesktopIcon(CResMgr::settings::startup::icon,32)); - QVBoxLayout* layout = new QVBoxLayout(page); + TQFrame* page = addPage(i18n("Display"), TQString::null, DesktopIcon(CResMgr::settings::startup::icon,32)); + TQVBoxLayout* layout = new TQVBoxLayout(page); layout->setSpacing( 5 ); {//daily tips - m_settings.startup.showTips = new QCheckBox(page); + m_settings.startup.showTips = new TQCheckBox(page); m_settings.startup.showTips->setText(i18n("Show tip of the day")); - QToolTip::add + TQToolTip::add (m_settings.startup.showTips, CResMgr::settings::startup::dailyTip::tooltip ); @@ -153,9 +153,9 @@ void COptionsDialog::initDisplay() { layout->addSpacing(5); { //startup logo - m_settings.startup.showLogo = new QCheckBox(page); + m_settings.startup.showLogo = new TQCheckBox(page); m_settings.startup.showLogo->setText(i18n("Show startuplogo")); - QToolTip::add + TQToolTip::add (m_settings.startup.showLogo, CResMgr::settings::startup::showLogo::tooltip); @@ -173,14 +173,14 @@ void COptionsDialog::initDisplay() { layout->addSpacing( 5 ); - QHBoxLayout* hboxlayout = new QHBoxLayout(); + TQHBoxLayout* hboxlayout = new TQHBoxLayout(); - m_settings.displayStyle.styleChooser = new QComboBox( page ); //create first to enable buddy for label - connect( m_settings.displayStyle.styleChooser, SIGNAL( activated( int ) ), - this, SLOT( updateStylePreview() ) ); + m_settings.displayStyle.styleChooser = new TQComboBox( page ); //create first to enable buddy for label + connect( m_settings.displayStyle.styleChooser, TQT_SIGNAL( activated( int ) ), + this, TQT_SLOT( updateStylePreview() ) ); hboxlayout->addWidget( - new QLabel(m_settings.displayStyle.styleChooser, i18n("Available display styles:"), page) + new TQLabel(m_settings.displayStyle.styleChooser, i18n("Available display styles:"), page) ); hboxlayout->addWidget( m_settings.displayStyle.styleChooser ); hboxlayout->addStretch(); @@ -188,7 +188,7 @@ void COptionsDialog::initDisplay() { m_settings.displayStyle.stylePreview = new KHTMLPart(page); layout->addWidget( - new QLabel( + new TQLabel( m_settings.displayStyle.stylePreview->view(), i18n("Style preview"), page ) @@ -211,9 +211,9 @@ void COptionsDialog::initDisplay() { /** Init fonts section. */ void COptionsDialog::initLanguages() { - QFrame* page = addPage(i18n("Languages"), QString::null, DesktopIcon(CResMgr::settings::fonts::icon, 32)); - QVBoxLayout* layout = new QVBoxLayout(page,5); - layout->setResizeMode( QLayout::Minimum ); + TQFrame* page = addPage(i18n("Languages"), TQString::null, DesktopIcon(CResMgr::settings::fonts::icon, 32)); + TQVBoxLayout* layout = new TQVBoxLayout(page,5); + layout->setResizeMode( TQLayout::Minimum ); { //Sword locales layout->addWidget( @@ -223,19 +223,19 @@ void COptionsDialog::initLanguages() { create a new locale, see http://www.crosswire.org/sword/develop for details.")) ); - m_settings.fonts.swordLocaleCombo = new QComboBox(page); - QLabel* label = new QLabel(m_settings.fonts.swordLocaleCombo, i18n("Language for names of Bible books"), page); - QToolTip::add + m_settings.fonts.swordLocaleCombo = new TQComboBox(page); + TQLabel* label = new TQLabel(m_settings.fonts.swordLocaleCombo, i18n("Language for names of Bible books"), page); + TQToolTip::add (m_settings.fonts.swordLocaleCombo, CResMgr::settings::sword::general::language::tooltip); - QHBoxLayout* hBoxLayout = new QHBoxLayout(); + TQHBoxLayout* hBoxLayout = new TQHBoxLayout(); hBoxLayout->addWidget(label); hBoxLayout->addWidget(m_settings.fonts.swordLocaleCombo); hBoxLayout->addStretch(); layout->addLayout(hBoxLayout); - QStringList languageNames; + TQStringList languageNames; languageNames.append( languageMgr()->languageForAbbrev("en_US")->translatedName() ); // languageNames.append( i18n("English") ); @@ -266,7 +266,7 @@ void COptionsDialog::initLanguages() { (CBTConfig::language) ); - QString currentLanguageName; + TQString currentLanguageName; if ( l->isValid() && languageNames.contains(l->translatedName()) ) { //tranlated language name is in the box currentLanguageName = l->translatedName(); } @@ -276,7 +276,7 @@ void COptionsDialog::initLanguages() { (CBTConfig::language).local8Bit() ); if (locale) { - currentLanguageName = QString::fromLatin1(locale->getDescription()); + currentLanguageName = TQString::fromLatin1(locale->getDescription()); } } @@ -307,10 +307,10 @@ void COptionsDialog::initLanguages() { ) ); layout->addSpacing(5); - QHBoxLayout* hLayout = new QHBoxLayout(); + TQHBoxLayout* hLayout = new TQHBoxLayout(); - m_settings.fonts.usage = new QComboBox(page); - QToolTip::add + m_settings.fonts.usage = new TQComboBox(page); + TQToolTip::add (m_settings.fonts.usage, CResMgr::settings::fonts::typeChooser::tooltip); @@ -319,13 +319,13 @@ void COptionsDialog::initLanguages() { CLanguageMgr::LangMap langMap = languageMgr()->availableLanguages(); for ( CLanguageMgr::LangMapIterator it( langMap ); it.current(); ++it ) { - const QString name = it.current()->translatedName().isEmpty() ? + const TQString name = it.current()->translatedName().isEmpty() ? it.current()->abbrev() : it.current()->translatedName(); m_settings.fonts.fontMap.insert(name, CBTConfig::get (it.current()) ); } - for( QMap<QString, CBTConfig::FontSettingsPair>::Iterator it = m_settings.fonts.fontMap.begin(); it != m_settings.fonts.fontMap.end(); ++it ) { + for( TQMap<TQString, CBTConfig::FontSettingsPair>::Iterator it = m_settings.fonts.fontMap.begin(); it != m_settings.fonts.fontMap.end(); ++it ) { if ( m_settings.fonts.fontMap[it.key()].first ) { //show font icon m_settings.fonts.usage->insertItem(SmallIcon("fonts"), it.key() ); } @@ -334,19 +334,19 @@ void COptionsDialog::initLanguages() { } } - m_settings.fonts.useOwnFontBox = new QCheckBox(i18n("Use custom font"), page, "font checkbox"); - connect(m_settings.fonts.useOwnFontBox, SIGNAL(toggled(bool)), SLOT(useOwnFontClicked(bool))); + m_settings.fonts.useOwnFontBox = new TQCheckBox(i18n("Use custom font"), page, "font checkbox"); + connect(m_settings.fonts.useOwnFontBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(useOwnFontClicked(bool))); hLayout->addWidget(m_settings.fonts.useOwnFontBox); layout->addLayout(hLayout); //#warning TODO: remember the last selected font and jump there. - m_settings.fonts.fontChooser = new KFontChooser(page, "fonts", false, QStringList(), true, 5); + m_settings.fonts.fontChooser = new KFontChooser(page, "fonts", false, TQStringList(), true, 5); m_settings.fonts.fontChooser->setSampleText(i18n("The quick brown fox jumps over the lazy dog.")); layout->addWidget(m_settings.fonts.fontChooser); - connect(m_settings.fonts.fontChooser, SIGNAL(fontSelected(const QFont&)), SLOT(newDisplayWindowFontSelected(const QFont&))); - connect(m_settings.fonts.usage, SIGNAL(activated(const QString&)), SLOT(newDisplayWindowFontAreaSelected(const QString&))); + connect(m_settings.fonts.fontChooser, TQT_SIGNAL(fontSelected(const TQFont&)), TQT_SLOT(newDisplayWindowFontSelected(const TQFont&))); + connect(m_settings.fonts.usage, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(newDisplayWindowFontAreaSelected(const TQString&))); m_settings.fonts.fontChooser->setFont( m_settings.fonts.fontMap[m_settings.fonts.usage->currentText()].second ); useOwnFontClicked( m_settings.fonts.fontMap[m_settings.fonts.usage->currentText()].first ); @@ -358,21 +358,21 @@ void COptionsDialog::initLanguages() { /** Init accel key section. */ void COptionsDialog::initAccelerators() { - QVBox* page = addVBoxPage(i18n("HotKeys"), QString::null, DesktopIcon(CResMgr::settings::keys::icon,32)); + TQVBox* page = addVBoxPage(i18n("HotKeys"), TQString::null, DesktopIcon(CResMgr::settings::keys::icon,32)); CBTConfig::setupAccelSettings( CBTConfig::application, m_settings.keys.application.actionCollection ); - QHBox* hbox = new QHBox(page); - QLabel* label = new QLabel(i18n("Choose type:"), hbox); - m_settings.keys.typeChooser = new QComboBox(hbox); + TQHBox* hbox = new TQHBox(page); + TQLabel* label = new TQLabel(i18n("Choose type:"), hbox); + m_settings.keys.typeChooser = new TQComboBox(hbox); connect( - m_settings.keys.typeChooser, SIGNAL(activated(const QString&)), - SLOT(slotKeyChooserTypeChanged(const QString&)) + m_settings.keys.typeChooser, TQT_SIGNAL(activated(const TQString&)), + TQT_SLOT(slotKeyChooserTypeChanged(const TQString&)) ); - QLabel* dummy = new QLabel( hbox ); // empty label for stretch + TQLabel* dummy = new TQLabel( hbox ); // empty label for stretch hbox->setStretchFactor(label, 0); hbox->setStretchFactor(m_settings.keys.typeChooser, 0); @@ -380,7 +380,7 @@ void COptionsDialog::initAccelerators() { page->setStretchFactor(hbox, 0); - m_settings.keys.keyChooserStack = new QWidgetStack(page); + m_settings.keys.keyChooserStack = new TQWidgetStack(page); Q_ASSERT(m_settings.keys.keyChooserStack); page->setStretchFactor(m_settings.keys.keyChooserStack, 5); @@ -455,14 +455,14 @@ void COptionsDialog::initAccelerators() { /** Init Sword section. */ void COptionsDialog::initSword() { - QVBox* page = addVBoxPage(i18n("Desk"),QString::null, DesktopIcon(CResMgr::settings::sword::icon,32)); + TQVBox* page = addVBoxPage(i18n("Desk"),TQString::null, DesktopIcon(CResMgr::settings::sword::icon,32)); KTabCtl* tabCtl = new KTabCtl(page); { //Standard works - QFrame* currentTab = new QFrame(tabCtl); + TQFrame* currentTab = new TQFrame(tabCtl); tabCtl->addTab(currentTab, i18n("Standard works")); - QGridLayout* gridLayout = new QGridLayout(currentTab,10,2, 5,5); //the last row is for stretching available space - gridLayout->setResizeMode(QLayout::Minimum); + TQGridLayout* gridLayout = new TQGridLayout(currentTab,10,2, 5,5); //the last row is for stretching available space + gridLayout->setResizeMode(TQLayout::Minimum); gridLayout->addMultiCellWidget( CToolClass::explanationLabel(currentTab, i18n("Standard works"), @@ -471,73 +471,73 @@ void COptionsDialog::initSword() { 0,0,0,-1 /*fill the horizontal space*/ ); - m_settings.swords.standardBible = new QComboBox(currentTab); - QLabel* label = new QLabel(m_settings.swords.standardBible, i18n("Standard Bible"), currentTab); + m_settings.swords.standardBible = new TQComboBox(currentTab); + TQLabel* label = new TQLabel(m_settings.swords.standardBible, i18n("Standard Bible"), currentTab); label->setAutoResize(true); - QToolTip::add + TQToolTip::add (m_settings.swords.standardBible, CResMgr::settings::sword::modules::bible::tooltip); gridLayout->addWidget(label,1,0); gridLayout->addWidget(m_settings.swords.standardBible,1,1); - m_settings.swords.standardCommentary = new QComboBox(currentTab); - label = new QLabel(m_settings.swords.standardCommentary, i18n("Standard Commentary"), currentTab); + m_settings.swords.standardCommentary = new TQComboBox(currentTab); + label = new TQLabel(m_settings.swords.standardCommentary, i18n("Standard Commentary"), currentTab); label->setAutoResize(true); - QToolTip::add + TQToolTip::add (m_settings.swords.standardCommentary, CResMgr::settings::sword::modules::commentary::tooltip); gridLayout->addWidget(label,2,0); gridLayout->addWidget(m_settings.swords.standardCommentary,2,1); - m_settings.swords.standardLexicon = new QComboBox(currentTab); - label = new QLabel(m_settings.swords.standardLexicon, i18n("Standard Lexicon"), currentTab); + m_settings.swords.standardLexicon = new TQComboBox(currentTab); + label = new TQLabel(m_settings.swords.standardLexicon, i18n("Standard Lexicon"), currentTab); label->setAutoResize(true); - QToolTip::add + TQToolTip::add (m_settings.swords.standardLexicon, CResMgr::settings::sword::modules::lexicon::tooltip); gridLayout->addWidget(label,3,0); gridLayout->addWidget(m_settings.swords.standardLexicon,3,1); - m_settings.swords.standardDailyDevotional = new QComboBox(currentTab); - label = new QLabel(m_settings.swords.standardDailyDevotional, i18n("Standard Daily Devotional"), currentTab); + m_settings.swords.standardDailyDevotional = new TQComboBox(currentTab); + label = new TQLabel(m_settings.swords.standardDailyDevotional, i18n("Standard Daily Devotional"), currentTab); label->setAutoResize(true); - QToolTip::add + TQToolTip::add (m_settings.swords.standardDailyDevotional, CResMgr::settings::sword::modules::dailyDevotional::tooltip); gridLayout->addWidget(label,4,0); gridLayout->addWidget(m_settings.swords.standardDailyDevotional,4,1); - m_settings.swords.standardHebrewStrong = new QComboBox(currentTab); - label = new QLabel(m_settings.swords.standardHebrewStrong, i18n("Standard Hebrew Strong's Lexicon"), currentTab); + m_settings.swords.standardHebrewStrong = new TQComboBox(currentTab); + label = new TQLabel(m_settings.swords.standardHebrewStrong, i18n("Standard Hebrew Strong's Lexicon"), currentTab); label->setAutoResize(true); - QToolTip::add + TQToolTip::add (m_settings.swords.standardHebrewStrong, CResMgr::settings::sword::modules::hebrewStrongs::tooltip); gridLayout->addWidget(label,5,0); gridLayout->addWidget(m_settings.swords.standardHebrewStrong,5,1); - m_settings.swords.standardGreekStrong = new QComboBox(currentTab); - label = new QLabel(m_settings.swords.standardGreekStrong, i18n("Standard Greek Strong's Lexicon"), currentTab); + m_settings.swords.standardGreekStrong = new TQComboBox(currentTab); + label = new TQLabel(m_settings.swords.standardGreekStrong, i18n("Standard Greek Strong's Lexicon"), currentTab); label->setAutoResize(true); - QToolTip::add + TQToolTip::add (m_settings.swords.standardGreekStrong, CResMgr::settings::sword::modules::greekStrongs::tooltip); gridLayout->addWidget(label,6,0); gridLayout->addWidget(m_settings.swords.standardGreekStrong,6,1); - m_settings.swords.standardHebrewMorph = new QComboBox(currentTab); - label = new QLabel(m_settings.swords.standardHebrewMorph, i18n("Standard Hebrew Morphological Lexicon"), currentTab); - QToolTip::add + m_settings.swords.standardHebrewMorph = new TQComboBox(currentTab); + label = new TQLabel(m_settings.swords.standardHebrewMorph, i18n("Standard Hebrew Morphological Lexicon"), currentTab); + TQToolTip::add (m_settings.swords.standardHebrewMorph, CResMgr::settings::sword::modules::hebrewMorph::tooltip); gridLayout->addWidget(label,7,0); gridLayout->addWidget(m_settings.swords.standardHebrewMorph,7,1); - m_settings.swords.standardGreekMorph = new QComboBox(currentTab); - label = new QLabel(m_settings.swords.standardGreekMorph, i18n("Standard Greek Morphological Lexicon"), currentTab); + m_settings.swords.standardGreekMorph = new TQComboBox(currentTab); + label = new TQLabel(m_settings.swords.standardGreekMorph, i18n("Standard Greek Morphological Lexicon"), currentTab); label->setAutoResize(true); - QToolTip::add + TQToolTip::add (m_settings.swords.standardGreekMorph, CResMgr::settings::sword::modules::greekMorph::tooltip); gridLayout->addWidget(label,8,0); @@ -547,7 +547,7 @@ void COptionsDialog::initSword() { //fill the comboboxes with the right modules ListCSwordModuleInfo& modules = backend()->moduleList(); - QString modDescript; + TQString modDescript; ListCSwordModuleInfo::iterator end_it = modules.end(); for (ListCSwordModuleInfo::iterator it(modules.begin()); it != end_it; ++it) { modDescript = (*it)->config(CSwordModuleInfo::Description); @@ -594,9 +594,9 @@ void COptionsDialog::initSword() { } //using two lists and one loop is better than six loops with almost the same code :) - QPtrList<QComboBox> comboList; + TQPtrList<TQComboBox> comboList; comboList.setAutoDelete(false);//don't delete the combos accidentally - QStringList moduleList; + TQStringList moduleList; for (int i = 0; i <= (int)CBTConfig::lastModuleType; ++i) { //fill the combobox list in the right order (i.e. same order as the CBTConfig::module enum list) @@ -635,14 +635,14 @@ void COptionsDialog::initSword() { moduleList << m->config(CSwordModuleInfo::Description); } else { - moduleList << QString::null; + moduleList << TQString::null; } } - QString module = QString::null; + TQString module = TQString::null; int item = 0; int count = 0; - for (QComboBox* combo = comboList.first(); combo; combo = comboList.next() ) { + for (TQComboBox* combo = comboList.first(); combo; combo = comboList.next() ) { module = moduleList[comboList.at()]; count = combo->count(); combo->setMaximumWidth(300); @@ -656,9 +656,9 @@ void COptionsDialog::initSword() { } } { // ---------- new tab: filters -------- // - QFrame* currentTab = new QFrame(tabCtl); + TQFrame* currentTab = new TQFrame(tabCtl); tabCtl->addTab(currentTab, i18n("Text filters")); - QVBoxLayout* layout = new QVBoxLayout(currentTab,5); + TQVBoxLayout* layout = new TQVBoxLayout(currentTab,5); layout->addWidget( CToolClass::explanationLabel(currentTab, i18n("Text filters"), i18n("Filters control the appearance of text. \ @@ -667,56 +667,56 @@ You can change the filter settings in each display window, of course.")) ); layout->addSpacing(5); - m_settings.swords.lineBreaks = new QCheckBox(currentTab); + m_settings.swords.lineBreaks = new TQCheckBox(currentTab); m_settings.swords.lineBreaks->setText(i18n("Insert line break after each verse")); m_settings.swords.lineBreaks->setChecked(CBTConfig::get (CBTConfig::lineBreaks)); layout->addWidget(m_settings.swords.lineBreaks); - m_settings.swords.verseNumbers = new QCheckBox(currentTab); + m_settings.swords.verseNumbers = new TQCheckBox(currentTab); m_settings.swords.verseNumbers->setText(i18n("Show verse numbers")); m_settings.swords.verseNumbers->setChecked(CBTConfig::get (CBTConfig::verseNumbers)); layout->addWidget(m_settings.swords.verseNumbers); - m_settings.swords.headings = new QCheckBox(currentTab); + m_settings.swords.headings = new TQCheckBox(currentTab); m_settings.swords.headings->setText(i18n("Show section headings")); m_settings.swords.headings->setChecked(CBTConfig::get (CBTConfig::headings)); layout->addWidget(m_settings.swords.headings); - m_settings.swords.scriptureReferences = new QCheckBox(currentTab); + m_settings.swords.scriptureReferences = new TQCheckBox(currentTab); m_settings.swords.scriptureReferences->setText(i18n("Show scripture cross-references")); m_settings.swords.scriptureReferences->setChecked(CBTConfig::get (CBTConfig::scriptureReferences)); layout->addWidget(m_settings.swords.scriptureReferences); - m_settings.swords.greekAccents = new QCheckBox(currentTab); + m_settings.swords.greekAccents = new TQCheckBox(currentTab); m_settings.swords.greekAccents->setText(i18n("Show Greek accents")); m_settings.swords.greekAccents->setChecked(CBTConfig::get (CBTConfig::greekAccents)); layout->addWidget(m_settings.swords.greekAccents); - m_settings.swords.hebrewPoints = new QCheckBox(currentTab); + m_settings.swords.hebrewPoints = new TQCheckBox(currentTab); m_settings.swords.hebrewPoints->setText(i18n("Show Hebrew vowel points")); m_settings.swords.hebrewPoints->setChecked(CBTConfig::get (CBTConfig::hebrewPoints)); layout->addWidget(m_settings.swords.hebrewPoints); - m_settings.swords.hebrewCantillation = new QCheckBox(currentTab); + m_settings.swords.hebrewCantillation = new TQCheckBox(currentTab); m_settings.swords.hebrewCantillation->setText(i18n("Show Hebrew cantillation marks")); m_settings.swords.hebrewCantillation->setChecked(CBTConfig::get (CBTConfig::hebrewCantillation)); layout->addWidget(m_settings.swords.hebrewCantillation); - m_settings.swords.morphSegmentation = new QCheckBox(currentTab); + m_settings.swords.morphSegmentation = new TQCheckBox(currentTab); m_settings.swords.morphSegmentation->setText(i18n("Show morph segmentation")); m_settings.swords.morphSegmentation->setChecked(CBTConfig::get (CBTConfig::morphSegmentation)); layout->addWidget(m_settings.swords.morphSegmentation); - m_settings.swords.textualVariants = new QCheckBox(currentTab); + m_settings.swords.textualVariants = new TQCheckBox(currentTab); m_settings.swords.textualVariants->setText(i18n("Use textual variants")); m_settings.swords.textualVariants->setChecked(CBTConfig::get (CBTConfig::textualVariants)); @@ -775,7 +775,7 @@ void COptionsDialog::saveAccelerators() { /** No descriptions */ void COptionsDialog::saveLanguages() { - for(QMap<QString, CBTConfig::FontSettingsPair>::Iterator it = m_settings.fonts.fontMap.begin(); it != m_settings.fonts.fontMap.end(); ++it ) { + for(TQMap<TQString, CBTConfig::FontSettingsPair>::Iterator it = m_settings.fonts.fontMap.begin(); it != m_settings.fonts.fontMap.end(); ++it ) { const CLanguageMgr::Language* const lang = languageMgr()->languageForTranslatedName(it.key()); if (!lang->isValid()) { //we probably use a language, for which we have only the abbrev CLanguageMgr::Language l(it.key(), it.key(), it.key()); //create a temp language @@ -800,7 +800,7 @@ void COptionsDialog::saveDisplay() { /** No descriptions */ void COptionsDialog::saveSword() { for (int i = 0; i <= (int)CBTConfig::lastModuleType; ++i) { - QString moduleDescription = QString::null; + TQString moduleDescription = TQString::null; CBTConfig::modules moduleType = (CBTConfig::modules)(i); switch (moduleType) { @@ -838,9 +838,9 @@ void COptionsDialog::saveSword() { } - QString languageAbbrev; + TQString languageAbbrev; - const QString currentLanguageName = m_settings.fonts.swordLocaleCombo->currentText(); + const TQString currentLanguageName = m_settings.fonts.swordLocaleCombo->currentText(); const CLanguageMgr::Language* const l = CPointers::languageMgr()->languageForTranslatedName( currentLanguageName ); if (l && l->isValid()) { @@ -853,8 +853,8 @@ void COptionsDialog::saveSword() { SWLocale* locale = LocaleMgr::getSystemLocaleMgr()->getLocale((*it).c_str()); Q_ASSERT(locale); - if ( locale && (QString::fromLatin1(locale->getDescription()) == currentLanguageName) ) { - languageAbbrev = QString::fromLatin1(locale->getName()); //we found the abbrevation for the current language + if ( locale && (TQString::fromLatin1(locale->getDescription()) == currentLanguageName) ) { + languageAbbrev = TQString::fromLatin1(locale->getName()); //we found the abbrevation for the current language break; } } @@ -913,7 +913,7 @@ void COptionsDialog::updateStylePreview() { //update the style preview widget using namespace Rendering; - const QString styleName = m_settings.displayStyle.styleChooser->currentText(); + const TQString styleName = m_settings.displayStyle.styleChooser->currentText(); CTextRendering::KeyTree tree; @@ -921,40 +921,40 @@ void COptionsDialog::updateStylePreview() { settings.highlight = false; tree.append( new CTextRendering::KeyTreeItem( - QString("\n<span class=\"entryname\"><a name=\"John316\" href=\"sword://Bible/WEB/John 3:16\">16</a></span>%1") + TQString("\n<span class=\"entryname\"><a name=\"John316\" href=\"sword://Bible/WEB/John 3:16\">16</a></span>%1") .arg(i18n("For God so loved the world, that he gave his one and only Son, that whoever believes in him should not perish, but have eternal life.")), settings)); tree.append( new CTextRendering::KeyTreeItem( - QString("\n<span class=\"entryname\"><a name=\"John317\" href=\"sword://Bible/WEB/John 3:17\">17</a></span>%1") + TQString("\n<span class=\"entryname\"><a name=\"John317\" href=\"sword://Bible/WEB/John 3:17\">17</a></span>%1") .arg(i18n("For God didn't send his Son into the world to judge the world, but that the world should be saved through him.")), settings)); settings.highlight = true; tree.append( new CTextRendering::KeyTreeItem( - QString("\n<span class=\"entryname\"><a name=\"John318\" href=\"sword://Bible/WEB/John 3:18\">18</a></span>%1") + TQString("\n<span class=\"entryname\"><a name=\"John318\" href=\"sword://Bible/WEB/John 3:18\">18</a></span>%1") .arg(i18n("He who believes in him is not judged. He who doesn't believe has been judged already, because he has not believed in the name of the one and only Son of God.")), settings) ); settings.highlight = false; tree.append( new CTextRendering::KeyTreeItem( - QString("\n<span class=\"entryname\"><a name=\"John319\" href=\"sword://Bible/WEB/John 3:19\">19</a></span>%1") + TQString("\n<span class=\"entryname\"><a name=\"John319\" href=\"sword://Bible/WEB/John 3:19\">19</a></span>%1") .arg(i18n("This is the judgment, that the light has come into the world, and men loved the darkness rather than the light; for their works were evil.")), settings)); tree.append( new CTextRendering::KeyTreeItem( - QString("\n<span class=\"entryname\"><a name=\"John320\" href=\"sword://Bible/WEB/John 3:20\">20</a></span>%1<br/>") + TQString("\n<span class=\"entryname\"><a name=\"John320\" href=\"sword://Bible/WEB/John 3:20\">20</a></span>%1<br/>") .arg(i18n("For everyone who does evil hates the light, and doesn't come to the light, lest his works would be exposed.")), settings)); tree.append( new CTextRendering::KeyTreeItem( - QString("\n<span class=\"entryname\"><a name=\"John321\" href=\"sword://Bible/WEB/John 3:21\">21</a></span>%1") + TQString("\n<span class=\"entryname\"><a name=\"John321\" href=\"sword://Bible/WEB/John 3:21\">21</a></span>%1") .arg(i18n("But he who does the truth comes to the light, that his works may be revealed, that they have been done in God.")), settings)); - const QString oldStyleName = CBTConfig::get + const TQString oldStyleName = CBTConfig::get (CBTConfig::displayStyle); CBTConfig::set (CBTConfig::displayStyle, styleName); @@ -968,9 +968,9 @@ void COptionsDialog::updateStylePreview() { (CBTConfig::displayStyle, oldStyleName); } -void COptionsDialog::slotKeyChooserTypeChanged(const QString& title) { +void COptionsDialog::slotKeyChooserTypeChanged(const TQString& title) { //delete all KKeyChoosers which may not share accels, because this class checks in all instances for key conflicts - typedef QPtrList<KKeyChooser> KeyChooserList; + typedef TQPtrList<KKeyChooser> KeyChooserList; KeyChooserList list; list.append(m_settings.keys.bible.keyChooser); list.append(m_settings.keys.commentary.keyChooser); @@ -985,11 +985,11 @@ void COptionsDialog::slotKeyChooserTypeChanged(const QString& title) { } } #else - //Normally we know a QPtrListIterator is done when it.current() == 0 + //Normally we know a TQPtrListIterator is done when it.current() == 0 //but now a value can actually be zero, which would be //indistinguishable from the end condition. //Therefore, more complex logic is needed. - QPtrListIterator<KKeyChooser> it(list); + TQPtrListIterator<KKeyChooser> it(list); if (!it.isEmpty()){ while (!it.atLast()){ if (it.current()){ diff --git a/bibletime/frontend/coptionsdialog.h b/bibletime/frontend/coptionsdialog.h index b6431ca..9bc649a 100644 --- a/bibletime/frontend/coptionsdialog.h +++ b/bibletime/frontend/coptionsdialog.h @@ -17,14 +17,14 @@ #include "util/cpointers.h" //QT includes -#include <qwidget.h> -#include <qframe.h> -#include <qguardedptr.h> -#include <qlabel.h> -#include <qstring.h> -#include <qmap.h> -#include <qdict.h> -#include <qmap.h> +#include <tqwidget.h> +#include <tqframe.h> +#include <tqguardedptr.h> +#include <tqlabel.h> +#include <tqstring.h> +#include <tqmap.h> +#include <tqdict.h> +#include <tqmap.h> //KDE includes #include <kdialogbase.h> @@ -34,11 +34,11 @@ #include <kapp.h> #include <klocale.h> -class QHBox; -class QCheckBox; -class QComboBox; -class QRadioButton; -class QWidgetStack; +class TQHBox; +class TQCheckBox; +class TQComboBox; +class TQRadioButton; +class TQWidgetStack; class KListBox; class KKeyChooser; @@ -54,7 +54,7 @@ class COptionsDialog : public KDialogBase, public CPointers { Q_OBJECT public: - COptionsDialog(QWidget *parent, const char *name, KActionCollection* actionCollection); + COptionsDialog(TQWidget *parent, const char *name, KActionCollection* actionCollection); virtual ~COptionsDialog(); enum Parts { @@ -71,46 +71,46 @@ public: private: struct Settings { struct StartupSettings { - QCheckBox* showTips; - QCheckBox* showLogo; + TQCheckBox* showTips; + TQCheckBox* showLogo; } startup; struct SwordSettings { - QComboBox* standardBible; - QComboBox* standardCommentary; - QComboBox* standardLexicon; - QComboBox* standardDailyDevotional; - QComboBox* standardHebrewStrong; - QComboBox* standardGreekStrong; - QComboBox* standardHebrewMorph; - QComboBox* standardGreekMorph; - QCheckBox* lineBreaks; - QCheckBox* verseNumbers; - QCheckBox* headings; - QCheckBox* hebrewPoints; - QCheckBox* hebrewCantillation; - QCheckBox* morphSegmentation; - QCheckBox* greekAccents; - QCheckBox* textualVariants; - QCheckBox* scriptureReferences; + TQComboBox* standardBible; + TQComboBox* standardCommentary; + TQComboBox* standardLexicon; + TQComboBox* standardDailyDevotional; + TQComboBox* standardHebrewStrong; + TQComboBox* standardGreekStrong; + TQComboBox* standardHebrewMorph; + TQComboBox* standardGreekMorph; + TQCheckBox* lineBreaks; + TQCheckBox* verseNumbers; + TQCheckBox* headings; + TQCheckBox* hebrewPoints; + TQCheckBox* hebrewCantillation; + TQCheckBox* morphSegmentation; + TQCheckBox* greekAccents; + TQCheckBox* textualVariants; + TQCheckBox* scriptureReferences; } swords; // not: sword instead of sword -> namespace error struct KeySettings { - QComboBox* typeChooser; - QWidgetStack* keyChooserStack; + TQComboBox* typeChooser; + TQWidgetStack* keyChooserStack; struct WindowType { - QGuardedPtr<KKeyChooser> keyChooser; + TQGuardedPtr<KKeyChooser> keyChooser; KActionCollection* actionCollection; - QString title; + TQString title; WindowType() { keyChooser = 0; actionCollection = 0; }; - WindowType(const QString& newTitle) { + WindowType(const TQString& newTitle) { title = newTitle; keyChooser = 0; @@ -128,18 +128,18 @@ private: keys; struct DisplayStyleSettings { - QComboBox* styleChooser; + TQComboBox* styleChooser; KHTMLPart* stylePreview; } displayStyle; struct FontSettings { - QComboBox* swordLocaleCombo; + TQComboBox* swordLocaleCombo; KFontChooser* fontChooser; - QComboBox* usage; - QCheckBox* useOwnFontBox; + TQComboBox* usage; + TQCheckBox* useOwnFontBox; //the pair os to check whether the standard font (bool == false) or whether an own font should be used (true) - QMap<QString,CBTConfig::FontSettingsPair> fontMap; + TQMap<TQString,CBTConfig::FontSettingsPair> fontMap; } fonts; } @@ -149,11 +149,11 @@ protected slots: // Protected slots /** * Called when a new font in the fonts page was selected. */ - void newDisplayWindowFontSelected(const QFont &); + void newDisplayWindowFontSelected(const TQFont &); /** * Called when the combobox contents is changed */ - void newDisplayWindowFontAreaSelected(const QString&); + void newDisplayWindowFontAreaSelected(const TQString&); /** * Called if the OK button was clicked */ @@ -174,7 +174,7 @@ protected slots: // Protected slots /** * The type of the keyaccel area changed */ - void slotKeyChooserTypeChanged(const QString&); + void slotKeyChooserTypeChanged(const TQString&); protected: // Protected methods /** diff --git a/bibletime/frontend/cprinter.cpp b/bibletime/frontend/cprinter.cpp index 1fad2bc..538fec3 100644 --- a/bibletime/frontend/cprinter.cpp +++ b/bibletime/frontend/cprinter.cpp @@ -23,8 +23,8 @@ namespace Printing { - CPrinter::CPrinter(QObject *, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions) -: QObject(0), + CPrinter::CPrinter(TQObject *, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions) +: TQObject(0), CDisplayRendering(displayOptions, filterOptions), m_htmlPart(new KHTMLPart(0, 0, this)) { @@ -57,7 +57,7 @@ namespace Printing { m_htmlPart->view()->print(); } - const QString CPrinter::entryLink(const KeyTreeItem& item, CSwordModuleInfo* module) { + const TQString CPrinter::entryLink(const KeyTreeItem& item, CSwordModuleInfo* module) { Q_ASSERT(module); if (module->type() == CSwordModuleInfo::Bible) { @@ -66,17 +66,17 @@ namespace Printing { switch (item.settings().keyRenderingFace) { case KeyTreeItem::Settings::CompleteShort: - return QString::fromUtf8(vk.getShortText()); + return TQString::fromUtf8(vk.getShortText()); case KeyTreeItem::Settings::CompleteLong: return vk.key(); case KeyTreeItem::Settings::NoKey: - return QString::null; + return TQString::null; case KeyTreeItem::Settings::SimpleKey: //fall through default: - return QString::number(vk.Verse()); + return TQString::number(vk.Verse()); } } @@ -84,12 +84,12 @@ namespace Printing { return item.key(); } - const QString CPrinter::renderEntry( const KeyTreeItem& i, CSwordKey* ) { + const TQString CPrinter::renderEntry( const KeyTreeItem& i, CSwordKey* ) { const CPrinter::KeyTreeItem* printItem = dynamic_cast<const CPrinter::KeyTreeItem*>(&i); Q_ASSERT(printItem); if (printItem && printItem->hasAlternativeContent()) { - QString ret = QString::fromLatin1("<div class=\"entry\"><div class=\"rangeheading\">%1</div>").arg(printItem->getAlternativeContent()); + TQString ret = TQString::fromLatin1("<div class=\"entry\"><div class=\"rangeheading\">%1</div>").arg(printItem->getAlternativeContent()); if (i.hasChildItems()) { KeyTree const * tree = i.childList(); @@ -106,7 +106,7 @@ namespace Printing { return CDisplayRendering::renderEntry(i); } - const QString CPrinter::finishText(const QString& text, KeyTree& tree) { + const TQString CPrinter::finishText(const TQString& text, KeyTree& tree) { ListCSwordModuleInfo modules = tree.collectModules(); Q_ASSERT(modules.count() > 0); @@ -121,7 +121,7 @@ namespace Printing { : "unknown"; settings.pageDirection = (modules.count() == 1) ? ((modules.first()->textDirection() == CSwordModuleInfo::LeftToRight) ? "ltr" : "rtl") - : QString::null; + : TQString::null; CDisplayTemplateMgr* tMgr = CPointers::displayTemplateManager(); return tMgr->fillTemplate(CBTConfig::get(CBTConfig::displayStyle), text, settings); diff --git a/bibletime/frontend/cprinter.h b/bibletime/frontend/cprinter.h index fd28280..c65bb7e 100644 --- a/bibletime/frontend/cprinter.h +++ b/bibletime/frontend/cprinter.h @@ -20,7 +20,7 @@ #include "frontend/cbtconfig.h" //Qt includes -#include <qobject.h> +#include <tqobject.h> class KHTMLPart; @@ -31,11 +31,11 @@ namespace Printing { * * @author The BibleTime team */ -class CPrinter : public QObject, public Rendering::CDisplayRendering { +class CPrinter : public TQObject, public Rendering::CDisplayRendering { Q_OBJECT public: CPrinter( - QObject *parent, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions + TQObject *parent, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions ); virtual ~CPrinter(); @@ -43,9 +43,9 @@ public: void printKeyTree( KeyTree& ); protected: - virtual const QString entryLink(const KeyTreeItem& item, CSwordModuleInfo* const module); - virtual const QString renderEntry( const KeyTreeItem&, CSwordKey* = 0 ); - virtual const QString finishText(const QString& arg1, KeyTree& tree); + virtual const TQString entryLink(const KeyTreeItem& item, CSwordModuleInfo* const module); + virtual const TQString renderEntry( const KeyTreeItem&, CSwordKey* = 0 ); + virtual const TQString finishText(const TQString& arg1, KeyTree& tree); private: KHTMLPart* m_htmlPart; diff --git a/bibletime/frontend/cprofile.cpp b/bibletime/frontend/cprofile.cpp index 309329e..7c26278 100644 --- a/bibletime/frontend/cprofile.cpp +++ b/bibletime/frontend/cprofile.cpp @@ -12,11 +12,11 @@ #include "cprofile.h" //Qt includes -#include <qdom.h> -#include <qfile.h> -#include <qstring.h> -#include <qtextstream.h> -#include <qregexp.h> +#include <tqdom.h> +#include <tqfile.h> +#include <tqstring.h> +#include <tqtextstream.h> +#include <tqregexp.h> //KDE includes #include <kstandarddirs.h> @@ -26,7 +26,7 @@ namespace Profile { -CProfile::CProfile( const QString& file, const QString& name ): +CProfile::CProfile( const TQString& file, const TQString& name ): m_name(name.isEmpty() ? i18n("unknown") : name), m_filename(file), m_fullscreen(false), @@ -38,7 +38,7 @@ m_geometry(10,20,640,480) { } else if (m_filename.isEmpty() && !name.isEmpty()) { m_filename = name; - m_filename.replace(QRegExp("\\s=#."),"_"); + m_filename.replace(TQRegExp("\\s=#."),"_"); KStandardDirs stdDirs; m_filename = stdDirs.saveLocation("data", "bibletime/sessions/") + m_filename + ".xml"; init(m_filename); @@ -53,20 +53,20 @@ CProfile::~CProfile() { } /** Loads the profile from the file given in the constructor. */ -QPtrList<CProfileWindow> CProfile::load() { - QFile file(m_filename); +TQPtrList<CProfileWindow> CProfile::load() { + TQFile file(m_filename); if (!file.exists()) - return QPtrList<CProfileWindow>(); + return TQPtrList<CProfileWindow>(); - QDomDocument doc; + TQDomDocument doc; if (file.open(IO_ReadOnly)) { - QTextStream t( &file ); - t.setEncoding(QTextStream::UnicodeUTF8); + TQTextStream t( &file ); + t.setEncoding(TQTextStream::UnicodeUTF8); doc.setContent(t.read()); file.close(); } - QDomElement document = doc.documentElement(); + TQDomElement document = doc.documentElement(); if( document.tagName() != "BibleTimeProfile" && document.tagName() != "BibleTime" ) { //BibleTime was used in syntax version 1.0 qWarning("CProfile::load: Missing BibleTime doc"); return m_profileWindows; @@ -79,8 +79,8 @@ QPtrList<CProfileWindow> CProfile::load() { //load settings of the main window { // see if there's a section with the name MAINWINDOW - QDomElement elem = document.firstChild().toElement(); - QDomElement mainWindow; + TQDomElement elem = document.firstChild().toElement(); + TQDomElement mainWindow; while (!elem.isNull()) { if (elem.tagName() == "MAINWINDOW") { mainWindow = elem; @@ -90,8 +90,8 @@ QPtrList<CProfileWindow> CProfile::load() { } if (!mainWindow.isNull()) { //was found setFullscreen( (bool)mainWindow.attribute("fullscreen").toInt()); - QDomElement object = mainWindow.namedItem("GEOMETRY").toElement(); - QRect rect; + TQDomElement object = mainWindow.namedItem("GEOMETRY").toElement(); + TQRect rect; if(!object.isNull()) { if (object.hasAttribute("x")) { rect.setX(object.attribute("x").toInt()); @@ -115,7 +115,7 @@ QPtrList<CProfileWindow> CProfile::load() { } m_profileWindows.clear(); - QDomElement elem = document.firstChild().toElement(); + TQDomElement elem = document.firstChild().toElement(); while (!elem.isNull()) { CProfileWindow* p = 0; if (elem.tagName() == "BIBLE") { @@ -144,9 +144,9 @@ QPtrList<CProfileWindow> CProfile::load() { p->setFocus( static_cast<bool>(elem.attribute("hasFocus").toInt()) ); } - QRect rect; + TQRect rect; - QDomElement object = elem.namedItem("GEOMETRY").toElement(); + TQDomElement object = elem.namedItem("GEOMETRY").toElement(); if(!object.isNull()) { if (object.hasAttribute("x")) { rect.setX(object.attribute("x").toInt()); @@ -169,8 +169,8 @@ QPtrList<CProfileWindow> CProfile::load() { object = elem.namedItem("MODULES").toElement(); if(!object.isNull()) { if (object.hasAttribute("list")) { - const QString sep = object.hasAttribute("separator") ? object.attribute("separator") : "|"; - QStringList modules = QStringList::split(sep, object.attribute("list")); + const TQString sep = object.hasAttribute("separator") ? object.attribute("separator") : "|"; + TQStringList modules = TQStringList::split(sep, object.attribute("list")); p->setModules(modules); } } @@ -198,27 +198,27 @@ QPtrList<CProfileWindow> CProfile::load() { } /** Saves the profile to the file given in the constructor. */ -const bool CProfile::save(QPtrList<CProfileWindow> windows) { +const bool CProfile::save(TQPtrList<CProfileWindow> windows) { /** Save the settings using a XML file * Save the CProfileWindow objects using a XML file which name is in m_filename */ bool ret = false; - QDomDocument doc("DOC"); + TQDomDocument doc("DOC"); doc.appendChild( doc.createProcessingInstruction( "xml", "version=\"1.0\" encoding=\"UTF-8\"" ) ); - QDomElement content = doc.createElement("BibleTimeProfile"); + TQDomElement content = doc.createElement("BibleTimeProfile"); content.setAttribute("syntaxVersion", CURRENT_SYNTAX_VERSION); content.setAttribute("name", m_name); doc.appendChild(content); //save mainwindow settings { - QDomElement mainWindow = doc.createElement("MAINWINDOW"); + TQDomElement mainWindow = doc.createElement("MAINWINDOW"); mainWindow.setAttribute("fullscreen", fullscreen()); - QDomElement geometry = doc.createElement("GEOMETRY"); + TQDomElement geometry = doc.createElement("GEOMETRY"); mainWindow.appendChild(geometry); - const QRect r = this->geometry(); + const TQRect r = this->geometry(); geometry.setAttribute("x",r.x()); geometry.setAttribute("y",r.y()); geometry.setAttribute("width",r.width()); @@ -229,7 +229,7 @@ const bool CProfile::save(QPtrList<CProfileWindow> windows) { } for (CProfileWindow* p = windows.first(); p; p = windows.next()) { - QDomElement window; + TQDomElement window; switch (p->type()) { case CSwordModuleInfo::Bible: window = doc.createElement("BIBLE"); @@ -253,8 +253,8 @@ const bool CProfile::save(QPtrList<CProfileWindow> windows) { window.setAttribute("hasFocus", p->hasFocus()); //save geomtery - const QRect r = p->geometry(); - QDomElement geometry = doc.createElement("GEOMETRY"); + const TQRect r = p->geometry(); + TQDomElement geometry = doc.createElement("GEOMETRY"); geometry.setAttribute("x",r.x()); geometry.setAttribute("y",r.y()); geometry.setAttribute("width",r.width()); @@ -262,16 +262,16 @@ const bool CProfile::save(QPtrList<CProfileWindow> windows) { geometry.setAttribute("isMaximized",static_cast<int>(p->maximized())); window.appendChild( geometry ); - QDomElement modules = doc.createElement("MODULES"); + TQDomElement modules = doc.createElement("MODULES"); modules.setAttribute("separator", "|"); modules.setAttribute("list", p->modules().join("|")); window.appendChild( modules ); - QDomElement key = doc.createElement("KEY"); + TQDomElement key = doc.createElement("KEY"); key.setAttribute("name", p->key()); window.appendChild( key ); - QDomElement scrollbars = doc.createElement("SCROLLBARS"); + TQDomElement scrollbars = doc.createElement("SCROLLBARS"); scrollbars.setAttribute("horizontal", p->scrollbarPositions().horizontal); scrollbars.setAttribute("vertical", p->scrollbarPositions().vertical); window.appendChild( scrollbars ); @@ -279,11 +279,11 @@ const bool CProfile::save(QPtrList<CProfileWindow> windows) { content.appendChild( window ); } - QFile file(m_filename); + TQFile file(m_filename); if ( file.open(IO_WriteOnly) ) { ret = true; - QTextStream t( &file ); - t.setEncoding(QTextStream::UnicodeUTF8); + TQTextStream t( &file ); + t.setEncoding(TQTextStream::UnicodeUTF8); t << doc.toString(); file.close(); } @@ -299,66 +299,66 @@ const bool CProfile::save() { } /** Returns the filename used for this profile. */ -const QString& CProfile::filename() { +const TQString& CProfile::filename() { return m_filename; } /** Returns the name of this profile. */ -const QString& CProfile::name() { +const TQString& CProfile::name() { return m_name; } /** Initializes the XML for the first time (use to create a new profile) */ -void CProfile::init(const QString file) { - const QString oldFile = m_filename; +void CProfile::init(const TQString file) { + const TQString oldFile = m_filename; m_filename = file; - save(QPtrList<CProfileWindow>()); + save(TQPtrList<CProfileWindow>()); m_filename = oldFile; } /** Changes the name of this profile. */ -void CProfile::setName( const QString& newName ) { +void CProfile::setName( const TQString& newName ) { m_name = newName; saveBasics(); //save chanegd name } /** Loads the basic settings requires for proper operation. */ void CProfile::loadBasics() { - QFile file(m_filename); + TQFile file(m_filename); if (!file.exists()) return; - QDomDocument doc; + TQDomDocument doc; if (file.open(IO_ReadOnly)) { - QTextStream t( &file ); - t.setEncoding(QTextStream::UnicodeUTF8); + TQTextStream t( &file ); + t.setEncoding(TQTextStream::UnicodeUTF8); doc.setContent(t.read()); file.close(); } - QDomElement document = doc.documentElement(); + TQDomElement document = doc.documentElement(); if (document.hasAttribute("name")) m_name = document.attribute("name"); } void CProfile::saveBasics() { - QFile file(m_filename); + TQFile file(m_filename); if (!file.exists()) return; - QDomDocument doc; + TQDomDocument doc; if (file.open(IO_ReadOnly)) { - QTextStream t(&file); - t.setEncoding(QTextStream::UnicodeUTF8); + TQTextStream t(&file); + t.setEncoding(TQTextStream::UnicodeUTF8); doc.setContent(t.read()); file.close(); } - QDomElement document = doc.documentElement(); + TQDomElement document = doc.documentElement(); document.setAttribute("name", m_name); if (file.open(IO_WriteOnly)) { - QTextStream t( &file ); - t.setEncoding(QTextStream::UnicodeUTF8); + TQTextStream t( &file ); + t.setEncoding(TQTextStream::UnicodeUTF8); t << doc.toString(); file.close(); } @@ -385,12 +385,12 @@ void CProfile::setMaximized( const bool maximized ) { } /** Returns the geometry of the main window */ -const QRect CProfile::geometry() { +const TQRect CProfile::geometry() { return m_geometry; } /** Stes the geoemtry of the main window */ -void CProfile::setGeometry( const QRect rect ) { +void CProfile::setGeometry( const TQRect rect ) { m_geometry = rect; } diff --git a/bibletime/frontend/cprofile.h b/bibletime/frontend/cprofile.h index 711bdf5..82c55f5 100644 --- a/bibletime/frontend/cprofile.h +++ b/bibletime/frontend/cprofile.h @@ -15,7 +15,7 @@ #include "cprofilewindow.h" //Qt includes -#include <qptrlist.h> +#include <tqptrlist.h> namespace Profile { @@ -24,14 +24,14 @@ namespace Profile { */ class CProfile { public: - CProfile(const QString& fileName, const QString& name = QString::null); + CProfile(const TQString& fileName, const TQString& name = TQString::null); ~CProfile(); /** * Saves the profile to the file given in the constructor. * @param windows The list of windows available in the profile. */ - const bool save( QPtrList<CProfileWindow> windows ); + const bool save( TQPtrList<CProfileWindow> windows ); /** * Saves the profile to the file given in the constructor. */ @@ -40,23 +40,23 @@ public: * Loads the profile from the file given in the constructor. * @return The list of profiled window which exist in the profile. */ - QPtrList<CProfileWindow> load(); + TQPtrList<CProfileWindow> load(); /** * Returns the name of this profile. */ - const QString& name(); + const TQString& name(); /** * Returns the filename used for this profile. */ - const QString& filename(); + const TQString& filename(); /** * Initializes the XML for the first time (use to create a new profile) */ - void init(const QString); + void init(const TQString); /** * Chnages the name of this profile. */ - void setName( const QString& ); + void setName( const TQString& ); /** * Returns true if the main window was in fullscreen mode as the profile was saved. */ @@ -76,11 +76,11 @@ public: /** * Sets the geoemtry of the main window */ - void setGeometry( const QRect rect ); + void setGeometry( const TQRect rect ); /** * Returns the geometry of the main window */ - const QRect geometry(); + const TQRect geometry(); private: /** @@ -89,12 +89,12 @@ private: void loadBasics(); void saveBasics(); - QPtrList<CProfileWindow> m_profileWindows; - QString m_name; - QString m_filename; + TQPtrList<CProfileWindow> m_profileWindows; + TQString m_name; + TQString m_filename; bool m_fullscreen; bool m_maximized; - QRect m_geometry; + TQRect m_geometry; }; } //end of namespace Profile diff --git a/bibletime/frontend/cprofilemgr.cpp b/bibletime/frontend/cprofilemgr.cpp index ef810a1..0e516ee 100644 --- a/bibletime/frontend/cprofilemgr.cpp +++ b/bibletime/frontend/cprofilemgr.cpp @@ -12,9 +12,9 @@ #include "cprofilemgr.h" //Qt includes -#include <qdir.h> -#include <qfile.h> -#include <qptrlist.h> +#include <tqdir.h> +#include <tqfile.h> +#include <tqptrlist.h> //KDE includes #include <kstandarddirs.h> @@ -27,9 +27,9 @@ CProfileMgr::CProfileMgr() : m_startupProfile(0) { KStandardDirs stdDirs; m_profilePath = stdDirs.saveLocation("data", "bibletime/sessions/"); - QDir d( m_profilePath ); - QStringList files = d.entryList("*.xml"); - for ( QStringList::Iterator it = files.begin(); it != files.end(); ++it ) { + TQDir d( m_profilePath ); + TQStringList files = d.entryList("*.xml"); + for ( TQStringList::Iterator it = files.begin(); it != files.end(); ++it ) { if ((*it) != "_startup_.xml") { m_profiles.append(new CProfile(m_profilePath + *it)); } @@ -45,13 +45,13 @@ CProfileMgr::~CProfileMgr() { } /** Returns a list of available profiles. */ -const QPtrList<CProfile>& CProfileMgr::profiles() { +const TQPtrList<CProfile>& CProfileMgr::profiles() { return m_profiles; } /** Creates a new profile with the name "name" (first parameter). @return The profile object */ -CProfile* CProfileMgr::create( const QString name ) { - CProfile* p = new CProfile(QString::null, name); +CProfile* CProfileMgr::create( const TQString name ) { + CProfile* p = new CProfile(TQString::null, name); m_profiles.append(p); return p; @@ -61,7 +61,7 @@ CProfile* CProfileMgr::create( const QString name ) { const bool CProfileMgr::remove ( CProfile* p ) { bool ret = false; - QFile f( p->filename() ); + TQFile f( p->filename() ); if (f.exists()) f.remove(); if(m_profiles.remove(p)) @@ -71,7 +71,7 @@ const bool CProfileMgr::remove } const bool CProfileMgr::remove - ( const QString& profile) { + ( const TQString& profile) { bool ret = false; for (CProfile* p = m_profiles.first(); p; p = m_profiles.next()) { if (p->name() == profile) { @@ -84,7 +84,7 @@ const bool CProfileMgr::remove } /** Returns the profile with the desired name. If there's no such profile 0 is returned. */ -CProfile* CProfileMgr::profile(const QString& name) { +CProfile* CProfileMgr::profile(const TQString& name) { for (m_profiles.first(); m_profiles.current(); m_profiles.next()) { if (m_profiles.current()->name() == name) { return m_profiles.current(); @@ -97,7 +97,7 @@ CProfile* CProfileMgr::profile(const QString& name) { /** Returns the startup profile if it exists, otherwise return 0. */ CProfile* CProfileMgr::startupProfile() { if (!m_startupProfile) { - m_startupProfile = new CProfile(QString::null, "_startup_"); + m_startupProfile = new CProfile(TQString::null, "_startup_"); } return m_startupProfile; @@ -106,9 +106,9 @@ CProfile* CProfileMgr::startupProfile() { /** Refreshes the profiles available on disk. Use this function to update the list of profiles after another instance of CProfileMgr created a new profile. */ void CProfileMgr::refresh() { m_profiles.clear(); //delete all profiles - QDir d( m_profilePath ); - QStringList files = d.entryList("*.xml"); - for ( QStringList::Iterator it = files.begin(); it != files.end(); ++it ) { + TQDir d( m_profilePath ); + TQStringList files = d.entryList("*.xml"); + for ( TQStringList::Iterator it = files.begin(); it != files.end(); ++it ) { CProfile p(m_profilePath + *it); if (p.name() == "_startup_") { //new startup profile if (!m_startupProfile) { //don't put this in the if clause above,it doesn't work! diff --git a/bibletime/frontend/cprofilemgr.h b/bibletime/frontend/cprofilemgr.h index b1f55d9..aba6675 100644 --- a/bibletime/frontend/cprofilemgr.h +++ b/bibletime/frontend/cprofilemgr.h @@ -15,7 +15,7 @@ #include "cprofile.h" //Qt includes -#include <qstring.h> +#include <tqstring.h> namespace Profile { /** The manager for profiles. @@ -30,11 +30,11 @@ public: /** Creates a new profile with the name "name" (first parameter). * @return The profile object */ - CProfile* create( const QString name ); + CProfile* create( const TQString name ); /** * @return a list of available profiles */ - const QPtrList<CProfile>& profiles(); + const TQPtrList<CProfile>& profiles(); /** * Removes the profile from the list and from the directory containg the profile files. */ @@ -44,11 +44,11 @@ public: * Removes the profile from the list and from the directory containg the profile files. */ const bool remove - ( const QString& ); + ( const TQString& ); /** * Returns the profile with the desired name. If there's no such profile 0 is returned. */ - CProfile* profile(const QString&); + CProfile* profile(const TQString&); /** * Returns the startup profile if it exists, otherwise return 0. */ @@ -59,8 +59,8 @@ public: void refresh(); protected: - QPtrList<CProfile> m_profiles; - QString m_profilePath; + TQPtrList<CProfile> m_profiles; + TQString m_profilePath; CProfile* m_startupProfile; }; diff --git a/bibletime/frontend/cprofilewindow.cpp b/bibletime/frontend/cprofilewindow.cpp index 142dd41..fbaf4de 100644 --- a/bibletime/frontend/cprofilewindow.cpp +++ b/bibletime/frontend/cprofilewindow.cpp @@ -17,7 +17,7 @@ CProfileWindow::CProfileWindow(CSwordModuleInfo::ModuleType type) : m_type(type), m_windowGeometry(), m_moduleList(), -m_key(QString::null), +m_key(TQString::null), m_maximized(false), m_hasFocus(false), m_windowSettings(0), @@ -29,12 +29,12 @@ m_writeWindowType(0) { CProfileWindow::~CProfileWindow() {} /** Returns the size of the window including the x,y coordinates. */ -const QRect& CProfileWindow::geometry() const { +const TQRect& CProfileWindow::geometry() const { return m_windowGeometry; } /** Sets the size of the window. */ -void CProfileWindow::setGeometry( const QRect& rect ) { +void CProfileWindow::setGeometry( const TQRect& rect ) { m_windowGeometry = rect; } @@ -46,22 +46,22 @@ const CSwordModuleInfo::ModuleType CProfileWindow::type() const { } /** Sets the modules. */ -void CProfileWindow::setModules( const QStringList& modules ) { +void CProfileWindow::setModules( const TQStringList& modules ) { m_moduleList = modules; //copy module pointers into our own list } /** Returns a list of module names which are chosen in the managed window profile. */ -const QStringList& CProfileWindow::modules() const { +const TQStringList& CProfileWindow::modules() const { return m_moduleList; } /** Returns the current key set in the modules. */ -const QString& CProfileWindow::key() const { +const TQString& CProfileWindow::key() const { return m_key; } /** Set the key used in the modules. */ -void CProfileWindow::setKey( const QString& key ) { +void CProfileWindow::setKey( const TQString& key ) { m_key = key; } diff --git a/bibletime/frontend/cprofilewindow.h b/bibletime/frontend/cprofilewindow.h index ddc5059..a393277 100644 --- a/bibletime/frontend/cprofilewindow.h +++ b/bibletime/frontend/cprofilewindow.h @@ -16,10 +16,10 @@ #include "backend/cswordbackend.h" //Qt includes -#include <qstring.h> -#include <qrect.h> -#include <qstringlist.h> -#include <qptrlist.h> +#include <tqstring.h> +#include <tqrect.h> +#include <tqstringlist.h> +#include <tqptrlist.h> namespace Profile { @@ -38,7 +38,7 @@ public: /** * Sets the modules. */ - void setModules( const QStringList& modules ); + void setModules( const TQStringList& modules ); /** * Returns the type of the managed window (bible window, commentary window or lexicon window). */ @@ -50,23 +50,23 @@ public: /** * Sets the size of the window. */ - void setGeometry( const QRect& s ); + void setGeometry( const TQRect& s ); /** * Returns the size of the window including the x,y coordinates. */ - const QRect& geometry() const; + const TQRect& geometry() const; /** * Returns a list of module names which are chosen in the managed window profile. */ - const QStringList& modules() const; + const TQStringList& modules() const; /** * Set the key used in the modules. */ - void setKey( const QString& ); + void setKey( const TQString& ); /** * Returns the current key set in the modules. */ - const QString& key() const; + const TQString& key() const; /** * Sets the current position of the scrollbars. */ @@ -110,9 +110,9 @@ public: private: CSwordModuleInfo::ModuleType m_type; - QRect m_windowGeometry; - QStringList m_moduleList; - QString m_key; + TQRect m_windowGeometry; + TQStringList m_moduleList; + TQString m_key; ScrollbarPos m_scrollbarPos; bool m_maximized; bool m_hasFocus; diff --git a/bibletime/frontend/crossrefrendering.cpp b/bibletime/frontend/crossrefrendering.cpp index aad9d44..a77fff3 100644 --- a/bibletime/frontend/crossrefrendering.cpp +++ b/bibletime/frontend/crossrefrendering.cpp @@ -23,13 +23,13 @@ namespace InfoDisplay { CrossRefRendering::CrossRefRendering( CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions) : CHTMLExportRendering(Settings(), displayOptions, filterOptions) {} - const QString CrossRefRendering::finishText( const QString& text, KeyTree& ) { + const TQString CrossRefRendering::finishText( const TQString& text, KeyTree& ) { // qDebug("CrossRefRendering::finishText"); return text; } - const QString CrossRefRendering::entryLink( const KeyTreeItem& item, CSwordModuleInfo* module ) { - QString linkText; + const TQString CrossRefRendering::entryLink( const KeyTreeItem& item, CSwordModuleInfo* module ) { + TQString linkText; const bool isBible = module && (module->type() == CSwordModuleInfo::Bible); CSwordVerseKey vk(module); //only valid for bible modules, i.e. isBible == true @@ -39,12 +39,12 @@ namespace InfoDisplay { switch (item.settings().keyRenderingFace) { case KeyTreeItem::Settings::NoKey: { - linkText = QString::null; + linkText = TQString::null; break; //no key is valid for all modules } case KeyTreeItem::Settings::CompleteShort: { if (isBible) { - linkText = QString::fromUtf8(vk.getShortText()); + linkText = TQString::fromUtf8(vk.getShortText()); break; } //fall through for non-Bible modules @@ -58,7 +58,7 @@ namespace InfoDisplay { } case KeyTreeItem::Settings::SimpleKey: { if (isBible) { - linkText = QString::number(vk.Verse()); + linkText = TQString::number(vk.Verse()); break; } //fall through for non-Bible modules @@ -71,7 +71,7 @@ namespace InfoDisplay { if (!linkText.isEmpty()) { //if we have a valid link text // qWarning("rendering"); - return QString("<a href=\"%1\">%2</a>") + return TQString("<a href=\"%1\">%2</a>") .arg( CReferenceManager::encodeHyperlink( module->name(), @@ -82,7 +82,7 @@ namespace InfoDisplay { .arg(linkText); } - return QString::null; + return TQString::null; } }; diff --git a/bibletime/frontend/crossrefrendering.h b/bibletime/frontend/crossrefrendering.h index 144d9d0..c1cc87b 100644 --- a/bibletime/frontend/crossrefrendering.h +++ b/bibletime/frontend/crossrefrendering.h @@ -26,8 +26,8 @@ protected: CSwordBackend::FilterOptions filterOptions = CBTConfig::getFilterOptionDefaults() ); - virtual const QString entryLink( const KeyTreeItem& item, CSwordModuleInfo* module ); - virtual const QString finishText( const QString&, KeyTree& tree ); + virtual const TQString entryLink( const KeyTreeItem& item, CSwordModuleInfo* module ); + virtual const TQString finishText( const TQString&, KeyTree& tree ); }; diff --git a/bibletime/frontend/cswordsetupdialog.cpp b/bibletime/frontend/cswordsetupdialog.cpp index d2b6950..7bcde98 100644 --- a/bibletime/frontend/cswordsetupdialog.cpp +++ b/bibletime/frontend/cswordsetupdialog.cpp @@ -24,15 +24,15 @@ #include "util/scoped_resource.h" //QT includes -#include <qdir.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qcombobox.h> -#include <qwidgetstack.h> -#include <qfileinfo.h> -#include <qpushbutton.h> -#include <qlineedit.h> -#include <qdict.h> +#include <tqdir.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqcombobox.h> +#include <tqwidgetstack.h> +#include <tqfileinfo.h> +#include <tqpushbutton.h> +#include <tqlineedit.h> +#include <tqdict.h> //KDE includes #include <kapplication.h> @@ -55,8 +55,8 @@ using namespace sword; namespace BookshelfManager { - CSwordSetupDialog::CSwordSetupDialog(QWidget *parent, const char *name ) -: KDialogBase(IconList, i18n("Bookshelf Manager"), Ok, Ok, parent, name, true, true, QString::null, QString::null, QString::null), + CSwordSetupDialog::CSwordSetupDialog(TQWidget *parent, const char *name ) +: KDialogBase(IconList, i18n("Bookshelf Manager"), Ok, Ok, parent, name, true, true, TQString::null, TQString::null, TQString::null), m_removeModuleListView(0), m_installModuleListPage(0), m_installModuleListView(0), @@ -72,75 +72,75 @@ namespace BookshelfManager { } void CSwordSetupDialog::initSwordConfig() { - QFrame* page = m_swordConfigPage = addPage(i18n("Bookshelf path(s)"), QString::null, SmallIcon("bt_swordconfig",32)); + TQFrame* page = m_swordConfigPage = addPage(i18n("Bookshelf path(s)"), TQString::null, SmallIcon("bt_swordconfig",32)); page->setMinimumSize(500,400); - QGridLayout* layout = new QGridLayout(page, 6, 4); + TQGridLayout* layout = new TQGridLayout(page, 6, 4); layout->setMargin(5); layout->setSpacing(10); layout->setColStretch(0,1); layout->setRowStretch(5,1); - QLabel* mainLabel = CToolClass::explanationLabel(page, + TQLabel* mainLabel = CToolClass::explanationLabel(page, i18n("Configure bookshelf path(s)"), i18n("You can store your bookshelfs in one or more directories, which you can specify here.") ); layout->addMultiCellWidget(mainLabel, 0, 0, 0, 3); - QString swordConfPath = BTInstallMgr::Tool::LocalConfig::swordConfigFilename(); - QLabel* confPathLabel = new QLabel(i18n("Your bookshelf configuration file is <b>%1</b>").arg(swordConfPath), page); + TQString swordConfPath = BTInstallMgr::Tool::LocalConfig::swordConfigFilename(); + TQLabel* confPathLabel = new TQLabel(i18n("Your bookshelf configuration file is <b>%1</b>").arg(swordConfPath), page); layout->addMultiCellWidget(confPathLabel, 1,1,0,3); - m_swordPathListBox = new QListView(page); + m_swordPathListBox = new TQListView(page); // m_swordPathListBox->setFullWidth(true); m_swordPathListBox->addColumn(i18n("Path to bookshelf")); - connect(m_swordPathListBox, SIGNAL(selectionChanged()), this, SLOT(slot_swordPathSelected())); + connect(m_swordPathListBox, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slot_swordPathSelected())); layout->addMultiCellWidget(m_swordPathListBox, 2,5,0,1); - m_swordEditPathButton = new QPushButton(i18n("Edit Entry"), page); + m_swordEditPathButton = new TQPushButton(i18n("Edit Entry"), page); m_swordEditPathButton->setIconSet(SmallIcon("edit", 16)); - connect(m_swordEditPathButton, SIGNAL(clicked()), this, SLOT(slot_swordEditClicked())); + connect(m_swordEditPathButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_swordEditClicked())); layout->addWidget(m_swordEditPathButton, 2, 3); - m_swordAddPathButton = new QPushButton(i18n("Add Entry"), page); + m_swordAddPathButton = new TQPushButton(i18n("Add Entry"), page); m_swordAddPathButton->setIconSet(SmallIcon("edit_add", 16)); - connect(m_swordAddPathButton, SIGNAL(clicked()), this, SLOT(slot_swordAddClicked())); + connect(m_swordAddPathButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_swordAddClicked())); layout->addWidget(m_swordAddPathButton, 3,3); - m_swordRemovePathButton = new QPushButton(i18n("Remove Entry"), page); + m_swordRemovePathButton = new TQPushButton(i18n("Remove Entry"), page); m_swordRemovePathButton->setIconSet(SmallIcon("editdelete", 16)); - connect(m_swordRemovePathButton, SIGNAL(clicked()), this, SLOT(slot_swordRemoveClicked())); + connect(m_swordRemovePathButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_swordRemoveClicked())); layout->addWidget(m_swordRemovePathButton, 4,3); setupSwordPathListBox(); } void CSwordSetupDialog::initInstall() { - m_installPage = addPage(i18n("Install/Update works"), QString::null, SmallIcon("bt_bible",32)); + m_installPage = addPage(i18n("Install/Update works"), TQString::null, SmallIcon("bt_bible",32)); - QVBoxLayout* vboxlayout = new QVBoxLayout(m_installPage); - QHBoxLayout* hboxlayout = new QHBoxLayout(); + TQVBoxLayout* vboxlayout = new TQVBoxLayout(m_installPage); + TQHBoxLayout* hboxlayout = new TQHBoxLayout(); hboxlayout->setAutoAdd( true ); vboxlayout->addLayout(hboxlayout); - m_installWidgetStack = new QWidgetStack(m_installPage); + m_installWidgetStack = new TQWidgetStack(m_installPage); hboxlayout->addWidget(m_installWidgetStack); - m_installSourcePage = new QWidget(0); + m_installSourcePage = new TQWidget(0); m_installWidgetStack->addWidget(m_installSourcePage); // m_installSourcePage->setMinimumSize(500,400); - QGridLayout* layout = new QGridLayout(m_installSourcePage, 7, 3); + TQGridLayout* layout = new TQGridLayout(m_installSourcePage, 7, 3); layout->setMargin(5); layout->setSpacing(10); layout->setRowStretch(6,5); layout->setColStretch(0,5); - QLabel* installLabel = CToolClass::explanationLabel(m_installSourcePage, + TQLabel* installLabel = CToolClass::explanationLabel(m_installSourcePage, i18n("Install/update works - Step 1"), i18n("Please choose a (local or remote) library and a bookshelf path to install the work(s) to. \ After that step click on the connect button.<br/>\ @@ -149,100 +149,100 @@ the module remote installation feature!</b>") ); layout->addMultiCellWidget(installLabel, 0,0,0,2); - QLabel* sourceHeadingLabel = new QLabel(QString("<b>%1</b>").arg(i18n("Select library")), m_installSourcePage); + TQLabel* sourceHeadingLabel = new TQLabel(TQString("<b>%1</b>").arg(i18n("Select library")), m_installSourcePage); layout->addMultiCellWidget(sourceHeadingLabel, 1,1,0,1); - m_sourceCombo = new QComboBox(m_installSourcePage); + m_sourceCombo = new TQComboBox(m_installSourcePage); layout->addWidget(m_sourceCombo, 2, 0); - QPushButton* deleteSourceButton = new QPushButton(i18n("Delete library"), m_installSourcePage); + TQPushButton* deleteSourceButton = new TQPushButton(i18n("Delete library"), m_installSourcePage); deleteSourceButton->setIconSet(SmallIcon("remove", 16)); - connect(deleteSourceButton, SIGNAL(clicked()), SLOT(slot_installDeleteSource())); + connect(deleteSourceButton, TQT_SIGNAL(clicked()), TQT_SLOT(slot_installDeleteSource())); layout->addWidget(deleteSourceButton, 2, 1, Qt::AlignLeft); - QPushButton* addSourceButton = new QPushButton(i18n("Add library"), m_installSourcePage); + TQPushButton* addSourceButton = new TQPushButton(i18n("Add library"), m_installSourcePage); addSourceButton->setIconSet(SmallIcon("folder_new", 16)); - connect(addSourceButton, SIGNAL(clicked()), SLOT(slot_installAddSource())); + connect(addSourceButton, TQT_SIGNAL(clicked()), TQT_SLOT(slot_installAddSource())); layout->addWidget(addSourceButton, 2, 2, Qt::AlignLeft); - m_sourceLabel = new QLabel(m_installSourcePage); + m_sourceLabel = new TQLabel(m_installSourcePage); layout->addMultiCellWidget(m_sourceLabel, 3,3,0,1); - QLabel* targetHeadingLabel = new QLabel(QString("<b>%1</b>").arg(i18n("Select bookshelf path")), m_installSourcePage); + TQLabel* targetHeadingLabel = new TQLabel(TQString("<b>%1</b>").arg(i18n("Select bookshelf path")), m_installSourcePage); layout->addMultiCellWidget(targetHeadingLabel, 4,4,0,1); - m_targetCombo = new QComboBox(m_installSourcePage); + m_targetCombo = new TQComboBox(m_installSourcePage); layout->addWidget(m_targetCombo, 5, 0); - m_targetLabel = new QLabel(m_installSourcePage); + m_targetLabel = new TQLabel(m_installSourcePage); layout->addMultiCellWidget(m_targetLabel, 6,6,0,0,Qt::AlignTop); //part beloew main layout with the back/next buttons - QHBoxLayout* myHBox = new QHBoxLayout(); + TQHBoxLayout* myHBox = new TQHBoxLayout(); vboxlayout->addLayout(myHBox); - m_installBackButton = new QPushButton(i18n("Back"), m_installPage); + m_installBackButton = new TQPushButton(i18n("Back"), m_installPage); m_installBackButton->setIconSet(SmallIcon("back",16)); myHBox->addWidget(m_installBackButton); myHBox->addSpacing(10); myHBox->addStretch(5); - m_installContinueButton = new QPushButton(i18n("Connect to library"), m_installPage); + m_installContinueButton = new TQPushButton(i18n("Connect to library"), m_installPage); m_installContinueButton->setIconSet(SmallIcon("forward",16)); - connect(m_installContinueButton, SIGNAL(clicked()), this, SLOT(slot_connectToSource())); + connect(m_installContinueButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_connectToSource())); myHBox->addWidget(m_installContinueButton); m_installBackButton->setEnabled(false); - connect(m_sourceCombo, SIGNAL( highlighted(const QString&) ), SLOT( slot_sourceSelected( const QString&) )); - connect(m_targetCombo, SIGNAL( highlighted(const QString&) ), SLOT( slot_targetSelected( const QString&) )); + connect(m_sourceCombo, TQT_SIGNAL( highlighted(const TQString&) ), TQT_SLOT( slot_sourceSelected( const TQString&) )); + connect(m_targetCombo, TQT_SIGNAL( highlighted(const TQString&) ), TQT_SLOT( slot_targetSelected( const TQString&) )); populateInstallCombos(); slot_sourceSelected( m_sourceCombo->currentText() ); } void CSwordSetupDialog::initRemove() { - QFrame* page = m_removePage = addPage(i18n("Remove works"), QString::null, SmallIcon("edittrash",32)); + TQFrame* page = m_removePage = addPage(i18n("Remove works"), TQString::null, SmallIcon("edittrash",32)); page->setMinimumSize(500,400); - QGridLayout* layout = new QGridLayout(page, 4, 4); + TQGridLayout* layout = new TQGridLayout(page, 4, 4); layout->setMargin(5); layout->setSpacing(10); layout->setColStretch(1,1); layout->setRowStretch(2,1); - QLabel* mainLabel= CToolClass::explanationLabel(page, + TQLabel* mainLabel= CToolClass::explanationLabel(page, i18n("Remove installed work(s)"), i18n("This dialog lets you remove installed works from your system. Choose the modules and then click on the remove button.") ); layout->addMultiCellWidget(mainLabel, 0, 0, 0, 3); - QLabel* headingLabel = new QLabel(QString("<b>%1</b>").arg(i18n("Select works to be uninstalled")), page); + TQLabel* headingLabel = new TQLabel(TQString("<b>%1</b>").arg(i18n("Select works to be uninstalled")), page); layout->addMultiCellWidget(headingLabel, 1, 1, 0, 3); m_removeModuleListView = new CSwordSetupModuleListView(page, false); layout->addMultiCellWidget( m_removeModuleListView, 2,2,0,3); - m_removeRemoveButton = new QPushButton(i18n("Remove selected work(s)"), page); + m_removeRemoveButton = new TQPushButton(i18n("Remove selected work(s)"), page); m_removeRemoveButton->setIconSet( SmallIcon("edittrash", 16) ); layout->addWidget(m_removeRemoveButton, 3, 3, Qt::AlignRight); - connect(m_removeRemoveButton, SIGNAL(clicked()), - this, SLOT(slot_doRemoveModules())); + connect(m_removeRemoveButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slot_doRemoveModules())); populateRemoveModuleListView(); } void CSwordSetupDialog::initManageIndices() { - QFrame* page = m_manageIndiciesPage = addPage(i18n("Manage search indicies"), - QString::null, SmallIcon("filefind",32)); + TQFrame* page = m_manageIndiciesPage = addPage(i18n("Manage search indicies"), + TQString::null, SmallIcon("filefind",32)); page->setMinimumSize(500,400); - QVBoxLayout* box = new QVBoxLayout(page, 4, 4); + TQVBoxLayout* box = new TQVBoxLayout(page, 4, 4); CManageIndicesWidget* mi = new CManageIndicesWidget(page); box->addWidget(mi); } @@ -255,10 +255,10 @@ the module remote installation feature!</b>") void CSwordSetupDialog::writeSwordConfig() { if (m_swordSetupChanged && m_swordPathListBox->childCount()) { - QStringList targets; - QListViewItemIterator it( m_swordPathListBox ); + TQStringList targets; + TQListViewItemIterator it( m_swordPathListBox ); while ( it.current() ) { - QListViewItem *item = it.current(); + TQListViewItem *item = it.current(); if (!item->text(0).isEmpty()) { targets << item->text(0); } @@ -293,7 +293,7 @@ the module remote installation feature!</b>") BTInstallMgr::Tool::RemoteConfig::initConfig(); - QStringList list; + TQStringList list; { BTInstallMgr mgr; list = BTInstallMgr::Tool::RemoteConfig::sourceList(&mgr); @@ -312,14 +312,14 @@ the module remote installation feature!</b>") } BTInstallMgr mgr; - for (QStringList::iterator it = list.begin(); it != list.end(); ++it) { + for (TQStringList::iterator it = list.begin(); it != list.end(); ++it) { sword::InstallSource is = BTInstallMgr::Tool::RemoteConfig::source(&mgr, *it); if (BTInstallMgr::Tool::RemoteConfig::isRemoteSource(&is)) { m_sourceCombo->insertItem( i18n("[Remote]") + " " + *it ); //remote source } else { // local source - QFileInfo fi( is.directory.c_str() ); + TQFileInfo fi( is.directory.c_str() ); if (fi.isDir() && fi.isReadable()) { m_sourceCombo->insertItem( i18n("[Local]") + " " + *it ); } @@ -330,7 +330,7 @@ the module remote installation feature!</b>") //list = (m_targetCombo->count()) ? m_swordPathListBox : BTInstallMgr::Tool::LocalConfig::targetList(); if (m_targetCombo->count()) { //we already read in the list once, we have to use the Sword paths list items now because this list is newer list.clear(); - QListViewItemIterator it2( m_swordPathListBox ); + TQListViewItemIterator it2( m_swordPathListBox ); while (it2.current()) { list << it2.current()->text(0); @@ -342,8 +342,8 @@ the module remote installation feature!</b>") } m_targetCombo->clear(); - for (QStringList::iterator it = list.begin(); it != list.end(); ++it) { - QFileInfo fi(*it); + for (TQStringList::iterator it = list.begin(); it != list.end(); ++it) { + TQFileInfo fi(*it); if (fi.isDir() && fi.isWritable()) { m_targetCombo->insertItem( *it ); } @@ -359,11 +359,11 @@ the module remote installation feature!</b>") } - void CSwordSetupDialog::slot_sourceSelected(const QString &sourceName) { + void CSwordSetupDialog::slot_sourceSelected(const TQString &sourceName) { //remove status parta - QString source = sourceName; + TQString source = sourceName; - QString rep = i18n("[Local]") + " "; + TQString rep = i18n("[Local]") + " "; int i = source.find(rep); if (i>=0) { source.remove(i, rep.length()); @@ -375,14 +375,14 @@ the module remote installation feature!</b>") } BTInstallMgr mgr; - QString url; + TQString url; sword::InstallSource is = BTInstallMgr::Tool::RemoteConfig::source(&mgr, source) ; if (BTInstallMgr::Tool::RemoteConfig::isRemoteSource(&is)) { - url = QString("ftp://%1%2").arg(is.source.c_str()).arg(is.directory.c_str()); + url = TQString("ftp://%1%2").arg(is.source.c_str()).arg(is.directory.c_str()); } else { - url = QString("%1").arg(is.directory.c_str()); + url = TQString("%1").arg(is.directory.c_str()); } m_sourceLabel->setText( url ); @@ -390,7 +390,7 @@ the module remote installation feature!</b>") } - void CSwordSetupDialog::slot_targetSelected(const QString &targetName) { + void CSwordSetupDialog::slot_targetSelected(const TQString &targetName) { m_targetLabel->setText( m_targetMap[targetName] ); target = m_targetMap[targetName]; } @@ -398,23 +398,23 @@ the module remote installation feature!</b>") void CSwordSetupDialog::slot_doRemoveModules() { - QStringList moduleList = m_removeModuleListView->selectedModules(); + TQStringList moduleList = m_removeModuleListView->selectedModules(); if ( moduleList.empty() ) { return; //no message, just do nothing } - const QString message = i18n("You selected the following work(s): %1.\n\n" + const TQString message = i18n("You selected the following work(s): %1.\n\n" "Do you really want to remove them from your system?").arg(moduleList.join(", ")); if ((KMessageBox::warningYesNo(0, message, i18n("Warning")) == KMessageBox::Yes)) { //Yes was pressed. sword::InstallMgr installMgr; - QDict<sword::SWMgr> mgrDict; //maps config paths to SWMgr objects + TQDict<sword::SWMgr> mgrDict; //maps config paths to SWMgr objects - for ( QStringList::Iterator it = moduleList.begin(); it != moduleList.end(); ++it ) { + for ( TQStringList::Iterator it = moduleList.begin(); it != moduleList.end(); ++it ) { if (CSwordModuleInfo* m = backend()->findModuleByName(*it)) { //module found? - QString prefixPath = m->config(CSwordModuleInfo::AbsoluteDataPath) + "/"; - QString dataPath = m->config(CSwordModuleInfo::DataPath); + TQString prefixPath = m->config(CSwordModuleInfo::AbsoluteDataPath) + "/"; + TQString dataPath = m->config(CSwordModuleInfo::DataPath); if (dataPath.left(2) == "./") { dataPath = dataPath.mid(2); @@ -424,7 +424,7 @@ the module remote installation feature!</b>") prefixPath = prefixPath.remove( prefixPath.find(dataPath), dataPath.length() ); } else { //fall back to default Sword config path - prefixPath = QString::fromLatin1(backend()->prefixPath); + prefixPath = TQString::fromLatin1(backend()->prefixPath); } sword::SWMgr* mgr = mgrDict[ prefixPath ]; @@ -471,7 +471,7 @@ the module remote installation feature!</b>") m_removeModuleListView->finish(); } - const bool CSwordSetupDialog::refreshRemoteModuleCache( const QString& sourceName ) { + const bool CSwordSetupDialog::refreshRemoteModuleCache( const TQString& sourceName ) { if (m_refreshedRemoteSources) { //the module info is up-to-date return true; } @@ -481,7 +481,7 @@ the module remote installation feature!</b>") sword::InstallSource is = BTInstallMgr::Tool::RemoteConfig::source(&iMgr, sourceName); bool success = false; - m_progressDialog = new KProgressDialog(this, 0, i18n("Download"), QString::null, true); + m_progressDialog = new KProgressDialog(this, 0, i18n("Download"), TQString::null, true); m_progressDialog->progressBar()->setTotalSteps(100); m_progressDialog->setLabel( i18n("Downloading library information...") ); m_progressDialog->setMinimumDuration(0); //show immediately @@ -490,12 +490,12 @@ the module remote installation feature!</b>") KApplication::kApplication()->processEvents(); connect( - m_progressDialog, SIGNAL(cancelClicked()), - SLOT(slot_moduleRefreshProgressCancelClicked()) + m_progressDialog, TQT_SIGNAL(cancelClicked()), + TQT_SLOT(slot_moduleRefreshProgressCancelClicked()) ); connect( - &iMgr, SIGNAL(completed(const int, const int)), - SLOT(slot_moduleRefreshCompleted(const int, const int)) + &iMgr, TQT_SIGNAL(completed(const int, const int)), + TQT_SLOT(slot_moduleRefreshCompleted(const int, const int)) ); @@ -521,7 +521,7 @@ the module remote installation feature!</b>") return success; } - bool CSwordSetupDialog::populateInstallModuleListView( const QString& sourceName ) { + bool CSwordSetupDialog::populateInstallModuleListView( const TQString& sourceName ) { KApplication::kApplication()->processEvents(); Q_ASSERT(m_installModuleListView); if (!m_installModuleListView) { // this may be an update after removing modules @@ -596,7 +596,7 @@ the module remote installation feature!</b>") (*it), installedModule ? installedModule->config(CSwordModuleInfo::ModuleVersion) - : QString::null + : TQString::null ); } m_installModuleListView->finish(); @@ -605,13 +605,13 @@ the module remote installation feature!</b>") void CSwordSetupDialog::slot_connectToSource() { if (!m_installModuleListPage) { //the widgets are not yet created - m_installModuleListPage = new QWidget(0); + m_installModuleListPage = new TQWidget(0); - QGridLayout* layout = new QGridLayout(m_installModuleListPage, 7, 2); + TQGridLayout* layout = new TQGridLayout(m_installModuleListPage, 7, 2); layout->setMargin(5); layout->setSpacing(10); - QLabel* installLabel = CToolClass::explanationLabel(m_installModuleListPage, + TQLabel* installLabel = CToolClass::explanationLabel(m_installModuleListPage, i18n("Install/update works - Step 2"), i18n("Please choose the works which should be installed and/or updated and click the install button.") ); @@ -630,21 +630,21 @@ the module remote installation feature!</b>") layout->setColStretch(0,5); layout->setRowStretch(1,5); - connect(m_installModuleListView, SIGNAL(selectedModulesChanged()), SLOT(slot_installModulesChanged())); + connect(m_installModuleListView, TQT_SIGNAL(selectedModulesChanged()), TQT_SLOT(slot_installModulesChanged())); } if (populateInstallModuleListView( currentInstallSource() ) ){ //code valid for already existing and newly created widgets - disconnect( m_installContinueButton, SIGNAL(clicked()), this, SLOT(slot_connectToSource())); - connect( m_installContinueButton, SIGNAL(clicked()), this, SLOT(slot_installModules())); + disconnect( m_installContinueButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_connectToSource())); + connect( m_installContinueButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_installModules())); m_installContinueButton->setText(i18n("Install works")); m_installContinueButton->setEnabled(false); m_installWidgetStack->raiseWidget(m_installModuleListPage); - connect( m_installBackButton, SIGNAL(clicked()), this, SLOT(slot_showInstallSourcePage())); + connect( m_installBackButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_showInstallSourcePage())); m_installBackButton->setEnabled(true); } } @@ -653,7 +653,7 @@ the module remote installation feature!</b>") sword::InstallSource newSource = CSwordSetupInstallSourcesDialog::getSource(); - if ( !((QString)newSource.type.c_str()).isEmpty() ) { // we have a valid source to add + if ( !((TQString)newSource.type.c_str()).isEmpty() ) { // we have a valid source to add BTInstallMgr::Tool::RemoteConfig::addSource( &newSource ); } @@ -684,13 +684,13 @@ the module remote installation feature!</b>") // m_installBackButton->setEnabled(false); //first get all chosen modules - QStringList moduleList = m_installModuleListView->selectedModules(); + TQStringList moduleList = m_installModuleListView->selectedModules(); Q_ASSERT(moduleList.count() != 0); if (moduleList.count() == 0) { // no modules selected return; } - const QString message = i18n("You selected the following works: %1.\n\n\ + const TQString message = i18n("You selected the following works: %1.\n\n\ Do you really want to install them on your system?").arg(moduleList.join(", ")); if ((KMessageBox::warningYesNo(0, message, i18n("Warning")) == KMessageBox::Yes)) { //Yes was pressed. @@ -699,10 +699,10 @@ the module remote installation feature!</b>") sword::InstallSource is = BTInstallMgr::Tool::RemoteConfig::source(&iMgr, currentInstallSource()); qWarning("installing from %s/%s", is.source.c_str(), is.directory.c_str()); - QString target = m_targetCombo->currentText(); + TQString target = m_targetCombo->currentText(); //make sure target/mods.d and target/modules exist - QDir dir(target.latin1()); + TQDir dir(target.latin1()); if (!dir.exists()) { dir.mkdir(target, true); } @@ -717,7 +717,7 @@ the module remote installation feature!</b>") //module are removed in this section of code m_installedModuleCount = 0; - m_progressDialog = new KProgressDialog(this, 0, i18n("Download of work(s)"), QString::null, true); + m_progressDialog = new KProgressDialog(this, 0, i18n("Download of work(s)"), TQString::null, true); m_progressDialog->progressBar()->setTotalSteps(100 * moduleList.count()); m_progressDialog->setMinimumDuration(0); //show immediately m_progressDialog->setAutoClose(false); @@ -725,15 +725,15 @@ the module remote installation feature!</b>") KApplication::kApplication()->processEvents(); connect( - m_progressDialog, SIGNAL(cancelClicked()), - SLOT(slot_installProgressCancelClicked()) + m_progressDialog, TQT_SIGNAL(cancelClicked()), + TQT_SLOT(slot_installProgressCancelClicked()) ); connect( - &iMgr, SIGNAL(completed(const int, const int)), - SLOT(installCompleted(const int, const int)) + &iMgr, TQT_SIGNAL(completed(const int, const int)), + TQT_SLOT(installCompleted(const int, const int)) ); - for ( QStringList::Iterator it = moduleList.begin(); (it != moduleList.end()) && !m_progressDialog->wasCancelled(); ++it, ++m_installedModuleCount ) { + for ( TQStringList::Iterator it = moduleList.begin(); (it != moduleList.end()) && !m_progressDialog->wasCancelled(); ++it, ++m_installedModuleCount ) { qWarning("installing %s", (*it).latin1()); m_installingModule = *it; @@ -742,8 +742,8 @@ the module remote installation feature!</b>") CSwordModuleInfo* m = backend()->findModuleByName(*it); Q_ASSERT(!m); if (m) { //module found? - QString prefixPath = m->config(CSwordModuleInfo::AbsoluteDataPath) + "/"; - QString dataPath = m->config(CSwordModuleInfo::DataPath); + TQString prefixPath = m->config(CSwordModuleInfo::AbsoluteDataPath) + "/"; + TQString dataPath = m->config(CSwordModuleInfo::DataPath); if (dataPath.left(2) == "./") { dataPath = dataPath.mid(2); } @@ -753,7 +753,7 @@ the module remote installation feature!</b>") //prefixPath = prefixPath.replace(dataPath, ""); //old code working with Qt 3.2 } else { - prefixPath = QString::fromLatin1(backend()->prefixPath); + prefixPath = TQString::fromLatin1(backend()->prefixPath); } sword::SWMgr mgr(prefixPath.latin1()); @@ -796,8 +796,8 @@ the module remote installation feature!</b>") } void CSwordSetupDialog::slot_showInstallSourcePage() { - connect( m_installContinueButton, SIGNAL(clicked()), this, SLOT(slot_connectToSource())); - disconnect( m_installContinueButton, SIGNAL(clicked()), this, SLOT(slot_installModules())); + connect( m_installContinueButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_connectToSource())); + disconnect( m_installContinueButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_installModules())); m_installBackButton->setEnabled(false); m_installContinueButton->setText(i18n("Connect to library")); @@ -807,10 +807,10 @@ the module remote installation feature!</b>") } void CSwordSetupDialog::slot_swordEditClicked() { - if (QListViewItem* i = m_swordPathListBox->currentItem()) { + if (TQListViewItem* i = m_swordPathListBox->currentItem()) { KURL url = KDirSelectDialog::selectDirectory(i->text(0), true); if (url.isValid()) { - const QFileInfo fi( url.path() ); + const TQFileInfo fi( url.path() ); if (!fi.exists() || !fi.isWritable()) { const int result = KMessageBox::warningYesNo(this, i18n("This directory is not writable, so works \ can not be installed here using BibleTime. \ @@ -829,9 +829,9 @@ the module remote installation feature!</b>") } void CSwordSetupDialog::slot_swordAddClicked() { - KURL url = KDirSelectDialog::selectDirectory(QString::null, true); + KURL url = KDirSelectDialog::selectDirectory(TQString::null, true); if (url.isValid()) { - const QFileInfo fi( url.path() ); + const TQFileInfo fi( url.path() ); if (!fi.exists() || !fi.isWritable()) { const int result = KMessageBox::warningYesNo(this, i18n("This directory is not writable, \ so works can not be installed here using BibleTime. \ @@ -840,7 +840,7 @@ the module remote installation feature!</b>") return; } } - (void)new QListViewItem(m_swordPathListBox, url.path()); + (void)new TQListViewItem(m_swordPathListBox, url.path()); m_swordSetupChanged = true; writeSwordConfig(); //to make sure other parts work with the new setting populateInstallCombos(); //update target list bof on install page @@ -849,7 +849,7 @@ the module remote installation feature!</b>") } void CSwordSetupDialog::slot_swordRemoveClicked() { - QListViewItem* i = m_swordPathListBox->currentItem(); + TQListViewItem* i = m_swordPathListBox->currentItem(); if (i) { delete i; @@ -861,14 +861,14 @@ the module remote installation feature!</b>") } void CSwordSetupDialog::setupSwordPathListBox() { - QStringList targets = BTInstallMgr::Tool::LocalConfig::targetList(); + TQStringList targets = BTInstallMgr::Tool::LocalConfig::targetList(); m_swordPathListBox->clear(); - for (QStringList::iterator it = targets.begin(); it != targets.end(); ++it) { + for (TQStringList::iterator it = targets.begin(); it != targets.end(); ++it) { if ((*it).isEmpty()) { continue; } - new QListViewItem(m_swordPathListBox, *it); + new TQListViewItem(m_swordPathListBox, *it); } m_swordPathListBox->setCurrentItem( m_swordPathListBox->firstChild() ); } @@ -877,9 +877,9 @@ the module remote installation feature!</b>") m_swordEditPathButton->setEnabled( m_swordPathListBox->currentItem() ); } - const QString CSwordSetupDialog::currentInstallSource() { - QString source = m_sourceCombo->currentText(); - QString rep = i18n("[Local]") + " "; + const TQString CSwordSetupDialog::currentInstallSource() { + TQString source = m_sourceCombo->currentText(); + TQString rep = i18n("[Local]") + " "; int i = source.find(rep); if (i>=0) { source.remove(i, rep.length()); diff --git a/bibletime/frontend/cswordsetupdialog.h b/bibletime/frontend/cswordsetupdialog.h index a77a6e5..612e91e 100644 --- a/bibletime/frontend/cswordsetupdialog.h +++ b/bibletime/frontend/cswordsetupdialog.h @@ -17,20 +17,20 @@ #include "btinstallmgr.h" //QT includes -#include <qstring.h> -#include <qmap.h> +#include <tqstring.h> +#include <tqmap.h> //KDE includes #include <kdialogbase.h> -class QWidget; -class QLabel; -class QComboBox; -class QWidgetStack; -class QButton; -class QPushButton; -class QLineEdit; -class QListView; +class TQWidget; +class TQLabel; +class TQComboBox; +class TQWidgetStack; +class TQButton; +class TQPushButton; +class TQLineEdit; +class TQListView; class KProgressDialog; @@ -46,7 +46,7 @@ class CSwordSetupDialog : public KDialogBase, public CPointers { Q_OBJECT public: - CSwordSetupDialog(QWidget *parent=0, const char *name=0); + CSwordSetupDialog(TQWidget *parent=0, const char *name=0); enum Parts { Sword, @@ -68,57 +68,57 @@ private: void setupSwordPathListBox(); void populateInstallCombos(); - const QString currentInstallSource(); + const TQString currentInstallSource(); - QFrame* m_swordConfigPage; - QListView* m_swordPathListBox; - QPushButton* m_swordEditPathButton; - QPushButton* m_swordAddPathButton; - QPushButton* m_swordRemovePathButton; - QStringList m_swordPathList; + TQFrame* m_swordConfigPage; + TQListView* m_swordPathListBox; + TQPushButton* m_swordEditPathButton; + TQPushButton* m_swordAddPathButton; + TQPushButton* m_swordRemovePathButton; + TQStringList m_swordPathList; bool m_swordSetupChanged; - QFrame* m_removePage; - QFrame* m_manageIndiciesPage; + TQFrame* m_removePage; + TQFrame* m_manageIndiciesPage; - QFrame* m_installPage; - QWidgetStack* m_installWidgetStack; + TQFrame* m_installPage; + TQWidgetStack* m_installWidgetStack; - QString source; - QString target; + TQString source; + TQString target; - QLabel* m_sourceLabel; - QLabel* m_targetLabel; - QComboBox* m_sourceCombo; - QComboBox* m_targetCombo; + TQLabel* m_sourceLabel; + TQLabel* m_targetLabel; + TQComboBox* m_sourceCombo; + TQComboBox* m_targetCombo; - QMap<QString, QString> m_targetMap; + TQMap<TQString, TQString> m_targetMap; CSwordSetupModuleListView* m_removeModuleListView; - QPushButton* m_removeRemoveButton; + TQPushButton* m_removeRemoveButton; - const bool refreshRemoteModuleCache( const QString& sourceName ); + const bool refreshRemoteModuleCache( const TQString& sourceName ); void populateRemoveModuleListView(); - bool populateInstallModuleListView(const QString& sourceName); + bool populateInstallModuleListView(const TQString& sourceName); //install module stuff - QPushButton* m_installBackButton; - QPushButton* m_installContinueButton; + TQPushButton* m_installBackButton; + TQPushButton* m_installContinueButton; - QWidget* m_installModuleListPage; - QWidget* m_installSourcePage; + TQWidget* m_installModuleListPage; + TQWidget* m_installSourcePage; CSwordSetupModuleListView* m_installModuleListView; KProgressDialog* m_progressDialog; - QString m_installingModule; + TQString m_installingModule; bool m_refreshedRemoteSources; unsigned int m_installedModuleCount; BTInstallMgr* m_currentInstallMgr; //pointer to the current installmgr object so we can access it in the cancel install slot private slots: - void slot_sourceSelected(const QString &sourceName); - void slot_targetSelected(const QString &targetName); + void slot_sourceSelected(const TQString &sourceName); + void slot_targetSelected(const TQString &targetName); void slot_doRemoveModules(); diff --git a/bibletime/frontend/cswordsetupinstallsourcesdialog.cpp b/bibletime/frontend/cswordsetupinstallsourcesdialog.cpp index 504ab7d..a5cedbd 100644 --- a/bibletime/frontend/cswordsetupinstallsourcesdialog.cpp +++ b/bibletime/frontend/cswordsetupinstallsourcesdialog.cpp @@ -14,13 +14,13 @@ #include "util/scoped_resource.h" //Qt includes -#include <qlayout.h> -#include <qlabel.h> -#include <qcombobox.h> -#include <qlineedit.h> -#include <qpushbutton.h> -#include <qmessagebox.h> -#include <qfileinfo.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqcombobox.h> +#include <tqlineedit.h> +#include <tqpushbutton.h> +#include <tqmessagebox.h> +#include <tqfileinfo.h> #include <klocale.h> @@ -28,96 +28,96 @@ namespace BookshelfManager { - const QString PROTO_FILE( i18n("Local") ); //Local path - const QString PROTO_FTP( i18n("Remote") ); //Remote path + const TQString PROTO_FILE( i18n("Local") ); //Local path + const TQString PROTO_FTP( i18n("Remote") ); //Remote path - CSwordSetupInstallSourcesDialog::CSwordSetupInstallSourcesDialog(/*QWidget *parent*/) -: QDialog() { + CSwordSetupInstallSourcesDialog::CSwordSetupInstallSourcesDialog(/*TQWidget *parent*/) +: TQDialog() { - QVBoxLayout* mainLayout = new QVBoxLayout( this ); + TQVBoxLayout* mainLayout = new TQVBoxLayout( this ); mainLayout->setMargin( 10 ); mainLayout->setSpacing( 5 ); - QHBoxLayout *captionLayout = new QHBoxLayout( mainLayout ); - QLabel *label = new QLabel( i18n("Caption"), this ); + TQHBoxLayout *captionLayout = new TQHBoxLayout( mainLayout ); + TQLabel *label = new TQLabel( i18n("Caption"), this ); captionLayout->addWidget( label ); - m_captionEdit = new QLineEdit( this ); + m_captionEdit = new TQLineEdit( this ); m_captionEdit->setText("Crosswire Bible Society"); captionLayout->addWidget( m_captionEdit ); mainLayout->addSpacing( 10 ); - QGridLayout* layout = new QGridLayout( mainLayout, 3, 3 ); + TQGridLayout* layout = new TQGridLayout( mainLayout, 3, 3 ); layout->setSpacing( 5 ); - label = new QLabel(i18n("Type"), this); + label = new TQLabel(i18n("Type"), this); layout->addWidget( label, 0, 0); - m_serverLabel = new QLabel(i18n("Server"), this); + m_serverLabel = new TQLabel(i18n("Server"), this); layout->addWidget( m_serverLabel, 0, 1); - label = new QLabel(i18n("Path"), this); + label = new TQLabel(i18n("Path"), this); layout->addWidget( label, 0, 2 ); - m_protocolCombo = new QComboBox( this ); + m_protocolCombo = new TQComboBox( this ); layout->addWidget(m_protocolCombo, 1, 0); m_protocolCombo->insertItem( PROTO_FTP ); m_protocolCombo->insertItem( PROTO_FILE ); - m_serverEdit = new QLineEdit( this ); + m_serverEdit = new TQLineEdit( this ); layout->addWidget( m_serverEdit, 1, 1 ); m_serverEdit->setText("ftp.crosswire.org"); - m_pathEdit = new QLineEdit( this ); + m_pathEdit = new TQLineEdit( this ); layout->addWidget( m_pathEdit, 1, 2 ); m_pathEdit->setText("/pub/sword/raw"); mainLayout->addSpacing( 10 ); - QHBoxLayout* buttonLayout = new QHBoxLayout( mainLayout ); + TQHBoxLayout* buttonLayout = new TQHBoxLayout( mainLayout ); buttonLayout->addStretch(); - QPushButton* okButton = new QPushButton( i18n("Ok"), this); - QPushButton* discardButton = new QPushButton( i18n("Discard"), this); + TQPushButton* okButton = new TQPushButton( i18n("Ok"), this); + TQPushButton* discardButton = new TQPushButton( i18n("Discard"), this); buttonLayout->addWidget( discardButton); buttonLayout->addWidget( okButton); buttonLayout->addStretch(); - connect( okButton, SIGNAL( clicked() ), this, SLOT( slotOk() ) ); - connect( discardButton, SIGNAL( clicked() ), this, SLOT( reject() ) ); - connect( m_protocolCombo, SIGNAL( activated(int) ), this, SLOT( slotProtocolChanged() ) ); + connect( okButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOk() ) ); + connect( discardButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) ); + connect( m_protocolCombo, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotProtocolChanged() ) ); } void CSwordSetupInstallSourcesDialog::slotOk() { //run a few tests to validate the input first if ( m_captionEdit->text().stripWhiteSpace().isEmpty() ) { //no caption - QMessageBox::information( this, i18n( "Error" ), i18n("Please provide a caption."), QMessageBox::Retry); + TQMessageBox::information( this, i18n( "Error" ), i18n("Please provide a caption."), TQMessageBox::Retry); return; } BTInstallMgr iMgr; sword::InstallSource is = BTInstallMgr::Tool::RemoteConfig::source( &iMgr, m_captionEdit->text() ); - if ( (QString)is.caption.c_str() == m_captionEdit->text() ) { //source already exists - QMessageBox::information( this, i18n( "Error" ), - i18n("A source with this caption already exists.<br>Please provide a different caption."), QMessageBox::Retry); + if ( (TQString)is.caption.c_str() == m_captionEdit->text() ) { //source already exists + TQMessageBox::information( this, i18n( "Error" ), + i18n("A source with this caption already exists.<br>Please provide a different caption."), TQMessageBox::Retry); return; } if ( m_protocolCombo->currentText() == PROTO_FTP && m_serverEdit->text().stripWhiteSpace().isEmpty() ) { //no server name - QMessageBox::information( this, i18n( "Error" ), i18n("Please provide a server name."), QMessageBox::Retry); + TQMessageBox::information( this, i18n( "Error" ), i18n("Please provide a server name."), TQMessageBox::Retry); return; } if ( m_protocolCombo->currentText() == PROTO_FILE) { - const QFileInfo fi( m_pathEdit->text() ); + const TQFileInfo fi( m_pathEdit->text() ); if (!fi.exists() || !fi.isReadable()) { //no valid and readable path - QMessageBox::information( this, i18n( "Error" ), i18n("Please provide a valid, readable path."), QMessageBox::Retry); + TQMessageBox::information( this, i18n( "Error" ), i18n("Please provide a valid, readable path."), TQMessageBox::Retry); return; } else if ( m_pathEdit->text().isEmpty() ) { - QMessageBox::information( this, i18n( "Error" ), i18n("Please provide a path."), QMessageBox::Retry); + TQMessageBox::information( this, i18n( "Error" ), i18n("Please provide a path."), TQMessageBox::Retry); } } @@ -134,7 +134,7 @@ namespace BookshelfManager { m_serverLabel->hide(); m_serverEdit->hide(); - KURL url = KDirSelectDialog::selectDirectory(QString::null, true); + KURL url = KDirSelectDialog::selectDirectory(TQString::null, true); if (url.isValid()) { m_pathEdit->setText( url.path() ); } @@ -147,7 +147,7 @@ namespace BookshelfManager { util::scoped_ptr<CSwordSetupInstallSourcesDialog> dlg( new CSwordSetupInstallSourcesDialog() ); sword::InstallSource newSource(""); //empty, invalid Source - if (dlg->exec() == QDialog::Accepted) { + if (dlg->exec() == TQDialog::Accepted) { if (dlg->m_protocolCombo->currentText() == PROTO_FTP) { newSource.type = "FTP"; newSource.source = dlg->m_serverEdit->text().utf8(); diff --git a/bibletime/frontend/cswordsetupinstallsourcesdialog.h b/bibletime/frontend/cswordsetupinstallsourcesdialog.h index a7d039a..c01ac73 100644 --- a/bibletime/frontend/cswordsetupinstallsourcesdialog.h +++ b/bibletime/frontend/cswordsetupinstallsourcesdialog.h @@ -2,15 +2,15 @@ #define CSWORDSETUPINSTALLSOURCESDIALOG_H #include "btinstallmgr.h" -#include <qdialog.h> +#include <tqdialog.h> -class QLabel; -class QComboBox; -class QLineEdit; +class TQLabel; +class TQComboBox; +class TQLineEdit; namespace BookshelfManager { -class CSwordSetupInstallSourcesDialog : public QDialog { +class CSwordSetupInstallSourcesDialog : public TQDialog { Q_OBJECT public: @@ -24,9 +24,9 @@ protected slots: void slotProtocolChanged(); private: - QLabel *m_serverLabel; - QLineEdit *m_captionEdit, *m_serverEdit, *m_pathEdit; - QComboBox *m_protocolCombo; + TQLabel *m_serverLabel; + TQLineEdit *m_captionEdit, *m_serverEdit, *m_pathEdit; + TQComboBox *m_protocolCombo; }; } //namespace diff --git a/bibletime/frontend/cswordsetupmodulelistview.cpp b/bibletime/frontend/cswordsetupmodulelistview.cpp index e06dc9c..c0f57ff 100644 --- a/bibletime/frontend/cswordsetupmodulelistview.cpp +++ b/bibletime/frontend/cswordsetupmodulelistview.cpp @@ -19,7 +19,7 @@ #include "util/ctoolclass.h" //QT includes -#include <qtooltip.h> +#include <tqtooltip.h> //KDE includes #include <klocale.h> @@ -29,30 +29,30 @@ using namespace sword; namespace BookshelfManager { - /** Tooltip implementation for QListView widgets. + /** Tooltip implementation for TQListView widgets. * @short Tooltip for InstallationManager listviews * @author Joachim Ansorg */ - class ToolTip : public QToolTip { + class ToolTip : public TQToolTip { public: /** Constructor which takes the listview to operate on. * @param listview We operate on this widget to request tooltips from it'd child items. * @short Constructor. */ ToolTip(CSwordSetupModuleListView* listview) - : QToolTip( listview->viewport() ), + : TQToolTip( listview->viewport() ), m_parent( listview ) {} - /** Reimplementation of QToolTip::maybeTip. It's requested if a new tooltip may be displayed. + /** Reimplementation of TQToolTip::maybeTip. It's requested if a new tooltip may be displayed. * @short Display a tooltip if we're over an item */ - virtual void maybeTip(const QPoint& pos) { - QListViewItem* i = m_parent->itemAt(pos); + virtual void maybeTip(const TQPoint& pos) { + TQListViewItem* i = m_parent->itemAt(pos); Q_ASSERT(i); - const QRect rect = m_parent->itemRect(i); + const TQRect rect = m_parent->itemRect(i); if (m_parent->showTooltip(i, pos, 0)) { - const QString tipText = m_parent->tooltip(i, 0); + const TQString tipText = m_parent->tooltip(i, 0); tip(rect, tipText); } } @@ -65,14 +65,14 @@ namespace BookshelfManager { * @short InstallationManager module listviews * @author Martin Gruner */ - CSwordSetupModuleListView::CSwordSetupModuleListView(QWidget *parent, bool is_remote, sword::InstallSource* installSource) + CSwordSetupModuleListView::CSwordSetupModuleListView(TQWidget *parent, bool is_remote, sword::InstallSource* installSource) : KListView(parent), m_is_remote( is_remote ) { Q_ASSERT(installSource); new BookshelfManager::ToolTip(this); m_backend = installSource ? BTInstallMgr::Tool::backend(installSource) : CPointers::backend(); addColumn(i18n("Name")); - setColumnWidthMode( 0, QListView::Maximum ); + setColumnWidthMode( 0, TQListView::Maximum ); setColumnWidth( 0, 200 ); //don`t get too broad addColumn(i18n("Status")); @@ -90,7 +90,7 @@ namespace BookshelfManager { setAllColumnsShowFocus(true); setFullWidth(true); setRootIsDecorated(true); - setResizeMode(QListView::LastColumn); + setResizeMode(TQListView::LastColumn); setTooltipColumn(0); init(); @@ -104,20 +104,20 @@ namespace BookshelfManager { void CSwordSetupModuleListView::init() { #if QT_VERSION >= 0x030200 - m_categoryBible = new QCheckListItem(this, i18n("Bibles"), QCheckListItem::CheckBoxController); - m_categoryCommentary = new QCheckListItem(this, i18n("Commentaries"), QCheckListItem::CheckBoxController); - m_categoryLexicon = new QCheckListItem(this, i18n("Lexicons"), QCheckListItem::CheckBoxController); - m_categoryBook = new QCheckListItem(this, i18n("Books"), QCheckListItem::CheckBoxController); - m_categoryDevotionals = new QCheckListItem(this, i18n("Daily Devotionals"), QCheckListItem::CheckBoxController); - m_categoryGlossaries = new QCheckListItem(this, i18n("Glossaries"), QCheckListItem::CheckBoxController); + m_categoryBible = new TQCheckListItem(this, i18n("Bibles"), TQCheckListItem::CheckBoxController); + m_categoryCommentary = new TQCheckListItem(this, i18n("Commentaries"), TQCheckListItem::CheckBoxController); + m_categoryLexicon = new TQCheckListItem(this, i18n("Lexicons"), TQCheckListItem::CheckBoxController); + m_categoryBook = new TQCheckListItem(this, i18n("Books"), TQCheckListItem::CheckBoxController); + m_categoryDevotionals = new TQCheckListItem(this, i18n("Daily Devotionals"), TQCheckListItem::CheckBoxController); + m_categoryGlossaries = new TQCheckListItem(this, i18n("Glossaries"), TQCheckListItem::CheckBoxController); #else // Qt <= 3.1.x doesn't support the CheckBoxController!, remove the define as soon as we switch to the new Qt - m_categoryBible = new QCheckListItem(this, i18n("Bibles"), QCheckListItem::Controller); - m_categoryCommentary = new QCheckListItem(this, i18n("Commentaries"), QCheckListItem::Controller); - m_categoryLexicon = new QCheckListItem(this, i18n("Lexicons"), QCheckListItem::Controller); - m_categoryBook = new QCheckListItem(this, i18n("Books"), QCheckListItem::Controller); - m_categoryDevotionals = new QCheckListItem(this, i18n("Daily Devotionals"), QCheckListItem::Controller); - m_categoryGlossaries = new QCheckListItem(this, i18n("Glossaries"), QCheckListItem::Controller); + m_categoryBible = new TQCheckListItem(this, i18n("Bibles"), TQCheckListItem::Controller); + m_categoryCommentary = new TQCheckListItem(this, i18n("Commentaries"), TQCheckListItem::Controller); + m_categoryLexicon = new TQCheckListItem(this, i18n("Lexicons"), TQCheckListItem::Controller); + m_categoryBook = new TQCheckListItem(this, i18n("Books"), TQCheckListItem::Controller); + m_categoryDevotionals = new TQCheckListItem(this, i18n("Daily Devotionals"), TQCheckListItem::Controller); + m_categoryGlossaries = new TQCheckListItem(this, i18n("Glossaries"), TQCheckListItem::Controller); #endif m_categoryBible->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16)); @@ -134,9 +134,9 @@ namespace BookshelfManager { m_categoryDevotionals->setOpen(true); m_categoryGlossaries->setOpen(true); - // connect(this, SIGNAL(executed(QListViewItem*)), SLOT(slotItemClicked(QListViewItem*))); - connect(this, SIGNAL(clicked(QListViewItem*)), SLOT(slotItemClicked(QListViewItem*))); //items have to be clicked only once in double click mode - connect(this, SIGNAL(spacePressed(QListViewItem*)), SLOT(slotItemClicked(QListViewItem*))); + // connect(this, TQT_SIGNAL(executed(TQListViewItem*)), TQT_SLOT(slotItemClicked(TQListViewItem*))); + connect(this, TQT_SIGNAL(clicked(TQListViewItem*)), TQT_SLOT(slotItemClicked(TQListViewItem*))); //items have to be clicked only once in double click mode + connect(this, TQT_SIGNAL(spacePressed(TQListViewItem*)), TQT_SLOT(slotItemClicked(TQListViewItem*))); } void CSwordSetupModuleListView::finish() { @@ -155,13 +155,13 @@ namespace BookshelfManager { } void CSwordSetupModuleListView::clear() { - QListView::clear(); + TQListView::clear(); init(); } - void CSwordSetupModuleListView::addModule(CSwordModuleInfo* module, QString localVersion) { + void CSwordSetupModuleListView::addModule(CSwordModuleInfo* module, TQString localVersion) { - QListViewItem* parent = 0; + TQListViewItem* parent = 0; switch ( module->type() ) { case CSwordModuleInfo::Bible: parent = m_categoryBible; @@ -190,12 +190,12 @@ namespace BookshelfManager { //now we know the category, find the right language group in that category const CLanguageMgr::Language* const lang = module->language(); - QString langName = lang->translatedName(); + TQString langName = lang->translatedName(); if (!lang->isValid()) { - langName = QString(module->module()->Lang()); + langName = TQString(module->module()->Lang()); } - QListViewItem * langFolder = 0; + TQListViewItem * langFolder = 0; if (parent) { langFolder = parent->firstChild(); @@ -210,10 +210,10 @@ namespace BookshelfManager { if (!langFolder) { //not yet there #if QT_VERSION >= 0x030200 - langFolder = new QCheckListItem(parent, langName, QCheckListItem::CheckBoxController); + langFolder = new TQCheckListItem(parent, langName, TQCheckListItem::CheckBoxController); #else - langFolder = new QCheckListItem(parent, langName, QCheckListItem::Controller); + langFolder = new TQCheckListItem(parent, langName, TQCheckListItem::Controller); #endif langFolder->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16)); @@ -222,11 +222,11 @@ namespace BookshelfManager { Q_ASSERT(langFolder); - QListViewItem* newItem = 0; + TQListViewItem* newItem = 0; if (langFolder) { - newItem = new QCheckListItem(langFolder, module->name(), QCheckListItem::CheckBox); + newItem = new TQCheckListItem(langFolder, module->name(), TQCheckListItem::CheckBox); } else { //shouldn't happen - newItem = new QCheckListItem(this, module->name(), QCheckListItem::CheckBox); + newItem = new TQCheckListItem(this, module->name(), TQCheckListItem::CheckBox); } newItem->setPixmap(0, CToolClass::getIconForModule(module)); @@ -244,13 +244,13 @@ namespace BookshelfManager { } } - QStringList CSwordSetupModuleListView::selectedModules() { - QStringList moduleList; + TQStringList CSwordSetupModuleListView::selectedModules() { + TQStringList moduleList; - QListViewItemIterator list_it( this ); + TQListViewItemIterator list_it( this ); while ( list_it.current() ) { - QCheckListItem* i = dynamic_cast<QCheckListItem*>( list_it.current() ); - if (i && i->isOn() && i->type() == QCheckListItem::CheckBox ) { + TQCheckListItem* i = dynamic_cast<TQCheckListItem*>( list_it.current() ); + if (i && i->isOn() && i->type() == TQCheckListItem::CheckBox ) { moduleList << i->text(0); } ++list_it; @@ -259,23 +259,23 @@ namespace BookshelfManager { return moduleList; } - void CSwordSetupModuleListView::slotItemClicked(QListViewItem*) { + void CSwordSetupModuleListView::slotItemClicked(TQListViewItem*) { emit selectedModulesChanged(); } - bool CSwordSetupModuleListView::showTooltip(QListViewItem* i, const QPoint&, int) const { - QCheckListItem* checkItem = dynamic_cast<QCheckListItem*>( i ); + bool CSwordSetupModuleListView::showTooltip(TQListViewItem* i, const TQPoint&, int) const { + TQCheckListItem* checkItem = dynamic_cast<TQCheckListItem*>( i ); Q_ASSERT(checkItem); - return (checkItem && (checkItem->type() == QCheckListItem::CheckBox)); + return (checkItem && (checkItem->type() == TQCheckListItem::CheckBox)); } - QString CSwordSetupModuleListView::tooltip(QListViewItem* i, int /*column*/) const { - QString ret; - QCheckListItem* checkItem = dynamic_cast<QCheckListItem*>( i ); + TQString CSwordSetupModuleListView::tooltip(TQListViewItem* i, int /*column*/) const { + TQString ret; + TQCheckListItem* checkItem = dynamic_cast<TQCheckListItem*>( i ); - if (checkItem && (checkItem->type() == QCheckListItem::CheckBox)) { - const QString moduleName = checkItem->text(0); + if (checkItem && (checkItem->type() == TQCheckListItem::CheckBox)) { + const TQString moduleName = checkItem->text(0); CSwordModuleInfo* module = m_backend->findModuleByName(moduleName); ret = CToolClass::moduleToolTip(module); diff --git a/bibletime/frontend/cswordsetupmodulelistview.h b/bibletime/frontend/cswordsetupmodulelistview.h index 1c7cac5..a05f5f1 100644 --- a/bibletime/frontend/cswordsetupmodulelistview.h +++ b/bibletime/frontend/cswordsetupmodulelistview.h @@ -16,8 +16,8 @@ #include <installmgr.h> //QT includes -#include <qstring.h> -#include <qmap.h> +#include <tqstring.h> +#include <tqmap.h> //KDE includes #include <klistview.h> @@ -31,19 +31,19 @@ class CSwordSetupModuleListView : public KListView { Q_OBJECT public: - CSwordSetupModuleListView(QWidget* parent, bool is_remote, sword::InstallSource* installSource = 0); + CSwordSetupModuleListView(TQWidget* parent, bool is_remote, sword::InstallSource* installSource = 0); virtual ~CSwordSetupModuleListView(); - void addModule(CSwordModuleInfo *, QString localVersion); + void addModule(CSwordModuleInfo *, TQString localVersion); void finish(); - QStringList selectedModules(); + TQStringList selectedModules(); void clear(); - virtual QString tooltip(QListViewItem* i, int column) const; - virtual bool showTooltip(QListViewItem* i, const QPoint& pos, int column) const; + virtual TQString tooltip(TQListViewItem* i, int column) const; + virtual bool showTooltip(TQListViewItem* i, const TQPoint& pos, int column) const; protected slots: - void slotItemClicked(QListViewItem*); + void slotItemClicked(TQListViewItem*); private: void init(); @@ -51,12 +51,12 @@ private: CSwordBackend* m_backend; bool m_is_remote; - QListViewItem* m_categoryBible; - QListViewItem* m_categoryCommentary; - QListViewItem* m_categoryLexicon; - QListViewItem* m_categoryBook; - QListViewItem* m_categoryDevotionals; - QListViewItem* m_categoryGlossaries; + TQListViewItem* m_categoryBible; + TQListViewItem* m_categoryCommentary; + TQListViewItem* m_categoryLexicon; + TQListViewItem* m_categoryBook; + TQListViewItem* m_categoryDevotionals; + TQListViewItem* m_categoryGlossaries; signals: void selectedModulesChanged(); diff --git a/bibletime/frontend/display/cdisplay.cpp b/bibletime/frontend/display/cdisplay.cpp index ce97e02..f4f5f04 100644 --- a/bibletime/frontend/display/cdisplay.cpp +++ b/bibletime/frontend/display/cdisplay.cpp @@ -20,9 +20,9 @@ //Qt includes -#include <qclipboard.h> -#include <qpopupmenu.h> -#include <qtimer.h> +#include <tqclipboard.h> +#include <tqpopupmenu.h> +#include <tqtimer.h> //KDE includes #include <kapplication.h> @@ -45,12 +45,12 @@ void CDisplayConnections::saveAsPlain() { } /** Emits the signal. */ -void CDisplayConnections::emitReferenceClicked( const QString& module, const QString& key) { +void CDisplayConnections::emitReferenceClicked( const TQString& module, const TQString& key) { emit referenceClicked( module, key ); } /** Emits the signal. */ -void CDisplayConnections::emitReferenceDropped( const QString& key) { +void CDisplayConnections::emitReferenceDropped( const TQString& key) { emit referenceDropped(key); } @@ -94,7 +94,7 @@ void CDisplayConnections::saveAnchorWithText() { } void CDisplayConnections::clear() { - m_display->setText(QString::null); + m_display->setText(TQString::null); } void CDisplayConnections::zoomIn() { @@ -112,11 +112,11 @@ void CDisplayConnections::openFindTextDialog() { /*----------------------*/ -CReadDisplay* CDisplay::createReadInstance( CReadWindow* readWindow, QWidget* parent ) { +CReadDisplay* CDisplay::createReadInstance( CReadWindow* readWindow, TQWidget* parent ) { return new CHTMLReadDisplay(readWindow, parent); } -CWriteDisplay* CDisplay::createWriteInstance( CWriteWindow* writeWindow, const CWriteDisplay::WriteDisplayType& type, QWidget* parent ) { +CWriteDisplay* CDisplay::createWriteInstance( CWriteWindow* writeWindow, const CWriteDisplay::WriteDisplayType& type, TQWidget* parent ) { // qWarning("CDisplay::createWriteInstance"); if (type == PlainTextDisplay) { return new CPlainWriteDisplay(writeWindow, parent); @@ -137,7 +137,7 @@ CDisplay::~CDisplay() { } const bool CDisplay::copy( const CDisplay::TextType format, const CDisplay::TextPart part ) { - const QString content = text(format, part); + const TQString content = text(format, part); QClipboard* cb = KApplication::clipboard(); cb->setText(content); @@ -146,19 +146,19 @@ const bool CDisplay::copy( const CDisplay::TextType format, const CDisplay::Text const bool CDisplay::save( const CDisplay::TextType format, const CDisplay::TextPart part ) { // qWarning("CDisplay::save( const CDisplay::TextType format, const CDisplay::TextPart part )"); - const QString content = text(format, part); - QString filter = QString::null; + const TQString content = text(format, part); + TQString filter = TQString::null; switch (format) { case HTMLText: - filter = QString("*.html *.htm | ") + i18n("HTML files") + QString("\n *.* | All files (*.*)"); + filter = TQString("*.html *.htm | ") + i18n("HTML files") + TQString("\n *.* | All files (*.*)"); break; case PlainText: - filter = QString("*.txt | ") + i18n("Text files") + QString("\n *.* | All files (*.*)"); + filter = TQString("*.txt | ") + i18n("Text files") + TQString("\n *.* | All files (*.*)"); break; }; - const QString filename = KFileDialog::getSaveFileName(QString::null, filter, 0, i18n("Save document ...")); + const TQString filename = KFileDialog::getSaveFileName(TQString::null, filter, 0, i18n("Save document ...")); if (!filename.isEmpty()) { CToolClass::savePlainFile(filename, content); @@ -167,10 +167,10 @@ const bool CDisplay::save( const CDisplay::TextType format, const CDisplay::Text } /** Emits the signal which used when a reference was clicked. */ -void CDisplay::emitReferenceClicked( const QString& reference ) { +void CDisplay::emitReferenceClicked( const TQString& reference ) { qWarning("reference clicked %s", reference.latin1()); - QString module; - QString key; + TQString module; + TQString key; CReferenceManager::Type type; /*const bool ok = */ CReferenceManager::decodeHyperlink(reference, module, key, type); @@ -181,9 +181,9 @@ void CDisplay::emitReferenceClicked( const QString& reference ) { } /** Used when a reference was dropped onto the widget. */ -void CDisplay::emitReferenceDropped( const QString& reference ) { - QString module; - QString key; +void CDisplay::emitReferenceDropped( const TQString& reference ) { + TQString module; + TQString key; CReferenceManager::Type type; /*const bool ok = */ CReferenceManager::decodeHyperlink(reference, module, key, type); @@ -204,12 +204,12 @@ CDisplayWindow* const CDisplay::parentWindow() const { } /** Installs the popup which should be opened when the right mouse button was pressed. */ -void CDisplay::installPopup( QPopupMenu* popup ) { +void CDisplay::installPopup( TQPopupMenu* popup ) { m_popup = popup; } /** Returns the popup menu which was set by installPopupMenu() */ -QPopupMenu* const CDisplay::installedPopup() { +TQPopupMenu* const CDisplay::installedPopup() { Q_ASSERT(m_popup); return m_popup; } diff --git a/bibletime/frontend/display/cdisplay.h b/bibletime/frontend/display/cdisplay.h index d37692c..1d34f9e 100644 --- a/bibletime/frontend/display/cdisplay.h +++ b/bibletime/frontend/display/cdisplay.h @@ -17,9 +17,9 @@ #include "backend/cswordbackend.h" //Qt includes -#include <qobject.h> -#include <qstring.h> -#include <qmap.h> +#include <tqobject.h> +#include <tqstring.h> +#include <tqmap.h> class CDisplayConnections; @@ -31,7 +31,7 @@ class CReadDisplay; class CWriteDisplay; -class QPopupMenu; +class TQPopupMenu; /** The base class for all display widgets. * @author The BibleTime team @@ -43,8 +43,8 @@ public: PlainTextDisplay }; - static CReadDisplay* createReadInstance(CReadWindow* readWindow, QWidget* parent = 0); - static CWriteDisplay* createWriteInstance( CWriteWindow* writeWindow, const WriteDisplayType& type = PlainTextDisplay, QWidget* parent = 0 ); + static CReadDisplay* createReadInstance(CReadWindow* readWindow, TQWidget* parent = 0); + static CWriteDisplay* createWriteInstance( CWriteWindow* writeWindow, const WriteDisplayType& type = PlainTextDisplay, TQWidget* parent = 0 ); enum TextType { HTMLText, /* Used for HTML markup */ @@ -72,11 +72,11 @@ public: /** Returns the text in the given format. * */ - virtual const QString text( const CDisplay::TextType format = CDisplay::HTMLText, const CDisplay::TextPart part = CDisplay::Document ) = 0; + virtual const TQString text( const CDisplay::TextType format = CDisplay::HTMLText, const CDisplay::TextPart part = CDisplay::Document ) = 0; /** * Sets the new text for this display widget. */ - virtual void setText( const QString& newText ) = 0; + virtual void setText( const TQString& newText ) = 0; /** * Returns true if the display widget has a selection. Otherwise false. */ @@ -84,7 +84,7 @@ public: /** * Returns the view of this display widget. */ - virtual QWidget* view() = 0; + virtual TQWidget* view() = 0; /** * Selects the document text. */ @@ -101,11 +101,11 @@ public: /** * Installs the popup which should be opened when the right mouse button was pressed. */ - void installPopup( QPopupMenu* popup ); + void installPopup( TQPopupMenu* popup ); /** * Returns the popup menu which was set by installPopupMenu() */ - QPopupMenu* const installedPopup(); + TQPopupMenu* const installedPopup(); virtual void zoomIn() {} virtual void zoomOut() {} @@ -116,19 +116,19 @@ public: }; - virtual QMap<NodeInfoType, QString> getCurrentNodeInfo() { - return QMap<NodeInfoType, QString>(); + virtual TQMap<NodeInfoType, TQString> getCurrentNodeInfo() { + return TQMap<NodeInfoType, TQString>(); } protected: /** * Used when a reference was dropped onto the widget. */ - void emitReferenceDropped( const QString& reference ); + void emitReferenceDropped( const TQString& reference ); /** * Emits the signal which used when a reference was clicked. */ - void emitReferenceClicked( const QString& reference ); + void emitReferenceClicked( const TQString& reference ); protected: CDisplay(CDisplayWindow* parent); @@ -137,18 +137,18 @@ protected: private: CDisplayWindow* m_parentWindow; CDisplayConnections* m_connections; - QPopupMenu* m_popup; + TQPopupMenu* m_popup; }; -class CDisplayConnections : public QObject { +class CDisplayConnections : public TQObject { Q_OBJECT public: CDisplayConnections( CDisplay* parent ); public slots: virtual void selectAll(); - void emitReferenceClicked( const QString& module, const QString& key); - void emitReferenceDropped( const QString& key ); + void emitReferenceClicked( const TQString& module, const TQString& key); + void emitReferenceDropped( const TQString& key ); void emitTextChanged(); //stuff which works in every CDisplay @@ -173,16 +173,16 @@ public slots: void openFindTextDialog(); signals: - void referenceClicked(const QString& module, const QString& key); - void referenceDropped(const QString& key); + void referenceClicked(const TQString& module, const TQString& key); + void referenceDropped(const TQString& key); void textChanged(); private: CDisplay* m_display; struct { - QString module; - QString key; + TQString module; + TQString key; } m_referenceClickedCache; }; diff --git a/bibletime/frontend/display/chtmlreaddisplay.cpp b/bibletime/frontend/display/chtmlreaddisplay.cpp index 4219f33..60e3e58 100644 --- a/bibletime/frontend/display/chtmlreaddisplay.cpp +++ b/bibletime/frontend/display/chtmlreaddisplay.cpp @@ -28,16 +28,16 @@ #include <kdeversion.h> //Qt includes -#include <qcursor.h> -#include <qscrollview.h> -#include <qwidget.h> -#include <qdragobject.h> -#include <qpopupmenu.h> -#include <qlayout.h> -#include <qtimer.h> +#include <tqcursor.h> +#include <tqscrollview.h> +#include <tqwidget.h> +#include <tqdragobject.h> +#include <tqpopupmenu.h> +#include <tqlayout.h> +#include <tqtimer.h> #if KDE_VERSION < 0x030300 //We will need to show the error message. -#include <qmessagebox.h> +#include <tqmessagebox.h> #endif //KDE includes @@ -52,10 +52,10 @@ using namespace InfoDisplay; -CHTMLReadDisplay::CHTMLReadDisplay(CReadWindow* readWindow, QWidget* parentWidget) +CHTMLReadDisplay::CHTMLReadDisplay(CReadWindow* readWindow, TQWidget* parentWidget) : KHTMLPart((m_view = new CHTMLReadDisplayView(this, parentWidget ? parentWidget : readWindow)), readWindow ? readWindow : parentWidget), CReadDisplay(readWindow), -m_currentAnchorCache(QString::null) { +m_currentAnchorCache(TQString::null) { setDNDEnabled(false); setJavaEnabled(false); setJScriptEnabled(false); @@ -67,7 +67,7 @@ m_currentAnchorCache(QString::null) { CHTMLReadDisplay::~CHTMLReadDisplay() {} -const QString CHTMLReadDisplay::text( const CDisplay::TextType format, const CDisplay::TextPart part) { +const TQString CHTMLReadDisplay::text( const CDisplay::TextType format, const CDisplay::TextPart part) { switch (part) { case Document: { @@ -95,7 +95,7 @@ const QString CHTMLReadDisplay::text( const CDisplay::TextType format, const CDi CPointers::backend()->setFilterOptions(filterOptions); - return QString(key->strippedText()).append("\n(") + return TQString(key->strippedText()).append("\n(") .append(key->key()) .append(", ") .append(key->module()->name()) @@ -106,7 +106,7 @@ const QString CHTMLReadDisplay::text( const CDisplay::TextType format, const CDi case SelectedText: { if (!hasSelection()) { - return QString::null; + return TQString::null; } else if (format == HTMLText) { DOM::Range range = selection(); @@ -118,8 +118,8 @@ const QString CHTMLReadDisplay::text( const CDisplay::TextType format, const CDi } case AnchorOnly: { - QString moduleName; - QString keyName; + TQString moduleName; + TQString keyName; CReferenceManager::Type type; CReferenceManager::decodeHyperlink(activeAnchor(), moduleName, keyName, type); @@ -127,8 +127,8 @@ const QString CHTMLReadDisplay::text( const CDisplay::TextType format, const CDi } case AnchorTextOnly: { - QString moduleName; - QString keyName; + TQString moduleName; + TQString keyName; CReferenceManager::Type type; CReferenceManager::decodeHyperlink(activeAnchor(), moduleName, keyName, type); @@ -138,12 +138,12 @@ const QString CHTMLReadDisplay::text( const CDisplay::TextType format, const CDi return key->strippedText(); } - return QString::null; + return TQString::null; } case AnchorWithText: { - QString moduleName; - QString keyName; + TQString moduleName; + TQString keyName; CReferenceManager::Type type; CReferenceManager::decodeHyperlink(activeAnchor(), moduleName, keyName, type); @@ -162,7 +162,7 @@ const QString CHTMLReadDisplay::text( const CDisplay::TextType format, const CDi CPointers::backend()->setFilterOptions(filterOptions); - return QString(key->strippedText()).append("\n(") + return TQString(key->strippedText()).append("\n(") .append(key->key()) .append(", ") .append(key->module()->name()) @@ -172,14 +172,14 @@ const QString CHTMLReadDisplay::text( const CDisplay::TextType format, const CDi .arg(key->key()) .arg(key->module()->name());*/ } - return QString::null; + return TQString::null; } default: - return QString::null; + return TQString::null; } } -void CHTMLReadDisplay::setText( const QString& newText ) { +void CHTMLReadDisplay::setText( const TQString& newText ) { begin(); write(newText); end(); @@ -192,7 +192,7 @@ const bool CHTMLReadDisplay::hasSelection() { /** Reimplementation. */ -QScrollView* CHTMLReadDisplay::view() { +TQScrollView* CHTMLReadDisplay::view() { return KHTMLPart::view(); } @@ -201,23 +201,23 @@ void CHTMLReadDisplay::selectAll() { } /** No descriptions */ -void CHTMLReadDisplay::moveToAnchor( const QString& anchor ) { +void CHTMLReadDisplay::moveToAnchor( const TQString& anchor ) { m_currentAnchorCache = anchor; //This is an ugly hack to work around a KDE problem in KDE including 3.3.1 (no later versions tested so far) - QTimer::singleShot(0, this, SLOT(slotGoToAnchor())); + TQTimer::singleShot(0, this, TQT_SLOT(slotGoToAnchor())); // instead of: // slotGoToAnchor(); } -void CHTMLReadDisplay::urlSelected( const QString& url, int button, int state, const QString& _target, KParts::URLArgs args) { +void CHTMLReadDisplay::urlSelected( const TQString& url, int button, int state, const TQString& _target, KParts::URLArgs args) { KHTMLPart::urlSelected(url, button, state, _target, args); m_urlWorkaroundData.doWorkaround = false; // qWarning("clicked: %s", url.latin1()); if (!url.isEmpty() && CReferenceManager::isHyperlink(url)) { - QString module; - QString key; + TQString module; + TQString key; CReferenceManager::Type type; CReferenceManager::decodeHyperlink(url, module, key, type); @@ -271,7 +271,7 @@ void CHTMLReadDisplay::khtmlMousePressEvent( khtml::MousePressEvent* event ) { if (event->qmouseEvent()->button() == Qt::RightButton) { DOM::Node tmpNode = event->innerNode(); DOM::Node attr; - m_nodeInfo[CDisplay::Lemma] = QString::null; + m_nodeInfo[CDisplay::Lemma] = TQString::null; do { if (!tmpNode.isNull() && (tmpNode.nodeType() == @@ -292,7 +292,7 @@ void CHTMLReadDisplay::khtmlMousePressEvent( khtml::MousePressEvent* event ) { m_dndData.anchor = event->url(); m_dndData.mousePressed = true; m_dndData.isDragging = false; - m_dndData.startPos = QPoint(event->x(), event->y()); + m_dndData.startPos = TQPoint(event->x(), event->y()); m_dndData.selection = selectedText(); if (!m_dndData.node.isNull()) { //we drag a valid link @@ -307,23 +307,23 @@ void CHTMLReadDisplay::khtmlMousePressEvent( khtml::MousePressEvent* event ) { void CHTMLReadDisplay::khtmlMouseMoveEvent( khtml::MouseMoveEvent* e ) { if( e->qmouseEvent()->state() & LeftButton == LeftButton) { //left mouse button pressed const int delay = KGlobalSettings::dndEventDelay(); - QPoint newPos = QPoint(e->x(), e->y()); + TQPoint newPos = TQPoint(e->x(), e->y()); if ( (newPos.x() > m_dndData.startPos.x()+delay || newPos.x() < (m_dndData.startPos.x()-delay) || newPos.y() > m_dndData.startPos.y()+delay || newPos.y() < (m_dndData.startPos.y()-delay)) && !m_dndData.isDragging && m_dndData.mousePressed ) { - QDragObject* d = 0; + TQDragObject* d = 0; if (!m_dndData.anchor.isEmpty() && (m_dndData.dragType == DNDData::Link) && !m_dndData.node.isNull() ) { // create a new bookmark drag! - QString module = QString::null; - QString key = QString::null; + TQString module = TQString::null; + TQString key = TQString::null; CReferenceManager::Type type; if ( !CReferenceManager::decodeHyperlink(m_dndData.anchor.string(), module, key, type) ) return; CDragDropMgr::ItemList dndItems; //no description! - dndItems.append( CDragDropMgr::Item(module, key, QString::null) ); + dndItems.append( CDragDropMgr::Item(module, key, TQString::null) ); d = CDragDropMgr::dragObject(dndItems, KHTMLPart::view()->viewport()); } else if ((m_dndData.dragType == DNDData::Text) && !m_dndData.selection.isEmpty()) { @@ -338,7 +338,7 @@ void CHTMLReadDisplay::khtmlMouseMoveEvent( khtml::MouseMoveEvent* e ) { m_dndData.mousePressed = false; //first make a virtual mouse click to end the selection, it it's in progress - QMouseEvent e(QEvent::MouseButtonRelease, QPoint(0,0), Qt::LeftButton, Qt::LeftButton); + TQMouseEvent e(TQEvent::MouseButtonRelease, TQPoint(0,0), Qt::LeftButton, Qt::LeftButton); KApplication::sendEvent(view()->viewport(), &e); d->drag(); } @@ -353,7 +353,7 @@ void CHTMLReadDisplay::khtmlMouseMoveEvent( khtml::MouseMoveEvent* e ) { // After some millisecs the new timer activates the Mag window update, see timerEvent() // SHIFT key not pressed, so we start timer if ( !(e->qmouseEvent()->state() & Qt::ShiftButton)) { - // QObject has simple timer + // TQObject has simple timer killTimers(); startTimer( CBTConfig::get(CBTConfig::magDelay) ); } @@ -366,7 +366,7 @@ void CHTMLReadDisplay::khtmlMouseMoveEvent( khtml::MouseMoveEvent* e ) { } /** The Mag window update happens here if the mouse has not moved to another node after starting the timer.*/ -void CHTMLReadDisplay::timerEvent( QTimerEvent *e ) { +void CHTMLReadDisplay::timerEvent( TQTimerEvent *e ) { killTimers(); DOM::Node currentNode = nodeUnderMouse(); CInfoDisplay::ListInfoData infoList; @@ -422,7 +422,7 @@ void CHTMLReadDisplay::timerEvent( QTimerEvent *e ) { // --------------------- -CHTMLReadDisplayView::CHTMLReadDisplayView(CHTMLReadDisplay* displayWidget, QWidget* parent) : KHTMLView(displayWidget, parent), m_display(displayWidget) { +CHTMLReadDisplayView::CHTMLReadDisplayView(CHTMLReadDisplay* displayWidget, TQWidget* parent) : KHTMLView(displayWidget, parent), m_display(displayWidget) { viewport()->setAcceptDrops(true); setMarginWidth(4); setMarginHeight(4); @@ -430,24 +430,24 @@ CHTMLReadDisplayView::CHTMLReadDisplayView(CHTMLReadDisplay* displayWidget, QWid /** Opens the popupmenu at the given position. */ -void CHTMLReadDisplayView::popupMenu( const QString& url, const QPoint& pos) { +void CHTMLReadDisplayView::popupMenu( const TQString& url, const TQPoint& pos) { if (!url.isEmpty()) { m_display->setActiveAnchor(url); } - if (QPopupMenu* popup = m_display->installedPopup()) { + if (TQPopupMenu* popup = m_display->installedPopup()) { popup->exec(pos); } } -/** Reimplementation from QScrollView. Sets the right slots */ +/** Reimplementation from TQScrollView. Sets the right slots */ void CHTMLReadDisplayView::polish() { KHTMLView::polish(); - connect( part(), SIGNAL(popupMenu(const QString&, const QPoint&)), - this, SLOT(popupMenu(const QString&, const QPoint&))); + connect( part(), TQT_SIGNAL(popupMenu(const TQString&, const TQPoint&)), + this, TQT_SLOT(popupMenu(const TQString&, const TQPoint&))); } -/** Reimplementatiob from QScrollView. */ -void CHTMLReadDisplayView::contentsDropEvent( QDropEvent* e ) { +/** Reimplementatiob from TQScrollView. */ +void CHTMLReadDisplayView::contentsDropEvent( TQDropEvent* e ) { if (CDragDropMgr::canDecode(e) && CDragDropMgr::dndType(e) == CDragDropMgr::Item::Bookmark) { CDragDropMgr::ItemList dndItems = CDragDropMgr::decode(e); CDragDropMgr::Item item = dndItems.first(); @@ -462,8 +462,8 @@ void CHTMLReadDisplayView::contentsDropEvent( QDropEvent* e ) { e->ignore(); } -/** Reimplementation from QScrollView. */ -void CHTMLReadDisplayView::contentsDragEnterEvent( QDragEnterEvent* e ) { +/** Reimplementation from TQScrollView. */ +void CHTMLReadDisplayView::contentsDragEnterEvent( TQDragEnterEvent* e ) { if (CDragDropMgr::canDecode(e) && CDragDropMgr::dndType(e) == CDragDropMgr::Item::Bookmark) { e->acceptAction(); return; @@ -482,7 +482,7 @@ void CHTMLReadDisplay::slotGoToAnchor() { qDebug("anchor %s not present!", m_currentAnchorCache.latin1()); } } - m_currentAnchorCache = QString::null; + m_currentAnchorCache = TQString::null; } void CHTMLReadDisplay::zoomIn() { @@ -497,7 +497,7 @@ void CHTMLReadDisplay::openFindTextDialog() { #if KDE_VERSION >= 0x030300 findText(); #else - QMessageBox::information(0, "Not Supported", + TQMessageBox::information(0, "Not Supported", "This copy of BibleTime was built against a version of KDE older\n" "than 3.3 (probably due to your distro), so this search feature\n" "does not work.\n\n" diff --git a/bibletime/frontend/display/chtmlreaddisplay.h b/bibletime/frontend/display/chtmlreaddisplay.h index 5b875cf..3a4cb02 100644 --- a/bibletime/frontend/display/chtmlreaddisplay.h +++ b/bibletime/frontend/display/chtmlreaddisplay.h @@ -17,8 +17,8 @@ //#include "frontend/ctooltip.h" //Qt includes -#include <qstring.h> -#include <qwidget.h> +#include <tqstring.h> +#include <tqwidget.h> //KDE includes #include <khtml_part.h> @@ -37,40 +37,40 @@ public: /** * Returns the right text part in the specified format. */ - virtual const QString text( const CDisplay::TextType format = CDisplay::HTMLText, const CDisplay::TextPart part = CDisplay::Document ); + virtual const TQString text( const CDisplay::TextType format = CDisplay::HTMLText, const CDisplay::TextPart part = CDisplay::Document ); /** * Sets the new text for this display widget. */ - virtual void setText( const QString& newText ); + virtual void setText( const TQString& newText ); virtual const bool hasSelection(); /** * Reimplementation. */ - virtual QScrollView* view(); + virtual TQScrollView* view(); virtual void selectAll(); - virtual void moveToAnchor( const QString& anchor ); + virtual void moveToAnchor( const TQString& anchor ); virtual void zoomIn(); virtual void zoomOut(); virtual void openFindTextDialog(); - virtual QMap<CDisplay::NodeInfoType, QString> getCurrentNodeInfo() { + virtual TQMap<CDisplay::NodeInfoType, TQString> getCurrentNodeInfo() { return m_nodeInfo; } protected: friend class CDisplay; - CHTMLReadDisplay( CReadWindow* readWindow, QWidget* parent = 0 ); + CHTMLReadDisplay( CReadWindow* readWindow, TQWidget* parent = 0 ); virtual ~CHTMLReadDisplay(); - virtual void urlSelected( const QString& url, int button, int state, const QString& _target, KParts::URLArgs args); + virtual void urlSelected( const TQString& url, int button, int state, const TQString& _target, KParts::URLArgs args); /** * Reimplementation. */ virtual void khtmlMouseReleaseEvent( khtml::MouseReleaseEvent* event ); virtual void khtmlMousePressEvent( khtml::MousePressEvent* event ); virtual void khtmlMouseMoveEvent( khtml::MouseMoveEvent* event ); - virtual void timerEvent(QTimerEvent *event); + virtual void timerEvent(TQTimerEvent *event); struct DNDData { @@ -78,8 +78,8 @@ protected: bool isDragging; DOM::Node node; DOM::DOMString anchor; - QString selection; - QPoint startPos; + TQString selection; + TQPoint startPos; enum DragType { Link, Text @@ -87,25 +87,25 @@ protected: } m_dndData; - QMap<NodeInfoType, QString> m_nodeInfo; + TQMap<NodeInfoType, TQString> m_nodeInfo; private: CHTMLReadDisplayView* m_view; struct URLWorkaroundData { bool doWorkaround; - QString url; + TQString url; int button; int state; - QString target; + TQString target; KParts::URLArgs args; - QString module; - QString key; + TQString module; + TQString key; } m_urlWorkaroundData; DOM::Node m_previousEventNode; - QString m_currentAnchorCache; + TQString m_currentAnchorCache; protected slots: void slotGoToAnchor(); @@ -117,25 +117,25 @@ protected: // Protected methods friend class CHTMLReadDisplay; - CHTMLReadDisplayView(CHTMLReadDisplay* display, QWidget* parent); + CHTMLReadDisplayView(CHTMLReadDisplay* display, TQWidget* parent); /** - * Reimplementation from QScrollView. Sets the right slots + * Reimplementation from TQScrollView. Sets the right slots */ virtual void polish(); /** - * Reimplementatiob from QScrollView. + * Reimplementatiob from TQScrollView. */ - virtual void contentsDropEvent( QDropEvent* ); + virtual void contentsDropEvent( TQDropEvent* ); /** - * Reimplementatiob from QScrollView. + * Reimplementatiob from TQScrollView. */ - virtual void contentsDragEnterEvent( QDragEnterEvent* ); + virtual void contentsDragEnterEvent( TQDragEnterEvent* ); protected slots: // Protected slots /** * Opens the popupmenu at the given position. */ - void popupMenu( const QString&, const QPoint& ); + void popupMenu( const TQString&, const TQPoint& ); private: CHTMLReadDisplay* m_display; diff --git a/bibletime/frontend/display/chtmlwritedisplay.cpp b/bibletime/frontend/display/chtmlwritedisplay.cpp index e535f26..b1206f8 100644 --- a/bibletime/frontend/display/chtmlwritedisplay.cpp +++ b/bibletime/frontend/display/chtmlwritedisplay.cpp @@ -16,8 +16,8 @@ #include "util/cresmgr.h" //Qt includes -#include <qpopupmenu.h> -#include <qtooltip.h> +#include <tqpopupmenu.h> +#include <tqtooltip.h> //KDE includes #include <kaction.h> @@ -27,7 +27,7 @@ #include <kcolorbutton.h> #include <kpopupmenu.h> -CHTMLWriteDisplay::CHTMLWriteDisplay(CWriteWindow* parentWindow, QWidget* parent) +CHTMLWriteDisplay::CHTMLWriteDisplay(CWriteWindow* parentWindow, TQWidget* parent) : CPlainWriteDisplay(parentWindow,parent) { m_actions.bold = 0; m_actions.italic = 0; @@ -41,15 +41,15 @@ CHTMLWriteDisplay::CHTMLWriteDisplay(CWriteWindow* parentWindow, QWidget* parent CHTMLWriteDisplay::~CHTMLWriteDisplay() {} -void CHTMLWriteDisplay::setText( const QString& newText ) { - QString text = newText; +void CHTMLWriteDisplay::setText( const TQString& newText ) { + TQString text = newText; // text.replace("\n<br/><!-- BT newline -->\n", "\n"); - QTextEdit::setText(text); + TQTextEdit::setText(text); } -const QString CHTMLWriteDisplay::plainText() { - return QTextEdit::text(); +const TQString CHTMLWriteDisplay::plainText() { + return TQTextEdit::text(); }; void CHTMLWriteDisplay::toggleBold() { @@ -110,17 +110,17 @@ void CHTMLWriteDisplay::slotAlignmentChanged( int a ) { /** Is called when a new color was selected. */ -void CHTMLWriteDisplay::slotColorSelected( const QColor& c) { +void CHTMLWriteDisplay::slotColorSelected( const TQColor& c) { setColor( c ); } /** Is called when a text with another color was selected. */ -void CHTMLWriteDisplay::slotColorChanged(const QColor& c) { +void CHTMLWriteDisplay::slotColorChanged(const TQColor& c) { m_colorButton->setColor(c); } -void CHTMLWriteDisplay::slotFontChanged( const QFont& font ) { +void CHTMLWriteDisplay::slotFontChanged( const TQFont& font ) { m_actions.fontChooser->setFont( font.family() ); m_actions.fontSizeChooser->setFontSize( font.pointSize() ); @@ -138,7 +138,7 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions m_actions.fontChooser->setToolTip( CResMgr::displaywindows::writeWindow::fontFamily::tooltip ); m_actions.fontChooser->plug(bar); - connect(m_actions.fontChooser, SIGNAL(activated(const QString&)), this, SLOT(setFamily(const QString&))); + connect(m_actions.fontChooser, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(setFamily(const TQString&))); m_actions.fontSizeChooser = new KFontSizeAction( i18n("Choose a font size"), @@ -149,12 +149,12 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions m_actions.fontSizeChooser->setToolTip( CResMgr::displaywindows::writeWindow::fontSize::tooltip ); m_actions.fontSizeChooser->plug(bar); - connect(m_actions.fontSizeChooser, SIGNAL(fontSizeChanged(int)), this, SLOT(setPointSize(int))); + connect(m_actions.fontSizeChooser, TQT_SIGNAL(fontSizeChanged(int)), this, TQT_SLOT(setPointSize(int))); m_colorButton = new KColorButton(bar); - connect(m_colorButton, SIGNAL(changed(const QColor&)), this, SLOT(slotColorSelected(const QColor&))); + connect(m_colorButton, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(slotColorSelected(const TQColor&))); bar->insertWidget(50, m_colorButton->sizeHint().width(), m_colorButton); - QToolTip::add + TQToolTip::add (m_colorButton, CResMgr::displaywindows::writeWindow::fontColor::tooltip ); @@ -164,7 +164,7 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions m_actions.bold = new KToggleAction( i18n("Bold"), CResMgr::displaywindows::writeWindow::boldText::icon, CResMgr::displaywindows::writeWindow::boldText::accel, - this, SLOT(toggleBold()), + this, TQT_SLOT(toggleBold()), actions, CResMgr::displaywindows::writeWindow::boldText::actionName ); @@ -175,7 +175,7 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions m_actions.italic = new KToggleAction( i18n("Italic"), CResMgr::displaywindows::writeWindow::italicText::icon, CResMgr::displaywindows::writeWindow::italicText::accel, - this, SLOT(toggleItalic()), + this, TQT_SLOT(toggleItalic()), actions, CResMgr::displaywindows::writeWindow::italicText::actionName ); @@ -186,7 +186,7 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions m_actions.underline = new KToggleAction( i18n("Underline"), CResMgr::displaywindows::writeWindow::underlinedText::icon, CResMgr::displaywindows::writeWindow::underlinedText::accel, - this, SLOT(toggleUnderline()), + this, TQT_SLOT(toggleUnderline()), actions, CResMgr::displaywindows::writeWindow::underlinedText::actionName ); @@ -200,7 +200,7 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions m_actions.alignLeft = new KToggleAction( i18n("Left"), CResMgr::displaywindows::writeWindow::alignLeft::icon, CResMgr::displaywindows::writeWindow::alignLeft::accel, - this, SLOT( alignLeft() ), + this, TQT_SLOT( alignLeft() ), actions, CResMgr::displaywindows::writeWindow::alignLeft::actionName ); @@ -211,7 +211,7 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions m_actions.alignCenter = new KToggleAction( i18n("Center"), CResMgr::displaywindows::writeWindow::alignCenter::icon, CResMgr::displaywindows::writeWindow::alignCenter::accel, - this, SLOT(alignCenter()), + this, TQT_SLOT(alignCenter()), actions, CResMgr::displaywindows::writeWindow::alignCenter::actionName ); @@ -222,7 +222,7 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions m_actions.alignRight = new KToggleAction( i18n("Right"), CResMgr::displaywindows::writeWindow::alignRight::icon, CResMgr::displaywindows::writeWindow::alignRight::accel, - this, SLOT(alignRight()), + this, TQT_SLOT(alignRight()), actions, CResMgr::displaywindows::writeWindow::alignRight::actionName ); @@ -233,7 +233,7 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions // m_actions.alignJustify = new KToggleAction( i18n("Justify"), // CResMgr::displaywindows::writeWindow::alignJustify::icon, // CResMgr::displaywindows::writeWindow::alignJustify::accel, - // this, SLOT( alignJustify() ), + // this, TQT_SLOT( alignJustify() ), // actions // ); // m_actions.alignJustify->setToolTip( CResMgr::displaywindows::writeWindow::alignJustify::tooltip ); @@ -241,9 +241,9 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions // m_actions.alignJustify->plug(bar); - connect(this, SIGNAL(currentFontChanged(const QFont&)), SLOT(slotFontChanged(const QFont&))); - connect(this, SIGNAL(currentAlignmentChanged(int)), SLOT(slotAlignmentChanged(int))); - connect(this, SIGNAL(currentColorChanged(const QColor&)), SLOT(slotColorChanged(const QColor&))); + connect(this, TQT_SIGNAL(currentFontChanged(const TQFont&)), TQT_SLOT(slotFontChanged(const TQFont&))); + connect(this, TQT_SIGNAL(currentAlignmentChanged(int)), TQT_SLOT(slotAlignmentChanged(int))); + connect(this, TQT_SIGNAL(currentColorChanged(const TQColor&)), TQT_SLOT(slotColorChanged(const TQColor&))); //set initial values for toolbar items @@ -253,9 +253,9 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions } /** Reimplementation to show a popup menu if the right mouse butoon was clicked. */ -QPopupMenu* CHTMLWriteDisplay::createPopupMenu( const QPoint& /*pos*/ ) { +TQPopupMenu* CHTMLWriteDisplay::createPopupMenu( const TQPoint& /*pos*/ ) { if (!m_actions.selectAll) { - m_actions.selectAll = new KAction(i18n("Select all"), KShortcut(0), this, SLOT(selectAll()), this); + m_actions.selectAll = new KAction(i18n("Select all"), KShortcut(0), this, TQT_SLOT(selectAll()), this); } KPopupMenu* popup = new KPopupMenu(this); diff --git a/bibletime/frontend/display/chtmlwritedisplay.h b/bibletime/frontend/display/chtmlwritedisplay.h index ad5faa6..4d9a508 100644 --- a/bibletime/frontend/display/chtmlwritedisplay.h +++ b/bibletime/frontend/display/chtmlwritedisplay.h @@ -16,12 +16,12 @@ #include "cplainwritedisplay.h" //Qt includes -#include <qwidget.h> -#include <qtextedit.h> +#include <tqwidget.h> +#include <tqtextedit.h> class CWriteWindow; -class QPopupMenu; +class TQPopupMenu; class KToggleAction; class KFontAction; @@ -38,11 +38,11 @@ public: /** * Sets the new text for this display widget. */ - virtual void setText( const QString& newText ); + virtual void setText( const TQString& newText ); /** * Returns the text of this edit widget. */ - virtual const QString plainText(); + virtual const TQString plainText(); /** * Creates the necessary action objects and puts them on the toolbar. @@ -51,12 +51,12 @@ public: protected: friend class CDisplay; - CHTMLWriteDisplay(CWriteWindow* parentWindow, QWidget* parent); + CHTMLWriteDisplay(CWriteWindow* parentWindow, TQWidget* parent); ~CHTMLWriteDisplay(); /** * Reimplementation to show a popup menu if the right mouse butoon was clicked. */ - virtual QPopupMenu* createPopupMenu( const QPoint& pos ); + virtual TQPopupMenu* createPopupMenu( const TQPoint& pos ); protected slots: void toggleBold(); @@ -67,7 +67,7 @@ protected slots: void alignCenter(); void alignRight(); - void slotFontChanged( const QFont& ); + void slotFontChanged( const TQFont& ); /** * The text's alignment changed. Enable the right buttons. */ @@ -75,11 +75,11 @@ protected slots: /** * Is called when a new color was selected. */ - void slotColorSelected( const QColor& ); + void slotColorSelected( const TQColor& ); /** * Is called when a text with another color was selected. */ - void slotColorChanged( const QColor& ); + void slotColorChanged( const TQColor& ); private: struct { diff --git a/bibletime/frontend/display/cplainwritedisplay.cpp b/bibletime/frontend/display/cplainwritedisplay.cpp index 2e81db0..7be7c6c 100644 --- a/bibletime/frontend/display/cplainwritedisplay.cpp +++ b/bibletime/frontend/display/cplainwritedisplay.cpp @@ -23,42 +23,42 @@ #include <kaction.h> #include <klocale.h> -CPlainWriteDisplay::CPlainWriteDisplay(CWriteWindow* parentWindow, QWidget* parent) : QTextEdit(parentWindow ? parentWindow : parent), CWriteDisplay(parentWindow) { +CPlainWriteDisplay::CPlainWriteDisplay(CWriteWindow* parentWindow, TQWidget* parent) : TQTextEdit(parentWindow ? parentWindow : parent), CWriteDisplay(parentWindow) { setTextFormat(Qt::PlainText); setAcceptDrops(true); viewport()->setAcceptDrops(true); - connect(this, SIGNAL(textChanged()), - connectionsProxy(), SLOT(emitTextChanged())); + connect(this, TQT_SIGNAL(textChanged()), + connectionsProxy(), TQT_SLOT(emitTextChanged())); } CPlainWriteDisplay::~CPlainWriteDisplay() {} /** Reimplementation. */ void CPlainWriteDisplay::selectAll() { - QTextEdit::selectAll(true); + TQTextEdit::selectAll(true); } -void CPlainWriteDisplay::setText( const QString& newText ) { +void CPlainWriteDisplay::setText( const TQString& newText ) { //make sure the text has been converted to show \n instead of <br/> - QString text = newText; + TQString text = newText; // text.replace("\n<br /><!-- BT newline -->\n", "\n"); text.replace("<br />", "\n"); //inserted by BT or the Qt textedit widget - QTextEdit::setText(text); + TQTextEdit::setText(text); } const bool CPlainWriteDisplay::hasSelection() { return hasSelectedText(); } -QWidget* CPlainWriteDisplay::view() { +TQWidget* CPlainWriteDisplay::view() { qDebug("CPlainWriteDisplay::view()"); return this; } -const QString CPlainWriteDisplay::text( const CDisplay::TextType /*format*/, const CDisplay::TextPart /*part*/) { - return QString::null; +const TQString CPlainWriteDisplay::text( const CDisplay::TextType /*format*/, const CDisplay::TextPart /*part*/) { + return TQString::null; } void CPlainWriteDisplay::print( const CDisplay::TextPart, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions ) { @@ -66,18 +66,18 @@ void CPlainWriteDisplay::print( const CDisplay::TextPart, CSwordBackend::Display /** Sets the current status of the edit widget. */ void CPlainWriteDisplay::setModified( const bool modified ) { - QTextEdit::setModified(modified); + TQTextEdit::setModified(modified); } /** Reimplementation. */ const bool CPlainWriteDisplay::isModified() const { - return QTextEdit::isModified(); + return TQTextEdit::isModified(); } /** Returns the text of this edit widget. */ -const QString CPlainWriteDisplay::plainText() { - QString ret = QTextEdit::text(); +const TQString CPlainWriteDisplay::plainText() { + TQString ret = TQTextEdit::text(); //in plain text mode the text just contains newlines, convert them into <br/> before we return the text for display in a HTML widget ret.replace("\n", "<br />"); @@ -85,13 +85,13 @@ const QString CPlainWriteDisplay::plainText() { return ret; } -/** Reimplementation from QTextEdit. Provides an popup menu for the given position. */ -QPopupMenu* CPlainWriteDisplay::createPopupMenu( const QPoint& /*pos*/ ) { +/** Reimplementation from TQTextEdit. Provides an popup menu for the given position. */ +TQPopupMenu* CPlainWriteDisplay::createPopupMenu( const TQPoint& /*pos*/ ) { return installedPopup(); } -/** Reimplementation from QTextEdit. Provides an popup menu for the given position. */ -QPopupMenu* CPlainWriteDisplay::createPopupMenu( ) { +/** Reimplementation from TQTextEdit. Provides an popup menu for the given position. */ +TQPopupMenu* CPlainWriteDisplay::createPopupMenu( ) { return installedPopup(); } @@ -99,7 +99,7 @@ QPopupMenu* CPlainWriteDisplay::createPopupMenu( ) { void CPlainWriteDisplay::setupToolbar(KToolBar* /*bar*/, KActionCollection* /*actionCollection*/) {} /** Reimplementation to insert the text of a dragged reference into the edit view. */ -void CPlainWriteDisplay::contentsDragEnterEvent( QDragEnterEvent* e ) { +void CPlainWriteDisplay::contentsDragEnterEvent( TQDragEnterEvent* e ) { if (CDragDropMgr::canDecode(e)) { e->accept(true); } @@ -110,7 +110,7 @@ void CPlainWriteDisplay::contentsDragEnterEvent( QDragEnterEvent* e ) { } /** Reimplementation to insert the text of a dragged reference into the edit view. */ -void CPlainWriteDisplay::contentsDragMoveEvent( QDragMoveEvent* e ) { +void CPlainWriteDisplay::contentsDragMoveEvent( TQDragMoveEvent* e ) { if (CDragDropMgr::canDecode(e)) { placeCursor(e->pos()); ensureCursorVisible(); @@ -123,7 +123,7 @@ void CPlainWriteDisplay::contentsDragMoveEvent( QDragMoveEvent* e ) { } /** Reimplementation to manage drops of our drag and drop objects. */ -void CPlainWriteDisplay::contentsDropEvent( QDropEvent* e ) { +void CPlainWriteDisplay::contentsDropEvent( TQDropEvent* e ) { if ( CDragDropMgr::canDecode(e) ) { e->acceptAction(); @@ -136,9 +136,9 @@ void CPlainWriteDisplay::contentsDropEvent( QDropEvent* e ) { util::scoped_ptr<CSwordKey> key( CSwordKey::createInstance(module) ); key->key( (*it).bookmarkKey() ); - QString moduleText = key->strippedText(); + TQString moduleText = key->strippedText(); - const QString text = QString::fromLatin1("%1\n(%2, %3)\n").arg(moduleText).arg((*it).bookmarkKey()).arg((*it).bookmarkModule()); + const TQString text = TQString::fromLatin1("%1\n(%2, %3)\n").arg(moduleText).arg((*it).bookmarkKey()).arg((*it).bookmarkModule()); placeCursor( e->pos() ); insert( text ); diff --git a/bibletime/frontend/display/cplainwritedisplay.h b/bibletime/frontend/display/cplainwritedisplay.h index 9219578..546d05c 100644 --- a/bibletime/frontend/display/cplainwritedisplay.h +++ b/bibletime/frontend/display/cplainwritedisplay.h @@ -16,8 +16,8 @@ #include "cwritedisplay.h" //Qt includes -#include <qwidget.h> -#include <qtextedit.h> +#include <tqwidget.h> +#include <tqtextedit.h> class CHTMLWriteDisplay; class KAction; @@ -25,7 +25,7 @@ class KAction; /** The write display implementation for plain source code editing. * @author The BibleTime team */ -class CPlainWriteDisplay : public QTextEdit, public CWriteDisplay { +class CPlainWriteDisplay : public TQTextEdit, public CWriteDisplay { public: /** * Reimplementation. @@ -34,7 +34,7 @@ public: /** * Sets the new text for this display widget. */ - virtual void setText( const QString& newText ); + virtual void setText( const TQString& newText ); /** * Returns true if the display widget has a selection. Otherwise false. */ @@ -42,8 +42,8 @@ public: /** * Returns the view of this display widget. */ - virtual QWidget* view(); - virtual const QString text( const CDisplay::TextType format = CDisplay::HTMLText, const CDisplay::TextPart part = CDisplay::Document ); + virtual TQWidget* view(); + virtual const TQString text( const CDisplay::TextType format = CDisplay::HTMLText, const CDisplay::TextPart part = CDisplay::Document ); virtual void print( const CDisplay::TextPart, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions ); /** * Reimplementation. @@ -56,7 +56,7 @@ public: /** * Returns the text of this edit widget. */ - virtual const QString plainText(); + virtual const TQString plainText(); /** * Creates the necessary action objects and puts them on the toolbar. */ @@ -66,28 +66,28 @@ protected: friend class CDisplay; friend class CHTMLWriteDisplay; - CPlainWriteDisplay(CWriteWindow* parentWindow, QWidget* parent); + CPlainWriteDisplay(CWriteWindow* parentWindow, TQWidget* parent); virtual ~CPlainWriteDisplay(); /** - * Reimplementation from QTextEdit. Provides an popup menu for the given position. + * Reimplementation from TQTextEdit. Provides an popup menu for the given position. */ - virtual QPopupMenu* createPopupMenu( const QPoint& pos ); + virtual TQPopupMenu* createPopupMenu( const TQPoint& pos ); /** - * Reimplementation from QTextEdit. Provides an popup menu. + * Reimplementation from TQTextEdit. Provides an popup menu. */ - virtual QPopupMenu* createPopupMenu(); + virtual TQPopupMenu* createPopupMenu(); /** * Reimplementation to manage drops of our drag and drop objects. */ - virtual void contentsDropEvent( QDropEvent* e ); + virtual void contentsDropEvent( TQDropEvent* e ); /** * Reimplementation to insert the text of a dragged reference into the edit view. */ - virtual void contentsDragEnterEvent( QDragEnterEvent* e ); + virtual void contentsDragEnterEvent( TQDragEnterEvent* e ); /** * Reimplementation to insert the text of a dragged reference into the edit view. */ - virtual void contentsDragMoveEvent( QDragMoveEvent* e ); + virtual void contentsDragMoveEvent( TQDragMoveEvent* e ); }; diff --git a/bibletime/frontend/display/creaddisplay.cpp b/bibletime/frontend/display/creaddisplay.cpp index 24c4f76..22baf24 100644 --- a/bibletime/frontend/display/creaddisplay.cpp +++ b/bibletime/frontend/display/creaddisplay.cpp @@ -29,25 +29,25 @@ #include "util/scoped_resource.h" //Qt includes -#include <qpopupmenu.h> +#include <tqpopupmenu.h> //KDE includes #include <klocale.h> CReadDisplay::CReadDisplay(CReadWindow* readWindow) : CDisplay(readWindow), -m_activeAnchor(QString::null), +m_activeAnchor(TQString::null), m_useMouseTracking(true) {} CReadDisplay::~CReadDisplay() {} /** Returns the current active anchor. */ -const QString& CReadDisplay::activeAnchor() { +const TQString& CReadDisplay::activeAnchor() { return m_activeAnchor; } /** Sets the current anchor to the parameter. */ -void CReadDisplay::setActiveAnchor( const QString& anchor ) { +void CReadDisplay::setActiveAnchor( const TQString& anchor ) { m_activeAnchor = anchor; } @@ -64,7 +64,7 @@ void CReadDisplay::print(const CDisplay::TextPart type, CSwordBackend::DisplayOp CSwordModuleInfo* module = key->module(); - CExportManager mgr(i18n("Print keys"),false, QString::null, parentWindow()->filterOptions(), parentWindow()->displayOptions()); + CExportManager mgr(i18n("Print keys"),false, TQString::null, parentWindow()->filterOptions(), parentWindow()->displayOptions()); switch (type) { case Document: { diff --git a/bibletime/frontend/display/creaddisplay.h b/bibletime/frontend/display/creaddisplay.h index de3e51d..48ce7b0 100644 --- a/bibletime/frontend/display/creaddisplay.h +++ b/bibletime/frontend/display/creaddisplay.h @@ -15,8 +15,8 @@ #include "cdisplay.h" #include "backend/cswordbackend.h" -class QPopupMenu; -class QWidget; +class TQPopupMenu; +class TQWidget; /**The base class for all read-only widgets like KHTMLView. *@author The BibleTime team @@ -31,11 +31,11 @@ public: /** * Returns the current active anchor. */ - const QString& activeAnchor(); + const TQString& activeAnchor(); /** * Moves the widget to the given anchor. */ - virtual void moveToAnchor( const QString& ) = 0; + virtual void moveToAnchor( const TQString& ) = 0; virtual void print(const CDisplay::TextPart, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions); void setMouseTracking(const bool trackingEnabled) { @@ -56,14 +56,14 @@ protected: // Protected methods /** * Sets the current anchor to the parameter. */ - void setActiveAnchor( const QString& ); + void setActiveAnchor( const TQString& ); private: // Public attributes /** * The member which hols the current anchor. */ - QString m_activeAnchor; + TQString m_activeAnchor; bool m_useMouseTracking; }; diff --git a/bibletime/frontend/display/cwritedisplay.cpp b/bibletime/frontend/display/cwritedisplay.cpp index 1c3ad4e..33c0926 100644 --- a/bibletime/frontend/display/cwritedisplay.cpp +++ b/bibletime/frontend/display/cwritedisplay.cpp @@ -15,7 +15,7 @@ #include "frontend/displaywindow/cwritewindow.h" //Qt includes -#include <qwidget.h> +#include <tqwidget.h> CWriteDisplay::CWriteDisplay( CWriteWindow* writeWindow ) : CDisplay(writeWindow) {} diff --git a/bibletime/frontend/display/cwritedisplay.h b/bibletime/frontend/display/cwritedisplay.h index b1222e8..f33b4d7 100644 --- a/bibletime/frontend/display/cwritedisplay.h +++ b/bibletime/frontend/display/cwritedisplay.h @@ -40,7 +40,7 @@ public: // Public methods /** * Returns the text of this edit widget. */ - virtual const QString plainText() = 0; + virtual const TQString plainText() = 0; /** * Creates the necessary action objects and puts them on the toolbar. */ diff --git a/bibletime/frontend/displaywindow/cbiblereadwindow.cpp b/bibletime/frontend/displaywindow/cbiblereadwindow.cpp index 0e80a35..0bbd85b 100644 --- a/bibletime/frontend/displaywindow/cbiblereadwindow.cpp +++ b/bibletime/frontend/displaywindow/cbiblereadwindow.cpp @@ -30,8 +30,8 @@ #include <math.h> //Qt includes -#include <qwidgetlist.h> -#include <qtimer.h> +#include <tqwidgetlist.h> +#include <tqtimer.h> //KDE includes #include <kaccel.h> @@ -133,37 +133,37 @@ void CBibleReadWindow::initActions() { new KAction( i18n("Next book"), CResMgr::displaywindows::bibleWindow::nextBook::accel, - this, SLOT(nextBook()), + this, TQT_SLOT(nextBook()), actionCollection(), "nextBook" ); new KAction( i18n("Previous book"), CResMgr::displaywindows::bibleWindow::previousBook::accel, - this, SLOT(previousBook()), + this, TQT_SLOT(previousBook()), actionCollection(), "previousBook" ); new KAction( i18n("Next chapter"), CResMgr::displaywindows::bibleWindow::nextChapter::accel, - this, SLOT(nextChapter()), + this, TQT_SLOT(nextChapter()), actionCollection(), "nextChapter" ); new KAction( i18n("Previous chapter"), CResMgr::displaywindows::bibleWindow::previousChapter::accel, - this, SLOT(previousChapter()), + this, TQT_SLOT(previousChapter()), actionCollection(), "previousChapter" ); new KAction( i18n("Next verse"), CResMgr::displaywindows::bibleWindow::nextVerse::accel, - this, SLOT(nextVerse()), + this, TQT_SLOT(nextVerse()), actionCollection(), "nextVerse" ); new KAction( i18n("Previous verse"), CResMgr::displaywindows::bibleWindow::previousVerse::accel, - this, SLOT(previousVerse()), + this, TQT_SLOT(previousVerse()), actionCollection(), "previousVerse" ); @@ -177,31 +177,31 @@ void CBibleReadWindow::initActions() { i18n("Strong's Search"), CResMgr::displaywindows::general::findStrongs::icon, CResMgr::displaywindows::general::findStrongs::accel, - this, SLOT(openSearchStrongsDialog()), + this, TQT_SLOT(openSearchStrongsDialog()), actionCollection(), CResMgr::displaywindows::general::findStrongs::actionName); - m_actions.copy.referenceOnly = new KAction(i18n("Reference only"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(copyAnchorOnly()), actionCollection(), "copyReferenceOnly"); + m_actions.copy.referenceOnly = new KAction(i18n("Reference only"), KShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(copyAnchorOnly()), actionCollection(), "copyReferenceOnly"); - m_actions.copy.referenceTextOnly = new KAction(i18n("Text of reference"), KShortcut(0),displayWidget()->connectionsProxy(), SLOT(copyAnchorTextOnly()), actionCollection(), "copyTextOfReference"); + m_actions.copy.referenceTextOnly = new KAction(i18n("Text of reference"), KShortcut(0),displayWidget()->connectionsProxy(), TQT_SLOT(copyAnchorTextOnly()), actionCollection(), "copyTextOfReference"); - m_actions.copy.referenceAndText = new KAction(i18n("Reference with text"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(copyAnchorWithText()), actionCollection(), "copyReferenceWithText"); + m_actions.copy.referenceAndText = new KAction(i18n("Reference with text"), KShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(copyAnchorWithText()), actionCollection(), "copyReferenceWithText"); - m_actions.copy.chapter = new KAction(i18n("Chapter"), KShortcut(0), this, SLOT(copyDisplayedText()), actionCollection(), "copyChapter"); + m_actions.copy.chapter = new KAction(i18n("Chapter"), KShortcut(0), this, TQT_SLOT(copyDisplayedText()), actionCollection(), "copyChapter"); m_actions.copy.selectedText = actionCollection()->action("copySelectedText"); Q_ASSERT(m_actions.copy.selectedText); - m_actions.save.referenceAndText = new KAction(i18n("Reference with text"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(saveAnchorWithText()), actionCollection(), "saveReferenceWithText"); + m_actions.save.referenceAndText = new KAction(i18n("Reference with text"), KShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(saveAnchorWithText()), actionCollection(), "saveReferenceWithText"); - m_actions.save.chapterAsPlain = new KAction(i18n("Chapter as plain text"), KShortcut(0), this, SLOT(saveChapterPlain()), actionCollection(), "saveChapterAsPlainText"); + m_actions.save.chapterAsPlain = new KAction(i18n("Chapter as plain text"), KShortcut(0), this, TQT_SLOT(saveChapterPlain()), actionCollection(), "saveChapterAsPlainText"); - m_actions.save.chapterAsHTML = new KAction(i18n("Chapter as HTML"), KShortcut(0), this, SLOT(saveChapterHTML()), actionCollection(), "saveChapterAsHTML"); + m_actions.save.chapterAsHTML = new KAction(i18n("Chapter as HTML"), KShortcut(0), this, TQT_SLOT(saveChapterHTML()), actionCollection(), "saveChapterAsHTML"); - m_actions.print.reference = new KAction(i18n("Reference with text"), KShortcut(0), this, SLOT(printAnchorWithText()), actionCollection(), "saveReferenceWithText"); + m_actions.print.reference = new KAction(i18n("Reference with text"), KShortcut(0), this, TQT_SLOT(printAnchorWithText()), actionCollection(), "saveReferenceWithText"); - m_actions.print.chapter = new KAction(i18n("Chapter"), KShortcut(0), this, SLOT(printAll()), actionCollection(), "printChapter"); + m_actions.print.chapter = new KAction(i18n("Chapter"), KShortcut(0), this, TQT_SLOT(printAll()), actionCollection(), "printChapter"); CBTConfig::setupAccelSettings(CBTConfig::bibleWindow, actionCollection()); } @@ -210,7 +210,7 @@ void CBibleReadWindow::initConnections() { CLexiconReadWindow::initConnections(); /* if (m_transliterationButton) { // Transliteration is not always available - connect(m_transliterationButton, SIGNAL(sigChanged()), SLOT(lookup())); + connect(m_transliterationButton, TQT_SIGNAL(sigChanged()), TQT_SLOT(lookup())); }*/ } @@ -273,7 +273,7 @@ void CBibleReadWindow::updatePopupMenu() { // } // // m_actions.findStrongs->setEnabled( hasStrongs ); - m_actions.findStrongs->setEnabled( displayWidget()->getCurrentNodeInfo()[CDisplay::Lemma] != QString::null ); + m_actions.findStrongs->setEnabled( displayWidget()->getCurrentNodeInfo()[CDisplay::Lemma] != TQString::null ); m_actions.copy.referenceOnly->setEnabled( displayWidget()->hasActiveAnchor() ); @@ -409,12 +409,12 @@ void CBibleReadWindow::reload() { } /** No descriptions */ -bool CBibleReadWindow::eventFilter( QObject* o, QEvent* e) { +bool CBibleReadWindow::eventFilter( TQObject* o, TQEvent* e) { const bool ret = CLexiconReadWindow::eventFilter(o,e); // Q_ASSERT(o->inherits("CDisplayWindow")); // qWarning("class: %s", o->className()); - if (e && (e->type() == QEvent::FocusIn)) { //sync other windows to this active + if (e && (e->type() == TQEvent::FocusIn)) { //sync other windows to this active /* This is a hack to work around a KHTML problem (similair to the Drag&Drop problem we had): * If new HTML content is loaded from inside a kHTML event handler @@ -424,7 +424,7 @@ bool CBibleReadWindow::eventFilter( QObject* o, QEvent* e) { * This is not really in a KHTML event handler but works anyway. * Sometime KDE/Qt is hard to use ... */ - QTimer::singleShot(0, this, SLOT(syncWindows())); + TQTimer::singleShot(0, this, TQT_SLOT(syncWindows())); } return ret; @@ -438,7 +438,7 @@ void CBibleReadWindow::lookup( CSwordKey* newKey ) { void CBibleReadWindow::syncWindows() { // qWarning("syncing windows"); - QWidgetList windows = mdi()->windowList(); + TQWidgetList windows = mdi()->windowList(); // Q_ASSERT(windows.count()); if (!windows.count()) { return; diff --git a/bibletime/frontend/displaywindow/cbiblereadwindow.h b/bibletime/frontend/displaywindow/cbiblereadwindow.h index 2326700..6e36db3 100644 --- a/bibletime/frontend/displaywindow/cbiblereadwindow.h +++ b/bibletime/frontend/displaywindow/cbiblereadwindow.h @@ -19,7 +19,7 @@ #include "backend/cswordversekey.h" //Qt includes -#include <qwidget.h> +#include <tqwidget.h> //KDE includes #include <kaction.h> @@ -65,7 +65,7 @@ protected: /** Event filter. * Reimplementation of the event filter to filter out events like focus in. */ - virtual bool eventFilter( QObject* o, QEvent* e); + virtual bool eventFilter( TQObject* o, TQEvent* e); struct { KAction* selectAll; diff --git a/bibletime/frontend/displaywindow/cbookreadwindow.cpp b/bibletime/frontend/displaywindow/cbookreadwindow.cpp index c4a4627..ec87501 100644 --- a/bibletime/frontend/displaywindow/cbookreadwindow.cpp +++ b/bibletime/frontend/displaywindow/cbookreadwindow.cpp @@ -24,7 +24,7 @@ #include "util/cresmgr.h" //Qt includes -#include <qsplitter.h> +#include <tqsplitter.h> //KDE includes #include <kaction.h> @@ -65,7 +65,7 @@ void CBookReadWindow::initActions() { i18n("Toggle tree view"), CResMgr::displaywindows::bookWindow::toggleTree::icon, CResMgr::displaywindows::bookWindow::toggleTree::accel, - this, SLOT(treeToggled()), + this, TQT_SLOT(treeToggled()), actionCollection(), "toggleTree"); CBTConfig::setupAccelSettings(CBTConfig::bookWindow, actionCollection()); @@ -92,17 +92,17 @@ void CBookReadWindow::insertKeyboardActions( KActionCollection* const a ) { void CBookReadWindow::initConnections() { CLexiconReadWindow::initConnections(); - connect(m_treeChooser, SIGNAL(keyChanged(CSwordKey*)), - this, SLOT(lookup(CSwordKey*))); - connect(m_treeChooser, SIGNAL(keyChanged(CSwordKey*)), - keyChooser(), SLOT(updateKey(CSwordKey*))); - connect(keyChooser(), SIGNAL(keyChanged(CSwordKey*)), - m_treeChooser, SLOT(updateKey(CSwordKey*))); + connect(m_treeChooser, TQT_SIGNAL(keyChanged(CSwordKey*)), + this, TQT_SLOT(lookup(CSwordKey*))); + connect(m_treeChooser, TQT_SIGNAL(keyChanged(CSwordKey*)), + keyChooser(), TQT_SLOT(updateKey(CSwordKey*))); + connect(keyChooser(), TQT_SIGNAL(keyChanged(CSwordKey*)), + m_treeChooser, TQT_SLOT(updateKey(CSwordKey*))); } /** Init the view */ void CBookReadWindow::initView() { - QSplitter* splitter = new QSplitter(this); + TQSplitter* splitter = new TQSplitter(this); setMainToolBar( new KToolBar(this) ); addDockWindow(mainToolBar()); @@ -122,7 +122,7 @@ void CBookReadWindow::initView() { m_treeChooser->hide(); - splitter->setResizeMode(m_treeChooser, QSplitter::Stretch); + splitter->setResizeMode(m_treeChooser, TQSplitter::Stretch); setCentralWidget( splitter ); setIcon(CToolClass::getIconForModule(modules().first())); } diff --git a/bibletime/frontend/displaywindow/cbuttons.cpp b/bibletime/frontend/displaywindow/cbuttons.cpp index ddcfadf..78797af 100644 --- a/bibletime/frontend/displaywindow/cbuttons.cpp +++ b/bibletime/frontend/displaywindow/cbuttons.cpp @@ -17,15 +17,15 @@ #include "util/cpointers.h" //Qt includes -#include <qstring.h> -#include <qtooltip.h> +#include <tqstring.h> +#include <tqtooltip.h> //KDE includes #include <kpopupmenu.h> #include <klocale.h> -// CTransliterationButton::CTransliterationButton(CSwordBackend::FilterOptions* filterOptions, QWidget *parent, const char *name ) +// CTransliterationButton::CTransliterationButton(CSwordBackend::FilterOptions* filterOptions, TQWidget *parent, const char *name ) // : KToolBarButton(CResMgr::displaywindows::transliteration::icon, 0,parent,name) { // m_filterOptions = filterOptions; // m_filterOptions->transliteration = 0; @@ -34,7 +34,7 @@ // setPopup(m_popup); // setPopupDelay(0001); // -// connect(m_popup, SIGNAL(activated(int)), this, SLOT(optionSelected(int))); +// connect(m_popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(optionSelected(int))); // populateMenu(); // } // @@ -65,7 +65,7 @@ // sword::StringList::iterator it; // // for (it = options.begin(); it != options.end(); ++it) { -// int id = m_popup->insertItem(QString::fromLatin1((*it).c_str())); +// int id = m_popup->insertItem(TQString::fromLatin1((*it).c_str())); // if (m_filterOptions->transliteration == m_popup->indexOf(id)-1 ) { //workaround // m_popup->setItemChecked(id, true); // } @@ -86,7 +86,7 @@ *********** CDisplaySettingsButton ************* ************************************************/ -CDisplaySettingsButton::CDisplaySettingsButton(CSwordBackend::DisplayOptions *displaySettings, CSwordBackend::FilterOptions *moduleSettings, const ListCSwordModuleInfo& useModules,QWidget *parent, const char *name ) +CDisplaySettingsButton::CDisplaySettingsButton(CSwordBackend::DisplayOptions *displaySettings, CSwordBackend::FilterOptions *moduleSettings, const ListCSwordModuleInfo& useModules,TQWidget *parent, const char *name ) : KToolBarButton(CResMgr::displaywindows::displaySettings::icon, 0, parent, name) { // qWarning("CDisplaySettingsButton::CDisplaySettingsButton"); m_displaySettings = displaySettings; @@ -97,7 +97,7 @@ CDisplaySettingsButton::CDisplaySettingsButton(CSwordBackend::DisplayOptions *di setPopup(m_popup); setPopupDelay(0001); //Fix, O only opens menu on mouse release or move - connect(m_popup, SIGNAL(activated(int)), this, SLOT(optionToggled(int))); + connect(m_popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(optionToggled(int))); populateMenu(); } @@ -107,12 +107,12 @@ void CDisplaySettingsButton::reset(const ListCSwordModuleInfo& useModules) { //disable the settings button if no options are available if (!populateMenu()) { setEnabled(false); - QToolTip::add + TQToolTip::add (this, i18n("Display settings: No options available")); } else { setEnabled(true); - QToolTip::add + TQToolTip::add (this, i18n("Display settings")); } } @@ -169,7 +169,7 @@ int CDisplaySettingsButton::populateMenu() { } /** No descriptions */ -int CDisplaySettingsButton::addMenuEntry( const QString name, const int* option, const bool available) { +int CDisplaySettingsButton::addMenuEntry( const TQString name, const int* option, const bool available) { int ret = 0; if (available) { @@ -201,7 +201,7 @@ const int CDisplaySettingsButton::menuItemCount() { void CDisplaySettingsButton::setItemStatus( const int index, const bool checked ) { const int ID = m_popup->idAt(index); m_popup->setItemChecked(ID, checked); - const QString text = m_popup->text(ID).remove('&'); + const TQString text = m_popup->text(ID).remove('&'); if (m_dict[text]) { *(m_dict[text]) = checked; } diff --git a/bibletime/frontend/displaywindow/cbuttons.h b/bibletime/frontend/displaywindow/cbuttons.h index ac72f49..aa8c29e 100644 --- a/bibletime/frontend/displaywindow/cbuttons.h +++ b/bibletime/frontend/displaywindow/cbuttons.h @@ -17,7 +17,7 @@ #include "backend/cswordmoduleinfo.h" //QT includes -#include <qdict.h> +#include <tqdict.h> //KDE includes #include <ktoolbarbutton.h> @@ -30,7 +30,7 @@ class KPopupMenu; // class CTransliterationButton : public KToolBarButton { // Q_OBJECT // public: -// CTransliterationButton(CSwordBackend::FilterOptions* displayOptions, QWidget *parent, const char *name=0); +// CTransliterationButton(CSwordBackend::FilterOptions* displayOptions, TQWidget *parent, const char *name=0); // ~CTransliterationButton(); // /** // * Setup the menu entries. @@ -58,7 +58,7 @@ class KPopupMenu; class CDisplaySettingsButton : public KToolBarButton { Q_OBJECT public: - CDisplaySettingsButton(CSwordBackend::DisplayOptions *displaySettings, CSwordBackend::FilterOptions *settings, const ListCSwordModuleInfo& useModules, QWidget *parent=0, const char *name=0); + CDisplaySettingsButton(CSwordBackend::DisplayOptions *displaySettings, CSwordBackend::FilterOptions *settings, const ListCSwordModuleInfo& useModules, TQWidget *parent=0, const char *name=0); void reset(const ListCSwordModuleInfo& useModules); /** * Sets the item at position pos to the satet given as 2nd paramter. @@ -89,13 +89,13 @@ protected: CSwordBackend::FilterOptions m_available; ListCSwordModuleInfo m_modules; - QDict<int> m_dict; + TQDict<int> m_dict; KPopupMenu* m_popup; int populateMenu(); bool isOptionAvailable( const CSwordModuleInfo::FilterTypes option); - int addMenuEntry( const QString name, const int* option, const bool available); + int addMenuEntry( const TQString name, const int* option, const bool available); }; #endif diff --git a/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp b/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp index 9355831..b73d506 100644 --- a/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp +++ b/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp @@ -110,37 +110,37 @@ void CCommentaryReadWindow::initActions() { new KAction( i18n("Next book"), CResMgr::displaywindows::bibleWindow::nextBook::accel, - this, SLOT(nextBook()), + this, TQT_SLOT(nextBook()), actionCollection(), "nextBook" ); new KAction( i18n("Previous book"), CResMgr::displaywindows::bibleWindow::previousBook::accel, - this, SLOT(previousBook()), + this, TQT_SLOT(previousBook()), actionCollection(), "previousBook" ); new KAction( i18n("Next chapter"), CResMgr::displaywindows::bibleWindow::nextChapter::accel, - this, SLOT(nextChapter()), + this, TQT_SLOT(nextChapter()), actionCollection(), "nextChapter" ); new KAction( i18n("Previous chapter"), CResMgr::displaywindows::bibleWindow::previousChapter::accel, - this, SLOT(previousChapter()), + this, TQT_SLOT(previousChapter()), actionCollection(), "previousChapter" ); new KAction( i18n("Next verse"), CResMgr::displaywindows::bibleWindow::nextVerse::accel, - this, SLOT(nextVerse()), + this, TQT_SLOT(nextVerse()), actionCollection(), "nextVerse" ); new KAction( i18n("Previous verse"), CResMgr::displaywindows::bibleWindow::previousVerse::accel, - this, SLOT(previousVerse()), + this, TQT_SLOT(previousVerse()), actionCollection(), "previousVerse" ); diff --git a/bibletime/frontend/displaywindow/ccommentaryreadwindow.h b/bibletime/frontend/displaywindow/ccommentaryreadwindow.h index 8b13d72..8d0816b 100644 --- a/bibletime/frontend/displaywindow/ccommentaryreadwindow.h +++ b/bibletime/frontend/displaywindow/ccommentaryreadwindow.h @@ -16,7 +16,7 @@ #include "cbiblereadwindow.h" //Qt includes -#include <qwidget.h> +#include <tqwidget.h> /** *@author The BibleTime team diff --git a/bibletime/frontend/displaywindow/cdisplaywindow.cpp b/bibletime/frontend/displaywindow/cdisplaywindow.cpp index 1eebba7..1020307 100644 --- a/bibletime/frontend/displaywindow/cdisplaywindow.cpp +++ b/bibletime/frontend/displaywindow/cdisplaywindow.cpp @@ -106,19 +106,19 @@ CMDIArea* const CDisplayWindow::mdi() const { } /** Returns the right window caption. */ -const QString CDisplayWindow::windowCaption() { +const TQString CDisplayWindow::windowCaption() { if (!m_modules.count()) { - return QString::null; + return TQString::null; } - return QString(key()->key()).append(" (").append(m_modules.join(" | ")).append(")"); + return TQString(key()->key()).append(" (").append(m_modules.join(" | ")).append(")"); } -/** Returns the used modules as a QPtrList */ +/** Returns the used modules as a TQPtrList */ ListCSwordModuleInfo CDisplayWindow::modules() { ListCSwordModuleInfo mods; - for (QStringList::iterator it = m_modules.begin(); it != m_modules.end(); ++it) { + for (TQStringList::iterator it = m_modules.begin(); it != m_modules.end(); ++it) { Q_ASSERT(backend()->findModuleByName(*it)); if (CSwordModuleInfo* m = backend()->findModuleByName(*it)) { mods.append(m); @@ -129,8 +129,8 @@ ListCSwordModuleInfo CDisplayWindow::modules() { } /** Set the window caption. */ -void CDisplayWindow::setCaption( const QString& ) { - QWidget::setCaption( windowCaption() ); +void CDisplayWindow::setCaption( const TQString& ) { + TQWidget::setCaption( windowCaption() ); m_mdi->emitWindowCaptionChanged(); } @@ -161,47 +161,47 @@ void CDisplayWindow::initActions() { new KAction(i18n("Search"), CResMgr::displaywindows::general::search::icon, CResMgr::displaywindows::general::search::accel, - this, SLOT(slotSearchInModules()), + this, TQT_SLOT(slotSearchInModules()), actionCollection(), CResMgr::displaywindows::general::search::actionName ); KStdAction::zoomIn( - displayWidget()->connectionsProxy(), SLOT(zoomIn()), + displayWidget()->connectionsProxy(), TQT_SLOT(zoomIn()), actionCollection(), "zoomIn" ); KStdAction::zoomOut( - displayWidget()->connectionsProxy(), SLOT(zoomOut()), + displayWidget()->connectionsProxy(), TQT_SLOT(zoomOut()), actionCollection(), "zoomOut" ); KStdAction::close( - this, SLOT(close()), + this, TQT_SLOT(close()), actionCollection(), "closeWindow" ); KStdAction::selectAll( - displayWidget()->connectionsProxy(), SLOT(selectAll()), + displayWidget()->connectionsProxy(), TQT_SLOT(selectAll()), actionCollection(), "selectAll" ); KStdAction::copy( - displayWidget()->connectionsProxy(), SLOT(copySelection()), + displayWidget()->connectionsProxy(), TQT_SLOT(copySelection()), actionCollection(), "copySelectedText" ); KStdAction::find( - displayWidget()->connectionsProxy(), SLOT(openFindTextDialog()), + displayWidget()->connectionsProxy(), TQT_SLOT(openFindTextDialog()), actionCollection(), "findText" ); new KToolBarPopupAction( i18n("Back in history"), CResMgr::displaywindows::general::backInHistory::icon, CResMgr::displaywindows::general::backInHistory::accel, - keyChooser(), SLOT( backInHistory() ), + keyChooser(), TQT_SLOT( backInHistory() ), actionCollection(), CResMgr::displaywindows::general::backInHistory::actionName ); new KToolBarPopupAction( i18n("Forward in history"), CResMgr::displaywindows::general::forwardInHistory::icon, CResMgr::displaywindows::general::forwardInHistory::accel, - keyChooser(), SLOT( forwardInHistory() ), + keyChooser(), TQT_SLOT( forwardInHistory() ), actionCollection(), CResMgr::displaywindows::general::forwardInHistory::actionName ); @@ -218,7 +218,7 @@ void CDisplayWindow::windowActivated( const bool hasFocus ) { /** Refresh the settings of this window. */ void CDisplayWindow::reload() { //first make sure all used Sword modules are still present - for (QStringList::iterator it = m_modules.begin(); it != m_modules.end(); ++it) { + for (TQStringList::iterator it = m_modules.begin(); it != m_modules.end(); ++it) { if (!backend()->findModuleByName(*it)) { it = m_modules.remove(it); if (it == m_modules.end()) { @@ -323,13 +323,13 @@ CModuleChooserBar* const CDisplayWindow::moduleChooserBar() const { /** Sets the module chooser bar. */ void CDisplayWindow::setModuleChooserBar( CModuleChooserBar* bar ) { if (m_moduleChooserBar) { - disconnect(m_moduleChooserBar, SIGNAL(sigChanged()), this, SLOT(modulesChanged())); + disconnect(m_moduleChooserBar, TQT_SIGNAL(sigChanged()), this, TQT_SLOT(modulesChanged())); } //if a new bar should be set! if (bar) { m_moduleChooserBar = bar; - connect(bar, SIGNAL(sigChanged()), SLOT(modulesChanged())); + connect(bar, TQT_SIGNAL(sigChanged()), TQT_SLOT(modulesChanged())); } } @@ -351,8 +351,8 @@ const bool CDisplayWindow::init() { setCaption(windowCaption()); //setup focus stuff. - setFocusPolicy(QWidget::ClickFocus); - parentWidget()->setFocusPolicy(QWidget::ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); + parentWidget()->setFocusPolicy(TQWidget::ClickFocus); initActions(); initToolbars(); @@ -397,10 +397,10 @@ CDisplaySettingsButton* const CDisplayWindow::displaySettingsButton() const { /** Sets the display settings button. */ void CDisplayWindow::setDisplaySettingsButton( CDisplaySettingsButton* button ) { if (m_displaySettingsButton) - disconnect(m_displaySettingsButton, SIGNAL( sigChanged() ),this, SLOT(lookup() )); + disconnect(m_displaySettingsButton, TQT_SIGNAL( sigChanged() ),this, TQT_SLOT(lookup() )); m_displaySettingsButton = button; - connect(m_displaySettingsButton, SIGNAL(sigChanged()),this, SLOT(lookup())); + connect(m_displaySettingsButton, TQT_SIGNAL(sigChanged()),this, TQT_SLOT(lookup())); } /** Lookup the current key. Used to refresh the display. */ @@ -408,7 +408,7 @@ void CDisplayWindow::lookup() { lookup( key() ); } -void CDisplayWindow::lookup( const QString& moduleName, const QString& keyName ) { +void CDisplayWindow::lookup( const TQString& moduleName, const TQString& keyName ) { Q_ASSERT(isReady()); if (!isReady()) { return; @@ -435,7 +435,7 @@ void CDisplayWindow::lookup( const QString& moduleName, const QString& keyName ) } } -void CDisplayWindow::lookup( const QString& keyName ) { +void CDisplayWindow::lookup( const TQString& keyName ) { /* This function is called for example after a bookmark was dropped on this window */ Q_ASSERT(modules().first()); @@ -453,7 +453,7 @@ KPopupMenu* const CDisplayWindow::popup() { // qWarning("CReadWindow::popup()"); if (!m_popupMenu) { m_popupMenu = new KPopupMenu(this); - connect(m_popupMenu, SIGNAL(aboutToShow()), this, SLOT(updatePopupMenu())); + connect(m_popupMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(updatePopupMenu())); if (displayWidget()) { displayWidget()->installPopup(m_popupMenu); } @@ -475,7 +475,7 @@ void CDisplayWindow::setDisplayWidget( CDisplay* newDisplay ) { m_displayWidget = newDisplay; } -void CDisplayWindow::closeEvent(QCloseEvent* e) { +void CDisplayWindow::closeEvent(TQCloseEvent* e) { if (!queryClose()) { e->ignore(); } diff --git a/bibletime/frontend/displaywindow/cdisplaywindow.h b/bibletime/frontend/displaywindow/cdisplaywindow.h index c166687..3c25acf 100644 --- a/bibletime/frontend/displaywindow/cdisplaywindow.h +++ b/bibletime/frontend/displaywindow/cdisplaywindow.h @@ -25,7 +25,7 @@ #include "frontend/cprofilewindow.h" //Qt includes -#include <qwidget.h> +#include <tqwidget.h> //KDE includes #include <kmainwindow.h> @@ -69,7 +69,7 @@ public: /** * Returns the right window caption. */ - const QString windowCaption(); + const TQString windowCaption(); /** * Returns the used modules as a QPtrList */ @@ -85,7 +85,7 @@ public: /** * Set the window caption. */ - virtual void setCaption( const QString& ); + virtual void setCaption( const TQString& ); /** * Sets the new filter options of this window. */ @@ -180,11 +180,11 @@ public slots: * Lookup the specified key in the given module. If the module is not chosen withing * this display window create a new displaywindow with the right module in it. */ - virtual void lookup( const QString& module, const QString& key ); + virtual void lookup( const TQString& module, const TQString& key ); /** * Lookup the key in the chosen modules. */ - virtual void lookup( const QString& key ); + virtual void lookup( const TQString& key ); /** * Refresh the settings of this window. */ @@ -236,7 +236,7 @@ protected: * Returns the installed popup menu. */ KPopupMenu* const popup(); - virtual void closeEvent(QCloseEvent* e); + virtual void closeEvent(TQCloseEvent* e); protected slots: virtual void modulesChanged(); @@ -256,7 +256,7 @@ private: CMDIArea* m_mdi; //we may only cache the module names bacause after a backend relaod the pointers are invalid! - QStringList m_modules; + TQStringList m_modules; CSwordBackend::FilterOptions m_filterOptions; CSwordBackend::DisplayOptions m_displayOptions; diff --git a/bibletime/frontend/displaywindow/chtmlwritewindow.cpp b/bibletime/frontend/displaywindow/chtmlwritewindow.cpp index e2e91e4..1dc7c2e 100644 --- a/bibletime/frontend/displaywindow/chtmlwritewindow.cpp +++ b/bibletime/frontend/displaywindow/chtmlwritewindow.cpp @@ -48,10 +48,10 @@ void CHTMLWriteWindow::initView() { void CHTMLWriteWindow::initConnections() { CWriteWindow::initConnections(); - connect(keyChooser(), SIGNAL(keyChanged(CSwordKey*)), - this, SLOT(lookup(CSwordKey*))); - connect(displayWidget()->connectionsProxy(), SIGNAL(textChanged()), - this, SLOT(textChanged()) ); + connect(keyChooser(), TQT_SIGNAL(keyChanged(CSwordKey*)), + this, TQT_SLOT(lookup(CSwordKey*))); + connect(displayWidget()->connectionsProxy(), TQT_SIGNAL(textChanged()), + this, TQT_SLOT(textChanged()) ); }; void CHTMLWriteWindow::initToolbars() { @@ -68,7 +68,7 @@ void CHTMLWriteWindow::initToolbars() { m_actions.saveText = new KAction( i18n("Save text"), CResMgr::displaywindows::writeWindow::saveText::icon, CResMgr::displaywindows::writeWindow::saveText::accel, - this, SLOT( saveCurrentText() ), + this, TQT_SLOT( saveCurrentText() ), actionCollection(), CResMgr::displaywindows::writeWindow::saveText::actionName ); @@ -78,7 +78,7 @@ void CHTMLWriteWindow::initToolbars() { m_actions.deleteEntry = new KAction(i18n("Delete current entry"), CResMgr::displaywindows::writeWindow::deleteEntry::icon, CResMgr::displaywindows::writeWindow::deleteEntry::accel, - this, SLOT(deleteEntry()), + this, TQT_SLOT(deleteEntry()), actionCollection(), CResMgr::displaywindows::writeWindow::deleteEntry::actionName ); @@ -88,7 +88,7 @@ void CHTMLWriteWindow::initToolbars() { m_actions.restoreText = new KAction(i18n("Restore original text"), CResMgr::displaywindows::writeWindow::restoreText::icon, CResMgr::displaywindows::writeWindow::restoreText::accel, - this, SLOT(restoreText()), actionCollection(), + this, TQT_SLOT(restoreText()), actionCollection(), CResMgr::displaywindows::writeWindow::restoreText::actionName ); m_actions.restoreText->setToolTip( CResMgr::displaywindows::writeWindow::restoreText::tooltip ); diff --git a/bibletime/frontend/displaywindow/chtmlwritewindow.h b/bibletime/frontend/displaywindow/chtmlwritewindow.h index 04b70f6..fd51ee0 100644 --- a/bibletime/frontend/displaywindow/chtmlwritewindow.h +++ b/bibletime/frontend/displaywindow/chtmlwritewindow.h @@ -16,7 +16,7 @@ #include "cplainwritewindow.h" //Qt includes -#include <qwidget.h> +#include <tqwidget.h> class KAction; diff --git a/bibletime/frontend/displaywindow/clexiconreadwindow.cpp b/bibletime/frontend/displaywindow/clexiconreadwindow.cpp index b36118d..4d29f28 100644 --- a/bibletime/frontend/displaywindow/clexiconreadwindow.cpp +++ b/bibletime/frontend/displaywindow/clexiconreadwindow.cpp @@ -81,12 +81,12 @@ void CLexiconReadWindow::initActions() { new KAction( i18n("Next entry"), CResMgr::displaywindows::lexiconWindow::nextEntry::accel, - this, SLOT( nextEntry() ), + this, TQT_SLOT( nextEntry() ), actionCollection(), "nextEntry" ); new KAction( i18n("Previous entry"), CResMgr::displaywindows::lexiconWindow::previousEntry::accel, - this, SLOT( previousEntry() ), + this, TQT_SLOT( previousEntry() ), actionCollection(), "previousEntry" ); @@ -96,29 +96,29 @@ void CLexiconReadWindow::initActions() { m_actions.findText = actionCollection()->action("findText"); Q_ASSERT(m_actions.findText); - //m_actions.findStrongs = new KAction(i18n("Strong's Search"), KShortcut(0),this, SLOT(openSearchStrongsDialog()), actionCollection(), "findStrongs"); + //m_actions.findStrongs = new KAction(i18n("Strong's Search"), KShortcut(0),this, TQT_SLOT(openSearchStrongsDialog()), actionCollection(), "findStrongs"); m_actions.findStrongs = new KAction( i18n("Strong's Search"), CResMgr::displaywindows::general::findStrongs::icon, CResMgr::displaywindows::general::findStrongs::accel, - this, SLOT(openSearchStrongsDialog()), + this, TQT_SLOT(openSearchStrongsDialog()), actionCollection(), CResMgr::displaywindows::general::findStrongs::actionName); - m_actions.copy.reference = new KAction(i18n("Reference only"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(copyAnchorOnly()), actionCollection(), "copyReferenceOnly"); + m_actions.copy.reference = new KAction(i18n("Reference only"), KShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(copyAnchorOnly()), actionCollection(), "copyReferenceOnly"); - m_actions.copy.entry = new KAction(i18n("Entry with text"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(copyAll()), actionCollection(), "copyEntryWithText"); + m_actions.copy.entry = new KAction(i18n("Entry with text"), KShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(copyAll()), actionCollection(), "copyEntryWithText"); m_actions.copy.selectedText = actionCollection()->action("copySelectedText"); Q_ASSERT(m_actions.copy.selectedText); - m_actions.save.entryAsPlain = new KAction(i18n("Entry as plain text"), KShortcut(0), this, SLOT(saveAsPlain()),actionCollection(), "saveEntryAsPlain"); + m_actions.save.entryAsPlain = new KAction(i18n("Entry as plain text"), KShortcut(0), this, TQT_SLOT(saveAsPlain()),actionCollection(), "saveEntryAsPlain"); - m_actions.save.entryAsHTML = new KAction(i18n("Entry as HTML"), KShortcut(0), this, SLOT(saveAsHTML()), actionCollection(), "saveEntryAsHTML"); + m_actions.save.entryAsHTML = new KAction(i18n("Entry as HTML"), KShortcut(0), this, TQT_SLOT(saveAsHTML()), actionCollection(), "saveEntryAsHTML"); - m_actions.print.reference = new KAction(i18n("Reference only"), KShortcut(0), this, SLOT(printAnchorWithText()), actionCollection(), "printReferenceOnly"); + m_actions.print.reference = new KAction(i18n("Reference only"), KShortcut(0), this, TQT_SLOT(printAnchorWithText()), actionCollection(), "printReferenceOnly"); - m_actions.print.entry = new KAction(i18n("Entry with text"), KShortcut(0), this, SLOT(printAll()), actionCollection(), "printEntryWithText"); + m_actions.print.entry = new KAction(i18n("Entry with text"), KShortcut(0), this, TQT_SLOT(printAll()), actionCollection(), "printEntryWithText"); // init with the user defined settings CBTConfig::setupAccelSettings(CBTConfig::lexiconWindow, actionCollection()); @@ -128,27 +128,27 @@ void CLexiconReadWindow::initActions() { void CLexiconReadWindow::initConnections() { Q_ASSERT(keyChooser()); - connect(keyChooser(), SIGNAL(keyChanged(CSwordKey*)), - this, SLOT(lookup(CSwordKey*))); - connect(keyChooser(), SIGNAL(historyChanged()), - this, SLOT(slotUpdateHistoryButtons())); + connect(keyChooser(), TQT_SIGNAL(keyChanged(CSwordKey*)), + this, TQT_SLOT(lookup(CSwordKey*))); + connect(keyChooser(), TQT_SIGNAL(historyChanged()), + this, TQT_SLOT(slotUpdateHistoryButtons())); //connect the history actions to the right slots connect( - m_actions.backInHistory->popupMenu(), SIGNAL(aboutToShow()), - this, SLOT(slotFillBackHistory()) + m_actions.backInHistory->popupMenu(), TQT_SIGNAL(aboutToShow()), + this, TQT_SLOT(slotFillBackHistory()) ); connect( - m_actions.backInHistory->popupMenu(), SIGNAL(activated(int)), - keyChooser(), SLOT(backInHistory(int)) + m_actions.backInHistory->popupMenu(), TQT_SIGNAL(activated(int)), + keyChooser(), TQT_SLOT(backInHistory(int)) ); connect( - m_actions.forwardInHistory->popupMenu(), SIGNAL(aboutToShow()), - this, SLOT(slotFillForwardHistory()) + m_actions.forwardInHistory->popupMenu(), TQT_SIGNAL(aboutToShow()), + this, TQT_SLOT(slotFillForwardHistory()) ); connect( - m_actions.forwardInHistory->popupMenu(), SIGNAL(activated(int)), - keyChooser(), SLOT(forwardInHistory(int)) + m_actions.forwardInHistory->popupMenu(), TQT_SIGNAL(activated(int)), + keyChooser(), TQT_SLOT(forwardInHistory(int)) ); @@ -199,7 +199,7 @@ void CLexiconReadWindow::initToolbars() { void CLexiconReadWindow::setupPopupMenu() { popup()->insertTitle(CToolClass::getIconForModule(modules().first()), i18n("Lexicon window")); - // m_actions.selectAll = new KAction(i18n("Select all"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(selectAll()), actionCollection()); + // m_actions.selectAll = new KAction(i18n("Select all"), KShortcut(0), displayWidget()->connectionsProxy(), TQT_SLOT(selectAll()), actionCollection()); m_actions.findText->plug(popup()); m_actions.findStrongs->plug(popup()); @@ -242,7 +242,7 @@ void CLexiconReadWindow::updatePopupMenu() { } } m_actions.findStrongs->setEnabled( hasStrongs );*/ - m_actions.findStrongs->setEnabled( displayWidget()->getCurrentNodeInfo()[CDisplay::Lemma] != QString::null ); + m_actions.findStrongs->setEnabled( displayWidget()->getCurrentNodeInfo()[CDisplay::Lemma] != TQString::null ); m_actions.copy.reference->setEnabled( displayWidget()->hasActiveAnchor() ); //m_actions.copy.entry->setEnabled( displayWidget()->hasActiveAnchor() ); @@ -280,11 +280,11 @@ void CLexiconReadWindow::saveAsPlain() { void CLexiconReadWindow::slotFillBackHistory() { // qWarning("fill back history"); - QStringList keyList = keyChooser()->getPreviousKeys(); - QPopupMenu* menu = m_actions.backInHistory->popupMenu(); + TQStringList keyList = keyChooser()->getPreviousKeys(); + TQPopupMenu* menu = m_actions.backInHistory->popupMenu(); menu->clear(); - QStringList::iterator it; + TQStringList::iterator it; int index = 1; for (it = keyList.begin(); it != keyList.end(); ++it) { menu->insertItem(*it,index, index); @@ -294,11 +294,11 @@ void CLexiconReadWindow::slotFillBackHistory() { void CLexiconReadWindow::slotFillForwardHistory() { // qWarning("fill forward history"); - QStringList keyList = keyChooser()->getNextKeys(); - QPopupMenu* menu = m_actions.forwardInHistory->popupMenu(); + TQStringList keyList = keyChooser()->getNextKeys(); + TQPopupMenu* menu = m_actions.forwardInHistory->popupMenu(); menu->clear(); - QStringList::iterator it; + TQStringList::iterator it; int index = 1; for (it = keyList.begin(); it != keyList.end(); ++it) { menu->insertItem(*it,index, index); diff --git a/bibletime/frontend/displaywindow/clexiconreadwindow.h b/bibletime/frontend/displaywindow/clexiconreadwindow.h index a29e4d0..1710963 100644 --- a/bibletime/frontend/displaywindow/clexiconreadwindow.h +++ b/bibletime/frontend/displaywindow/clexiconreadwindow.h @@ -16,7 +16,7 @@ #include "creadwindow.h" //Qt includes -#include <qwidget.h> +#include <tqwidget.h> //KDE includes #include <kaction.h> diff --git a/bibletime/frontend/displaywindow/cmodulechooserbar.cpp b/bibletime/frontend/displaywindow/cmodulechooserbar.cpp index 11492b6..7f0f1fc 100644 --- a/bibletime/frontend/displaywindow/cmodulechooserbar.cpp +++ b/bibletime/frontend/displaywindow/cmodulechooserbar.cpp @@ -12,9 +12,9 @@ #include "cmodulechooserbar.h" #include "cmodulechooserbutton.h" -#include <qtimer.h> +#include <tqtimer.h> -CModuleChooserBar::CModuleChooserBar(ListCSwordModuleInfo useModules, CSwordModuleInfo::ModuleType type, QWidget *parent, const char *name ) +CModuleChooserBar::CModuleChooserBar(ListCSwordModuleInfo useModules, CSwordModuleInfo::ModuleType type, TQWidget *parent, const char *name ) : KToolBar(parent,name), m_moduleType(type), m_idCounter(0), @@ -44,12 +44,12 @@ CModuleChooserButton* const CModuleChooserBar::addButton( CSwordModuleInfo* cons insertWidget( m_idCounter, b->size().width(), b ); m_buttonList.append(b); - connect( b, SIGNAL(sigAddButton()), this, SLOT(addButton()) ); + connect( b, TQT_SIGNAL(sigAddButton()), this, TQT_SLOT(addButton()) ); - connect( b, SIGNAL(sigRemoveButton(const int)), this, SLOT(removeButton(const int)) ); + connect( b, TQT_SIGNAL(sigRemoveButton(const int)), this, TQT_SLOT(removeButton(const int)) ); - connect( b, SIGNAL(sigChanged()), SIGNAL(sigChanged()) ); - connect( b, SIGNAL(sigChanged()), SLOT(updateMenuItems()) ); + connect( b, TQT_SIGNAL(sigChanged()), TQT_SIGNAL(sigChanged()) ); + connect( b, TQT_SIGNAL(sigChanged()), TQT_SLOT(updateMenuItems()) ); b->show(); @@ -144,7 +144,7 @@ void CModuleChooserBar::setModules( ListCSwordModuleInfo useModules ) { \fn CModuleChooserBar::updateMenuItems() */ void CModuleChooserBar::updateMenuItems() { - QPtrList<CModuleChooserButton> buttons = m_buttonList ; + TQPtrList<CModuleChooserButton> buttons = m_buttonList ; for (buttons.first(); buttons.current(); buttons.next()) { buttons.current()->updateMenuItems(); diff --git a/bibletime/frontend/displaywindow/cmodulechooserbar.h b/bibletime/frontend/displaywindow/cmodulechooserbar.h index 0ab2009..5d4cf06 100644 --- a/bibletime/frontend/displaywindow/cmodulechooserbar.h +++ b/bibletime/frontend/displaywindow/cmodulechooserbar.h @@ -20,8 +20,8 @@ #include "util/cpointers.h" //Qt includes -#include <qwidget.h> -#include <qhbox.h> +#include <tqwidget.h> +#include <tqhbox.h> //KDE includes #include <ktoolbar.h> @@ -35,7 +35,7 @@ public: /** * Default constructor */ - CModuleChooserBar(ListCSwordModuleInfo useModules, CSwordModuleInfo::ModuleType type, QWidget *parent=0, const char *name=0); + CModuleChooserBar(ListCSwordModuleInfo useModules, CSwordModuleInfo::ModuleType type, TQWidget *parent=0, const char *name=0); /** * Returns a list of selected modules. */ @@ -70,7 +70,7 @@ private: CSwordModuleInfo::ModuleType m_moduleType; int m_idCounter; int m_buttonLimit; - QPtrList<CModuleChooserButton> m_buttonList; + TQPtrList<CModuleChooserButton> m_buttonList; signals: // Signals void sigChanged(); diff --git a/bibletime/frontend/displaywindow/cmodulechooserbutton.cpp b/bibletime/frontend/displaywindow/cmodulechooserbutton.cpp index 7f5eaa4..3d8105f 100644 --- a/bibletime/frontend/displaywindow/cmodulechooserbutton.cpp +++ b/bibletime/frontend/displaywindow/cmodulechooserbutton.cpp @@ -17,10 +17,10 @@ #include "util/cresmgr.h" //Qt includes -#include <qstring.h> -#include <qtooltip.h> -#include <qdict.h> -#include <qvaluelist.h> +#include <tqstring.h> +#include <tqtooltip.h> +#include <tqdict.h> +#include <tqvaluelist.h> //KDE includes #include <klocale.h> @@ -53,7 +53,7 @@ CModuleChooserButton::~CModuleChooserButton() { } /** Returns the icon used for the current status. */ -const QString CModuleChooserButton::iconName() { +const TQString CModuleChooserButton::iconName() { switch (m_moduleType) { case CSwordModuleInfo::Bible: if (m_hasModule) @@ -84,7 +84,7 @@ CSwordModuleInfo* CModuleChooserButton::module() { for ( KPopupMenu* popup = m_submenus.first(); popup; popup = m_submenus.next() ) { for (unsigned int i = 0; i < popup->count(); i++) { if ( m_popup->isItemChecked(popup->idAt(i)) ) { - QString mod = popup->text(popup->idAt(i)).remove('&'); + TQString mod = popup->text(popup->idAt(i)).remove('&'); return backend()->findModuleByName( mod.left(mod.find(" ")) ); } } @@ -128,10 +128,10 @@ void CModuleChooserButton::moduleChosen( int ID ) { setText( i18n("Select a work") ); m_popup->changeTitle(m_titleId, i18n("Select a work")); - QToolTip::remove + TQToolTip::remove (this); if (module()) { - QToolTip::add + TQToolTip::add (this, module()->name()); } } @@ -162,11 +162,11 @@ void CModuleChooserButton::populateMenu() { } m_popup->insertSeparator(); - connect(m_popup, SIGNAL(activated(int)), this, SLOT(moduleChosen(int))); + connect(m_popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(moduleChosen(int))); setPopup(m_popup, true); - QStringList languages; - QDict<KPopupMenu> langdict; + TQStringList languages; + TQDict<KPopupMenu> langdict; //the modules list contains only the modules we can use, i.e. same type and same features ListCSwordModuleInfo modules; @@ -187,10 +187,10 @@ void CModuleChooserButton::populateMenu() { /*ListCSwordModuleInfo::iterator*/ end_it = modules.end(); for (ListCSwordModuleInfo::iterator it(modules.begin()); it != end_it; ++it) { - QString lang = (*it)->language()->translatedName(); + TQString lang = (*it)->language()->translatedName(); if (lang.isEmpty()) { - //lang = QString::fromLatin1("xx"); //unknown language -- do not use English as default!! + //lang = TQString::fromLatin1("xx"); //unknown language -- do not use English as default!! lang = (*it)->language()->abbrev(); if (lang.isEmpty()) { lang = "xx"; @@ -203,7 +203,7 @@ void CModuleChooserButton::populateMenu() { KPopupMenu* menu = new KPopupMenu; langdict.insert(lang, menu ); m_submenus.append(menu); - connect(menu, SIGNAL(activated(int)), this, SLOT(moduleChosen(int))); + connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(moduleChosen(int))); } } @@ -212,7 +212,7 @@ void CModuleChooserButton::populateMenu() { // for (modules.first(); modules.current(); modules.next()) { /*ListCSwordModuleInfo::iterator*/ end_it = modules.end(); for (ListCSwordModuleInfo::iterator it(modules.begin()); it != end_it; ++it) { - QString lang = (*it)->language()->translatedName(); + TQString lang = (*it)->language()->translatedName(); if (lang.isEmpty()) { lang = (*it)->language()->abbrev(); @@ -221,8 +221,8 @@ void CModuleChooserButton::populateMenu() { } } - QString name((*it)->name()); - name.append(" ").append((*it)->isLocked() ? i18n("[locked]") : QString::null); + TQString name((*it)->name()); + name.append(" ").append((*it)->isLocked() ? i18n("[locked]") : TQString::null); const int id = langdict[lang]->insertItem( name ); if ( m_module && (*it)->name() == m_module->name()) { @@ -231,16 +231,16 @@ void CModuleChooserButton::populateMenu() { } languages.sort(); - for ( QStringList::Iterator it = languages.begin(); it != languages.end(); ++it ) { + for ( TQStringList::Iterator it = languages.begin(); it != languages.end(); ++it ) { m_popup->insertItem( *it, langdict[*it]); } if (module()) { - QToolTip::add + TQToolTip::add (this, module()->name()); } else { - QToolTip::add + TQToolTip::add (this, i18n("No work selected")); } } @@ -250,7 +250,7 @@ void CModuleChooserButton::populateMenu() { \fn CModuleChooserButton::updateMenuItems() */ void CModuleChooserButton::updateMenuItems() { - QString moduleName; + TQString moduleName; CSwordModuleInfo* module = 0; ListCSwordModuleInfo chosenModules = m_moduleChooserBar->getModuleList(); diff --git a/bibletime/frontend/displaywindow/cmodulechooserbutton.h b/bibletime/frontend/displaywindow/cmodulechooserbutton.h index 2bd9fa7..d1a99b2 100644 --- a/bibletime/frontend/displaywindow/cmodulechooserbutton.h +++ b/bibletime/frontend/displaywindow/cmodulechooserbutton.h @@ -17,8 +17,8 @@ #include "util/cpointers.h" //Qt includes -#include <qdict.h> -#include <qtoolbutton.h> +#include <tqdict.h> +#include <tqtoolbutton.h> //KDE includes #include <ktoolbarbutton.h> @@ -51,7 +51,7 @@ private: /** * Returns the icon used for the current status. */ - const QString iconName(); + const TQString iconName(); bool m_hasModule; int m_id; @@ -61,7 +61,7 @@ private: CSwordModuleInfo* m_module; KPopupMenu* m_popup; - QPtrList<KPopupMenu> m_submenus; + TQPtrList<KPopupMenu> m_submenus; CModuleChooserBar* m_moduleChooserBar; diff --git a/bibletime/frontend/displaywindow/cplainwritewindow.cpp b/bibletime/frontend/displaywindow/cplainwritewindow.cpp index ba95bec..b855ee8 100644 --- a/bibletime/frontend/displaywindow/cplainwritewindow.cpp +++ b/bibletime/frontend/displaywindow/cplainwritewindow.cpp @@ -18,7 +18,7 @@ #include "util/cresmgr.h" //Qt includes -#include <qregexp.h> +#include <tqregexp.h> //KDE includes #include <kaction.h> @@ -65,7 +65,7 @@ void CPlainWriteWindow::initToolbars() { m_actions.saveText = new KAction(i18n("Save text"), CResMgr::displaywindows::writeWindow::saveText::icon, CResMgr::displaywindows::writeWindow::saveText::accel, - this, SLOT(saveCurrentText()), + this, TQT_SLOT(saveCurrentText()), actionCollection(), CResMgr::displaywindows::writeWindow::saveText::actionName ); @@ -76,7 +76,7 @@ void CPlainWriteWindow::initToolbars() { m_actions.deleteEntry = new KAction(i18n("Delete current entry"), CResMgr::displaywindows::writeWindow::deleteEntry::icon, CResMgr::displaywindows::writeWindow::deleteEntry::accel, - this, SLOT(deleteEntry()), + this, TQT_SLOT(deleteEntry()), actionCollection(), CResMgr::displaywindows::writeWindow::deleteEntry::actionName ); @@ -87,7 +87,7 @@ void CPlainWriteWindow::initToolbars() { m_actions.restoreText = new KAction(i18n("Restore original text"), CResMgr::displaywindows::writeWindow::restoreText::icon, CResMgr::displaywindows::writeWindow::restoreText::accel, - this, SLOT(restoreText()), + this, TQT_SLOT(restoreText()), actionCollection(), CResMgr::displaywindows::writeWindow::restoreText::actionName ); @@ -97,11 +97,11 @@ void CPlainWriteWindow::initToolbars() { void CPlainWriteWindow::initConnections() { CWriteWindow::initConnections(); - connect(keyChooser(), SIGNAL(keyChanged(CSwordKey*)), - this, SLOT(lookup(CSwordKey*))); + connect(keyChooser(), TQT_SIGNAL(keyChanged(CSwordKey*)), + this, TQT_SLOT(lookup(CSwordKey*))); - connect(displayWidget()->connectionsProxy(), SIGNAL(textChanged()), - this, SLOT(textChanged()) ); + connect(displayWidget()->connectionsProxy(), TQT_SIGNAL(textChanged()), + this, TQT_SLOT(textChanged()) ); } void CPlainWriteWindow::storeProfileSettings( CProfileWindow* profileWindow ) { @@ -117,15 +117,15 @@ void CPlainWriteWindow::applyProfileSettings( CProfileWindow* profileWindow ) { }; /** Saves the text for the current key. Directly writes the changed text into the module. */ -void CPlainWriteWindow::saveCurrentText( const QString& /*key*/ ) { - QString t = displayWidget()->plainText(); +void CPlainWriteWindow::saveCurrentText( const TQString& /*key*/ ) { + TQString t = displayWidget()->plainText(); //since t is a complete HTML page at the moment, strip away headers and footers of a HTML page - QRegExp re("(?:<html.*>.+<body.*>)", false); //remove headers, case insensitive + TQRegExp re("(?:<html.*>.+<body.*>)", false); //remove headers, case insensitive re.setMinimal(true); t.replace(re, ""); - t.replace(QRegExp("</body></html>", false), "");//remove footer + t.replace(TQRegExp("</body></html>", false), "");//remove footer - const QString& oldKey = this->key()->key(); + const TQString& oldKey = this->key()->key(); if( modules().first()->isWritable() ) { modules().first()->write(this->key(), t ); this->key()->key( oldKey ); @@ -134,7 +134,7 @@ void CPlainWriteWindow::saveCurrentText( const QString& /*key*/ ) { textChanged(); } else { KMessageBox::error( this, - QString::fromLatin1("<qt><B>%1</B><BR>%2</qt>") + TQString::fromLatin1("<qt><B>%1</B><BR>%2</qt>") .arg( i18n("Module is not writable.") ) .arg( i18n("Either the module may not be edited, or " "you do not have write permission.") ), diff --git a/bibletime/frontend/displaywindow/cplainwritewindow.h b/bibletime/frontend/displaywindow/cplainwritewindow.h index 94f9b70..6a498c7 100644 --- a/bibletime/frontend/displaywindow/cplainwritewindow.h +++ b/bibletime/frontend/displaywindow/cplainwritewindow.h @@ -16,7 +16,7 @@ #include "cwritewindow.h" //Qt includes -#include <qwidget.h> +#include <tqwidget.h> class KAction; @@ -79,7 +79,7 @@ protected slots: // Protected slots /** * Saves the text for the current key. Directly writes the changed text into the module. */ - virtual void saveCurrentText( const QString& ); + virtual void saveCurrentText( const TQString& ); /** * Is called when the current text was changed. */ diff --git a/bibletime/frontend/displaywindow/creadwindow.cpp b/bibletime/frontend/displaywindow/creadwindow.cpp index d1bcd11..ccd78e3 100644 --- a/bibletime/frontend/displaywindow/creadwindow.cpp +++ b/bibletime/frontend/displaywindow/creadwindow.cpp @@ -55,24 +55,24 @@ CReadDisplay* const CReadWindow::displayWidget() { void CReadWindow::setDisplayWidget( CReadDisplay* newDisplay ) { CDisplayWindow::setDisplayWidget(newDisplay); if (m_displayWidget) { - disconnect(m_displayWidget->connectionsProxy(), SIGNAL(referenceClicked(const QString&, const QString&)), this, SLOT(lookup(const QString&, const QString&))); + disconnect(m_displayWidget->connectionsProxy(), TQT_SIGNAL(referenceClicked(const TQString&, const TQString&)), this, TQT_SLOT(lookup(const TQString&, const TQString&))); - disconnect(m_displayWidget->connectionsProxy(), SIGNAL(referenceDropped(const QString&)), this, SLOT(lookup(const QString&))); + disconnect(m_displayWidget->connectionsProxy(), TQT_SIGNAL(referenceDropped(const TQString&)), this, TQT_SLOT(lookup(const TQString&))); } m_displayWidget = newDisplay; connect( m_displayWidget->connectionsProxy(), - SIGNAL(referenceClicked(const QString&, const QString&)), + TQT_SIGNAL(referenceClicked(const TQString&, const TQString&)), this, - SLOT(lookup(const QString&, const QString&)) + TQT_SLOT(lookup(const TQString&, const TQString&)) ); connect( m_displayWidget->connectionsProxy(), - SIGNAL(referenceDropped(const QString&)), + TQT_SIGNAL(referenceDropped(const TQString&)), this, - SLOT(lookup(const QString&)) + TQT_SLOT(lookup(const TQString&)) ); } @@ -113,7 +113,7 @@ void CReadWindow::lookup( CSwordKey* newKey ) { /** Store the settings of this window in the given CProfileWindow object. */ void CReadWindow::storeProfileSettings(CProfileWindow * const settings) { - QRect rect; + TQRect rect; rect.setX(parentWidget()->x()); rect.setY(parentWidget()->y()); rect.setWidth(width()); @@ -127,9 +127,9 @@ void CReadWindow::storeProfileSettings(CProfileWindow * const settings) { if (key()) { sword::VerseKey* vk = dynamic_cast<sword::VerseKey*>(key()); - QString oldLang; + TQString oldLang; if (vk) { - oldLang = QString(vk->getLocale()); + oldLang = TQString(vk->getLocale()); vk->setLocale("en"); //save english locale names as default! } settings->setKey( key()->key() ); @@ -138,7 +138,7 @@ void CReadWindow::storeProfileSettings(CProfileWindow * const settings) { } } - QStringList mods; + TQStringList mods; ListCSwordModuleInfo allMods = modules(); ListCSwordModuleInfo::iterator end_it = allMods.end(); @@ -157,7 +157,7 @@ void CReadWindow::applyProfileSettings(CProfileWindow * const settings) { parentWidget()->showMaximized(); } else { - const QRect rect = settings->geometry(); + const TQRect rect = settings->geometry(); resize(rect.width(), rect.height()); parentWidget()->move(rect.x(), rect.y()); } @@ -169,15 +169,15 @@ void CReadWindow::insertKeyboardActions( KActionCollection* const ) {} /** No descriptions */ void CReadWindow::copyDisplayedText() { - CExportManager mgr(QString::null); + CExportManager mgr(TQString::null); mgr.copyKey(key(), CExportManager::Text, true); } /*! - \fn CReadWindow::resizeEvent(QResizeEvent* e) + \fn CReadWindow::resizeEvent(TQResizeEvent* e) */ -void CReadWindow::resizeEvent(QResizeEvent* /*e*/) { +void CReadWindow::resizeEvent(TQResizeEvent* /*e*/) { displayWidget()->moveToAnchor( Rendering::CDisplayRendering::keyToHTMLAnchor(key()->key()) ); @@ -185,9 +185,9 @@ void CReadWindow::resizeEvent(QResizeEvent* /*e*/) { void CReadWindow::openSearchStrongsDialog() { // qWarning("looking for lemma %s", displayWidget()->getCurrentNodeInfo()[CDisplay::Lemma].latin1() ); - QString searchText = QString::null; + TQString searchText = TQString::null; - if (displayWidget()->getCurrentNodeInfo()[CDisplay::Lemma] != QString::null) { + if (displayWidget()->getCurrentNodeInfo()[CDisplay::Lemma] != TQString::null) { searchText.append("strong:").append(displayWidget()->getCurrentNodeInfo() [CDisplay::Lemma]); } diff --git a/bibletime/frontend/displaywindow/creadwindow.h b/bibletime/frontend/displaywindow/creadwindow.h index 9dd36b0..35cdc42 100644 --- a/bibletime/frontend/displaywindow/creadwindow.h +++ b/bibletime/frontend/displaywindow/creadwindow.h @@ -19,8 +19,8 @@ #include "frontend/display/creaddisplay.h" //Qt includes -#include <qwidget.h> -#include <qpopupmenu.h> +#include <tqwidget.h> +#include <tqpopupmenu.h> class KPopupMenu; @@ -54,7 +54,7 @@ protected: // Protected methods * Returns the display widget of this window. */ virtual CReadDisplay* const displayWidget(); - virtual void resizeEvent(QResizeEvent* e); + virtual void resizeEvent(TQResizeEvent* e); protected slots: virtual void lookup( CSwordKey* ); diff --git a/bibletime/frontend/displaywindow/cwritewindow.cpp b/bibletime/frontend/displaywindow/cwritewindow.cpp index 34be15c..760a767 100644 --- a/bibletime/frontend/displaywindow/cwritewindow.cpp +++ b/bibletime/frontend/displaywindow/cwritewindow.cpp @@ -42,8 +42,8 @@ void CWriteWindow::initConnections() { // qWarning("CWriteWindow::initConnections()"); Q_ASSERT(keyChooser()); - connect(keyChooser(), SIGNAL(beforeKeyChange(const QString&)), - this, SLOT(beforeKeyChange(const QString&)) + connect(keyChooser(), TQT_SIGNAL(beforeKeyChange(const TQString&)), + this, TQT_SLOT(beforeKeyChange(const TQString&)) ); }; @@ -54,7 +54,7 @@ void CWriteWindow::storeProfileSettings(CProfileWindow * const settings) { settings->setWriteWindowType( writeWindowType() ); - QRect rect; + TQRect rect; rect.setX(parentWidget()->x()); rect.setY(parentWidget()->y()); rect.setWidth(width()); @@ -67,9 +67,9 @@ void CWriteWindow::storeProfileSettings(CProfileWindow * const settings) { if (key()) { sword::VerseKey* vk = dynamic_cast<sword::VerseKey*>(key()); - QString oldLang; + TQString oldLang; if (vk) { - oldLang = QString::fromLatin1(vk->getLocale()); + oldLang = TQString::fromLatin1(vk->getLocale()); vk->setLocale("en"); //save english locale names as default! } settings->setKey( key()->key() ); @@ -78,7 +78,7 @@ void CWriteWindow::storeProfileSettings(CProfileWindow * const settings) { } } - QStringList mods; + TQStringList mods; ListCSwordModuleInfo allMods = modules(); // for (CSwordModuleInfo* m = modules().first(); m; m = modules().next()) { ListCSwordModuleInfo::iterator end_it = allMods.end(); @@ -95,7 +95,7 @@ void CWriteWindow::applyProfileSettings(CProfileWindow * const settings) { parentWidget()->showMaximized(); } else { - const QRect rect = settings->geometry(); + const TQRect rect = settings->geometry(); resize(rect.width(), rect.height()); parentWidget()->move(rect.x(), rect.y()); //setGeometry( settings->geometry() ); @@ -153,7 +153,7 @@ bool CWriteWindow::queryClose() { return true; } -void CWriteWindow::beforeKeyChange(const QString& key) { +void CWriteWindow::beforeKeyChange(const TQString& key) { Q_ASSERT(displayWidget()); Q_ASSERT(keyChooser()); if (!isReady()) { diff --git a/bibletime/frontend/displaywindow/cwritewindow.h b/bibletime/frontend/displaywindow/cwritewindow.h index dfa4c1a..986fa7d 100644 --- a/bibletime/frontend/displaywindow/cwritewindow.h +++ b/bibletime/frontend/displaywindow/cwritewindow.h @@ -17,7 +17,7 @@ #include "cdisplaywindow.h" //Qt includes -#include <qwidget.h> +#include <tqwidget.h> /**The base class for all write-only display windows. *@author The BibleTime team @@ -60,7 +60,7 @@ protected: // Protected methods void setDisplayWidget( CWriteDisplay* display ); virtual const CDisplayWindow::WriteWindowType writeWindowType() = 0; virtual bool queryClose(); - virtual void saveCurrentText( const QString& key ) = 0; + virtual void saveCurrentText( const TQString& key ) = 0; protected slots: /** Save text to the module @@ -70,7 +70,7 @@ protected slots: saveCurrentText(key()->key()); }; }; - virtual void beforeKeyChange(const QString&); + virtual void beforeKeyChange(const TQString&); private: CWriteDisplay* m_writeDisplay; diff --git a/bibletime/frontend/keychooser/cbiblekeychooser.cpp b/bibletime/frontend/keychooser/cbiblekeychooser.cpp index 88a2a51..c8a2e0f 100644 --- a/bibletime/frontend/keychooser/cbiblekeychooser.cpp +++ b/bibletime/frontend/keychooser/cbiblekeychooser.cpp @@ -21,14 +21,14 @@ #include "util/cresmgr.h" //Qt includes -#include <qcombobox.h> -#include <qlistbox.h> -#include <qpushbutton.h> +#include <tqcombobox.h> +#include <tqlistbox.h> +#include <tqpushbutton.h> //KDE includes #include <klocale.h> -CBibleKeyChooser::CBibleKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key, QWidget *parent, const char *name ) +CBibleKeyChooser::CBibleKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key, TQWidget *parent, const char *name ) : CKeyChooser(modules, key, parent, name), m_key(dynamic_cast<CSwordVerseKey*>(key)) { w_ref = 0; @@ -38,13 +38,13 @@ m_key(dynamic_cast<CSwordVerseKey*>(key)) { m_key = 0; return; } - QHBoxLayout* layout = new QHBoxLayout(this); - layout->setDirection( QBoxLayout::LeftToRight ); + TQHBoxLayout* layout = new TQHBoxLayout(this); + layout->setDirection( TQBoxLayout::LeftToRight ); w_ref = new CKeyReferenceWidget(dynamic_cast<CSwordBibleModuleInfo*>(m_modules.first()), m_key, this); layout->addWidget(w_ref); - connect(w_ref,SIGNAL(changed(CSwordVerseKey *)),SLOT(refChanged(CSwordVerseKey *))); + connect(w_ref,TQT_SIGNAL(changed(CSwordVerseKey *)),TQT_SLOT(refChanged(CSwordVerseKey *))); setKey(m_key); //set the key without changing it, setKey(key()) would change it } diff --git a/bibletime/frontend/keychooser/cbiblekeychooser.h b/bibletime/frontend/keychooser/cbiblekeychooser.h index 88e987e..71d92f9 100644 --- a/bibletime/frontend/keychooser/cbiblekeychooser.h +++ b/bibletime/frontend/keychooser/cbiblekeychooser.h @@ -12,7 +12,7 @@ #ifndef CBIBLEKEYCHOOSER_H #define CBIBLEKEYCHOOSER_H -#include <qwidget.h> +#include <tqwidget.h> #include "ckeychooser.h" #include "backend/cswordbiblemoduleinfo.h" @@ -38,7 +38,7 @@ public: * the constructor * you should not need to use this, use @ref CKeyChooser::createInstance instead */ - CBibleKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key=0, QWidget *parent=0, const char *name=0); + CBibleKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key=0, TQWidget *parent=0, const char *name=0); public slots: /** @@ -66,7 +66,7 @@ public slots: private: CKeyReferenceWidget* w_ref; - QPtrList<CSwordBibleModuleInfo> m_modules; + TQPtrList<CSwordBibleModuleInfo> m_modules; CSwordVerseKey *m_key; }; diff --git a/bibletime/frontend/keychooser/cbookkeychooser.cpp b/bibletime/frontend/keychooser/cbookkeychooser.cpp index 0741bad..233476e 100644 --- a/bibletime/frontend/keychooser/cbookkeychooser.cpp +++ b/bibletime/frontend/keychooser/cbookkeychooser.cpp @@ -15,12 +15,12 @@ #include "frontend/cbtconfig.h" //Qt includes -#include <qlayout.h> -#include <qmap.h> +#include <tqlayout.h> +#include <tqmap.h> -QMap<QObject*, int> boxes; +TQMap<TQObject*, int> boxes; -CBookKeyChooser::CBookKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key, QWidget *parent, const char *name) +CBookKeyChooser::CBookKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key, TQWidget *parent, const char *name) : CKeyChooser(modules, key, parent,name), m_layout(0) { setModules(modules, false); @@ -48,7 +48,7 @@ void CBookKeyChooser::setKey(CSwordKey* newKey, const bool emitSignal) { m_key = dynamic_cast<CSwordTreeKey*>(newKey); } - /*const */QString oldKey = m_key->key(); + /*const */TQString oldKey = m_key->key(); if (oldKey.isEmpty()) { //don't set keys equal to "/", always use a key which may have content m_key->firstChild(); @@ -56,9 +56,9 @@ void CBookKeyChooser::setKey(CSwordKey* newKey, const bool emitSignal) { } const int oldOffset = m_key->getOffset(); - QStringList siblings; + TQStringList siblings; if (m_key && !oldKey.isEmpty()) { - siblings = QStringList::split("/", oldKey, false); + siblings = TQStringList::split("/", oldKey, false); } int depth = 0; @@ -67,9 +67,9 @@ void CBookKeyChooser::setKey(CSwordKey* newKey, const bool emitSignal) { m_key->root(); while( m_key->firstChild() && (depth <= int(siblings.count())) ) { - const QString key = m_key->key(); + const TQString key = m_key->key(); index = (depth == 0) ? -1 : 0; - const QString sibling = siblings[depth]; + const TQString sibling = siblings[depth]; if (!sibling.isEmpty()) { //found it bool found = false; @@ -77,7 +77,7 @@ void CBookKeyChooser::setKey(CSwordKey* newKey, const bool emitSignal) { do { ++index; //qDebug("set 'found'"); - //found = (QString::fromLocal8Bit(m_key->getLocalName()) == sibling); + //found = (TQString::fromLocal8Bit(m_key->getLocalName()) == sibling); found = (m_key->getLocalNameUnicode() == sibling); } while (!found && m_key->nextSibling()); @@ -134,7 +134,7 @@ void CBookKeyChooser::setModules(const ListCSwordModuleInfo& modules, const bool //refresh the number of combos if (refresh && m_modules.count() && m_key) { if (!m_layout) { - m_layout = new QHBoxLayout(this); + m_layout = new TQHBoxLayout(this); } //delete old widgets @@ -162,8 +162,8 @@ void CBookKeyChooser::setModules(const ListCSwordModuleInfo& modules, const bool w->comboBox()->setMaximumWidth(maxWidth); w->comboBox()->setCurrentItem(0); - connect(w, SIGNAL(changed(int)), SLOT(keyChooserChanged(int))); - connect(w, SIGNAL(focusOut(int)), SLOT(keyChooserChanged(int))); + connect(w, TQT_SIGNAL(changed(int)), TQT_SLOT(keyChooserChanged(int))); + connect(w, TQT_SIGNAL(focusOut(int)), TQT_SLOT(keyChooserChanged(int))); m_layout->addWidget(w); boxes[w] = i; @@ -181,12 +181,12 @@ void CBookKeyChooser::setModules(const ListCSwordModuleInfo& modules, const bool Q_ASSERT(chooser); if (chooser && chooser_prev) { - QWidget::setTabOrder(chooser_prev, chooser); + TQWidget::setTabOrder(chooser_prev, chooser); } chooser_prev = chooser; } - QWidget::setTabOrder(chooser, 0); + TQWidget::setTabOrder(chooser, 0); updateKey(m_key); adjustFont(); // only when refresh is set. @@ -210,7 +210,7 @@ void CBookKeyChooser::refreshContent() { } } -void CBookKeyChooser::setupCombo(const QString key, const int depth, const int currentItem) { +void CBookKeyChooser::setupCombo(const TQString key, const int depth, const int currentItem) { CKeyChooserWidget* chooserWidget = m_chooserWidgets.at(depth); const unsigned long oldOffset = m_key->getOffset(); @@ -228,13 +228,13 @@ void CBookKeyChooser::setupCombo(const QString key, const int depth, const int c //insert an empty item at the top - QStringList items; + TQStringList items; if (depth > 0) { - items << QString::null; + items << TQString::null; } do { - //items << QString::fromLocal8Bit(m_key->getLocalName()); + //items << TQString::fromLocal8Bit(m_key->getLocalName()); items << m_key->getLocalNameUnicode(); } while (m_key->nextSibling()); @@ -250,18 +250,18 @@ void CBookKeyChooser::setupCombo(const QString key, const int depth, const int c /** A keychooser changed. Update and emit a signal if necessary. */ void CBookKeyChooser::keyChooserChanged(int /*newIndex*/) { - const int activeID = boxes[const_cast<QObject*>(sender())]; //no so good code! + const int activeID = boxes[const_cast<TQObject*>(sender())]; //no so good code! - QStringList items; + TQStringList items; CKeyChooserWidget* chooser; const int count = m_chooserWidgets.count(); for (int i = 0; i < count; ++i) { chooser = m_chooserWidgets.at(i); - const QString currentText = + const TQString currentText = (chooser && chooser->comboBox()) ? chooser->comboBox()->currentText() - : QString::null; + : TQString::null; if (currentText.isEmpty() || i > activeID) { break; @@ -270,7 +270,7 @@ void CBookKeyChooser::keyChooserChanged(int /*newIndex*/) { items << currentText; } - QString newKey("/"); + TQString newKey("/"); newKey.append(items.join("/")); if (newKey.length() > 1) { newKey.remove(newKey.length(),1); //remove the traling slash diff --git a/bibletime/frontend/keychooser/cbookkeychooser.h b/bibletime/frontend/keychooser/cbookkeychooser.h index 586996e..ddb5b95 100644 --- a/bibletime/frontend/keychooser/cbookkeychooser.h +++ b/bibletime/frontend/keychooser/cbookkeychooser.h @@ -19,11 +19,11 @@ //Sword includes //Qt includes -#include <qwidget.h> -#include <qsize.h> -#include <qmap.h> -#include <qptrlist.h> -#include <qstringlist.h> +#include <tqwidget.h> +#include <tqsize.h> +#include <tqmap.h> +#include <tqptrlist.h> +#include <tqstringlist.h> class CSwordKey; class CSwordBookModuleInfo; @@ -33,7 +33,7 @@ namespace sword { class TreeKeyIdx; } -class QHBoxLayout; +class TQHBoxLayout; /** The keychooser implementation for books. * @author The BibleTime team @@ -41,7 +41,7 @@ class QHBoxLayout; class CBookKeyChooser : public CKeyChooser { Q_OBJECT public: - CBookKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key=0, QWidget *parent=0, const char *name=0); + CBookKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key=0, TQWidget *parent=0, const char *name=0); ~CBookKeyChooser(); /** * Refreshes the content. @@ -76,7 +76,7 @@ protected: // Protected methods * Fills the combo given by depth with the items from the key having depth "depth". * The parent sibling is given by key. */ - void setupCombo(const QString key, const int depth, const int currentItem); + void setupCombo(const TQString key, const int depth, const int currentItem); /** No descriptions */ virtual void adjustFont(); @@ -90,10 +90,10 @@ protected slots: // void previousEntry(); private: - QPtrList<CKeyChooserWidget> m_chooserWidgets; - QPtrList<CSwordBookModuleInfo> m_modules; + TQPtrList<CKeyChooserWidget> m_chooserWidgets; + TQPtrList<CSwordBookModuleInfo> m_modules; CSwordTreeKey *m_key; - QHBoxLayout* m_layout; + TQHBoxLayout* m_layout; }; #endif diff --git a/bibletime/frontend/keychooser/cbooktreechooser.cpp b/bibletime/frontend/keychooser/cbooktreechooser.cpp index 33e95fa..e15fbc2 100644 --- a/bibletime/frontend/keychooser/cbooktreechooser.cpp +++ b/bibletime/frontend/keychooser/cbooktreechooser.cpp @@ -15,17 +15,17 @@ #include "frontend/cbtconfig.h" //Qt includes -#include <qlayout.h> -#include <qheader.h> -#include <qlistview.h> -#include <qcursor.h> +#include <tqlayout.h> +#include <tqheader.h> +#include <tqlistview.h> +#include <tqcursor.h> //KDE includes #include <kapplication.h> //////////// -CBookTreeChooser::TreeItem::TreeItem(QListViewItem* parent, QListViewItem* after, CSwordTreeKey* key, const QString keyName) +CBookTreeChooser::TreeItem::TreeItem(TQListViewItem* parent, TQListViewItem* after, CSwordTreeKey* key, const TQString keyName) : KListViewItem(parent, after), m_key(key), m_keyName(keyName) { @@ -33,13 +33,13 @@ m_keyName(keyName) { const unsigned long offset = m_key->getOffset(); m_key->key(m_keyName); - //setText(0, QString::fromLocal8Bit(m_key->getLocalName()) ); + //setText(0, TQString::fromLocal8Bit(m_key->getLocalName()) ); setText(0, m_key->getLocalNameUnicode() ); m_key->setOffset( offset ); }; -CBookTreeChooser::TreeItem::TreeItem(QListViewItem* parent,CSwordTreeKey* key, const QString keyName) +CBookTreeChooser::TreeItem::TreeItem(TQListViewItem* parent,CSwordTreeKey* key, const TQString keyName) : KListViewItem(parent), m_key(key), m_keyName(keyName) { @@ -47,13 +47,13 @@ m_keyName(keyName) { const unsigned int offset = m_key->getOffset(); m_key->key(m_keyName); - //setText(0, QString::fromLocal8Bit(m_key->getLocalName()) ); + //setText(0, TQString::fromLocal8Bit(m_key->getLocalName()) ); setText(0, m_key->getLocalNameUnicode() ); m_key->setOffset( offset ); }; -CBookTreeChooser::TreeItem::TreeItem(QListView* view, QListViewItem* after,CSwordTreeKey* key, const QString keyName) +CBookTreeChooser::TreeItem::TreeItem(TQListView* view, TQListViewItem* after,CSwordTreeKey* key, const TQString keyName) : KListViewItem(view,after), m_key(key), m_keyName(keyName) { @@ -61,13 +61,13 @@ m_keyName(keyName) { const unsigned int offset = m_key->getOffset(); m_key->key(m_keyName); - //setText(0, QString::fromLocal8Bit(m_key->getLocalName()) ); + //setText(0, TQString::fromLocal8Bit(m_key->getLocalName()) ); setText(0, m_key->getLocalNameUnicode() ); m_key->setOffset( offset ); }; -const QString& CBookTreeChooser::TreeItem::key() const { +const TQString& CBookTreeChooser::TreeItem::key() const { return m_keyName; }; @@ -93,7 +93,7 @@ void CBookTreeChooser::TreeItem::createChilds() { if (m_key->hasChildren()) { m_key->firstChild(); //go to the first child - QListViewItem* oldItem = 0; + TQListViewItem* oldItem = 0; do { if (oldItem) { @@ -124,7 +124,7 @@ void CBookTreeChooser::TreeItem::setOpen(bool o) { ////////////////////////////////// -CBookTreeChooser::CBookTreeChooser(ListCSwordModuleInfo modules, CSwordKey *key, QWidget *parent, const char *name) +CBookTreeChooser::CBookTreeChooser(ListCSwordModuleInfo modules, CSwordKey *key, TQWidget *parent, const char *name) : CKeyChooser(modules, key, parent,name), m_key( dynamic_cast<CSwordTreeKey*>(key) ) { setModules(modules, false); @@ -135,7 +135,7 @@ m_key( dynamic_cast<CSwordTreeKey*>(key) ) { } //now setup the keychooser widgets - QHBoxLayout* layout = new QHBoxLayout(this); + TQHBoxLayout* layout = new TQHBoxLayout(this); m_treeView = new KListView(this); layout->addWidget(m_treeView); @@ -144,7 +144,7 @@ m_key( dynamic_cast<CSwordTreeKey*>(key) ) { m_treeView->setSorting(-1); m_treeView->setRootIsDecorated(true); m_treeView->setFullWidth(true); - connect(m_treeView, SIGNAL(executed(QListViewItem*)), SLOT(itemActivated(QListViewItem*))); + connect(m_treeView, TQT_SIGNAL(executed(TQListViewItem*)), TQT_SLOT(itemActivated(TQListViewItem*))); setKey(key); adjustFont(); @@ -163,19 +163,19 @@ void CBookTreeChooser::setKey(CSwordKey* newKey, const bool emitSignal) { m_key = dynamic_cast<CSwordTreeKey*>(newKey); } - const QString key = m_key->key(); + const TQString key = m_key->key(); - QStringList siblings; + TQStringList siblings; if (m_key && !key.isEmpty()) { - siblings = QStringList::split("/",key,false); + siblings = TQStringList::split("/",key,false); } //find the right listview item const int count = siblings.count(); int index = 0; - QString currentSibling = siblings[index]; + TQString currentSibling = siblings[index]; - QListViewItem* child = m_treeView->firstChild(); + TQListViewItem* child = m_treeView->firstChild(); while( child && index < count ) { if (child->text(0) == currentSibling) { //found a parent of our item //found right entry? @@ -229,7 +229,7 @@ void CBookTreeChooser::setModules(const ListCSwordModuleInfo& modules, const boo // m_treeView->clear(); // - // const QString oldKey = m_key->key(); + // const TQString oldKey = m_key->key(); // m_key->root(); // m_key->firstChild(); // setupTree(0,0,m_key); @@ -264,7 +264,7 @@ void CBookTreeChooser::refreshContent() { } /** No descriptions */ -void CBookTreeChooser::itemActivated( QListViewItem* item ) { +void CBookTreeChooser::itemActivated( TQListViewItem* item ) { TreeItem* i = dynamic_cast<TreeItem*>(item); if (!i) { return; @@ -304,7 +304,7 @@ void CBookTreeChooser::setupTree() { m_key->root(); if (m_key->hasChildren()) { - QListViewItem* item = 0; + TQListViewItem* item = 0; m_key->firstChild(); do { diff --git a/bibletime/frontend/keychooser/cbooktreechooser.h b/bibletime/frontend/keychooser/cbooktreechooser.h index 43b03d5..49caa05 100644 --- a/bibletime/frontend/keychooser/cbooktreechooser.h +++ b/bibletime/frontend/keychooser/cbooktreechooser.h @@ -23,11 +23,11 @@ //Sword includes //Qt includes -#include <qwidget.h> -#include <qsize.h> -#include <qmap.h> -#include <qptrlist.h> -#include <qstringlist.h> +#include <tqwidget.h> +#include <tqsize.h> +#include <tqmap.h> +#include <tqptrlist.h> +#include <tqstringlist.h> //KDE includes #include <klistview.h> @@ -46,7 +46,7 @@ namespace sword { class CBookTreeChooser : public CKeyChooser { Q_OBJECT public: - CBookTreeChooser(ListCSwordModuleInfo modules, CSwordKey *key=0, QWidget *parent=0, const char *name=0); + CBookTreeChooser(ListCSwordModuleInfo modules, CSwordKey *key=0, TQWidget *parent=0, const char *name=0); ~CBookTreeChooser(); /** * Refreshes the content. @@ -82,15 +82,15 @@ protected: // Protected methods virtual void adjustFont(); protected slots: // Protected slots - void itemActivated( QListViewItem* item ); + void itemActivated( TQListViewItem* item ); private: class TreeItem : public KListViewItem { public: - TreeItem(QListViewItem* parent, QListViewItem* after, CSwordTreeKey* key, const QString keyName); - TreeItem(QListViewItem* parent, CSwordTreeKey* key, const QString keyName); - TreeItem(QListView* view,QListViewItem* after, CSwordTreeKey* key, const QString keyName); - const QString& key() const; + TreeItem(TQListViewItem* parent, TQListViewItem* after, CSwordTreeKey* key, const TQString keyName); + TreeItem(TQListViewItem* parent, CSwordTreeKey* key, const TQString keyName); + TreeItem(TQListView* view,TQListViewItem* after, CSwordTreeKey* key, const TQString keyName); + const TQString& key() const; void createChilds(); virtual void setOpen(bool); @@ -101,10 +101,10 @@ protected: virtual void setup(); private: CSwordTreeKey* m_key; - QString m_keyName; + TQString m_keyName; }; - QPtrList<CSwordBookModuleInfo> m_modules; + TQPtrList<CSwordBookModuleInfo> m_modules; CSwordTreeKey* m_key; KListView* m_treeView; }; diff --git a/bibletime/frontend/keychooser/ckeychooser.cpp b/bibletime/frontend/keychooser/ckeychooser.cpp index 4dcd878..0db5911 100644 --- a/bibletime/frontend/keychooser/ckeychooser.cpp +++ b/bibletime/frontend/keychooser/ckeychooser.cpp @@ -19,13 +19,13 @@ #include "cbiblekeychooser.h" #include "cbookkeychooser.h" -CKeyChooser::CKeyChooser(ListCSwordModuleInfo, CSwordKey *, QWidget *parent, const char *name ) -: QWidget(parent, name), +CKeyChooser::CKeyChooser(ListCSwordModuleInfo, CSwordKey *, TQWidget *parent, const char *name ) +: TQWidget(parent, name), m_inHistoryFunction(false) {} CKeyChooser::~CKeyChooser() {} -CKeyChooser* CKeyChooser::createInstance(ListCSwordModuleInfo modules, CSwordKey *key, QWidget *parent) { +CKeyChooser* CKeyChooser::createInstance(ListCSwordModuleInfo modules, CSwordKey *key, TQWidget *parent) { if (!modules.count()) { return 0; } @@ -58,7 +58,7 @@ void CKeyChooser::backInHistory(int count) { Q_ASSERT(m_prevKeyHistoryList.size()); - QStringList::iterator it = m_prevKeyHistoryList.begin(); + TQStringList::iterator it = m_prevKeyHistoryList.begin(); //pop_front count items, the top item is then the new current key int index = count; @@ -90,7 +90,7 @@ void CKeyChooser::forwardInHistory(int count) { Q_ASSERT(m_nextKeyHistoryList.size()); - QStringList::iterator it = m_nextKeyHistoryList.begin(); + TQStringList::iterator it = m_nextKeyHistoryList.begin(); //pop_front count-1 items, the top item is then the new current key int index = count; while (index > 0 && it != m_nextKeyHistoryList.end()) { @@ -124,8 +124,8 @@ void CKeyChooser::addToHistory(CSwordKey* k) { emit historyChanged(); } -const QStringList CKeyChooser::getPreviousKeys() const { - QStringList ret = m_prevKeyHistoryList; +const TQStringList CKeyChooser::getPreviousKeys() const { + TQStringList ret = m_prevKeyHistoryList; if (ret.size() >= 1) { ret.pop_front(); //the first item always is equal to the current key } @@ -133,7 +133,7 @@ const QStringList CKeyChooser::getPreviousKeys() const { return ret; } -const QStringList CKeyChooser::getNextKeys() const { +const TQStringList CKeyChooser::getNextKeys() const { return m_nextKeyHistoryList; } @@ -142,8 +142,8 @@ const QStringList CKeyChooser::getNextKeys() const { \fn CKeyChooser::polish() */ void CKeyChooser::polish() { - QWidget::polish(); + TQWidget::polish(); //connect the history calls just before we show, we want an empty history - connect(this, SIGNAL(keyChanged(CSwordKey*)), SLOT(addToHistory(CSwordKey*))); + connect(this, TQT_SIGNAL(keyChanged(CSwordKey*)), TQT_SLOT(addToHistory(CSwordKey*))); } diff --git a/bibletime/frontend/keychooser/ckeychooser.h b/bibletime/frontend/keychooser/ckeychooser.h index c5ad246..2ccb27d 100644 --- a/bibletime/frontend/keychooser/ckeychooser.h +++ b/bibletime/frontend/keychooser/ckeychooser.h @@ -12,7 +12,7 @@ #ifndef CKEYCHOOSER_H #define CKEYCHOOSER_H -#include <qwidget.h> +#include <tqwidget.h> #include "backend/cswordmoduleinfo.h" @@ -28,7 +28,7 @@ class CSwordKey; * @author The BibleTime team */ -class CKeyChooser : public QWidget { +class CKeyChooser : public TQWidget { Q_OBJECT public: @@ -41,10 +41,10 @@ public: * @param key if not NULL, the @ref CKey the KeyChooser should be set to * @param parent the parent of the widget to create */ - static CKeyChooser* createInstance(ListCSwordModuleInfo modules, CSwordKey *key, QWidget *parent); + static CKeyChooser* createInstance(ListCSwordModuleInfo modules, CSwordKey *key, TQWidget *parent); - const QStringList getPreviousKeys() const; - const QStringList getNextKeys() const; + const TQStringList getPreviousKeys() const; + const TQStringList getNextKeys() const; public slots: /** @@ -88,14 +88,14 @@ signals: /** * Is emitted before the key is changed! */ - void beforeKeyChange(const QString& key); + void beforeKeyChange(const TQString& key); void historyChanged(); protected: /** * the constructor - DO NOT USE! -- use @ref #createInstance instead! */ - CKeyChooser(ListCSwordModuleInfo info, CSwordKey *key=0, QWidget *parent=0, const char *name=0); + CKeyChooser(ListCSwordModuleInfo info, CSwordKey *key=0, TQWidget *parent=0, const char *name=0); virtual ~CKeyChooser(); /** * Set the appropriate font do display the modules @@ -103,8 +103,8 @@ protected: virtual void adjustFont() = 0; private: - QStringList m_prevKeyHistoryList; - QStringList m_nextKeyHistoryList; + TQStringList m_prevKeyHistoryList; + TQStringList m_nextKeyHistoryList; int m_currentKeyHistoryPos; bool m_inHistoryFunction; protected: diff --git a/bibletime/frontend/keychooser/ckeychooserwidget.cpp b/bibletime/frontend/keychooser/ckeychooserwidget.cpp index 64de499..d068545 100644 --- a/bibletime/frontend/keychooser/ckeychooserwidget.cpp +++ b/bibletime/frontend/keychooser/ckeychooserwidget.cpp @@ -16,34 +16,34 @@ //Qt includes -#include <qlineedit.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qlistbox.h> -#include <qtoolbutton.h> -#include <qevent.h> -#include <qlayout.h> -#include <qpainter.h> -#include <qstyle.h> -#include <qpixmap.h> -#include <qapplication.h> -#include <qtooltip.h> -#include <qrect.h> - -CKCComboBox::CKCComboBox(bool rw,QWidget* parent,const char* name) -: QComboBox(rw,parent,name) { - setFocusPolicy(QWidget::WheelFocus); +#include <tqlineedit.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqlistbox.h> +#include <tqtoolbutton.h> +#include <tqevent.h> +#include <tqlayout.h> +#include <tqpainter.h> +#include <tqstyle.h> +#include <tqpixmap.h> +#include <tqapplication.h> +#include <tqtooltip.h> +#include <tqrect.h> + +CKCComboBox::CKCComboBox(bool rw,TQWidget* parent,const char* name) +: TQComboBox(rw,parent,name) { + setFocusPolicy(TQWidget::WheelFocus); if (lineEdit()) { installEventFilter( lineEdit() ); } } /** Reimplementation. */ -bool CKCComboBox::eventFilter( QObject *o, QEvent *e ) { - if (e->type() == QEvent::FocusOut) { - QFocusEvent* f = static_cast<QFocusEvent*>(e); +bool CKCComboBox::eventFilter( TQObject *o, TQEvent *e ) { + if (e->type() == TQEvent::FocusOut) { + TQFocusEvent* f = static_cast<TQFocusEvent*>(e); - if (o == lineEdit() && f->reason() == QFocusEvent::Tab) { + if (o == lineEdit() && f->reason() == TQFocusEvent::Tab) { int index = listBox()->index( listBox()->findItem(currentText()) ); if (index == -1) { index = 0;// return 0 if not found @@ -53,14 +53,14 @@ bool CKCComboBox::eventFilter( QObject *o, QEvent *e ) { return false; } - else if (f->reason() == QFocusEvent::Popup) { + else if (f->reason() == TQFocusEvent::Popup) { return false; } - else if (f->reason() == QFocusEvent::ActiveWindow) { + else if (f->reason() == TQFocusEvent::ActiveWindow) { emit activated(currentText()); return false; } - else if (f->reason() == QFocusEvent::Mouse) { + else if (f->reason() == TQFocusEvent::Mouse) { emit activated(currentText()); return false; } @@ -70,12 +70,12 @@ bool CKCComboBox::eventFilter( QObject *o, QEvent *e ) { } } - return QComboBox::eventFilter(o,e); + return TQComboBox::eventFilter(o,e); } /** Scrolls in the list if the wheel of the mouse was used. */ -void CKCComboBox::wheelEvent( QWheelEvent* e ) { - return QComboBox::wheelEvent(e); +void CKCComboBox::wheelEvent( TQWheelEvent* e ) { + return TQComboBox::wheelEvent(e); const signed int change = (int)((float)e->delta()/(float)120); int current = currentItem(); @@ -92,17 +92,17 @@ void CKCComboBox::wheelEvent( QWheelEvent* e ) { //**********************************************************************************/ -CKeyChooserWidget::CKeyChooserWidget(int count, const bool useNextPrevSignals, QWidget *parent, const char *name) : QWidget(parent,name) { +CKeyChooserWidget::CKeyChooserWidget(int count, const bool useNextPrevSignals, TQWidget *parent, const char *name) : TQWidget(parent,name) { m_useNextPrevSignals = useNextPrevSignals; for (int index=1; index <= count; index++) { - m_list.append( QString::number(index) ); + m_list.append( TQString::number(index) ); } init(); reset(m_list,0,false); }; -CKeyChooserWidget::CKeyChooserWidget(QStringList *list, const bool useNextPrevSignals, QWidget *parent, const char *name ) : QWidget(parent,name) { +CKeyChooserWidget::CKeyChooserWidget(TQStringList *list, const bool useNextPrevSignals, TQWidget *parent, const char *name ) : TQWidget(parent,name) { m_useNextPrevSignals = useNextPrevSignals; if (list) { @@ -122,13 +122,13 @@ void CKeyChooserWidget::reset(const int count, int index, bool do_emit) { m_list.clear(); for (int i=1; i <= count; i++) { //TODO: CHECK - m_list.append( QString::number(i) ); + m_list.append( TQString::number(i) ); } reset(&m_list,index,do_emit); } -void CKeyChooserWidget::reset(QStringList& list, int index, bool do_emit) { +void CKeyChooserWidget::reset(TQStringList& list, int index, bool do_emit) { if (!isUpdatesEnabled()) return; @@ -137,14 +137,14 @@ void CKeyChooserWidget::reset(QStringList& list, int index, bool do_emit) { } -void CKeyChooserWidget::reset(QStringList *list, int index, bool do_emit) { +void CKeyChooserWidget::reset(TQStringList *list, int index, bool do_emit) { if (isResetting || !isUpdatesEnabled()) return; // qWarning("starting insert"); isResetting = true; - oldKey = QString::null; + oldKey = TQString::null; // m_comboBox->setUpdatesEnabled(false); //DON'T REMOVE THE HIDE: Otherwise QComboBox's sizeHint() function won't work properly @@ -168,7 +168,7 @@ void CKeyChooserWidget::reset(QStringList *list, int index, bool do_emit) { emit changed(m_comboBox->currentItem()); } - const QSize dummySize = m_comboBox->sizeHint(); //without this function call the combo box won't be properly sized! + const TQSize dummySize = m_comboBox->sizeHint(); //without this function call the combo box won't be properly sized! //DON'T REMOVE OR MOVE THE show()! Otherwise QComboBox's sizeHint() function won't work properly! m_comboBox->show(); @@ -181,16 +181,16 @@ void CKeyChooserWidget::reset(QStringList *list, int index, bool do_emit) { /** Initializes this widget. We need this function because we have more than one constructor. */ void CKeyChooserWidget::init() { - oldKey = QString::null; + oldKey = TQString::null; - setFocusPolicy(QWidget::WheelFocus); + setFocusPolicy(TQWidget::WheelFocus); m_comboBox = new CKCComboBox( true, this ); m_comboBox->setAutoCompletion( true ); - m_comboBox->setInsertionPolicy(QComboBox::NoInsertion); - m_comboBox->setFocusPolicy(QWidget::WheelFocus); + m_comboBox->setInsertionPolicy(TQComboBox::NoInsertion); + m_comboBox->setFocusPolicy(TQWidget::WheelFocus); - m_mainLayout = new QHBoxLayout( this ); + m_mainLayout = new TQHBoxLayout( this ); m_mainLayout->addWidget(m_comboBox,5); m_scroller = new CScrollerWidgetSet(this); @@ -200,25 +200,25 @@ void CKeyChooserWidget::init() { setTabOrder(m_comboBox, 0); - connect(m_scroller, SIGNAL(scroller_pressed()), SLOT(lock())); - connect(m_scroller, SIGNAL(scroller_released()), SLOT(unlock())); - connect(m_scroller, SIGNAL(change(int)), SLOT(changeCombo(int)) ); + connect(m_scroller, TQT_SIGNAL(scroller_pressed()), TQT_SLOT(lock())); + connect(m_scroller, TQT_SIGNAL(scroller_released()), TQT_SLOT(unlock())); + connect(m_scroller, TQT_SIGNAL(change(int)), TQT_SLOT(changeCombo(int)) ); - connect(m_comboBox, SIGNAL(activated(int)), SLOT(slotComboChanged(int))); - // connect(m_comboBox, SIGNAL(activated(const QString&)), SLOT(slotReturnPressed(const QString&))); - connect(m_comboBox->lineEdit(), SIGNAL(returnPressed()), SLOT(slotReturnPressed())); - connect(m_comboBox, SIGNAL(focusOut(int)), SIGNAL(focusOut(int))); + connect(m_comboBox, TQT_SIGNAL(activated(int)), TQT_SLOT(slotComboChanged(int))); + // connect(m_comboBox, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotReturnPressed(const TQString&))); + connect(m_comboBox->lineEdit(), TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed())); + connect(m_comboBox, TQT_SIGNAL(focusOut(int)), TQT_SIGNAL(focusOut(int))); updatelock = false; isResetting = false; } /** Is called when the return key was presed in the combobox. */ -void CKeyChooserWidget::slotReturnPressed( /*const QString& text*/) { +void CKeyChooserWidget::slotReturnPressed( /*const TQString& text*/) { Q_ASSERT(comboBox()->lineEdit()); qWarning("return pressed"); - QString text = comboBox()->lineEdit()->text(); + TQString text = comboBox()->lineEdit()->text(); for (int index = 0; index < comboBox()->count(); ++index) { if (comboBox()->text(index) == text) { // emit changed(index); @@ -237,7 +237,7 @@ void CKeyChooserWidget::slotComboChanged(int index) { setUpdatesEnabled(false); - const QString key = comboBox()->text( index ); + const TQString key = comboBox()->text( index ); if (oldKey.isNull() || (oldKey != key)) { emit changed(index); } @@ -248,13 +248,13 @@ void CKeyChooserWidget::slotComboChanged(int index) { } /** Sets the tooltips for the given entries using the parameters as text. */ -void CKeyChooserWidget::setToolTips( const QString comboTip, const QString nextEntryTip, const QString scrollButtonTip, const QString previousEntryTip) { - QToolTip::add (comboBox(),comboTip); +void CKeyChooserWidget::setToolTips( const TQString comboTip, const TQString nextEntryTip, const TQString scrollButtonTip, const TQString previousEntryTip) { + TQToolTip::add (comboBox(),comboTip); m_scroller->setToolTips(nextEntryTip, scrollButtonTip, previousEntryTip); } /** Sets the current item to the one with the given text */ -bool CKeyChooserWidget::setItem( const QString item ) { +bool CKeyChooserWidget::setItem( const TQString item ) { bool ret = false; const int count = comboBox()->count(); for (int i = 0; i < count; ++i) { diff --git a/bibletime/frontend/keychooser/ckeychooserwidget.h b/bibletime/frontend/keychooser/ckeychooserwidget.h index e5893ce..d1ef131 100644 --- a/bibletime/frontend/keychooser/ckeychooserwidget.h +++ b/bibletime/frontend/keychooser/ckeychooserwidget.h @@ -12,9 +12,9 @@ #ifndef CKEYCHOOSERWIDGET_H #define CKEYCHOOSERWIDGET_H -#include <qwidget.h> -#include <qmap.h> -#include <qstringlist.h> +#include <tqwidget.h> +#include <tqmap.h> +#include <tqstringlist.h> #include <kcombobox.h> #include "cscrollerwidgetset.h" @@ -23,37 +23,37 @@ class CLexiconKeyChooser; //class CMinMaxLayout; -class QIconSet; -//class QComboBox; -class QStringList; -class QPoint; -class QMouseEvent; -class QWheelEvent; -class QHBoxLayout; +class TQIconSet; +//class TQComboBox; +class TQStringList; +class TQPoint; +class TQMouseEvent; +class TQWheelEvent; +class TQHBoxLayout; /* * We use this class to conrtol the focus move in the combobox * This class is used in the key chooser widgets */ -class CKCComboBox : public QComboBox { +class CKCComboBox : public TQComboBox { Q_OBJECT public: - CKCComboBox(bool rw, QWidget * parent=0, const char * name=0 ); + CKCComboBox(bool rw, TQWidget * parent=0, const char * name=0 ); /** * Returns the size this widget would like to have. */ - // virtual QSize sizeHint() const; + // virtual TQSize sizeHint() const; protected: /** * Reimplementation. */ - virtual bool eventFilter( QObject *o, QEvent *e ); + virtual bool eventFilter( TQObject *o, TQEvent *e ); /** * Scrolls in the list if the wheel of the mouse was used. */ - virtual void wheelEvent( QWheelEvent* e); + virtual void wheelEvent( TQWheelEvent* e); signals: /** @@ -64,22 +64,22 @@ signals: /** * This class implements the KeyCooser Widget, which - * consists of a @ref QComboBox, two normal ref @QToolButton + * consists of a @ref TQComboBox, two normal ref @QToolButton * and a enhanced @ref CScrollButton * * @author The BibleTime team */ -class CKeyChooserWidget : public QWidget { +class CKeyChooserWidget : public TQWidget { Q_OBJECT public: /** * the constructor */ - CKeyChooserWidget(QStringList *list=0, const bool useNextPrevSignals = false, QWidget *parent=0, const char *name=0); + CKeyChooserWidget(TQStringList *list=0, const bool useNextPrevSignals = false, TQWidget *parent=0, const char *name=0); /** * the constructor */ - CKeyChooserWidget(int count=0, const bool useNextPrevSignals = false, QWidget *parent=0, const char *name=0); + CKeyChooserWidget(int count=0, const bool useNextPrevSignals = false, TQWidget *parent=0, const char *name=0); /** * This function does clear the combobox, then fill in * the StringList, set the ComboBox' current item to index @@ -90,8 +90,8 @@ public: * @param do_emit should we emit @ref #changed(int) */ void reset(const int count, int index, bool do_emit); - void reset(QStringList& list, int index, bool do_emit); - void reset(QStringList *list, int index, bool do_emit); + void reset(TQStringList& list, int index, bool do_emit); + void reset(TQStringList *list, int index, bool do_emit); /** * Initializes this widget. We need this function because * we have more than one constructor. @@ -104,15 +104,15 @@ public: /** * Sets the tooltips for the given entries using the parameters as text. */ - void setToolTips( const QString comboTip, const QString nextEntry, const QString scrollButton, const QString previousEntry); + void setToolTips( const TQString comboTip, const TQString nextEntry, const TQString scrollButton, const TQString previousEntry); /** * Sets the current item to the one with the given text */ - bool setItem( const QString item); + bool setItem( const TQString item); /** * Return the combobox of this key chooser widget. */ - QComboBox* comboBox() {return m_comboBox;}; + TQComboBox* comboBox() {return m_comboBox;}; public slots: /** @@ -153,18 +153,18 @@ protected: /** * */ - QString oldKey; + TQString oldKey; protected slots: // Protected slots /** * Is called when the return key was presed in the combobox. */ - void slotReturnPressed( /*const QString&*/ ); + void slotReturnPressed( /*const TQString&*/ ); private: friend class CLexiconKeyChooser; - QStringList m_list; + TQStringList m_list; bool m_useNextPrevSignals; bool updatelock; @@ -172,7 +172,7 @@ private: * Members should never be public!! */ CKCComboBox* m_comboBox; - QHBoxLayout *m_mainLayout; + TQHBoxLayout *m_mainLayout; CScrollerWidgetSet * m_scroller; }; diff --git a/bibletime/frontend/keychooser/ckeyreferencewidget.cpp b/bibletime/frontend/keychooser/ckeyreferencewidget.cpp index b0fc7c9..5382efc 100644 --- a/bibletime/frontend/keychooser/ckeyreferencewidget.cpp +++ b/bibletime/frontend/keychooser/ckeyreferencewidget.cpp @@ -19,11 +19,11 @@ //Qt includes #include <klineedit.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qevent.h> -#include <qpixmap.h> -#include <qapplication.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqevent.h> +#include <tqpixmap.h> +#include <tqapplication.h> #include <kcompletion.h> #include <kglobalsettings.h> #include <kcompletionbox.h> @@ -38,28 +38,28 @@ CKeyReferenceCompletion::CKeyReferenceCompletion(CSwordBibleModuleInfo *mod) : K m_module = mod; } -QString CKeyReferenceCompletion::makeCompletion(const QString &text) { +TQString CKeyReferenceCompletion::makeCompletion(const TQString &text) { if(!text.isEmpty() && m_key->key(text)) { // XXX: key() does not check bounds properly if we only have eg the NT. return m_key->key(); } - return QString::null; + return TQString::null; } //**********************************************************************************/ /* To get popup working we have to rework KLineEdit too */ -CKeyReferenceLineEdit::CKeyReferenceLineEdit(QWidget *parent, const char *name) : KLineEdit(parent,name) { +CKeyReferenceLineEdit::CKeyReferenceLineEdit(TQWidget *parent, const char *name) : KLineEdit(parent,name) { } -void CKeyReferenceLineEdit::makeCompletion(const QString &text) { +void CKeyReferenceLineEdit::makeCompletion(const TQString &text) { KCompletion *comp = compObj(); KGlobalSettings::Completion mode = completionMode(); if ( !comp || mode == KGlobalSettings::CompletionNone ) return; // No completion object... - QString match = comp->makeCompletion( text ); + TQString match = comp->makeCompletion( text ); if ( mode == KGlobalSettings::CompletionPopup || mode == KGlobalSettings::CompletionPopupAuto ) { @@ -69,7 +69,7 @@ void CKeyReferenceLineEdit::makeCompletion(const QString &text) { compbox->hide(); compbox->clear(); } else { - QStringList t; + TQStringList t; t.append(match); setCompletedItems(t); } @@ -80,19 +80,19 @@ void CKeyReferenceLineEdit::makeCompletion(const QString &text) { //**********************************************************************************/ -CKeyReferenceWidget::CKeyReferenceWidget( CSwordBibleModuleInfo *mod, CSwordVerseKey *key, QWidget *parent, const char *name) : QWidget(parent,name) { +CKeyReferenceWidget::CKeyReferenceWidget( CSwordBibleModuleInfo *mod, CSwordVerseKey *key, TQWidget *parent, const char *name) : TQWidget(parent,name) { updatelock = false; m_module = mod; - setFocusPolicy(QWidget::WheelFocus); + setFocusPolicy(TQWidget::WheelFocus); // Erase button KGuiItem erase_picture; erase_picture.setIconName("locationbar_erase"); KPushButton *clearRef = new KPushButton(this); clearRef->setGuiItem(erase_picture); - connect(clearRef, SIGNAL(clicked( ) ), SLOT(slotClearRef( ))); + connect(clearRef, TQT_SIGNAL(clicked( ) ), TQT_SLOT(slotClearRef( ))); m_bookScroller = new CScrollerWidgetSet(this); @@ -103,7 +103,7 @@ CKeyReferenceWidget::CKeyReferenceWidget( CSwordBibleModuleInfo *mod, CSwordVers m_chapterScroller = new CScrollerWidgetSet(this); m_verseScroller = new CScrollerWidgetSet(this); - m_mainLayout = new QHBoxLayout( this ); + m_mainLayout = new TQHBoxLayout( this ); m_mainLayout->addWidget(clearRef); m_mainLayout->addWidget(m_bookScroller); m_mainLayout->addWidget(m_textbox); @@ -131,16 +131,16 @@ CKeyReferenceWidget::CKeyReferenceWidget( CSwordBibleModuleInfo *mod, CSwordVers // signals and slots connections - connect(m_bookScroller, SIGNAL(change(int)), SLOT(slotBookChange(int))); - connect(m_bookScroller, SIGNAL(scroller_pressed()), SLOT(slotUpdateLock())); - connect(m_bookScroller, SIGNAL(scroller_released()), SLOT(slotUpdateUnlock())); - connect(m_textbox, SIGNAL(returnPressed()), SLOT(slotReturnPressed())); - connect(m_chapterScroller, SIGNAL(change(int)), SLOT(slotChapterChange(int))); - connect(m_chapterScroller, SIGNAL(scroller_pressed()), SLOT(slotUpdateLock())); - connect(m_chapterScroller, SIGNAL(scroller_released()), SLOT(slotUpdateUnlock())); - connect(m_verseScroller, SIGNAL(change(int)), SLOT(slotVerseChange(int))); - connect(m_verseScroller, SIGNAL(scroller_pressed()), SLOT(slotUpdateLock())); - connect(m_verseScroller, SIGNAL(scroller_released()), SLOT(slotUpdateUnlock())); + connect(m_bookScroller, TQT_SIGNAL(change(int)), TQT_SLOT(slotBookChange(int))); + connect(m_bookScroller, TQT_SIGNAL(scroller_pressed()), TQT_SLOT(slotUpdateLock())); + connect(m_bookScroller, TQT_SIGNAL(scroller_released()), TQT_SLOT(slotUpdateUnlock())); + connect(m_textbox, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed())); + connect(m_chapterScroller, TQT_SIGNAL(change(int)), TQT_SLOT(slotChapterChange(int))); + connect(m_chapterScroller, TQT_SIGNAL(scroller_pressed()), TQT_SLOT(slotUpdateLock())); + connect(m_chapterScroller, TQT_SIGNAL(scroller_released()), TQT_SLOT(slotUpdateUnlock())); + connect(m_verseScroller, TQT_SIGNAL(change(int)), TQT_SLOT(slotVerseChange(int))); + connect(m_verseScroller, TQT_SIGNAL(scroller_pressed()), TQT_SLOT(slotUpdateLock())); + connect(m_verseScroller, TQT_SIGNAL(scroller_released()), TQT_SLOT(slotUpdateUnlock())); } void CKeyReferenceWidget::setModule(CSwordBibleModuleInfo *m) { diff --git a/bibletime/frontend/keychooser/ckeyreferencewidget.h b/bibletime/frontend/keychooser/ckeyreferencewidget.h index bcb6bb9..0025945 100644 --- a/bibletime/frontend/keychooser/ckeyreferencewidget.h +++ b/bibletime/frontend/keychooser/ckeyreferencewidget.h @@ -15,8 +15,8 @@ #include "cscrollerwidgetset.h" #include "backend/cswordbiblemoduleinfo.h" -#include <qwidget.h> -#include <qlayout.h> +#include <tqwidget.h> +#include <tqlayout.h> #include <klineedit.h> #include <kcompletion.h> @@ -28,8 +28,8 @@ class CKeyReferenceCompletion : public KCompletion { Q_OBJECT public: CKeyReferenceCompletion(CSwordBibleModuleInfo*); - QString makeCompletion(const QString &); - QStringList allMatches(); + TQString makeCompletion(const TQString &); + TQStringList allMatches(); private: CSwordVerseKey *m_key; CSwordBibleModuleInfo *m_module; @@ -38,17 +38,17 @@ private: class CKeyReferenceLineEdit : public KLineEdit { Q_OBJECT public: - CKeyReferenceLineEdit(QWidget *parent=0, const char *name=0); - void makeCompletion(const QString &); + CKeyReferenceLineEdit(TQWidget *parent=0, const char *name=0); + void makeCompletion(const TQString &); }; -class CKeyReferenceWidget : public QWidget { +class CKeyReferenceWidget : public TQWidget { Q_OBJECT public: /** * the constructor */ - CKeyReferenceWidget(CSwordBibleModuleInfo *, CSwordVerseKey*, QWidget *parent=0, const char *name=0); + CKeyReferenceWidget(CSwordBibleModuleInfo *, CSwordVerseKey*, TQWidget *parent=0, const char *name=0); bool setKey(CSwordVerseKey* key); KLineEdit* textbox(); void setModule(CSwordBibleModuleInfo *m = 0); @@ -75,14 +75,14 @@ protected slots: // Protected slots private: friend class CLexiconKeyChooser; - QHBoxLayout *m_mainLayout; + TQHBoxLayout *m_mainLayout; CKeyReferenceLineEdit *m_textbox; CSwordVerseKey *m_key; CScrollerWidgetSet *m_bookScroller; CScrollerWidgetSet *m_chapterScroller; CScrollerWidgetSet *m_verseScroller; bool updatelock; - QString oldKey; + TQString oldKey; CSwordBibleModuleInfo *m_module; }; diff --git a/bibletime/frontend/keychooser/clexiconkeychooser.cpp b/bibletime/frontend/keychooser/clexiconkeychooser.cpp index ff55602..2a507ac 100644 --- a/bibletime/frontend/keychooser/clexiconkeychooser.cpp +++ b/bibletime/frontend/keychooser/clexiconkeychooser.cpp @@ -24,22 +24,22 @@ #include <map> //Qt includes -#include <qcombobox.h> -#include <qlayout.h> -#include <qlistbox.h> +#include <tqcombobox.h> +#include <tqlayout.h> +#include <tqlistbox.h> //KDE includes #include <klocale.h> -CLexiconKeyChooser::CLexiconKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key, QWidget *parent, const char *name ) +CLexiconKeyChooser::CLexiconKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key, TQWidget *parent, const char *name ) : CKeyChooser(modules, key, parent, name), m_key(dynamic_cast<CSwordLDKey*>(key)) { setModules(modules, false); //we use a layout because the key chooser should be resized to full size - m_layout = new QHBoxLayout(this, QBoxLayout::LeftToRight); - m_layout->setResizeMode(QLayout::FreeResize); + m_layout = new TQHBoxLayout(this, TQBoxLayout::LeftToRight); + m_layout->setResizeMode(TQLayout::FreeResize); m_widget = new CKeyChooserWidget(0, false, this); @@ -56,8 +56,8 @@ m_key(dynamic_cast<CSwordLDKey*>(key)) { m_layout->addWidget(m_widget,0,Qt::AlignLeft); - connect(m_widget,SIGNAL(changed(int)),SLOT(activated(int))); - connect(m_widget,SIGNAL(focusOut(int)),SLOT(activated(int))); + connect(m_widget,TQT_SIGNAL(changed(int)),TQT_SLOT(activated(int))); + connect(m_widget,TQT_SIGNAL(focusOut(int)),TQT_SLOT(activated(int))); setModules(modules, true); setKey(key); @@ -74,7 +74,7 @@ void CLexiconKeyChooser::setKey(CSwordKey* key) { } // qWarning("setKey start"); - QString newKey = m_key->key(); + TQString newKey = m_key->key(); const int index = m_widget->comboBox()->listBox()->index(m_widget->comboBox()->listBox()->findItem( newKey )); m_widget->comboBox()->setCurrentItem(index); @@ -84,7 +84,7 @@ void CLexiconKeyChooser::setKey(CSwordKey* key) { void CLexiconKeyChooser::activated(int index) { // qWarning("activated"); - const QString text = m_widget->comboBox()->text(index); + const TQString text = m_widget->comboBox()->text(index); // To prevent from eternal loop, because activated() is emitted again if (m_key && m_key->key() != text) { @@ -94,7 +94,7 @@ void CLexiconKeyChooser::activated(int index) { // qWarning("activated end"); } -inline const bool my_cmpEntries(const QString& a, const QString& b) { +inline const bool my_cmpEntries(const TQString& a, const TQString& b) { return a < b; }; @@ -105,19 +105,19 @@ void CLexiconKeyChooser::refreshContent() { // qWarning("resetted"); } else { - typedef std::multimap<unsigned int, QStringList*> EntryMap; + typedef std::multimap<unsigned int, TQStringList*> EntryMap; EntryMap entryMap; - QStringList* entries = 0; + TQStringList* entries = 0; for (m_modules.first(); m_modules.current(); m_modules.next()) { entries = m_modules.current()->entries(); entryMap.insert( std::make_pair(entries->count(), entries) ); } - QStringList goodEntries; //The string list which contains the entries which are available in all modules + TQStringList goodEntries; //The string list which contains the entries which are available in all modules EntryMap::iterator it = entryMap.begin(); //iterator to go thoigh all selected modules - QStringList refEntries = *(it->second); //copy the items for the first time - QStringList* cmpEntries = ( ++it )->second; //list for comparision, starts with the second module in the map + TQStringList refEntries = *(it->second); //copy the items for the first time + TQStringList* cmpEntries = ( ++it )->second; //list for comparision, starts with the second module in the map while(it != entryMap.end()) { std::set_intersection( diff --git a/bibletime/frontend/keychooser/clexiconkeychooser.h b/bibletime/frontend/keychooser/clexiconkeychooser.h index 10283eb..d28adc9 100644 --- a/bibletime/frontend/keychooser/clexiconkeychooser.h +++ b/bibletime/frontend/keychooser/clexiconkeychooser.h @@ -12,14 +12,14 @@ #ifndef CLEXICONKEYCHOOSER_H #define CLEXICONKEYCHOOSER_H -#include <qwidget.h> +#include <tqwidget.h> #include "ckeychooser.h" #include "backend/cswordldkey.h" #include "backend/cswordmoduleinfo.h" #include "backend/cswordlexiconmoduleinfo.h" class CKeyChooserWidget; -class QHBoxLayout; +class TQHBoxLayout; /** * This class implements the KeyChooser for lexicons @@ -37,7 +37,7 @@ public: * * you should not need to use this, use @ref CKeyChooser::createInstance instead */ - CLexiconKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key=0, QWidget *parent=0, const char *name=0); + CLexiconKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key=0, TQWidget *parent=0, const char *name=0); public slots: /** @@ -67,8 +67,8 @@ public slots: protected: CKeyChooserWidget *m_widget; CSwordLDKey* m_key; - QPtrList<CSwordLexiconModuleInfo> m_modules; - QHBoxLayout *m_layout; + TQPtrList<CSwordLexiconModuleInfo> m_modules; + TQHBoxLayout *m_layout; virtual void adjustFont(); diff --git a/bibletime/frontend/keychooser/crefselectdialog.cpp b/bibletime/frontend/keychooser/crefselectdialog.cpp index e0c0552..fd82470 100644 --- a/bibletime/frontend/keychooser/crefselectdialog.cpp +++ b/bibletime/frontend/keychooser/crefselectdialog.cpp @@ -12,9 +12,9 @@ #include "crefselectdialog.h" // QT -#include "qlayout.h" -#include "qlineedit.h" -#include "qlabel.h" +#include "tqlayout.h" +#include "tqlineedit.h" +#include "tqlabel.h" // backend #include "backend/cswordkey.h" @@ -24,21 +24,21 @@ #include <klocale.h> -//CRefSelectDialog::CRefSelectDialog(QWidget *parent) +//CRefSelectDialog::CRefSelectDialog(TQWidget *parent) // : KDialogBase(parent, "Refenences", // true, i18n("Refenence selector"), // KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true), // m_oldPos(0,0) // //{ -// m_page = new QWidget( this ); -// m_placeholder = new QWidget( m_page); -// QVBoxLayout* layout = new QVBoxLayout( m_page, 0, spacingHint()); -// m_lineedit = new QLineEdit( QString::null, m_page, "select" ); +// m_page = new TQWidget( this ); +// m_placeholder = new TQWidget( m_page); +// TQVBoxLayout* layout = new TQVBoxLayout( m_page, 0, spacingHint()); +// m_lineedit = new TQLineEdit( TQString::null, m_page, "select" ); // m_lineedit->setMinimumWidth(fontMetrics().maxWidth()*8); // -// QHBoxLayout* hlayout = new QHBoxLayout(m_page, 0, spacingHint()); -// hlayout->addWidget(new QLabel(i18n("Verse key:"), m_page)); +// TQHBoxLayout* hlayout = new TQHBoxLayout(m_page, 0, spacingHint()); +// hlayout->addWidget(new TQLabel(i18n("Verse key:"), m_page)); // hlayout->addWidget(m_lineedit); // layout->addItem(hlayout); // layout->addWidget(m_placeholder); @@ -47,8 +47,8 @@ // m_oldParent = NULL; // setMainWidget(m_page); // -// connect(this, SIGNAL(okClicked()), SLOT(slotPressedOk())); -// connect(this, SIGNAL(cancelClicked()), SLOT(slotPressedCancel())); +// connect(this, TQT_SIGNAL(okClicked()), TQT_SLOT(slotPressedOk())); +// connect(this, TQT_SIGNAL(cancelClicked()), TQT_SLOT(slotPressedCancel())); //} // //CRefSelectDialog::~CRefSelectDialog() { @@ -67,7 +67,7 @@ // // // we temporary borrow chooser widget from the MDI window // m_placeholder->setMinimumSize(chooser->size()); -// chooser->reparent(m_placeholder, QPoint(0,0), true); +// chooser->reparent(m_placeholder, TQPoint(0,0), true); // } //} // diff --git a/bibletime/frontend/keychooser/crefselectdialog.h b/bibletime/frontend/keychooser/crefselectdialog.h index 3d78ffe..fc2430a 100644 --- a/bibletime/frontend/keychooser/crefselectdialog.h +++ b/bibletime/frontend/keychooser/crefselectdialog.h @@ -12,9 +12,9 @@ #ifndef CREFSELECTDIALOG_H #define CREFSELECTDIALOG_H //Qt includes -#include <qwidget.h> -#include <qstring.h> -class QLineEdit; +#include <tqwidget.h> +#include <tqstring.h> +class TQLineEdit; //KDE includes #include <kdialog.h> @@ -27,7 +27,7 @@ class QLineEdit; //class CRefSelectDialog : public KDialogBase { // Q_OBJECT // public: -// CRefSelectDialog(QWidget *parent); +// CRefSelectDialog(TQWidget *parent); // virtual ~CRefSelectDialog(); // // void setChooser(CKeyChooser* const chooser); @@ -41,12 +41,12 @@ class QLineEdit; // void restoreParent(); // // private: -// QWidget* m_page; -// QWidget* m_placeholder; -// QWidget* m_oldParent; +// TQWidget* m_page; +// TQWidget* m_placeholder; +// TQWidget* m_oldParent; // CKeyChooser* m_chooser; -// QLineEdit* m_lineedit; -// QPoint m_oldPos; +// TQLineEdit* m_lineedit; +// TQPoint m_oldPos; //}; #endif diff --git a/bibletime/frontend/keychooser/cscrollbutton.cpp b/bibletime/frontend/keychooser/cscrollbutton.cpp index c9952cc..65f7a04 100644 --- a/bibletime/frontend/keychooser/cscrollbutton.cpp +++ b/bibletime/frontend/keychooser/cscrollbutton.cpp @@ -17,17 +17,17 @@ #include <math.h> //Qt includes -#include <qevent.h> -#include <qapplication.h> -#include <qcursor.h> +#include <tqevent.h> +#include <tqapplication.h> +#include <tqcursor.h> -CScrollButton::CScrollButton(QWidget *parent, const char *name ) : QToolButton(parent,name) { - setFocusPolicy(QWidget::WheelFocus); +CScrollButton::CScrollButton(TQWidget *parent, const char *name ) : TQToolButton(parent,name) { + setFocusPolicy(TQWidget::WheelFocus); setCursor( splitVCursor ); m_isLocked = false; - connect(this, SIGNAL(pressed() ), SLOT(was_pressed() )); - connect(this, SIGNAL(released()), SLOT(was_released())); + connect(this, TQT_SIGNAL(pressed() ), TQT_SLOT(was_pressed() )); + connect(this, TQT_SIGNAL(released()), TQT_SLOT(was_released())); } const bool CScrollButton::isLocked( ) const { @@ -35,7 +35,7 @@ const bool CScrollButton::isLocked( ) const { } void CScrollButton::was_pressed( ) { - QApplication::setOverrideCursor( BlankCursor ); + TQApplication::setOverrideCursor( BlankCursor ); m_isLocked = true; lock_Point = get_lock_Point(); @@ -44,19 +44,19 @@ void CScrollButton::was_pressed( ) { } void CScrollButton::was_released( ) { - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); m_isLocked = false; emit unlock(); } -const QPoint CScrollButton::get_lock_Point() const { - return mapToGlobal( QPoint( width()/2, height()/2 ) ); +const TQPoint CScrollButton::get_lock_Point() const { + return mapToGlobal( TQPoint( width()/2, height()/2 ) ); } -void CScrollButton::mouseMoveEvent( QMouseEvent* e ) { +void CScrollButton::mouseMoveEvent( TQMouseEvent* e ) { if (m_isLocked) { - int vchange = (QCursor::pos().y() - lock_Point.y()); + int vchange = (TQCursor::pos().y() - lock_Point.y()); if (abs(vchange) < 10) { vchange = (int)((vchange>0 ? 1 : -1) * pow(abs(vchange), 0.3)); @@ -75,17 +75,17 @@ void CScrollButton::mouseMoveEvent( QMouseEvent* e ) { emit change_requested( vchange ); } - QCursor::setPos( lock_Point ); + TQCursor::setPos( lock_Point ); } else { - QToolButton::mouseMoveEvent(e); + TQToolButton::mouseMoveEvent(e); } } /** If the wheel of the mouse is used while the mouse stays over our scrollbutton the content is scrolled like the mouse was pressed and moved. */ -void CScrollButton::wheelEvent( QWheelEvent* e ) { +void CScrollButton::wheelEvent( TQWheelEvent* e ) { /** * The problem is, that wheel events do everytime have the delta value 120 */ diff --git a/bibletime/frontend/keychooser/cscrollbutton.h b/bibletime/frontend/keychooser/cscrollbutton.h index bd6e900..daf02fc 100644 --- a/bibletime/frontend/keychooser/cscrollbutton.h +++ b/bibletime/frontend/keychooser/cscrollbutton.h @@ -12,21 +12,21 @@ #ifndef CSRCOLLBUTTON_H #define CSRCOLLBUTTON_H -#include <qwidget.h> -#include <qtoolbutton.h> +#include <tqwidget.h> +#include <tqtoolbutton.h> -class QMouseEvent; +class TQMouseEvent; /** This Class implements the direct chooser button used in the KeyChooser Widget * @author The BibleTime team */ -class CScrollButton : public QToolButton { +class CScrollButton : public TQToolButton { Q_OBJECT public: /** * The constructor */ - CScrollButton(QWidget *parent=0, const char *name=0); + CScrollButton(TQWidget *parent=0, const char *name=0); const bool isLocked() const; signals: @@ -60,17 +60,17 @@ protected: * Reimplementation from @ref QWidget#mouseMoveEvent - processes * the mouse move events */ - virtual void mouseMoveEvent( QMouseEvent* e ); + virtual void mouseMoveEvent( TQMouseEvent* e ); /** * used to find the lock point - the middle of the button * @return the lock point */ - const QPoint get_lock_Point() const; + const TQPoint get_lock_Point() const; /** * If the wheel of the mouse is used while the mouse stays over our scrollbutton the content is * scrolled like the mouse was pressed and moved. */ - virtual void wheelEvent( QWheelEvent* e ); + virtual void wheelEvent( TQWheelEvent* e ); private: /** @@ -80,7 +80,7 @@ private: /** * stores the lock point */ - QPoint lock_Point; + TQPoint lock_Point; }; #endif diff --git a/bibletime/frontend/keychooser/cscrollerwidgetset.cpp b/bibletime/frontend/keychooser/cscrollerwidgetset.cpp index dd4201b..bbb5b48 100644 --- a/bibletime/frontend/keychooser/cscrollerwidgetset.cpp +++ b/bibletime/frontend/keychooser/cscrollerwidgetset.cpp @@ -16,59 +16,59 @@ #include "frontend/cbtconfig.h" //Qt includes -#include <qlineedit.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qlistbox.h> -#include <qtoolbutton.h> -#include <qevent.h> -#include <qlayout.h> -#include <qpainter.h> -#include <qstyle.h> -#include <qpixmap.h> -#include <qapplication.h> -#include <qtooltip.h> -#include <qrect.h> -#include <qlayout.h> +#include <tqlineedit.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqlistbox.h> +#include <tqtoolbutton.h> +#include <tqevent.h> +#include <tqlayout.h> +#include <tqpainter.h> +#include <tqstyle.h> +#include <tqpixmap.h> +#include <tqapplication.h> +#include <tqtooltip.h> +#include <tqrect.h> +#include <tqlayout.h> const unsigned int WIDTH = 16; const unsigned int ARROW_HEIGHT = 12; const unsigned int MOVER_HEIGHT = 6; -CScrollerWidgetSet::CScrollerWidgetSet(QWidget *parent, const char *name) : QWidget(parent,name) { - m_layout = new QVBoxLayout(this); +CScrollerWidgetSet::CScrollerWidgetSet(TQWidget *parent, const char *name) : TQWidget(parent,name) { + m_layout = new TQVBoxLayout(this); m_layout->setAlignment(Qt::AlignHCenter | Qt::AlignCenter); //setAlignment(Qt::AlignHCenter | Qt::AlignCenter); - btn_up = new QToolButton( UpArrow, this, "btn_up" ); + btn_up = new TQToolButton( UpArrow, this, "btn_up" ); btn_up->setFixedSize(WIDTH, ARROW_HEIGHT); - btn_up->setFocusPolicy(QWidget::NoFocus); + btn_up->setFocusPolicy(TQWidget::NoFocus); btn_fx = new CScrollButton( this, "btn_fx" ); btn_fx->setFixedSize(WIDTH, MOVER_HEIGHT); - btn_fx->setFocusPolicy(QWidget::NoFocus); + btn_fx->setFocusPolicy(TQWidget::NoFocus); - btn_down = new QToolButton( DownArrow, this, "btn_down" ); + btn_down = new TQToolButton( DownArrow, this, "btn_down" ); btn_down->setFixedSize(WIDTH, ARROW_HEIGHT); - btn_down->setFocusPolicy(QWidget::NoFocus); + btn_down->setFocusPolicy(TQWidget::NoFocus); m_layout->addWidget( btn_up,0 ); m_layout->addWidget( btn_fx,0 ); m_layout->addWidget( btn_down,0 ); setMinimumWidth(WIDTH+4); // Kludge to add some spacing but seems to work. - connect(btn_fx, SIGNAL(lock()), SLOT(slotLock())); - connect(btn_fx, SIGNAL(unlock()), SLOT(slotUnlock())); - connect(btn_fx, SIGNAL(change_requested(int)), SLOT(slotScroller(int))); - connect(btn_up, SIGNAL(clicked()), SLOT(slotUpClick())); - connect(btn_down, SIGNAL(clicked()), SLOT(slotDownClick())); + connect(btn_fx, TQT_SIGNAL(lock()), TQT_SLOT(slotLock())); + connect(btn_fx, TQT_SIGNAL(unlock()), TQT_SLOT(slotUnlock())); + connect(btn_fx, TQT_SIGNAL(change_requested(int)), TQT_SLOT(slotScroller(int))); + connect(btn_up, TQT_SIGNAL(clicked()), TQT_SLOT(slotUpClick())); + connect(btn_down, TQT_SIGNAL(clicked()), TQT_SLOT(slotDownClick())); } /** Sets the tooltips for the given entries using the parameters as text. */ -void CScrollerWidgetSet::setToolTips( const QString nextEntryTip, const QString scrollButtonTip, const QString previousEntryTip) { - QToolTip::add (btn_fx, scrollButtonTip); - QToolTip::add (btn_down, nextEntryTip); - QToolTip::add (btn_up, previousEntryTip); +void CScrollerWidgetSet::setToolTips( const TQString nextEntryTip, const TQString scrollButtonTip, const TQString previousEntryTip) { + TQToolTip::add (btn_fx, scrollButtonTip); + TQToolTip::add (btn_down, nextEntryTip); + TQToolTip::add (btn_up, previousEntryTip); } void CScrollerWidgetSet::slotLock() { emit scroller_pressed(); } diff --git a/bibletime/frontend/keychooser/cscrollerwidgetset.h b/bibletime/frontend/keychooser/cscrollerwidgetset.h index dd3e6d8..5435e5f 100644 --- a/bibletime/frontend/keychooser/cscrollerwidgetset.h +++ b/bibletime/frontend/keychooser/cscrollerwidgetset.h @@ -12,32 +12,32 @@ #ifndef CSCROLLERWIDGETSET_H #define CSCROLLERWIDGETSET_H -#include <qwidget.h> -#include <qmap.h> -#include <qstringlist.h> -#include <qlayout.h> -#include <qlayout.h> +#include <tqwidget.h> +#include <tqmap.h> +#include <tqstringlist.h> +#include <tqlayout.h> +#include <tqlayout.h> #include <kcombobox.h> #include "cscrollbutton.h" /** * This class implements the Scroller Widget-set, which - * consists of two normal ref @QToolButton and a enhanced @ref CScrollButton + * consists of two normal ref @TQToolButton and a enhanced @ref CScrollButton * * @author The BibleTime team */ -class CScrollerWidgetSet : public QWidget { +class CScrollerWidgetSet : public TQWidget { Q_OBJECT public: /** * the constructor */ - CScrollerWidgetSet(QWidget *parent=0, const char *name=0); + CScrollerWidgetSet(TQWidget *parent=0, const char *name=0); /** * Sets the tooltips for the given entries using the parameters as text. */ - void setToolTips( const QString nextEntry, const QString scrollButton, const QString previousEntry); + void setToolTips( const TQString nextEntry, const TQString scrollButton, const TQString previousEntry); signals: /** @@ -53,8 +53,8 @@ signals: void scroller_released(); protected: - QToolButton* btn_up; - QToolButton* btn_down; + TQToolButton* btn_up; + TQToolButton* btn_down; CScrollButton* btn_fx; protected slots: @@ -65,7 +65,7 @@ protected slots: void slotScroller(int); private: - QVBoxLayout *m_layout; + TQVBoxLayout *m_layout; }; diff --git a/bibletime/frontend/kstartuplogo.cpp b/bibletime/frontend/kstartuplogo.cpp index 62c01e9..5bc7089 100644 --- a/bibletime/frontend/kstartuplogo.cpp +++ b/bibletime/frontend/kstartuplogo.cpp @@ -13,10 +13,10 @@ #include "kstartuplogo.h" //Qt includes -#include <qapplication.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpixmap.h> +#include <tqapplication.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpixmap.h> //KDE includes #include <kapplication.h> @@ -49,16 +49,16 @@ void KStartupLogo::deleteSplash() { } -void KStartupLogo::setStatusMessage(const QString& message) { +void KStartupLogo::setStatusMessage(const TQString& message) { if (startupLogo) { startupLogo->setText(message); } } KStartupLogo::KStartupLogo() -: QWidget(0, "startuplogo", /*WStyle_Customize | WStyle_NoBorder*/ WStyle_NoBorder|WStyle_StaysOnTop|WX11BypassWM ) { +: TQWidget(0, "startuplogo", /*WStyle_Customize | WStyle_NoBorder*/ WStyle_NoBorder|WStyle_StaysOnTop|WX11BypassWM ) { - QPixmap pm; + TQPixmap pm; if ( !pm.load(locate("BT_pic","startuplogo.png")) ) { qWarning("Can't load startuplogo! Check your installation."); } @@ -66,22 +66,22 @@ KStartupLogo::KStartupLogo() setBackgroundPixmap(pm); //Please not change the margin - textLabel = new QLabel(this); + textLabel = new TQLabel(this); textLabel->setGeometry(0,pm.height(),pm.width(),textLabel->sizeHint().height()+10); - textLabel->setBackgroundColor( QColor("#0d6de9") ); - textLabel->setFrameStyle(QFrame::Panel | QFrame::Plain); + textLabel->setBackgroundColor( TQColor("#0d6de9") ); + textLabel->setFrameStyle(TQFrame::Panel | TQFrame::Plain); textLabel->setLineWidth(1); textLabel->setScaledContents( true ); - QFont f; + TQFont f; f.setBold( true ); textLabel->setFont( f ); - QPalette p = palette(); - p.setColor( QPalette::Inactive, QColorGroup::Text, Qt::white ); - p.setColor( QPalette::Inactive, QColorGroup::Foreground, Qt::white ); - p.setColor( QPalette::Normal, QColorGroup::Text, Qt::white ); - p.setColor( QPalette::Normal, QColorGroup::Foreground, Qt::white ); + TQPalette p = palette(); + p.setColor( TQPalette::Inactive, TQColorGroup::Text, Qt::white ); + p.setColor( TQPalette::Inactive, TQColorGroup::Foreground, Qt::white ); + p.setColor( TQPalette::Normal, TQColorGroup::Text, Qt::white ); + p.setColor( TQPalette::Normal, TQColorGroup::Foreground, Qt::white ); setPalette( p ); setGeometry ( @@ -92,9 +92,9 @@ KStartupLogo::KStartupLogo() ); } -void KStartupLogo::setText(const QString text) { +void KStartupLogo::setText(const TQString text) { //Please not make the text bold & let the first character be blank - textLabel->setText( QString::fromLatin1(" %1").arg(text) ); + textLabel->setText( TQString::fromLatin1(" %1").arg(text) ); KApplication::kApplication()->processEvents(); } diff --git a/bibletime/frontend/kstartuplogo.h b/bibletime/frontend/kstartuplogo.h index d1a7af0..e3e0814 100644 --- a/bibletime/frontend/kstartuplogo.h +++ b/bibletime/frontend/kstartuplogo.h @@ -12,17 +12,17 @@ #ifndef KSTARTUPLOGO_H #define KSTARTUPLOGO_H -#include <qwidget.h> +#include <tqwidget.h> //class forward declarations -class QLabel; +class TQLabel; /** * This class provides a startuplogo. * * @author The team of BibleTime */ -class KStartupLogo : public QWidget { +class KStartupLogo : public TQWidget { public: /** * Create the splash screen and show it on the screen. @@ -44,7 +44,7 @@ public: /** * Sets the text status message in the splash screen. */ - static void setStatusMessage(const QString& message); + static void setStatusMessage(const TQString& message); /** * Makes the splashscreen the toplevel window. */ @@ -57,8 +57,8 @@ public: private: KStartupLogo(); - void setText(const QString text); - QLabel* textLabel; + void setText(const TQString text); + TQLabel* textLabel; static KStartupLogo* startupLogo; }; diff --git a/bibletime/frontend/mainindex/cindexitem.cpp b/bibletime/frontend/mainindex/cindexitem.cpp index 4896e1b..4e32881 100644 --- a/bibletime/frontend/mainindex/cindexitem.cpp +++ b/bibletime/frontend/mainindex/cindexitem.cpp @@ -34,11 +34,11 @@ #include <string.h> //Qt includes -#include <qdragobject.h> -#include <qstringlist.h> -#include <qfile.h> -#include <qstring.h> -#include <qtextstream.h> +#include <tqdragobject.h> +#include <tqstringlist.h> +#include <tqfile.h> +#include <tqstring.h> +#include <tqtextstream.h> //KDE includes #include <kconfig.h> @@ -64,13 +64,13 @@ m_sortingEnabled(true) {} CItemBase::~CItemBase() {} -const QString CItemBase::toolTip() { - return QString::null; +const TQString CItemBase::toolTip() { + return TQString::null; } /** Returns the used main index. */ CMainIndex* CItemBase::listView() const { - return dynamic_cast<CMainIndex*>( QListViewItem::listView() ); + return dynamic_cast<CMainIndex*>( TQListViewItem::listView() ); } void CItemBase::init() { @@ -102,7 +102,7 @@ const bool CItemBase::isMovable() { return false; } -const bool CItemBase::allowAutoOpen( const QMimeSource* ) const { +const bool CItemBase::allowAutoOpen( const TQMimeSource* ) const { return false; }; @@ -161,7 +161,7 @@ void CModuleItem::init() { /** Reimplementation to handle text drops on a module. In this case open the searchdialog. In the case of a referebnce open the module at the given position. */ -bool CModuleItem::acceptDrop( const QMimeSource* src ) const { +bool CModuleItem::acceptDrop( const TQMimeSource* src ) const { if (CDragDropMgr::canDecode(src)) { if (CDragDropMgr::dndType(src) == CDragDropMgr::Item::Bookmark) { CDragDropMgr::Item item = CDragDropMgr::decode(src).first(); @@ -185,7 +185,7 @@ bool CModuleItem::acceptDrop( const QMimeSource* src ) const { } /** No descriptions */ -void CModuleItem::dropped( QDropEvent* e, QListViewItem* /*after*/) { +void CModuleItem::dropped( TQDropEvent* e, TQListViewItem* /*after*/) { /* Something was dropped on a module item * * 1. If the drop type is plain text open the searchdialog for this text and start the search @@ -224,7 +224,7 @@ void CModuleItem::dropped( QDropEvent* e, QListViewItem* /*after*/) { /** Reimplementation. */ -const QString CModuleItem::toolTip() { +const TQString CModuleItem::toolTip() { return CToolClass::moduleToolTip(module()); } @@ -252,10 +252,10 @@ const bool CModuleItem::enableAction( const MenuAction action ) { /* ---------- new class: CBookmarkItem ------------*/ /* ----------------------------------------------*/ -CBookmarkItem::CBookmarkItem(CFolderBase* parentItem, CSwordModuleInfo* module, const QString& key, const QString& description) +CBookmarkItem::CBookmarkItem(CFolderBase* parentItem, CSwordModuleInfo* module, const TQString& key, const TQString& description) : CItemBase(parentItem), m_description(description), -m_moduleName(module ? module->name() : QString::null) { +m_moduleName(module ? module->name() : TQString::null) { if ((module && (module->type() == CSwordModuleInfo::Bible) || (module->type() == CSwordModuleInfo::Commentary)) ) { CSwordVerseKey vk(0); vk = key; @@ -266,14 +266,14 @@ m_moduleName(module ? module->name() : QString::null) { m_key = key; }; - m_startupXML = QDomElement(); //empty XML code + m_startupXML = TQDomElement(); //empty XML code } -CBookmarkItem::CBookmarkItem(CFolderBase* parentItem, QDomElement& xml ) +CBookmarkItem::CBookmarkItem(CFolderBase* parentItem, TQDomElement& xml ) : CItemBase(parentItem), -m_key(QString::null), -m_description(QString::null), -m_moduleName(QString::null) { +m_key(TQString::null), +m_description(TQString::null), +m_moduleName(TQString::null) { m_startupXML = xml; } @@ -284,7 +284,7 @@ void CBookmarkItem::update() { setMultiLinesEnabled(true); setPixmap(0,SmallIcon(CResMgr::mainIndex::bookmark::icon,16)); - const QString title = QString::fromLatin1("%1 (%2)") + const TQString title = TQString::fromLatin1("%1 (%2)") .arg(key()) .arg(module() ? module()->name() : i18n("unknown")); setText(0, title); @@ -304,9 +304,9 @@ void CBookmarkItem::init() { } /** Reimplementation. */ -const QString CBookmarkItem::toolTip() { +const TQString CBookmarkItem::toolTip() { if (!module()) { - return QString::null; + return TQString::null; } CSwordBackend::FilterOptions filterOptions = CBTConfig::getFilterOptionDefaults(); @@ -314,7 +314,7 @@ const QString CBookmarkItem::toolTip() { filterOptions.scriptureReferences = false; CPointers::backend()->setFilterOptions(filterOptions); - QString ret; + TQString ret; util::scoped_ptr<CSwordKey> k( CSwordKey::createInstance(module()) ); k->key(this->key()); @@ -325,7 +325,7 @@ const QString CBookmarkItem::toolTip() { Q_ASSERT(k.get()); if (fontPair.first) { //use a special font qWarning("using a font, %s", fontPair.second.family().latin1()); - ret = QString::fromLatin1("<b>%1 (%2)</b><br/><small>%3</small><hr><font face=\"%4\" size=\"4\">%5</font>") + ret = TQString::fromLatin1("<b>%1 (%2)</b><br/><small>%3</small><hr><font face=\"%4\" size=\"4\">%5</font>") .arg(key()) .arg(module()->name()) .arg(description()) @@ -333,7 +333,7 @@ const QString CBookmarkItem::toolTip() { .arg(k->renderedText()); } else { - ret = QString::fromLatin1("<b>%1 (%2)</b><br/><small>%3</small><hr>%4") + ret = TQString::fromLatin1("<b>%1 (%2)</b><br/><small>%3</small><hr>%4") .arg(key()) .arg(module()->name()) .arg(description()) @@ -351,13 +351,13 @@ CSwordModuleInfo* const CBookmarkItem::module() { } /** Returns the used key. */ -const QString CBookmarkItem::key() { - const QString englishKeyName = englishKey(); +const TQString CBookmarkItem::key() { + const TQString englishKeyName = englishKey(); if (!module()) { return englishKeyName; } - QString returnKeyName = englishKeyName; + TQString returnKeyName = englishKeyName; if ((module()->type() == CSwordModuleInfo::Bible) || (module()->type() == CSwordModuleInfo::Commentary)) { CSwordVerseKey vk(0); vk = englishKeyName; @@ -370,7 +370,7 @@ const QString CBookmarkItem::key() { } /** Returns the used description. */ -const QString& CBookmarkItem::description() { +const TQString& CBookmarkItem::description() { return m_description; } @@ -390,7 +390,7 @@ const bool CBookmarkItem::enableAction(const MenuAction action) { /** Changes this bookmark. */ void CBookmarkItem::rename() { bool ok = false; - const QString newDescription = CInputDialog::getText(i18n("Change description ..."), i18n("Enter a new description for the chosen bookmark."), description(), &ok, listView(), true); + const TQString newDescription = CInputDialog::getText(i18n("Change description ..."), i18n("Enter a new description for the chosen bookmark."), description(), &ok, listView(), true); if (ok) { m_description = newDescription; @@ -399,18 +399,18 @@ void CBookmarkItem::rename() { } /** Reimplementation of CItemBase::saveToXML. */ -QDomElement CBookmarkItem::saveToXML( QDomDocument& doc ) { - QDomElement elem = doc.createElement("Bookmark"); +TQDomElement CBookmarkItem::saveToXML( TQDomDocument& doc ) { + TQDomElement elem = doc.createElement("Bookmark"); elem.setAttribute("key", englishKey()); elem.setAttribute("description", description()); elem.setAttribute("modulename", m_moduleName); - elem.setAttribute("moduledescription", module() ? module()->config(CSwordModuleInfo::Description) : QString::null); + elem.setAttribute("moduledescription", module() ? module()->config(CSwordModuleInfo::Description) : TQString::null); return elem; } -void CBookmarkItem::loadFromXML( QDomElement& element ) { +void CBookmarkItem::loadFromXML( TQDomElement& element ) { if (element.isNull()) return; @@ -430,12 +430,12 @@ void CBookmarkItem::loadFromXML( QDomElement& element ) { } /** Returns the english key. */ -const QString& CBookmarkItem::englishKey() const { +const TQString& CBookmarkItem::englishKey() const { return m_key; } /** Reimplementation. Returns false everytime because a bookmarks has not possible drops. */ -bool CBookmarkItem::acceptDrop(const QMimeSource* /*src*/) const { +bool CBookmarkItem::acceptDrop(const TQMimeSource* /*src*/) const { return false; } @@ -447,7 +447,7 @@ CFolderBase::CFolderBase(CMainIndex* mainIndex, const Type type) : CItemBase(mai CFolderBase::CFolderBase(CFolderBase* parentItem, const Type type) : CItemBase(parentItem, type) {} -CFolderBase::CFolderBase(CFolderBase* parentFolder, const QString& caption) : CItemBase(parentFolder) { +CFolderBase::CFolderBase(CFolderBase* parentFolder, const TQString& caption) : CItemBase(parentFolder) { setText(0, caption); } @@ -495,21 +495,21 @@ void CFolderBase::newSubFolder() { } /** Reimplementation. Returns true if the drop is accepted. */ -const bool CFolderBase::allowAutoOpen( const QMimeSource* ) const { +const bool CFolderBase::allowAutoOpen( const TQMimeSource* ) const { return true; } /** Reimplementation. Returns false because folders have no use for drops (except for the bookmark folders) */ -bool CFolderBase::acceptDrop(const QMimeSource*) const { +bool CFolderBase::acceptDrop(const TQMimeSource*) const { return false; } -QPtrList<QListViewItem> CFolderBase::getChildList() { - QPtrList<QListViewItem> childs; +TQPtrList<TQListViewItem> CFolderBase::getChildList() { + TQPtrList<TQListViewItem> childs; if (!childCount()) //no childs available return childs; - QListViewItem* i = firstChild(); + TQListViewItem* i = firstChild(); while (i && (i->parent() == this)) { CItemBase* item = dynamic_cast<CItemBase*>(i); if (item) { //we found a valid item @@ -517,8 +517,8 @@ QPtrList<QListViewItem> CFolderBase::getChildList() { CFolderBase* folder = dynamic_cast<CFolderBase*>(i); if (folder) { - QPtrList<QListViewItem> subChilds = folder->getChildList(); - for (QListViewItem* ci = subChilds.first(); ci; ci = subChilds.next()) { + TQPtrList<TQListViewItem> subChilds = folder->getChildList(); + for (TQListViewItem* ci = subChilds.first(); ci; ci = subChilds.next()) { childs.append(ci); } } @@ -538,17 +538,17 @@ QPtrList<QListViewItem> CFolderBase::getChildList() { /****************************************/ -CTreeFolder::CTreeFolder(CMainIndex* mainIndex, const Type type, const QString& language) : CFolderBase(mainIndex, type) { +CTreeFolder::CTreeFolder(CMainIndex* mainIndex, const Type type, const TQString& language) : CFolderBase(mainIndex, type) { m_language = language; } -CTreeFolder::CTreeFolder(CFolderBase* item, const Type type, const QString& language) : CFolderBase(item, type) { +CTreeFolder::CTreeFolder(CFolderBase* item, const Type type, const TQString& language) : CFolderBase(item, type) { m_language = language; } CTreeFolder::~CTreeFolder() {} -void CTreeFolder::addGroup(const Type type, const QString language) { +void CTreeFolder::addGroup(const Type type, const TQString language) { CTreeFolder* i = 0; if (type == BookmarkFolder) { i = new CBookmarkFolder(this); @@ -569,7 +569,7 @@ void CTreeFolder::addModule(CSwordModuleInfo* const module) { i->init(); } -void CTreeFolder::addBookmark(CSwordModuleInfo* module, const QString& key, const QString& description) { +void CTreeFolder::addBookmark(CSwordModuleInfo* module, const TQString& key, const TQString& description) { CBookmarkItem* i = new CBookmarkItem(this, module, key, description); i->init(); } @@ -652,19 +652,19 @@ void CTreeFolder::initTree() { continue; } - if (language() == QString::fromLatin1("*") || (language() != QString::fromLatin1("*") && QString::fromLatin1((*it)->module()->Lang()) == language()) )//right type and language! + if (language() == TQString::fromLatin1("*") || (language() != TQString::fromLatin1("*") && TQString::fromLatin1((*it)->module()->Lang()) == language()) )//right type and language! usedModules.append(*it); } } //we have now all modules we want to have - if (language() == QString::fromLatin1("*")) { //create subfolders for each language - QStringList usedLangs; + if (language() == TQString::fromLatin1("*")) { //create subfolders for each language + TQStringList usedLangs; // for (CSwordModuleInfo* m = usedModules.first(); m; m = usedModules.next()) { /*ListCSwordModuleInfo::iterator*/ end_it = usedModules.end(); for (ListCSwordModuleInfo::iterator it(usedModules.begin()); it != end_it; ++it) { - QString lang = QString::fromLatin1((*it)->module()->Lang()); + TQString lang = TQString::fromLatin1((*it)->module()->Lang()); // if (lang.isEmpty()) // lang = "); if (!usedLangs.contains(lang)) { @@ -673,7 +673,7 @@ void CTreeFolder::initTree() { } //ToDo:: Optimize the loop with const itrs - QStringList::iterator lang_it; + TQStringList::iterator lang_it; for (lang_it = usedLangs.begin(); lang_it != usedLangs.end(); ++lang_it) { addGroup(/**lang_it,*/ type(), *lang_it); } @@ -689,7 +689,7 @@ void CTreeFolder::initTree() { sortChildItems(0,true); } -const QString& CTreeFolder::language() const { +const TQString& CTreeFolder::language() const { return m_language; }; @@ -701,38 +701,38 @@ namespace Bookmarks { /* --------------------------------------------------------------------------*/ /* ---------- new class: CBookmarkFolder::OldBookmarkImport -----------------*/ /* --------------------------------------------------------------------------*/ - const QString OldBookmarkImport::oldBookmarksXML( const QString& configFileName ) { - QString fileName = (configFileName.isEmpty()) ? "bt-groupmanager" : configFileName; + const TQString OldBookmarkImport::oldBookmarksXML( const TQString& configFileName ) { + TQString fileName = (configFileName.isEmpty()) ? "bt-groupmanager" : configFileName; KConfig* config = new KSimpleConfig( fileName ); KConfigGroupSaver groupSaver(config, configFileName.isEmpty() ? "Groupmanager" : "Bookmarks"); - QDomDocument doc("DOC"); + TQDomDocument doc("DOC"); doc.appendChild( doc.createProcessingInstruction( "xml", "version=\"1.0\" encoding=\"UTF-8\"" ) ); - QDomElement content = doc.createElement("SwordBookmarks"); + TQDomElement content = doc.createElement("SwordBookmarks"); content.setAttribute("syntaxVersion", CURRENT_SYNTAX_VERSION); doc.appendChild(content); //first create the bookmark groups in the XML document, then add the bookmarks to each parent - QMap<int, QDomElement> parentMap; //maps parent ids to dom elements + TQMap<int, TQDomElement> parentMap; //maps parent ids to dom elements - QStringList groupList = config->readListEntry("Groups"); - QValueList<int> parentList = config->readIntListEntry("Group parents"); + TQStringList groupList = config->readListEntry("Groups"); + TQValueList<int> parentList = config->readIntListEntry("Group parents"); - QStringList::Iterator it_groups = groupList.begin(); - QValueList<int>::Iterator it_parents = parentList.begin(); + TQStringList::Iterator it_groups = groupList.begin(); + TQValueList<int>::Iterator it_parents = parentList.begin(); int parentIDCounter = 0; while ( (it_groups != groupList.end()) && (it_parents != parentList.end()) ) { - QDomElement parentElement = (*it_parents == -1) ? content : parentMap[*it_parents]; + TQDomElement parentElement = (*it_parents == -1) ? content : parentMap[*it_parents]; if (parentElement.isNull()) { qWarning("EMPTY PARENT FOUND!"); parentElement = content; }; - QDomElement elem = doc.createElement("Folder"); + TQDomElement elem = doc.createElement("Folder"); elem.setAttribute("caption", (*it_groups)); parentMap.insert(parentIDCounter, elem); @@ -746,32 +746,32 @@ namespace Bookmarks { //groups are now read in, create now the bookmarks parentList = config->readIntListEntry("Bookmark parents"); - QStringList bookmarkList = config->readListEntry("Bookmarks"); - QStringList bookmarkModulesList = config->readListEntry("Bookmark modules"); - QStringList bookmarkDescriptionsList = config->readListEntry("Bookmark descriptions"); + TQStringList bookmarkList = config->readListEntry("Bookmarks"); + TQStringList bookmarkModulesList = config->readListEntry("Bookmark modules"); + TQStringList bookmarkDescriptionsList = config->readListEntry("Bookmark descriptions"); it_parents = parentList.begin(); - QStringList::Iterator it_bookmarks = bookmarkList.begin(); - QStringList::Iterator it_modules = bookmarkModulesList.begin(); - QStringList::Iterator it_descriptions = bookmarkDescriptionsList.begin(); + TQStringList::Iterator it_bookmarks = bookmarkList.begin(); + TQStringList::Iterator it_modules = bookmarkModulesList.begin(); + TQStringList::Iterator it_descriptions = bookmarkDescriptionsList.begin(); while ( it_bookmarks != bookmarkList.end() && it_parents != parentList.end() && it_modules != bookmarkModulesList.end() ) { - QDomElement parentElement = ((*it_parents) == -1) ? content : parentMap[(*it_parents)]; + TQDomElement parentElement = ((*it_parents) == -1) ? content : parentMap[(*it_parents)]; if (parentElement.isNull()) { qWarning("EMPTY PARENT FOUND!"); parentElement = content; }; - QDomElement elem = doc.createElement("Bookmark"); + TQDomElement elem = doc.createElement("Bookmark"); elem.setAttribute("key", *it_bookmarks); elem.setAttribute("description", *it_descriptions); elem.setAttribute("modulename", *it_modules); CSwordModuleInfo* m = CPointers::backend()->findModuleByName( *it_modules ); - elem.setAttribute("moduledescription", m ? m->config(CSwordModuleInfo::Description) : QString::null); + elem.setAttribute("moduledescription", m ? m->config(CSwordModuleInfo::Description) : TQString::null); parentElement.appendChild( elem ); @@ -803,15 +803,15 @@ OldBookmarksFolder::OldBookmarksFolder(CTreeFolder* folder) : CBookmarkFolder(fo } - QDomElement OldBookmarksFolder::saveToXML( QDomDocument& doc ) { - QDomElement elem = doc.createElement("Folder"); + TQDomElement OldBookmarksFolder::saveToXML( TQDomDocument& doc ) { + TQDomElement elem = doc.createElement("Folder"); elem.setAttribute("caption", text(0)); // Append the XML nodes of all child items CItemBase* i = dynamic_cast<CItemBase*>(firstChild()); while( i ) { if (i->parent() == this) { - QDomElement newElem = i->saveToXML( doc ); + TQDomElement newElem = i->saveToXML( doc ); if (!newElem.isNull()) { elem.appendChild( newElem ); //append to this folder } @@ -826,19 +826,19 @@ OldBookmarksFolder::OldBookmarksFolder(CTreeFolder* folder) : CBookmarkFolder(fo return elem; } - void OldBookmarksFolder::loadFromXML( QDomElement& /*element*/ ) { + void OldBookmarksFolder::loadFromXML( TQDomElement& /*element*/ ) { //this function is empty because the folder imports the old 1.2 bookmarks from the bt-groupmanager config file } // New class SubFolder -SubFolder::SubFolder(CFolderBase* parentItem, const QString& caption) : CBookmarkFolder(parentItem, BookmarkFolder) { - m_startupXML = QDomElement(); +SubFolder::SubFolder(CFolderBase* parentItem, const TQString& caption) : CBookmarkFolder(parentItem, BookmarkFolder) { + m_startupXML = TQDomElement(); setText( 0, caption ); } -SubFolder::SubFolder(CFolderBase* parentItem, QDomElement& xml ) : CBookmarkFolder(parentItem, BookmarkFolder) { +SubFolder::SubFolder(CFolderBase* parentItem, TQDomElement& xml ) : CBookmarkFolder(parentItem, BookmarkFolder) { m_startupXML = xml; } @@ -865,7 +865,7 @@ SubFolder::SubFolder(CFolderBase* parentItem, QDomElement& xml ) : CBookmarkFold CPrinter::KeyTree tree; CPrinter::KeyTreeItem::Settings settings; - QPtrList<QListViewItem> items = getChildList(); + TQPtrList<TQListViewItem> items = getChildList(); //create a tree of keytreeitems using the bookmark hierarchy. for (items.first(); items.current(); items.next()) { @@ -881,19 +881,19 @@ SubFolder::SubFolder(CFolderBase* parentItem, QDomElement& xml ) : CBookmarkFold } /** Returns the XML code which represents the content of this folder. */ - QDomElement SubFolder::saveToXML( QDomDocument& doc ) { + TQDomElement SubFolder::saveToXML( TQDomDocument& doc ) { /** * Save all subitems (bookmarks and folders) to the XML file. * We get the XML code for the items by calling their own saveToXML implementations. */ - QDomElement elem = doc.createElement("Folder"); + TQDomElement elem = doc.createElement("Folder"); elem.setAttribute("caption", text(0)); //append the XML nodes of all child items CItemBase* i = dynamic_cast<CItemBase*>(firstChild()); while( i ) { if (i->parent() == this) { - QDomElement newElem = i->saveToXML( doc ); + TQDomElement newElem = i->saveToXML( doc ); if (!newElem.isNull()) { elem.appendChild( newElem ); //append to this folder } @@ -904,13 +904,13 @@ SubFolder::SubFolder(CFolderBase* parentItem, QDomElement& xml ) : CBookmarkFold } /** Loads the content of this folder from the XML code passed as argument to this function. */ - void SubFolder::loadFromXML( QDomElement& elem ) { + void SubFolder::loadFromXML( TQDomElement& elem ) { //get the caption and restore all child items! if (elem.hasAttribute("caption")) setText(0, elem.attribute("caption")); //restore all child items - QDomElement child = elem.firstChild().toElement(); + TQDomElement child = elem.firstChild().toElement(); CItemBase* oldItem = 0; while ( !child.isNull() && child.parentNode() == elem ) { CItemBase* i = 0; @@ -949,7 +949,7 @@ void CBookmarkFolder::initTree() { addGroup(OldBookmarkFolder, "*"); KStandardDirs stdDirs; - const QString path = stdDirs.saveLocation("data", "bibletime/"); + const TQString path = stdDirs.saveLocation("data", "bibletime/"); if (!path.isEmpty()) { loadBookmarks(path + "bookmarks.xml"); } @@ -971,7 +971,7 @@ const bool CBookmarkFolder::enableAction(const MenuAction action) { void CBookmarkFolder::exportBookmarks() { - QString fileName = KFileDialog::getSaveFileName(QString::null, i18n("*.btb | BibleTime bookmark files (*.btb)\n*.* | All files (*.*)"), 0, i18n("BibleTime - Export bookmarks")); + TQString fileName = KFileDialog::getSaveFileName(TQString::null, i18n("*.btb | BibleTime bookmark files (*.btb)\n*.* | All files (*.*)"), 0, i18n("BibleTime - Export bookmarks")); if (!fileName.isEmpty()) { saveBookmarks( fileName, false ); //false means we don't want to overwrite the file without asking the user }; @@ -979,7 +979,7 @@ void CBookmarkFolder::exportBookmarks() { void CBookmarkFolder::importBookmarks() { - QString fileName = KFileDialog::getOpenFileName(QString::null, i18n("*.btb | BibleTime bookmark files (*.btb)\n*.* | All files (*.*)"), 0, i18n("BibleTime - Import bookmarks")); + TQString fileName = KFileDialog::getOpenFileName(TQString::null, i18n("*.btb | BibleTime bookmark files (*.btb)\n*.* | All files (*.*)"), 0, i18n("BibleTime - Import bookmarks")); if (!fileName.isEmpty()) { //we have to decide if we should load an old bookmark file from 1.2 or earlier or the new XML format of > 1.3 if ( !loadBookmarks(fileName) ) { //if this failed try to load it as old bookmark file @@ -988,14 +988,14 @@ void CBookmarkFolder::importBookmarks() { }; } -bool CBookmarkFolder::acceptDrop(const QMimeSource * src) const { - // qWarning("bool CBookmarkFolder::acceptDrop(const QMimeSource * src): return%ii", (CDragDropMgr::canDecode(src) && (CDragDropMgr::dndType(src) == CDragDropMgr::Item::Bookmark))); +bool CBookmarkFolder::acceptDrop(const TQMimeSource * src) const { + // qWarning("bool CBookmarkFolder::acceptDrop(const TQMimeSource * src): return%ii", (CDragDropMgr::canDecode(src) && (CDragDropMgr::dndType(src) == CDragDropMgr::Item::Bookmark))); return CDragDropMgr::canDecode(src) && (CDragDropMgr::dndType(src) == CDragDropMgr::Item::Bookmark); } -void CBookmarkFolder::dropped(QDropEvent *e, QListViewItem* after) { +void CBookmarkFolder::dropped(TQDropEvent *e, TQListViewItem* after) { if (acceptDrop(e)) { CDragDropMgr::ItemList dndItems = CDragDropMgr::decode(e); CDragDropMgr::ItemList::Iterator it; @@ -1024,11 +1024,11 @@ void CBookmarkFolder::dropped(QDropEvent *e, QListViewItem* after) { } /** Saves the bookmarks in a file. */ -const bool CBookmarkFolder::saveBookmarks( const QString& filename, const bool& forceOverwrite ) { - QDomDocument doc("DOC"); +const bool CBookmarkFolder::saveBookmarks( const TQString& filename, const bool& forceOverwrite ) { + TQDomDocument doc("DOC"); doc.appendChild( doc.createProcessingInstruction( "xml", "version=\"1.0\" encoding=\"UTF-8\"" ) ); - QDomElement content = doc.createElement("SwordBookmarks"); + TQDomElement content = doc.createElement("SwordBookmarks"); content.setAttribute("syntaxVersion", CURRENT_SYNTAX_VERSION); doc.appendChild(content); @@ -1036,7 +1036,7 @@ const bool CBookmarkFolder::saveBookmarks( const QString& filename, const bool& CItemBase* i = dynamic_cast<CItemBase*>( firstChild() ); while( i ) { if (i->parent() == this) { //only one level under this folder - QDomElement newElem = i->saveToXML( doc ); // the cild creates it's own XML code + TQDomElement newElem = i->saveToXML( doc ); // the cild creates it's own XML code if (!newElem.isNull()) { content.appendChild( newElem ); //append to this folder } @@ -1044,13 +1044,13 @@ const bool CBookmarkFolder::saveBookmarks( const QString& filename, const bool& i = dynamic_cast<CItemBase*>( i->nextSibling() ); } - return CToolClass::savePlainFile(filename, doc.toString(), forceOverwrite, QTextStream::UnicodeUTF8); + return CToolClass::savePlainFile(filename, doc.toString(), forceOverwrite, TQTextStream::UnicodeUTF8); } -const bool CBookmarkFolder::loadBookmarksFromXML( const QString& xml ) { - QDomDocument doc; +const bool CBookmarkFolder::loadBookmarksFromXML( const TQString& xml ) { + TQDomDocument doc; doc.setContent(xml); - QDomElement document = doc.documentElement(); + TQDomElement document = doc.documentElement(); if( document.tagName() != "SwordBookmarks" ) { qWarning("Not a BibleTime Bookmark XML file"); return false; @@ -1058,7 +1058,7 @@ const bool CBookmarkFolder::loadBookmarksFromXML( const QString& xml ) { CItemBase* oldItem = 0; //restore all child items - QDomElement child = document.firstChild().toElement(); + TQDomElement child = document.firstChild().toElement(); while ( !child.isNull() && child.parentNode() == document) { CItemBase* i = 0; if (child.tagName() == "Folder") { @@ -1088,15 +1088,15 @@ const bool CBookmarkFolder::loadBookmarksFromXML( const QString& xml ) { } /** Loads bookmarks from a file. */ -const bool CBookmarkFolder::loadBookmarks( const QString& filename ) { - QFile file(filename); +const bool CBookmarkFolder::loadBookmarks( const TQString& filename ) { + TQFile file(filename); if (!file.exists()) return false; - QString xml; + TQString xml; if (file.open(IO_ReadOnly)) { - QTextStream t; - t.setEncoding(QTextStream::UnicodeUTF8); //set encoding before file is used for input! + TQTextStream t; + t.setEncoding(TQTextStream::UnicodeUTF8); //set encoding before file is used for input! t.setDevice(&file); xml = t.read(); file.close(); @@ -1107,13 +1107,13 @@ const bool CBookmarkFolder::loadBookmarks( const QString& filename ) { /* NEW CLASS */ -CGlossaryFolder::CGlossaryFolder(CMainIndex* mainIndex, const Type type, const QString& fromLanguage, const QString& toLanguage) +CGlossaryFolder::CGlossaryFolder(CMainIndex* mainIndex, const Type type, const TQString& fromLanguage, const TQString& toLanguage) : CTreeFolder(mainIndex, type, fromLanguage) { m_fromLanguage = fromLanguage; m_toLanguage = toLanguage; } -CGlossaryFolder::CGlossaryFolder(CFolderBase* item, const Type type, const QString& fromLanguage, const QString& toLanguage) +CGlossaryFolder::CGlossaryFolder(CFolderBase* item, const Type type, const TQString& fromLanguage, const TQString& toLanguage) : CTreeFolder(item, type, fromLanguage) { m_fromLanguage = fromLanguage; m_toLanguage = toLanguage; @@ -1138,8 +1138,8 @@ void CGlossaryFolder::initTree() { } //found a glossary //ToDo: this is ugly code - if (language() == QString::fromLatin1("*") - || (language() != QString::fromLatin1("*") + if (language() == TQString::fromLatin1("*") + || (language() != TQString::fromLatin1("*") && (*it)->config(CSwordModuleInfo::GlossaryFrom) == fromLanguage() && (*it)->config(CSwordModuleInfo::GlossaryTo) == toLanguage() ) @@ -1150,9 +1150,9 @@ void CGlossaryFolder::initTree() { } //we have now all modules we want to have - if (language() == QString::fromLatin1("*")) { //create subfolders for each language - typedef std::pair<QString, QString> LanguagePair; - typedef QValueList<LanguagePair> LanguagePairList; + if (language() == TQString::fromLatin1("*")) { //create subfolders for each language + typedef std::pair<TQString, TQString> LanguagePair; + typedef TQValueList<LanguagePair> LanguagePairList; LanguagePairList usedLangs; // for (CSwordModuleInfo* m = usedModules.first(); m; m = usedModules.next()) { @@ -1192,8 +1192,8 @@ void CGlossaryFolder::init() { const CLanguageMgr::Language* const fromLang = CPointers::languageMgr()->languageForAbbrev( m_fromLanguage ); const CLanguageMgr::Language* const toLang = CPointers::languageMgr()->languageForAbbrev( m_toLanguage ); - QString fromLangString = fromLang->translatedName(); - QString toLangString = toLang->translatedName(); + TQString fromLangString = fromLang->translatedName(); + TQString toLangString = toLang->translatedName(); if (fromLangString.isEmpty()) { //use abbrev! fromLangString = m_fromLanguage; @@ -1209,16 +1209,16 @@ void CGlossaryFolder::init() { } /** Returns the language this glossary folder maps from. */ -const QString& CGlossaryFolder::fromLanguage() const { +const TQString& CGlossaryFolder::fromLanguage() const { return m_fromLanguage; } /** Returns the language this glossary folder maps to. */ -const QString& CGlossaryFolder::toLanguage() const { +const TQString& CGlossaryFolder::toLanguage() const { return m_toLanguage; } -void CGlossaryFolder::addGroup(const Type type, const QString& fromLanguage, const QString& toLanguage) { +void CGlossaryFolder::addGroup(const Type type, const TQString& fromLanguage, const TQString& toLanguage) { CTreeFolder* i = new CGlossaryFolder(this, type, fromLanguage, toLanguage); i->init(); if (!i->childCount()) { diff --git a/bibletime/frontend/mainindex/cindexitem.h b/bibletime/frontend/mainindex/cindexitem.h index ab7de5e..f5598c5 100644 --- a/bibletime/frontend/mainindex/cindexitem.h +++ b/bibletime/frontend/mainindex/cindexitem.h @@ -18,7 +18,7 @@ #include "backend/cswordmoduleinfo.h" //Qt includes -#include <qdom.h> +#include <tqdom.h> //KDE includes #include <klistview.h> @@ -68,7 +68,7 @@ public: CItemBase(CItemBase* item, const Type type = Unknown); virtual ~CItemBase(); - virtual const QString toolTip(); + virtual const TQString toolTip(); virtual CMainIndex* listView() const; /** * Returns if the implementation of this class is a folder item or not. @@ -91,13 +91,13 @@ public: /** * Returns the XML code which represents the content of this folder. */ - virtual QDomElement saveToXML( QDomDocument& /*document*/ ) { - return QDomElement(); + virtual TQDomElement saveToXML( TQDomDocument& /*document*/ ) { + return TQDomElement(); }; /** * Loads the content of this folder from the XML code passed as argument to this function. */ - virtual void loadFromXML( QDomElement& /*element*/ ) {} + virtual void loadFromXML( TQDomElement& /*element*/ ) {} ; /** * Returns true whether the sorting is enabled or not. @@ -121,18 +121,18 @@ protected: /** Reimplementation which uses our extended version of dropped (see below). */ - virtual void dropped( QDropEvent* e) { + virtual void dropped( TQDropEvent* e) { dropped(e,0); }; /** Our extended version of the dropped method to include a item above the point we dropped the stuff. */ - virtual void dropped( QDropEvent* /*e*/, QListViewItem* /*after*/) {} + virtual void dropped( TQDropEvent* /*e*/, TQListViewItem* /*after*/) {} ; /** * Reimplementation. Returns true if the auto opening of this folder is allowd * The default return value is "false" */ - virtual const bool allowAutoOpen( const QMimeSource* src ) const; + virtual const bool allowAutoOpen( const TQMimeSource* src ) const; private: Type m_type; @@ -144,7 +144,7 @@ public: CModuleItem(CTreeFolder* item, CSwordModuleInfo* module); virtual ~CModuleItem(); virtual CSwordModuleInfo* const module() const; - virtual const QString toolTip(); + virtual const TQString toolTip(); /** * Reimplementation from CItemBase. @@ -158,8 +158,8 @@ protected: // Protected methods * Reimplementation to handle text drops on a module. * In this case open the searchdialog. In the case of a referebnce open the module at the given position. */ - virtual bool acceptDrop( const QMimeSource* src ) const; - virtual void dropped( QDropEvent* e, QListViewItem* after ); + virtual bool acceptDrop( const TQMimeSource* src ) const; + virtual void dropped( TQDropEvent* e, TQListViewItem* after ); private: CSwordModuleInfo* m_module; @@ -167,15 +167,15 @@ private: class CBookmarkItem : public CItemBase { public: - CBookmarkItem(CFolderBase* parentItem, CSwordModuleInfo* module, const QString& key, const QString& description); - CBookmarkItem(CFolderBase* parentItem, QDomElement& xml); + CBookmarkItem(CFolderBase* parentItem, CSwordModuleInfo* module, const TQString& key, const TQString& description); + CBookmarkItem(CFolderBase* parentItem, TQDomElement& xml); virtual ~CBookmarkItem(); CSwordModuleInfo* const module(); - const QString key(); - const QString& description(); - virtual const QString toolTip(); + const TQString key(); + const TQString& description(); + virtual const TQString toolTip(); - //virtual int compare( QListViewItem * i, int col, bool ascending ) const; + //virtual int compare( TQListViewItem * i, int col, bool ascending ) const; virtual void update(); virtual void init(); @@ -195,18 +195,18 @@ public: /** * Reimplementation of CItemBase::saveToXML. */ - virtual QDomElement saveToXML( QDomDocument& document ); + virtual TQDomElement saveToXML( TQDomDocument& document ); /** * Loads the content of this folder from the XML code passed as argument to this function. */ - virtual void loadFromXML( QDomElement& element ); + virtual void loadFromXML( TQDomElement& element ); private: - QString m_key; - QString m_description; - QString m_moduleName; + TQString m_key; + TQString m_description; + TQString m_moduleName; - QDomElement m_startupXML; + TQDomElement m_startupXML; protected: // Protected methods /** @@ -214,14 +214,14 @@ protected: // Protected methods * because a bookmarks * has not possible drops. */ - virtual bool acceptDrop(const QMimeSource * src) const; + virtual bool acceptDrop(const TQMimeSource * src) const; private: // Private methods /** * Returns the english key. * Only used internal of this class implementation. */ - const QString& englishKey() const; + const TQString& englishKey() const; }; @@ -229,7 +229,7 @@ class CFolderBase : public CItemBase { public: CFolderBase(CMainIndex* mainIndex, const Type type); CFolderBase(CFolderBase* parentFolder, const Type type); - CFolderBase(CFolderBase* parentFolder, const QString& caption); + CFolderBase(CFolderBase* parentFolder, const TQString& caption); virtual ~CFolderBase(); virtual const bool isFolder(); @@ -243,18 +243,18 @@ public: void rename(); virtual void newSubFolder(); - QPtrList<QListViewItem> getChildList(); + TQPtrList<TQListViewItem> getChildList(); protected: /** * Reimplementation. Returns true if the auto opening of this folder is allowd */ - virtual const bool allowAutoOpen( const QMimeSource* src ) const; + virtual const bool allowAutoOpen( const TQMimeSource* src ) const; /** * Reimplementation. Returns false because folders have no use for drops * (except for the bookmark folders) */ - bool acceptDrop(const QMimeSource * src) const; + bool acceptDrop(const TQMimeSource * src) const; }; /** The base class for all items in the tree. Subclasses for module folders, modules and bookmarks exist. @@ -262,48 +262,48 @@ protected: */ class CTreeFolder : public CFolderBase { public: - CTreeFolder(CMainIndex* mainIndex, const Type type, const QString& language ); - CTreeFolder(CFolderBase* parentFolder, const Type type, const QString& language ); + CTreeFolder(CMainIndex* mainIndex, const Type type, const TQString& language ); + CTreeFolder(CFolderBase* parentFolder, const Type type, const TQString& language ); virtual ~CTreeFolder(); - virtual void addGroup(const Type type, const QString language); + virtual void addGroup(const Type type, const TQString language); virtual void addModule(CSwordModuleInfo* const); - virtual void addBookmark(CSwordModuleInfo* module, const QString& key, const QString& description); + virtual void addBookmark(CSwordModuleInfo* module, const TQString& key, const TQString& description); virtual void initTree(); virtual void update(); virtual void init(); - virtual const QString& language() const; + virtual const TQString& language() const; private: - QString m_language; + TQString m_language; }; class CGlossaryFolder : public CTreeFolder { public: - CGlossaryFolder(CMainIndex* mainIndex, const Type type, const QString& fromLanguage, const QString& toLanguage ); - CGlossaryFolder(CFolderBase* parentFolder, const Type type, const QString& fromLanguage, const QString& toLanguage ); + CGlossaryFolder(CMainIndex* mainIndex, const Type type, const TQString& fromLanguage, const TQString& toLanguage ); + CGlossaryFolder(CFolderBase* parentFolder, const Type type, const TQString& fromLanguage, const TQString& toLanguage ); virtual ~CGlossaryFolder(); virtual void initTree(); virtual void init(); - virtual void addGroup(const Type /*type*/, const QString& /*fromLanguage*/) {} + virtual void addGroup(const Type /*type*/, const TQString& /*fromLanguage*/) {} ; //standard reimpl to overload the old one right - virtual void addGroup(const Type type, const QString& fromLanguage, const QString& toLanguage); + virtual void addGroup(const Type type, const TQString& fromLanguage, const TQString& toLanguage); /** * Returns the language this glossary folder maps from. */ - const QString& fromLanguage() const; + const TQString& fromLanguage() const; /** * Returns the language this glossary folder maps from. */ - const QString& toLanguage() const; + const TQString& toLanguage() const; private: - QString m_fromLanguage; - QString m_toLanguage; + TQString m_fromLanguage; + TQString m_toLanguage; }; class CBookmarkFolder : public CTreeFolder { @@ -314,21 +314,21 @@ public: virtual const bool enableAction(const MenuAction action); virtual void exportBookmarks(); virtual void importBookmarks(); - virtual bool acceptDrop(const QMimeSource * src) const; - virtual void dropped(QDropEvent *e, QListViewItem* after); + virtual bool acceptDrop(const TQMimeSource * src) const; + virtual void dropped(TQDropEvent *e, TQListViewItem* after); /** * Loads bookmarks from XML content */ - const bool loadBookmarksFromXML( const QString& xml ); + const bool loadBookmarksFromXML( const TQString& xml ); /** * Loads bookmarks from a file. */ - const bool loadBookmarks( const QString& ); + const bool loadBookmarks( const TQString& ); /** * Saves the bookmarks in a file. */ - const bool saveBookmarks( const QString& filename, const bool& forceOverwrite = true ); + const bool saveBookmarks( const TQString& filename, const bool& forceOverwrite = true ); protected: // Protected methods virtual void initTree(); @@ -344,11 +344,11 @@ public: /** * Returns the XML code which represents the content of this folder. */ - virtual QDomElement saveToXML( QDomDocument& document ); + virtual TQDomElement saveToXML( TQDomDocument& document ); /** * Loads the content of this folder from the XML code passed as argument to this function. */ - virtual void loadFromXML( QDomElement& element ); + virtual void loadFromXML( TQDomElement& element ); }; class OldBookmarkImport { @@ -356,7 +356,7 @@ public: /** * This function converts the old config based bookmarks into a valid 1.3 XML file, so importing is easy */ - static const QString oldBookmarksXML( const QString& configFileName = QString::null ); + static const TQString oldBookmarksXML( const TQString& configFileName = TQString::null ); private: // made provate because we offer one static functions which doesn't need constructor and destructor OldBookmarkImport(); @@ -365,8 +365,8 @@ private: class SubFolder : public CBookmarkFolder { public: - SubFolder(CFolderBase* parentItem, const QString& caption); - SubFolder(CFolderBase* parentItem, QDomElement& xml); + SubFolder(CFolderBase* parentItem, const TQString& caption); + SubFolder(CFolderBase* parentItem, TQDomElement& xml); virtual ~SubFolder(); virtual void init(); /** @@ -376,14 +376,14 @@ public: /** * Returns the XML code which represents the content of this folder. */ - virtual QDomElement saveToXML( QDomDocument& document ); + virtual TQDomElement saveToXML( TQDomDocument& document ); /** * Loads the content of this folder from the XML code passed as argument to this function. */ - virtual void loadFromXML( QDomElement& element ); + virtual void loadFromXML( TQDomElement& element ); private: - QDomElement m_startupXML; + TQDomElement m_startupXML; }; } //end of namespace Bookmarks diff --git a/bibletime/frontend/mainindex/cmainindex.cpp b/bibletime/frontend/mainindex/cmainindex.cpp index b6c2e41..5201105 100644 --- a/bibletime/frontend/mainindex/cmainindex.cpp +++ b/bibletime/frontend/mainindex/cmainindex.cpp @@ -27,11 +27,11 @@ #include "util/scoped_resource.h" //Qt includes -#include <qheader.h> -#include <qlistview.h> -#include <qdragobject.h> -#include <qinputdialog.h> -#include <qregexp.h> +#include <tqheader.h> +#include <tqlistview.h> +#include <tqdragobject.h> +#include <tqinputdialog.h> +#include <tqregexp.h> //KDE includes #include <klocale.h> @@ -42,22 +42,22 @@ using namespace Printing; -CMainIndex::ToolTip::ToolTip(CMainIndex* parent) : QToolTip(parent->viewport()), m_mainIndex(parent) {} +CMainIndex::ToolTip::ToolTip(CMainIndex* parent) : TQToolTip(parent->viewport()), m_mainIndex(parent) {} -void CMainIndex::ToolTip::maybeTip(const QPoint& p) { +void CMainIndex::ToolTip::maybeTip(const TQPoint& p) { CItemBase* i = dynamic_cast<CItemBase*>(m_mainIndex->itemAt(p)); Q_ASSERT(i); if ( !i ) { return; } - QRect r = m_mainIndex->itemRect(i); + TQRect r = m_mainIndex->itemRect(i); if (!r.isValid()) { return; } //get type of item and display correct text - const QString text = i->toolTip(); + const TQString text = i->toolTip(); if (!text.isEmpty()) { CBookmarkItem* bookmark = dynamic_cast<CBookmarkItem*>(i); if (bookmark) { @@ -77,7 +77,7 @@ void CMainIndex::ToolTip::maybeTip(const QPoint& p) { } } -CMainIndex::CMainIndex(QWidget *parent) : KListView(parent), +CMainIndex::CMainIndex(TQWidget *parent) : KListView(parent), m_searchDialog(0), m_toolTip(0), m_itemsMovable(false), m_autoOpenFolder(0), m_autoOpenTimer(this) { initView(); initConnections(); @@ -93,7 +93,7 @@ CMainIndex::~CMainIndex() { } /** Reimplementation. Adds the given group to the tree. */ -void CMainIndex::addGroup(const CItemBase::Type type, const QString language) { +void CMainIndex::addGroup(const CItemBase::Type type, const TQString language) { CTreeFolder *i = 0; switch (type) { case CItemBase::BookmarkFolder: @@ -101,7 +101,7 @@ void CMainIndex::addGroup(const CItemBase::Type type, const QString language) { break; case CItemBase::GlossaryModuleFolder: //we have no second language - i = new CGlossaryFolder(this, type, language, QString::null); + i = new CGlossaryFolder(this, type, language, TQString::null); break; default: i = new CTreeFolder(this, type, language); @@ -119,7 +119,7 @@ void CMainIndex::addGroup(const CItemBase::Type type, const QString language) { /** Initializes the view. */ void CMainIndex::initView() { - addColumn(QString::null); + addColumn(TQString::null); header()->hide(); m_toolTip = new ToolTip(this); @@ -146,24 +146,24 @@ void CMainIndex::initView() { m_popup = new KPopupMenu(viewport()); m_popup->insertTitle(i18n("Bookshelf")); - m_actions.newFolder = new KAction(i18n("Create a new folder"), CResMgr::mainIndex::newFolder::icon, 0, this, SLOT(createNewFolder()), this); - m_actions.changeFolder = new KAction(i18n("Change this folder"),CResMgr::mainIndex::changeFolder::icon, 0, this, SLOT(changeFolder()), this); + m_actions.newFolder = new KAction(i18n("Create a new folder"), CResMgr::mainIndex::newFolder::icon, 0, this, TQT_SLOT(createNewFolder()), this); + m_actions.changeFolder = new KAction(i18n("Change this folder"),CResMgr::mainIndex::changeFolder::icon, 0, this, TQT_SLOT(changeFolder()), this); - m_actions.changeBookmark = new KAction(i18n("Change bookmark description"),CResMgr::mainIndex::changeBookmark::icon, 0, this, SLOT(changeBookmark()), this); - m_actions.importBookmarks = new KAction(i18n("Import bookmarks"),CResMgr::mainIndex::importBookmarks::icon, 0, this, SLOT(importBookmarks()), this); - m_actions.exportBookmarks = new KAction(i18n("Export bookmarks"),CResMgr::mainIndex::exportBookmarks::icon, 0, this, SLOT(exportBookmarks()), this); - m_actions.printBookmarks = new KAction(i18n("Print bookmarks"),CResMgr::mainIndex::printBookmarks::icon, 0, this, SLOT(printBookmarks()), this); + m_actions.changeBookmark = new KAction(i18n("Change bookmark description"),CResMgr::mainIndex::changeBookmark::icon, 0, this, TQT_SLOT(changeBookmark()), this); + m_actions.importBookmarks = new KAction(i18n("Import bookmarks"),CResMgr::mainIndex::importBookmarks::icon, 0, this, TQT_SLOT(importBookmarks()), this); + m_actions.exportBookmarks = new KAction(i18n("Export bookmarks"),CResMgr::mainIndex::exportBookmarks::icon, 0, this, TQT_SLOT(exportBookmarks()), this); + m_actions.printBookmarks = new KAction(i18n("Print bookmarks"),CResMgr::mainIndex::printBookmarks::icon, 0, this, TQT_SLOT(printBookmarks()), this); - m_actions.deleteEntries = new KAction(i18n("Remove selected item(s)"),CResMgr::mainIndex::deleteItems::icon, 0, this, SLOT(deleteEntries()), this); + m_actions.deleteEntries = new KAction(i18n("Remove selected item(s)"),CResMgr::mainIndex::deleteItems::icon, 0, this, TQT_SLOT(deleteEntries()), this); m_actions.editModuleMenu = new KActionMenu(i18n("Edit this work"),CResMgr::mainIndex::editModuleMenu::icon, this); m_actions.editModuleMenu->setDelayed(false); - m_actions.editModulePlain = new KAction(i18n("Plain text"),CResMgr::mainIndex::editModulePlain::icon, 0, this, SLOT(editModulePlain()), this); - m_actions.editModuleHTML = new KAction(i18n("HTML"),CResMgr::mainIndex::editModuleHTML::icon, 0, this, SLOT(editModuleHTML()), this); + m_actions.editModulePlain = new KAction(i18n("Plain text"),CResMgr::mainIndex::editModulePlain::icon, 0, this, TQT_SLOT(editModulePlain()), this); + m_actions.editModuleHTML = new KAction(i18n("HTML"),CResMgr::mainIndex::editModuleHTML::icon, 0, this, TQT_SLOT(editModuleHTML()), this); - m_actions.searchInModules = new KAction(i18n("Search in selected work(s)"),CResMgr::mainIndex::search::icon, 0, this, SLOT(searchInModules()), this); - m_actions.unlockModule = new KAction(i18n("Unlock this work"),CResMgr::mainIndex::unlockModule::icon, 0, this, SLOT(unlockModule()), this); - m_actions.aboutModule = new KAction(i18n("About this work"),CResMgr::mainIndex::aboutModule::icon, 0, this, SLOT(aboutModule()), this); + m_actions.searchInModules = new KAction(i18n("Search in selected work(s)"),CResMgr::mainIndex::search::icon, 0, this, TQT_SLOT(searchInModules()), this); + m_actions.unlockModule = new KAction(i18n("Unlock this work"),CResMgr::mainIndex::unlockModule::icon, 0, this, TQT_SLOT(unlockModule()), this); + m_actions.aboutModule = new KAction(i18n("About this work"),CResMgr::mainIndex::aboutModule::icon, 0, this, TQT_SLOT(aboutModule()), this); //fill the popup menu itself @@ -188,20 +188,20 @@ void CMainIndex::initView() { m_actions.aboutModule->plug(m_popup); } -/** Initialize the SIGNAL<->SLOT connections */ +/** Initialize the SIGNAL<->TQT_SLOT connections */ void CMainIndex::initConnections() { - connect(this, SIGNAL(executed(QListViewItem*)), - SLOT(slotExecuted(QListViewItem*))); - connect(this, SIGNAL(dropped(QDropEvent*, QListViewItem*, QListViewItem*)), - SLOT(dropped(QDropEvent*, QListViewItem*, QListViewItem*))); - connect(this, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)), - SLOT(contextMenu(KListView*, QListViewItem*, const QPoint&))); - connect(&m_autoOpenTimer, SIGNAL(timeout()), - this, SLOT(autoOpenTimeout())); + connect(this, TQT_SIGNAL(executed(TQListViewItem*)), + TQT_SLOT(slotExecuted(TQListViewItem*))); + connect(this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), + TQT_SLOT(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*))); + connect(this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), + TQT_SLOT(contextMenu(KListView*, TQListViewItem*, const TQPoint&))); + connect(&m_autoOpenTimer, TQT_SIGNAL(timeout()), + this, TQT_SLOT(autoOpenTimeout())); } /** Is called when an item was clicked/double clicked. */ -void CMainIndex::slotExecuted( QListViewItem* i ) { +void CMainIndex::slotExecuted( TQListViewItem* i ) { CItemBase* ci = dynamic_cast<CItemBase*>(i); if (!ci) { return; @@ -214,7 +214,7 @@ void CMainIndex::slotExecuted( QListViewItem* i ) { CSwordModuleInfo* mod = m->module(); ListCSwordModuleInfo modules; modules.append(mod); - emit createReadDisplayWindow(modules, QString::null); + emit createReadDisplayWindow(modules, TQString::null); } else if (CBookmarkItem* b = dynamic_cast<CBookmarkItem*>(i) ) { //clicked on a bookmark if (CSwordModuleInfo* mod = b->module()) { @@ -226,14 +226,14 @@ void CMainIndex::slotExecuted( QListViewItem* i ) { } /** Reimplementation. Returns the drag object for the current selection. */ -QDragObject* CMainIndex::dragObject() { +TQDragObject* CMainIndex::dragObject() { if (!m_itemsMovable) { return false; } CDragDropMgr::ItemList dndItems; - QPtrList<QListViewItem> items = selectedItems(); + TQPtrList<TQListViewItem> items = selectedItems(); for (items.first(); items.current(); items.next()) { if (CItemBase* i = dynamic_cast<CItemBase*>(items.current())) { //we can move this item! @@ -243,7 +243,7 @@ QDragObject* CMainIndex::dragObject() { if (CBookmarkItem* bookmark = dynamic_cast<CBookmarkItem*>( items.current() )) { //take care of bookmarks which have no valid module any more, e.g. if it was uninstalled - const QString moduleName = bookmark->module() ? bookmark->module()->name() : QString::null; + const TQString moduleName = bookmark->module() ? bookmark->module()->name() : TQString::null; dndItems.append( CDragDropMgr::Item(moduleName, bookmark->key(), bookmark->description()) ); } } @@ -253,8 +253,8 @@ QDragObject* CMainIndex::dragObject() { } /** Reimplementation from KListView. Returns true if the drag is acceptable for the listview. */ -bool CMainIndex::acceptDrag( QDropEvent* event ) const { - const QPoint pos = contentsToViewport(event->pos()); +bool CMainIndex::acceptDrag( TQDropEvent* event ) const { + const TQPoint pos = contentsToViewport(event->pos()); CItemBase* i = dynamic_cast<CItemBase*>(itemAt(pos)); return i ? (i->acceptDrop(event) || i->isMovable()) : false; @@ -262,17 +262,17 @@ bool CMainIndex::acceptDrag( QDropEvent* event ) const { /** No descriptions */ void CMainIndex::initTree() { - addGroup(CItemBase::BookmarkFolder, QString("*")); - addGroup(CItemBase::BibleModuleFolder, QString("*")); - addGroup(CItemBase::BookModuleFolder, QString("*")); - addGroup(CItemBase::CommentaryModuleFolder, QString("*")); - addGroup(CItemBase::DevotionalModuleFolder, QString("*")); - addGroup(CItemBase::GlossaryModuleFolder, QString("*")); - addGroup(CItemBase::LexiconModuleFolder, QString("*")); + addGroup(CItemBase::BookmarkFolder, TQString("*")); + addGroup(CItemBase::BibleModuleFolder, TQString("*")); + addGroup(CItemBase::BookModuleFolder, TQString("*")); + addGroup(CItemBase::CommentaryModuleFolder, TQString("*")); + addGroup(CItemBase::DevotionalModuleFolder, TQString("*")); + addGroup(CItemBase::GlossaryModuleFolder, TQString("*")); + addGroup(CItemBase::LexiconModuleFolder, TQString("*")); } /** No descriptions */ -void CMainIndex::dropped( QDropEvent* e, QListViewItem* parent, QListViewItem* after) { +void CMainIndex::dropped( TQDropEvent* e, TQListViewItem* parent, TQListViewItem* after) { Q_ASSERT(after); Q_ASSERT(parent); @@ -285,7 +285,7 @@ void CMainIndex::dropped( QDropEvent* e, QListViewItem* parent, QListViewItem* a */ if (dynamic_cast<CBookmarkFolder*>(parent) || dynamic_cast<Bookmarks::SubFolder*>(parent)) { // we drop onto the bookmark folder or one of it's subfolders - // QPtrList<QListViewItem> items = selectedItems(); + // TQPtrList<TQListViewItem> items = selectedItems(); // items.setAutoDelete(true); // items.clear(); //delete the selected items we dragged } @@ -341,9 +341,9 @@ void CMainIndex::dropped( QDropEvent* e, QListViewItem* parent, QListViewItem* a if (moveSelectedItems) { //move all selected items after the afterItem if (m_itemsMovable) { - QPtrList<QListViewItem> items = selectedItems(); - QListViewItem* i = items.first(); - QListViewItem* after = afterItem; + TQPtrList<TQListViewItem> items = selectedItems(); + TQListViewItem* i = items.first(); + TQListViewItem* after = afterItem; while (i && afterItem) { i->moveItem(after); after = i; @@ -354,14 +354,14 @@ void CMainIndex::dropped( QDropEvent* e, QListViewItem* parent, QListViewItem* a } if (removeSelectedItems) { - QPtrList<QListViewItem> items = selectedItems(); + TQPtrList<TQListViewItem> items = selectedItems(); items.setAutoDelete(true); items.clear(); //delete the selected items we dragged } } /** No descriptions */ -void CMainIndex::emitModulesChosen( ListCSwordModuleInfo modules, QString key ) { +void CMainIndex::emitModulesChosen( ListCSwordModuleInfo modules, TQString key ) { emit createReadDisplayWindow(modules, key); } @@ -399,9 +399,9 @@ KAction* const CMainIndex::action( const CItemBase::MenuAction type ) const { } /** Shows the context menu at the given position. */ -void CMainIndex::contextMenu(KListView* /*list*/, QListViewItem* i, const QPoint& p) { +void CMainIndex::contextMenu(KListView* /*list*/, TQListViewItem* i, const TQPoint& p) { //setup menu entries depending on current selection - QPtrList<QListViewItem> items = selectedItems(); + TQPtrList<TQListViewItem> items = selectedItems(); if (items.count() == 0) { //special handling for no selection @@ -501,7 +501,7 @@ void CMainIndex::printBookmarks() { CPrinter::KeyTreeItem::Settings settings; settings.keyRenderingFace = CPrinter::KeyTreeItem::Settings::CompleteShort; - QPtrList<QListViewItem> items; + TQPtrList<TQListViewItem> items; CBookmarkFolder* bf = dynamic_cast<CBookmarkFolder*>(currentItem()); if (bf) { @@ -527,7 +527,7 @@ void CMainIndex::printBookmarks() { /** Deletes the selected entries. */ void CMainIndex::deleteEntries() { - QPtrList<QListViewItem> items = selectedItems(); + TQPtrList<TQListViewItem> items = selectedItems(); if (!items.count()) return; @@ -547,7 +547,7 @@ void CMainIndex::deleteEntries() { /** Opens the searchdialog for the selected modules. */ void CMainIndex::searchInModules() { - QPtrList<QListViewItem> items = selectedItems(); + TQPtrList<TQListViewItem> items = selectedItems(); ListCSwordModuleInfo modules; for (items.first(); items.current(); items.next()) { if (CModuleItem* i = dynamic_cast<CModuleItem*>(items.current())) { @@ -564,16 +564,16 @@ void CMainIndex::searchInModules() { } } - Search::CSearchDialog::openDialog(modules, QString::null); + Search::CSearchDialog::openDialog(modules, TQString::null); } /** Unlocks the current module. */ void CMainIndex::unlockModule() { if (CModuleItem* i = dynamic_cast<CModuleItem*>(currentItem())) { bool ok = false; - const QString unlockKey = QInputDialog::getText(i18n("BibleTime - Unlock work"), + const TQString unlockKey = QInputDialog::getText(i18n("BibleTime - Unlock work"), i18n("Enter the unlock key for this work."), - QLineEdit::Normal, i->module()->config(CSwordModuleInfo::CipherKey), &ok); + TQLineEdit::Normal, i->module()->config(CSwordModuleInfo::CipherKey), &ok); if (ok) { i->module()->unlock( unlockKey ); @@ -591,7 +591,7 @@ void CMainIndex::aboutModule() { /** Reimplementation. Takes care of movable items. */ void CMainIndex::startDrag() { - QPtrList<QListViewItem> items = selectedItems(); + TQPtrList<TQListViewItem> items = selectedItems(); m_itemsMovable = true; for (items.first(); items.current() && m_itemsMovable; items.next()) { @@ -607,8 +607,8 @@ void CMainIndex::startDrag() { } /** Reimplementation to support the items dragEnter and dragLeave functions. */ -void CMainIndex::contentsDragMoveEvent( QDragMoveEvent* event ) { - // qWarning("void CMainIndex:: drag move event ( QDragLeaveEvent* e )"); +void CMainIndex::contentsDragMoveEvent( TQDragMoveEvent* event ) { + // qWarning("void CMainIndex:: drag move event ( TQDragLeaveEvent* e )"); CItemBase* i = dynamic_cast<CItemBase*>( itemAt( contentsToViewport(event->pos())) ); if (i) { if (i->allowAutoOpen(event) || (i->acceptDrop(event) && i->isFolder() && i->allowAutoOpen(event) && !i->isOpen() && autoOpen()) ) { @@ -630,11 +630,11 @@ void CMainIndex::contentsDragMoveEvent( QDragMoveEvent* event ) { KListView::contentsDragMoveEvent(event); } -QRect CMainIndex::drawItemHighlighter(QPainter* painter, QListViewItem* item) { +TQRect CMainIndex::drawItemHighlighter(TQPainter* painter, TQListViewItem* item) { CBookmarkItem* bookmark = dynamic_cast<CBookmarkItem*>(item); if (bookmark) { //no drops on bookmarks allowed, just moving items after it - return QRect(); + return TQRect(); } return KListView::drawItemHighlighter(painter, item); @@ -649,7 +649,7 @@ void CMainIndex::autoOpenTimeout() { } /** No descriptions */ -void CMainIndex::contentsDragLeaveEvent( QDragLeaveEvent* e ) { +void CMainIndex::contentsDragLeaveEvent( TQDragLeaveEvent* e ) { m_autoOpenTimer.stop(); KListView::contentsDragLeaveEvent(e); } @@ -688,13 +688,13 @@ const bool CMainIndex::isMultiAction( const CItemBase::MenuAction type ) const { } /** Is called when items should be moved. */ -void CMainIndex::moved( QPtrList<QListViewItem>& /*items*/, QPtrList<QListViewItem>& /*afterFirst*/, QPtrList<QListViewItem>& /*afterNow*/) { +void CMainIndex::moved( TQPtrList<TQListViewItem>& /*items*/, TQPtrList<TQListViewItem>& /*afterFirst*/, TQPtrList<TQListViewItem>& /*afterNow*/) { qDebug("move items"); } /** Opens an editor window to edit the modules content. */ void CMainIndex::editModulePlain() { - QPtrList<QListViewItem> items = selectedItems(); + TQPtrList<TQListViewItem> items = selectedItems(); ListCSwordModuleInfo modules; for (items.first(); items.current(); items.next()) { if (CModuleItem* i = dynamic_cast<CModuleItem*>(items.current())) { @@ -702,13 +702,13 @@ void CMainIndex::editModulePlain() { } } if (modules.count() == 1) { - emit createWriteDisplayWindow(modules.first(), QString::null, CDisplayWindow::PlainTextWindow); + emit createWriteDisplayWindow(modules.first(), TQString::null, CDisplayWindow::PlainTextWindow); }; } /** Opens an editor window to edit the modules content. */ void CMainIndex::editModuleHTML() { - QPtrList<QListViewItem> items = selectedItems(); + TQPtrList<TQListViewItem> items = selectedItems(); ListCSwordModuleInfo modules; for (items.first(); items.current(); items.next()) { if (CModuleItem* i = dynamic_cast<CModuleItem*>(items.current())) { @@ -717,7 +717,7 @@ void CMainIndex::editModuleHTML() { } if (modules.count() == 1) { - emit createWriteDisplayWindow(modules.first(), QString::null, CDisplayWindow::HTMLWindow); + emit createWriteDisplayWindow(modules.first(), TQString::null, CDisplayWindow::HTMLWindow); } } @@ -735,7 +735,7 @@ void CMainIndex::saveBookmarks() { //find the bookmark folder CItemBase* i = 0; - QListViewItemIterator it( this ); + TQListViewItemIterator it( this ); while ( it.current() ) { i = dynamic_cast<CItemBase*>( it.current() ); @@ -743,7 +743,7 @@ void CMainIndex::saveBookmarks() { //found the bookmark folder KStandardDirs stdDirs; - const QString path = stdDirs.saveLocation("data", "bibletime/"); + const TQString path = stdDirs.saveLocation("data", "bibletime/"); if (!path.isEmpty()) { //save the bookmarks to the right file if (CBookmarkFolder* f = dynamic_cast<CBookmarkFolder*>(i)) { @@ -760,15 +760,15 @@ void CMainIndex::saveBookmarks() { void CMainIndex::readSettings() { qDebug("CMainIndex::readSettings"); - QStringList openGroups = CBTConfig::get(CBTConfig::bookshelfOpenGroups); - for (QStringList::Iterator it( openGroups.begin() ); it != openGroups.end(); ++it) { - QStringList path = QStringList::split("/", (*it)); //e.g. with items parent, child - QListViewItem* item = firstChild(); //begin on the top for each item + TQStringList openGroups = CBTConfig::get(CBTConfig::bookshelfOpenGroups); + for (TQStringList::Iterator it( openGroups.begin() ); it != openGroups.end(); ++it) { + TQStringList path = TQStringList::split("/", (*it)); //e.g. with items parent, child + TQListViewItem* item = firstChild(); //begin on the top for each item Q_ASSERT(item); unsigned int index = 1; - for (QStringList::Iterator p_it( path.begin() ); p_it != path.end(); ++p_it) { - QString itemName = (*p_it).replace("\\/", "/"); + for (TQStringList::Iterator p_it( path.begin() ); p_it != path.end(); ++p_it) { + TQString itemName = (*p_it).replace("\\/", "/"); while (item && (item->text(0) != itemName)) { item = item->nextSibling(); @@ -798,11 +798,11 @@ void CMainIndex::readSettings() { //restore the selected item - QStringList path = QStringList::split("/", CBTConfig::get(CBTConfig::bookshelfCurrentItem)); - QListViewItem* item = firstChild(); + TQStringList path = TQStringList::split("/", CBTConfig::get(CBTConfig::bookshelfCurrentItem)); + TQListViewItem* item = firstChild(); Q_ASSERT(item); unsigned int index = 1; - for (QStringList::iterator it( path.begin() ); it != path.end(); ++it) { + for (TQStringList::iterator it( path.begin() ); it != path.end(); ++it) { //search for the current caption and go down to it's childs while (item && (item->text(0) != (*it)) ) { item = item->nextSibling(); @@ -825,14 +825,14 @@ void CMainIndex::readSettings() { void CMainIndex::saveSettings() { //save the complete names of all open groups to the settings file (e.g. Bibles/German/,Bookmarks/Jeuss Christ - QStringList openGroups; + TQStringList openGroups; - QListViewItemIterator it( this ); + TQListViewItemIterator it( this ); while ( it.current() ) { if ( it.current()->isOpen() ) { //is a group and open //it.current()'s full name needs to be added to the list - QListViewItem* i = it.current(); - QString fullName = i->text(0); + TQListViewItem* i = it.current(); + TQString fullName = i->text(0); while (i->parent()) { i = i->parent(); fullName.prepend("/").prepend( i->text(0).replace("/", "\\/")); // parent / child @@ -852,8 +852,8 @@ void CMainIndex::saveSettings() { // verticalScrollBar() ? verticalScrollBar()->value() : 0); //save the currently selected item - QListViewItem* item = currentItem(); - QString path; + TQListViewItem* item = currentItem(); + TQString path; while (item) { path.prepend( item->text(0) + "/" ); item = item->parent(); diff --git a/bibletime/frontend/mainindex/cmainindex.h b/bibletime/frontend/mainindex/cmainindex.h index be9f9f4..56cd569 100644 --- a/bibletime/frontend/mainindex/cmainindex.h +++ b/bibletime/frontend/mainindex/cmainindex.h @@ -21,9 +21,9 @@ #include "util/cpointers.h" //Qt includes -#include <qwidget.h> -#include <qtimer.h> -#include <qtooltip.h> +#include <tqwidget.h> +#include <tqtimer.h> +#include <tqtooltip.h> //KDE includes #include <kaction.h> @@ -37,28 +37,28 @@ class CSearchDialog; class CMainIndex : public KListView { Q_OBJECT - class ToolTip : public QToolTip { + class ToolTip : public TQToolTip { public: ToolTip(CMainIndex* parent); virtual ~ToolTip() {} /** * Displays a tooltip for position p using the getToolTip() function of CGroupManagerItem */ - virtual void maybeTip( const QPoint &pos); + virtual void maybeTip( const TQPoint &pos); private: CMainIndex* m_mainIndex; }; public: - CMainIndex(QWidget *parent); + CMainIndex(TQWidget *parent); virtual ~CMainIndex(); void initTree(); /** * Opens the searchdialog using the given modules using the given search text. */ - void emitModulesChosen( ListCSwordModuleInfo modules, QString key ); + void emitModulesChosen( ListCSwordModuleInfo modules, TQString key ); /** * Saves the bookmarks to disk */ @@ -78,19 +78,19 @@ protected: // Protected methods /** * Reimplementation. Adds the given group to the tree. */ - virtual void addGroup( const CItemBase::Type type, const QString language); + virtual void addGroup( const CItemBase::Type type, const TQString language); /** - * Initialize the SIGNAL<->SLOT connections + * Initialize the SIGNAL<->TQT_SLOT connections */ void initConnections(); /** * Reimplementation. Returns the drag object for the current selection. */ - virtual QDragObject* dragObject(); + virtual TQDragObject* dragObject(); /** * Reimplementation from KListView. Returns true if the drag is acceptable for the listview. */ - virtual bool acceptDrag( QDropEvent* event ) const; + virtual bool acceptDrag( TQDropEvent* event ) const; /** * Returns the correct KAction object for the given type of action. */ @@ -102,12 +102,12 @@ protected: // Protected methods /** * Reimplementation to support the items dragEnter and dragLeave functions. */ - virtual void contentsDragMoveEvent( QDragMoveEvent* event ); + virtual void contentsDragMoveEvent( TQDragMoveEvent* event ); /** * Reimplementation. */ - virtual void contentsDragLeaveEvent( QDragLeaveEvent* e ); - QRect drawItemHighlighter(QPainter* painter, QListViewItem * item ); + virtual void contentsDragLeaveEvent( TQDragLeaveEvent* e ); + TQRect drawItemHighlighter(TQPainter* painter, TQListViewItem * item ); /** Read settings like open groups or scrollbar position and restore them */ void readSettings(); @@ -122,12 +122,12 @@ protected slots: // Protected slots /** * Is called when an item was clicked/double clicked. */ - void slotExecuted( QListViewItem* ); - void dropped( QDropEvent*, QListViewItem*, QListViewItem*); + void slotExecuted( TQListViewItem* ); + void dropped( TQDropEvent*, TQListViewItem*, TQListViewItem*); /** * Shows the context menu at the given position. */ - void contextMenu(KListView*, QListViewItem*, const QPoint&); + void contextMenu(KListView*, TQListViewItem*, const TQPoint&); /** * Adds a new subfolder to the current item. */ @@ -168,7 +168,7 @@ protected slots: // Protected slots /** * Is called when items should be moved. */ - void moved( QPtrList<QListViewItem>& items, QPtrList<QListViewItem>& afterFirst, QPtrList<QListViewItem>& afterNow); + void moved( TQPtrList<TQListViewItem>& items, TQPtrList<TQListViewItem>& afterFirst, TQPtrList<TQListViewItem>& afterNow); /** * Opens a plain text editor window to edit the modules content. */ @@ -182,8 +182,8 @@ private: CSearchDialog* m_searchDialog; ToolTip* m_toolTip; bool m_itemsMovable; - QListViewItem* m_autoOpenFolder; - QTimer m_autoOpenTimer; + TQListViewItem* m_autoOpenFolder; + TQTimer m_autoOpenTimer; /** * Initializes the view. @@ -221,11 +221,11 @@ signals: /** * Is emitted when a module should be opened, */ - void createReadDisplayWindow( ListCSwordModuleInfo, const QString& ); + void createReadDisplayWindow( ListCSwordModuleInfo, const TQString& ); /** * Is emitted when a write window should be created. */ - void createWriteDisplayWindow( CSwordModuleInfo*, const QString&, const CDisplayWindow::WriteWindowType& ); + void createWriteDisplayWindow( CSwordModuleInfo*, const TQString&, const CDisplayWindow::WriteWindowType& ); void signalSwordSetupChanged(); }; diff --git a/bibletime/frontend/manageindicesform.cpp b/bibletime/frontend/manageindicesform.cpp index c74ecd5..c711876 100644 --- a/bibletime/frontend/manageindicesform.cpp +++ b/bibletime/frontend/manageindicesform.cpp @@ -10,51 +10,51 @@ #include "manageindicesform.h" -#include <qvariant.h> -#include <qframe.h> -#include <qcheckbox.h> -#include <qheader.h> +#include <tqvariant.h> +#include <tqframe.h> +#include <tqcheckbox.h> +#include <tqheader.h> #include <klistview.h> -#include <qpushbutton.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <tqpushbutton.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> /* * Constructs a ManageIndicesForm as a child of 'parent', with the * name 'name' and widget flags set to 'f'. */ -ManageIndicesForm::ManageIndicesForm( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +ManageIndicesForm::ManageIndicesForm( TQWidget* parent, const char* name, WFlags fl ) + : TQWidget( parent, name, fl ) { if ( !name ) setName( "ManageIndicesForm" ); - ManageIndicesFormLayout = new QVBoxLayout( this, 0, 8, "ManageIndicesFormLayout"); + ManageIndicesFormLayout = new TQVBoxLayout( this, 0, 8, "ManageIndicesFormLayout"); - m_labelFrame = new QFrame( this, "m_labelFrame" ); - m_labelFrame->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)5, 0, 0, m_labelFrame->sizePolicy().hasHeightForWidth() ) ); - m_labelFrame->setFrameShape( QFrame::NoFrame ); - m_labelFrame->setFrameShadow( QFrame::Plain ); + m_labelFrame = new TQFrame( this, "m_labelFrame" ); + m_labelFrame->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)5, 0, 0, m_labelFrame->sizePolicy().hasHeightForWidth() ) ); + m_labelFrame->setFrameShape( TQFrame::NoFrame ); + m_labelFrame->setFrameShadow( TQFrame::Plain ); ManageIndicesFormLayout->addWidget( m_labelFrame ); - m_autoDeleteOrphanedIndicesBox = new QCheckBox( this, "m_autoDeleteOrphanedIndicesBox" ); + m_autoDeleteOrphanedIndicesBox = new TQCheckBox( this, "m_autoDeleteOrphanedIndicesBox" ); ManageIndicesFormLayout->addWidget( m_autoDeleteOrphanedIndicesBox ); m_moduleList = new KListView( this, "m_moduleList" ); ManageIndicesFormLayout->addWidget( m_moduleList ); - layout1 = new QHBoxLayout( 0, 0, 6, "layout1"); - spacer1 = new QSpacerItem( 40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + layout1 = new TQHBoxLayout( 0, 0, 6, "layout1"); + spacer1 = new TQSpacerItem( 40, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); layout1->addItem( spacer1 ); - m_createIndicesButton = new QPushButton( this, "m_createIndicesButton" ); + m_createIndicesButton = new TQPushButton( this, "m_createIndicesButton" ); layout1->addWidget( m_createIndicesButton ); - m_deleteIndicesButton = new QPushButton( this, "m_deleteIndicesButton" ); + m_deleteIndicesButton = new TQPushButton( this, "m_deleteIndicesButton" ); layout1->addWidget( m_deleteIndicesButton ); ManageIndicesFormLayout->addLayout( layout1 ); languageChange(); - resize( QSize(415, 404).expandedTo(minimumSizeHint()) ); + resize( TQSize(415, 404).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); } @@ -74,7 +74,7 @@ void ManageIndicesForm::languageChange() { setCaption( tr2i18n( "Manage Indicies" ) ); m_autoDeleteOrphanedIndicesBox->setText( tr2i18n( "Automaticall&y delete orphaned indices when BibleTime starts" ) ); - m_autoDeleteOrphanedIndicesBox->setAccel( QKeySequence( tr2i18n( "Alt+Y" ) ) ); + m_autoDeleteOrphanedIndicesBox->setAccel( TQKeySequence( tr2i18n( "Alt+Y" ) ) ); m_createIndicesButton->setText( tr2i18n( "&Create selected indices" ) ); m_deleteIndicesButton->setText( tr2i18n( "De&lete selected indices" ) ); } diff --git a/bibletime/frontend/searchdialog/cmodulechooser.cpp b/bibletime/frontend/searchdialog/cmodulechooser.cpp index 5670d91..ea6d8fc 100644 --- a/bibletime/frontend/searchdialog/cmodulechooser.cpp +++ b/bibletime/frontend/searchdialog/cmodulechooser.cpp @@ -20,20 +20,20 @@ #include "util/ctoolclass.h" //Qt includes -#include <qhbox.h> -#include <qvbox.h> -#include <qptrlist.h> -#include <qpainter.h> -#include <qlayout.h> -#include <qmap.h> -#include <qlineedit.h> -#include <qtextedit.h> -#include <qlabel.h> -#include <qsizepolicy.h> -#include <qpushbutton.h> -#include <qheader.h> -#include <qregexp.h> -#include <qmessagebox.h> +#include <tqhbox.h> +#include <tqvbox.h> +#include <tqptrlist.h> +#include <tqpainter.h> +#include <tqlayout.h> +#include <tqmap.h> +#include <tqlineedit.h> +#include <tqtextedit.h> +#include <tqlabel.h> +#include <tqsizepolicy.h> +#include <tqpushbutton.h> +#include <tqheader.h> +#include <tqregexp.h> +#include <tqmessagebox.h> //KDE includes #include <kapplication.h> @@ -48,7 +48,7 @@ namespace Search { /****************************/ /****************************/ -CModuleChooser::ModuleCheckBoxItem::ModuleCheckBoxItem(QListViewItem* item, CSwordModuleInfo* module) : QCheckListItem(item, QString::null, QCheckListItem::CheckBox) { +CModuleChooser::ModuleCheckBoxItem::ModuleCheckBoxItem(TQListViewItem* item, CSwordModuleInfo* module) : TQCheckListItem(item, TQString::null, TQCheckListItem::CheckBox) { m_module = module; setText(0,m_module->name()); }; @@ -66,7 +66,7 @@ CSwordModuleInfo* const CModuleChooser::ModuleCheckBoxItem::module() const { /****************************/ /****************************/ -CModuleChooser::CModuleChooser(QWidget* parent) : KListView(parent) { +CModuleChooser::CModuleChooser(TQWidget* parent) : KListView(parent) { initView(); initTree(); } @@ -77,7 +77,7 @@ void CModuleChooser::show() { KListView::show(); //open module items - QListViewItemIterator it( this ); + TQListViewItemIterator it( this ); for ( ; it.current(); ++it ) { if ( ModuleCheckBoxItem* i = dynamic_cast<ModuleCheckBoxItem*>(it.current()) ) { if (i->isOn()) { @@ -105,7 +105,7 @@ void CModuleChooser::initTree() { * 3. Create the subfolders for this */ - QMap<CSwordModuleInfo::ModuleType, QString> typenameMap; + TQMap<CSwordModuleInfo::ModuleType, TQString> typenameMap; typenameMap.insert(CSwordModuleInfo::Bible, i18n("Bibles")); typenameMap.insert(CSwordModuleInfo::Commentary, i18n("Commentaries")); typenameMap.insert(CSwordModuleInfo::Lexicon, i18n("Lexicons")); @@ -120,7 +120,7 @@ void CModuleChooser::initTree() { while (ok) { ListCSwordModuleInfo modsForType; - QString typeFolderCaption = QString::null; + TQString typeFolderCaption = TQString::null; incType = false; if (static_cast<CSwordModuleInfo::ModuleType>(type) == CSwordModuleInfo::Lexicon) { if (!addedLexs) { @@ -136,7 +136,7 @@ void CModuleChooser::initTree() { }; addedLexs = true; - typeFolderCaption = QString::null; + typeFolderCaption = TQString::null; } else if (!addedDevotionals) { // for (mods.first(); mods.current(); mods.next()) { @@ -182,20 +182,20 @@ void CModuleChooser::initTree() { } //get the available languages of the selected modules - QStringList langs; + TQStringList langs; // for (modsForType.first(); modsForType.current(); modsForType.next()) { ListCSwordModuleInfo::iterator end_it = modsForType.end(); for (ListCSwordModuleInfo::iterator it(modsForType.begin()); it != end_it; ++it) { - if ( !langs.contains(QString( (*it)->module()->Lang() ))) { + if ( !langs.contains(TQString( (*it)->module()->Lang() ))) { langs.append( (*it)->module()->Lang() ); } }; langs.sort(); //go through the list of languages and create subfolders for each language and the modules of the language - QListViewItem* typeFolder = 0; + TQListViewItem* typeFolder = 0; if (modsForType.count()) { - typeFolder = new QListViewItem(this, typeFolder, typeFolderCaption); + typeFolder = new TQListViewItem(this, typeFolder, typeFolderCaption); } else { if (incType) { @@ -205,22 +205,22 @@ void CModuleChooser::initTree() { }; - QString language = QString::null; + TQString language = TQString::null; CLanguageMgr* langMgr = languageMgr(); - for ( QStringList::Iterator it = langs.begin(); it != langs.end(); ++it ) { + for ( TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it ) { language = langMgr->languageForAbbrev(*it)->translatedName(); if (language.isEmpty()) { language = (*it); } - QListViewItem* langFolder = new QListViewItem(typeFolder,language); + TQListViewItem* langFolder = new TQListViewItem(typeFolder,language); langFolder->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16)); //create the module items of this lang folder // for (modsForType.first(); modsForType.current(); modsForType.next()) { ListCSwordModuleInfo::iterator end_modItr = modsForType.end(); for (ListCSwordModuleInfo::iterator mod_Itr(modsForType.begin()); mod_Itr != end_modItr; ++mod_Itr) { - if (QString( (*mod_Itr)->module()->Lang() ) == (*it) ) { //found correct language + if (TQString( (*mod_Itr)->module()->Lang() ) == (*it) ) { //found correct language ModuleCheckBoxItem* i = new ModuleCheckBoxItem(langFolder, *mod_Itr); i->setPixmap(0, CToolClass::getIconForModule(*mod_Itr)); }; @@ -237,7 +237,7 @@ void CModuleChooser::initTree() { /** Returns a list of selected modules. */ ListCSwordModuleInfo CModuleChooser::modules() { ListCSwordModuleInfo mods; - QListViewItemIterator it( this ); + TQListViewItemIterator it( this ); for ( ; it.current(); ++it ) { if ( ModuleCheckBoxItem* i = dynamic_cast<ModuleCheckBoxItem*>(it.current()) ) { //add the module if the box is checked @@ -253,7 +253,7 @@ ListCSwordModuleInfo CModuleChooser::modules() { /** Sets the list of modules and updates the state of the checkbox items. */ void CModuleChooser::setModules( ListCSwordModuleInfo modules ) { // qWarning("CModuleChooser::setModules( ListCSwordModuleInfo modules )"); - QListViewItemIterator it( this ); + TQListViewItemIterator it( this ); for ( ; it.current(); ++it ) { if ( ModuleCheckBoxItem* i = dynamic_cast<ModuleCheckBoxItem*>(it.current()) ) { i->setOn(modules.contains(i->module())); //set the status for the module checkbox item @@ -267,7 +267,7 @@ void CModuleChooser::setModules( ListCSwordModuleInfo modules ) { /****************************/ -CModuleChooserDialog::CModuleChooserDialog( QWidget* parentDialog, ListCSwordModuleInfo modules ) : +CModuleChooserDialog::CModuleChooserDialog( TQWidget* parentDialog, ListCSwordModuleInfo modules ) : KDialogBase(Plain, i18n("Choose work(s)"), Ok, Ok, parentDialog, "CModuleChooser", false, true) { initView(); initConnections(); @@ -282,8 +282,8 @@ CModuleChooserDialog::~CModuleChooserDialog() {} void CModuleChooserDialog::initView() { setButtonOKText(i18n("Use chosen work(s)")); - QFrame* page = plainPage(); - QHBoxLayout* layout = new QHBoxLayout(page); + TQFrame* page = plainPage(); + TQHBoxLayout* layout = new TQHBoxLayout(page); m_moduleChooser = new CModuleChooser(page); m_moduleChooser->setMinimumSize(320,400); layout->addWidget(m_moduleChooser); diff --git a/bibletime/frontend/searchdialog/cmodulechooser.h b/bibletime/frontend/searchdialog/cmodulechooser.h index b40010e..c17d609 100644 --- a/bibletime/frontend/searchdialog/cmodulechooser.h +++ b/bibletime/frontend/searchdialog/cmodulechooser.h @@ -24,11 +24,11 @@ //Qt includes -#include <qwidget.h> -#include <qstring.h> -#include <qcanvas.h> -#include <qdict.h> -#include <qtooltip.h> +#include <tqwidget.h> +#include <tqstring.h> +#include <tqcanvas.h> +#include <tqdict.h> +#include <tqtooltip.h> //KDE includes #include <kdialog.h> @@ -41,9 +41,9 @@ namespace Search { class CModuleChooser : public KListView, public CPointers { Q_OBJECT public: - class ModuleCheckBoxItem : virtual public QCheckListItem { + class ModuleCheckBoxItem : virtual public TQCheckListItem { public: - ModuleCheckBoxItem(QListViewItem* item, CSwordModuleInfo* module); + ModuleCheckBoxItem(TQListViewItem* item, CSwordModuleInfo* module); ~ModuleCheckBoxItem(); /** * Returns the used module. @@ -53,7 +53,7 @@ public: CSwordModuleInfo* m_module; }; - CModuleChooser(QWidget* parent); + CModuleChooser(TQWidget* parent); ~CModuleChooser(); /** * Sets the list of modules and updates the state of the checkbox items. @@ -85,7 +85,7 @@ protected: // Protected methods class CModuleChooserDialog : public KDialogBase { Q_OBJECT public: - CModuleChooserDialog(QWidget* parentDialog, ListCSwordModuleInfo modules); + CModuleChooserDialog(TQWidget* parentDialog, ListCSwordModuleInfo modules); ~CModuleChooserDialog(); signals: diff --git a/bibletime/frontend/searchdialog/cmoduleresultview.cpp b/bibletime/frontend/searchdialog/cmoduleresultview.cpp index a3e1463..5cac4ca 100644 --- a/bibletime/frontend/searchdialog/cmoduleresultview.cpp +++ b/bibletime/frontend/searchdialog/cmoduleresultview.cpp @@ -34,7 +34,7 @@ namespace Search { ************ ModuleResultList ************** ********************************************/ -CModuleResultView::CModuleResultView(QWidget* parent, const char* name) : +CModuleResultView::CModuleResultView(TQWidget* parent, const char* name) : KListView(parent, name) { initView(); initConnections(); @@ -62,23 +62,23 @@ void CModuleResultView::initView() { m_actions.copyMenu = new KActionMenu(i18n("Copy..."), CResMgr::searchdialog::result::moduleList::copyMenu::icon, m_popup); m_actions.copyMenu->setDelayed(false); - m_actions.copy.result = new KAction(i18n("Reference only"), KShortcut(0), this, SLOT(copyResult()), this); + m_actions.copy.result = new KAction(i18n("Reference only"), KShortcut(0), this, TQT_SLOT(copyResult()), this); m_actions.copyMenu->insert(m_actions.copy.result); - m_actions.copy.resultWithText = new KAction(i18n("Reference with text"), KShortcut(0), this, SLOT(copyResultWithText()), this); + m_actions.copy.resultWithText = new KAction(i18n("Reference with text"), KShortcut(0), this, TQT_SLOT(copyResultWithText()), this); m_actions.copyMenu->insert(m_actions.copy.resultWithText); m_actions.copyMenu->plug(m_popup); m_actions.saveMenu = new KActionMenu(i18n("Save..."), CResMgr::searchdialog::result::moduleList::saveMenu::icon, m_popup); m_actions.saveMenu->setDelayed( false ); - m_actions.save.result = new KAction(i18n("Reference only"), KShortcut(0), this, SLOT(saveResult()), this); + m_actions.save.result = new KAction(i18n("Reference only"), KShortcut(0), this, TQT_SLOT(saveResult()), this); m_actions.saveMenu->insert(m_actions.save.result); - m_actions.save.resultWithText = new KAction(i18n("Reference with text"), KShortcut(0), this, SLOT(saveResultWithText()), this); + m_actions.save.resultWithText = new KAction(i18n("Reference with text"), KShortcut(0), this, TQT_SLOT(saveResultWithText()), this); m_actions.saveMenu->insert(m_actions.save.resultWithText); m_actions.saveMenu->plug(m_popup); m_actions.printMenu = new KActionMenu(i18n("Print..."), CResMgr::searchdialog::result::moduleList::printMenu::icon, m_popup); m_actions.printMenu->setDelayed(false); - m_actions.print.result = new KAction(i18n("Reference with text"), KShortcut(0), this, SLOT(printResult()), this); + m_actions.print.result = new KAction(i18n("Reference with text"), KShortcut(0), this, TQT_SLOT(printResult()), this); m_actions.printMenu->insert(m_actions.print.result); @@ -87,14 +87,14 @@ void CModuleResultView::initView() { /** Initializes the connections of this widget, */ void CModuleResultView::initConnections() { - connect(this, SIGNAL(currentChanged(QListViewItem*)), - this, SLOT(executed(QListViewItem*))); - connect(this, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)), - this, SLOT(showPopup(KListView*, QListViewItem*, const QPoint&))); + connect(this, TQT_SIGNAL(currentChanged(TQListViewItem*)), + this, TQT_SLOT(executed(TQListViewItem*))); + connect(this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(showPopup(KListView*, TQListViewItem*, const TQPoint&))); } /** Setups the tree using the given list of modules. */ -void CModuleResultView::setupTree( ListCSwordModuleInfo modules, const QString& searchedText ) { +void CModuleResultView::setupTree( ListCSwordModuleInfo modules, const TQString& searchedText ) { clear(); util::CSortListViewItem* item = 0; @@ -113,7 +113,7 @@ void CModuleResultView::setupTree( ListCSwordModuleInfo modules, const QString& // for (modules.first(); modules.current(); modules.next()) { result = (*it)->searchResult(); - item = new util::CSortListViewItem(this, (*it)->name(), QString::number(result.Count()) ); + item = new util::CSortListViewItem(this, (*it)->name(), TQString::number(result.Count()) ); item->setColumnSorting(1, util::CSortListViewItem::Number); item->setPixmap(0,CToolClass::getIconForModule(*it) ); @@ -126,7 +126,7 @@ void CModuleResultView::setupTree( ListCSwordModuleInfo modules, const QString& //---------------------------------------------------------------------- int sstIndex, sTokenIndex; // strong search text index for finding "strong:" if ((sstIndex = searchedText.find("strong:", 0)) != -1) { - QString sNumber; + TQString sNumber; //-------------------------------------------------- // get the strongs number from the search text //-------------------------------------------------- @@ -150,9 +150,9 @@ void CModuleResultView::setupTree( ListCSwordModuleInfo modules, const QString& executed(currentItem()); } -void CModuleResultView::setupStrongsResults(CSwordModuleInfo* module, QListViewItem* parent, - const QString& sNumber) { - QString lText; +void CModuleResultView::setupStrongsResults(CSwordModuleInfo* module, TQListViewItem* parent, + const TQString& sNumber) { + TQString lText; util::CSortListViewItem* item = 0; strongsResults = new StrongsResultClass(module, sNumber); @@ -160,15 +160,15 @@ void CModuleResultView::setupStrongsResults(CSwordModuleInfo* module, QListViewI for (int cnt = 0; cnt < strongsResults->Count(); ++cnt) { lText = strongsResults->keyText(cnt); - item = new util::CSortListViewItem(parent, lText, QString::number(strongsResults->keyCount(cnt))); + item = new util::CSortListViewItem(parent, lText, TQString::number(strongsResults->keyCount(cnt))); item->setColumnSorting(1, util::CSortListViewItem::Number); } } /** Is executed when an item was selected in the list. */ -void CModuleResultView::executed( QListViewItem* i ) { - QString itemText, lText; +void CModuleResultView::executed( TQListViewItem* i ) { + TQString itemText, lText; if (CSwordModuleInfo* m = CPointers::backend()->findModuleByName(i->text(0))) { emit moduleChanged(); @@ -196,7 +196,7 @@ void CModuleResultView::executed( QListViewItem* i ) { CSwordModuleInfo* const CModuleResultView::activeModule() { Q_ASSERT(currentItem()); - QListViewItem* item = currentItem(); + TQListViewItem* item = currentItem(); if (!item) { return 0; } @@ -215,7 +215,7 @@ CSwordModuleInfo* const CModuleResultView::activeModule() { } /** No descriptions */ -void CModuleResultView::showPopup(KListView*, QListViewItem*, const QPoint& point) { +void CModuleResultView::showPopup(KListView*, TQListViewItem*, const TQPoint& point) { //make sure that all entries have the correct status m_popup->exec(point); } diff --git a/bibletime/frontend/searchdialog/cmoduleresultview.h b/bibletime/frontend/searchdialog/cmoduleresultview.h index 7153f6f..cfe5614 100644 --- a/bibletime/frontend/searchdialog/cmoduleresultview.h +++ b/bibletime/frontend/searchdialog/cmoduleresultview.h @@ -22,10 +22,10 @@ #include <klistview.h> //forward declarations -class QLabel; -class QCheckBox; -class QPushButton; -class QRadioButton; +class TQLabel; +class TQCheckBox; +class TQPushButton; +class TQRadioButton; class KComboBox; class KActionMenu; @@ -42,13 +42,13 @@ namespace Search { class CModuleResultView : public KListView { Q_OBJECT public: - CModuleResultView(QWidget* parent, const char* name = 0); + CModuleResultView(TQWidget* parent, const char* name = 0); ~CModuleResultView(); /** * Setups the tree using the given list of modules. */ - void setupTree( ListCSwordModuleInfo modules, const QString& searchedText ); + void setupTree( ListCSwordModuleInfo modules, const TQString& searchedText ); /** * Returns the currently active module. */ @@ -64,13 +64,13 @@ protected: // Protected methods */ void initConnections(); - void setupStrongsResults(CSwordModuleInfo* module, QListViewItem* parent, const QString& searchedText); + void setupStrongsResults(CSwordModuleInfo* module, TQListViewItem* parent, const TQString& searchedText); protected slots: // Protected slots /** * Is executed when an item was selected in the list. */ - void executed( QListViewItem* ); + void executed( TQListViewItem* ); /** * Copies the whole search result with the text into the clipboard. */ @@ -82,7 +82,7 @@ protected slots: // Protected slots /** * This slot opens the popup menu at the given position */ - void showPopup(KListView*, QListViewItem*, const QPoint&); + void showPopup(KListView*, TQListViewItem*, const TQPoint&); /** * Appends the whole search result to the printer queue. */ @@ -99,7 +99,7 @@ protected slots: // Protected slots signals: void moduleSelected(CSwordModuleInfo*); void moduleChanged(); - void strongsSelected(CSwordModuleInfo*, QStringList*); + void strongsSelected(CSwordModuleInfo*, TQStringList*); private: struct { diff --git a/bibletime/frontend/searchdialog/crangechooser.cpp b/bibletime/frontend/searchdialog/crangechooser.cpp index ca9aac9..2e0fd3e 100644 --- a/bibletime/frontend/searchdialog/crangechooser.cpp +++ b/bibletime/frontend/searchdialog/crangechooser.cpp @@ -20,20 +20,20 @@ #include "util/ctoolclass.h" //Qt includes -#include <qhbox.h> -#include <qvbox.h> -#include <qptrlist.h> -#include <qpainter.h> -#include <qlayout.h> -#include <qmap.h> -#include <qlineedit.h> -#include <qtextedit.h> -#include <qlabel.h> -#include <qsizepolicy.h> -#include <qpushbutton.h> -#include <qheader.h> -#include <qregexp.h> -#include <qmessagebox.h> +#include <tqhbox.h> +#include <tqvbox.h> +#include <tqptrlist.h> +#include <tqpainter.h> +#include <tqlayout.h> +#include <tqmap.h> +#include <tqlineedit.h> +#include <tqtextedit.h> +#include <tqlabel.h> +#include <tqsizepolicy.h> +#include <tqpushbutton.h> +#include <tqheader.h> +#include <tqregexp.h> +#include <tqmessagebox.h> //KDE includes #include <kapplication.h> @@ -45,33 +45,33 @@ namespace Search { namespace Options { /****************************/ -CRangeChooserDialog::RangeItem::RangeItem(QListView* view, QListViewItem* afterThis, const QString caption, const QString range) : KListViewItem(view, afterThis) { +CRangeChooserDialog::RangeItem::RangeItem(TQListView* view, TQListViewItem* afterThis, const TQString caption, const TQString range) : KListViewItem(view, afterThis) { setCaption(caption); setRange(range); } CRangeChooserDialog::RangeItem::~RangeItem() {} -const QString& CRangeChooserDialog::RangeItem::range() { +const TQString& CRangeChooserDialog::RangeItem::range() { // qWarning("ange is %s", (const char*)m_range.utf8()); return m_range; } -void CRangeChooserDialog::RangeItem::setRange(QString newRange) { +void CRangeChooserDialog::RangeItem::setRange(TQString newRange) { m_range = newRange; } -const QString CRangeChooserDialog::RangeItem::caption() { +const TQString CRangeChooserDialog::RangeItem::caption() { return text(0); } -void CRangeChooserDialog::RangeItem::setCaption(const QString newCaption) { +void CRangeChooserDialog::RangeItem::setCaption(const TQString newCaption) { setText(0, newCaption); } /**************************/ -CRangeChooserDialog::CRangeChooserDialog( QWidget* parentDialog ) : KDialogBase(Plain, i18n("Search range editor"), Default | Ok | Cancel, Ok, parentDialog, "CRangeChooserDialog", false, true) { +CRangeChooserDialog::CRangeChooserDialog( TQWidget* parentDialog ) : KDialogBase(Plain, i18n("Search range editor"), Default | Ok | Cancel, Ok, parentDialog, "CRangeChooserDialog", false, true) { initView(); initConnections(); @@ -96,35 +96,35 @@ CRangeChooserDialog::~CRangeChooserDialog() {} void CRangeChooserDialog::initView() { // setButtonOKText(i18n("")); - QGridLayout* grid = new QGridLayout(plainPage(),6,5,0,3); + TQGridLayout* grid = new TQGridLayout(plainPage(),6,5,0,3); m_rangeList = new KListView(plainPage()); m_rangeList->addColumn(i18n("Search range")); - m_rangeList->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding)); + m_rangeList->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding)); m_rangeList->setFullWidth(true); m_rangeList->setSorting(0, true); m_rangeList->header()->setClickEnabled(false); m_rangeList->header()->setMovingEnabled(false); grid->addMultiCellWidget(m_rangeList,0,4,0,1); - m_newRangeButton = new QPushButton(i18n("Add new range"),plainPage()); - connect(m_newRangeButton, SIGNAL(clicked()), this, SLOT(addNewRange())); + m_newRangeButton = new TQPushButton(i18n("Add new range"),plainPage()); + connect(m_newRangeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addNewRange())); grid->addWidget(m_newRangeButton,5,0); - m_deleteRangeButton = new QPushButton(i18n("Delete current range"),plainPage()); - connect(m_deleteRangeButton, SIGNAL(clicked()), this, SLOT(deleteCurrentRange())); + m_deleteRangeButton = new TQPushButton(i18n("Delete current range"),plainPage()); + connect(m_deleteRangeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteCurrentRange())); grid->addWidget(m_deleteRangeButton,5,1); grid->addColSpacing(2, 5); - QLabel* label = new QLabel(i18n("Name:"), plainPage()); - m_nameEdit = new QLineEdit(plainPage()); + TQLabel* label = new TQLabel(i18n("Name:"), plainPage()); + m_nameEdit = new TQLineEdit(plainPage()); grid->addWidget(label,0,3); grid->addWidget(m_nameEdit,0,4); - label = new QLabel(i18n("Edit current search range:"), plainPage()); + label = new TQLabel(i18n("Edit current search range:"), plainPage()); label->setFixedSize(label->sizeHint()); - m_rangeEdit = new QTextEdit(plainPage()); + m_rangeEdit = new TQTextEdit(plainPage()); m_rangeEdit->setTextFormat(Qt::PlainText); grid->addMultiCellWidget(label,1,1,3,4); grid->addMultiCellWidget(m_rangeEdit,2,2,3,4); @@ -147,16 +147,16 @@ void CRangeChooserDialog::initView() { /** Initializes the connections of this widget. */ void CRangeChooserDialog::initConnections() { - connect(m_rangeList, SIGNAL(selectionChanged(QListViewItem*)), - this, SLOT(editRange(QListViewItem*))); + connect(m_rangeList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQT_SLOT(editRange(TQListViewItem*))); - connect(m_rangeEdit, SIGNAL(textChanged()), - this, SLOT(parseRange())); - connect(m_rangeEdit, SIGNAL(textChanged()), - this, SLOT(rangeChanged())); + connect(m_rangeEdit, TQT_SIGNAL(textChanged()), + this, TQT_SLOT(parseRange())); + connect(m_rangeEdit, TQT_SIGNAL(textChanged()), + this, TQT_SLOT(rangeChanged())); - connect(m_nameEdit, SIGNAL(textChanged(const QString&)), - this, SLOT(nameChanged(const QString&))); + connect(m_nameEdit, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SLOT(nameChanged(const TQString&))); } /** Adds a new range to the list. */ @@ -170,7 +170,7 @@ void CRangeChooserDialog::addNewRange() { } /** No descriptions */ -void CRangeChooserDialog::editRange(QListViewItem* item) { +void CRangeChooserDialog::editRange(TQListViewItem* item) { RangeItem* const range = dynamic_cast<RangeItem*>(item); m_nameEdit->setEnabled( range ); //only if an item is selected enable the edit part @@ -189,13 +189,13 @@ void CRangeChooserDialog::parseRange() { m_resultList->clear(); //hack: repair range to work with Sword 1.5.6 - QString range( m_rangeEdit->text() ); - range.replace(QRegExp("\\s{0,}-\\s{0,}"), "-" ); + TQString range( m_rangeEdit->text() ); + range.replace(TQRegExp("\\s{0,}-\\s{0,}"), "-" ); sword::VerseKey key; sword::ListKey verses = key.ParseVerseList((const char*)range.utf8(), "Genesis 1:1", true); for (int i = 0; i < verses.Count(); ++i) { - new KListViewItem(m_resultList, QString::fromUtf8(verses.GetElement(i)->getRangeText())); + new KListViewItem(m_resultList, TQString::fromUtf8(verses.GetElement(i)->getRangeText())); // qWarning("range=%s, text=%s",verses.GetElement(i)->getRangeText(), verses.GetElement(i)->getText() ); } @@ -205,15 +205,15 @@ void CRangeChooserDialog::parseRange() { void CRangeChooserDialog::rangeChanged() { if (RangeItem* i = dynamic_cast<RangeItem*>(m_rangeList->currentItem()) ) { - QString range( m_rangeEdit->text() ); + TQString range( m_rangeEdit->text() ); //hack: repair range to work with Sword 1.5.6 - range.replace(QRegExp("\\s{0,}-\\s{0,}"), "-" ); + range.replace(TQRegExp("\\s{0,}-\\s{0,}"), "-" ); i->setRange(range); }; } /** No descriptions */ -void CRangeChooserDialog::nameChanged(const QString& newCaption) { +void CRangeChooserDialog::nameChanged(const TQString& newCaption) { m_rangeEdit->setEnabled(!newCaption.isEmpty()); m_resultList->setEnabled(!newCaption.isEmpty()); m_resultList->header()->setEnabled(!newCaption.isEmpty()); @@ -236,7 +236,7 @@ void CRangeChooserDialog::nameChanged(const QString& newCaption) { void CRangeChooserDialog::deleteCurrentRange() { if (RangeItem* i = dynamic_cast<RangeItem*>(m_rangeList->currentItem()) ) { - if (QListViewItem* selection = i->itemBelow() ? i->itemBelow() : i->itemAbove()) { + if (TQListViewItem* selection = i->itemBelow() ? i->itemBelow() : i->itemAbove()) { m_rangeList->setSelected(selection, true); m_rangeList->setCurrentItem(selection); } @@ -252,7 +252,7 @@ void CRangeChooserDialog::deleteCurrentRange() { void CRangeChooserDialog::slotOk() { //save the new map of search scopes CBTConfig::StringMap map; - QListViewItemIterator it( m_rangeList ); + TQListViewItemIterator it( m_rangeList ); for (;it.current(); ++it) { if ( RangeItem* i = dynamic_cast<RangeItem*>(it.current()) ) { map[i->caption()] = i->range(); diff --git a/bibletime/frontend/searchdialog/crangechooser.h b/bibletime/frontend/searchdialog/crangechooser.h index 8acb0c6..8db63a5 100644 --- a/bibletime/frontend/searchdialog/crangechooser.h +++ b/bibletime/frontend/searchdialog/crangechooser.h @@ -22,11 +22,11 @@ //Qt includes -#include <qwidget.h> -#include <qstring.h> -#include <qcanvas.h> -#include <qdict.h> -#include <qtooltip.h> +#include <tqwidget.h> +#include <tqstring.h> +#include <tqcanvas.h> +#include <tqdict.h> +#include <tqtooltip.h> //KDE includes #include <kdialog.h> @@ -39,7 +39,7 @@ class CSearchAnalysisLegendItem; class CSearchAnalysis; class CSearchAnalysisView; -class QTextEdit; +class TQTextEdit; namespace Search { namespace Options { @@ -47,20 +47,20 @@ namespace Search { class CRangeChooserDialog : public KDialogBase { Q_OBJECT public: - CRangeChooserDialog(QWidget* parentDialog); + CRangeChooserDialog(TQWidget* parentDialog); ~CRangeChooserDialog(); protected: // Protected methods class RangeItem : public KListViewItem { public: - RangeItem(QListView*, QListViewItem* afterThis = 0, const QString caption = QString::null, const QString range = QString::null); + RangeItem(TQListView*, TQListViewItem* afterThis = 0, const TQString caption = TQString::null, const TQString range = TQString::null); ~RangeItem(); - const QString& range(); - const QString caption(); - void setRange(QString range); - void setCaption(const QString); + const TQString& range(); + const TQString caption(); + void setRange(TQString range); + void setCaption(const TQString); private: - QString m_range; + TQString m_range; }; /** @@ -77,12 +77,12 @@ protected slots: // Protected slots * Adds a new range to the list. */ void addNewRange(); - void editRange(QListViewItem*); + void editRange(TQListViewItem*); /** * Parses the entered text and prints out the result in the list box below the edit area. */ void parseRange(); - void nameChanged(const QString&); + void nameChanged(const TQString&); void rangeChanged(); /** * Deletes the selected range. @@ -94,10 +94,10 @@ protected slots: // Protected slots private: KListView* m_rangeList; KListView* m_resultList; - QLineEdit* m_nameEdit; - QTextEdit* m_rangeEdit; - QPushButton* m_newRangeButton; - QPushButton* m_deleteRangeButton; + TQLineEdit* m_nameEdit; + TQTextEdit* m_rangeEdit; + TQPushButton* m_newRangeButton; + TQPushButton* m_deleteRangeButton; }; } //end of namespace Search.Options diff --git a/bibletime/frontend/searchdialog/csearchanalysis.cpp b/bibletime/frontend/searchdialog/csearchanalysis.cpp index 2c64f21..8a0a656 100644 --- a/bibletime/frontend/searchdialog/csearchanalysis.cpp +++ b/bibletime/frontend/searchdialog/csearchanalysis.cpp @@ -21,20 +21,20 @@ #include "util/ctoolclass.h" //Qt includes -#include <qhbox.h> -#include <qvbox.h> -#include <qptrlist.h> -#include <qpainter.h> -#include <qlayout.h> -#include <qmap.h> -#include <qlineedit.h> -#include <qtextedit.h> -#include <qlabel.h> -#include <qsizepolicy.h> -#include <qpushbutton.h> -#include <qheader.h> -#include <qregexp.h> -#include <qmessagebox.h> +#include <tqhbox.h> +#include <tqvbox.h> +#include <tqptrlist.h> +#include <tqpainter.h> +#include <tqlayout.h> +#include <tqmap.h> +#include <tqlineedit.h> +#include <tqtextedit.h> +#include <tqlabel.h> +#include <tqsizepolicy.h> +#include <tqpushbutton.h> +#include <tqheader.h> +#include <tqregexp.h> +#include <tqmessagebox.h> //KDE includes #include <kapplication.h> @@ -67,7 +67,7 @@ const int LEGEND_WIDTH = 85; /****************************/ -CSearchAnalysisDialog::CSearchAnalysisDialog( ListCSwordModuleInfo modules, QWidget* parentDialog ) : KDialogBase(Plain, i18n("Search analysis"), Close, Close, parentDialog, 0, true) { +CSearchAnalysisDialog::CSearchAnalysisDialog( ListCSwordModuleInfo modules, TQWidget* parentDialog ) : KDialogBase(Plain, i18n("Search analysis"), Close, Close, parentDialog, 0, true) { initView(); initConnections(); m_analysis->reset(); @@ -80,9 +80,9 @@ CSearchAnalysisDialog::~CSearchAnalysisDialog() {} /** Initializes this dialog. */ void CSearchAnalysisDialog::initView() { - QVBoxLayout* layout = new QVBoxLayout(plainPage(),0); + TQVBoxLayout* layout = new TQVBoxLayout(plainPage(),0); - QPushButton* button = new QPushButton(plainPage(), "button"); + TQPushButton* button = new TQPushButton(plainPage(), "button"); button->setIconSet(SmallIconSet("filesave")); button->setText(i18n("Save search analysis as HTML")); button->setFixedSize(button->sizeHint()); @@ -94,18 +94,18 @@ void CSearchAnalysisDialog::initView() { m_analysisView->show(); layout->addWidget(m_analysisView); - connect(button, SIGNAL(clicked()), m_analysis, SLOT(saveAsHTML())); + connect(button, TQT_SIGNAL(clicked()), m_analysis, TQT_SLOT(saveAsHTML())); } -/** Initializes the widgets SIGNAL and SLOT connections,. */ +/** Initializes the widgets TQT_SIGNAL and TQT_SLOT connections,. */ void CSearchAnalysisDialog::initConnections() {} /****************************/ /* CSearchAnalysis */ /****************************/ -CSearchAnalysis::CSearchAnalysis(QObject *parent, const char *name ) -: QCanvas(parent,name) { +CSearchAnalysis::CSearchAnalysis(TQObject *parent, const char *name ) +: TQCanvas(parent,name) { m_scaleFactor = 0.0; m_legend = 0; @@ -113,17 +113,17 @@ CSearchAnalysis::CSearchAnalysis(QObject *parent, const char *name ) m_canvasItemList.resize(67); m_canvasItemList.setAutoDelete(true); resize(1,1); - connect(this, SIGNAL(resized()), SLOT(slotResized())); + connect(this, TQT_SIGNAL(resized()), TQT_SLOT(slotResized())); } CSearchAnalysis::~CSearchAnalysis() {} -QDict<CSearchAnalysisItem>* CSearchAnalysis::getSearchAnalysisItemList() { +TQDict<CSearchAnalysisItem>* CSearchAnalysis::getSearchAnalysisItemList() { // Returns pointer to the search analysis items return &m_canvasItemList; } -/** Starts the analysis of the search result. This should be called only once because QCanvas handles the updates automatically. */ +/** Starts the analysis of the search result. This should be called only once because TQCanvas handles the updates automatically. */ void CSearchAnalysis::analyse(ListCSwordModuleInfo modules) { /** * Steps of analysing our search result; @@ -210,7 +210,7 @@ void CSearchAnalysis::setModules(ListCSwordModuleInfo modules) { void CSearchAnalysis::reset() { m_scaleFactor = 0.0; - QDictIterator<CSearchAnalysisItem> it( m_canvasItemList ); // iterator for items + TQDictIterator<CSearchAnalysisItem> it( m_canvasItemList ); // iterator for items while ( it.current() ) { it.current()->hide(); ++it; @@ -231,7 +231,7 @@ void CSearchAnalysis::reset() { void CSearchAnalysis::slotResized() { m_scaleFactor = (double)( (double)(height()-UPPER_BORDER-LOWER_BORDER-BAR_LOWER_BORDER-(m_moduleList.count()-1)*BAR_DELTAY) /(double)m_maxCount); - QDictIterator<CSearchAnalysisItem> it( m_canvasItemList ); + TQDictIterator<CSearchAnalysisItem> it( m_canvasItemList ); while ( it.current() ) { it.current()->setSize(BAR_WIDTH + (m_moduleList.count()-1)*BAR_DELTAX, height()-UPPER_BORDER-LOWER_BORDER); it.current()->setY(UPPER_BORDER); @@ -241,7 +241,7 @@ void CSearchAnalysis::slotResized() { } /** This function returns a color for each module */ -QColor CSearchAnalysis::getColor(int index) { +TQColor CSearchAnalysis::getColor(int index) { switch (index) { case 0: return Qt::red; @@ -269,7 +269,7 @@ QColor CSearchAnalysis::getColor(int index) { } /** Returns the count of the book in the module */ -const unsigned int CSearchAnalysis::getCount( const QString book, CSwordModuleInfo* module ) { +const unsigned int CSearchAnalysis::getCount( const TQString book, CSwordModuleInfo* module ) { sword::ListKey& result = module->searchResult(); const int length = book.length(); unsigned int i = m_lastPosList[module]; @@ -290,8 +290,8 @@ const unsigned int CSearchAnalysis::getCount( const QString book, CSwordModuleIn //------------------------------------------------------------------ //------------------------------------------------------------------ -CSearchAnalysisItem::CSearchAnalysisItem(QCanvas *parent, const int moduleCount, const QString &bookname, double *scaleFactor, ListCSwordModuleInfo* modules) -: QCanvasRectangle(parent), +CSearchAnalysisItem::CSearchAnalysisItem(TQCanvas *parent, const int moduleCount, const TQString &bookname, double *scaleFactor, ListCSwordModuleInfo* modules) +: TQCanvasRectangle(parent), m_moduleList( modules ), m_scaleFactor(scaleFactor), m_bookName(bookname), @@ -318,12 +318,12 @@ int CSearchAnalysisItem::getCountForModule( const int moduleIndex) { } /** Reimplementation. Draws the content of this item. */ -void CSearchAnalysisItem::draw(QPainter& painter) { - QFont f = painter.font(); +void CSearchAnalysisItem::draw(TQPainter& painter) { + TQFont f = painter.font(); f.setPointSize(ITEM_TEXT_SIZE); painter.setFont(f); - setPen(QPen(black,1)); + setPen(TQPen(black,1)); setBrush(Qt::red); /** * We have to paint so many bars as we have modules available (we use m_moduleCount) @@ -343,12 +343,12 @@ void CSearchAnalysisItem::draw(QPainter& painter) { while (drawn < m_moduleCount) { for (index = 0; index < m_moduleCount; index++) { if (m_resultCountArray[index] == Value) { - QPoint p1((int)x() + (m_moduleCount-drawn-1)*BAR_DELTAX, + TQPoint p1((int)x() + (m_moduleCount-drawn-1)*BAR_DELTAX, (int)height() + (int)y() - BAR_LOWER_BORDER - (m_moduleCount-drawn)*BAR_DELTAY); - QPoint p2(p1.x() + BAR_WIDTH, + TQPoint p2(p1.x() + BAR_WIDTH, p1.y() - (int)( !m_resultCountArray[index] ? 0 : ((m_resultCountArray[index])*(*m_scaleFactor))) ); - QRect r(p1, p2); - painter.fillRect(r, QBrush(CSearchAnalysis::getColor(index)) ); + TQRect r(p1, p2); + painter.fillRect(r, TQBrush(CSearchAnalysis::getColor(index)) ); painter.drawRect(r); drawn++; } @@ -361,17 +361,17 @@ void CSearchAnalysisItem::draw(QPainter& painter) { Value = newValue; } if (!m_bufferPixmap) { - m_bufferPixmap = new QPixmap(); + m_bufferPixmap = new TQPixmap(); m_bufferPixmap->resize(width(),BAR_LOWER_BORDER); m_bufferPixmap->fill(); - QPainter p(m_bufferPixmap); + TQPainter p(m_bufferPixmap); f = p.font(); f.setPointSize(ITEM_TEXT_SIZE); p.setFont(f); p.rotate(90); - p.drawText(QPoint(5,0), m_bookName); + p.drawText(TQPoint(5,0), m_bookName); } - painter.drawPixmap(QPoint(int(x()),int(height()+y()-BAR_LOWER_BORDER)), *m_bufferPixmap); + painter.drawPixmap(TQPoint(int(x()),int(height()+y()-BAR_LOWER_BORDER)), *m_bufferPixmap); } /** Returns the width of this item. */ @@ -380,8 +380,8 @@ int CSearchAnalysisItem::width() { } /** Returns the tooltip for this item. */ -const QString CSearchAnalysisItem::getToolTip() { - QString ret = QString("<center><b>%1</b></center><hr/>").arg(m_bookName); +const TQString CSearchAnalysisItem::getToolTip() { + TQString ret = TQString("<center><b>%1</b></center><hr/>").arg(m_bookName); ret += "<table cellspacing=\"0\" cellpadding=\"3\" width=\"100%\" height=\"100%\" align=\"center\">"; //ToDo: Fix that loop @@ -391,12 +391,12 @@ const QString CSearchAnalysisItem::getToolTip() { for (ListCSwordModuleInfo::iterator it(m_moduleList->begin()); it != end_it; ++it) { // for (int i = 0; i < m_moduleCount; ++i) { CSwordModuleInfo* info = (*it); - const QColor c = CSearchAnalysis::getColor(i); + const TQColor c = CSearchAnalysis::getColor(i); ret.append( - QString("<tr bgcolor=\"white\"><td><b><font color=\"#%1\">%2</font></b></td><td>%3 (%4%)</td></tr>") - .arg(QString().sprintf("%02X%02X%02X",c.red(),c.green(),c.blue())) - .arg(info ? info->name() : QString::null) + TQString("<tr bgcolor=\"white\"><td><b><font color=\"#%1\">%2</font></b></td><td>%3 (%4%)</td></tr>") + .arg(TQString().sprintf("%02X%02X%02X",c.red(),c.green(),c.blue())) + .arg(info ? info->name() : TQString::null) .arg( m_resultCountArray[i] ) .arg( (info && m_resultCountArray[i])? ((double)m_resultCountArray[i] / (double)info->searchResult().Count())*(double)100 : 0.0, 0, 'g', 2) ); @@ -411,56 +411,56 @@ const QString CSearchAnalysisItem::getToolTip() { //------------------------------------------------------------------ //------------------------------------------------------------------ -CSearchAnalysisView::CSearchAnalysisView(QCanvas* canvas, QWidget* parent) -: QCanvasView(canvas, parent) { - setFocusPolicy(QWidget::WheelFocus); +CSearchAnalysisView::CSearchAnalysisView(TQCanvas* canvas, TQWidget* parent) +: TQCanvasView(canvas, parent) { + setFocusPolicy(TQWidget::WheelFocus); m_toolTip = new ToolTip(this); resize(sizeHint()); } /** Returns the sizeHint for this view */ -QSize CSearchAnalysisView::sizeHint() { +TQSize CSearchAnalysisView::sizeHint() { if ( parentWidget() ) return parentWidget()->sizeHint(); - return QCanvasView::sizeHint(); + return TQCanvasView::sizeHint(); } /** No descriptions */ -void CSearchAnalysisView::resizeEvent( QResizeEvent* e) { - QCanvasView::resizeEvent(e); +void CSearchAnalysisView::resizeEvent( TQResizeEvent* e) { + TQCanvasView::resizeEvent(e); canvas()->resize( canvas()->width(), viewport()->height() ); } -CSearchAnalysisView::ToolTip::ToolTip(QWidget* parent) : QToolTip(parent) {} +CSearchAnalysisView::ToolTip::ToolTip(TQWidget* parent) : TQToolTip(parent) {} -void CSearchAnalysisView::ToolTip::maybeTip(const QPoint& p) { +void CSearchAnalysisView::ToolTip::maybeTip(const TQPoint& p) { CSearchAnalysisView* view = dynamic_cast<CSearchAnalysisView*>(parentWidget()); if (!view) return; - QPoint point(p); + TQPoint point(p); point = view->viewport()->mapFrom(view, point); CSearchAnalysisItem* i = view->itemAt( view->viewportToContents(point) ); if (!i) return; //get type of item and display correct text - QString text = i->getToolTip(); + TQString text = i->getToolTip(); if (text.isEmpty()) return; - QPoint p1 = view->viewport()->mapTo(view, view->contentsToViewport(i->rect().topLeft())); + TQPoint p1 = view->viewport()->mapTo(view, view->contentsToViewport(i->rect().topLeft())); p1.setY(0); - QPoint p2 = view->viewport()->mapTo(view, view->contentsToViewport(i->rect().bottomRight())); + TQPoint p2 = view->viewport()->mapTo(view, view->contentsToViewport(i->rect().bottomRight())); p2.setY(view->height()); - QRect r = QRect( p1, p2 ); + TQRect r = TQRect( p1, p2 ); if (r.contains(p)) tip(r, text); } /** Returns the item at position p. If there no item at that point return 0. */ -CSearchAnalysisItem* CSearchAnalysisView::itemAt( const QPoint& p ) { - QCanvasItemList l = canvas()->collisions(p); +CSearchAnalysisItem* CSearchAnalysisView::itemAt( const TQPoint& p ) { + TQCanvasItemList l = canvas()->collisions(p); if (!l.count()) return 0; return dynamic_cast<CSearchAnalysisItem*>(l.first()); @@ -469,25 +469,25 @@ CSearchAnalysisItem* CSearchAnalysisView::itemAt( const QPoint& p ) { //------------------------------------------------------------------ //------------------------------------------------------------------ -CSearchAnalysisLegendItem::CSearchAnalysisLegendItem(QCanvas *parent, ListCSwordModuleInfo *list ) -: QCanvasRectangle(parent) { +CSearchAnalysisLegendItem::CSearchAnalysisLegendItem(TQCanvas *parent, ListCSwordModuleInfo *list ) +: TQCanvasRectangle(parent) { m_moduleList = list; } /** Reimplementation. Draws the content of this item. */ -void CSearchAnalysisLegendItem::draw (QPainter& painter) { +void CSearchAnalysisLegendItem::draw (TQPainter& painter) { painter.save(); - setPen( QPen(black,2) ); + setPen( TQPen(black,2) ); setBrush( Qt::white ); //the outer rectangle - QPoint p1( (int)x(), (int)y() ); - QPoint p2( (int)x()+width(), (int)y() + height() ); - QRect r(p1, p2); + TQPoint p1( (int)x(), (int)y() ); + TQPoint p2( (int)x()+width(), (int)y() + height() ); + TQRect r(p1, p2); r.normalize(); painter.drawRect(r); - QFont f = painter.font(); + TQFont f = painter.font(); f.setPointSize(ITEM_TEXT_SIZE); painter.setFont(f); @@ -496,14 +496,14 @@ void CSearchAnalysisLegendItem::draw (QPainter& painter) { ListCSwordModuleInfo::iterator end_it = m_moduleList->end(); for (ListCSwordModuleInfo::iterator it(m_moduleList->begin()); it != end_it; ++it) { // the module color indicators - QPoint p1( (int)x() + LEGEND_INNER_BORDER, (int)y() + LEGEND_INNER_BORDER + moduleIndex*(LEGEND_DELTAY + ITEM_TEXT_SIZE) ); - QPoint p2(p1.x() + ITEM_TEXT_SIZE, p1.y() + ITEM_TEXT_SIZE); - QRect r(p1,p2); - painter.fillRect(r, QBrush(CSearchAnalysis::getColor(moduleIndex)) ); + TQPoint p1( (int)x() + LEGEND_INNER_BORDER, (int)y() + LEGEND_INNER_BORDER + moduleIndex*(LEGEND_DELTAY + ITEM_TEXT_SIZE) ); + TQPoint p2(p1.x() + ITEM_TEXT_SIZE, p1.y() + ITEM_TEXT_SIZE); + TQRect r(p1,p2); + painter.fillRect(r, TQBrush(CSearchAnalysis::getColor(moduleIndex)) ); r.normalize(); painter.drawRect(r); - QPoint p3( p2.x() + LEGEND_INNER_BORDER, p2.y() ); + TQPoint p3( p2.x() + LEGEND_INNER_BORDER, p2.y() ); painter.drawText(p3, (*it)->name() ); ++moduleIndex; @@ -513,8 +513,8 @@ void CSearchAnalysisLegendItem::draw (QPainter& painter) { /** No descriptions */ void CSearchAnalysis::saveAsHTML() { - const QString file = KFileDialog::getSaveFileName(QString::null, - QString("*.html | %1").arg(i18n("HTML files")), + const TQString file = KFileDialog::getSaveFileName(TQString::null, + TQString("*.html | %1").arg(i18n("HTML files")), 0, i18n("Save Search Analysis")); if (file.isNull()) { @@ -523,13 +523,13 @@ void CSearchAnalysis::saveAsHTML() { int moduleIndex = 0; int count = 0; - QString countStr = ""; - QString m_searchAnalysisHTML = ""; - QString tableTitle = ""; - QString tableTotals = ""; - QString VerseRange = ""; - const QString txtCSS = QString("<style type=\"text/css\">\ntd {border:1px solid black;}\nth {font-size: 130%; text-align:left; vertical-align:top;}\n</style>\n"); - const QString metaEncoding = QString("<META http-equiv=Content-Type content=\"text/html; charset=utf-8\">"); + TQString countStr = ""; + TQString m_searchAnalysisHTML = ""; + TQString tableTitle = ""; + TQString tableTotals = ""; + TQString VerseRange = ""; + const TQString txtCSS = TQString("<style type=\"text/css\">\ntd {border:1px solid black;}\nth {font-size: 130%; text-align:left; vertical-align:top;}\n</style>\n"); + const TQString metaEncoding = TQString("<META http-equiv=Content-Type content=\"text/html; charset=utf-8\">"); CSwordVerseKey key(0); sword::ListKey searchResult; @@ -537,7 +537,7 @@ void CSearchAnalysis::saveAsHTML() { CSearchAnalysisItem* analysisItem = m_canvasItemList.find( key.book() ); - QString text = "<html>\n<head>\n<title>" + i18n("BibleTime Search Analysis") + "</title>\n" + txtCSS + metaEncoding + "</head>\n<body>\n"; + TQString text = "<html>\n<head>\n<title>" + i18n("BibleTime Search Analysis") + "</title>\n" + txtCSS + metaEncoding + "</head>\n<body>\n"; text += "<table>\n<tr><th>" + i18n("Search text :") + "</th><th>" + CSearchDialog::getSearchDialog()->searchText() + "</th></tr>\n"; tableTitle = "<tr><th align=\"left\">" + i18n("Book") + "</th>"; @@ -546,20 +546,20 @@ void CSearchAnalysis::saveAsHTML() { moduleIndex = 0; ListCSwordModuleInfo::iterator end_it = m_moduleList.end(); for (ListCSwordModuleInfo::iterator it(m_moduleList.begin()); it != end_it; ++it) { - tableTitle += QString("<th align=\"left\">") + (*it)->name() + QString("</th>"); + tableTitle += TQString("<th align=\"left\">") + (*it)->name() + TQString("</th>"); searchResult = (*it)->searchResult(); countStr.setNum(searchResult.Count()); - tableTotals += QString("<td align=\"right\">") + countStr + QString("</td>"); + tableTotals += TQString("<td align=\"right\">") + countStr + TQString("</td>"); ++moduleIndex; } - tableTitle += QString("</tr>\n"); - tableTotals += QString("</tr>\n"); + tableTitle += TQString("</tr>\n"); + tableTotals += TQString("</tr>\n"); m_searchAnalysisHTML = ""; bool ok = true; while (ok) { - m_searchAnalysisHTML += QString("<tr><td>") + key.book() + QString("</td>"); + m_searchAnalysisHTML += TQString("<tr><td>") + key.book() + TQString("</td>"); analysisItem = m_canvasItemList.find( key.book() ); // for (moduleIndex = 0, m_moduleList.first(); m_moduleList.current(); m_moduleList.next(), ++moduleIndex) { @@ -568,19 +568,19 @@ void CSearchAnalysis::saveAsHTML() { for (ListCSwordModuleInfo::iterator it(m_moduleList.begin()); it != end_it; ++it) { count = analysisItem->getCountForModule(moduleIndex); countStr.setNum(count); - m_searchAnalysisHTML += QString("<td align=\"right\">") + countStr + QString("</td>"); + m_searchAnalysisHTML += TQString("<td align=\"right\">") + countStr + TQString("</td>"); ++moduleIndex; } - m_searchAnalysisHTML += QString("</tr>\n"); + m_searchAnalysisHTML += TQString("</tr>\n"); ok = key.next(CSwordVerseKey::UseBook); } - text += QString("<table>\n") + tableTitle + tableTotals + m_searchAnalysisHTML + QString("</table>\n"); - text += QString("<center>") + i18n("Created by") + QString(" <a href=\"http://www.bibletime.info/\">BibleTime</a></center>"); - text += QString("</body></html>"); + text += TQString("<table>\n") + tableTitle + tableTotals + m_searchAnalysisHTML + TQString("</table>\n"); + text += TQString("<center>") + i18n("Created by") + TQString(" <a href=\"http://www.bibletime.info/\">BibleTime</a></center>"); + text += TQString("</body></html>"); - CToolClass::savePlainFile(file, text, false, QTextStream::UnicodeUTF8); + CToolClass::savePlainFile(file, text, false, TQTextStream::UnicodeUTF8); } } //end of namespace Search::Analysis diff --git a/bibletime/frontend/searchdialog/csearchanalysis.h b/bibletime/frontend/searchdialog/csearchanalysis.h index 013efaa..6fed8ea 100644 --- a/bibletime/frontend/searchdialog/csearchanalysis.h +++ b/bibletime/frontend/searchdialog/csearchanalysis.h @@ -24,11 +24,11 @@ //Qt includes -#include <qwidget.h> -#include <qstring.h> -#include <qcanvas.h> -#include <qdict.h> -#include <qtooltip.h> +#include <tqwidget.h> +#include <tqstring.h> +#include <tqcanvas.h> +#include <tqdict.h> +#include <tqtooltip.h> //KDE includes #include <kdialog.h> @@ -36,7 +36,7 @@ #include <klistview.h> -class QTextEdit; +class TQTextEdit; namespace Search { namespace Analysis { @@ -50,26 +50,26 @@ class CSearchAnalysisView; * CSearchDialogAnaylsis shows the graphical analysis of the search result. * @author The BibleTime Team */ -class CSearchAnalysis : public QCanvas { +class CSearchAnalysis : public TQCanvas { Q_OBJECT public: - CSearchAnalysis(QObject *parent=0, const char *name=0); + CSearchAnalysis(TQObject *parent=0, const char *name=0); virtual ~CSearchAnalysis(); /** * Starts the analysis of the search result. * This should be called only once because - * QCanvas handles the updates automatically. + * TQCanvas handles the updates automatically. */ void analyse(ListCSwordModuleInfo modules); /** * This function returns a color for each module * @return The color at position index in the list */ - static QColor getColor(int index); + static TQColor getColor(int index); /* * This function returns a pointer to the list of AnalysisItems */ - QDict<CSearchAnalysisItem>* getSearchAnalysisItemList(); + TQDict<CSearchAnalysisItem>* getSearchAnalysisItemList(); void reset(); protected slots: // Protected slots @@ -85,11 +85,11 @@ private: /** * Returns the count of the book in the module */ - const unsigned int getCount( const QString book, CSwordModuleInfo* module ); + const unsigned int getCount( const TQString book, CSwordModuleInfo* module ); ListCSwordModuleInfo m_moduleList; - QDict<CSearchAnalysisItem> m_canvasItemList; - QMap<CSwordModuleInfo*,unsigned int> m_lastPosList; + TQDict<CSearchAnalysisItem> m_canvasItemList; + TQMap<CSwordModuleInfo*,unsigned int> m_lastPosList; int m_maxCount; double m_scaleFactor; CSearchAnalysisLegendItem* m_legend; @@ -102,12 +102,12 @@ public slots: // Public slots class CSearchAnalysisDialog : public KDialogBase { Q_OBJECT public: - CSearchAnalysisDialog(ListCSwordModuleInfo modules, QWidget* parentDialog); + CSearchAnalysisDialog(ListCSwordModuleInfo modules, TQWidget* parentDialog); ~CSearchAnalysisDialog(); protected: // Protected methods /** - * Initializes the widgets SIGNAL and SLOT connections,. + * Initializes the widgets TQT_SIGNAL and TQT_SLOT connections,. */ void initConnections(); @@ -128,12 +128,12 @@ private: /** Paints the bars for one book for one or more modules * */ -class CSearchAnalysisItem : public QCanvasRectangle { +class CSearchAnalysisItem : public TQCanvasRectangle { public: /** * Standard constructor. */ - CSearchAnalysisItem(QCanvas* parent, const int moduleCount, const QString& bookname, double *scaleFactor, ListCSwordModuleInfo* modules); + CSearchAnalysisItem(TQCanvas* parent, const int moduleCount, const TQString& bookname, double *scaleFactor, ListCSwordModuleInfo* modules); virtual ~CSearchAnalysisItem(); /** * Sets the resultcount of this item @@ -151,66 +151,66 @@ public: /** * Returns the tooltip for this item. */ - const QString getToolTip(); + const TQString getToolTip(); private: - virtual void draw (QPainter & painter); + virtual void draw (TQPainter & painter); ListCSwordModuleInfo* m_moduleList; double *m_scaleFactor; - QString m_bookName; + TQString m_bookName; int m_moduleCount; - QMemArray<int> m_resultCountArray; - QPixmap* m_bufferPixmap; + TQMemArray<int> m_resultCountArray; + TQPixmap* m_bufferPixmap; }; -class CSearchAnalysisLegendItem : public QCanvasRectangle { +class CSearchAnalysisLegendItem : public TQCanvasRectangle { public: - CSearchAnalysisLegendItem(QCanvas* parent, ListCSwordModuleInfo* list ); + CSearchAnalysisLegendItem(TQCanvas* parent, ListCSwordModuleInfo* list ); private: - virtual void draw (QPainter & painter); + virtual void draw (TQPainter & painter); ListCSwordModuleInfo* m_moduleList; }; //---------------------------------------------------------- //---------------------------------------------------------- -class CSearchAnalysisView : public QCanvasView { +class CSearchAnalysisView : public TQCanvasView { Q_OBJECT public: /** * Standard constructor */ - CSearchAnalysisView(QCanvas* canvas, QWidget* parent); + CSearchAnalysisView(TQCanvas* canvas, TQWidget* parent); /** * Returns the sizeHint for this view * We give back the size of the parent widgetas default. - * This is a reimplementation from QCanvasView::sizeHint(). + * This is a reimplementation from TQCanvasView::sizeHint(). */ - virtual QSize sizeHint(); + virtual TQSize sizeHint(); /** * Returns the item at position p. * If there no item at that point return 0. */ - CSearchAnalysisItem* itemAt( const QPoint& p ); + CSearchAnalysisItem* itemAt( const TQPoint& p ); protected: /** * Reimplementation. */ - virtual void resizeEvent(QResizeEvent* e); + virtual void resizeEvent(TQResizeEvent* e); private: - class ToolTip : public QToolTip { + class ToolTip : public TQToolTip { public: - ToolTip(QWidget* parent); + ToolTip(TQWidget* parent); virtual ~ToolTip() {} ; /** * Displays a tooltip for position p */ - virtual void maybeTip(const QPoint &pos); + virtual void maybeTip(const TQPoint &pos); }; ToolTip* m_toolTip; diff --git a/bibletime/frontend/searchdialog/csearchdialog.cpp b/bibletime/frontend/searchdialog/csearchdialog.cpp index beef7c4..af1538a 100644 --- a/bibletime/frontend/searchdialog/csearchdialog.cpp +++ b/bibletime/frontend/searchdialog/csearchdialog.cpp @@ -24,20 +24,20 @@ #include "util/ctoolclass.h" //Qt includes -#include <qhbox.h> -#include <qvbox.h> -#include <qptrlist.h> -#include <qpainter.h> -#include <qlayout.h> -#include <qmap.h> -#include <qlineedit.h> -#include <qtextedit.h> -#include <qlabel.h> -#include <qsizepolicy.h> -#include <qpushbutton.h> -#include <qheader.h> -#include <qregexp.h> -#include <qmessagebox.h> +#include <tqhbox.h> +#include <tqvbox.h> +#include <tqptrlist.h> +#include <tqpainter.h> +#include <tqlayout.h> +#include <tqmap.h> +#include <tqlineedit.h> +#include <tqtextedit.h> +#include <tqlabel.h> +#include <tqsizepolicy.h> +#include <tqpushbutton.h> +#include <tqheader.h> +#include <tqregexp.h> +#include <tqmessagebox.h> //KDE includes #include <kapplication.h> @@ -49,7 +49,7 @@ namespace Search { static CSearchDialog* m_staticDialog = 0; -void CSearchDialog::openDialog(const ListCSwordModuleInfo modules, const QString& searchText, QWidget* parentDialog) { +void CSearchDialog::openDialog(const ListCSwordModuleInfo modules, const TQString& searchText, TQWidget* parentDialog) { if (!m_staticDialog) { m_staticDialog = new CSearchDialog(parentDialog); }; @@ -81,13 +81,13 @@ CSearchDialog* const CSearchDialog::getSearchDialog() { return m_staticDialog; }; -CSearchDialog::CSearchDialog(QWidget *parent) +CSearchDialog::CSearchDialog(TQWidget *parent) : KDialogBase(Plain, i18n("Search dialog"), Close | User1, User1, parent, "CSearchDialog", false, true, i18n("Search")) { setWFlags( getWFlags() | Qt::WStyle_MinMax ); setIcon(CResMgr::searchdialog::icon); - m_searcher.connectFinished( this, SLOT(searchFinished())); + m_searcher.connectFinished( this, TQT_SLOT(searchFinished())); initView(); initConnections(); @@ -100,7 +100,7 @@ CSearchDialog::~CSearchDialog(){ /** Starts the search with the set modules and the set search text. */ void CSearchDialog::startSearch() { - QString searchText(m_searchOptionsPage->searchText()); + TQString searchText(m_searchOptionsPage->searchText()); if (searchText.isEmpty()) { return; @@ -108,15 +108,15 @@ void CSearchDialog::startSearch() { // check that we have the indices we need for searching if (!m_searcher.modulesHaveIndices( modules() ) ) { - int result = QMessageBox::question(this, i18n("Missing indices"), + int result = TQMessageBox::question(this, i18n("Missing indices"), i18n("One or more modules need indexing before they can be searched.\n" "This could take a long time. Proceed with indexing?"), - QMessageBox::Yes | QMessageBox::Default, - QMessageBox::No | QMessageBox::Escape); + TQMessageBox::Yes | TQMessageBox::Default, + TQMessageBox::No | TQMessageBox::Escape); // In SuSE 10.0 the result is the logical or of the button type, just like it is - // inputed into the QMessageBox. - if ( (result == (QMessageBox::Yes | QMessageBox::Default)) || - (result == QMessageBox::Yes) || (result == QMessageBox::Default) ) { + // inputed into the TQMessageBox. + if ( (result == (TQMessageBox::Yes | TQMessageBox::Default)) || + (result == TQMessageBox::Yes) || (result == TQMessageBox::Default) ) { CModuleIndexDialog* dlg = CModuleIndexDialog::getInstance(); dlg->indexUnindexedModules( modules() ); } @@ -155,7 +155,7 @@ void CSearchDialog::startSearch() { } /** Starts the search with the given module list and given search text. */ -void CSearchDialog::startSearch( const ListCSwordModuleInfo modules, const QString& searchText) { +void CSearchDialog::startSearch( const ListCSwordModuleInfo modules, const TQString& searchText) { m_searchResultPage->reset(); m_searchOptionsPage->reset(); setModules(modules); @@ -176,7 +176,7 @@ void CSearchDialog::setModules( const ListCSwordModuleInfo modules ) { } /** Returns the search text which is set currently. */ -const QString CSearchDialog::searchText() { +const TQString CSearchDialog::searchText() { return m_searchOptionsPage->searchText(); } @@ -195,7 +195,7 @@ sword::ListKey CSearchDialog::searchScope() { // } /** Returns the search text which is used for the search. */ -void CSearchDialog::setSearchText( const QString searchText ) { +void CSearchDialog::setSearchText( const TQString searchText ) { m_searchOptionsPage->setSearchText(searchText); } @@ -203,7 +203,7 @@ void CSearchDialog::setSearchText( const QString searchText ) { void CSearchDialog::initView() { setButtonTip(User1, CResMgr::searchdialog::searchButton::tooltip); - QVBoxLayout *box = new QVBoxLayout( plainPage(), 0, spacingHint() ); + TQVBoxLayout *box = new TQVBoxLayout( plainPage(), 0, spacingHint() ); m_searchOptionsPage = new Options::CSearchOptionsPage(plainPage()); box->addWidget( m_searchOptionsPage ); @@ -244,8 +244,8 @@ void CSearchDialog::showModulesSelector() { /** Initializes the signal slot connections */ void CSearchDialog::initConnections() { - connect(this, SIGNAL(user1Clicked()), SLOT(startSearch())); - connect(this, SIGNAL(closeClicked()), SLOT(slotDelayedDestruct())); + connect(this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(startSearch())); + connect(this, TQT_SIGNAL(closeClicked()), TQT_SLOT(slotDelayedDestruct())); } /** Resets the parts to the default. */ diff --git a/bibletime/frontend/searchdialog/csearchdialog.h b/bibletime/frontend/searchdialog/csearchdialog.h index c64ff44..455b98b 100644 --- a/bibletime/frontend/searchdialog/csearchdialog.h +++ b/bibletime/frontend/searchdialog/csearchdialog.h @@ -25,11 +25,11 @@ //Qt includes -#include <qwidget.h> -#include <qstring.h> -#include <qcanvas.h> -#include <qdict.h> -#include <qtooltip.h> +#include <tqwidget.h> +#include <tqstring.h> +#include <tqcanvas.h> +#include <tqdict.h> +#include <tqtooltip.h> //KDE includes #include <kdialog.h> @@ -37,8 +37,8 @@ //forward declarations -class QLineEdit; -class QTextEdit; +class TQLineEdit; +class TQTextEdit; namespace Search { /** @@ -48,7 +48,7 @@ class CSearchDialog : public KDialogBase { Q_OBJECT public: - static void openDialog(const ListCSwordModuleInfo modules, const QString& searchText = QString::null, QWidget* parentDialog = 0); + static void openDialog(const ListCSwordModuleInfo modules, const TQString& searchText = TQString::null, TQWidget* parentDialog = 0); protected: friend class Analysis::CSearchAnalysis; @@ -64,7 +64,7 @@ protected: * The cinstructor of the dialog. It's protected because you should use the static public function openDialog. * The dialog destroys itself if it was closed. */ - CSearchDialog(QWidget *parent); + CSearchDialog(TQWidget *parent); ~CSearchDialog(); /** @@ -75,7 +75,7 @@ protected: * Starts the search with the given module list and given search text. * Doesn't wait for the start button press, starts immediatly */ - void startSearch( const ListCSwordModuleInfo modules, const QString& searchText); + void startSearch( const ListCSwordModuleInfo modules, const TQString& searchText); /** * Sets the list of modules for the search. */ @@ -87,11 +87,11 @@ protected: /** * Returns the search text which is used for the search. */ - void setSearchText( const QString searchText ); + void setSearchText( const TQString searchText ); /** * Returns the search text which is set currently. */ - const QString searchText(); + const TQString searchText(); /** * Returns the used search scope as a list key */ diff --git a/bibletime/frontend/searchdialog/csearchdialogpages.cpp b/bibletime/frontend/searchdialog/csearchdialogpages.cpp index 473dc91..53853ed 100644 --- a/bibletime/frontend/searchdialog/csearchdialogpages.cpp +++ b/bibletime/frontend/searchdialog/csearchdialogpages.cpp @@ -28,11 +28,11 @@ #include "util/ctoolclass.h" //Qt includes -#include <qlayout.h> -#include <qpushbutton.h> -#include <qlabel.h> -#include <qregexp.h> -#include <qeventloop.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqlabel.h> +#include <tqregexp.h> +#include <tqeventloop.h> //KDE includes #include <klocale.h> @@ -60,12 +60,12 @@ void StrongsResultClass::initStrongsResults(void) { CDisplayRendering render; ListCSwordModuleInfo modules; CTextRendering::KeyTreeItem::Settings settings; - QString rText, lText, key; + TQString rText, lText, key; bool found; int sIndex; int count; int index; - QString text; + TQString text; modules.append(srModule); sword::ListKey& result = srModule->searchResult(); @@ -87,7 +87,7 @@ KApplication::kApplication()->processEvents( 1 ); //1 ms only progress->progressBar()->setProgress( int( (index*100) / count ) ); KApplication::kApplication()->processEvents( 1 ); //1 ms only - key = QString::fromUtf8(result.GetElement(index)->getText()); + key = TQString::fromUtf8(result.GetElement(index)->getText()); text = render.renderSingleKey(key, modules, settings); sIndex = 0; while ((rText = getStrongsNumberText(text, &sIndex)) != "") @@ -113,10 +113,10 @@ KApplication::kApplication()->processEvents( 1 ); //1 ms only //qHeapSort(srList); } -QString StrongsResultClass::getStrongsNumberText(const QString& verseContent, int *startIndex) { +TQString StrongsResultClass::getStrongsNumberText(const TQString& verseContent, int *startIndex) { // get the strongs text int idx1, idx2, index; - QString sNumber, strongsText; + TQString sNumber, strongsText; //const bool cs = CSwordModuleSearch::caseSensitive; const bool cs = false; @@ -150,14 +150,14 @@ QString StrongsResultClass::getStrongsNumberText(const QString& verseContent, in index += 6; // 6 is the length of "lemma=" } } - return QString::null; + return TQString::null; } /******************************************** ********** CSearchDialogResultPage ********* ********************************************/ -CSearchResultPage::CSearchResultPage(QWidget *parent, const char *name ) : +CSearchResultPage::CSearchResultPage(TQWidget *parent, const char *name ) : SearchResultsForm(parent, name) { initView(); initConnections(); @@ -167,14 +167,14 @@ CSearchResultPage::~CSearchResultPage() {} /** Initializes the view of this widget. */ void CSearchResultPage::initView() { - QVBoxLayout* frameLayout = new QVBoxLayout(m_displayFrame, 0, 6, "frameLayout"); + TQVBoxLayout* frameLayout = new TQVBoxLayout(m_displayFrame, 0, 6, "frameLayout"); m_previewDisplay = CDisplay::createReadInstance(0, m_displayFrame); frameLayout->addWidget(m_previewDisplay->view()); } /** Sets the modules which contain the result of each. */ void CSearchResultPage::setSearchResult(ListCSwordModuleInfo modules) { - const QString searchedText = CSearchDialog::getSearchDialog()->searchText(); + const TQString searchedText = CSearchDialog::getSearchDialog()->searchText(); reset(); //clear current modules m_modules = modules; @@ -198,7 +198,7 @@ void CSearchResultPage::setSearchResult(ListCSwordModuleInfo modules) { void CSearchResultPage::reset() { m_moduleListBox->clear(); m_resultListBox->clear(); - m_previewDisplay->setText(QString::null); + m_previewDisplay->setText(TQString::null); m_analyseButton->setEnabled(false); // m_modules.setAutoDelete(false); //make sure we don't delete modules accidentally m_modules.clear(); @@ -206,15 +206,15 @@ void CSearchResultPage::reset() { /** Update the preview of the selected key. */ -void CSearchResultPage::updatePreview(const QString& key) { +void CSearchResultPage::updatePreview(const TQString& key) { using namespace Rendering; CSwordModuleInfo* module = m_moduleListBox->activeModule(); if ( module ) { - const QString searchedText = CSearchDialog::getSearchDialog()->searchText(); + const TQString searchedText = CSearchDialog::getSearchDialog()->searchText(); //const int searchFlags = CSearchDialog::getSearchDialog()->searchFlags(); - QString text; + TQString text; CDisplayRendering render; ListCSwordModuleInfo modules; @@ -242,13 +242,13 @@ void CSearchResultPage::updatePreview(const QString& key) { vk.Verse(0); } - const QString startKey = vk.key(); + const TQString startKey = vk.key(); vk.key(key); vk.next(CSwordVerseKey::UseVerse); vk.next(CSwordVerseKey::UseVerse); - const QString endKey = vk.key(); + const TQString endKey = vk.key(); settings.keyRenderingFace = CTextRendering::KeyTreeItem::Settings::CompleteShort; text = render.renderKeyRange(startKey, endKey, modules, key, settings); @@ -268,10 +268,10 @@ void CSearchResultPage::updatePreview(const QString& key) { } vk.Verse(0); } - const QString startKey = vk.key(); + const TQString startKey = vk.key(); vk.key(key); - const QString endKey = vk.key(); + const TQString endKey = vk.key(); settings.keyRenderingFace = CTextRendering::KeyTreeItem::Settings::NoKey; text = render.renderKeyRange(startKey, endKey, modules, key, settings); @@ -285,9 +285,9 @@ void CSearchResultPage::updatePreview(const QString& key) { } } -QStringList CSearchResultPage::QueryParser(const QString& queryString) { - QString token; - QStringList tokenList; +TQStringList CSearchResultPage::QueryParser(const TQString& queryString) { + TQString token; + TQStringList tokenList; int cnt, pos; token = ""; @@ -384,7 +384,7 @@ QStringList CSearchResultPage::QueryParser(const QString& queryString) { tokenList.append(token); cnt = 0; - QStringList::iterator it; + TQStringList::iterator it; for ( it = tokenList.begin(); it != tokenList.end(); it++ ) { //----------------------------------------------------------- // remove all the NOT(!) tokens - these do not need to be @@ -425,8 +425,8 @@ QStringList CSearchResultPage::QueryParser(const QString& queryString) { return(tokenList); } -const QString CSearchResultPage::highlightSearchedText(const QString& content, const QString& searchedText/*, const int searchFlags*/) { - QString ret = content; +const TQString CSearchResultPage::highlightSearchedText(const TQString& content, const TQString& searchedText/*, const int searchFlags*/) { + TQString ret = content; //const bool cs = (searchFlags & CSwordModuleSearch::caseSensitive); const bool cs = false; @@ -436,12 +436,12 @@ const QString CSearchResultPage::highlightSearchedText(const QString& content, c int matchLen = 0; int length = searchedText.length(); - const QString rep1("<span style=\"background-color:#FFFF66;\">"); - const QString rep2("</span>"); + const TQString rep1("<span style=\"background-color:#FFFF66;\">"); + const TQString rep2("</span>"); const unsigned int repLength = rep1.length() + rep1.length(); int sstIndex; // strong search text index for finding "strong:" bool inQuote; - QString newSearchText; + TQString newSearchText; newSearchText = searchedText; //--------------------------------------------------------------------- @@ -451,8 +451,8 @@ const QString CSearchResultPage::highlightSearchedText(const QString& content, c sstIndex = 0; while ((sstIndex = newSearchText.find("strong:", sstIndex)) != -1) { int idx1, idx2, sTokenIndex, sTokenIndex2; - QString sNumber, lemmaText; - const QString rep3("style=\"background-color:#FFFF66;\" "); + TQString sNumber, lemmaText; + const TQString rep3("style=\"background-color:#FFFF66;\" "); const unsigned int rep3Length = rep3.length(); int strongIndex = index; //-------------------------------------------------- @@ -517,19 +517,19 @@ const QString CSearchResultPage::highlightSearchedText(const QString& content, c // since I could not figure out the lucene query parser, I // made a simple parser. //=========================================================== - QStringList words = QueryParser(newSearchText); + TQStringList words = QueryParser(newSearchText); for ( int wi = 0; (unsigned int)wi < words.count(); ++wi ) { //search for every word in the list - QRegExp findExp; - QString word = words[ wi ]; + TQRegExp findExp; + TQString word = words[ wi ]; if (word.contains("*")) { length = word.length() - 1; word.replace('*', "\\S*"); //match within a word - findExp = QRegExp(word); + findExp = TQRegExp(word); findExp.setMinimal(TRUE); } else { length = word.length(); - findExp = QRegExp("\\b" + word + "\\b"); + findExp = TQRegExp("\\b" + word + "\\b"); } // index = 0; //for every word start at the beginning @@ -553,16 +553,16 @@ const QString CSearchResultPage::highlightSearchedText(const QString& content, c /** Initializes the signal slot conections of the child widgets, */ void CSearchResultPage::initConnections() { - connect(m_resultListBox, SIGNAL(keySelected(const QString&)), - this, SLOT(updatePreview(const QString&))); - connect(m_moduleListBox, SIGNAL(moduleSelected(CSwordModuleInfo*)), - m_resultListBox, SLOT(setupTree(CSwordModuleInfo*))); - connect(m_moduleListBox, SIGNAL(moduleChanged()), - m_previewDisplay->connectionsProxy(), SLOT(clear())); - connect(m_analyseButton, SIGNAL(clicked()), SLOT(showAnalysis())); + connect(m_resultListBox, TQT_SIGNAL(keySelected(const TQString&)), + this, TQT_SLOT(updatePreview(const TQString&))); + connect(m_moduleListBox, TQT_SIGNAL(moduleSelected(CSwordModuleInfo*)), + m_resultListBox, TQT_SLOT(setupTree(CSwordModuleInfo*))); + connect(m_moduleListBox, TQT_SIGNAL(moduleChanged()), + m_previewDisplay->connectionsProxy(), TQT_SLOT(clear())); + connect(m_analyseButton, TQT_SIGNAL(clicked()), TQT_SLOT(showAnalysis())); // connect the strongs list - connect(m_moduleListBox, SIGNAL(strongsSelected(CSwordModuleInfo*, QStringList*)), - m_resultListBox, SLOT(setupStrongsTree(CSwordModuleInfo*, QStringList*))); + connect(m_moduleListBox, TQT_SIGNAL(strongsSelected(CSwordModuleInfo*, TQStringList*)), + m_resultListBox, TQT_SLOT(setupStrongsTree(CSwordModuleInfo*, TQStringList*))); } /** Shows a dialog with the search analysis of the current search. */ @@ -577,7 +577,7 @@ void CSearchResultPage::showAnalysis() { namespace Options { -CSearchOptionsPage::CSearchOptionsPage(QWidget *parent, const char *name ) : +CSearchOptionsPage::CSearchOptionsPage(TQWidget *parent, const char *name ) : SearchOptionsForm(parent,name) { initView(); readSettings(); @@ -588,12 +588,12 @@ CSearchOptionsPage::~CSearchOptionsPage() { } /** Returns the search text set in this page. */ -const QString CSearchOptionsPage::searchText() { +const TQString CSearchOptionsPage::searchText() { return m_searchTextCombo->currentText(); } /** Sets the search text used in the page. */ -void CSearchOptionsPage::setSearchText(const QString& text) { +void CSearchOptionsPage::setSearchText(const TQString& text) { bool found = false; int i = 0; for (i = 0; !found && i < m_searchTextCombo->count(); ++i) { @@ -616,30 +616,30 @@ void CSearchOptionsPage::setSearchText(const QString& text) { /** Initializes this page. */ void CSearchOptionsPage::initView() { - connect( m_searchTextCombo, SIGNAL(activated( const QString& )), - m_searchTextCombo, SLOT( addToHistory( const QString& )) + connect( m_searchTextCombo, TQT_SIGNAL(activated( const TQString& )), + m_searchTextCombo, TQT_SLOT( addToHistory( const TQString& )) ); - connect( m_searchTextCombo, SIGNAL(returnPressed ( const QString& )), - m_searchTextCombo, SLOT(addToHistory(const QString&)) + connect( m_searchTextCombo, TQT_SIGNAL(returnPressed ( const TQString& )), + m_searchTextCombo, TQT_SLOT(addToHistory(const TQString&)) ); - QToolTip::add(m_searchTextCombo, CResMgr::searchdialog::options::searchedText::tooltip); + TQToolTip::add(m_searchTextCombo, CResMgr::searchdialog::options::searchedText::tooltip); m_syntaxButton->setIconSet(SmallIconSet("contexthelp")); - connect( m_syntaxButton, SIGNAL(clicked()), this, SLOT(syntaxHelp())); + connect( m_syntaxButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(syntaxHelp())); m_chooseModulesButton->setIconSet(SmallIconSet("wizard")); - connect(m_chooseModulesButton, SIGNAL(clicked()), - this, SLOT(chooseModules())); - QToolTip::add + connect(m_chooseModulesButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(chooseModules())); + TQToolTip::add (m_chooseModulesButton, CResMgr::searchdialog::options::moduleChooserButton::tooltip); - QToolTip::add + TQToolTip::add (m_rangeChooserCombo, CResMgr::searchdialog::options::chooseScope::tooltip); refreshRanges(); m_chooseRangeButton->setIconSet(SmallIconSet("configure")); - connect(m_chooseRangeButton, SIGNAL(clicked()), - this, SLOT(setupRanges())); + connect(m_chooseRangeButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(setupRanges())); //set the initial focus m_searchTextCombo->setFocus(); @@ -647,7 +647,7 @@ void CSearchOptionsPage::initView() { /** Sets the modules used by the search. */ void CSearchOptionsPage::setModules( ListCSwordModuleInfo modules ) { - QString t = i18n("Searching in: "); + TQString t = i18n("Searching in: "); m_modules.clear(); //remove old modules ListCSwordModuleInfo::iterator end_it = modules.end(); @@ -662,7 +662,7 @@ void CSearchOptionsPage::setModules( ListCSwordModuleInfo modules ) { m_modules.append( *it ); t.append( (*it)->name() ); if (*it != modules.last()) { - t += QString::fromLatin1(", "); // so that it will become a readable list (WLC, LXX, GerLut...) + t += TQString::fromLatin1(", "); // so that it will become a readable list (WLC, LXX, GerLut...) } } }; @@ -673,8 +673,8 @@ void CSearchOptionsPage::setModules( ListCSwordModuleInfo modules ) { /** Opens the modules chooser dialog. */ void CSearchOptionsPage::chooseModules() { CModuleChooserDialog* dlg = new CModuleChooserDialog(this, modules()); - connect(dlg, SIGNAL(modulesChanged(ListCSwordModuleInfo)), - this, SLOT(setModules(ListCSwordModuleInfo))); + connect(dlg, TQT_SIGNAL(modulesChanged(ListCSwordModuleInfo)), + this, TQT_SLOT(setModules(ListCSwordModuleInfo))); dlg->exec(); } @@ -719,7 +719,7 @@ void CSearchOptionsPage::setupRanges() { /** No descriptions */ void CSearchOptionsPage::syntaxHelp() { - QString syntax = i18n ( + TQString syntax = i18n ( "<p>Enter search terms separated by spaces. By default the search " "function will return results that match any of the search terms (OR). " "To search for all the terms separate the terms by AND.</p>") + i18n( @@ -764,7 +764,7 @@ sword::ListKey CSearchOptionsPage::searchScope() { if (m_rangeChooserCombo->currentItem() > 0) { //is not "no scope" CBTConfig::StringMap map = CBTConfig::get(CBTConfig::searchScopes); - QString scope = map[ m_rangeChooserCombo->currentText() ]; + TQString scope = map[ m_rangeChooserCombo->currentText() ]; if (!scope.isEmpty()) { return sword::VerseKey().ParseVerseList( (const char*)scope.utf8(), "Genesis 1:1", true); } diff --git a/bibletime/frontend/searchdialog/csearchdialogpages.h b/bibletime/frontend/searchdialog/csearchdialogpages.h index 7949a1b..d8bc070 100644 --- a/bibletime/frontend/searchdialog/csearchdialogpages.h +++ b/bibletime/frontend/searchdialog/csearchdialogpages.h @@ -21,17 +21,17 @@ #include "frontend/searchdialog/searchresultsform.h" // uic generated //Qt includes -#include <qwidget.h> -#include <qvgroupbox.h> +#include <tqwidget.h> +#include <tqvgroupbox.h> //KDE includes #include <klistview.h> //forward declarations -class QLabel; -class QCheckBox; -class QPushButton; -class QRadioButton; +class TQLabel; +class TQCheckBox; +class TQPushButton; +class TQRadioButton; class KComboBox; class KActionMenu; @@ -60,28 +60,28 @@ namespace Search { */ class StrongsResult { public: - StrongsResult() /*: text(QString::null)*/ { + StrongsResult() /*: text(TQString::null)*/ { //keyNameList.clear(); } - StrongsResult(const QString& text, const QString &keyName) + StrongsResult(const TQString& text, const TQString &keyName) : text(text) { //keyNameList.clear(); keyNameList.append(keyName); } - QString keyText() const { + TQString keyText() const { return text; } int keyCount() const { return keyNameList.count(); } - void addKeyName(const QString& keyName) { + void addKeyName(const TQString& keyName) { if (keyNameList.findIndex(keyName) == -1) keyNameList.append(keyName); } - QStringList* getKeyList() { + TQStringList* getKeyList() { return & keyNameList; } @@ -96,11 +96,11 @@ public: { return (l->keyText() > r->keyText()); } */ private: - QString text; - QStringList keyNameList; + TQString text; + TQStringList keyNameList; }; -typedef QValueList<StrongsResult> StrongsResultList; +typedef TQValueList<StrongsResult> StrongsResultList; /** * This class is used to keep track of the text strongs results. @@ -118,19 +118,19 @@ typedef QValueList<StrongsResult> StrongsResultList; */ class StrongsResultClass { public: - StrongsResultClass(CSwordModuleInfo* module, const QString& strongsNumber) + StrongsResultClass(CSwordModuleInfo* module, const TQString& strongsNumber) : srModule(module), lemmaText(strongsNumber) { initStrongsResults(); } - QString keyText(int index) const { + TQString keyText(int index) const { return srList[index].keyText(); } int keyCount(int index) const { return srList[index].keyCount(); } - QStringList* getKeyList(int index) { + TQStringList* getKeyList(int index) { return srList[index].getKeyList(); } int Count() const { @@ -139,11 +139,11 @@ public: private: void initStrongsResults(void); - QString getStrongsNumberText(const QString& verseContent, int *startIndex); + TQString getStrongsNumberText(const TQString& verseContent, int *startIndex); StrongsResultList srList; CSwordModuleInfo* srModule; - QString lemmaText; + TQString lemmaText; }; /** The page of the search dialog which contains the search result part. @@ -152,15 +152,15 @@ private: class CSearchResultPage : public SearchResultsForm { Q_OBJECT public: - CSearchResultPage(QWidget *parent=0, const char *name=0); + CSearchResultPage(TQWidget *parent=0, const char *name=0); ~CSearchResultPage(); /** * Sets the modules which contain the result of each. */ void setSearchResult(ListCSwordModuleInfo modules); - QSize sizeHint() const { return baseSize(); } - QSize minimumSizeHint() const { return minimumSize(); } + TQSize sizeHint() const { return baseSize(); } + TQSize minimumSizeHint() const { return minimumSize(); } public slots: // Public slots /** @@ -180,11 +180,11 @@ protected: // Protected methods /** * This function breakes the queryString into clucene tokens */ - QStringList QueryParser(const QString& queryString); + TQStringList QueryParser(const TQString& queryString); /** * This function highlights the searched text in the content using the search type given by search flags */ - const QString highlightSearchedText(const QString& content, const QString& searchedText/*, const int searchFlags*/); + const TQString highlightSearchedText(const TQString& content, const TQString& searchedText/*, const int searchFlags*/); private: CReadDisplay* m_previewDisplay; @@ -194,7 +194,7 @@ protected slots: // Protected slots /** * Update the preview of the selected key. */ - void updatePreview(const QString& key); + void updatePreview(const TQString& key); /** * Shows a dialog with the search analysis of the current search. */ @@ -208,16 +208,16 @@ protected slots: // Protected slots class CSearchOptionsPage : public SearchOptionsForm { Q_OBJECT public: - CSearchOptionsPage(QWidget *parent=0, const char *name=0); + CSearchOptionsPage(TQWidget *parent=0, const char *name=0); ~CSearchOptionsPage(); /** * Sets the search text used in the page. */ - void setSearchText(const QString& text); + void setSearchText(const TQString& text); /** * Returns the search text set in this page. */ - const QString searchText(); + const TQString searchText(); /** * Returns the list of used modules. */ @@ -239,8 +239,8 @@ public: */ //const CSwordModuleSearch::scopeType scopeType(); - QSize sizeHint() const { return baseSize(); } - QSize minimumSizeHint() const { return minimumSize(); } + TQSize sizeHint() const { return baseSize(); } + TQSize minimumSizeHint() const { return minimumSize(); } bool hasSearchScope(); private: diff --git a/bibletime/frontend/searchdialog/csearchresultview.cpp b/bibletime/frontend/searchdialog/csearchresultview.cpp index cbb2ee1..89d7f98 100644 --- a/bibletime/frontend/searchdialog/csearchresultview.cpp +++ b/bibletime/frontend/searchdialog/csearchresultview.cpp @@ -28,7 +28,7 @@ namespace Search { namespace Result { -CSearchResultView::CSearchResultView(QWidget* parent, const char* name) : +CSearchResultView::CSearchResultView(TQWidget* parent, const char* name) : KListView(parent, name), m_module(0) { initView(); initConnections(); @@ -50,36 +50,36 @@ void CSearchResultView::initView() { m_actions.copyMenu = new KActionMenu(i18n("Copy..."), CResMgr::searchdialog::result::foundItems::copyMenu::icon, m_popup); m_actions.copyMenu->setDelayed(false); - m_actions.copy.result = new KAction(i18n("Reference only"), KShortcut(0), this, SLOT(copyItems()), this); + m_actions.copy.result = new KAction(i18n("Reference only"), KShortcut(0), this, TQT_SLOT(copyItems()), this); m_actions.copyMenu->insert(m_actions.copy.result); - m_actions.copy.resultWithText = new KAction(i18n("Reference with text"), KShortcut(0), this, SLOT(copyItemsWithText()), this); + m_actions.copy.resultWithText = new KAction(i18n("Reference with text"), KShortcut(0), this, TQT_SLOT(copyItemsWithText()), this); m_actions.copyMenu->insert(m_actions.copy.resultWithText); m_actions.copyMenu->plug(m_popup); m_actions.saveMenu = new KActionMenu(i18n("Save..."),CResMgr::searchdialog::result::foundItems::saveMenu::icon, m_popup); m_actions.saveMenu->setDelayed( false ); - m_actions.save.result = new KAction(i18n("Reference only"), KShortcut(0), this, SLOT(saveItems()), this); + m_actions.save.result = new KAction(i18n("Reference only"), KShortcut(0), this, TQT_SLOT(saveItems()), this); m_actions.saveMenu->insert(m_actions.save.result); - m_actions.save.resultWithText = new KAction(i18n("Reference with text"), KShortcut(0), this, SLOT(saveItemsWithText()), this); + m_actions.save.resultWithText = new KAction(i18n("Reference with text"), KShortcut(0), this, TQT_SLOT(saveItemsWithText()), this); m_actions.saveMenu->insert(m_actions.save.resultWithText); m_actions.saveMenu->plug(m_popup); m_actions.printMenu = new KActionMenu(i18n("Print..."),CResMgr::searchdialog::result::foundItems::printMenu::icon, m_popup); m_actions.printMenu->setDelayed(false); - m_actions.print.result = new KAction(i18n("Reference with text"), KShortcut(0), this, SLOT(printItems()), this); + m_actions.print.result = new KAction(i18n("Reference with text"), KShortcut(0), this, TQT_SLOT(printItems()), this); m_actions.printMenu->insert(m_actions.print.result); m_actions.printMenu->plug(m_popup); } /** No descriptions */ void CSearchResultView::initConnections() { - // connect(this, SIGNAL(executed(QListViewItem*)), - // this, SLOT(executed(QListViewItem*))); - connect(this, SIGNAL(currentChanged(QListViewItem*)), - this, SLOT(executed(QListViewItem*))); + // connect(this, TQT_SIGNAL(executed(TQListViewItem*)), + // this, TQT_SLOT(executed(TQListViewItem*))); + connect(this, TQT_SIGNAL(currentChanged(TQListViewItem*)), + this, TQT_SLOT(executed(TQListViewItem*))); - connect(this, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)), - this, SLOT(showPopup(KListView*, QListViewItem*, const QPoint&))); + connect(this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(showPopup(KListView*, TQListViewItem*, const TQPoint&))); } /** Setups the list with the given module. */ @@ -100,11 +100,11 @@ void CSearchResultView::setupTree(CSwordModuleInfo* m) { setUpdatesEnabled(false); - QListViewItem* oldItem = 0; + TQListViewItem* oldItem = 0; KListViewItem* item = 0; for (int index = 0; index < count; index++) { item = new KListViewItem(this, oldItem); - item->setText(0, QString::fromUtf8(result.GetElement(index)->getText())); + item->setText(0, TQString::fromUtf8(result.GetElement(index)->getText())); oldItem = item; } @@ -115,7 +115,7 @@ void CSearchResultView::setupTree(CSwordModuleInfo* m) { executed(currentItem()); } -void CSearchResultView::setupStrongsTree(CSwordModuleInfo* m, QStringList* vList) { +void CSearchResultView::setupStrongsTree(CSwordModuleInfo* m, TQStringList* vList) { clear(); if (!m) { return; @@ -132,7 +132,7 @@ void CSearchResultView::setupStrongsTree(CSwordModuleInfo* m, QStringList* vList KListViewItem* oldItem = 0; KListViewItem* item = 0; - for ( QStringList::Iterator it = vList->begin(); it != vList->end(); ++it ) { + for ( TQStringList::Iterator it = vList->begin(); it != vList->end(); ++it ) { item = new KListViewItem(this, oldItem); item->setText(0, (*it)); @@ -146,24 +146,24 @@ void CSearchResultView::setupStrongsTree(CSwordModuleInfo* m, QStringList* vList } /** Is connected to the signal executed, which is emitted when a mew item was chosen. */ -void CSearchResultView::executed(QListViewItem* item) { +void CSearchResultView::executed(TQListViewItem* item) { // Q_ASSERT(item); // qWarning("executed"); emit keySelected(item->text(0)); } /** Reimplementation to show the popup menu. */ -void CSearchResultView::showPopup(KListView*, QListViewItem*, const QPoint& point) { +void CSearchResultView::showPopup(KListView*, TQListViewItem*, const TQPoint& point) { m_popup->exec(point); } /** No descriptions */ void CSearchResultView::printItems() { - QPtrList<QListViewItem> items = selectedItems(); + TQPtrList<TQListViewItem> items = selectedItems(); CExportManager mgr(i18n("Print search result..."), true, i18n("Printing search result")); - QStringList list; - for (QListViewItem* k = items.first(); k; k = items.next()) { + TQStringList list; + for (TQListViewItem* k = items.first(); k; k = items.next()) { list.append( k->text(0) ); }; mgr.printKeyList( list, module(), CBTConfig::getDisplayOptionDefaults(), CBTConfig::getFilterOptionDefaults() ); @@ -175,9 +175,9 @@ void CSearchResultView::saveItems() { CSwordModuleInfo* m = module(); CSwordKey* k = 0; - QPtrList<QListViewItem> items = selectedItems(); - QPtrList<CSwordKey> keys; - for (QListViewItem* i = items.first(); i; i = items.next()) { + TQPtrList<TQListViewItem> items = selectedItems(); + TQPtrList<CSwordKey> keys; + for (TQListViewItem* i = items.first(); i; i = items.next()) { k = CSwordKey::createInstance( m ); k->key(i->text(0)); keys.append( k ); @@ -194,9 +194,9 @@ void CSearchResultView::saveItemsWithText() { CSwordModuleInfo* m = module(); CSwordKey* k = 0; - QPtrList<QListViewItem> items = selectedItems(); - QPtrList<CSwordKey> keys; - for (QListViewItem* i = items.first(); i; i = items.next()) { + TQPtrList<TQListViewItem> items = selectedItems(); + TQPtrList<CSwordKey> keys; + for (TQListViewItem* i = items.first(); i; i = items.next()) { k = CSwordKey::createInstance( m ); k->key(i->text(0)); keys.append( k ); @@ -213,9 +213,9 @@ void CSearchResultView::copyItems() { CSwordModuleInfo* m = module(); CSwordKey* k = 0; - QPtrList<QListViewItem> items = selectedItems(); - QPtrList<CSwordKey> keys; - for (QListViewItem* i = items.first(); i; i = items.next()) { + TQPtrList<TQListViewItem> items = selectedItems(); + TQPtrList<CSwordKey> keys; + for (TQListViewItem* i = items.first(); i; i = items.next()) { k = CSwordKey::createInstance( m ); k->key(i->text(0)); keys.append( k ); @@ -232,9 +232,9 @@ void CSearchResultView::copyItemsWithText() { CSwordModuleInfo* m = module(); CSwordKey* k = 0; - QPtrList<QListViewItem> items = selectedItems(); - QPtrList<CSwordKey> keys; - for (QListViewItem* i = items.first(); i; i = items.next()) { + TQPtrList<TQListViewItem> items = selectedItems(); + TQPtrList<CSwordKey> keys; + for (TQListViewItem* i = items.first(); i; i = items.next()) { k = CSwordKey::createInstance( m ); k->key(i->text(0)); keys.append( k ); @@ -250,17 +250,17 @@ CSwordModuleInfo* const CSearchResultView::module() { return m_module; } -QDragObject* CSearchResultView::dragObject() { +TQDragObject* CSearchResultView::dragObject() { //return a valid DragObject to make DnD possible! /* - * First get all selected items and fill with them the dndItems list. The return the QDragObject we got from CDRagDropMgr + * First get all selected items and fill with them the dndItems list. The return the TQDragObject we got from CDRagDropMgr */ CDragDropMgr::ItemList dndItems; - QPtrList<QListViewItem> items = selectedItems(); + TQPtrList<TQListViewItem> items = selectedItems(); for (items.first(); items.current(); items.next()) { - dndItems.append( CDragDropMgr::Item(m_module->name(), items.current()->text(0), QString::null) ); //no description + dndItems.append( CDragDropMgr::Item(m_module->name(), items.current()->text(0), TQString::null) ); //no description }; return CDragDropMgr::dragObject(dndItems, viewport()); diff --git a/bibletime/frontend/searchdialog/csearchresultview.h b/bibletime/frontend/searchdialog/csearchresultview.h index b3f4dc4..11e49d5 100644 --- a/bibletime/frontend/searchdialog/csearchresultview.h +++ b/bibletime/frontend/searchdialog/csearchresultview.h @@ -19,10 +19,10 @@ #include <klistview.h> //forward declarations -class QLabel; -class QCheckBox; -class QPushButton; -class QRadioButton; +class TQLabel; +class TQCheckBox; +class TQPushButton; +class TQRadioButton; class KComboBox; class KActionMenu; @@ -39,7 +39,7 @@ namespace Search { class CSearchResultView : public KListView { Q_OBJECT public: - CSearchResultView(QWidget* parent, const char* name = 0); + CSearchResultView(TQWidget* parent, const char* name = 0); virtual ~CSearchResultView(); /** Returns the module which is currently used. */ CSwordModuleInfo* const module(); @@ -50,7 +50,7 @@ protected: // Protected methods */ void initView(); void initConnections(); - virtual QDragObject* dragObject(); + virtual TQDragObject* dragObject(); public slots: // Public slots void saveItems(); @@ -58,21 +58,21 @@ public slots: // Public slots * Setups the list with the given module. */ void setupTree(CSwordModuleInfo*); - void setupStrongsTree(CSwordModuleInfo*, QStringList*); + void setupStrongsTree(CSwordModuleInfo*, TQStringList*); void copyItemsWithText(); void copyItems(); void saveItemsWithText(); /** * Reimplementation to show the popup menu. */ - virtual void showPopup(KListView*, QListViewItem* i, const QPoint& point); + virtual void showPopup(KListView*, TQListViewItem* i, const TQPoint& point); protected slots: // Protected slots void printItems(); /** * Is connected to the signal executed, which is emitted when a mew item was chosen. */ - void executed(QListViewItem*); + void executed(TQListViewItem*); private: struct { @@ -102,7 +102,7 @@ private: CSwordModuleInfo* m_module; signals: // Signals - void keySelected(const QString&); + void keySelected(const TQString&); }; } //end of namespace Result diff --git a/bibletime/frontend/searchdialog/searchoptionsform.cpp b/bibletime/frontend/searchdialog/searchoptionsform.cpp index 18035c8..994c94e 100644 --- a/bibletime/frontend/searchdialog/searchoptionsform.cpp +++ b/bibletime/frontend/searchdialog/searchoptionsform.cpp @@ -10,66 +10,66 @@ #include "searchoptionsform.h" -#include <qvariant.h> -#include <qgroupbox.h> -#include <qlabel.h> -#include <qpushbutton.h> +#include <tqvariant.h> +#include <tqgroupbox.h> +#include <tqlabel.h> +#include <tqpushbutton.h> #include <kcombobox.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> /* * Constructs a SearchOptionsForm as a child of 'parent', with the * name 'name' and widget flags set to 'f'. */ -SearchOptionsForm::SearchOptionsForm( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +SearchOptionsForm::SearchOptionsForm( TQWidget* parent, const char* name, WFlags fl ) + : TQWidget( parent, name, fl ) { if ( !name ) setName( "SearchOptionsForm" ); - setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, sizePolicy().hasHeightForWidth() ) ); - setMinimumSize( QSize( 260, 130 ) ); - setBaseSize( QSize( 420, 150 ) ); - SearchOptionsFormLayout = new QHBoxLayout( this, 0, 3, "SearchOptionsFormLayout"); + setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, sizePolicy().hasHeightForWidth() ) ); + setMinimumSize( TQSize( 260, 130 ) ); + setBaseSize( TQSize( 420, 150 ) ); + SearchOptionsFormLayout = new TQHBoxLayout( this, 0, 3, "SearchOptionsFormLayout"); - searchGroupBox = new QGroupBox( this, "searchGroupBox" ); + searchGroupBox = new TQGroupBox( this, "searchGroupBox" ); searchGroupBox->setMargin( 0 ); searchGroupBox->setColumnLayout(0, Qt::Vertical ); searchGroupBox->layout()->setSpacing( 3 ); searchGroupBox->layout()->setMargin( 6 ); - searchGroupBoxLayout = new QGridLayout( searchGroupBox->layout() ); + searchGroupBoxLayout = new TQGridLayout( searchGroupBox->layout() ); searchGroupBoxLayout->setAlignment( Qt::AlignTop ); - m_searchTextLabel = new QLabel( searchGroupBox, "m_searchTextLabel" ); - m_searchTextLabel->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)1, 0, 0, m_searchTextLabel->sizePolicy().hasHeightForWidth() ) ); + m_searchTextLabel = new TQLabel( searchGroupBox, "m_searchTextLabel" ); + m_searchTextLabel->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_searchTextLabel->sizePolicy().hasHeightForWidth() ) ); searchGroupBoxLayout->addWidget( m_searchTextLabel, 0, 0 ); - m_syntaxButton = new QPushButton( searchGroupBox, "m_syntaxButton" ); + m_syntaxButton = new TQPushButton( searchGroupBox, "m_syntaxButton" ); searchGroupBoxLayout->addWidget( m_syntaxButton, 0, 2 ); - m_chooseModulesButton = new QPushButton( searchGroupBox, "m_chooseModulesButton" ); + m_chooseModulesButton = new TQPushButton( searchGroupBox, "m_chooseModulesButton" ); searchGroupBoxLayout->addWidget( m_chooseModulesButton, 1, 2 ); - m_chooseRangeButton = new QPushButton( searchGroupBox, "m_chooseRangeButton" ); + m_chooseRangeButton = new TQPushButton( searchGroupBox, "m_chooseRangeButton" ); searchGroupBoxLayout->addWidget( m_chooseRangeButton, 2, 2 ); - m_searchScopeLabel = new QLabel( searchGroupBox, "m_searchScopeLabel" ); - m_searchScopeLabel->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)1, 0, 0, m_searchScopeLabel->sizePolicy().hasHeightForWidth() ) ); + m_searchScopeLabel = new TQLabel( searchGroupBox, "m_searchScopeLabel" ); + m_searchScopeLabel->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_searchScopeLabel->sizePolicy().hasHeightForWidth() ) ); searchGroupBoxLayout->addWidget( m_searchScopeLabel, 2, 0 ); m_rangeChooserCombo = new KComboBox( FALSE, searchGroupBox, "m_rangeChooserCombo" ); - m_rangeChooserCombo->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, m_rangeChooserCombo->sizePolicy().hasHeightForWidth() ) ); + m_rangeChooserCombo->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, m_rangeChooserCombo->sizePolicy().hasHeightForWidth() ) ); searchGroupBoxLayout->addWidget( m_rangeChooserCombo, 2, 1 ); m_searchTextCombo = new KHistoryCombo( searchGroupBox, "m_searchTextCombo" ); - m_searchTextCombo->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, m_searchTextCombo->sizePolicy().hasHeightForWidth() ) ); + m_searchTextCombo->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)0, 0, 0, m_searchTextCombo->sizePolicy().hasHeightForWidth() ) ); m_searchTextCombo->setFocusPolicy( KHistoryCombo::WheelFocus ); m_searchTextCombo->setSizeLimit( 25 ); m_searchTextCombo->setInsertionPolicy( KHistoryCombo::AtBottom ); @@ -77,15 +77,15 @@ SearchOptionsForm::SearchOptionsForm( QWidget* parent, const char* name, WFlags searchGroupBoxLayout->addWidget( m_searchTextCombo, 0, 1 ); - m_modulesLabel = new QLabel( searchGroupBox, "m_modulesLabel" ); - m_modulesLabel->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)1, (QSizePolicy::SizeType)1, 0, 0, m_modulesLabel->sizePolicy().hasHeightForWidth() ) ); - m_modulesLabel->setTextFormat( QLabel::RichText ); - m_modulesLabel->setAlignment( int( QLabel::WordBreak | QLabel::AlignVCenter | QLabel::AlignLeft ) ); + m_modulesLabel = new TQLabel( searchGroupBox, "m_modulesLabel" ); + m_modulesLabel->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_modulesLabel->sizePolicy().hasHeightForWidth() ) ); + m_modulesLabel->setTextFormat( TQLabel::RichText ); + m_modulesLabel->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter | TQLabel::AlignLeft ) ); searchGroupBoxLayout->addMultiCellWidget( m_modulesLabel, 1, 1, 0, 1 ); SearchOptionsFormLayout->addWidget( searchGroupBox ); languageChange(); - resize( QSize(648, 130).expandedTo(minimumSizeHint()) ); + resize( TQSize(648, 130).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); } @@ -107,11 +107,11 @@ void SearchOptionsForm::languageChange() searchGroupBox->setTitle( tr2i18n( "Search parameters" ) ); m_searchTextLabel->setText( tr2i18n( "Search for:" ) ); m_syntaxButton->setText( tr2i18n( "&Help" ) ); - m_syntaxButton->setAccel( QKeySequence( tr2i18n( "Alt+H" ) ) ); + m_syntaxButton->setAccel( TQKeySequence( tr2i18n( "Alt+H" ) ) ); m_chooseModulesButton->setText( tr2i18n( "&Choose" ) ); - m_chooseModulesButton->setAccel( QKeySequence( tr2i18n( "Alt+C" ) ) ); + m_chooseModulesButton->setAccel( TQKeySequence( tr2i18n( "Alt+C" ) ) ); m_chooseRangeButton->setText( tr2i18n( "&Setup" ) ); - m_chooseRangeButton->setAccel( QKeySequence( tr2i18n( "Alt+S" ) ) ); + m_chooseRangeButton->setAccel( TQKeySequence( tr2i18n( "Alt+S" ) ) ); m_searchScopeLabel->setText( tr2i18n( "Search scope:" ) ); m_modulesLabel->setText( tr2i18n( "Search in:" ) ); } diff --git a/bibletime/frontend/searchdialog/searchresultsform.cpp b/bibletime/frontend/searchdialog/searchresultsform.cpp index cf1f77b..d4271a4 100644 --- a/bibletime/frontend/searchdialog/searchresultsform.cpp +++ b/bibletime/frontend/searchdialog/searchresultsform.cpp @@ -10,13 +10,13 @@ #include "searchresultsform.h" -#include <qvariant.h> -#include <qpushbutton.h> -#include <qsplitter.h> -#include <qframe.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qwhatsthis.h> +#include <tqvariant.h> +#include <tqpushbutton.h> +#include <tqsplitter.h> +#include <tqframe.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqwhatsthis.h> #include "cmoduleresultview.h" #include "csearchresultview.h" @@ -24,46 +24,46 @@ * Constructs a SearchResultsForm as a child of 'parent', with the * name 'name' and widget flags set to 'f'. */ -SearchResultsForm::SearchResultsForm( QWidget* parent, const char* name, WFlags fl ) - : QWidget( parent, name, fl ) +SearchResultsForm::SearchResultsForm( TQWidget* parent, const char* name, WFlags fl ) + : TQWidget( parent, name, fl ) { if ( !name ) setName( "SearchResultsForm" ); - setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, sizePolicy().hasHeightForWidth() ) ); - setMinimumSize( QSize( 300, 220 ) ); - setBaseSize( QSize( 440, 290 ) ); - SearchResultsFormLayout = new QVBoxLayout( this, 0, 3, "SearchResultsFormLayout"); + setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, sizePolicy().hasHeightForWidth() ) ); + setMinimumSize( TQSize( 300, 220 ) ); + setBaseSize( TQSize( 440, 290 ) ); + SearchResultsFormLayout = new TQVBoxLayout( this, 0, 3, "SearchResultsFormLayout"); - displaySplitter = new QSplitter( this, "displaySplitter" ); - displaySplitter->setMinimumSize( QSize( 134, 44 ) ); - displaySplitter->setOrientation( QSplitter::Horizontal ); + displaySplitter = new TQSplitter( this, "displaySplitter" ); + displaySplitter->setMinimumSize( TQSize( 134, 44 ) ); + displaySplitter->setOrientation( TQSplitter::Horizontal ); - QWidget* privateLayoutWidget = new QWidget( displaySplitter, "rightSideBox" ); - rightSideBox = new QVBoxLayout( privateLayoutWidget, 0, 6, "rightSideBox"); + TQWidget* privateLayoutWidget = new TQWidget( displaySplitter, "rightSideBox" ); + rightSideBox = new TQVBoxLayout( privateLayoutWidget, 0, 6, "rightSideBox"); - resultSplitter = new QSplitter( privateLayoutWidget, "resultSplitter" ); - resultSplitter->setOrientation( QSplitter::Vertical ); + resultSplitter = new TQSplitter( privateLayoutWidget, "resultSplitter" ); + resultSplitter->setOrientation( TQSplitter::Vertical ); m_moduleListBox = new Search::Result::CModuleResultView( resultSplitter, "m_moduleListBox" ); m_resultListBox = new Search::Result::CSearchResultView( resultSplitter, "m_resultListBox" ); rightSideBox->addWidget( resultSplitter ); - buttonLayout = new QHBoxLayout( 0, 0, 6, "buttonLayout"); + buttonLayout = new TQHBoxLayout( 0, 0, 6, "buttonLayout"); - m_analyseButton = new QPushButton( privateLayoutWidget, "m_analyseButton" ); + m_analyseButton = new TQPushButton( privateLayoutWidget, "m_analyseButton" ); buttonLayout->addWidget( m_analyseButton ); - buttonSpacer = new QSpacerItem( 10, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); + buttonSpacer = new TQSpacerItem( 10, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); buttonLayout->addItem( buttonSpacer ); rightSideBox->addLayout( buttonLayout ); - m_displayFrame = new QFrame( displaySplitter, "m_displayFrame" ); - m_displayFrame->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, m_displayFrame->sizePolicy().hasHeightForWidth() ) ); - m_displayFrame->setFrameShape( QFrame::NoFrame ); - m_displayFrame->setFrameShadow( QFrame::Plain ); + m_displayFrame = new TQFrame( displaySplitter, "m_displayFrame" ); + m_displayFrame->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, m_displayFrame->sizePolicy().hasHeightForWidth() ) ); + m_displayFrame->setFrameShape( TQFrame::NoFrame ); + m_displayFrame->setFrameShadow( TQFrame::Plain ); SearchResultsFormLayout->addWidget( displaySplitter ); languageChange(); - resize( QSize(300, 220).expandedTo(minimumSizeHint()) ); + resize( TQSize(300, 220).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); } diff --git a/bibletime/frontend/util/csortlistviewitem.cpp b/bibletime/frontend/util/csortlistviewitem.cpp index 1bc089f..7278011 100644 --- a/bibletime/frontend/util/csortlistviewitem.cpp +++ b/bibletime/frontend/util/csortlistviewitem.cpp @@ -15,36 +15,36 @@ namespace util { -CSortListViewItem::CSortListViewItem(QListViewItem* parent) : KListViewItem(parent) +CSortListViewItem::CSortListViewItem(TQListViewItem* parent) : KListViewItem(parent) { } -CSortListViewItem::CSortListViewItem( QListView * parent, QListViewItem * after ) +CSortListViewItem::CSortListViewItem( TQListView * parent, TQListViewItem * after ) : KListViewItem ( parent, after ) { } -CSortListViewItem::CSortListViewItem( QListViewItem * parent, QListViewItem * after ) +CSortListViewItem::CSortListViewItem( TQListViewItem * parent, TQListViewItem * after ) : KListViewItem ( parent, after ) { } -CSortListViewItem::CSortListViewItem( QListView * parent, QString label1, QString label2, QString label3, QString label4, QString label5, QString label6, QString label7, QString label8 ) +CSortListViewItem::CSortListViewItem( TQListView * parent, TQString label1, TQString label2, TQString label3, TQString label4, TQString label5, TQString label6, TQString label7, TQString label8 ) : KListViewItem( parent, label1, label2, label3, label4, label5, label6, label7, label8 ) { } -CSortListViewItem::CSortListViewItem( QListViewItem * parent, QString label1, QString label2, QString label3, QString label4, QString label5, QString label6, QString label7, QString label8 ) +CSortListViewItem::CSortListViewItem( TQListViewItem * parent, TQString label1, TQString label2, TQString label3, TQString label4, TQString label5, TQString label6, TQString label7, TQString label8 ) : KListViewItem ( parent, label1, label2, label3, label4, label5, label6, label7, label8 ) { } -CSortListViewItem::CSortListViewItem( QListView * parent, QListViewItem * after, QString label1, QString label2, QString label3, QString label4, QString label5, QString label6, QString label7, QString label8 ) +CSortListViewItem::CSortListViewItem( TQListView * parent, TQListViewItem * after, TQString label1, TQString label2, TQString label3, TQString label4, TQString label5, TQString label6, TQString label7, TQString label8 ) : KListViewItem ( parent, after, label1, label2, label3, label4, label5, label6, label7, label8 ) { } -CSortListViewItem::CSortListViewItem( QListViewItem * parent, QListViewItem * after, QString label1, QString label2, QString label3, QString label4, QString label5, QString label6, QString label7, QString label8 ) +CSortListViewItem::CSortListViewItem( TQListViewItem * parent, TQListViewItem * after, TQString label1, TQString label2, TQString label3, TQString label4, TQString label5, TQString label6, TQString label7, TQString label8 ) : KListViewItem ( parent, after, label1, label2, label3, label4, label5, label6, label7, label8 ) { @@ -54,7 +54,7 @@ CSortListViewItem::CSortListViewItem( QListViewItem * parent, QListViewItem * af CSortListViewItem::~CSortListViewItem() { } -int CSortListViewItem::compare( QListViewItem* i, int col, bool ascending ) const { +int CSortListViewItem::compare( TQListViewItem* i, int col, bool ascending ) const { int ret = 0; if ( !columnSorting.contains(col) ) { diff --git a/bibletime/frontend/util/csortlistviewitem.h b/bibletime/frontend/util/csortlistviewitem.h index b1f66ce..6a975ae 100644 --- a/bibletime/frontend/util/csortlistviewitem.h +++ b/bibletime/frontend/util/csortlistviewitem.h @@ -13,14 +13,14 @@ #define UTILCSORTLISTVIEWITEM_H -#include <qmap.h> +#include <tqmap.h> #include <klistview.h> namespace util { /** - * A implementation of a QListViewItem to allow special sort orders for it's columns. + * A implementation of a TQListViewItem to allow special sort orders for it's columns. * @author The BibleTime team <info@bibletime.info> */ class CSortListViewItem : public KListViewItem { @@ -29,28 +29,28 @@ public: Number, String/*, BibleKey*/ }; - CSortListViewItem( QListViewItem* parent ); + CSortListViewItem( TQListViewItem* parent ); - CSortListViewItem( QListView * parent, QListViewItem * after ); + CSortListViewItem( TQListView * parent, TQListViewItem * after ); - CSortListViewItem( QListViewItem * parent, QListViewItem * after ); + CSortListViewItem( TQListViewItem * parent, TQListViewItem * after ); - CSortListViewItem( QListView * parent, QString label1, QString label2 = QString::null, QString label3 = QString::null, QString label4 = QString::null, QString label5 = QString::null, QString label6 = QString::null, QString label7 = QString::null, QString label8 = QString::null ); + CSortListViewItem( TQListView * parent, TQString label1, TQString label2 = TQString::null, TQString label3 = TQString::null, TQString label4 = TQString::null, TQString label5 = TQString::null, TQString label6 = TQString::null, TQString label7 = TQString::null, TQString label8 = TQString::null ); - CSortListViewItem( QListViewItem * parent, QString label1, QString label2 = QString::null, QString label3 = QString::null, QString label4 = QString::null, QString label5 = QString::null, QString label6 = QString::null, QString label7 = QString::null, QString label8 = QString::null ); + CSortListViewItem( TQListViewItem * parent, TQString label1, TQString label2 = TQString::null, TQString label3 = TQString::null, TQString label4 = TQString::null, TQString label5 = TQString::null, TQString label6 = TQString::null, TQString label7 = TQString::null, TQString label8 = TQString::null ); - CSortListViewItem( QListView * parent, QListViewItem * after, QString label1, QString label2 = QString::null, QString label3 = QString::null, QString label4 = QString::null, QString label5 = QString::null, QString label6 = QString::null, QString label7 = QString::null, QString label8 = QString::null ); + CSortListViewItem( TQListView * parent, TQListViewItem * after, TQString label1, TQString label2 = TQString::null, TQString label3 = TQString::null, TQString label4 = TQString::null, TQString label5 = TQString::null, TQString label6 = TQString::null, TQString label7 = TQString::null, TQString label8 = TQString::null ); - CSortListViewItem( QListViewItem * parent, QListViewItem * after, QString label1, QString label2 = QString::null, QString label3 = QString::null, QString label4 = QString::null, QString label5 = QString::null, QString label6 = QString::null, QString label7 = QString::null, QString label8 = QString::null ); + CSortListViewItem( TQListViewItem * parent, TQListViewItem * after, TQString label1, TQString label2 = TQString::null, TQString label3 = TQString::null, TQString label4 = TQString::null, TQString label5 = TQString::null, TQString label6 = TQString::null, TQString label7 = TQString::null, TQString label8 = TQString::null ); virtual ~CSortListViewItem(); - virtual int compare( QListViewItem* i, int col, bool ascending ) const; + virtual int compare( TQListViewItem* i, int col, bool ascending ) const; void setColumnSorting(int column, Type type); private: - QMap<int, Type> columnSorting; + TQMap<int, Type> columnSorting; }; } |