summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bibletime/bibletime.cpp2
-rw-r--r--bibletime/bibletime_init.cpp52
-rw-r--r--bibletime/frontend/cbtconfig.cpp2
-rw-r--r--bibletime/frontend/display/chtmlreaddisplay.cpp4
-rw-r--r--bibletime/frontend/displaywindow/cbookreadwindow.cpp2
-rw-r--r--bibletime/frontend/displaywindow/cdisplaywindow.cpp2
-rw-r--r--bibletime/frontend/displaywindow/clexiconreadwindow.cpp2
7 files changed, 33 insertions, 33 deletions
diff --git a/bibletime/bibletime.cpp b/bibletime/bibletime.cpp
index 649823b..6333885 100644
--- a/bibletime/bibletime.cpp
+++ b/bibletime/bibletime.cpp
@@ -55,7 +55,7 @@ using namespace Profile;
BibleTime::BibleTime()
: BibleTimeInterface("BibleTimeInterface"),
-#if KDE_VERSION >= 0x030200
+#if TDE_VERSION >= 0x030200
KMainWindow(KMainWindow::NoDCOPObject, 0,0, WType_TopLevel),
#else
KMainWindow(0,0, WType_TopLevel),
diff --git a/bibletime/bibletime_init.cpp b/bibletime/bibletime_init.cpp
index d8b6083..944c7a3 100644
--- a/bibletime/bibletime_init.cpp
+++ b/bibletime/bibletime_init.cpp
@@ -107,7 +107,7 @@ void BibleTime::initActions() {
action = KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT( quit() ), actionCollection());
action->setToolTip( CResMgr::mainMenu::file::quit::tooltip );
- #if KDE_VERSION_MINOR < 1
+ #if TDE_VERSION_MINOR < 1
action->plugAccel( accel() );
#endif
@@ -120,7 +120,7 @@ void BibleTime::initActions() {
);
action->setToolTip( CResMgr::mainMenu::mainIndex::search::tooltip );
- #if KDE_VERSION_MINOR < 1
+ #if TDE_VERSION_MINOR < 1
action->plugAccel( accel() );
#endif
@@ -133,7 +133,7 @@ void BibleTime::initActions() {
);
action->setToolTip( CResMgr::mainMenu::mainIndex::searchdefaultbible::tooltip );
- #if KDE_VERSION_MINOR < 1
+ #if TDE_VERSION_MINOR < 1
action->plugAccel( accel() );
#endif
@@ -141,7 +141,7 @@ void BibleTime::initActions() {
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
+ #if TDE_VERSION_MINOR < 1
m_viewToolbar_action->plugAccel( accel() );
#endif
@@ -154,7 +154,7 @@ void BibleTime::initActions() {
CResMgr::mainMenu::view::showMainIndex::actionName);
m_viewMainIndex_action->setToolTip( CResMgr::mainMenu::view::showMainIndex::tooltip );
- #if KDE_VERSION_MINOR < 1
+ #if TDE_VERSION_MINOR < 1
m_viewMainIndex_action->plugAccel( accel() );
#endif
@@ -166,7 +166,7 @@ void BibleTime::initActions() {
CResMgr::mainMenu::view::showInfoDisplay::actionName);
m_viewMainIndex_action->setToolTip( CResMgr::mainMenu::view::showInfoDisplay::tooltip );
- #if KDE_VERSION_MINOR < 1
+ #if TDE_VERSION_MINOR < 1
m_viewInfoDisplay_action->plugAccel( accel() );
#endif
@@ -174,7 +174,7 @@ void BibleTime::initActions() {
action = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT( slotSettingsOptions() ), actionCollection());
action->setToolTip( CResMgr::mainMenu::settings::optionsDialog::tooltip );
- #if KDE_VERSION_MINOR < 1
+ #if TDE_VERSION_MINOR < 1
action->plugAccel( accel() );
#endif
@@ -186,7 +186,7 @@ void BibleTime::initActions() {
CResMgr::mainMenu::settings::swordSetupDialog::actionName
);
action->setToolTip( CResMgr::mainMenu::settings::swordSetupDialog::tooltip );
- #if KDE_VERSION_MINOR < 1
+ #if TDE_VERSION_MINOR < 1
action->plugAccel( accel() );
#endif
@@ -200,7 +200,7 @@ void BibleTime::initActions() {
}
action = KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT( slotSettingsToolbar() ), actionCollection());
action->setToolTip( CResMgr::mainMenu::settings::editToolBar::tooltip );
- #if KDE_VERSION_MINOR < 1
+ #if TDE_VERSION_MINOR < 1
action->plugAccel( accel() );
#endif
@@ -220,7 +220,7 @@ void BibleTime::initActions() {
m_windowManualMode_action->setToolTip(
CResMgr::mainMenu::window::arrangementMode::manual::tooltip
);
- #if KDE_VERSION_MINOR < 1
+ #if TDE_VERSION_MINOR < 1
m_windowManualMode_action->plugAccel( accel() );
#endif
@@ -237,7 +237,7 @@ void BibleTime::initActions() {
m_windowAutoTileVertical_action->setToolTip(
CResMgr::mainMenu::window::arrangementMode::autoTileVertical::tooltip
);
- #if KDE_VERSION_MINOR < 1
+ #if TDE_VERSION_MINOR < 1
m_windowAutoTileVertical_action->plugAccel( accel() );
#endif
@@ -254,7 +254,7 @@ void BibleTime::initActions() {
m_windowAutoTileHorizontal_action->setToolTip(
CResMgr::mainMenu::window::arrangementMode::autoTileHorizontal::tooltip
);
- #if KDE_VERSION_MINOR < 1
+ #if TDE_VERSION_MINOR < 1
m_windowAutoTileHorizontal_action->plugAccel( accel() );
#endif
@@ -271,7 +271,7 @@ void BibleTime::initActions() {
m_windowAutoCascade_action->setToolTip(
CResMgr::mainMenu::window::arrangementMode::autoCascade::tooltip
);
- #if KDE_VERSION_MINOR < 1
+ #if TDE_VERSION_MINOR < 1
// qWarning("Plug accel");
m_windowAutoCascade_action->plugAccel( accel() );
#endif
@@ -286,7 +286,7 @@ void BibleTime::initActions() {
);
m_windowCascade_action->setToolTip( CResMgr::mainMenu::window::cascade::tooltip );
- #if KDE_VERSION_MINOR < 1
+ #if TDE_VERSION_MINOR < 1
m_windowCascade_action->plugAccel( accel() );
#endif
@@ -299,7 +299,7 @@ void BibleTime::initActions() {
CResMgr::mainMenu::window::tileVertical::actionName
);
m_windowTileVertical_action->setToolTip( CResMgr::mainMenu::window::tileVertical::tooltip );
- #if KDE_VERSION_MINOR < 1
+ #if TDE_VERSION_MINOR < 1
m_windowTileVertical_action->plugAccel( accel() );
#endif
@@ -312,7 +312,7 @@ void BibleTime::initActions() {
);
m_windowTileHorizontal_action->setToolTip( CResMgr::mainMenu::window::tileHorizontal::tooltip );
- #if KDE_VERSION_MINOR < 1
+ #if TDE_VERSION_MINOR < 1
m_windowTileHorizontal_action->plugAccel( accel() );
#endif
@@ -325,7 +325,7 @@ void BibleTime::initActions() {
CResMgr::mainMenu::window::closeAll::actionName
);
m_windowCloseAll_action->setToolTip( CResMgr::mainMenu::window::closeAll::tooltip );
- #if KDE_VERSION_MINOR < 1
+ #if TDE_VERSION_MINOR < 1
m_windowCloseAll_action->plugAccel( accel() );
#endif
@@ -338,7 +338,7 @@ void BibleTime::initActions() {
);
m_windowSaveProfile_action->setToolTip( CResMgr::mainMenu::window::saveProfile::tooltip );
m_windowSaveProfile_action->setDelayed( false );
- #if KDE_VERSION_MINOR < 1
+ #if TDE_VERSION_MINOR < 1
m_windowSaveProfile_action->plugAccel( accel() );
#endif
@@ -351,7 +351,7 @@ void BibleTime::initActions() {
CResMgr::mainMenu::window::saveToNewProfile::actionName
);
m_windowSaveToNewProfile_action->setToolTip( CResMgr::mainMenu::window::saveToNewProfile::tooltip );
- #if KDE_VERSION_MINOR < 1
+ #if TDE_VERSION_MINOR < 1
m_windowSaveToNewProfile_action->plugAccel( accel() );
#endif
@@ -364,7 +364,7 @@ void BibleTime::initActions() {
);
m_windowLoadProfile_action->setToolTip( CResMgr::mainMenu::window::loadProfile::tooltip );
m_windowLoadProfile_action->setDelayed( false );
- #if KDE_VERSION_MINOR < 1
+ #if TDE_VERSION_MINOR < 1
m_windowLoadProfile_action->plugAccel( accel() );
#endif
@@ -376,7 +376,7 @@ void BibleTime::initActions() {
);
m_windowLoadProfile_action->setToolTip( CResMgr::mainMenu::window::deleteProfile::tooltip );
m_windowLoadProfile_action->setDelayed( false );
- #if KDE_VERSION_MINOR < 1
+ #if TDE_VERSION_MINOR < 1
m_windowDeleteProfile_action->plugAccel( accel() );
#endif
@@ -389,7 +389,7 @@ void BibleTime::initActions() {
);
m_windowFullscreen_action->setToolTip( CResMgr::mainMenu::window::showFullscreen::tooltip );
m_windowFullscreen_action->setShortcutConfigurable(true);
- #if KDE_VERSION_MINOR < 1
+ #if TDE_VERSION_MINOR < 1
m_windowFullscreen_action->plugAccel( accel() );
#endif
@@ -418,7 +418,7 @@ void BibleTime::initActions() {
);
action->setToolTip( CResMgr::mainMenu::help::handbook::tooltip );
- #if KDE_VERSION_MINOR < 1
+ #if TDE_VERSION_MINOR < 1
action->plugAccel( accel() );
#endif
@@ -431,7 +431,7 @@ void BibleTime::initActions() {
);
action->setToolTip( CResMgr::mainMenu::help::bibleStudyHowTo::tooltip );
- #if KDE_VERSION_MINOR < 1
+ #if TDE_VERSION_MINOR < 1
action->plugAccel( accel() );
#endif
@@ -449,7 +449,7 @@ void BibleTime::initActions() {
}
action = KStdAction::reportBug(m_helpMenu, TQT_SLOT(reportBug()), actionCollection());
action->setToolTip(CResMgr::mainMenu::help::bugreport::tooltip);
- #if KDE_VERSION_MINOR < 1
+ #if TDE_VERSION_MINOR < 1
action->plugAccel( accel() );
#endif
@@ -461,7 +461,7 @@ void BibleTime::initActions() {
CResMgr::mainMenu::help::dailyTip::actionName
);
action->setToolTip(CResMgr::mainMenu::help::dailyTip::tooltip);
- #if KDE_VERSION_MINOR < 1
+ #if TDE_VERSION_MINOR < 1
action->plugAccel( accel() );
#endif
diff --git a/bibletime/frontend/cbtconfig.cpp b/bibletime/frontend/cbtconfig.cpp
index 558a66b..89c30df 100644
--- a/bibletime/frontend/cbtconfig.cpp
+++ b/bibletime/frontend/cbtconfig.cpp
@@ -27,7 +27,7 @@
//KDE includes
#include <kdeversion.h>
#include <kapplication.h>
-#if KDE_VERSION >= 0x030200
+#if TDE_VERSION >= 0x030200
#include <kactioncollection.h>
#else
#include <kaction.h>
diff --git a/bibletime/frontend/display/chtmlreaddisplay.cpp b/bibletime/frontend/display/chtmlreaddisplay.cpp
index e549ec2..d7833b1 100644
--- a/bibletime/frontend/display/chtmlreaddisplay.cpp
+++ b/bibletime/frontend/display/chtmlreaddisplay.cpp
@@ -35,7 +35,7 @@
#include <tqpopupmenu.h>
#include <tqlayout.h>
#include <tqtimer.h>
-#if KDE_VERSION < 0x030300
+#if TDE_VERSION < 0x030300
//We will need to show the error message.
#include <tqmessagebox.h>
#endif
@@ -494,7 +494,7 @@ void CHTMLReadDisplay::zoomOut() {
}
void CHTMLReadDisplay::openFindTextDialog() {
-#if KDE_VERSION >= 0x030300
+#if TDE_VERSION >= 0x030300
findText();
#else
TQMessageBox::information(0, "Not Supported",
diff --git a/bibletime/frontend/displaywindow/cbookreadwindow.cpp b/bibletime/frontend/displaywindow/cbookreadwindow.cpp
index 4a2ec07..666df70 100644
--- a/bibletime/frontend/displaywindow/cbookreadwindow.cpp
+++ b/bibletime/frontend/displaywindow/cbookreadwindow.cpp
@@ -147,7 +147,7 @@ void CBookReadWindow::initToolbars() {
action->plug(buttonsToolBar());
}
- #if KDE_VERSION_MINOR < 1
+ #if TDE_VERSION_MINOR < 1
action->plugAccel( accel() );
#endif
}
diff --git a/bibletime/frontend/displaywindow/cdisplaywindow.cpp b/bibletime/frontend/displaywindow/cdisplaywindow.cpp
index a0dd45b..ae975f0 100644
--- a/bibletime/frontend/displaywindow/cdisplaywindow.cpp
+++ b/bibletime/frontend/displaywindow/cdisplaywindow.cpp
@@ -77,7 +77,7 @@ CWriteWindow* CDisplayWindow::createWriteInstance(ListCSwordModuleInfo modules,
}
CDisplayWindow::CDisplayWindow(ListCSwordModuleInfo modules, CMDIArea *parent, const char *name )
-#if KDE_VERSION >= 0x030200
+#if TDE_VERSION >= 0x030200
: KMainWindow(KMainWindow::NoDCOPObject, parent, name, WDestructiveClose),
#else
: KMainWindow(parent, name, WDestructiveClose),
diff --git a/bibletime/frontend/displaywindow/clexiconreadwindow.cpp b/bibletime/frontend/displaywindow/clexiconreadwindow.cpp
index 45c040d..4e1d2f0 100644
--- a/bibletime/frontend/displaywindow/clexiconreadwindow.cpp
+++ b/bibletime/frontend/displaywindow/clexiconreadwindow.cpp
@@ -188,7 +188,7 @@ void CLexiconReadWindow::initToolbars() {
if (action) {
action->plug(buttonsToolBar());
}
- #if KDE_VERSION_MINOR < 1
+ #if TDE_VERSION_MINOR < 1
action->plugAccel( accel() );
#endif
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-21 08:17:36 +0000