//KDE includes
@@ -86,7 +86,7 @@ m_mainIndex(0) {
setPlainCaption("BibleTime " VERSION);
- // we don't save the geometry, it's stored in the startup profile
+ // we don't save the tqgeometry, it's stored in the startup profile
setAutoSaveSettings(TQString("MainWindow"), false);
}
@@ -324,6 +324,6 @@ void BibleTime::polish() {
m_initialized = true;
KMainWindow::polish();
- applyMainWindowSettings(CBTConfig::getConfig(), TQString::fromLatin1("MainWindow"));
+ applyMainWindowSettings(CBTConfig::getConfig(), TQString::tqfromLatin1("MainWindow"));
}
diff --git a/bibletime/bibletime.h b/bibletime/bibletime.h
index 6728db4..b108333 100644
--- a/bibletime/bibletime.h
+++ b/bibletime/bibletime.h
@@ -110,7 +110,7 @@ class TQSplitter;
* BibleTime main page.
* This is the sourcecode documentation of BibleTime, a Bible study tool for KDE/Linux.
* BibleTime is devided in two major parts, the backend and the frontend.
- * The backend is mainly a wrapper around Sword's classes to use Qt functionality
+ * The backend is mainly a wrapper around Sword's classes to use TQt functionality
* to allow easy access to it's functionality and to have it in a (more or less :)
* object oriented structure.
*
@@ -135,6 +135,7 @@ class TQSplitter;
class BibleTime : public KMainWindow, virtual public BibleTimeInterface {
friend class CMDIArea;
Q_OBJECT
+ TQ_OBJECT
public:
/**
* construtor of BibleTime
diff --git a/bibletime/bibletime_dcop.cpp b/bibletime/bibletime_dcop.cpp
index cc8c354..37722b5 100644
--- a/bibletime/bibletime_dcop.cpp
+++ b/bibletime/bibletime_dcop.cpp
@@ -95,7 +95,7 @@ TQStringList BibleTime::searchInModule(const TQString& moduleName, const TQStrin
mod->searchIndexed( searchText, scope );
sword::ListKey result = mod->searchResult();
- const TQString lead = TQString("[%1] ").arg(moduleName);
+ const TQString lead = TQString("[%1] ").tqarg(moduleName);
;
for ( int i = 0; i < result.Count(); ++i ) {
sword::SWKey* key = result.getElement(i);
@@ -144,7 +144,7 @@ TQStringList BibleTime::searchInDefaultBible(const TQString& searchText) {
TQString BibleTime::getCurrentReference() {
qDebug("BibleTime::getCurrentReference");
- TQString ret = TQString::null;
+ TQString ret = TQString();
CDisplayWindow* w = dynamic_cast(m_mdi->activeWindow());
Q_ASSERT(w);
diff --git a/bibletime/bibletime_init.cpp b/bibletime/bibletime_init.cpp
index 626ff8b..d8b6083 100644
--- a/bibletime/bibletime_init.cpp
+++ b/bibletime/bibletime_init.cpp
@@ -94,7 +94,7 @@ void BibleTime::initView() {
m_mdi = new CMDIArea(m_mainSplitter, "mdiarea" );
m_mdi->setMinimumSize(100, 100);
- m_mdi->setFocusPolicy(ClickFocus);
+ m_mdi->setFocusPolicy(TQ_ClickFocus);
m_helpMenu = new KHelpMenu(this, KGlobal::instance()->aboutData(), true, actionCollection());
}
@@ -104,7 +104,7 @@ void BibleTime::initActions() {
KStartupLogo::setStatusMessage(i18n("Initializing menu- and toolbars") + TQString("..."));
KAction* action = 0;
- action = KStdAction::quit(kapp, TQT_SLOT( quit() ), actionCollection());
+ action = KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT( quit() ), actionCollection());
action->setToolTip( CResMgr::mainMenu::file::quit::tooltip );
#if KDE_VERSION_MINOR < 1
@@ -115,7 +115,7 @@ void BibleTime::initActions() {
action = new KAction(i18n("Search in &open work(s)"),
CResMgr::mainMenu::mainIndex::search::icon,
CResMgr::mainMenu::mainIndex::search::accel,
- this, TQT_SLOT(slotSearchModules()), actionCollection(),
+ TQT_TQOBJECT(this), TQT_SLOT(slotSearchModules()), actionCollection(),
CResMgr::mainMenu::mainIndex::search::actionName
);
action->setToolTip( CResMgr::mainMenu::mainIndex::search::tooltip );
@@ -128,7 +128,7 @@ void BibleTime::initActions() {
action = new KAction(i18n("Search in standard &Bible"),
CResMgr::mainMenu::mainIndex::searchdefaultbible::icon,
CResMgr::mainMenu::mainIndex::searchdefaultbible::accel,
- this, TQT_SLOT(slotSearchDefaultBible()), actionCollection(),
+ TQT_TQOBJECT(this), TQT_SLOT(slotSearchDefaultBible()), actionCollection(),
CResMgr::mainMenu::mainIndex::searchdefaultbible::actionName
);
action->setToolTip( CResMgr::mainMenu::mainIndex::searchdefaultbible::tooltip );
@@ -138,7 +138,7 @@ void BibleTime::initActions() {
action->plugAccel( accel() );
#endif
- m_viewToolbar_action = KStdAction::showToolbar(this, TQT_SLOT( slotToggleToolbar() ), actionCollection());
+ m_viewToolbar_action = KStdAction::showToolbar(TQT_TQOBJECT(this), TQT_SLOT( slotToggleToolbar() ), actionCollection());
m_viewToolbar_action->setToolTip( CResMgr::mainMenu::view::showToolBar::tooltip );
#if KDE_VERSION_MINOR < 1
@@ -150,7 +150,7 @@ void BibleTime::initActions() {
m_viewMainIndex_action = new KToggleAction(i18n("&Show bookshelf"),
CResMgr::mainMenu::view::showMainIndex::icon,
CResMgr::mainMenu::view::showMainIndex::accel,
- this, TQT_SLOT(slotToggleMainIndex()), actionCollection(),
+ TQT_TQOBJECT(this), TQT_SLOT(slotToggleMainIndex()), actionCollection(),
CResMgr::mainMenu::view::showMainIndex::actionName);
m_viewMainIndex_action->setToolTip( CResMgr::mainMenu::view::showMainIndex::tooltip );
@@ -162,7 +162,7 @@ void BibleTime::initActions() {
m_viewInfoDisplay_action = new KToggleAction(i18n("Show &mag"),
CResMgr::mainMenu::view::showInfoDisplay::icon,
CResMgr::mainMenu::view::showInfoDisplay::accel,
- this, TQT_SLOT(slotToggleInfoDisplay()), actionCollection(),
+ TQT_TQOBJECT(this), TQT_SLOT(slotToggleInfoDisplay()), actionCollection(),
CResMgr::mainMenu::view::showInfoDisplay::actionName);
m_viewMainIndex_action->setToolTip( CResMgr::mainMenu::view::showInfoDisplay::tooltip );
@@ -171,7 +171,7 @@ void BibleTime::initActions() {
m_viewInfoDisplay_action->plugAccel( accel() );
#endif
- action = KStdAction::preferences(this, TQT_SLOT( slotSettingsOptions() ), actionCollection());
+ action = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT( slotSettingsOptions() ), actionCollection());
action->setToolTip( CResMgr::mainMenu::settings::optionsDialog::tooltip );
#if KDE_VERSION_MINOR < 1
@@ -182,7 +182,7 @@ void BibleTime::initActions() {
action = new KAction(i18n("Bookshelf &Manager"),
CResMgr::mainMenu::settings::swordSetupDialog::icon,
CResMgr::mainMenu::settings::swordSetupDialog::accel,
- this, TQT_SLOT( slotSwordSetupDialog() ), actionCollection(),
+ TQT_TQOBJECT(this), TQT_SLOT( slotSwordSetupDialog() ), actionCollection(),
CResMgr::mainMenu::settings::swordSetupDialog::actionName
);
action->setToolTip( CResMgr::mainMenu::settings::swordSetupDialog::tooltip );
@@ -198,7 +198,7 @@ void BibleTime::initActions() {
KStdAction::stdName(KStdAction::ConfigureToolbars))
);
}
- action = KStdAction::configureToolbars(this, TQT_SLOT( slotSettingsToolbar() ), actionCollection());
+ action = KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT( slotSettingsToolbar() ), actionCollection());
action->setToolTip( CResMgr::mainMenu::settings::editToolBar::tooltip );
#if KDE_VERSION_MINOR < 1
@@ -214,7 +214,7 @@ void BibleTime::initActions() {
m_windowManualMode_action = new KToggleAction(i18n("&Manual mode"),
CResMgr::mainMenu::window::arrangementMode::manual::icon,
CResMgr::mainMenu::window::arrangementMode::manual::accel,
- this, TQT_SLOT(slotManualArrangementMode()), actionCollection(),
+ TQT_TQOBJECT(this), TQT_SLOT(slotManualArrangementMode()), actionCollection(),
CResMgr::mainMenu::window::arrangementMode::manual::actionName
);
m_windowManualMode_action->setToolTip(
@@ -231,7 +231,7 @@ void BibleTime::initActions() {
m_windowAutoTileVertical_action = new KToggleAction(i18n("Auto-tile &vertically"),
CResMgr::mainMenu::window::arrangementMode::autoTileVertical::icon,
CResMgr::mainMenu::window::arrangementMode::autoTileVertical::accel,
- this, TQT_SLOT(slotAutoTileVertical()), actionCollection(),
+ TQT_TQOBJECT(this), TQT_SLOT(slotAutoTileVertical()), actionCollection(),
CResMgr::mainMenu::window::arrangementMode::autoTileVertical::actionName
);
m_windowAutoTileVertical_action->setToolTip(
@@ -248,7 +248,7 @@ void BibleTime::initActions() {
m_windowAutoTileHorizontal_action = new KToggleAction(i18n("Auto-tile &horizontally"),
CResMgr::mainMenu::window::arrangementMode::autoTileHorizontal::icon,
CResMgr::mainMenu::window::arrangementMode::autoTileHorizontal::accel,
- this, TQT_SLOT(slotAutoTileHorizontal()), actionCollection(),
+ TQT_TQOBJECT(this), TQT_SLOT(slotAutoTileHorizontal()), actionCollection(),
CResMgr::mainMenu::window::arrangementMode::autoTileHorizontal::actionName
);
m_windowAutoTileHorizontal_action->setToolTip(
@@ -265,7 +265,7 @@ void BibleTime::initActions() {
m_windowAutoCascade_action = new KToggleAction(i18n("Auto-&cascade"),
CResMgr::mainMenu::window::arrangementMode::autoCascade::icon,
CResMgr::mainMenu::window::arrangementMode::autoCascade::accel,
- this, TQT_SLOT(slotAutoCascade()), actionCollection(),
+ TQT_TQOBJECT(this), TQT_SLOT(slotAutoCascade()), actionCollection(),
CResMgr::mainMenu::window::arrangementMode::autoCascade::actionName
);
m_windowAutoCascade_action->setToolTip(
@@ -281,7 +281,7 @@ void BibleTime::initActions() {
m_windowCascade_action = new KAction(i18n("&Cascade"),
CResMgr::mainMenu::window::cascade::icon,
CResMgr::mainMenu::window::cascade::accel,
- this, TQT_SLOT(slotCascade()), actionCollection(),
+ TQT_TQOBJECT(this), TQT_SLOT(slotCascade()), actionCollection(),
CResMgr::mainMenu::window::cascade::actionName
);
m_windowCascade_action->setToolTip( CResMgr::mainMenu::window::cascade::tooltip );
@@ -295,7 +295,7 @@ void BibleTime::initActions() {
m_windowTileVertical_action = new KAction(i18n("Tile &vertically"),
CResMgr::mainMenu::window::tileVertical::icon,
CResMgr::mainMenu::window::tileVertical::accel,
- this, TQT_SLOT(slotTileVertical()), actionCollection(),
+ TQT_TQOBJECT(this), TQT_SLOT(slotTileVertical()), actionCollection(),
CResMgr::mainMenu::window::tileVertical::actionName
);
m_windowTileVertical_action->setToolTip( CResMgr::mainMenu::window::tileVertical::tooltip );
@@ -307,7 +307,7 @@ void BibleTime::initActions() {
m_windowTileHorizontal_action = new KAction(i18n("Tile &horizontally"),
CResMgr::mainMenu::window::tileHorizontal::icon,
CResMgr::mainMenu::window::tileHorizontal::accel,
- this, TQT_SLOT(slotTileHorizontal()), actionCollection(),
+ TQT_TQOBJECT(this), TQT_SLOT(slotTileHorizontal()), actionCollection(),
CResMgr::mainMenu::window::tileHorizontal::actionName
);
m_windowTileHorizontal_action->setToolTip( CResMgr::mainMenu::window::tileHorizontal::tooltip );
@@ -321,7 +321,7 @@ void BibleTime::initActions() {
m_windowCloseAll_action = new KAction(i18n("Cl&ose all"),
CResMgr::mainMenu::window::closeAll::icon,
CResMgr::mainMenu::window::closeAll::accel,
- m_mdi, TQT_SLOT(deleteAll()), actionCollection(),
+ TQT_TQOBJECT(m_mdi), TQT_SLOT(deleteAll()), actionCollection(),
CResMgr::mainMenu::window::closeAll::actionName
);
m_windowCloseAll_action->setToolTip( CResMgr::mainMenu::window::closeAll::tooltip );
@@ -347,7 +347,7 @@ void BibleTime::initActions() {
m_windowSaveToNewProfile_action = new KAction(i18n("Save as &new session"),
CResMgr::mainMenu::window::saveToNewProfile::icon,
CResMgr::mainMenu::window::saveToNewProfile::accel,
- this, TQT_SLOT(saveToNewProfile()), actionCollection(),
+ TQT_TQOBJECT(this), TQT_SLOT(saveToNewProfile()), actionCollection(),
CResMgr::mainMenu::window::saveToNewProfile::actionName
);
m_windowSaveToNewProfile_action->setToolTip( CResMgr::mainMenu::window::saveToNewProfile::tooltip );
@@ -384,7 +384,7 @@ void BibleTime::initActions() {
m_windowFullscreen_action = new KToggleAction(i18n("&Fullscreen mode"),
CResMgr::mainMenu::window::showFullscreen::icon,
CResMgr::mainMenu::window::showFullscreen::accel,
- this, TQT_SLOT(toggleFullscreen()), actionCollection(),
+ TQT_TQOBJECT(this), TQT_SLOT(toggleFullscreen()), actionCollection(),
CResMgr::mainMenu::window::showFullscreen::actionName
);
m_windowFullscreen_action->setToolTip( CResMgr::mainMenu::window::showFullscreen::tooltip );
@@ -413,7 +413,7 @@ void BibleTime::initActions() {
action = new KAction(i18n("&Handbook"),
CResMgr::mainMenu::help::handbook::icon,
CResMgr::mainMenu::help::handbook::accel,
- this, TQT_SLOT(openOnlineHelp_Handbook()), actionCollection(),
+ TQT_TQOBJECT(this), TQT_SLOT(openOnlineHelp_Handbook()), actionCollection(),
CResMgr::mainMenu::help::handbook::actionName
);
action->setToolTip( CResMgr::mainMenu::help::handbook::tooltip );
@@ -426,7 +426,7 @@ void BibleTime::initActions() {
action = new KAction(i18n("&Bible Study Howto"),
CResMgr::mainMenu::help::bibleStudyHowTo::icon,
CResMgr::mainMenu::help::bibleStudyHowTo::accel,
- this, TQT_SLOT(openOnlineHelp_Howto()), actionCollection(),
+ TQT_TQOBJECT(this), TQT_SLOT(openOnlineHelp_Howto()), actionCollection(),
CResMgr::mainMenu::help::bibleStudyHowTo::actionName
);
action->setToolTip( CResMgr::mainMenu::help::bibleStudyHowTo::tooltip );
@@ -457,7 +457,7 @@ void BibleTime::initActions() {
action = new KAction(i18n("&Daily tip"),
CResMgr::mainMenu::help::dailyTip::icon,
CResMgr::mainMenu::help::dailyTip::accel,
- this, TQT_SLOT(slotHelpTipOfDay()), actionCollection(),
+ TQT_TQOBJECT(this), TQT_SLOT(slotHelpTipOfDay()), actionCollection(),
CResMgr::mainMenu::help::dailyTip::actionName
);
action->setToolTip(CResMgr::mainMenu::help::dailyTip::tooltip);
@@ -580,7 +580,7 @@ void BibleTime::applyProfileSettings( CProfile* p ) {
Q_ASSERT(p);
if (!p) return;
- if (m_initialized) { //on startup KDE sets the main geometry
+ if (m_initialized) { //on startup KDE sets the main tqgeometry
//see polish(), where m_initialized is set and the KDE methods are called for window resize
//first Main Window state
@@ -588,9 +588,9 @@ void BibleTime::applyProfileSettings( CProfile* p ) {
toggleFullscreen(); //either showFullscreen or showNormal
if (p->maximized()) KMainWindow::showMaximized(); //if maximized, then also call showMaximized
- //Then Main Window geometry
- KMainWindow::resize( p->geometry().size() ); //Don't use KMainWindowInterface::resize
- KMainWindow::move( p->geometry().topLeft() );//Don't use KMainWindowInterface::move
+ //Then Main Window tqgeometry
+ KMainWindow::resize( p->tqgeometry().size() ); //Don't use KMainWindowInterface::resize
+ KMainWindow::move( p->tqgeometry().topLeft() );//Don't use KMainWindowInterface::move
}
}
@@ -602,8 +602,8 @@ void BibleTime::storeProfileSettings( CProfile* p ) {
p->setFullscreen( m_windowFullscreen_action->isChecked() );
p->setMaximized( this->KMainWindow::isMaximized() );
- TQRect geometry;
- geometry.setTopLeft(pos());
- geometry.setSize(size());
- p->setGeometry(geometry);
+ TQRect tqgeometry;
+ tqgeometry.setTopLeft(pos());
+ tqgeometry.setSize(size());
+ p->setGeometry(tqgeometry);
}
diff --git a/bibletime/bibletime_slots.cpp b/bibletime/bibletime_slots.cpp
index 05fe12c..56c3913 100644
--- a/bibletime/bibletime_slots.cpp
+++ b/bibletime/bibletime_slots.cpp
@@ -171,18 +171,10 @@ void BibleTime::slotWindowMenuAboutToShow() {
m_windowCloseAll_action->setEnabled( true );
}
-#if QT_VERSION >= 0x030200
TQPtrList::iterator end = m_windowOpenWindowsList.end();
for (TQPtrList::iterator it = m_windowOpenWindowsList.begin(); it != end; ++it ) {
(*it)->unplugAll();
}
-#else
- TQPtrListIterator it(m_windowOpenWindowsList);
- while (it.current() != 0){
- it.current()->unplugAll();
- ++it;
- }
-#endif
m_windowOpenWindowsList.setAutoDelete(true);
m_windowOpenWindowsList.clear();
@@ -196,7 +188,7 @@ void BibleTime::slotWindowMenuAboutToShow() {
TQWidget* w = windows.at(i);
Q_ASSERT(w);
- KUserDataAction* action = new KUserDataAction(w->caption(), KShortcut(), this, TQT_SLOT(slotWindowMenuActivated()), m_windowActionCollection);
+ KUserDataAction* action = new KUserDataAction(w->caption(), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotWindowMenuActivated()), m_windowActionCollection);
Q_ASSERT(action);
action->setUserData(w);
@@ -332,12 +324,12 @@ void BibleTime::slotToggleToolbar() {
/** Shows or hides the groupmanager.
*/
void BibleTime::slotToggleMainIndex() {
- //we use the parent widget because the main index is enclosed in a layout which adds the label at the top
+ //we use the tqparent widget because the main index is enclosed in a tqlayout which adds the label at the top
if (m_viewMainIndex_action->isChecked()) {
- m_mainIndex->parentWidget()->show();
+ m_mainIndex->tqparentWidget()->show();
}
else {
- m_mainIndex->parentWidget()->hide();
+ m_mainIndex->tqparentWidget()->hide();
}
}
@@ -375,7 +367,7 @@ void BibleTime::slotSearchModules() {
};
};
- Search::CSearchDialog::openDialog(modules, TQString::null);
+ Search::CSearchDialog::openDialog(modules, TQString());
}
/* Search default Bible slot
@@ -389,7 +381,7 @@ void BibleTime::slotSearchDefaultBible() {
module.append(bible);
}
- Search::CSearchDialog::openDialog(module, TQString::null);
+ Search::CSearchDialog::openDialog(module, TQString());
}
void BibleTime::openOnlineHelp_Handbook() {
@@ -533,7 +525,7 @@ void BibleTime::toggleFullscreen() {
/** Saves current settings into a new profile. */
void BibleTime::saveToNewProfile() {
bool ok = false;
- const TQString name = QInputDialog::getText(i18n("Session name:"), i18n("Please enter a name for the new session."), TQLineEdit::Normal, TQString::null, &ok, this);
+ const TQString name = TQInputDialog::getText(i18n("Session name:"), i18n("Please enter a name for the new session."), TQLineEdit::Normal, TQString(), &ok, this);
if (ok && !name.isEmpty()) {
CProfile* profile = m_profileMgr.create(name);
saveProfile(profile);
diff --git a/bibletime/bibletimeinterface.h b/bibletime/bibletimeinterface.h
index 3eda81c..95ecf11 100644
--- a/bibletime/bibletimeinterface.h
+++ b/bibletime/bibletimeinterface.h
@@ -12,7 +12,7 @@
#ifndef BIBLETIME_INTERFACE_H
#define BIBLETIME_INTERFACE_H
-//Qt includes
+//TQt includes
#include
#include
diff --git a/bibletime/bibletimeinterface_skel.cpp b/bibletime/bibletimeinterface_skel.cpp
index 36ef922..4c31311 100644
--- a/bibletime/bibletimeinterface_skel.cpp
+++ b/bibletime/bibletimeinterface_skel.cpp
@@ -22,11 +22,11 @@ static const char* const BibleTimeInterface_ftable[14][3] = {
{ "void", "openWindow(TQString,TQString)", "openWindow(TQString moduleName,TQString key)" },
{ "void", "openDefaultBible(TQString)", "openDefaultBible(TQString key)" },
{ "void", "closeAllModuleWindows()", "closeAllModuleWindows()" },
- { "TQString", "getCurrentReference()", "getCurrentReference()" },
- { "TQStringList", "searchInModule(TQString,TQString)", "searchInModule(TQString moduleName,TQString searchText)" },
- { "TQStringList", "searchInOpenModules(TQString)", "searchInOpenModules(TQString searchText)" },
- { "TQStringList", "searchInDefaultBible(TQString)", "searchInDefaultBible(TQString searchText)" },
- { "TQStringList", "getModulesOfType(TQString)", "getModulesOfType(TQString type)" },
+ { TQSTRING_OBJECT_NAME_STRING, "getCurrentReference()", "getCurrentReference()" },
+ { TQSTRINGLIST_OBJECT_NAME_STRING, "searchInModule(TQString,TQString)", "searchInModule(TQString moduleName,TQString searchText)" },
+ { TQSTRINGLIST_OBJECT_NAME_STRING, "searchInOpenModules(TQString)", "searchInOpenModules(TQString searchText)" },
+ { TQSTRINGLIST_OBJECT_NAME_STRING, "searchInDefaultBible(TQString)", "searchInDefaultBible(TQString searchText)" },
+ { TQSTRINGLIST_OBJECT_NAME_STRING, "getModulesOfType(TQString)", "getModulesOfType(TQString type)" },
{ 0, 0, 0 }
};
static const int BibleTimeInterface_ftable_hiddens[13] = {
@@ -53,7 +53,7 @@ bool BibleTimeInterface::process(const TQCString &fun, const TQByteArray &data,
for ( int i = 0; BibleTimeInterface_ftable[i][1]; i++ )
fdict->insert( BibleTimeInterface_ftable[i][1], new int( i ) );
}
- int* fp = fdict->find( fun );
+ int* fp = fdict->tqfind( fun );
switch ( fp?*fp:-1) {
case 0: { // void syncAllBibles(TQString)
TQString arg0;
diff --git a/bibletime/frontend/btinstallmgr.cpp b/bibletime/frontend/btinstallmgr.cpp
index b253286..e569642 100644
--- a/bibletime/frontend/btinstallmgr.cpp
+++ b/bibletime/frontend/btinstallmgr.cpp
@@ -12,7 +12,7 @@
#include "util/cpointers.h"
#include "cbtconfig.h"
-//Qt includes
+//TQt includes
#include
#include
@@ -41,7 +41,7 @@ namespace BookshelfManager {
const TQString BTInstallMgr::Tool::LocalConfig::swordConfigFilename() {
// Q_ASSERT( CPointers::backend()->sysconfig );
- return TQString::fromLatin1("%1/.sword/sword.conf").arg(getenv("HOME"));
+ return TQString::tqfromLatin1("%1/.sword/sword.conf").tqarg(getenv("HOME"));
}
TQStringList BTInstallMgr::Tool::RemoteConfig::sourceList( sword::InstallMgr* mgr ) {
@@ -65,7 +65,7 @@ namespace BookshelfManager {
while (sourceBegin != sourceEnd) {
InstallSource is("DIR", sourceBegin->second.c_str());
- names << TQString::fromLatin1(is.caption.c_str());
+ names << TQString::tqfromLatin1(is.caption.c_str());
sourceBegin++;
}
@@ -91,7 +91,7 @@ namespace BookshelfManager {
filename = LocalConfig::swordConfigFilename();
directAccess = true;
}
- else if ( !i.exists() && dirInfo.isWritable() ) { // if the file doesn't exist but th eparent is writable for us, create it
+ else if ( !i.exists() && dirInfo.isWritable() ) { // if the file doesn't exist but th etqparent is writable for us, create it
filename = LocalConfig::swordConfigFilename();
directAccess = true;
}
@@ -102,12 +102,12 @@ namespace BookshelfManager {
for (TQStringList::const_iterator it = targets.begin(); it != targets.end(); ++it) {
TQString t = *it;
- if (t.contains( TQString("%1/.sword").arg(getenv("HOME")) )) {
+ if (t.tqcontains( TQString("%1/.sword").tqarg(getenv("HOME")) )) {
//we don't want HOME/.sword in the config
continue;
}
else {
- conf["Install"].insert( std::make_pair(!setDataPath ? SWBuf("DataPath") : SWBuf("AugmentPath"), t.local8Bit()) );
+ conf["Install"].insert( std::make_pair(!setDataPath ? SWBuf("DataPath") : SWBuf("AugmentPath"), t.local8Bit().data()) );
setDataPath = true;
}
@@ -117,7 +117,7 @@ namespace BookshelfManager {
if (!directAccess) { //use kdesu to move the file to the right place
KProcess *proc = new KProcess;
*proc << "kdesu";
- *proc << TQString::fromLatin1("-c") << TQString("mv %1 %2").arg(filename).arg(LocalConfig::swordConfigFilename());
+ *proc << TQString::tqfromLatin1("-c") << TQString("mv %1 %2").tqarg(filename).tqarg(LocalConfig::swordConfigFilename());
proc->start(KProcess::Block);
}
}
@@ -326,8 +326,8 @@ namespace BookshelfManager {
emit completed(totalPercent, filePercent);
}
- void BTInstallMgr::preStatus(long totalBytes, long completedBytes, const char* /*message*/) {
- qWarning("pre Status: %i / %i", (int)totalBytes, (int)completedBytes);
+ void BTInstallMgr::pretqStatus(long totalBytes, long completedBytes, const char* /*message*/) {
+ qWarning("pre tqStatus: %i / %i", (int)totalBytes, (int)completedBytes);
emit downloadStarted( "unknown filename" );
m_completedBytes = completedBytes;
diff --git a/bibletime/frontend/btinstallmgr.h b/bibletime/frontend/btinstallmgr.h
index 386e718..cf1a1e5 100644
--- a/bibletime/frontend/btinstallmgr.h
+++ b/bibletime/frontend/btinstallmgr.h
@@ -21,7 +21,7 @@
#include
#include
-//Qt includes
+//TQt includes
#include
#include
#include
@@ -40,6 +40,7 @@ namespace BookshelfManager {
*/
class BTInstallMgr : public TQObject, public sword::InstallMgr, public sword::StatusReporter {
Q_OBJECT
+ TQ_OBJECT
public:
class Tool {
public:
@@ -93,7 +94,7 @@ public:
protected:
/* Reimplementations of method in StatusReporter */
virtual void statusUpdate(double dltotal, double dlnow);
- virtual void preStatus(long totalBytes, long completedBytes, const char *message);
+ virtual void pretqStatus(long totalBytes, long completedBytes, const char *message);
// virtual FTPTransport *createFTPTransport(const char *host, StatusReporter *statusReporter);
diff --git a/bibletime/frontend/cbtconfig.cpp b/bibletime/frontend/cbtconfig.cpp
index 33a3793..54621d5 100644
--- a/bibletime/frontend/cbtconfig.cpp
+++ b/bibletime/frontend/cbtconfig.cpp
@@ -17,7 +17,7 @@
#include "util/cpointers.h"
-//Qt includes
+//TQt includes
#include
#include
#include
@@ -58,7 +58,7 @@ const TQString CBTConfig::getKey( const CBTConfig::strings ID) {
case displayStyle: return "displayStyle";
case bookshelfCurrentItem: return "bookshelfCurrentItem";
}
- return TQString::null;
+ return TQString();
}
const TQString CBTConfig::getDefault( const CBTConfig::strings ID) {
@@ -68,7 +68,7 @@ const TQString CBTConfig::getDefault( const CBTConfig::strings ID) {
case displayStyle: return CDisplayTemplateMgr::defaultTemplate();
case bookshelfCurrentItem: return TQString();
}
- return TQString::null;
+ return TQString();
}
const TQString CBTConfig::getKey( const CBTConfig::modules ID) {
@@ -83,7 +83,7 @@ const TQString CBTConfig::getKey( const CBTConfig::modules ID) {
case standardGreekMorphLexicon: return "standardGreekMorphLexicon";
}
- return TQString::null;
+ return TQString();
}
const TQString CBTConfig::getDefault( const CBTConfig::modules ID) {
@@ -100,7 +100,7 @@ const TQString CBTConfig::getDefault( const CBTConfig::modules ID) {
case standardGreekMorphLexicon: return "StrongsGreek";
}
- return TQString::null;
+ return TQString();
}
const TQString CBTConfig::getKey( const CBTConfig::bools ID) {
@@ -125,7 +125,7 @@ const TQString CBTConfig::getKey( const CBTConfig::bools ID) {
case crashedLastTime: return "crashedLastTime";
case crashedTwoTimes: return "crashedTwoTimes";
}
- return TQString::null;
+ return TQString();
}
const TQString CBTConfig::getKey( const CBTConfig::ints ID) {
@@ -145,7 +145,7 @@ const TQString CBTConfig::getKey( const CBTConfig::ints ID) {
case bookshelfContentsY: return "bookshelfContentsY";
case magDelay: return "magDelay";
}
- return TQString::null;
+ return TQString();
}
const bool CBTConfig::getDefault( const CBTConfig::bools ID) {
@@ -199,7 +199,7 @@ const TQString CBTConfig::getKey( const CBTConfig::intLists ID) {
case mainSplitterSizes: return "mainSplitterSizes";
}
- return TQString::null;
+ return TQString();
}
const TQValueList CBTConfig::getDefault( const CBTConfig::intLists ID) {
@@ -219,14 +219,14 @@ const TQString CBTConfig::getKey( const CBTConfig::stringLists ID) {
case searchTexts: return TQString("searchTexts");
case bookshelfOpenGroups: return TQString("bookshelfOpenGroups");
}
- return TQString::null;
+ return TQString();
}
const TQStringList CBTConfig::getDefault( const CBTConfig::stringLists ID) {
switch ( ID ) {
case searchTexts: {
TQStringList list;
- list.append(TQString::null);
+ list.append(TQString());
return list;
}
case searchCompletionTexts:
@@ -242,7 +242,7 @@ const TQString CBTConfig::getKey( const CBTConfig::stringMaps ID) {
case searchScopes:
return TQString("SearchScopes");
};
- return TQString::null;
+ return TQString();
}
const CBTConfig::StringMap CBTConfig::getDefault( const CBTConfig::stringMaps ID) {
@@ -386,8 +386,8 @@ const CBTConfig::StringMap CBTConfig::get
const CBTConfig::FontSettingsPair CBTConfig::get
( const CLanguageMgr::Language* const language ) {
- if (fontConfigMap && fontConfigMap->contains(language)) {
- return fontConfigMap->find(language).data();
+ if (fontConfigMap && fontConfigMap->tqcontains(language)) {
+ return fontConfigMap->tqfind(language).data();
}
if (!fontConfigMap) {
@@ -423,7 +423,7 @@ 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() : TQString::null);
+ config->writeEntry(getKey(ID), value ? value->name() : TQString());
}
void CBTConfig::set
@@ -479,12 +479,12 @@ void CBTConfig::set
* will always work with each locale set.
*/
CBTConfig::StringMap::ConstIterator it;
- TQString data;// = TQString::null;
+ TQString data;// = TQString();
sword::VerseKey vk;
for (it = value.begin(); it != value.end(); ++it) {
sword::ListKey list = vk.ParseVerseList(it.data().utf8(), "Genesis 1:1", true);
- data = TQString::null;
+ data = TQString();
for (int i = 0; i < list.Count(); ++i) {
if ( sword::VerseKey* range = dynamic_cast(list.GetElement(i)) ) {
range->setLocale("en");
@@ -515,7 +515,7 @@ void CBTConfig::set
config->setGroup("font standard settings");
config->writeEntry(getKey(language), value.first);
- if (fontConfigMap && fontConfigMap->contains(language)) {
+ if (fontConfigMap && fontConfigMap->tqcontains(language)) {
fontConfigMap->remove
(language); //remove it from the cache
}
@@ -642,7 +642,7 @@ const TQString CBTConfig::getModuleEncryptionKey( const TQString& module ) {
KConfig* config = CBTConfig::getConfig();
KConfigGroupSaver groupSaver(config, "Module keys");
- return config->readEntry(module, TQString::null);
+ return config->readEntry(module, TQString());
}
void CBTConfig::setModuleEncryptionKey( const TQString& module, const TQString& key ) {
diff --git a/bibletime/frontend/cbtconfig.h b/bibletime/frontend/cbtconfig.h
index c949593..b653bb8 100644
--- a/bibletime/frontend/cbtconfig.h
+++ b/bibletime/frontend/cbtconfig.h
@@ -15,7 +15,7 @@
#include "backend/cswordbackend.h"
#include "backend/clanguagemgr.h"
-//Qt includes
+//TQt includes
#include
#include
#include
diff --git a/bibletime/frontend/cdragdropmgr.cpp b/bibletime/frontend/cdragdropmgr.cpp
index 5c8cb7b..de315bf 100644
--- a/bibletime/frontend/cdragdropmgr.cpp
+++ b/bibletime/frontend/cdragdropmgr.cpp
@@ -19,7 +19,7 @@
//Sword includes
#include "versekey.h"
-//Qt includes
+//TQt includes
#include
#include
@@ -48,7 +48,7 @@ const char* CDragDropMgr::BTDrag::format( int i ) const {
bool CDragDropMgr::BTDrag::decode(const TQMimeSource* e, TQString& str) {
if (canDecode(e)) {
- str = TQString( e->encodedData( "BibleTime/DND" ) );
+ str = TQString( e->tqencodedData( "BibleTime/DND" ) );
return true;
}
return false;
@@ -58,17 +58,17 @@ bool CDragDropMgr::BTDrag::decode(const TQMimeSource* e, TQString& str, TQCStrin
return decode(e, str);
};
-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
+TQByteArray CDragDropMgr::BTDrag::tqencodedData( const char* /*type*/ ) const {
+ return TQTextDrag::tqencodedData("text/plain"); //hack because TQTextDrag only accepts text/plainand not our BibleTime/DND type
};
///////////////////////////// new class //////////////////////
CDragDropMgr::Item::Item( const TQString& text )
: m_type(Text),
-m_bookmarkModuleName(TQString::null),
-m_bookmarkKey(TQString::null),
-m_bookmarkDescription(TQString::null),
+m_bookmarkModuleName(TQString()),
+m_bookmarkKey(TQString()),
+m_bookmarkDescription(TQString()),
m_text(text) {}
CDragDropMgr::Item::Item( const TQString& moduleName, const TQString& key, const TQString& description )
@@ -76,7 +76,7 @@ CDragDropMgr::Item::Item( const TQString& moduleName, const TQString& key, const
m_bookmarkModuleName(moduleName),
m_bookmarkKey(key),
m_bookmarkDescription(description),
-m_text(TQString::null) {
+m_text(TQString()) {
//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) {
@@ -217,14 +217,14 @@ CDragDropMgr::ItemList CDragDropMgr::decode( const TQMimeSource* const src) {
while (!elem.isNull()) {
if (elem.tagName() == "BOOKMARK") { //we found a bookmark!
// qWarning("found a bookmark!");
- 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;
+ const TQString key = elem.hasAttribute("key") ? elem.attribute("key") : TQString();
+ const TQString moduleName = elem.hasAttribute("moduleName") ? elem.attribute("moduleName") : TQString();
+ const TQString description = elem.hasAttribute("description") ? elem.attribute("description") : TQString();
dndItems.append( CDragDropMgr::Item(moduleName, key, description) );
}
else if (elem.tagName() == "TEXT") { //we found a plain text passage!
- const TQString text = elem.hasAttribute("text") ? elem.attribute("text") : TQString::null;
+ const TQString text = elem.hasAttribute("text") ? elem.attribute("text") : TQString();
dndItems.append( CDragDropMgr::Item(text) );
};
elem = elem.nextSibling().toElement();
diff --git a/bibletime/frontend/cdragdropmgr.h b/bibletime/frontend/cdragdropmgr.h
index 904aa15..e8c4243 100644
--- a/bibletime/frontend/cdragdropmgr.h
+++ b/bibletime/frontend/cdragdropmgr.h
@@ -12,7 +12,7 @@
#ifndef CDRAGDROPMGR_H
#define CDRAGDROPMGR_H
-//Qt includes
+//TQt includes
#include
#include
#include
@@ -82,7 +82,7 @@ public:
* This constructor automatically sets the type member to Text
* This is also the default constructor
*/
- Item(const TQString& text = TQString::null );
+ Item(const TQString& text = TQString() );
/** Constructor for a Bookmark item
* This constructor automatically sets the type member to Bookmark
*/
@@ -135,7 +135,7 @@ public:
virtual bool provides( const char* type ) const;
virtual const char* format( int i = 0 ) const;
- virtual TQByteArray encodedData( const char* type ) const;
+ virtual TQByteArray tqencodedData( const char* type ) const;
protected:
friend class CDragDropMgr;
diff --git a/bibletime/frontend/cexportmanager.cpp b/bibletime/frontend/cexportmanager.cpp
index 279ada6..2dc1dbd 100644
--- a/bibletime/frontend/cexportmanager.cpp
+++ b/bibletime/frontend/cexportmanager.cpp
@@ -25,7 +25,7 @@
#include "util/ctoolclass.h"
#include "util/scoped_resource.h"
-//Qt includes
+//TQt includes
#include
#include
#include
@@ -44,7 +44,7 @@ using namespace Rendering;
using namespace Printing;
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_caption = !caption.isEmpty() ? caption : TQString::tqfromLatin1("BibleTime");
m_progressLabel = progressLabel;
m_filterOptions = filterOptions;
m_displayOptions = displayOptions;
@@ -237,7 +237,7 @@ const bool CExportManager::copyKey(CSwordKey* key, const Format format, const bo
text = render->renderSingleKey(key->key(), modules);
}
- KApplication::clipboard()->setText(text);
+ KApplication::tqclipboard()->setText(text);
return true;
};
@@ -272,7 +272,7 @@ const bool CExportManager::copyKeyList(sword::ListKey* list, CSwordModuleInfo* m
}
const TQString text = render->renderKeyTree(tree);
- KApplication::clipboard()->setText(text);
+ KApplication::tqclipboard()->setText(text);
return true;
};
@@ -306,7 +306,7 @@ const bool CExportManager::copyKeyList(TQPtrList& list, const Format
};
const TQString text = render->renderKeyTree(tree);
- KApplication::clipboard()->setText(text);
+ KApplication::tqclipboard()->setText(text);
return true;
};
@@ -441,11 +441,11 @@ const bool CExportManager::printKeyList(const TQStringList& list,CSwordModuleInf
CPrinter::KeyTree tree;
setProgressRange(list.count());
- //ToDo: Fix that as soon as we use Qt > 3.1
+ //ToDo: Fix that as soon as we use TQt > 3.1
// 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
+ //ToDo: Fix that as soon as we use TQt > 3.1
// for (TQStringList::const_iterator it = list.constBegin(); (it != end) && !progressWasCancelled(); ++it) {
for (TQStringList::const_iterator it = list.begin(); (it != end) && !progressWasCancelled(); ++it) {
@@ -479,15 +479,15 @@ const TQString CExportManager::filterString( const Format format ) {
/** Returns a filename to save a file. */
const TQString CExportManager::getSaveFileName(const Format format) {
- return KFileDialog::getSaveFileName(TQString::null, filterString(format), 0, m_caption);
+ return KFileDialog::getSaveFileName(TQString(), filterString(format), 0, m_caption);
}
/** Returns a string containing the linebreak for the current format. */
const TQString CExportManager::lineBreak(const Format format) {
if (static_cast(m_displayOptions.lineBreaks))
- return (format == HTML) ? TQString::fromLatin1("
\n") : TQString::fromLatin1("\n");
+ return (format == HTML) ? TQString::tqfromLatin1("
\n") : TQString::tqfromLatin1("\n");
- return TQString::null;
+ return TQString();
}
/** No descriptions */
@@ -497,7 +497,7 @@ void CExportManager::setProgressRange( const int items ) {
dlg->setProgress(0);
dlg->setMinimumDuration(0);
dlg->show();
- // dlg->repaint();
+ // dlg->tqrepaint();
KApplication::kApplication()->processEvents(); //do not lock the GUI!
}
}
diff --git a/bibletime/frontend/cexportmanager.h b/bibletime/frontend/cexportmanager.h
index 54c98c0..e4c042f 100644
--- a/bibletime/frontend/cexportmanager.h
+++ b/bibletime/frontend/cexportmanager.h
@@ -18,7 +18,7 @@
#include "util/cpointers.h"
-//Qt includes
+//TQt includes
#include
#include
@@ -39,7 +39,7 @@ public:
Text
};
- 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());
+ CExportManager(const TQString& caption, const bool showProgress = true, const TQString& progressLabel = TQString(), 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);
diff --git a/bibletime/frontend/cinfodisplay.cpp b/bibletime/frontend/cinfodisplay.cpp
index 70dc05f..831b2fb 100644
--- a/bibletime/frontend/cinfodisplay.cpp
+++ b/bibletime/frontend/cinfodisplay.cpp
@@ -31,7 +31,7 @@
//Sword includes
#include
-//Qt includes
+//TQt includes
#include
#include
#include
@@ -47,9 +47,9 @@ using namespace sword;
namespace InfoDisplay {
- CInfoDisplay::CInfoDisplay(TQWidget *parent, const char *name)
-: TQWidget(parent, name) {
- TQVBoxLayout* layout = new TQVBoxLayout(this);
+ CInfoDisplay::CInfoDisplay(TQWidget *tqparent, const char *name)
+: TQWidget(tqparent, name) {
+ TQVBoxLayout* tqlayout = new TQVBoxLayout(this);
TQLabel* headingLabel = new TQLabel(i18n("Mag (\"shift\" to lock)"),this);
headingLabel->setMargin(5);
@@ -63,8 +63,8 @@ namespace InfoDisplay {
TQT_SLOT(lookup(const TQString&, const TQString&))
);
- layout->addWidget(headingLabel);
- layout->addWidget(m_htmlPart->view());
+ tqlayout->addWidget(headingLabel);
+ tqlayout->addWidget(m_htmlPart->view());
}
@@ -97,7 +97,7 @@ namespace InfoDisplay {
void CInfoDisplay::setInfo(const InfoType type, const TQString& data) {
ListInfoData list;
- list.append( qMakePair(type, data) );
+ list.append( tqMakePair(type, data) );
setInfo(list);
}
@@ -165,9 +165,9 @@ namespace InfoDisplay {
ret.append(
TQString("")
- .arg(i18n("Abbreviation"))
- .arg("text")
- .arg(text));
+ .tqarg(i18n("Abbreviation"))
+ .tqarg("text")
+ .tqarg(text));
return ret;
}
@@ -176,7 +176,7 @@ namespace InfoDisplay {
Q_ASSERT(!data.isEmpty());
if (data.isEmpty()) {
return TQString("%1
")
- .arg(i18n("Cross references"));
+ .tqarg(i18n("Cross references"));
}
// qWarning("setting crossref %s", data.latin1());
@@ -267,11 +267,11 @@ 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
+ //spanns containing rtl text need dir=rtl on their tqparent tag to be aligned properly
return TQString("")
- .arg(i18n("Cross references"))
- .arg(module ? ((module->textDirection() == CSwordModuleInfo::LeftToRight) ? "ltr" : "rtl") : "")
- .arg(renderer.renderKeyTree(tree));
+ .tqarg(i18n("Cross references"))
+ .tqarg(module ? ((module->textDirection() == CSwordModuleInfo::LeftToRight) ? "ltr" : "rtl") : "")
+ .tqarg(renderer.renderKeyTree(tree));
}
/*!
@@ -281,7 +281,7 @@ namespace InfoDisplay {
TQStringList list = TQStringList::split("/", data);
Q_ASSERT(list.count() >= 3);
if (!list.count()) {
- return TQString::null;
+ return TQString();
}
const TQString modulename = list.first();
@@ -293,7 +293,7 @@ namespace InfoDisplay {
CSwordModuleInfo* module = CPointers::backend()->findModuleByName(modulename);
if (!module) {
- return TQString::null;
+ return TQString();
}
util::scoped_ptr key( CSwordKey::createInstance(module) );
@@ -310,8 +310,8 @@ namespace InfoDisplay {
));
return TQString("")
- .arg(i18n("Footnote"))
- .arg(text);
+ .tqarg(i18n("Footnote"))
+ .tqarg(text);
}
const TQString CInfoDisplay::decodeStrongs( const TQString& data ) {
@@ -337,9 +337,9 @@ namespace InfoDisplay {
ret.append(
TQString("")
- .arg(i18n("Strongs"))
- .arg(*it)
- .arg(text)
+ .tqarg(i18n("Strongs"))
+ .tqarg(*it)
+ .tqarg(text)
);
}
@@ -356,7 +356,7 @@ namespace InfoDisplay {
TQString value = "";
TQString valueClass = "";
- int valStart = (*it).find(':');
+ int valStart = (*it).tqfind(':');
if (valStart > -1) {
valueClass = (*it).mid(0, valStart);
module = CPointers::backend()->findModuleByName( valueClass );
@@ -372,7 +372,7 @@ namespace InfoDisplay {
// 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()) {
+ switch (value.tqat(0).latin1()) {
case 'G':
module = CBTConfig::get
(CBTConfig::standardGreekMorphLexicon);
@@ -416,9 +416,9 @@ namespace InfoDisplay {
//if the module wasn't found just display an empty morph info
ret.append( TQString("")
- .arg(i18n("Morphology"))
- .arg(value)
- .arg(text)
+ .tqarg(i18n("Morphology"))
+ .tqarg(value)
+ .tqarg(text)
);
}
@@ -429,19 +429,19 @@ namespace InfoDisplay {
CSwordModuleInfo* const module = CBTConfig::get
(CBTConfig::standardLexicon);
if (!module) {
- return TQString::null;
+ return TQString();
}
util::scoped_ptr key( CSwordKey::createInstance(module) );
key->key( data );
if (key->key().upper() != data.upper()) { //key not present in the lexicon
- return TQString::null;
+ return TQString();
}
TQString ret = TQString("")
- .arg(i18n("Word lookup"))
- .arg(data)
- .arg(key->renderedText());
+ .tqarg(i18n("Word lookup"))
+ .tqarg(data)
+ .tqarg(key->renderedText());
return ret;
}
@@ -456,7 +456,7 @@ namespace InfoDisplay {
settings.pageCSS_ID = "infodisplay";
m_htmlPart->setText( tmgr->fillTemplate(CBTConfig::get
- (CBTConfig::displayStyle), TQString::null, settings) );
+ (CBTConfig::displayStyle), TQString(), settings) );
}
} //end of namespace InfoDisplay
diff --git a/bibletime/frontend/cinfodisplay.h b/bibletime/frontend/cinfodisplay.h
index 4b081b6..c75dbf1 100644
--- a/bibletime/frontend/cinfodisplay.h
+++ b/bibletime/frontend/cinfodisplay.h
@@ -16,7 +16,7 @@
//Backend
#include "backend/ctextrendering.h"
-//Qt includes
+//TQt includes
#include
#include
#include
@@ -31,6 +31,7 @@ namespace InfoDisplay {
*/
class CInfoDisplay : public TQWidget {
Q_OBJECT
+ TQ_OBJECT
public:
enum InfoType {
Abbreviation,
@@ -45,7 +46,7 @@ public:
typedef TQPair InfoData;
typedef TQValueList ListInfoData;
- CInfoDisplay(TQWidget *parent = 0, const char *name = 0);
+ CInfoDisplay(TQWidget *tqparent = 0, const char *name = 0);
virtual ~CInfoDisplay();
void setInfo(const InfoType, const TQString& data);
diff --git a/bibletime/frontend/cinputdialog.cpp b/bibletime/frontend/cinputdialog.cpp
index 7647a73..b1d7710 100644
--- a/bibletime/frontend/cinputdialog.cpp
+++ b/bibletime/frontend/cinputdialog.cpp
@@ -12,7 +12,7 @@
//own includes
#include "cinputdialog.h"
-//Qt includes
+//TQt includes
#include
#include
#include
@@ -23,7 +23,7 @@
#include
#include
-CInputDialog::CInputDialog(const TQString& caption, const TQString& description, const TQString& text, TQWidget *parent, const char *name, const bool modal ) : KDialog(parent,name,modal) {
+CInputDialog::CInputDialog(const TQString& caption, const TQString& description, const TQString& text, TQWidget *tqparent, const char *name, const bool modal ) : KDialog(tqparent,name,modal) {
setPlainCaption(caption);
TQVBoxLayout* topLayout = new TQVBoxLayout(this, 5,5);
@@ -76,9 +76,9 @@ const TQString CInputDialog::text() {
}
/** A static function to get some using CInputDialog. */
-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);
- TQString ret = TQString::null;
+const TQString CInputDialog::getText( const TQString& caption, const TQString& description, const TQString& text, bool* ok, TQWidget* tqparent, bool modal) {
+ CInputDialog* dlg = new CInputDialog(caption, description, text, tqparent, "", modal);
+ TQString ret = TQString();
const bool isOk = (dlg->exec() == CInputDialog::Accepted);
if (isOk) {
diff --git a/bibletime/frontend/cinputdialog.h b/bibletime/frontend/cinputdialog.h
index a7b24ae..5fb1167 100644
--- a/bibletime/frontend/cinputdialog.h
+++ b/bibletime/frontend/cinputdialog.h
@@ -24,12 +24,13 @@ class TQWidget;
*/
class CInputDialog : public KDialog {
Q_OBJECT
+ TQ_OBJECT
public:
- CInputDialog(const TQString& caption, const TQString& description, const TQString& text, TQWidget *parent=0, const char *name=0, const bool modal = true);
+ CInputDialog(const TQString& caption, const TQString& description, const TQString& text, TQWidget *tqparent=0, const char *name=0, const bool modal = true);
/**
* A static function to get some using CInputDialog.
*/
- static const TQString getText( const TQString& caption, const TQString& description, const TQString& text = TQString::null, bool* ok = 0, TQWidget* parent = 0, bool modal = true);
+ static const TQString getText( const TQString& caption, const TQString& description, const TQString& text = TQString(), bool* ok = 0, TQWidget* tqparent = 0, bool modal = true);
/**
* Returns the text entered at the moment.
*/
diff --git a/bibletime/frontend/cmanageindiceswidget.cpp b/bibletime/frontend/cmanageindiceswidget.cpp
index 9928b49..eb22c43 100644
--- a/bibletime/frontend/cmanageindiceswidget.cpp
+++ b/bibletime/frontend/cmanageindiceswidget.cpp
@@ -22,7 +22,7 @@
#include "backend/cswordmoduleinfo.h"
#include "backend/cswordbackend.h"
-//Qt includes
+//TQt includes
#include
#include
#include
@@ -40,8 +40,8 @@
namespace BookshelfManager {
/** Constructor */
-CManageIndicesWidget::CManageIndicesWidget(TQWidget* parent, const char* name) :
- ManageIndicesForm(parent, name) {
+CManageIndicesWidget::CManageIndicesWidget(TQWidget* tqparent, const char* name) :
+ ManageIndicesForm(tqparent, name) {
initView();
populateModuleList();
@@ -68,7 +68,7 @@ void CManageIndicesWidget::initView()
m_moduleList->addColumn(i18n("Index size"));
m_moduleList->setRootIsDecorated(true);
m_moduleList->setColumnWidth(0, 150);
- m_moduleList->setColumnAlignment(1, Qt::AlignRight);
+ m_moduleList->setColumnAlignment(1, TQt::AlignRight);
m_moduleList->setSorting( -1 );
m_autoDeleteOrphanedIndicesBox->setChecked( CBTConfig::get( CBTConfig::autoDeleteOrphanedIndices ) );
@@ -103,7 +103,7 @@ void CManageIndicesWidget::populateModuleList() {
if ((*it)->hasIndex()) {
item = new TQCheckListItem(m_modsWithIndices, (*it)->name(),
TQCheckListItem::CheckBox);
- item->setText(1, TQString("%1 ").arg((*it)->indexSize() / 1024) + i18n("KiB"));
+ item->setText(1, TQString("%1 ").tqarg((*it)->indexSize() / 1024) + i18n("KiB"));
}
else {
item = new TQCheckListItem(m_modsWithoutIndices, (*it)->name(),
diff --git a/bibletime/frontend/cmanageindiceswidget.h b/bibletime/frontend/cmanageindiceswidget.h
index e9adb49..d4f5f9d 100644
--- a/bibletime/frontend/cmanageindiceswidget.h
+++ b/bibletime/frontend/cmanageindiceswidget.h
@@ -28,12 +28,13 @@ namespace BookshelfManager {
class CManageIndicesWidget : public ManageIndicesForm
{
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Constructor
*/
- CManageIndicesWidget(TQWidget* parent, const char* name = 0);
+ CManageIndicesWidget(TQWidget* tqparent, const char* name = 0);
/**
* Destructor
diff --git a/bibletime/frontend/cmdiarea.cpp b/bibletime/frontend/cmdiarea.cpp
index 4da250f..5f4c164 100644
--- a/bibletime/frontend/cmdiarea.cpp
+++ b/bibletime/frontend/cmdiarea.cpp
@@ -28,17 +28,13 @@
#include
#include
#include
-#if QT_VERSION < 0x030200
-//We need this to close all windows with Qt < 3.2
-#include
-#endif
-CMDIArea::CMDIArea(TQWidget *parent, const char *name )
-: TQWorkspace(parent, name),
+CMDIArea::CMDIArea(TQWidget *tqparent, const char *name )
+: TQWorkspace(tqparent, name),
m_guiOption(Nothing),
m_childEvent(false),
-m_appCaption(TQString::null) {
+m_appCaption(TQString()) {
initView();
initConnections();
readSettings();
@@ -47,7 +43,7 @@ m_appCaption(TQString::null) {
/** Initializes the view of the MDI area */
void CMDIArea::initView() {
- setPaletteBackgroundColor( parentWidget()->paletteBackgroundColor() ); //work around a KDE bug (IMHO was in KDE 2.x)
+ setPaletteBackgroundColor( tqparentWidget()->paletteBackgroundColor() ); //work around a KDE bug (IMHO was in KDE 2.x)
}
/** Initilizes the connectiosn to SIGNALS */
@@ -93,7 +89,7 @@ void CMDIArea::childEvent( TQChildEvent * e ) {
m_childEvent = true;
if (!windowList().count()) {
- m_appCaption = TQString::null;
+ m_appCaption = TQString();
emit sigSetToplevelCaption( KApplication::kApplication()->makeStdCaption(m_appCaption) );
emit sigLastPresenterClosed();
}
@@ -129,15 +125,7 @@ void CMDIArea::readSettings() {}
/** Deletes all the presenters in the MDI area. */
void CMDIArea::deleteAll() {
-#if QT_VERSION >= 0x030200
closeAllWindows();
-#else
- TQWidgetListIt it(windowList());
- while (it.current() != 0){
- it.current()->close();
- ++it;
- }
-#endif
}
/** Enable / disable autoCascading */
@@ -176,7 +164,7 @@ void CMDIArea::myTileHorizontal() {
if ((windows.count() == 1) && windows.at(0)) {
m_appCaption = windows.at(0)->caption();
- windows.at(0)/*->parentWidget()*/->showMaximized();
+ windows.at(0)/*->tqparentWidget()*/->showMaximized();
}
else {
@@ -191,13 +179,13 @@ void CMDIArea::myTileHorizontal() {
int y = 0;
for ( int i = 0; i < int(windows.count()); ++i ) {
TQWidget *window = windows.at(i);
- window->parentWidget()->showNormal();
- qApp->sendPostedEvents( 0, TQEvent::ShowNormal );
+ window->tqparentWidget()->showNormal();
+ tqApp->sendPostedEvents( 0, TQEvent::ShowNormal );
- const int preferredHeight = window->minimumHeight() + window->parentWidget()->baseSize().height();
- const int actHeight = QMAX(heightForEach, preferredHeight);
+ const int preferredHeight = window->minimumHeight() + window->tqparentWidget()->baseSize().height();
+ const int actHeight = TQMAX(heightForEach, preferredHeight);
- window->parentWidget()->setGeometry( 0, y, width(), actHeight );
+ window->tqparentWidget()->setGeometry( 0, y, width(), actHeight );
y += actHeight;
}
@@ -221,7 +209,7 @@ void CMDIArea::myCascade() {
if ((windows.count() == 1) && windows.at(0)) {
m_appCaption = windows.at(0)->caption();
- windows.at(0)->parentWidget()->showMaximized();
+ windows.at(0)->tqparentWidget()->showMaximized();
}
else {
const int offsetX = 40;
@@ -248,8 +236,8 @@ void CMDIArea::myCascade() {
window->setUpdatesEnabled(false);
- window->parentWidget()->raise(); //make it the on-top-of-window-stack window to make sure they're in the right order
- window->parentWidget()->setGeometry(x, y, windowWidth, windowHeight);
+ window->tqparentWidget()->raise(); //make it the on-top-of-window-stack window to make sure they're in the right order
+ window->tqparentWidget()->setGeometry(x, y, windowWidth, windowHeight);
x += offsetX;
y += offsetY;
@@ -258,8 +246,8 @@ void CMDIArea::myCascade() {
setUpdatesEnabled(true);
- active->parentWidget()->setGeometry(x, y, windowWidth, windowHeight);
- active->parentWidget()->raise();
+ active->tqparentWidget()->setGeometry(x, y, windowWidth, windowHeight);
+ active->tqparentWidget()->raise();
active->setActiveWindow();
blockSignals(false);
@@ -303,9 +291,8 @@ bool CMDIArea::eventFilter( TQObject *o, TQEvent *e ) {
TQWidget* w = dynamic_cast( o );
bool ret = TQWorkspace::eventFilter(o,e);
-#if QT_VERSION >= 0x030300
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
+ if (o->inherits("CDisplayWindow") && ((w->windowState() & TQt::WindowMinimized) || w->isHidden())) { //window was minimized, trigger a tile/cascade update if necessary
triggerWindowUpdate();
ret = false;
}
@@ -315,20 +302,6 @@ bool CMDIArea::eventFilter( TQObject *o, TQEvent *e ) {
//o->dumpObjectTree();
}
}
-#else
- if (w && o->inherits("CDisplayWindow")){
- if ((e->type() == TQEvent::ShowMinimized) ||
- (e->type() == TQEvent::Hide)){
- triggerWindowUpdate();
- ret = false;
- }
- }
- else if (!o->inherits("CDisplayWindow")){
- qDebug("bad mdi child classname: %s", o->className());
- //o->dumpObjectInfo();
- //o->dumpObjectTree();
- }
-#endif
return ret; // standard event processing
}
diff --git a/bibletime/frontend/cmdiarea.h b/bibletime/frontend/cmdiarea.h
index 5877e17..86da1c6 100644
--- a/bibletime/frontend/cmdiarea.h
+++ b/bibletime/frontend/cmdiarea.h
@@ -16,7 +16,7 @@
#include "util/cpointers.h"
#include "backend/cswordmoduleinfo.h"
-//Qt includes
+//TQt includes
#include
#include
#include
@@ -32,6 +32,7 @@ class CSwordKey;
*/
class CMDIArea : public TQWorkspace, public CPointers {
Q_OBJECT
+ TQ_OBJECT
public:
/**
@@ -43,7 +44,7 @@ public:
autoCascade,
Nothing
};
- CMDIArea(TQWidget *parent, const char *name = 0 );
+ CMDIArea(TQWidget *tqparent, const char *name = 0 );
/**
*/
void readSettings();
@@ -84,8 +85,8 @@ public slots:
* Also necessary for autoTile feature
*/
void myTileVertical();
- /** Horizontal tile function
- * This function was taken from Qt's MDI example.
+ /**Qt::Horizontal tile function
+ * This function was taken from TQt's MDI example.
*/
void myTileHorizontal();
/**
diff --git a/bibletime/frontend/cmoduleindexdialog.cpp b/bibletime/frontend/cmoduleindexdialog.cpp
index 44af1d5..7d01535 100644
--- a/bibletime/frontend/cmoduleindexdialog.cpp
+++ b/bibletime/frontend/cmoduleindexdialog.cpp
@@ -14,7 +14,7 @@
#include "util/scoped_resource.h"
-//Qt includes
+//TQt includes
#include
//KDE includes
@@ -38,7 +38,7 @@ void CModuleIndexDialog::indexAllModules( const ListCSwordModuleInfo& modules )
}
m_currentModuleIndex = 0;
- progress = new KProgressDialog(0, "progressDialog", i18n("Preparing instant search"), TQString::null, true);
+ progress = new KProgressDialog(0, "progressDialog", i18n("Preparing instant search"), TQString(), true);
progress->setAllowCancel(false);
progress->progressBar()->setTotalSteps( modules.count() * 100 );
progress->setMinimumDuration(0);
@@ -50,7 +50,7 @@ void CModuleIndexDialog::indexAllModules( const ListCSwordModuleInfo& modules )
(*it)->connectIndexingFinished(this, TQT_SLOT(slotFinished()));
(*it)->connectIndexingProgress(this, TQT_SLOT(slotModuleProgress(int)));
- progress->setLabel(i18n("Creating index for work %1").arg((*it)->name()));
+ progress->setLabel(i18n("Creating index for work %1").tqarg((*it)->name()));
qDebug("Building index for work %s", (*it)->name().latin1());
(*it)->buildIndex();
@@ -87,12 +87,12 @@ void CModuleIndexDialog::slotModuleProgress( int percentage ) {
// qDebug("progress %d", percentage);
progress->progressBar()->setProgress( m_currentModuleIndex * 100 + percentage );
- KApplication::kApplication()->processEvents( 10 ); //10 ms only
+ KApplication::kApplication()->tqprocessEvents( 10 ); //10 ms only
}
void CModuleIndexDialog::slotFinished( ) {
qDebug("indexing finished()");
progress->progressBar()->setProgress( progress->progressBar()->totalSteps() );
- KApplication::kApplication()->processEvents( 1 ); //1 ms only
+ KApplication::kApplication()->tqprocessEvents( 1 ); //1 ms only
}
diff --git a/bibletime/frontend/cmoduleindexdialog.h b/bibletime/frontend/cmoduleindexdialog.h
index f259785..7e64c57 100644
--- a/bibletime/frontend/cmoduleindexdialog.h
+++ b/bibletime/frontend/cmoduleindexdialog.h
@@ -14,7 +14,7 @@
#include "backend/cswordmoduleinfo.h"
-//Qt includes
+//TQt includes
#include
//forward declaration
@@ -29,6 +29,7 @@ class KProgressDialog;
*/
class CModuleIndexDialog : public TQObject {
Q_OBJECT
+ TQ_OBJECT
public:
/** Get the singleton instance.
*
diff --git a/bibletime/frontend/coptionsdialog.cpp b/bibletime/frontend/coptionsdialog.cpp
index cdce01b..d6a1c4f 100644
--- a/bibletime/frontend/coptionsdialog.cpp
+++ b/bibletime/frontend/coptionsdialog.cpp
@@ -71,8 +71,8 @@
using std::string;
using std::list;
-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) {
+COptionsDialog::COptionsDialog(TQWidget *tqparent, const char *name, KActionCollection* actionCollection )
+: KDialogBase(IconList, i18n("Configure BibleTime"), Ok | Cancel | Apply, Ok, tqparent, name, true, true, TQString(), TQString(), TQString()) {
m_settings.keys.application.actionCollection = actionCollection;
setIconListAllVisible(true);
@@ -84,13 +84,13 @@ COptionsDialog::COptionsDialog(TQWidget *parent, const char *name, KActionCollec
}
COptionsDialog::~COptionsDialog() {
- //the actionCollections objects are deleted by their TQWidget parent
+ //the actionCollections objects are deleted by their TQWidget tqparent
}
/** */
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) );
+ m_settings.fonts.fontMap.tqreplace( m_settings.fonts.usage->currentText(), CBTConfig::FontSettingsPair(oldSettings.first, newFont) );
}
/** Called when the combobox contents is changed */
@@ -135,9 +135,9 @@ const bool COptionsDialog::showPart( COptionsDialog::Parts /*ID*/ ) {
/** Initializes the startup section of the OD. */
void COptionsDialog::initDisplay() {
- TQFrame* page = addPage(i18n("Display"), TQString::null, DesktopIcon(CResMgr::settings::startup::icon,32));
- TQVBoxLayout* layout = new TQVBoxLayout(page);
- layout->setSpacing( 5 );
+ TQFrame* page = addPage(i18n("Display"), TQString(), DesktopIcon(CResMgr::settings::startup::icon,32));
+ TQVBoxLayout* tqlayout = new TQVBoxLayout(page);
+ tqlayout->setSpacing( 5 );
{//daily tips
m_settings.startup.showTips = new TQCheckBox(page);
@@ -149,8 +149,8 @@ void COptionsDialog::initDisplay() {
m_settings.startup.showTips->setChecked( CBTConfig::get
(CBTConfig::tips) );
}
- layout->addWidget(m_settings.startup.showTips);
- layout->addSpacing(5);
+ tqlayout->addWidget(m_settings.startup.showTips);
+ tqlayout->addSpacing(5);
{ //startup logo
m_settings.startup.showLogo = new TQCheckBox(page);
@@ -161,39 +161,39 @@ void COptionsDialog::initDisplay() {
m_settings.startup.showLogo->setChecked(CBTConfig::get
(CBTConfig::logo));
- layout->addWidget(m_settings.startup.showLogo);
- layout->addSpacing(20);
+ tqlayout->addWidget(m_settings.startup.showLogo);
+ tqlayout->addSpacing(20);
}
- layout->addWidget(
+ tqlayout->addWidget(
CToolClass::explanationLabel(page, i18n("Display templates"),
i18n("Display templates define how text is displayed. Please choose a template you like.")
)
);
- layout->addSpacing( 5 );
+ tqlayout->addSpacing( 5 );
- TQHBoxLayout* hboxlayout = new TQHBoxLayout();
+ TQHBoxLayout* hboxtqlayout = new TQHBoxLayout();
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(
+ hboxtqlayout->addWidget(
new TQLabel(m_settings.displayStyle.styleChooser, i18n("Available display styles:"), page)
);
- hboxlayout->addWidget( m_settings.displayStyle.styleChooser );
- hboxlayout->addStretch();
- layout->addLayout( hboxlayout );
+ hboxtqlayout->addWidget( m_settings.displayStyle.styleChooser );
+ hboxtqlayout->addStretch();
+ tqlayout->addLayout( hboxtqlayout );
m_settings.displayStyle.stylePreview = new KHTMLPart(page);
- layout->addWidget(
+ tqlayout->addWidget(
new TQLabel(
m_settings.displayStyle.stylePreview->view(),
i18n("Style preview"), page
)
);
- layout->addWidget(m_settings.displayStyle.stylePreview->view());
+ tqlayout->addWidget(m_settings.displayStyle.stylePreview->view());
m_settings.displayStyle.styleChooser->insertStringList(
CPointers::displayTemplateManager()->availableTemplates()
@@ -211,12 +211,12 @@ void COptionsDialog::initDisplay() {
/** Init fonts section. */
void COptionsDialog::initLanguages() {
- TQFrame* page = addPage(i18n("Languages"), TQString::null, DesktopIcon(CResMgr::settings::fonts::icon, 32));
- TQVBoxLayout* layout = new TQVBoxLayout(page,5);
- layout->setResizeMode( TQLayout::Minimum );
+ TQFrame* page = addPage(i18n("Languages"), TQString(), DesktopIcon(CResMgr::settings::fonts::icon, 32));
+ TQVBoxLayout* tqlayout = new TQVBoxLayout(page,5);
+ tqlayout->setResizeMode( TQLayout::Minimum );
{ //Sword locales
- layout->addWidget(
+ tqlayout->addWidget(
CToolClass::explanationLabel(page, i18n("Specify a language for names of Bible books"),
i18n("Sword has a number of locales available which can be used to internationalize the \
names of books of the Bible. You can specify which locale to use. If you want to \
@@ -233,7 +233,7 @@ void COptionsDialog::initLanguages() {
hBoxLayout->addWidget(label);
hBoxLayout->addWidget(m_settings.fonts.swordLocaleCombo);
hBoxLayout->addStretch();
- layout->addLayout(hBoxLayout);
+ tqlayout->addLayout(hBoxLayout);
TQStringList languageNames;
languageNames.append( languageMgr()->languageForAbbrev("en_US")->translatedName() );
@@ -267,7 +267,7 @@ void COptionsDialog::initLanguages() {
);
TQString currentLanguageName;
- if ( l->isValid() && languageNames.contains(l->translatedName()) ) { //tranlated language name is in the box
+ if ( l->isValid() && languageNames.tqcontains(l->translatedName()) ) { //tranlated language name is in the box
currentLanguageName = l->translatedName();
}
else { //a language like "German Abbrevs" might be the language to set
@@ -276,7 +276,7 @@ void COptionsDialog::initLanguages() {
(CBTConfig::language).local8Bit()
);
if (locale) {
- currentLanguageName = TQString::fromLatin1(locale->getDescription());
+ currentLanguageName = TQString::tqfromLatin1(locale->getDescription());
}
}
@@ -294,10 +294,10 @@ void COptionsDialog::initLanguages() {
}
}
- layout->addSpacing( 20 );
+ tqlayout->addSpacing( 20 );
}
{ //Font settings
- layout->addWidget(
+ tqlayout->addWidget(
CToolClass::explanationLabel(
page,
i18n("Select custom fonts per-language"),
@@ -306,7 +306,7 @@ void COptionsDialog::initLanguages() {
to be displayed correctly.")
)
);
- layout->addSpacing(5);
+ tqlayout->addSpacing(5);
TQHBoxLayout* hLayout = new TQHBoxLayout();
m_settings.fonts.usage = new TQComboBox(page);
@@ -338,12 +338,12 @@ void COptionsDialog::initLanguages() {
connect(m_settings.fonts.useOwnFontBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(useOwnFontClicked(bool)));
hLayout->addWidget(m_settings.fonts.useOwnFontBox);
- layout->addLayout(hLayout);
+ tqlayout->addLayout(hLayout);
//#warning TODO: remember the last selected font and jump there.
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);
+ tqlayout->addWidget(m_settings.fonts.fontChooser);
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&)));
@@ -351,14 +351,14 @@ void COptionsDialog::initLanguages() {
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 );
m_settings.fonts.useOwnFontBox->setChecked( m_settings.fonts.fontMap[m_settings.fonts.usage->currentText()].first );
- m_settings.fonts.fontChooser->setMinimumSize(m_settings.fonts.fontChooser->sizeHint());
+ m_settings.fonts.fontChooser->setMinimumSize(m_settings.fonts.fontChooser->tqsizeHint());
}
}
/** Init accel key section. */
void COptionsDialog::initAccelerators() {
- TQVBox* page = addVBoxPage(i18n("HotKeys"), TQString::null, DesktopIcon(CResMgr::settings::keys::icon,32));
+ TQVBox* page = addVBoxPage(i18n("HotKeys"), TQString(), DesktopIcon(CResMgr::settings::keys::icon,32));
CBTConfig::setupAccelSettings(
CBTConfig::application,
@@ -455,7 +455,7 @@ void COptionsDialog::initAccelerators() {
/** Init Sword section. */
void COptionsDialog::initSword() {
- TQVBox* page = addVBoxPage(i18n("Desk"),TQString::null, DesktopIcon(CResMgr::settings::sword::icon,32));
+ TQVBox* page = addVBoxPage(i18n("Desk"),TQString(), DesktopIcon(CResMgr::settings::sword::icon,32));
KTabCtl* tabCtl = new KTabCtl(page);
{ //Standard works
@@ -635,11 +635,11 @@ void COptionsDialog::initSword() {
moduleList << m->config(CSwordModuleInfo::Description);
}
else {
- moduleList << TQString::null;
+ moduleList << TQString();
}
}
- TQString module = TQString::null;
+ TQString module = TQString();
int item = 0;
int count = 0;
for (TQComboBox* combo = comboList.first(); combo; combo = comboList.next() ) {
@@ -658,71 +658,71 @@ void COptionsDialog::initSword() {
{ // ---------- new tab: filters -------- //
TQFrame* currentTab = new TQFrame(tabCtl);
tabCtl->addTab(currentTab, i18n("Text filters"));
- TQVBoxLayout* layout = new TQVBoxLayout(currentTab,5);
+ TQVBoxLayout* tqlayout = new TQVBoxLayout(currentTab,5);
- layout->addWidget( CToolClass::explanationLabel(currentTab, i18n("Text filters"),
+ tqlayout->addWidget( CToolClass::explanationLabel(currentTab, i18n("Text filters"),
i18n("Filters control the appearance of text. \
Here you can specify default settings for all filters. \
You can change the filter settings in each display window, of course.")) );
- layout->addSpacing(5);
+ tqlayout->addSpacing(5);
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);
+ tqlayout->addWidget(m_settings.swords.lineBreaks);
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);
+ tqlayout->addWidget(m_settings.swords.verseNumbers);
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);
+ tqlayout->addWidget(m_settings.swords.headings);
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);
+ tqlayout->addWidget(m_settings.swords.scriptureReferences);
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);
+ tqlayout->addWidget(m_settings.swords.greekAccents);
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);
+ tqlayout->addWidget(m_settings.swords.hebrewPoints);
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);
+ tqlayout->addWidget(m_settings.swords.hebrewCantillation);
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);
+ tqlayout->addWidget(m_settings.swords.morphSegmentation);
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));
- layout->addWidget(m_settings.swords.textualVariants);
+ tqlayout->addWidget(m_settings.swords.textualVariants);
- layout->addStretch(4);
+ tqlayout->addStretch(4);
}
}
@@ -800,7 +800,7 @@ void COptionsDialog::saveDisplay() {
/** No descriptions */
void COptionsDialog::saveSword() {
for (int i = 0; i <= (int)CBTConfig::lastModuleType; ++i) {
- TQString moduleDescription = TQString::null;
+ TQString moduleDescription = TQString();
CBTConfig::modules moduleType = (CBTConfig::modules)(i);
switch (moduleType) {
@@ -853,8 +853,8 @@ void COptionsDialog::saveSword() {
SWLocale* locale = LocaleMgr::getSystemLocaleMgr()->getLocale((*it).c_str());
Q_ASSERT(locale);
- if ( locale && (TQString::fromLatin1(locale->getDescription()) == currentLanguageName) ) {
- languageAbbrev = TQString::fromLatin1(locale->getName()); //we found the abbrevation for the current language
+ if ( locale && (TQString::tqfromLatin1(locale->getDescription()) == currentLanguageName) ) {
+ languageAbbrev = TQString::tqfromLatin1(locale->getName()); //we found the abbrevation for the current language
break;
}
}
@@ -922,36 +922,36 @@ void COptionsDialog::updateStylePreview() {
tree.append( new CTextRendering::KeyTreeItem(
TQString("\n16%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.")),
+ .tqarg(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(
TQString("\n17%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.")),
+ .tqarg(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(
TQString("\n18%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.")),
+ .tqarg(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(
TQString("\n19%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.")),
+ .tqarg(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(
TQString("\n20%1
")
- .arg(i18n("For everyone who does evil hates the light, and doesn't come to the light, lest his works would be exposed.")),
+ .tqarg(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(
TQString("\n21%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.")),
+ .tqarg(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 TQString oldStyleName = CBTConfig::get
@@ -978,33 +978,13 @@ void COptionsDialog::slotKeyChooserTypeChanged(const TQString& title) {
list.append(m_settings.keys.book.keyChooser);
//commit all changes in the keychoosers
-#if QT_VERSION >= 0x030200
for (KeyChooserList::iterator it(list.begin()); it != list.end(); ++it) {
if (*it) { //the list may contain NULL pointers
(*it)->commitChanges();
}
}
-#else
- //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.
- TQPtrListIterator it(list);
- if (!it.isEmpty()){
- while (!it.atLast()){
- if (it.current()){
- it.current()->commitChanges();
- }
- ++it;
- }
- //We still have the last item to process.
- if (it.current()){
- it.current()->commitChanges();
- }
- }
-#endif
/* Delete all the keychoosers in the list,
- * the keychoosers are set to NULL, because they are QGuardedPtr
+ * the keychoosers are set to NULL, because they are TQGuardedPtr
*/
list.setAutoDelete(true);
list.clear();
diff --git a/bibletime/frontend/coptionsdialog.h b/bibletime/frontend/coptionsdialog.h
index 9bc649a..872d7ef 100644
--- a/bibletime/frontend/coptionsdialog.h
+++ b/bibletime/frontend/coptionsdialog.h
@@ -52,9 +52,10 @@ class KActionCollection;
*/
class COptionsDialog : public KDialogBase, public CPointers {
Q_OBJECT
+ TQ_OBJECT
public:
- COptionsDialog(TQWidget *parent, const char *name, KActionCollection* actionCollection);
+ COptionsDialog(TQWidget *tqparent, const char *name, KActionCollection* actionCollection);
virtual ~COptionsDialog();
enum Parts {
diff --git a/bibletime/frontend/cprinter.cpp b/bibletime/frontend/cprinter.cpp
index 538fec3..bfc7e0a 100644
--- a/bibletime/frontend/cprinter.cpp
+++ b/bibletime/frontend/cprinter.cpp
@@ -53,7 +53,7 @@ namespace Printing {
m_htmlPart->write(renderKeyTree(tree));
m_htmlPart->end();
- m_htmlPart->view()->layout();
+ m_htmlPart->view()->tqlayout();
m_htmlPart->view()->print();
}
@@ -72,7 +72,7 @@ namespace Printing {
return vk.key();
case KeyTreeItem::Settings::NoKey:
- return TQString::null;
+ return TQString();
case KeyTreeItem::Settings::SimpleKey: //fall through
default:
@@ -89,7 +89,7 @@ namespace Printing {
Q_ASSERT(printItem);
if (printItem && printItem->hasAlternativeContent()) {
- TQString ret = TQString::fromLatin1("%1
").arg(printItem->getAlternativeContent());
+ TQString ret = TQString::tqfromLatin1("
%1
").tqarg(printItem->getAlternativeContent());
if (i.hasChildItems()) {
KeyTree const * tree = i.childList();
@@ -121,7 +121,7 @@ namespace Printing {
: "unknown";
settings.pageDirection = (modules.count() == 1)
? ((modules.first()->textDirection() == CSwordModuleInfo::LeftToRight) ? "ltr" : "rtl")
- : TQString::null;
+ : TQString();
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 c65bb7e..305aa0b 100644
--- a/bibletime/frontend/cprinter.h
+++ b/bibletime/frontend/cprinter.h
@@ -19,7 +19,7 @@
//BibleTime frontend
#include "frontend/cbtconfig.h"
-//Qt includes
+//TQt includes
#include
class KHTMLPart;
@@ -33,9 +33,10 @@ namespace Printing {
*/
class CPrinter : public TQObject, public Rendering::CDisplayRendering {
Q_OBJECT
+ TQ_OBJECT
public:
CPrinter(
- TQObject *parent, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions
+ TQObject *tqparent, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions
);
virtual ~CPrinter();
diff --git a/bibletime/frontend/cprofile.cpp b/bibletime/frontend/cprofile.cpp
index 7c26278..329f18a 100644
--- a/bibletime/frontend/cprofile.cpp
+++ b/bibletime/frontend/cprofile.cpp
@@ -11,7 +11,7 @@
#include "cprofile.h"
-//Qt includes
+//TQt includes
#include
#include
#include
@@ -30,7 +30,7 @@ CProfile::CProfile( const TQString& file, const TQString& name ):
m_name(name.isEmpty() ? i18n("unknown") : name),
m_filename(file),
m_fullscreen(false),
-m_geometry(10,20,640,480) {
+m_tqgeometry(10,20,640,480) {
m_profileWindows.setAutoDelete(true);
if (!m_filename.isEmpty() && name.isEmpty()) {
@@ -38,7 +38,7 @@ m_geometry(10,20,640,480) {
}
else if (m_filename.isEmpty() && !name.isEmpty()) {
m_filename = name;
- m_filename.replace(TQRegExp("\\s=#."),"_");
+ m_filename.tqreplace(TQRegExp("\\s=#."),"_");
KStandardDirs stdDirs;
m_filename = stdDirs.saveLocation("data", "bibletime/sessions/") + m_filename + ".xml";
init(m_filename);
@@ -216,14 +216,14 @@ const bool CProfile::save(TQPtrList windows) {
TQDomElement mainWindow = doc.createElement("MAINWINDOW");
mainWindow.setAttribute("fullscreen", fullscreen());
- TQDomElement geometry = doc.createElement("GEOMETRY");
- mainWindow.appendChild(geometry);
- const TQRect r = this->geometry();
- geometry.setAttribute("x",r.x());
- geometry.setAttribute("y",r.y());
- geometry.setAttribute("width",r.width());
- geometry.setAttribute("height",r.height());
- geometry.setAttribute("isMaximized",static_cast(this->maximized()));
+ TQDomElement tqgeometry = doc.createElement("GEOMETRY");
+ mainWindow.appendChild(tqgeometry);
+ const TQRect r = this->tqgeometry();
+ tqgeometry.setAttribute("x",r.x());
+ tqgeometry.setAttribute("y",r.y());
+ tqgeometry.setAttribute("width",r.width());
+ tqgeometry.setAttribute("height",r.height());
+ tqgeometry.setAttribute("isMaximized",static_cast(this->maximized()));
content.appendChild(mainWindow);
}
@@ -253,14 +253,14 @@ const bool CProfile::save(TQPtrList windows) {
window.setAttribute("hasFocus", p->hasFocus());
//save geomtery
- 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());
- geometry.setAttribute("height",r.height());
- geometry.setAttribute("isMaximized",static_cast(p->maximized()));
- window.appendChild( geometry );
+ const TQRect r = p->tqgeometry();
+ TQDomElement tqgeometry = doc.createElement("GEOMETRY");
+ tqgeometry.setAttribute("x",r.x());
+ tqgeometry.setAttribute("y",r.y());
+ tqgeometry.setAttribute("width",r.width());
+ tqgeometry.setAttribute("height",r.height());
+ tqgeometry.setAttribute("isMaximized",static_cast(p->maximized()));
+ window.appendChild( tqgeometry );
TQDomElement modules = doc.createElement("MODULES");
modules.setAttribute("separator", "|");
@@ -384,14 +384,14 @@ void CProfile::setMaximized( const bool maximized ) {
m_maximized = maximized;
}
-/** Returns the geometry of the main window */
-const TQRect CProfile::geometry() {
- return m_geometry;
+/** Returns the tqgeometry of the main window */
+const TQRect CProfile::tqgeometry() {
+ return m_tqgeometry;
}
/** Stes the geoemtry of the main window */
void CProfile::setGeometry( const TQRect rect ) {
- m_geometry = rect;
+ m_tqgeometry = rect;
}
} //end of namespace Profile
diff --git a/bibletime/frontend/cprofile.h b/bibletime/frontend/cprofile.h
index 82c55f5..9ef59fd 100644
--- a/bibletime/frontend/cprofile.h
+++ b/bibletime/frontend/cprofile.h
@@ -14,7 +14,7 @@
#include "cprofilewindow.h"
-//Qt includes
+//TQt includes
#include
namespace Profile {
@@ -24,7 +24,7 @@ namespace Profile {
*/
class CProfile {
public:
- CProfile(const TQString& fileName, const TQString& name = TQString::null);
+ CProfile(const TQString& fileName, const TQString& name = TQString());
~CProfile();
/**
@@ -78,9 +78,9 @@ public:
*/
void setGeometry( const TQRect rect );
/**
- * Returns the geometry of the main window
+ * Returns the tqgeometry of the main window
*/
- const TQRect geometry();
+ const TQRect tqgeometry();
private:
/**
@@ -94,7 +94,7 @@ private:
TQString m_filename;
bool m_fullscreen;
bool m_maximized;
- TQRect m_geometry;
+ TQRect m_tqgeometry;
};
} //end of namespace Profile
diff --git a/bibletime/frontend/cprofilemgr.cpp b/bibletime/frontend/cprofilemgr.cpp
index 0e516ee..5ecd8f7 100644
--- a/bibletime/frontend/cprofilemgr.cpp
+++ b/bibletime/frontend/cprofilemgr.cpp
@@ -11,7 +11,7 @@
#include "cprofilemgr.h"
-//Qt includes
+//TQt includes
#include
#include
#include
@@ -51,7 +51,7 @@ const TQPtrList& CProfileMgr::profiles() {
/** Creates a new profile with the name "name" (first parameter). @return The profile object */
CProfile* CProfileMgr::create( const TQString name ) {
- CProfile* p = new CProfile(TQString::null, name);
+ CProfile* p = new CProfile(TQString(), name);
m_profiles.append(p);
return p;
@@ -97,7 +97,7 @@ CProfile* CProfileMgr::profile(const TQString& name) {
/** Returns the startup profile if it exists, otherwise return 0. */
CProfile* CProfileMgr::startupProfile() {
if (!m_startupProfile) {
- m_startupProfile = new CProfile(TQString::null, "_startup_");
+ m_startupProfile = new CProfile(TQString(), "_startup_");
}
return m_startupProfile;
diff --git a/bibletime/frontend/cprofilemgr.h b/bibletime/frontend/cprofilemgr.h
index aba6675..e02453f 100644
--- a/bibletime/frontend/cprofilemgr.h
+++ b/bibletime/frontend/cprofilemgr.h
@@ -14,7 +14,7 @@
#include "cprofile.h"
-//Qt includes
+//TQt includes
#include
namespace Profile {
diff --git a/bibletime/frontend/cprofilewindow.cpp b/bibletime/frontend/cprofilewindow.cpp
index fbaf4de..3d0ae6b 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(TQString::null),
+m_key(TQString()),
m_maximized(false),
m_hasFocus(false),
m_windowSettings(0),
@@ -29,7 +29,7 @@ m_writeWindowType(0) {
CProfileWindow::~CProfileWindow() {}
/** Returns the size of the window including the x,y coordinates. */
-const TQRect& CProfileWindow::geometry() const {
+const TQRect& CProfileWindow::tqgeometry() const {
return m_windowGeometry;
}
diff --git a/bibletime/frontend/cprofilewindow.h b/bibletime/frontend/cprofilewindow.h
index a393277..928f9f9 100644
--- a/bibletime/frontend/cprofilewindow.h
+++ b/bibletime/frontend/cprofilewindow.h
@@ -15,7 +15,7 @@
#include "backend/cswordmoduleinfo.h"
#include "backend/cswordbackend.h"
-//Qt includes
+//TQt includes
#include
#include
#include
@@ -54,7 +54,7 @@ public:
/**
* Returns the size of the window including the x,y coordinates.
*/
- const TQRect& geometry() const;
+ const TQRect& tqgeometry() const;
/**
* Returns a list of module names which are chosen in the managed window profile.
*/
diff --git a/bibletime/frontend/crossrefrendering.cpp b/bibletime/frontend/crossrefrendering.cpp
index a77fff3..6c83686 100644
--- a/bibletime/frontend/crossrefrendering.cpp
+++ b/bibletime/frontend/crossrefrendering.cpp
@@ -39,7 +39,7 @@ namespace InfoDisplay {
switch (item.settings().keyRenderingFace) {
case KeyTreeItem::Settings::NoKey: {
- linkText = TQString::null;
+ linkText = TQString();
break; //no key is valid for all modules
}
case KeyTreeItem::Settings::CompleteShort: {
@@ -72,17 +72,17 @@ namespace InfoDisplay {
if (!linkText.isEmpty()) { //if we have a valid link text
// qWarning("rendering");
return TQString("%2")
- .arg(
+ .tqarg(
CReferenceManager::encodeHyperlink(
module->name(),
item.key(),
CReferenceManager::typeFromModule(module->type())
)
)
- .arg(linkText);
+ .tqarg(linkText);
}
- return TQString::null;
+ return TQString();
}
};
diff --git a/bibletime/frontend/cswordsetupdialog.cpp b/bibletime/frontend/cswordsetupdialog.cpp
index c02db6f..be9f459 100644
--- a/bibletime/frontend/cswordsetupdialog.cpp
+++ b/bibletime/frontend/cswordsetupdialog.cpp
@@ -55,8 +55,8 @@ using namespace sword;
namespace BookshelfManager {
- CSwordSetupDialog::CSwordSetupDialog(TQWidget *parent, const char *name )
-: KDialogBase(IconList, i18n("Bookshelf Manager"), Ok, Ok, parent, name, true, true, TQString::null, TQString::null, TQString::null),
+ CSwordSetupDialog::CSwordSetupDialog(TQWidget *tqparent, const char *name )
+: KDialogBase(IconList, i18n("Bookshelf Manager"), Ok, Ok, tqparent, name, true, true, TQString(), TQString(), TQString()),
m_removeModuleListView(0),
m_installModuleListPage(0),
m_installModuleListView(0),
@@ -72,73 +72,73 @@ namespace BookshelfManager {
}
void CSwordSetupDialog::initSwordConfig() {
- TQFrame* page = m_swordConfigPage = addPage(i18n("Bookshelf path(s)"), TQString::null, SmallIcon("bt_swordconfig",32));
+ TQFrame* page = m_swordConfigPage = addPage(i18n("Bookshelf path(s)"), TQString(), SmallIcon("bt_swordconfig",32));
page->setMinimumSize(500,400);
- TQGridLayout* layout = new TQGridLayout(page, 6, 4);
- layout->setMargin(5);
+ TQGridLayout* tqlayout = new TQGridLayout(page, 6, 4);
+ tqlayout->setMargin(5);
- layout->setSpacing(10);
- layout->setColStretch(0,1);
- layout->setRowStretch(5,1);
+ tqlayout->setSpacing(10);
+ tqlayout->setColStretch(0,1);
+ tqlayout->setRowStretch(5,1);
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);
+ tqlayout->addMultiCellWidget(mainLabel, 0, 0, 0, 3);
TQString swordConfPath = BTInstallMgr::Tool::LocalConfig::swordConfigFilename();
- TQLabel* confPathLabel = new TQLabel(i18n("Your bookshelf configuration file is %1").arg(swordConfPath), page);
- layout->addMultiCellWidget(confPathLabel, 1,1,0,3);
+ TQLabel* confPathLabel = new TQLabel(i18n("Your bookshelf configuration file is %1").tqarg(swordConfPath), page);
+ tqlayout->addMultiCellWidget(confPathLabel, 1,1,0,3);
m_swordPathListBox = new TQListView(page);
// m_swordPathListBox->setFullWidth(true);
m_swordPathListBox->addColumn(i18n("Path to bookshelf"));
connect(m_swordPathListBox, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slot_swordPathSelected()));
- layout->addMultiCellWidget(m_swordPathListBox, 2,5,0,1);
+ tqlayout->addMultiCellWidget(m_swordPathListBox, 2,5,0,1);
m_swordEditPathButton = new TQPushButton(i18n("Edit Entry"), page);
m_swordEditPathButton->setIconSet(SmallIcon("edit", 16));
connect(m_swordEditPathButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_swordEditClicked()));
- layout->addWidget(m_swordEditPathButton, 2, 3);
+ tqlayout->addWidget(m_swordEditPathButton, 2, 3);
m_swordAddPathButton = new TQPushButton(i18n("Add Entry"), page);
m_swordAddPathButton->setIconSet(SmallIcon("edit_add", 16));
connect(m_swordAddPathButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_swordAddClicked()));
- layout->addWidget(m_swordAddPathButton, 3,3);
+ tqlayout->addWidget(m_swordAddPathButton, 3,3);
m_swordRemovePathButton = new TQPushButton(i18n("Remove Entry"), page);
m_swordRemovePathButton->setIconSet(SmallIcon("editdelete", 16));
connect(m_swordRemovePathButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_swordRemoveClicked()));
- layout->addWidget(m_swordRemovePathButton, 4,3);
+ tqlayout->addWidget(m_swordRemovePathButton, 4,3);
setupSwordPathListBox();
}
void CSwordSetupDialog::initInstall() {
- m_installPage = addPage(i18n("Install/Update works"), TQString::null, SmallIcon("bt_bible",32));
+ m_installPage = addPage(i18n("Install/Update works"), TQString(), SmallIcon("bt_bible",32));
- TQVBoxLayout* vboxlayout = new TQVBoxLayout(m_installPage);
- TQHBoxLayout* hboxlayout = new TQHBoxLayout();
- hboxlayout->setAutoAdd( true );
+ TQVBoxLayout* vboxtqlayout = new TQVBoxLayout(m_installPage);
+ TQHBoxLayout* hboxtqlayout = new TQHBoxLayout();
+ hboxtqlayout->setAutoAdd( true );
- vboxlayout->addLayout(hboxlayout);
+ vboxtqlayout->addLayout(hboxtqlayout);
m_installWidgetStack = new TQWidgetStack(m_installPage);
- hboxlayout->addWidget(m_installWidgetStack);
+ hboxtqlayout->addWidget(m_installWidgetStack);
m_installSourcePage = new TQWidget(0);
m_installWidgetStack->addWidget(m_installSourcePage);
// m_installSourcePage->setMinimumSize(500,400);
- TQGridLayout* layout = new TQGridLayout(m_installSourcePage, 7, 3);
- layout->setMargin(5);
- layout->setSpacing(10);
- layout->setRowStretch(6,5);
- layout->setColStretch(0,5);
+ TQGridLayout* tqlayout = new TQGridLayout(m_installSourcePage, 7, 3);
+ tqlayout->setMargin(5);
+ tqlayout->setSpacing(10);
+ tqlayout->setRowStretch(6,5);
+ tqlayout->setColStretch(0,5);
TQLabel* installLabel = CToolClass::explanationLabel(m_installSourcePage,
i18n("Install/update works - Step 1"),
@@ -147,39 +147,39 @@ After that step click on the connect button.
\
WARNING: If you live in a persecuted country and do not wish to risk detection you should NOT use \
the module remote installation feature!")
);
- layout->addMultiCellWidget(installLabel, 0,0,0,2);
+ tqlayout->addMultiCellWidget(installLabel, 0,0,0,2);
- TQLabel* sourceHeadingLabel = new TQLabel(TQString("%1").arg(i18n("Select library")), m_installSourcePage);
- layout->addMultiCellWidget(sourceHeadingLabel, 1,1,0,1);
+ TQLabel* sourceHeadingLabel = new TQLabel(TQString("%1").tqarg(i18n("Select library")), m_installSourcePage);
+ tqlayout->addMultiCellWidget(sourceHeadingLabel, 1,1,0,1);
m_sourceCombo = new TQComboBox(m_installSourcePage);
- layout->addWidget(m_sourceCombo, 2, 0);
+ tqlayout->addWidget(m_sourceCombo, 2, 0);
TQPushButton* deleteSourceButton = new TQPushButton(i18n("Delete library"), m_installSourcePage);
deleteSourceButton->setIconSet(SmallIcon("remove", 16));
connect(deleteSourceButton, TQT_SIGNAL(clicked()), TQT_SLOT(slot_installDeleteSource()));
- layout->addWidget(deleteSourceButton, 2, 1, Qt::AlignLeft);
+ tqlayout->addWidget(deleteSourceButton, 2, 1, TQt::AlignLeft);
TQPushButton* addSourceButton = new TQPushButton(i18n("Add library"), m_installSourcePage);
addSourceButton->setIconSet(SmallIcon("folder_new", 16));
connect(addSourceButton, TQT_SIGNAL(clicked()), TQT_SLOT(slot_installAddSource()));
- layout->addWidget(addSourceButton, 2, 2, Qt::AlignLeft);
+ tqlayout->addWidget(addSourceButton, 2, 2, TQt::AlignLeft);
m_sourceLabel = new TQLabel(m_installSourcePage);
- layout->addMultiCellWidget(m_sourceLabel, 3,3,0,1);
+ tqlayout->addMultiCellWidget(m_sourceLabel, 3,3,0,1);
- TQLabel* targetHeadingLabel = new TQLabel(TQString("%1").arg(i18n("Select bookshelf path")), m_installSourcePage);
- layout->addMultiCellWidget(targetHeadingLabel, 4,4,0,1);
+ TQLabel* targetHeadingLabel = new TQLabel(TQString("%1").tqarg(i18n("Select bookshelf path")), m_installSourcePage);
+ tqlayout->addMultiCellWidget(targetHeadingLabel, 4,4,0,1);
m_targetCombo = new TQComboBox(m_installSourcePage);
- layout->addWidget(m_targetCombo, 5, 0);
+ tqlayout->addWidget(m_targetCombo, 5, 0);
m_targetLabel = new TQLabel(m_installSourcePage);
- layout->addMultiCellWidget(m_targetLabel, 6,6,0,0,Qt::AlignTop);
+ tqlayout->addMultiCellWidget(m_targetLabel, 6,6,0,0,TQt::AlignTop);
- //part beloew main layout with the back/next buttons
+ //part beloew main tqlayout with the back/next buttons
TQHBoxLayout* myHBox = new TQHBoxLayout();
- vboxlayout->addLayout(myHBox);
+ vboxtqlayout->addLayout(myHBox);
m_installBackButton = new TQPushButton(i18n("Back"), m_installPage);
m_installBackButton->setIconSet(SmallIcon("back",16));
@@ -203,32 +203,32 @@ the module remote installation feature!")
}
void CSwordSetupDialog::initRemove() {
- TQFrame* page = m_removePage = addPage(i18n("Remove works"), TQString::null, SmallIcon("edittrash",32));
+ TQFrame* page = m_removePage = addPage(i18n("Remove works"), TQString(), SmallIcon("edittrash",32));
page->setMinimumSize(500,400);
- TQGridLayout* layout = new TQGridLayout(page, 4, 4);
- layout->setMargin(5);
+ TQGridLayout* tqlayout = new TQGridLayout(page, 4, 4);
+ tqlayout->setMargin(5);
- layout->setSpacing(10);
- layout->setColStretch(1,1);
- layout->setRowStretch(2,1);
+ tqlayout->setSpacing(10);
+ tqlayout->setColStretch(1,1);
+ tqlayout->setRowStretch(2,1);
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);
+ tqlayout->addMultiCellWidget(mainLabel, 0, 0, 0, 3);
- TQLabel* headingLabel = new TQLabel(TQString("%1").arg(i18n("Select works to be uninstalled")), page);
- layout->addMultiCellWidget(headingLabel, 1, 1, 0, 3);
+ TQLabel* headingLabel = new TQLabel(TQString("%1").tqarg(i18n("Select works to be uninstalled")), page);
+ tqlayout->addMultiCellWidget(headingLabel, 1, 1, 0, 3);
m_removeModuleListView = new CSwordSetupModuleListView(page, false);
- layout->addMultiCellWidget( m_removeModuleListView, 2,2,0,3);
+ tqlayout->addMultiCellWidget( m_removeModuleListView, 2,2,0,3);
m_removeRemoveButton = new TQPushButton(i18n("Remove selected work(s)"), page);
m_removeRemoveButton->setIconSet( SmallIcon("edittrash", 16) );
- layout->addWidget(m_removeRemoveButton, 3, 3, Qt::AlignRight);
+ tqlayout->addWidget(m_removeRemoveButton, 3, 3, TQt::AlignRight);
connect(m_removeRemoveButton, TQT_SIGNAL(clicked()),
this, TQT_SLOT(slot_doRemoveModules()));
@@ -239,7 +239,7 @@ the module remote installation feature!")
void CSwordSetupDialog::initManageIndices()
{
TQFrame* page = m_manageIndiciesPage = addPage(i18n("Manage search indicies"),
- TQString::null, SmallIcon("filefind",32));
+ TQString(), SmallIcon("filetqfind",32));
page->setMinimumSize(500,400);
TQVBoxLayout* box = new TQVBoxLayout(page, 4, 4);
@@ -364,12 +364,12 @@ the module remote installation feature!")
TQString source = sourceName;
TQString rep = i18n("[Local]") + " ";
- int i = source.find(rep);
+ int i = source.tqfind(rep);
if (i>=0) {
source.remove(i, rep.length());
}
rep = i18n("[Remote]") + " ";
- i = source.find(rep);
+ i = source.tqfind(rep);
if (i>=0) {
source.remove(i, rep.length());
}
@@ -379,10 +379,10 @@ the module remote installation feature!")
sword::InstallSource is = BTInstallMgr::Tool::RemoteConfig::source(&mgr, source) ;
if (BTInstallMgr::Tool::RemoteConfig::isRemoteSource(&is)) {
- url = TQString("ftp://%1%2").arg(is.source.c_str()).arg(is.directory.c_str());
+ url = TQString("ftp://%1%2").tqarg(is.source.c_str()).tqarg(is.directory.c_str());
}
else {
- url = TQString("%1").arg(is.directory.c_str());
+ url = TQString("%1").tqarg(is.directory.c_str());
}
m_sourceLabel->setText( url );
@@ -405,7 +405,7 @@ the module remote installation feature!")
}
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(", "));
+ "Do you really want to remove them from your system?").tqarg(moduleList.join(", "));
if ((KMessageBox::warningYesNo(0, message, i18n("Warning")) == KMessageBox::Yes)) { //Yes was pressed.
sword::InstallMgr installMgr;
@@ -420,11 +420,11 @@ the module remote installation feature!")
dataPath = dataPath.mid(2);
}
- if (prefixPath.contains(dataPath)) { //remove module part to get the prefix path
- prefixPath = prefixPath.remove( prefixPath.find(dataPath), dataPath.length() );
+ if (prefixPath.tqcontains(dataPath)) { //remove module part to get the prefix path
+ prefixPath = prefixPath.remove( prefixPath.tqfind(dataPath), dataPath.length() );
}
else { //fall back to default Sword config path
- prefixPath = TQString::fromLatin1(backend()->prefixPath);
+ prefixPath = TQString::tqfromLatin1(backend()->prefixPath);
}
sword::SWMgr* mgr = mgrDict[ prefixPath ];
@@ -481,7 +481,7 @@ the module remote installation feature!")
sword::InstallSource is = BTInstallMgr::Tool::RemoteConfig::source(&iMgr, sourceName);
bool success = false;
- m_progressDialog = new KProgressDialog(this, 0, i18n("Download"), TQString::null, true);
+ m_progressDialog = new KProgressDialog(this, 0, i18n("Download"), TQString(), true);
m_progressDialog->progressBar()->setTotalSteps(100);
m_progressDialog->setLabel( i18n("Downloading library information...") );
m_progressDialog->setMinimumDuration(0); //show immediately
@@ -601,7 +601,7 @@ the module remote installation feature!")
(*it),
installedModule
? installedModule->config(CSwordModuleInfo::ModuleVersion)
- : TQString::null
+ : TQString()
);
}
m_installModuleListView->finish();
@@ -612,16 +612,16 @@ the module remote installation feature!")
if (!m_installModuleListPage) { //the widgets are not yet created
m_installModuleListPage = new TQWidget(0);
- TQGridLayout* layout = new TQGridLayout(m_installModuleListPage, 7, 2);
- layout->setMargin(5);
- layout->setSpacing(10);
+ TQGridLayout* tqlayout = new TQGridLayout(m_installModuleListPage, 7, 2);
+ tqlayout->setMargin(5);
+ tqlayout->setSpacing(10);
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.")
);
- layout->addMultiCellWidget(installLabel, 0,0,0,1);
- layout->setRowStretch(0,0);
+ tqlayout->addMultiCellWidget(installLabel, 0,0,0,1);
+ tqlayout->setRowStretch(0,0);
m_installWidgetStack->addWidget(m_installModuleListPage);
m_installModuleListPage->setMinimumSize(500,400);
@@ -631,9 +631,9 @@ the module remote installation feature!")
sword::InstallSource is = BTInstallMgr::Tool::RemoteConfig::source(&iMgr, currentInstallSource());
m_installModuleListView = new CSwordSetupModuleListView(m_installModuleListPage, true, &is);
- layout->addMultiCellWidget( m_installModuleListView, 1,6,0,1);
- layout->setColStretch(0,5);
- layout->setRowStretch(1,5);
+ tqlayout->addMultiCellWidget( m_installModuleListView, 1,6,0,1);
+ tqlayout->setColStretch(0,5);
+ tqlayout->setRowStretch(1,5);
connect(m_installModuleListView, TQT_SIGNAL(selectedModulesChanged()), TQT_SLOT(slot_installModulesChanged()));
}
@@ -696,7 +696,7 @@ the module remote installation feature!")
}
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(", "));
+ Do you really want to install them on your system?").tqarg(moduleList.join(", "));
if ((KMessageBox::warningYesNo(0, message, i18n("Warning")) == KMessageBox::Yes)) { //Yes was pressed.
BTInstallMgr iMgr;
@@ -722,7 +722,7 @@ the module remote installation feature!")
//module are removed in this section of code
m_installedModuleCount = 0;
- m_progressDialog = new KProgressDialog(this, 0, i18n("Download of work(s)"), TQString::null, true);
+ m_progressDialog = new KProgressDialog(this, 0, i18n("Download of work(s)"), TQString(), true);
m_progressDialog->progressBar()->setTotalSteps(100 * moduleList.count());
m_progressDialog->setMinimumDuration(0); //show immediately
m_progressDialog->setAutoClose(false);
@@ -753,12 +753,12 @@ the module remote installation feature!")
dataPath = dataPath.mid(2);
}
- if (prefixPath.contains(dataPath)) {
- prefixPath.remove( prefixPath.find(dataPath), dataPath.length() ); //complicated to work with Qt 3.0
- //prefixPath = prefixPath.replace(dataPath, ""); //old code working with Qt 3.2
+ if (prefixPath.tqcontains(dataPath)) {
+ prefixPath.remove( prefixPath.tqfind(dataPath), dataPath.length() ); //complicated to work with TQt 3.0
+ //prefixPath = prefixPath.tqreplace(dataPath, ""); //old code working with TQt 3.2
}
else {
- prefixPath = TQString::fromLatin1(backend()->prefixPath);
+ prefixPath = TQString::tqfromLatin1(backend()->prefixPath);
}
sword::SWMgr mgr(prefixPath.latin1());
@@ -795,7 +795,7 @@ the module remote installation feature!")
void CSwordSetupDialog::installCompleted( const int total, const int /* file */) {
if (m_progressDialog) {
m_progressDialog->progressBar()->setProgress(total+100*m_installedModuleCount);
- m_progressDialog->setLabel( i18n("[%1]: %2% complete").arg(m_installingModule).arg(total) );
+ m_progressDialog->setLabel( i18n("[%1]: %2% complete").tqarg(m_installingModule).tqarg(total) );
}
KApplication::kApplication()->processEvents();
}
@@ -834,7 +834,7 @@ the module remote installation feature!")
}
void CSwordSetupDialog::slot_swordAddClicked() {
- KURL url = KDirSelectDialog::selectDirectory(TQString::null, true);
+ KURL url = KDirSelectDialog::selectDirectory(TQString(), true);
if (url.isValid()) {
const TQFileInfo fi( url.path() );
if (!fi.exists() || !fi.isWritable()) {
@@ -885,12 +885,12 @@ the module remote installation feature!")
const TQString CSwordSetupDialog::currentInstallSource() {
TQString source = m_sourceCombo->currentText();
TQString rep = i18n("[Local]") + " ";
- int i = source.find(rep);
+ int i = source.tqfind(rep);
if (i>=0) {
source.remove(i, rep.length());
}
rep = i18n("[Remote]") + " ";
- i = source.find(rep);
+ i = source.tqfind(rep);
if (i>=0) {
source.remove(i, rep.length());
}
diff --git a/bibletime/frontend/cswordsetupdialog.h b/bibletime/frontend/cswordsetupdialog.h
index 612e91e..d456a7b 100644
--- a/bibletime/frontend/cswordsetupdialog.h
+++ b/bibletime/frontend/cswordsetupdialog.h
@@ -44,9 +44,10 @@ namespace BookshelfManager {
*/
class CSwordSetupDialog : public KDialogBase, public CPointers {
Q_OBJECT
+ TQ_OBJECT
public:
- CSwordSetupDialog(TQWidget *parent=0, const char *name=0);
+ CSwordSetupDialog(TQWidget *tqparent=0, const char *name=0);
enum Parts {
Sword,
diff --git a/bibletime/frontend/cswordsetupinstallsourcesdialog.cpp b/bibletime/frontend/cswordsetupinstallsourcesdialog.cpp
index a5cedbd..2e9115c 100644
--- a/bibletime/frontend/cswordsetupinstallsourcesdialog.cpp
+++ b/bibletime/frontend/cswordsetupinstallsourcesdialog.cpp
@@ -13,7 +13,7 @@
#include "cswordsetupinstallsourcesdialog.h"
#include "util/scoped_resource.h"
-//Qt includes
+//TQt includes
#include
#include
#include
@@ -32,7 +32,7 @@ namespace BookshelfManager {
const TQString PROTO_FTP( i18n("Remote") ); //Remote path
- CSwordSetupInstallSourcesDialog::CSwordSetupInstallSourcesDialog(/*TQWidget *parent*/)
+ CSwordSetupInstallSourcesDialog::CSwordSetupInstallSourcesDialog(/*TQWidget *tqparent*/)
: TQDialog() {
TQVBoxLayout* mainLayout = new TQVBoxLayout( this );
@@ -49,29 +49,29 @@ namespace BookshelfManager {
mainLayout->addSpacing( 10 );
- TQGridLayout* layout = new TQGridLayout( mainLayout, 3, 3 );
- layout->setSpacing( 5 );
+ TQGridLayout* tqlayout = new TQGridLayout( mainLayout, 3, 3 );
+ tqlayout->setSpacing( 5 );
label = new TQLabel(i18n("Type"), this);
- layout->addWidget( label, 0, 0);
+ tqlayout->addWidget( label, 0, 0);
m_serverLabel = new TQLabel(i18n("Server"), this);
- layout->addWidget( m_serverLabel, 0, 1);
+ tqlayout->addWidget( m_serverLabel, 0, 1);
label = new TQLabel(i18n("Path"), this);
- layout->addWidget( label, 0, 2 );
+ tqlayout->addWidget( label, 0, 2 );
m_protocolCombo = new TQComboBox( this );
- layout->addWidget(m_protocolCombo, 1, 0);
+ tqlayout->addWidget(m_protocolCombo, 1, 0);
m_protocolCombo->insertItem( PROTO_FTP );
m_protocolCombo->insertItem( PROTO_FILE );
m_serverEdit = new TQLineEdit( this );
- layout->addWidget( m_serverEdit, 1, 1 );
+ tqlayout->addWidget( m_serverEdit, 1, 1 );
m_serverEdit->setText("ftp.crosswire.org");
m_pathEdit = new TQLineEdit( this );
- layout->addWidget( m_pathEdit, 1, 2 );
+ tqlayout->addWidget( m_pathEdit, 1, 2 );
m_pathEdit->setText("/pub/sword/raw");
mainLayout->addSpacing( 10 );
@@ -134,7 +134,7 @@ namespace BookshelfManager {
m_serverLabel->hide();
m_serverEdit->hide();
- KURL url = KDirSelectDialog::selectDirectory(TQString::null, true);
+ KURL url = KDirSelectDialog::selectDirectory(TQString(), true);
if (url.isValid()) {
m_pathEdit->setText( url.path() );
}
diff --git a/bibletime/frontend/cswordsetupinstallsourcesdialog.h b/bibletime/frontend/cswordsetupinstallsourcesdialog.h
index c01ac73..d21283d 100644
--- a/bibletime/frontend/cswordsetupinstallsourcesdialog.h
+++ b/bibletime/frontend/cswordsetupinstallsourcesdialog.h
@@ -12,6 +12,7 @@ namespace BookshelfManager {
class CSwordSetupInstallSourcesDialog : public TQDialog {
Q_OBJECT
+ TQ_OBJECT
public:
static sword::InstallSource getSource();
diff --git a/bibletime/frontend/cswordsetupmodulelistview.cpp b/bibletime/frontend/cswordsetupmodulelistview.cpp
index c0f57ff..babc1af 100644
--- a/bibletime/frontend/cswordsetupmodulelistview.cpp
+++ b/bibletime/frontend/cswordsetupmodulelistview.cpp
@@ -50,7 +50,7 @@ namespace BookshelfManager {
TQListViewItem* i = m_parent->itemAt(pos);
Q_ASSERT(i);
- const TQRect rect = m_parent->itemRect(i);
+ const TQRect rect = m_parent->tqitemRect(i);
if (m_parent->showTooltip(i, pos, 0)) {
const TQString tipText = m_parent->tooltip(i, 0);
tip(rect, tipText);
@@ -65,8 +65,8 @@ namespace BookshelfManager {
* @short InstallationManager module listviews
* @author Martin Gruner
*/
- CSwordSetupModuleListView::CSwordSetupModuleListView(TQWidget *parent, bool is_remote, sword::InstallSource* installSource)
- : KListView(parent), m_is_remote( is_remote ) {
+ CSwordSetupModuleListView::CSwordSetupModuleListView(TQWidget *tqparent, bool is_remote, sword::InstallSource* installSource)
+ : KListView(tqparent), m_is_remote( is_remote ) {
Q_ASSERT(installSource);
new BookshelfManager::ToolTip(this);
m_backend = installSource ? BTInstallMgr::Tool::backend(installSource) : CPointers::backend();
@@ -75,17 +75,17 @@ namespace BookshelfManager {
setColumnWidthMode( 0, TQListView::Maximum );
setColumnWidth( 0, 200 ); //don`t get too broad
- addColumn(i18n("Status"));
- setColumnAlignment(1, Qt::AlignRight);
+ addColumn(i18n("tqStatus"));
+ setColumnAlignment(1, TQt::AlignRight);
addColumn(i18n("Installed version")); //version
- setColumnAlignment(2, Qt::AlignHCenter);
+ setColumnAlignment(2, TQt::AlignHCenter);
if (m_is_remote) {
addColumn(i18n("Remote version")); //version
} else {
addColumn(i18n("Location"));
}
- setColumnAlignment(3, Qt::AlignLeft);
+ setColumnAlignment(3, TQt::AlignLeft);
setAllColumnsShowFocus(true);
setFullWidth(true);
@@ -103,22 +103,12 @@ namespace BookshelfManager {
}
void CSwordSetupModuleListView::init() {
-#if QT_VERSION >= 0x030200
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 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));
m_categoryCommentary->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16));
@@ -161,31 +151,31 @@ namespace BookshelfManager {
void CSwordSetupModuleListView::addModule(CSwordModuleInfo* module, TQString localVersion) {
- TQListViewItem* parent = 0;
+ TQListViewItem* tqparent = 0;
switch ( module->type() ) {
case CSwordModuleInfo::Bible:
- parent = m_categoryBible;
+ tqparent = m_categoryBible;
break;
case CSwordModuleInfo::Commentary:
- parent = m_categoryCommentary;
+ tqparent = m_categoryCommentary;
break;
case CSwordModuleInfo::Lexicon:
- parent = m_categoryLexicon;
+ tqparent = m_categoryLexicon;
break;
case CSwordModuleInfo::GenericBook:
- parent = m_categoryBook;
+ tqparent = m_categoryBook;
break;
default:
- parent = 0;
+ tqparent = 0;
break;
}
//handling for special module types
- if ((parent == m_categoryLexicon) && (module->category() == CSwordModuleInfo::Glossary)) {
- parent = m_categoryGlossaries;
+ if ((tqparent == m_categoryLexicon) && (module->category() == CSwordModuleInfo::Glossary)) {
+ tqparent = m_categoryGlossaries;
}
- if ((parent == m_categoryLexicon) && (module->category() == CSwordModuleInfo::DailyDevotional)) {
- parent = m_categoryDevotionals;
+ if ((tqparent == m_categoryLexicon) && (module->category() == CSwordModuleInfo::DailyDevotional)) {
+ tqparent = m_categoryDevotionals;
}
//now we know the category, find the right language group in that category
@@ -196,8 +186,8 @@ namespace BookshelfManager {
}
TQListViewItem * langFolder = 0;
- if (parent) {
- langFolder = parent->firstChild();
+ if (tqparent) {
+ langFolder = tqparent->firstChild();
while( langFolder ) { //try to find language folder if it exsists
if (langFolder->text(0) == langName) { //found right folder
@@ -209,12 +199,7 @@ namespace BookshelfManager {
}
if (!langFolder) { //not yet there
-#if QT_VERSION >= 0x030200
- langFolder = new TQCheckListItem(parent, langName, TQCheckListItem::CheckBoxController);
-#else
-
- langFolder = new TQCheckListItem(parent, langName, TQCheckListItem::Controller);
-#endif
+ langFolder = new TQCheckListItem(tqparent, langName, TQCheckListItem::CheckBoxController);
langFolder->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16));
langFolder->setOpen(false);
diff --git a/bibletime/frontend/cswordsetupmodulelistview.h b/bibletime/frontend/cswordsetupmodulelistview.h
index a05f5f1..f88775c 100644
--- a/bibletime/frontend/cswordsetupmodulelistview.h
+++ b/bibletime/frontend/cswordsetupmodulelistview.h
@@ -29,9 +29,10 @@ namespace BookshelfManager {
class CSwordSetupModuleListView : public KListView {
Q_OBJECT
+ TQ_OBJECT
public:
- CSwordSetupModuleListView(TQWidget* parent, bool is_remote, sword::InstallSource* installSource = 0);
+ CSwordSetupModuleListView(TQWidget* tqparent, bool is_remote, sword::InstallSource* installSource = 0);
virtual ~CSwordSetupModuleListView();
void addModule(CSwordModuleInfo *, TQString localVersion);
diff --git a/bibletime/frontend/display/cdisplay.cpp b/bibletime/frontend/display/cdisplay.cpp
index f4f5f04..0239cf7 100644
--- a/bibletime/frontend/display/cdisplay.cpp
+++ b/bibletime/frontend/display/cdisplay.cpp
@@ -19,7 +19,7 @@
#include "util/ctoolclass.h"
-//Qt includes
+//TQt includes
#include
#include
#include
@@ -94,7 +94,7 @@ void CDisplayConnections::saveAnchorWithText() {
}
void CDisplayConnections::clear() {
- m_display->setText(TQString::null);
+ m_display->setText(TQString());
}
void CDisplayConnections::zoomIn() {
@@ -112,23 +112,23 @@ void CDisplayConnections::openFindTextDialog() {
/*----------------------*/
-CReadDisplay* CDisplay::createReadInstance( CReadWindow* readWindow, TQWidget* parent ) {
- return new CHTMLReadDisplay(readWindow, parent);
+CReadDisplay* CDisplay::createReadInstance( CReadWindow* readWindow, TQWidget* tqparent ) {
+ return new CHTMLReadDisplay(readWindow, tqparent);
}
-CWriteDisplay* CDisplay::createWriteInstance( CWriteWindow* writeWindow, const CWriteDisplay::WriteDisplayType& type, TQWidget* parent ) {
+CWriteDisplay* CDisplay::createWriteInstance( CWriteWindow* writeWindow, const CWriteDisplay::WriteDisplayType& type, TQWidget* tqparent ) {
// qWarning("CDisplay::createWriteInstance");
if (type == PlainTextDisplay) {
- return new CPlainWriteDisplay(writeWindow, parent);
+ return new CPlainWriteDisplay(writeWindow, tqparent);
}
else {
- return new CHTMLWriteDisplay(writeWindow, parent);
+ return new CHTMLWriteDisplay(writeWindow, tqparent);
};
}
-CDisplay::CDisplay(CDisplayWindow* parent) :
-m_parentWindow(parent),
+CDisplay::CDisplay(CDisplayWindow* tqparent) :
+m_parentWindow(tqparent),
m_connections( new CDisplayConnections( this ) ),
m_popup(0) {}
@@ -139,7 +139,7 @@ CDisplay::~CDisplay() {
const bool CDisplay::copy( const CDisplay::TextType format, const CDisplay::TextPart part ) {
const TQString content = text(format, part);
- QClipboard* cb = KApplication::clipboard();
+ TQClipboard* cb = KApplication::tqclipboard();
cb->setText(content);
return true;
}
@@ -147,7 +147,7 @@ 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 TQString content = text(format, part);
- TQString filter = TQString::null;
+ TQString filter = TQString();
switch (format) {
case HTMLText:
@@ -158,7 +158,7 @@ const bool CDisplay::save( const CDisplay::TextType format, const CDisplay::Text
break;
};
- const TQString filename = KFileDialog::getSaveFileName(TQString::null, filter, 0, i18n("Save document ..."));
+ const TQString filename = KFileDialog::getSaveFileName(TQString(), filter, 0, i18n("Save document ..."));
if (!filename.isEmpty()) {
CToolClass::savePlainFile(filename, content);
@@ -199,7 +199,7 @@ CDisplayConnections* const CDisplay::connectionsProxy() const {
return m_connections;
}
-CDisplayWindow* const CDisplay::parentWindow() const {
+CDisplayWindow* const CDisplay::tqparentWindow() const {
return m_parentWindow;
}
diff --git a/bibletime/frontend/display/cdisplay.h b/bibletime/frontend/display/cdisplay.h
index 1d34f9e..091b4b8 100644
--- a/bibletime/frontend/display/cdisplay.h
+++ b/bibletime/frontend/display/cdisplay.h
@@ -16,7 +16,7 @@
#include "util/cpointers.h"
#include "backend/cswordbackend.h"
-//Qt includes
+//TQt includes
#include
#include
#include
@@ -43,8 +43,8 @@ public:
PlainTextDisplay
};
- static CReadDisplay* createReadInstance(CReadWindow* readWindow, TQWidget* parent = 0);
- static CWriteDisplay* createWriteInstance( CWriteWindow* writeWindow, const WriteDisplayType& type = PlainTextDisplay, TQWidget* parent = 0 );
+ static CReadDisplay* createReadInstance(CReadWindow* readWindow, TQWidget* tqparent = 0);
+ static CWriteDisplay* createWriteInstance( CWriteWindow* writeWindow, const WriteDisplayType& type = PlainTextDisplay, TQWidget* tqparent = 0 );
enum TextType {
HTMLText, /* Used for HTML markup */
@@ -94,9 +94,9 @@ public:
*/
virtual CDisplayConnections* const connectionsProxy() const;
/**
- * Returns the parent window used for this display widget.
+ * Returns the tqparent window used for this display widget.
*/
- CDisplayWindow* const parentWindow() const;
+ CDisplayWindow* const tqparentWindow() const;
virtual void print( const CDisplay::TextPart, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions) = 0;
/**
* Installs the popup which should be opened when the right mouse button was pressed.
@@ -131,7 +131,7 @@ protected:
void emitReferenceClicked( const TQString& reference );
protected:
- CDisplay(CDisplayWindow* parent);
+ CDisplay(CDisplayWindow* tqparent);
virtual ~CDisplay();
private:
@@ -142,8 +142,9 @@ private:
class CDisplayConnections : public TQObject {
Q_OBJECT
+ TQ_OBJECT
public:
- CDisplayConnections( CDisplay* parent );
+ CDisplayConnections( CDisplay* tqparent );
public slots:
virtual void selectAll();
diff --git a/bibletime/frontend/display/chtmlreaddisplay.cpp b/bibletime/frontend/display/chtmlreaddisplay.cpp
index 60e3e58..33521e6 100644
--- a/bibletime/frontend/display/chtmlreaddisplay.cpp
+++ b/bibletime/frontend/display/chtmlreaddisplay.cpp
@@ -24,10 +24,10 @@
#include "util/cpointers.h"
#include "util/scoped_resource.h"
-//We will need to reference this in the Qt includes
+//We will need to reference this in the TQt includes
#include
-//Qt includes
+//TQt includes
#include
#include
#include
@@ -52,10 +52,10 @@
using namespace InfoDisplay;
-CHTMLReadDisplay::CHTMLReadDisplay(CReadWindow* readWindow, TQWidget* parentWidget)
-: KHTMLPart((m_view = new CHTMLReadDisplayView(this, parentWidget ? parentWidget : readWindow)), readWindow ? readWindow : parentWidget),
+CHTMLReadDisplay::CHTMLReadDisplay(CReadWindow* readWindow, TQWidget* tqparentWidget)
+: KHTMLPart((m_view = new CHTMLReadDisplayView(this, tqparentWidget ? tqparentWidget : readWindow)), TQT_TQOBJECT(readWindow ? readWindow : tqparentWidget)),
CReadDisplay(readWindow),
-m_currentAnchorCache(TQString::null) {
+m_currentAnchorCache(TQString()) {
setDNDEnabled(false);
setJavaEnabled(false);
setJScriptEnabled(false);
@@ -75,7 +75,7 @@ const TQString CHTMLReadDisplay::text( const CDisplay::TextType format, const CD
return document().toHTML();
}
else {
- CDisplayWindow* window = parentWindow();
+ CDisplayWindow* window = tqparentWindow();
CSwordKey* const key = window->key();
CSwordModuleInfo* module = key->module();
//return htmlDocument().body().innerText().string().latin1();
@@ -106,7 +106,7 @@ const TQString CHTMLReadDisplay::text( const CDisplay::TextType format, const CD
case SelectedText: {
if (!hasSelection()) {
- return TQString::null;
+ return TQString();
}
else if (format == HTMLText) {
DOM::Range range = selection();
@@ -138,7 +138,7 @@ const TQString CHTMLReadDisplay::text( const CDisplay::TextType format, const CD
return key->strippedText();
}
- return TQString::null;
+ return TQString();
}
case AnchorWithText: {
@@ -168,14 +168,14 @@ const TQString CHTMLReadDisplay::text( const CDisplay::TextType format, const CD
.append(key->module()->name())
.append(")");
/* ("%1\n(%2, %3)")
- .arg()
- .arg(key->key())
- .arg(key->module()->name());*/
+ .tqarg()
+ .tqarg(key->key())
+ .tqarg(key->module()->name());*/
}
- return TQString::null;
+ return TQString();
}
default:
- return TQString::null;
+ return TQString();
}
}
@@ -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] = TQString::null;
+ m_nodeInfo[CDisplay::Lemma] = TQString();
do {
if (!tmpNode.isNull() && (tmpNode.nodeType() ==
@@ -305,7 +305,7 @@ void CHTMLReadDisplay::khtmlMousePressEvent( khtml::MousePressEvent* event ) {
/** Reimplementation for our drag&drop system. Also needed for the mouse tracking */
void CHTMLReadDisplay::khtmlMouseMoveEvent( khtml::MouseMoveEvent* e ) {
- if( e->qmouseEvent()->state() & LeftButton == LeftButton) { //left mouse button pressed
+ if( e->qmouseEvent()->state() & Qt::LeftButton == Qt::LeftButton) { //left mouse button pressed
const int delay = KGlobalSettings::dndEventDelay();
TQPoint newPos = TQPoint(e->x(), e->y());
@@ -315,15 +315,15 @@ void CHTMLReadDisplay::khtmlMouseMoveEvent( khtml::MouseMoveEvent* e ) {
TQDragObject* d = 0;
if (!m_dndData.anchor.isEmpty() && (m_dndData.dragType == DNDData::Link) && !m_dndData.node.isNull() ) {
// create a new bookmark drag!
- TQString module = TQString::null;
- TQString key = TQString::null;
+ TQString module = TQString();
+ TQString key = TQString();
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, TQString::null) );
+ dndItems.append( CDragDropMgr::Item(module, key, TQString()) );
d = CDragDropMgr::dragObject(dndItems, KHTMLPart::view()->viewport());
}
else if ((m_dndData.dragType == DNDData::Text) && !m_dndData.selection.isEmpty()) {
@@ -344,7 +344,7 @@ void CHTMLReadDisplay::khtmlMouseMoveEvent( khtml::MouseMoveEvent* e ) {
}
}
}
- else if (getMouseTracking() && !(e->qmouseEvent()->state() & Qt::ShiftButton == Qt::ShiftButton)) {
+ else if (getMouseTracking() && !(e->qmouseEvent()->state() & TQt::ShiftButton == TQt::ShiftButton)) {
//no mouse button pressed and tracking enabled
DOM::Node node = e->innerNode();
//if no link was under the mouse try to find a title attribute
@@ -352,7 +352,7 @@ void CHTMLReadDisplay::khtmlMouseMoveEvent( khtml::MouseMoveEvent* e ) {
// we want to avoid processing the node again
// 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)) {
+ if ( !(e->qmouseEvent()->state() & TQt::ShiftButton)) {
// TQObject has simple timer
killTimers();
startTimer( CBTConfig::get(CBTConfig::magDelay) );
@@ -378,27 +378,27 @@ void CHTMLReadDisplay::timerEvent( TQTimerEvent *e ) {
if (!currentNode.isNull() && (currentNode.nodeType() == DOM::Node::ELEMENT_NODE) && currentNode.hasAttributes()) { //found right node
attr = currentNode.attributes().getNamedItem("note");
if (!attr.isNull()) {
- infoList.append( qMakePair(CInfoDisplay::Footnote, attr.nodeValue().string()) );
+ infoList.append( tqMakePair(CInfoDisplay::Footnote, attr.nodeValue().string()) );
}
attr = currentNode.attributes().getNamedItem("lemma");
if (!attr.isNull()) {
- infoList.append( qMakePair(CInfoDisplay::Lemma, attr.nodeValue().string()) );
+ infoList.append( tqMakePair(CInfoDisplay::Lemma, attr.nodeValue().string()) );
}
attr = currentNode.attributes().getNamedItem("morph");
if (!attr.isNull()) {
- infoList.append( qMakePair(CInfoDisplay::Morph, attr.nodeValue().string()) );
+ infoList.append( tqMakePair(CInfoDisplay::Morph, attr.nodeValue().string()) );
}
attr = currentNode.attributes().getNamedItem("expansion");
if (!attr.isNull()) {
- infoList.append( qMakePair(CInfoDisplay::Abbreviation, attr.nodeValue().string()) );
+ infoList.append( tqMakePair(CInfoDisplay::Abbreviation, attr.nodeValue().string()) );
}
attr = currentNode.attributes().getNamedItem("crossrefs");
if (!attr.isNull()) {
- infoList.append( qMakePair(CInfoDisplay::CrossReference, attr.nodeValue().string()) );
+ infoList.append( tqMakePair(CInfoDisplay::CrossReference, attr.nodeValue().string()) );
}
}
@@ -422,7 +422,7 @@ void CHTMLReadDisplay::timerEvent( TQTimerEvent *e ) {
// ---------------------
-CHTMLReadDisplayView::CHTMLReadDisplayView(CHTMLReadDisplay* displayWidget, TQWidget* parent) : KHTMLView(displayWidget, parent), m_display(displayWidget) {
+CHTMLReadDisplayView::CHTMLReadDisplayView(CHTMLReadDisplay* displayWidget, TQWidget* tqparent) : KHTMLView(displayWidget, tqparent), m_display(displayWidget) {
viewport()->setAcceptDrops(true);
setMarginWidth(4);
setMarginHeight(4);
@@ -482,7 +482,7 @@ void CHTMLReadDisplay::slotGoToAnchor() {
qDebug("anchor %s not present!", m_currentAnchorCache.latin1());
}
}
- m_currentAnchorCache = TQString::null;
+ m_currentAnchorCache = TQString();
}
void CHTMLReadDisplay::zoomIn() {
diff --git a/bibletime/frontend/display/chtmlreaddisplay.h b/bibletime/frontend/display/chtmlreaddisplay.h
index 3a4cb02..de5f4fd 100644
--- a/bibletime/frontend/display/chtmlreaddisplay.h
+++ b/bibletime/frontend/display/chtmlreaddisplay.h
@@ -16,7 +16,7 @@
#include "creaddisplay.h"
//#include "frontend/ctooltip.h"
-//Qt includes
+//TQt includes
#include
#include
@@ -32,6 +32,7 @@ class CHTMLReadDisplayView;
*/
class CHTMLReadDisplay : public KHTMLPart, public CReadDisplay {
Q_OBJECT
+ TQ_OBJECT
public:
//reimplemented functions from CDisplay
/**
@@ -60,7 +61,7 @@ public:
protected:
friend class CDisplay;
- CHTMLReadDisplay( CReadWindow* readWindow, TQWidget* parent = 0 );
+ CHTMLReadDisplay( CReadWindow* readWindow, TQWidget* tqparent = 0 );
virtual ~CHTMLReadDisplay();
virtual void urlSelected( const TQString& url, int button, int state, const TQString& _target, KParts::URLArgs args);
@@ -113,11 +114,12 @@ protected slots:
class CHTMLReadDisplayView : public KHTMLView, public CPointers {
Q_OBJECT
+ TQ_OBJECT
protected: // Protected methods
friend class CHTMLReadDisplay;
- CHTMLReadDisplayView(CHTMLReadDisplay* display, TQWidget* parent);
+ CHTMLReadDisplayView(CHTMLReadDisplay* display, TQWidget* tqparent);
/**
* Reimplementation from TQScrollView. Sets the right slots
*/
diff --git a/bibletime/frontend/display/chtmlwritedisplay.cpp b/bibletime/frontend/display/chtmlwritedisplay.cpp
index b1206f8..8b3fee7 100644
--- a/bibletime/frontend/display/chtmlwritedisplay.cpp
+++ b/bibletime/frontend/display/chtmlwritedisplay.cpp
@@ -15,7 +15,7 @@
#include "util/cresmgr.h"
-//Qt includes
+//TQt includes
#include
#include
@@ -27,14 +27,14 @@
#include
#include
-CHTMLWriteDisplay::CHTMLWriteDisplay(CWriteWindow* parentWindow, TQWidget* parent)
-: CPlainWriteDisplay(parentWindow,parent) {
+CHTMLWriteDisplay::CHTMLWriteDisplay(CWriteWindow* tqparentWindow, TQWidget* tqparent)
+: CPlainWriteDisplay(tqparentWindow,tqparent) {
m_actions.bold = 0;
m_actions.italic = 0;
m_actions.underline = 0;
m_actions.selectAll = 0;
- setTextFormat(Qt::RichText);
+ setTextFormat(TQt::RichText);
setAcceptDrops(true);
viewport()->setAcceptDrops(true);
}
@@ -43,7 +43,7 @@ CHTMLWriteDisplay::~CHTMLWriteDisplay() {}
void CHTMLWriteDisplay::setText( const TQString& newText ) {
TQString text = newText;
-// text.replace("\n
\n", "\n");
+// text.tqreplace("\n
\n", "\n");
TQTextEdit::setText(text);
}
@@ -66,40 +66,40 @@ void CHTMLWriteDisplay::toggleUnderline() {
void CHTMLWriteDisplay::alignLeft() {
- setAlignment(Qt::AlignLeft);
+ tqsetAlignment(TQt::AlignLeft);
};
void CHTMLWriteDisplay::alignCenter() {
- setAlignment(Qt::AlignHCenter);
+ tqsetAlignment(TQt::AlignHCenter);
};
void CHTMLWriteDisplay::alignRight() {
- setAlignment(Qt::AlignRight);
+ tqsetAlignment(TQt::AlignRight);
};
-/** The text's alignment changed. Enable the right buttons. */
+/** The text's tqalignment changed. Enable the right buttons. */
void CHTMLWriteDisplay::slotAlignmentChanged( int a ) {
bool alignLeft = false;
bool alignCenter = false;
bool alignRight = false;
// bool alignJustify = false;
- if (a & Qt::AlignLeft) {
+ if (a & TQt::AlignLeft) {
alignLeft = true;
}
- else if ((a & Qt::AlignHCenter) || (a & Qt::AlignCenter)) {
+ else if ((a & TQt::AlignHCenter) || (a & TQt::AlignCenter)) {
alignCenter = true;
}
- else if (a & Qt::AlignRight) {
+ else if (a & TQt::AlignRight) {
alignRight = true;
}
- // else if (a & Qt::AlignJustify) {
+ // else if (a & TQt::AlignJustify) {
// alignJustify = true;
// }
else {
alignLeft = true;
- qWarning("unknown alignment %i", a);
+ qWarning("unknown tqalignment %i", a);
}
m_actions.alignLeft->setChecked( alignLeft );
@@ -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, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(setFamily(const TQString&)));
+ connect(m_actions.fontChooser, TQT_SIGNAL(activated(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(setFamily(const TQString&)));
m_actions.fontSizeChooser = new KFontSizeAction( i18n("Choose a font size"),
@@ -149,11 +149,11 @@ 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, TQT_SIGNAL(fontSizeChanged(int)), this, TQT_SLOT(setPointSize(int)));
+ connect(m_actions.fontSizeChooser, TQT_SIGNAL(fontSizeChanged(int)), TQT_TQOBJECT(this), TQT_SLOT(setPointSize(int)));
m_colorButton = new KColorButton(bar);
- connect(m_colorButton, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(slotColorSelected(const TQColor&)));
- bar->insertWidget(50, m_colorButton->sizeHint().width(), m_colorButton);
+ connect(m_colorButton, TQT_SIGNAL(changed(const TQColor&)), TQT_TQOBJECT(this), TQT_SLOT(slotColorSelected(const TQColor&)));
+ bar->insertWidget(50, m_colorButton->tqsizeHint().width(), m_colorButton);
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, TQT_SLOT(toggleBold()),
+ TQT_TQOBJECT(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, TQT_SLOT(toggleItalic()),
+ TQT_TQOBJECT(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, TQT_SLOT(toggleUnderline()),
+ TQT_TQOBJECT(this), TQT_SLOT(toggleUnderline()),
actions,
CResMgr::displaywindows::writeWindow::underlinedText::actionName
);
@@ -195,12 +195,12 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions
m_actions.underline->plug(bar);
- (new KActionSeparator())->plug(bar); //seperate formatting from alignment buttons
+ (new KActionSeparator())->plug(bar); //seperate formatting from tqalignment buttons
m_actions.alignLeft = new KToggleAction( i18n("Left"),
CResMgr::displaywindows::writeWindow::alignLeft::icon,
CResMgr::displaywindows::writeWindow::alignLeft::accel,
- this, TQT_SLOT( alignLeft() ),
+ TQT_TQOBJECT(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, TQT_SLOT(alignCenter()),
+ TQT_TQOBJECT(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, TQT_SLOT(alignRight()),
+ TQT_TQOBJECT(this), TQT_SLOT(alignRight()),
actions,
CResMgr::displaywindows::writeWindow::alignRight::actionName
);
@@ -248,14 +248,14 @@ void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions
//set initial values for toolbar items
slotFontChanged( font() );
- slotAlignmentChanged( alignment() );
+ slotAlignmentChanged( tqalignment() );
slotColorChanged( color() );
}
/** Reimplementation to show a popup menu if the right mouse butoon was clicked. */
TQPopupMenu* CHTMLWriteDisplay::createPopupMenu( const TQPoint& /*pos*/ ) {
if (!m_actions.selectAll) {
- m_actions.selectAll = new KAction(i18n("Select all"), KShortcut(0), this, TQT_SLOT(selectAll()), this);
+ m_actions.selectAll = new KAction(i18n("Select all"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(selectAll()), TQT_TQOBJECT(this));
}
KPopupMenu* popup = new KPopupMenu(this);
diff --git a/bibletime/frontend/display/chtmlwritedisplay.h b/bibletime/frontend/display/chtmlwritedisplay.h
index 4d9a508..d38a7c2 100644
--- a/bibletime/frontend/display/chtmlwritedisplay.h
+++ b/bibletime/frontend/display/chtmlwritedisplay.h
@@ -15,7 +15,7 @@
//BibleTime includes
#include "cplainwritedisplay.h"
-//Qt includes
+//TQt includes
#include
#include
@@ -34,6 +34,7 @@ class KColorButton;
*/
class CHTMLWriteDisplay : public CPlainWriteDisplay {
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Sets the new text for this display widget.
@@ -51,7 +52,7 @@ public:
protected:
friend class CDisplay;
- CHTMLWriteDisplay(CWriteWindow* parentWindow, TQWidget* parent);
+ CHTMLWriteDisplay(CWriteWindow* tqparentWindow, TQWidget* tqparent);
~CHTMLWriteDisplay();
/**
* Reimplementation to show a popup menu if the right mouse butoon was clicked.
@@ -69,7 +70,7 @@ protected slots:
void slotFontChanged( const TQFont& );
/**
- * The text's alignment changed. Enable the right buttons.
+ * The text's tqalignment changed. Enable the right buttons.
*/
void slotAlignmentChanged( int );
/**
diff --git a/bibletime/frontend/display/cplainwritedisplay.cpp b/bibletime/frontend/display/cplainwritedisplay.cpp
index 7be7c6c..7ca99dc 100644
--- a/bibletime/frontend/display/cplainwritedisplay.cpp
+++ b/bibletime/frontend/display/cplainwritedisplay.cpp
@@ -17,14 +17,14 @@
#include "util/scoped_resource.h"
-//Qt includes
+//TQt includes
//KDE includes
#include
#include
-CPlainWriteDisplay::CPlainWriteDisplay(CWriteWindow* parentWindow, TQWidget* parent) : TQTextEdit(parentWindow ? parentWindow : parent), CWriteDisplay(parentWindow) {
- setTextFormat(Qt::PlainText);
+CPlainWriteDisplay::CPlainWriteDisplay(CWriteWindow* tqparentWindow, TQWidget* tqparent) : TQTextEdit(tqparentWindow ? tqparentWindow : tqparent), CWriteDisplay(tqparentWindow) {
+ setTextFormat(TQt::PlainText);
setAcceptDrops(true);
viewport()->setAcceptDrops(true);
@@ -42,8 +42,8 @@ void CPlainWriteDisplay::selectAll() {
void CPlainWriteDisplay::setText( const TQString& newText ) {
//make sure the text has been converted to show \n instead of
TQString text = newText;
-// text.replace("\n
\n", "\n");
- text.replace("
", "\n"); //inserted by BT or the Qt textedit widget
+// text.tqreplace("\n
\n", "\n");
+ text.tqreplace("
", "\n"); //inserted by BT or the TQt textedit widget
TQTextEdit::setText(text);
}
@@ -58,7 +58,7 @@ TQWidget* CPlainWriteDisplay::view() {
}
const TQString CPlainWriteDisplay::text( const CDisplay::TextType /*format*/, const CDisplay::TextPart /*part*/) {
- return TQString::null;
+ return TQString();
}
void CPlainWriteDisplay::print( const CDisplay::TextPart, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions ) {
@@ -80,7 +80,7 @@ const TQString CPlainWriteDisplay::plainText() {
TQString ret = TQTextEdit::text();
//in plain text mode the text just contains newlines, convert them into
before we return the text for display in a HTML widget
- ret.replace("\n", "
");
+ ret.tqreplace("\n", "
");
return ret;
}
@@ -138,7 +138,7 @@ void CPlainWriteDisplay::contentsDropEvent( TQDropEvent* e ) {
TQString moduleText = key->strippedText();
- const TQString text = TQString::fromLatin1("%1\n(%2, %3)\n").arg(moduleText).arg((*it).bookmarkKey()).arg((*it).bookmarkModule());
+ const TQString text = TQString::tqfromLatin1("%1\n(%2, %3)\n").tqarg(moduleText).tqarg((*it).bookmarkKey()).tqarg((*it).bookmarkModule());
placeCursor( e->pos() );
insert( text );
diff --git a/bibletime/frontend/display/cplainwritedisplay.h b/bibletime/frontend/display/cplainwritedisplay.h
index 546d05c..8e45296 100644
--- a/bibletime/frontend/display/cplainwritedisplay.h
+++ b/bibletime/frontend/display/cplainwritedisplay.h
@@ -15,7 +15,7 @@
//Bibletime include files
#include "cwritedisplay.h"
-//Qt includes
+//TQt includes
#include
#include
@@ -66,7 +66,7 @@ protected:
friend class CDisplay;
friend class CHTMLWriteDisplay;
- CPlainWriteDisplay(CWriteWindow* parentWindow, TQWidget* parent);
+ CPlainWriteDisplay(CWriteWindow* tqparentWindow, TQWidget* tqparent);
virtual ~CPlainWriteDisplay();
/**
* Reimplementation from TQTextEdit. Provides an popup menu for the given position.
diff --git a/bibletime/frontend/display/creaddisplay.cpp b/bibletime/frontend/display/creaddisplay.cpp
index 22baf24..868eeb5 100644
--- a/bibletime/frontend/display/creaddisplay.cpp
+++ b/bibletime/frontend/display/creaddisplay.cpp
@@ -28,7 +28,7 @@
#include "util/scoped_resource.h"
-//Qt includes
+//TQt includes
#include
//KDE includes
@@ -36,7 +36,7 @@
CReadDisplay::CReadDisplay(CReadWindow* readWindow) :
CDisplay(readWindow),
-m_activeAnchor(TQString::null),
+m_activeAnchor(TQString()),
m_useMouseTracking(true) {}
CReadDisplay::~CReadDisplay() {}
@@ -59,12 +59,12 @@ const bool CReadDisplay::hasActiveAnchor() {
void CReadDisplay::print(const CDisplay::TextPart type, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions) {
- CDisplayWindow* window = parentWindow();
+ CDisplayWindow* window = tqparentWindow();
CSwordKey* const key = window->key();
CSwordModuleInfo* module = key->module();
- CExportManager mgr(i18n("Print keys"),false, TQString::null, parentWindow()->filterOptions(), parentWindow()->displayOptions());
+ CExportManager mgr(i18n("Print keys"),false, TQString(), tqparentWindow()->filterOptions(), tqparentWindow()->displayOptions());
switch (type) {
case Document: {
diff --git a/bibletime/frontend/display/cwritedisplay.cpp b/bibletime/frontend/display/cwritedisplay.cpp
index 33c0926..66b055b 100644
--- a/bibletime/frontend/display/cwritedisplay.cpp
+++ b/bibletime/frontend/display/cwritedisplay.cpp
@@ -14,7 +14,7 @@
#include "frontend/displaywindow/cwritewindow.h"
-//Qt includes
+//TQt includes
#include
CWriteDisplay::CWriteDisplay( CWriteWindow* writeWindow ) : CDisplay(writeWindow) {}
diff --git a/bibletime/frontend/displaywindow/cbiblereadwindow.cpp b/bibletime/frontend/displaywindow/cbiblereadwindow.cpp
index 0bbd85b..62896a7 100644
--- a/bibletime/frontend/displaywindow/cbiblereadwindow.cpp
+++ b/bibletime/frontend/displaywindow/cbiblereadwindow.cpp
@@ -29,7 +29,7 @@
#include
-//Qt includes
+//TQt includes
#include
#include
@@ -40,7 +40,7 @@
using namespace Profile;
-CBibleReadWindow::CBibleReadWindow(ListCSwordModuleInfo moduleList, CMDIArea* parent, const char *name ) : CLexiconReadWindow(moduleList, parent,name) {
+CBibleReadWindow::CBibleReadWindow(ListCSwordModuleInfo moduleList, CMDIArea* tqparent, const char *name ) : CLexiconReadWindow(moduleList, tqparent,name) {
}
CBibleReadWindow::~CBibleReadWindow() {}
@@ -53,10 +53,10 @@ void CBibleReadWindow::applyProfileSettings( CProfileWindow* const settings ) {
for (int i = count-1; i>=1; i--) {
if (result-(int)pow((double)2,i-1)>= 0) { //2^i was added before, so item with index i is set
result -= (int)pow((double)2,i-1);
- displaySettingsButton()->setItemStatus(i,true);
+ displaySettingsButton()->setItemtqStatus(i,true);
}
else {
- displaySettingsButton()->setItemStatus(i,false);
+ displaySettingsButton()->setItemtqStatus(i,false);
}
}
displaySettingsButton()->setChanged();
@@ -69,7 +69,7 @@ void CBibleReadWindow::storeProfileSettings( CProfileWindow* const settings ) {
int result = 0;
//now check every item
for (int i = 1; i < count; i++) { //first item is a title
- if (displaySettingsButton()->itemStatus(i)) //item is checked
+ if (displaySettingsButton()->itemtqStatus(i)) //item is checked
result += (int)pow((double)2,i-1);//add 2^i (the i. digit in binary)
}
settings->setWindowSettings(result);
@@ -133,37 +133,37 @@ void CBibleReadWindow::initActions() {
new KAction(
i18n("Next book"),
CResMgr::displaywindows::bibleWindow::nextBook::accel,
- this, TQT_SLOT(nextBook()),
+ TQT_TQOBJECT(this), TQT_SLOT(nextBook()),
actionCollection(), "nextBook"
);
new KAction(
i18n("Previous book"),
CResMgr::displaywindows::bibleWindow::previousBook::accel,
- this, TQT_SLOT(previousBook()),
+ TQT_TQOBJECT(this), TQT_SLOT(previousBook()),
actionCollection(), "previousBook"
);
new KAction(
i18n("Next chapter"),
CResMgr::displaywindows::bibleWindow::nextChapter::accel,
- this, TQT_SLOT(nextChapter()),
+ TQT_TQOBJECT(this), TQT_SLOT(nextChapter()),
actionCollection(), "nextChapter"
);
new KAction(
i18n("Previous chapter"),
CResMgr::displaywindows::bibleWindow::previousChapter::accel,
- this, TQT_SLOT(previousChapter()),
+ TQT_TQOBJECT(this), TQT_SLOT(previousChapter()),
actionCollection(), "previousChapter"
);
new KAction(
i18n("Next verse"),
CResMgr::displaywindows::bibleWindow::nextVerse::accel,
- this, TQT_SLOT(nextVerse()),
+ TQT_TQOBJECT(this), TQT_SLOT(nextVerse()),
actionCollection(), "nextVerse"
);
new KAction(
i18n("Previous verse"),
CResMgr::displaywindows::bibleWindow::previousVerse::accel,
- this, TQT_SLOT(previousVerse()),
+ TQT_TQOBJECT(this), TQT_SLOT(previousVerse()),
actionCollection(), "previousVerse"
);
@@ -177,7 +177,7 @@ void CBibleReadWindow::initActions() {
i18n("Strong's Search"),
CResMgr::displaywindows::general::findStrongs::icon,
CResMgr::displaywindows::general::findStrongs::accel,
- this, TQT_SLOT(openSearchStrongsDialog()),
+ TQT_TQOBJECT(this), TQT_SLOT(openSearchStrongsDialog()),
actionCollection(),
CResMgr::displaywindows::general::findStrongs::actionName);
@@ -188,20 +188,20 @@ void CBibleReadWindow::initActions() {
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, TQT_SLOT(copyDisplayedText()), actionCollection(), "copyChapter");
+ m_actions.copy.chapter = new KAction(i18n("Chapter"), KShortcut(0), TQT_TQOBJECT(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(), TQT_SLOT(saveAnchorWithText()), actionCollection(), "saveReferenceWithText");
- m_actions.save.chapterAsPlain = new KAction(i18n("Chapter as plain text"), KShortcut(0), this, TQT_SLOT(saveChapterPlain()), actionCollection(), "saveChapterAsPlainText");
+ m_actions.save.chapterAsPlain = new KAction(i18n("Chapter as plain text"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(saveChapterPlain()), actionCollection(), "saveChapterAsPlainText");
- m_actions.save.chapterAsHTML = new KAction(i18n("Chapter as HTML"), KShortcut(0), this, TQT_SLOT(saveChapterHTML()), actionCollection(), "saveChapterAsHTML");
+ m_actions.save.chapterAsHTML = new KAction(i18n("Chapter as HTML"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(saveChapterHTML()), actionCollection(), "saveChapterAsHTML");
- m_actions.print.reference = new KAction(i18n("Reference with text"), KShortcut(0), this, TQT_SLOT(printAnchorWithText()), actionCollection(), "saveReferenceWithText");
+ m_actions.print.reference = new KAction(i18n("Reference with text"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(printAnchorWithText()), actionCollection(), "saveReferenceWithText");
- m_actions.print.chapter = new KAction(i18n("Chapter"), KShortcut(0), this, TQT_SLOT(printAll()), actionCollection(), "printChapter");
+ m_actions.print.chapter = new KAction(i18n("Chapter"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(printAll()), actionCollection(), "printChapter");
CBTConfig::setupAccelSettings(CBTConfig::bibleWindow, actionCollection());
}
@@ -221,7 +221,7 @@ void CBibleReadWindow::initToolbars() {
void CBibleReadWindow::initView() {
CLexiconReadWindow::initView();
- parentWidget()->installEventFilter( this );
+ tqparentWidget()->installEventFilter( this );
}
/** Reimplementation. */
@@ -232,26 +232,26 @@ void CBibleReadWindow::setupPopupMenu() {
m_actions.findStrongs->plug(popup());
m_actions.selectAll->plug(popup());
- (new KActionSeparator(this))->plug( popup() );
+ (new KActionSeparator(TQT_TQOBJECT(this)))->plug( popup() );
- m_actions.copyMenu = new KActionMenu(i18n("Copy..."), CResMgr::displaywindows::bibleWindow::copyMenu::icon, popup());
+ m_actions.copyMenu = new KActionMenu(i18n("Copy..."), CResMgr::displaywindows::bibleWindow::copyMenu::icon, TQT_TQOBJECT(popup()));
m_actions.copyMenu->setDelayed( false );
m_actions.copyMenu->insert(m_actions.copy.referenceOnly);
m_actions.copyMenu->insert(m_actions.copy.referenceTextOnly);
m_actions.copyMenu->insert(m_actions.copy.referenceAndText);
m_actions.copyMenu->insert(m_actions.copy.chapter);
- m_actions.copyMenu->insert(new KActionSeparator(this));
+ m_actions.copyMenu->insert(new KActionSeparator(TQT_TQOBJECT(this)));
m_actions.copyMenu->insert(m_actions.copy.selectedText);
m_actions.copyMenu->plug(popup());
- m_actions.saveMenu = new KActionMenu(i18n("Save..."),CResMgr::displaywindows::bibleWindow::saveMenu::icon, popup());
+ m_actions.saveMenu = new KActionMenu(i18n("Save..."),CResMgr::displaywindows::bibleWindow::saveMenu::icon,TQT_TQOBJECT(popup()));
m_actions.saveMenu->setDelayed( false );
m_actions.saveMenu->insert(m_actions.save.referenceAndText);
m_actions.saveMenu->insert(m_actions.save.chapterAsPlain);
m_actions.saveMenu->insert(m_actions.save.chapterAsHTML);
m_actions.saveMenu->plug(popup());
- m_actions.printMenu = new KActionMenu(i18n("Print..."),CResMgr::displaywindows::bibleWindow::printMenu::icon, popup());
+ m_actions.printMenu = new KActionMenu(i18n("Print..."),CResMgr::displaywindows::bibleWindow::printMenu::icon, TQT_TQOBJECT(popup()));
m_actions.printMenu->setDelayed(false);
m_actions.printMenu->insert(m_actions.print.reference);
m_actions.printMenu->insert(m_actions.print.chapter);
@@ -273,7 +273,7 @@ void CBibleReadWindow::updatePopupMenu() {
// }
//
// m_actions.findStrongs->setEnabled( hasStrongs );
- m_actions.findStrongs->setEnabled( displayWidget()->getCurrentNodeInfo()[CDisplay::Lemma] != TQString::null );
+ m_actions.findStrongs->setEnabled( displayWidget()->getCurrentNodeInfo()[CDisplay::Lemma] != TQString() );
m_actions.copy.referenceOnly->setEnabled( displayWidget()->hasActiveAnchor() );
@@ -422,9 +422,9 @@ bool CBibleReadWindow::eventFilter( TQObject* o, TQEvent* e) {
* the mousebutton clicked.
*
* This is not really in a KHTML event handler but works anyway.
- * Sometime KDE/Qt is hard to use ...
+ * Sometime KDE/TQt is hard to use ...
*/
- TQTimer::singleShot(0, this, TQT_SLOT(syncWindows()));
+ TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(syncWindows()));
}
return ret;
diff --git a/bibletime/frontend/displaywindow/cbiblereadwindow.h b/bibletime/frontend/displaywindow/cbiblereadwindow.h
index 6e36db3..b0e67a4 100644
--- a/bibletime/frontend/displaywindow/cbiblereadwindow.h
+++ b/bibletime/frontend/displaywindow/cbiblereadwindow.h
@@ -18,7 +18,7 @@
#include "backend/cswordkey.h"
#include "backend/cswordversekey.h"
-//Qt includes
+//TQt includes
#include
//KDE includes
@@ -33,8 +33,9 @@ class CTransliterationButton;
class CBibleReadWindow : public CLexiconReadWindow {
Q_OBJECT
+ TQ_OBJECT
public:
- CBibleReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0);
+ CBibleReadWindow(ListCSwordModuleInfo modules, CMDIArea* tqparent, const char *name=0);
virtual ~CBibleReadWindow();
/**
* Store the settings of this window in the given CProfileWindow object.
diff --git a/bibletime/frontend/displaywindow/cbookreadwindow.cpp b/bibletime/frontend/displaywindow/cbookreadwindow.cpp
index ec87501..587c1bd 100644
--- a/bibletime/frontend/displaywindow/cbookreadwindow.cpp
+++ b/bibletime/frontend/displaywindow/cbookreadwindow.cpp
@@ -23,7 +23,7 @@
#include "util/ctoolclass.h"
#include "util/cresmgr.h"
-//Qt includes
+//TQt includes
#include
//KDE includes
@@ -33,7 +33,7 @@
using namespace Profile;
-CBookReadWindow::CBookReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name) : CLexiconReadWindow(modules, parent, name) {}
+CBookReadWindow::CBookReadWindow(ListCSwordModuleInfo modules, CMDIArea* tqparent, const char *name) : CLexiconReadWindow(modules, tqparent, name) {}
CBookReadWindow::~CBookReadWindow() {}
@@ -65,7 +65,7 @@ void CBookReadWindow::initActions() {
i18n("Toggle tree view"),
CResMgr::displaywindows::bookWindow::toggleTree::icon,
CResMgr::displaywindows::bookWindow::toggleTree::accel,
- this, TQT_SLOT(treeToggled()),
+ TQT_TQOBJECT(this), TQT_SLOT(treeToggled()),
actionCollection(), "toggleTree");
CBTConfig::setupAccelSettings(CBTConfig::bookWindow, actionCollection());
@@ -93,7 +93,7 @@ void CBookReadWindow::initConnections() {
CLexiconReadWindow::initConnections();
connect(m_treeChooser, TQT_SIGNAL(keyChanged(CSwordKey*)),
- this, TQT_SLOT(lookup(CSwordKey*)));
+ TQT_TQOBJECT(this), TQT_SLOT(lookup(CSwordKey*)));
connect(m_treeChooser, TQT_SIGNAL(keyChanged(CSwordKey*)),
keyChooser(), TQT_SLOT(updateKey(CSwordKey*)));
connect(keyChooser(), TQT_SIGNAL(keyChanged(CSwordKey*)),
@@ -134,7 +134,7 @@ void CBookReadWindow::initToolbars() {
m_actions.backInHistory->plug( mainToolBar(), 0 );
m_actions.forwardInHistory->plug( mainToolBar(), 1 );
- mainToolBar()->insertWidget(0,keyChooser()->sizeHint().width(),keyChooser());
+ mainToolBar()->insertWidget(0,keyChooser()->tqsizeHint().width(),keyChooser());
m_treeAction->plug(buttonsToolBar());
m_treeAction->setChecked(false);
diff --git a/bibletime/frontend/displaywindow/cbookreadwindow.h b/bibletime/frontend/displaywindow/cbookreadwindow.h
index 6effe83..81c04a0 100644
--- a/bibletime/frontend/displaywindow/cbookreadwindow.h
+++ b/bibletime/frontend/displaywindow/cbookreadwindow.h
@@ -26,10 +26,11 @@ class CBookTreeChooser;
*/
class CBookReadWindow : public CLexiconReadWindow {
Q_OBJECT
+ TQ_OBJECT
public:
static void insertKeyboardActions( KActionCollection* const a );
- CBookReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0);
+ CBookReadWindow(ListCSwordModuleInfo modules, CMDIArea* tqparent, const char *name=0);
virtual ~CBookReadWindow();
/**
diff --git a/bibletime/frontend/displaywindow/cbuttons.cpp b/bibletime/frontend/displaywindow/cbuttons.cpp
index 78797af..3965296 100644
--- a/bibletime/frontend/displaywindow/cbuttons.cpp
+++ b/bibletime/frontend/displaywindow/cbuttons.cpp
@@ -16,7 +16,7 @@
#include "util/cpointers.h"
-//Qt includes
+//TQt includes
#include
#include
@@ -25,8 +25,8 @@
#include
-// CTransliterationButton::CTransliterationButton(CSwordBackend::FilterOptions* filterOptions, TQWidget *parent, const char *name )
-// : KToolBarButton(CResMgr::displaywindows::transliteration::icon, 0,parent,name) {
+// CTransliterationButton::CTransliterationButton(CSwordBackend::FilterOptions* filterOptions, TQWidget *tqparent, const char *name )
+// : KToolBarButton(CResMgr::displaywindows::transliteration::icon, 0,tqparent,name) {
// m_filterOptions = filterOptions;
// m_filterOptions->transliteration = 0;
//
@@ -65,7 +65,7 @@
// sword::StringList::iterator it;
//
// for (it = options.begin(); it != options.end(); ++it) {
-// int id = m_popup->insertItem(TQString::fromLatin1((*it).c_str()));
+// int id = m_popup->insertItem(TQString::tqfromLatin1((*it).c_str()));
// if (m_filterOptions->transliteration == m_popup->indexOf(id)-1 ) { //workaround
// m_popup->setItemChecked(id, true);
// }
@@ -86,8 +86,8 @@
*********** CDisplaySettingsButton *************
************************************************/
-CDisplaySettingsButton::CDisplaySettingsButton(CSwordBackend::DisplayOptions *displaySettings, CSwordBackend::FilterOptions *moduleSettings, const ListCSwordModuleInfo& useModules,TQWidget *parent, const char *name )
-: KToolBarButton(CResMgr::displaywindows::displaySettings::icon, 0, parent, name) {
+CDisplaySettingsButton::CDisplaySettingsButton(CSwordBackend::DisplayOptions *displaySettings, CSwordBackend::FilterOptions *moduleSettings, const ListCSwordModuleInfo& useModules,TQWidget *tqparent, const char *name )
+: KToolBarButton(CResMgr::displaywindows::displaySettings::icon, 0, tqparent, name) {
// qWarning("CDisplaySettingsButton::CDisplaySettingsButton");
m_displaySettings = displaySettings;
m_moduleSettings = moduleSettings;
@@ -198,7 +198,7 @@ const int CDisplaySettingsButton::menuItemCount() {
}
/** Sets the item at position pos to the satet given as 2nd paramter. */
-void CDisplaySettingsButton::setItemStatus( const int index, const bool checked ) {
+void CDisplaySettingsButton::setItemtqStatus( const int index, const bool checked ) {
const int ID = m_popup->idAt(index);
m_popup->setItemChecked(ID, checked);
const TQString text = m_popup->text(ID).remove('&');
@@ -208,7 +208,7 @@ void CDisplaySettingsButton::setItemStatus( const int index, const bool checked
}
/** Returns the status of the item at position "index" */
-const bool CDisplaySettingsButton::itemStatus( const int index ) {
+const bool CDisplaySettingsButton::itemtqStatus( const int index ) {
return m_popup->isItemChecked( m_popup->idAt(index) );
}
diff --git a/bibletime/frontend/displaywindow/cbuttons.h b/bibletime/frontend/displaywindow/cbuttons.h
index aa8c29e..0e6ff14 100644
--- a/bibletime/frontend/displaywindow/cbuttons.h
+++ b/bibletime/frontend/displaywindow/cbuttons.h
@@ -29,8 +29,9 @@ class KPopupMenu;
*/
// class CTransliterationButton : public KToolBarButton {
// Q_OBJECT
+// TQ_OBJECT
// public:
-// CTransliterationButton(CSwordBackend::FilterOptions* displayOptions, TQWidget *parent, const char *name=0);
+// CTransliterationButton(CSwordBackend::FilterOptions* displayOptions, TQWidget *tqparent, const char *name=0);
// ~CTransliterationButton();
// /**
// * Setup the menu entries.
@@ -57,13 +58,14 @@ class KPopupMenu;
*/
class CDisplaySettingsButton : public KToolBarButton {
Q_OBJECT
+ TQ_OBJECT
public:
- CDisplaySettingsButton(CSwordBackend::DisplayOptions *displaySettings, CSwordBackend::FilterOptions *settings, const ListCSwordModuleInfo& useModules, TQWidget *parent=0, const char *name=0);
+ CDisplaySettingsButton(CSwordBackend::DisplayOptions *displaySettings, CSwordBackend::FilterOptions *settings, const ListCSwordModuleInfo& useModules, TQWidget *tqparent=0, const char *name=0);
void reset(const ListCSwordModuleInfo& useModules);
/**
* Sets the item at position pos to the satet given as 2nd paramter.
*/
- void setItemStatus( const int pos, const bool checked );
+ void setItemtqStatus( const int pos, const bool checked );
/**
* Returns the number of usable menu items in the setttings menu.
*/
@@ -71,7 +73,7 @@ public:
/**
* Returns the status of the item at position "index"
*/
- const bool itemStatus( const int index );
+ const bool itemtqStatus( const int index );
/**
* Sets the status to changed. The signal changed will be emitted.
*/
diff --git a/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp b/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp
index b73d506..001aafb 100644
--- a/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp
+++ b/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp
@@ -21,7 +21,7 @@
#include "util/ctoolclass.h"
#include "util/cresmgr.h"
-//Qt includes
+//TQt includes
//KDE includes
#include
@@ -31,7 +31,7 @@
using namespace Profile;
-CCommentaryReadWindow::CCommentaryReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name) : CLexiconReadWindow(modules, parent,name) {}
+CCommentaryReadWindow::CCommentaryReadWindow(ListCSwordModuleInfo modules, CMDIArea* tqparent, const char *name) : CLexiconReadWindow(modules, tqparent,name) {}
void CCommentaryReadWindow::insertKeyboardActions( KActionCollection* const a ) {
new KAction(
@@ -110,37 +110,37 @@ void CCommentaryReadWindow::initActions() {
new KAction(
i18n("Next book"),
CResMgr::displaywindows::bibleWindow::nextBook::accel,
- this, TQT_SLOT(nextBook()),
+ TQT_TQOBJECT(this), TQT_SLOT(nextBook()),
actionCollection(), "nextBook"
);
new KAction(
i18n("Previous book"),
CResMgr::displaywindows::bibleWindow::previousBook::accel,
- this, TQT_SLOT(previousBook()),
+ TQT_TQOBJECT(this), TQT_SLOT(previousBook()),
actionCollection(), "previousBook"
);
new KAction(
i18n("Next chapter"),
CResMgr::displaywindows::bibleWindow::nextChapter::accel,
- this, TQT_SLOT(nextChapter()),
+ TQT_TQOBJECT(this), TQT_SLOT(nextChapter()),
actionCollection(), "nextChapter"
);
new KAction(
i18n("Previous chapter"),
CResMgr::displaywindows::bibleWindow::previousChapter::accel,
- this, TQT_SLOT(previousChapter()),
+ TQT_TQOBJECT(this), TQT_SLOT(previousChapter()),
actionCollection(), "previousChapter"
);
new KAction(
i18n("Next verse"),
CResMgr::displaywindows::bibleWindow::nextVerse::accel,
- this, TQT_SLOT(nextVerse()),
+ TQT_TQOBJECT(this), TQT_SLOT(nextVerse()),
actionCollection(), "nextVerse"
);
new KAction(
i18n("Previous verse"),
CResMgr::displaywindows::bibleWindow::previousVerse::accel,
- this, TQT_SLOT(previousVerse()),
+ TQT_TQOBJECT(this), TQT_SLOT(previousVerse()),
actionCollection(), "previousVerse"
);
diff --git a/bibletime/frontend/displaywindow/ccommentaryreadwindow.h b/bibletime/frontend/displaywindow/ccommentaryreadwindow.h
index 8d0816b..ddfaf60 100644
--- a/bibletime/frontend/displaywindow/ccommentaryreadwindow.h
+++ b/bibletime/frontend/displaywindow/ccommentaryreadwindow.h
@@ -15,7 +15,7 @@
//BibleTime includes
#include "cbiblereadwindow.h"
-//Qt includes
+//TQt includes
#include
/**
@@ -24,13 +24,14 @@
class CCommentaryReadWindow : public CLexiconReadWindow {
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Reimplementation.
*/
static void insertKeyboardActions( KActionCollection* const a );
- CCommentaryReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0);
+ CCommentaryReadWindow(ListCSwordModuleInfo modules, CMDIArea* tqparent, const char *name=0);
/**
* Store the settings of this window in the given CProfileWindow object.
*/
diff --git a/bibletime/frontend/displaywindow/cdisplaywindow.cpp b/bibletime/frontend/displaywindow/cdisplaywindow.cpp
index 1020307..8695558 100644
--- a/bibletime/frontend/displaywindow/cdisplaywindow.cpp
+++ b/bibletime/frontend/displaywindow/cdisplaywindow.cpp
@@ -39,7 +39,7 @@
#include "util/cresmgr.h"
-//Qt includes
+//TQt includes
//KDE includes
#include
@@ -48,16 +48,16 @@
using namespace Profile;
-CReadWindow* CDisplayWindow::createReadInstance(ListCSwordModuleInfo modules, CMDIArea* parent, const char* name) {
+CReadWindow* CDisplayWindow::createReadInstance(ListCSwordModuleInfo modules, CMDIArea* tqparent, const char* name) {
switch (modules.first()->type()) {
case CSwordModuleInfo::Bible:
- return new CBibleReadWindow(modules, parent, name);
+ return new CBibleReadWindow(modules, tqparent, name);
case CSwordModuleInfo::Commentary:
- return new CCommentaryReadWindow(modules, parent, name);
+ return new CCommentaryReadWindow(modules, tqparent, name);
case CSwordModuleInfo::Lexicon:
- return new CLexiconReadWindow(modules, parent, name);
+ return new CLexiconReadWindow(modules, tqparent, name);
case CSwordModuleInfo::GenericBook:
- return new CBookReadWindow(modules, parent, name);
+ return new CBookReadWindow(modules, tqparent, name);
default:
qWarning("unknown module type");
break;
@@ -66,23 +66,23 @@ CReadWindow* CDisplayWindow::createReadInstance(ListCSwordModuleInfo modules, CM
}
-CWriteWindow* CDisplayWindow::createWriteInstance(ListCSwordModuleInfo modules, CMDIArea* parent, const CDisplayWindow::WriteWindowType type, const char* name) {
+CWriteWindow* CDisplayWindow::createWriteInstance(ListCSwordModuleInfo modules, CMDIArea* tqparent, const CDisplayWindow::WriteWindowType type, const char* name) {
if (type == HTMLWindow) {
- return new CHTMLWriteWindow(modules, parent, name);
+ return new CHTMLWriteWindow(modules, tqparent, name);
}
else {
- return new CPlainWriteWindow(modules, parent, name);
+ return new CPlainWriteWindow(modules, tqparent, name);
}
return 0;
}
-CDisplayWindow::CDisplayWindow(ListCSwordModuleInfo modules, CMDIArea *parent, const char *name )
+CDisplayWindow::CDisplayWindow(ListCSwordModuleInfo modules, CMDIArea *tqparent, const char *name )
#if KDE_VERSION >= 0x030200
-: KMainWindow(KMainWindow::NoDCOPObject, parent, name, WDestructiveClose),
+: KMainWindow(KMainWindow::NoDCOPObject, tqparent, name, WDestructiveClose),
#else
-: KMainWindow(parent, name, WDestructiveClose),
+: KMainWindow(tqparent, name, WDestructiveClose),
#endif
-m_mdi(parent),
+m_mdi(tqparent),
m_filterOptions(),
m_displayOptions(),
m_displaySettingsButton(0),
@@ -108,7 +108,7 @@ CMDIArea* const CDisplayWindow::mdi() const {
/** Returns the right window caption. */
const TQString CDisplayWindow::windowCaption() {
if (!m_modules.count()) {
- return TQString::null;
+ return TQString();
}
return TQString(key()->key()).append(" (").append(m_modules.join(" | ")).append(")");
@@ -161,7 +161,7 @@ void CDisplayWindow::initActions() {
new KAction(i18n("Search"),
CResMgr::displaywindows::general::search::icon,
CResMgr::displaywindows::general::search::accel,
- this, TQT_SLOT(slotSearchInModules()),
+ TQT_TQOBJECT(this), TQT_SLOT(slotSearchInModules()),
actionCollection(), CResMgr::displaywindows::general::search::actionName
);
@@ -174,7 +174,7 @@ void CDisplayWindow::initActions() {
actionCollection(), "zoomOut"
);
KStdAction::close(
- this, TQT_SLOT(close()),
+ TQT_TQOBJECT(this), TQT_SLOT(close()),
actionCollection(), "closeWindow"
);
@@ -195,13 +195,13 @@ void CDisplayWindow::initActions() {
new KToolBarPopupAction(
i18n("Back in history"), CResMgr::displaywindows::general::backInHistory::icon, CResMgr::displaywindows::general::backInHistory::accel,
- keyChooser(), TQT_SLOT( backInHistory() ),
+ TQT_TQOBJECT(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(), TQT_SLOT( forwardInHistory() ),
+ TQT_TQOBJECT(keyChooser()), TQT_SLOT( forwardInHistory() ),
actionCollection(), CResMgr::displaywindows::general::forwardInHistory::actionName
);
@@ -351,8 +351,8 @@ const bool CDisplayWindow::init() {
setCaption(windowCaption());
//setup focus stuff.
- setFocusPolicy(TQWidget::ClickFocus);
- parentWidget()->setFocusPolicy(TQWidget::ClickFocus);
+ setFocusPolicy(TQ_ClickFocus);
+ tqparentWidget()->setFocusPolicy(TQ_ClickFocus);
initActions();
initToolbars();
@@ -421,7 +421,7 @@ void CDisplayWindow::lookup( const TQString& moduleName, const TQString& keyName
}
//ToDo: check for containsRef compat
- if (m && modules().contains(m)) {
+ if (m && modules().tqcontains(m)) {
key()->key(keyName);
keyChooser()->setKey(key()); //the key chooser does send an update signal
}
diff --git a/bibletime/frontend/displaywindow/cdisplaywindow.h b/bibletime/frontend/displaywindow/cdisplaywindow.h
index 3c25acf..5fd3bdd 100644
--- a/bibletime/frontend/displaywindow/cdisplaywindow.h
+++ b/bibletime/frontend/displaywindow/cdisplaywindow.h
@@ -24,7 +24,7 @@
#include "frontend/cprofilewindow.h"
-//Qt includes
+//TQt includes
#include
//KDE includes
@@ -51,14 +51,15 @@ class KPopupMenu;
class CDisplayWindow : public KMainWindow, public CPointers {
Q_OBJECT
+ TQ_OBJECT
public:
enum WriteWindowType {
HTMLWindow = 1,
PlainTextWindow = 2
};
- static CReadWindow* createReadInstance(ListCSwordModuleInfo modules, CMDIArea* parent, const char* name = 0);
- static CWriteWindow* createWriteInstance(ListCSwordModuleInfo modules, CMDIArea* parent, const WriteWindowType type = HTMLWindow, const char* name = 0);
+ static CReadWindow* createReadInstance(ListCSwordModuleInfo modules, CMDIArea* tqparent, const char* name = 0);
+ static CWriteWindow* createWriteInstance(ListCSwordModuleInfo modules, CMDIArea* tqparent, const WriteWindowType type = HTMLWindow, const char* name = 0);
/**
* Insert the keyboard accelerators of this window into the given KAccel object.
*/
@@ -71,7 +72,7 @@ public:
*/
const TQString windowCaption();
/**
- * Returns the used modules as a QPtrList
+ * Returns the used modules as a TQPtrList
*/
ListCSwordModuleInfo modules();
/**
@@ -194,7 +195,7 @@ protected:
friend class CMDIArea;
friend class CBibleReadWindow;
- CDisplayWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0);
+ CDisplayWindow(ListCSwordModuleInfo modules, CMDIArea* tqparent, const char *name=0);
virtual ~CDisplayWindow();
/**
* Initializes the intern keyboard actions.
diff --git a/bibletime/frontend/displaywindow/chtmlwritewindow.cpp b/bibletime/frontend/displaywindow/chtmlwritewindow.cpp
index 1dc7c2e..d778c9b 100644
--- a/bibletime/frontend/displaywindow/chtmlwritewindow.cpp
+++ b/bibletime/frontend/displaywindow/chtmlwritewindow.cpp
@@ -17,7 +17,7 @@
#include "util/cresmgr.h"
-//Qt includes
+//TQt includes
//KDE includes
#include
@@ -25,8 +25,8 @@
using namespace Profile;
-CHTMLWriteWindow::CHTMLWriteWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name)
-: CPlainWriteWindow(modules, parent, name) {}
+CHTMLWriteWindow::CHTMLWriteWindow(ListCSwordModuleInfo modules, CMDIArea* tqparent, const char *name)
+: CPlainWriteWindow(modules, tqparent, name) {}
CHTMLWriteWindow::~CHTMLWriteWindow() {}
@@ -41,7 +41,7 @@ void CHTMLWriteWindow::initView() {
addDockWindow(mainToolBar());
setKeyChooser( CKeyChooser::createInstance(modules(), key(), mainToolBar()) );
- mainToolBar()->insertWidget(0,keyChooser()->sizeHint().width(),keyChooser());
+ mainToolBar()->insertWidget(0,keyChooser()->tqsizeHint().width(),keyChooser());
mainToolBar()->setFullSize(false);
};
@@ -49,9 +49,9 @@ void CHTMLWriteWindow::initConnections() {
CWriteWindow::initConnections();
connect(keyChooser(), TQT_SIGNAL(keyChanged(CSwordKey*)),
- this, TQT_SLOT(lookup(CSwordKey*)));
+ TQT_TQOBJECT(this), TQT_SLOT(lookup(CSwordKey*)));
connect(displayWidget()->connectionsProxy(), TQT_SIGNAL(textChanged()),
- this, TQT_SLOT(textChanged()) );
+ TQT_TQOBJECT(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, TQT_SLOT( saveCurrentText() ),
+ TQT_TQOBJECT(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, TQT_SLOT(deleteEntry()),
+ TQT_TQOBJECT(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, TQT_SLOT(restoreText()), actionCollection(),
+ TQT_TQOBJECT(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 fd51ee0..642ba61 100644
--- a/bibletime/frontend/displaywindow/chtmlwritewindow.h
+++ b/bibletime/frontend/displaywindow/chtmlwritewindow.h
@@ -15,7 +15,7 @@
//BibleTime includes
#include "cplainwritewindow.h"
-//Qt includes
+//TQt includes
#include
class KAction;
@@ -25,8 +25,9 @@ class KAction;
*/
class CHTMLWriteWindow : public CPlainWriteWindow {
Q_OBJECT
+ TQ_OBJECT
public:
- CHTMLWriteWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name = 0);
+ CHTMLWriteWindow(ListCSwordModuleInfo modules, CMDIArea* tqparent, const char *name = 0);
virtual ~CHTMLWriteWindow();
/**
diff --git a/bibletime/frontend/displaywindow/clexiconreadwindow.cpp b/bibletime/frontend/displaywindow/clexiconreadwindow.cpp
index 4d29f28..2b2e864 100644
--- a/bibletime/frontend/displaywindow/clexiconreadwindow.cpp
+++ b/bibletime/frontend/displaywindow/clexiconreadwindow.cpp
@@ -26,7 +26,7 @@
#include "util/ctoolclass.h"
#include "util/cresmgr.h"
-//Qt includes
+//TQt includes
//KDE includes
#include
@@ -36,7 +36,7 @@
#include
// #include
-CLexiconReadWindow::CLexiconReadWindow(ListCSwordModuleInfo moduleList, CMDIArea* parent, const char *name) : CReadWindow(moduleList, parent,name) {
+CLexiconReadWindow::CLexiconReadWindow(ListCSwordModuleInfo moduleList, CMDIArea* tqparent, const char *name) : CReadWindow(moduleList, tqparent,name) {
setKey( CSwordKey::createInstance(moduleList.first()) );
}
@@ -81,12 +81,12 @@ void CLexiconReadWindow::initActions() {
new KAction(
i18n("Next entry"), CResMgr::displaywindows::lexiconWindow::nextEntry::accel,
- this, TQT_SLOT( nextEntry() ),
+ TQT_TQOBJECT(this), TQT_SLOT( nextEntry() ),
actionCollection(), "nextEntry"
);
new KAction(
i18n("Previous entry"), CResMgr::displaywindows::lexiconWindow::previousEntry::accel,
- this, TQT_SLOT( previousEntry() ),
+ TQT_TQOBJECT(this), TQT_SLOT( previousEntry() ),
actionCollection(), "previousEntry"
);
@@ -101,7 +101,7 @@ void CLexiconReadWindow::initActions() {
i18n("Strong's Search"),
CResMgr::displaywindows::general::findStrongs::icon,
CResMgr::displaywindows::general::findStrongs::accel,
- this, TQT_SLOT(openSearchStrongsDialog()),
+ TQT_TQOBJECT(this), TQT_SLOT(openSearchStrongsDialog()),
actionCollection(),
CResMgr::displaywindows::general::findStrongs::actionName);
@@ -112,13 +112,13 @@ void CLexiconReadWindow::initActions() {
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, TQT_SLOT(saveAsPlain()),actionCollection(), "saveEntryAsPlain");
+ m_actions.save.entryAsPlain = new KAction(i18n("Entry as plain text"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(saveAsPlain()),actionCollection(), "saveEntryAsPlain");
- m_actions.save.entryAsHTML = new KAction(i18n("Entry as HTML"), KShortcut(0), this, TQT_SLOT(saveAsHTML()), actionCollection(), "saveEntryAsHTML");
+ m_actions.save.entryAsHTML = new KAction(i18n("Entry as HTML"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(saveAsHTML()), actionCollection(), "saveEntryAsHTML");
- m_actions.print.reference = new KAction(i18n("Reference only"), KShortcut(0), this, TQT_SLOT(printAnchorWithText()), actionCollection(), "printReferenceOnly");
+ m_actions.print.reference = new KAction(i18n("Reference only"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(printAnchorWithText()), actionCollection(), "printReferenceOnly");
- m_actions.print.entry = new KAction(i18n("Entry with text"), KShortcut(0), this, TQT_SLOT(printAll()), actionCollection(), "printEntryWithText");
+ m_actions.print.entry = new KAction(i18n("Entry with text"), KShortcut(0), TQT_TQOBJECT(this), TQT_SLOT(printAll()), actionCollection(), "printEntryWithText");
// init with the user defined settings
CBTConfig::setupAccelSettings(CBTConfig::lexiconWindow, actionCollection());
@@ -129,14 +129,14 @@ void CLexiconReadWindow::initConnections() {
Q_ASSERT(keyChooser());
connect(keyChooser(), TQT_SIGNAL(keyChanged(CSwordKey*)),
- this, TQT_SLOT(lookup(CSwordKey*)));
+ TQT_TQOBJECT(this), TQT_SLOT(lookup(CSwordKey*)));
connect(keyChooser(), TQT_SIGNAL(historyChanged()),
- this, TQT_SLOT(slotUpdateHistoryButtons()));
+ TQT_TQOBJECT(this), TQT_SLOT(slotUpdateHistoryButtons()));
//connect the history actions to the right slots
connect(
m_actions.backInHistory->popupMenu(), TQT_SIGNAL(aboutToShow()),
- this, TQT_SLOT(slotFillBackHistory())
+ TQT_TQOBJECT(this), TQT_SLOT(slotFillBackHistory())
);
connect(
m_actions.backInHistory->popupMenu(), TQT_SIGNAL(activated(int)),
@@ -144,7 +144,7 @@ void CLexiconReadWindow::initConnections() {
);
connect(
m_actions.forwardInHistory->popupMenu(), TQT_SIGNAL(aboutToShow()),
- this, TQT_SLOT(slotFillForwardHistory())
+ TQT_TQOBJECT(this), TQT_SLOT(slotFillForwardHistory())
);
connect(
m_actions.forwardInHistory->popupMenu(), TQT_SIGNAL(activated(int)),
@@ -162,7 +162,7 @@ void CLexiconReadWindow::initView() {
setKeyChooser( CKeyChooser::createInstance(modules(), key(), mainToolBar()) );
- mainToolBar()->insertWidget(0, keyChooser()->sizeHint().width(), keyChooser());
+ mainToolBar()->insertWidget(0, keyChooser()->tqsizeHint().width(), keyChooser());
mainToolBar()->setFullSize(false);
setModuleChooserBar( new CModuleChooserBar(modules(), modules().first()->type(), this) );
@@ -206,14 +206,14 @@ void CLexiconReadWindow::setupPopupMenu() {
m_actions.selectAll->plug(popup());
- (new KActionSeparator(this))->plug( popup() );
+ (new KActionSeparator(TQT_TQOBJECT(this)))->plug( popup() );
m_actions.copyMenu = new KActionMenu(i18n("Copy..."), CResMgr::displaywindows::lexiconWindow::copyMenu::icon, actionCollection());
m_actions.copyMenu->setDelayed(false);
m_actions.copyMenu->insert(m_actions.copy.reference);
m_actions.copyMenu->insert(m_actions.copy.entry);
- m_actions.copyMenu->insert(new KActionSeparator(this));
+ m_actions.copyMenu->insert(new KActionSeparator(TQT_TQOBJECT(this)));
m_actions.copyMenu->insert(m_actions.copy.selectedText);
m_actions.copyMenu->plug(popup());
@@ -242,7 +242,7 @@ void CLexiconReadWindow::updatePopupMenu() {
}
}
m_actions.findStrongs->setEnabled( hasStrongs );*/
- m_actions.findStrongs->setEnabled( displayWidget()->getCurrentNodeInfo()[CDisplay::Lemma] != TQString::null );
+ m_actions.findStrongs->setEnabled( displayWidget()->getCurrentNodeInfo()[CDisplay::Lemma] != TQString() );
m_actions.copy.reference->setEnabled( displayWidget()->hasActiveAnchor() );
//m_actions.copy.entry->setEnabled( displayWidget()->hasActiveAnchor() );
diff --git a/bibletime/frontend/displaywindow/clexiconreadwindow.h b/bibletime/frontend/displaywindow/clexiconreadwindow.h
index 1710963..c06b175 100644
--- a/bibletime/frontend/displaywindow/clexiconreadwindow.h
+++ b/bibletime/frontend/displaywindow/clexiconreadwindow.h
@@ -15,7 +15,7 @@
//BibleTime includes
#include "creadwindow.h"
-//Qt includes
+//TQt includes
#include
//KDE includes
@@ -32,8 +32,9 @@ class KToolBarPopupAction;
class CLexiconReadWindow : public CReadWindow {
Q_OBJECT
+ TQ_OBJECT
public:
- CLexiconReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0);
+ CLexiconReadWindow(ListCSwordModuleInfo modules, CMDIArea* tqparent, const char *name=0);
virtual ~CLexiconReadWindow();
/**
* Store the settings of this window in the given CProfileWindow object.
diff --git a/bibletime/frontend/displaywindow/cmodulechooserbar.cpp b/bibletime/frontend/displaywindow/cmodulechooserbar.cpp
index 7f0f1fc..49ae902 100644
--- a/bibletime/frontend/displaywindow/cmodulechooserbar.cpp
+++ b/bibletime/frontend/displaywindow/cmodulechooserbar.cpp
@@ -14,8 +14,8 @@
#include
-CModuleChooserBar::CModuleChooserBar(ListCSwordModuleInfo useModules, CSwordModuleInfo::ModuleType type, TQWidget *parent, const char *name )
-: KToolBar(parent,name),
+CModuleChooserBar::CModuleChooserBar(ListCSwordModuleInfo useModules, CSwordModuleInfo::ModuleType type, TQWidget *tqparent, const char *name )
+: KToolBar(tqparent,name),
m_moduleType(type),
m_idCounter(0),
m_buttonLimit(-1) //-1 means no limit
diff --git a/bibletime/frontend/displaywindow/cmodulechooserbar.h b/bibletime/frontend/displaywindow/cmodulechooserbar.h
index 5d4cf06..4598324 100644
--- a/bibletime/frontend/displaywindow/cmodulechooserbar.h
+++ b/bibletime/frontend/displaywindow/cmodulechooserbar.h
@@ -19,7 +19,7 @@
#include "util/cpointers.h"
-//Qt includes
+//TQt includes
#include
#include
@@ -31,11 +31,12 @@
*/
class CModuleChooserBar : public KToolBar {
Q_OBJECT
+ TQ_OBJECT
public:
/**
* Default constructor
*/
- CModuleChooserBar(ListCSwordModuleInfo useModules, CSwordModuleInfo::ModuleType type, TQWidget *parent=0, const char *name=0);
+ CModuleChooserBar(ListCSwordModuleInfo useModules, CSwordModuleInfo::ModuleType type, TQWidget *tqparent=0, const char *name=0);
/**
* Returns a list of selected modules.
*/
diff --git a/bibletime/frontend/displaywindow/cmodulechooserbutton.cpp b/bibletime/frontend/displaywindow/cmodulechooserbutton.cpp
index 3d8105f..30d5e21 100644
--- a/bibletime/frontend/displaywindow/cmodulechooserbutton.cpp
+++ b/bibletime/frontend/displaywindow/cmodulechooserbutton.cpp
@@ -16,7 +16,7 @@
#include "util/cresmgr.h"
-//Qt includes
+//TQt includes
#include
#include
#include
@@ -27,9 +27,9 @@
#include
#include
-CModuleChooserButton::CModuleChooserButton(CSwordModuleInfo* useModule,CSwordModuleInfo::ModuleType type, const int id, CModuleChooserBar *parent, const char *name )
-: KToolBarButton(iconName(), id, parent, name),
-m_id(id), m_popup(0), m_moduleChooserBar(parent) {
+CModuleChooserButton::CModuleChooserButton(CSwordModuleInfo* useModule,CSwordModuleInfo::ModuleType type, const int id, CModuleChooserBar *tqparent, const char *name )
+: KToolBarButton(iconName(), id, tqparent, name),
+m_id(id), m_popup(0), m_moduleChooserBar(tqparent) {
m_moduleType = type;
m_module = useModule;
if (!m_module) {
@@ -85,7 +85,7 @@ CSwordModuleInfo* CModuleChooserButton::module() {
for (unsigned int i = 0; i < popup->count(); i++) {
if ( m_popup->isItemChecked(popup->idAt(i)) ) {
TQString mod = popup->text(popup->idAt(i)).remove('&');
- return backend()->findModuleByName( mod.left(mod.find(" ")) );
+ return backend()->findModuleByName( mod.left(mod.tqfind(" ")) );
}
}
@@ -190,14 +190,14 @@ void CModuleChooserButton::populateMenu() {
TQString lang = (*it)->language()->translatedName();
if (lang.isEmpty()) {
- //lang = TQString::fromLatin1("xx"); //unknown language -- do not use English as default!!
+ //lang = TQString::tqfromLatin1("xx"); //unknown language -- do not use English as default!!
lang = (*it)->language()->abbrev();
if (lang.isEmpty()) {
lang = "xx";
}
}
- if (languages.find( lang ) == languages.end() ) { //this lang was not yet added
+ if (languages.tqfind( lang ) == languages.end() ) { //this lang was not yet added
languages += lang;
KPopupMenu* menu = new KPopupMenu;
@@ -222,7 +222,7 @@ void CModuleChooserButton::populateMenu() {
}
TQString name((*it)->name());
- name.append(" ").append((*it)->isLocked() ? i18n("[locked]") : TQString::null);
+ name.append(" ").append((*it)->isLocked() ? i18n("[locked]") : TQString());
const int id = langdict[lang]->insertItem( name );
if ( m_module && (*it)->name() == m_module->name()) {
@@ -258,14 +258,14 @@ void CModuleChooserButton::updateMenuItems() {
for (unsigned int i = 0; i < popup->count(); i++) {
moduleName = popup->text(popup->idAt(i)).remove('&');
- module = backend()->findModuleByName( moduleName.left(moduleName.findRev(" ")) );
+ module = backend()->findModuleByName( moduleName.left(moduleName.tqfindRev(" ")) );
Q_ASSERT(module);
// if (!module) {
// qWarning("Can't find module with name %s", moduleName.latin1());
// }
- bool alreadyChosen = chosenModules.contains( module );
+ bool alreadyChosen = chosenModules.tqcontains( module );
if (m_module) {
alreadyChosen = alreadyChosen && (m_module->name() != moduleName);
}
diff --git a/bibletime/frontend/displaywindow/cmodulechooserbutton.h b/bibletime/frontend/displaywindow/cmodulechooserbutton.h
index d1a99b2..acc77a8 100644
--- a/bibletime/frontend/displaywindow/cmodulechooserbutton.h
+++ b/bibletime/frontend/displaywindow/cmodulechooserbutton.h
@@ -16,7 +16,7 @@
#include "backend/cswordmoduleinfo.h"
#include "util/cpointers.h"
-//Qt includes
+//TQt includes
#include
#include
@@ -33,8 +33,9 @@ class CModuleChooserBar;
*/
class CModuleChooserButton : public KToolBarButton, public CPointers {
Q_OBJECT
+ TQ_OBJECT
public:
- CModuleChooserButton(CSwordModuleInfo* useModule, CSwordModuleInfo::ModuleType type, const int id, CModuleChooserBar *parent, const char *name = 0 );
+ CModuleChooserButton(CSwordModuleInfo* useModule, CSwordModuleInfo::ModuleType type, const int id, CModuleChooserBar *tqparent, const char *name = 0 );
~CModuleChooserButton();
CSwordModuleInfo* module();
diff --git a/bibletime/frontend/displaywindow/cplainwritewindow.cpp b/bibletime/frontend/displaywindow/cplainwritewindow.cpp
index b855ee8..2e63cef 100644
--- a/bibletime/frontend/displaywindow/cplainwritewindow.cpp
+++ b/bibletime/frontend/displaywindow/cplainwritewindow.cpp
@@ -17,7 +17,7 @@
#include "util/cresmgr.h"
-//Qt includes
+//TQt includes
#include
//KDE includes
@@ -28,7 +28,7 @@
using namespace Profile;
-CPlainWriteWindow::CPlainWriteWindow(ListCSwordModuleInfo moduleList, CMDIArea* parent, const char *name ) : CWriteWindow(moduleList, parent, name) {
+CPlainWriteWindow::CPlainWriteWindow(ListCSwordModuleInfo moduleList, CMDIArea* tqparent, const char *name ) : CWriteWindow(moduleList, tqparent, name) {
setKey( CSwordKey::createInstance(moduleList.first()) );
}
@@ -46,7 +46,7 @@ void CPlainWriteWindow::initView() {
addDockWindow(mainToolBar());
setKeyChooser( CKeyChooser::createInstance(modules(), key(), mainToolBar()) );
- mainToolBar()->insertWidget(0,keyChooser()->sizeHint().width(),keyChooser());
+ mainToolBar()->insertWidget(0,keyChooser()->tqsizeHint().width(),keyChooser());
mainToolBar()->setFullSize(false);
}
@@ -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, TQT_SLOT(saveCurrentText()),
+ TQT_TQOBJECT(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, TQT_SLOT(deleteEntry()),
+ TQT_TQOBJECT(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, TQT_SLOT(restoreText()),
+ TQT_TQOBJECT(this), TQT_SLOT(restoreText()),
actionCollection(),
CResMgr::displaywindows::writeWindow::restoreText::actionName
);
@@ -98,10 +98,10 @@ void CPlainWriteWindow::initToolbars() {
void CPlainWriteWindow::initConnections() {
CWriteWindow::initConnections();
connect(keyChooser(), TQT_SIGNAL(keyChanged(CSwordKey*)),
- this, TQT_SLOT(lookup(CSwordKey*)));
+ TQT_TQOBJECT(this), TQT_SLOT(lookup(CSwordKey*)));
connect(displayWidget()->connectionsProxy(), TQT_SIGNAL(textChanged()),
- this, TQT_SLOT(textChanged()) );
+ TQT_TQOBJECT(this), TQT_SLOT(textChanged()) );
}
void CPlainWriteWindow::storeProfileSettings( CProfileWindow* profileWindow ) {
@@ -122,8 +122,8 @@ void CPlainWriteWindow::saveCurrentText( const TQString& /*key*/ ) {
//since t is a complete HTML page at the moment, strip away headers and footers of a HTML page
TQRegExp re("(?:.+)", false); //remove headers, case insensitive
re.setMinimal(true);
- t.replace(re, "");
- t.replace(TQRegExp("