TDE
/
bibletime
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/bibletime
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KDE_VERSION to TDE_VERSION

Browse Source
r14.0.x
Timothy Pearson 13 years ago
parent 531093a8f4
commit e77643f360
7 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File

2
bibletime/bibletime.cpp
Unescape View File

@ -55,7 +55,7 @@ using namespace Profile;
BibleTime::BibleTime() BibleTime::BibleTime()
: BibleTimeInterface("BibleTimeInterface"), : BibleTimeInterface("BibleTimeInterface"),
#if KDE_VERSION >= 0x030200 #if TDE_VERSION >= 0x030200
KMainWindow(KMainWindow::NoDCOPObject, 0,0, WType_TopLevel), KMainWindow(KMainWindow::NoDCOPObject, 0,0, WType_TopLevel),
#else #else
KMainWindow(0,0, WType_TopLevel), KMainWindow(0,0, WType_TopLevel),

52
bibletime/bibletime_init.cpp
Unescape View File

@ -107,7 +107,7 @@ void BibleTime::initActions() {
action = KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT( quit() ), actionCollection()); action = KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT( quit() ), actionCollection());
action->setToolTip( CResMgr::mainMenu::file::quit::tooltip ); action->setToolTip( CResMgr::mainMenu::file::quit::tooltip );
#if KDE_VERSION_MINOR < 1 #if TDE_VERSION_MINOR < 1
action->plugAccel( accel() ); action->plugAccel( accel() );
#endif #endif
@ -120,7 +120,7 @@ void BibleTime::initActions() {
); );
action->setToolTip( CResMgr::mainMenu::mainIndex::search::tooltip ); action->setToolTip( CResMgr::mainMenu::mainIndex::search::tooltip );
#if KDE_VERSION_MINOR < 1 #if TDE_VERSION_MINOR < 1
action->plugAccel( accel() ); action->plugAccel( accel() );
#endif #endif
@ -133,7 +133,7 @@ void BibleTime::initActions() {
); );
action->setToolTip( CResMgr::mainMenu::mainIndex::searchdefaultbible::tooltip ); action->setToolTip( CResMgr::mainMenu::mainIndex::searchdefaultbible::tooltip );
#if KDE_VERSION_MINOR < 1 #if TDE_VERSION_MINOR < 1
action->plugAccel( accel() ); action->plugAccel( accel() );
#endif #endif
@ -141,7 +141,7 @@ void BibleTime::initActions() {
m_viewToolbar_action = KStdAction::showToolbar(TQT_TQOBJECT(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 ); m_viewToolbar_action->setToolTip( CResMgr::mainMenu::view::showToolBar::tooltip );
#if KDE_VERSION_MINOR < 1 #if TDE_VERSION_MINOR < 1
m_viewToolbar_action->plugAccel( accel() ); m_viewToolbar_action->plugAccel( accel() );
#endif #endif
@ -154,7 +154,7 @@ void BibleTime::initActions() {
CResMgr::mainMenu::view::showMainIndex::actionName); CResMgr::mainMenu::view::showMainIndex::actionName);
m_viewMainIndex_action->setToolTip( CResMgr::mainMenu::view::showMainIndex::tooltip ); m_viewMainIndex_action->setToolTip( CResMgr::mainMenu::view::showMainIndex::tooltip );
#if KDE_VERSION_MINOR < 1 #if TDE_VERSION_MINOR < 1
m_viewMainIndex_action->plugAccel( accel() ); m_viewMainIndex_action->plugAccel( accel() );
#endif #endif
@ -166,7 +166,7 @@ void BibleTime::initActions() {
CResMgr::mainMenu::view::showInfoDisplay::actionName); CResMgr::mainMenu::view::showInfoDisplay::actionName);
m_viewMainIndex_action->setToolTip( CResMgr::mainMenu::view::showInfoDisplay::tooltip ); m_viewMainIndex_action->setToolTip( CResMgr::mainMenu::view::showInfoDisplay::tooltip );
#if KDE_VERSION_MINOR < 1 #if TDE_VERSION_MINOR < 1
m_viewInfoDisplay_action->plugAccel( accel() ); m_viewInfoDisplay_action->plugAccel( accel() );
#endif #endif
@ -174,7 +174,7 @@ void BibleTime::initActions() {
action = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT( slotSettingsOptions() ), actionCollection()); action = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT( slotSettingsOptions() ), actionCollection());
action->setToolTip( CResMgr::mainMenu::settings::optionsDialog::tooltip ); action->setToolTip( CResMgr::mainMenu::settings::optionsDialog::tooltip );
#if KDE_VERSION_MINOR < 1 #if TDE_VERSION_MINOR < 1
action->plugAccel( accel() ); action->plugAccel( accel() );
#endif #endif
@ -186,7 +186,7 @@ void BibleTime::initActions() {
CResMgr::mainMenu::settings::swordSetupDialog::actionName CResMgr::mainMenu::settings::swordSetupDialog::actionName
); );
action->setToolTip( CResMgr::mainMenu::settings::swordSetupDialog::tooltip ); action->setToolTip( CResMgr::mainMenu::settings::swordSetupDialog::tooltip );
#if KDE_VERSION_MINOR < 1 #if TDE_VERSION_MINOR < 1
action->plugAccel( accel() ); action->plugAccel( accel() );
#endif #endif
@ -200,7 +200,7 @@ void BibleTime::initActions() {
} }
action = KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT( slotSettingsToolbar() ), actionCollection()); action = KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT( slotSettingsToolbar() ), actionCollection());
action->setToolTip( CResMgr::mainMenu::settings::editToolBar::tooltip ); action->setToolTip( CResMgr::mainMenu::settings::editToolBar::tooltip );
#if KDE_VERSION_MINOR < 1 #if TDE_VERSION_MINOR < 1
action->plugAccel( accel() ); action->plugAccel( accel() );
#endif #endif
@ -220,7 +220,7 @@ void BibleTime::initActions() {
m_windowManualMode_action->setToolTip( m_windowManualMode_action->setToolTip(
CResMgr::mainMenu::window::arrangementMode::manual::tooltip CResMgr::mainMenu::window::arrangementMode::manual::tooltip
); );
#if KDE_VERSION_MINOR < 1 #if TDE_VERSION_MINOR < 1
m_windowManualMode_action->plugAccel( accel() ); m_windowManualMode_action->plugAccel( accel() );
#endif #endif
@ -237,7 +237,7 @@ void BibleTime::initActions() {
m_windowAutoTileVertical_action->setToolTip( m_windowAutoTileVertical_action->setToolTip(
CResMgr::mainMenu::window::arrangementMode::autoTileVertical::tooltip CResMgr::mainMenu::window::arrangementMode::autoTileVertical::tooltip
); );
#if KDE_VERSION_MINOR < 1 #if TDE_VERSION_MINOR < 1
m_windowAutoTileVertical_action->plugAccel( accel() ); m_windowAutoTileVertical_action->plugAccel( accel() );
#endif #endif
@ -254,7 +254,7 @@ void BibleTime::initActions() {
m_windowAutoTileHorizontal_action->setToolTip( m_windowAutoTileHorizontal_action->setToolTip(
CResMgr::mainMenu::window::arrangementMode::autoTileHorizontal::tooltip CResMgr::mainMenu::window::arrangementMode::autoTileHorizontal::tooltip
); );
#if KDE_VERSION_MINOR < 1 #if TDE_VERSION_MINOR < 1
m_windowAutoTileHorizontal_action->plugAccel( accel() ); m_windowAutoTileHorizontal_action->plugAccel( accel() );
#endif #endif
@ -271,7 +271,7 @@ void BibleTime::initActions() {
m_windowAutoCascade_action->setToolTip( m_windowAutoCascade_action->setToolTip(
CResMgr::mainMenu::window::arrangementMode::autoCascade::tooltip CResMgr::mainMenu::window::arrangementMode::autoCascade::tooltip
); );
#if KDE_VERSION_MINOR < 1 #if TDE_VERSION_MINOR < 1
// qWarning("Plug accel"); // qWarning("Plug accel");
m_windowAutoCascade_action->plugAccel( accel() ); m_windowAutoCascade_action->plugAccel( accel() );
#endif #endif
@ -286,7 +286,7 @@ void BibleTime::initActions() {
); );
m_windowCascade_action->setToolTip( CResMgr::mainMenu::window::cascade::tooltip ); m_windowCascade_action->setToolTip( CResMgr::mainMenu::window::cascade::tooltip );
#if KDE_VERSION_MINOR < 1 #if TDE_VERSION_MINOR < 1
m_windowCascade_action->plugAccel( accel() ); m_windowCascade_action->plugAccel( accel() );
#endif #endif
@ -299,7 +299,7 @@ void BibleTime::initActions() {
CResMgr::mainMenu::window::tileVertical::actionName CResMgr::mainMenu::window::tileVertical::actionName
); );
m_windowTileVertical_action->setToolTip( CResMgr::mainMenu::window::tileVertical::tooltip ); m_windowTileVertical_action->setToolTip( CResMgr::mainMenu::window::tileVertical::tooltip );
#if KDE_VERSION_MINOR < 1 #if TDE_VERSION_MINOR < 1
m_windowTileVertical_action->plugAccel( accel() ); m_windowTileVertical_action->plugAccel( accel() );
#endif #endif
@ -312,7 +312,7 @@ void BibleTime::initActions() {
); );
m_windowTileHorizontal_action->setToolTip( CResMgr::mainMenu::window::tileHorizontal::tooltip ); m_windowTileHorizontal_action->setToolTip( CResMgr::mainMenu::window::tileHorizontal::tooltip );
#if KDE_VERSION_MINOR < 1 #if TDE_VERSION_MINOR < 1
m_windowTileHorizontal_action->plugAccel( accel() ); m_windowTileHorizontal_action->plugAccel( accel() );
#endif #endif
@ -325,7 +325,7 @@ void BibleTime::initActions() {
CResMgr::mainMenu::window::closeAll::actionName CResMgr::mainMenu::window::closeAll::actionName
); );
m_windowCloseAll_action->setToolTip( CResMgr::mainMenu::window::closeAll::tooltip ); m_windowCloseAll_action->setToolTip( CResMgr::mainMenu::window::closeAll::tooltip );
#if KDE_VERSION_MINOR < 1 #if TDE_VERSION_MINOR < 1
m_windowCloseAll_action->plugAccel( accel() ); m_windowCloseAll_action->plugAccel( accel() );
#endif #endif
@ -338,7 +338,7 @@ void BibleTime::initActions() {
); );
m_windowSaveProfile_action->setToolTip( CResMgr::mainMenu::window::saveProfile::tooltip ); m_windowSaveProfile_action->setToolTip( CResMgr::mainMenu::window::saveProfile::tooltip );
m_windowSaveProfile_action->setDelayed( false ); m_windowSaveProfile_action->setDelayed( false );
#if KDE_VERSION_MINOR < 1 #if TDE_VERSION_MINOR < 1
m_windowSaveProfile_action->plugAccel( accel() ); m_windowSaveProfile_action->plugAccel( accel() );
#endif #endif
@ -351,7 +351,7 @@ void BibleTime::initActions() {
CResMgr::mainMenu::window::saveToNewProfile::actionName CResMgr::mainMenu::window::saveToNewProfile::actionName
); );
m_windowSaveToNewProfile_action->setToolTip( CResMgr::mainMenu::window::saveToNewProfile::tooltip ); m_windowSaveToNewProfile_action->setToolTip( CResMgr::mainMenu::window::saveToNewProfile::tooltip );
#if KDE_VERSION_MINOR < 1 #if TDE_VERSION_MINOR < 1
m_windowSaveToNewProfile_action->plugAccel( accel() ); m_windowSaveToNewProfile_action->plugAccel( accel() );
#endif #endif
@ -364,7 +364,7 @@ void BibleTime::initActions() {
); );
m_windowLoadProfile_action->setToolTip( CResMgr::mainMenu::window::loadProfile::tooltip ); m_windowLoadProfile_action->setToolTip( CResMgr::mainMenu::window::loadProfile::tooltip );
m_windowLoadProfile_action->setDelayed( false ); m_windowLoadProfile_action->setDelayed( false );
#if KDE_VERSION_MINOR < 1 #if TDE_VERSION_MINOR < 1
m_windowLoadProfile_action->plugAccel( accel() ); m_windowLoadProfile_action->plugAccel( accel() );
#endif #endif
@ -376,7 +376,7 @@ void BibleTime::initActions() {
); );
m_windowLoadProfile_action->setToolTip( CResMgr::mainMenu::window::deleteProfile::tooltip ); m_windowLoadProfile_action->setToolTip( CResMgr::mainMenu::window::deleteProfile::tooltip );
m_windowLoadProfile_action->setDelayed( false ); m_windowLoadProfile_action->setDelayed( false );
#if KDE_VERSION_MINOR < 1 #if TDE_VERSION_MINOR < 1
m_windowDeleteProfile_action->plugAccel( accel() ); m_windowDeleteProfile_action->plugAccel( accel() );
#endif #endif
@ -389,7 +389,7 @@ void BibleTime::initActions() {
); );
m_windowFullscreen_action->setToolTip( CResMgr::mainMenu::window::showFullscreen::tooltip ); m_windowFullscreen_action->setToolTip( CResMgr::mainMenu::window::showFullscreen::tooltip );
m_windowFullscreen_action->setShortcutConfigurable(true); m_windowFullscreen_action->setShortcutConfigurable(true);
#if KDE_VERSION_MINOR < 1 #if TDE_VERSION_MINOR < 1
m_windowFullscreen_action->plugAccel( accel() ); m_windowFullscreen_action->plugAccel( accel() );
#endif #endif
@ -418,7 +418,7 @@ void BibleTime::initActions() {
); );
action->setToolTip( CResMgr::mainMenu::help::handbook::tooltip ); action->setToolTip( CResMgr::mainMenu::help::handbook::tooltip );
#if KDE_VERSION_MINOR < 1 #if TDE_VERSION_MINOR < 1
action->plugAccel( accel() ); action->plugAccel( accel() );
#endif #endif
@ -431,7 +431,7 @@ void BibleTime::initActions() {
); );
action->setToolTip( CResMgr::mainMenu::help::bibleStudyHowTo::tooltip ); action->setToolTip( CResMgr::mainMenu::help::bibleStudyHowTo::tooltip );
#if KDE_VERSION_MINOR < 1 #if TDE_VERSION_MINOR < 1
action->plugAccel( accel() ); action->plugAccel( accel() );
#endif #endif
@ -449,7 +449,7 @@ void BibleTime::initActions() {
} }
action = KStdAction::reportBug(m_helpMenu, TQT_SLOT(reportBug()), actionCollection()); action = KStdAction::reportBug(m_helpMenu, TQT_SLOT(reportBug()), actionCollection());
action->setToolTip(CResMgr::mainMenu::help::bugreport::tooltip); action->setToolTip(CResMgr::mainMenu::help::bugreport::tooltip);
#if KDE_VERSION_MINOR < 1 #if TDE_VERSION_MINOR < 1
action->plugAccel( accel() ); action->plugAccel( accel() );
#endif #endif
@ -461,7 +461,7 @@ void BibleTime::initActions() {
CResMgr::mainMenu::help::dailyTip::actionName CResMgr::mainMenu::help::dailyTip::actionName
); );
action->setToolTip(CResMgr::mainMenu::help::dailyTip::tooltip); action->setToolTip(CResMgr::mainMenu::help::dailyTip::tooltip);
#if KDE_VERSION_MINOR < 1 #if TDE_VERSION_MINOR < 1
action->plugAccel( accel() ); action->plugAccel( accel() );
#endif #endif

2
bibletime/frontend/cbtconfig.cpp
Unescape View File

@ -27,7 +27,7 @@
//KDE includes //KDE includes
#include <kdeversion.h> #include <kdeversion.h>
#include <kapplication.h> #include <kapplication.h>
#if KDE_VERSION >= 0x030200 #if TDE_VERSION >= 0x030200
#include <kactioncollection.h> #include <kactioncollection.h>
#else #else
#include <kaction.h> #include <kaction.h>

4
bibletime/frontend/display/chtmlreaddisplay.cpp
Unescape View File

@ -35,7 +35,7 @@
#include <tqpopupmenu.h> #include <tqpopupmenu.h>
#include <tqlayout.h> #include <tqlayout.h>
#include <tqtimer.h> #include <tqtimer.h>
#if KDE_VERSION < 0x030300 #if TDE_VERSION < 0x030300
//We will need to show the error message. //We will need to show the error message.
#include <tqmessagebox.h> #include <tqmessagebox.h>
#endif #endif
@ -494,7 +494,7 @@ void CHTMLReadDisplay::zoomOut() {
} }
void CHTMLReadDisplay::openFindTextDialog() { void CHTMLReadDisplay::openFindTextDialog() {
#if KDE_VERSION >= 0x030300 #if TDE_VERSION >= 0x030300
findText(); findText();
#else #else
TQMessageBox::information(0, "Not Supported", TQMessageBox::information(0, "Not Supported",

2
bibletime/frontend/displaywindow/cbookreadwindow.cpp
Unescape View File

@ -147,7 +147,7 @@ void CBookReadWindow::initToolbars() {
action->plug(buttonsToolBar()); action->plug(buttonsToolBar());
} }
#if KDE_VERSION_MINOR < 1 #if TDE_VERSION_MINOR < 1
action->plugAccel( accel() ); action->plugAccel( accel() );
#endif #endif
} }

2
bibletime/frontend/displaywindow/cdisplaywindow.cpp
Unescape View File

@ -77,7 +77,7 @@ CWriteWindow* CDisplayWindow::createWriteInstance(ListCSwordModuleInfo modules,
} }
CDisplayWindow::CDisplayWindow(ListCSwordModuleInfo modules, CMDIArea *parent, const char *name ) CDisplayWindow::CDisplayWindow(ListCSwordModuleInfo modules, CMDIArea *parent, const char *name )
#if KDE_VERSION >= 0x030200 #if TDE_VERSION >= 0x030200
: KMainWindow(KMainWindow::NoDCOPObject, parent, name, WDestructiveClose), : KMainWindow(KMainWindow::NoDCOPObject, parent, name, WDestructiveClose),
#else #else
: KMainWindow(parent, name, WDestructiveClose), : KMainWindow(parent, name, WDestructiveClose),

2
bibletime/frontend/displaywindow/clexiconreadwindow.cpp
Unescape View File

@ -188,7 +188,7 @@ void CLexiconReadWindow::initToolbars() {
if (action) { if (action) {
action->plug(buttonsToolBar()); action->plug(buttonsToolBar());
} }
#if KDE_VERSION_MINOR < 1 #if TDE_VERSION_MINOR < 1
action->plugAccel( accel() ); action->plugAccel( accel() );
#endif #endif

Write Preview
Loading…
Cancel
Save