diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:10:41 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:10:41 -0600 |
| commit | 7422cac1a18dca897d3830a267eb91683d05a95b (patch) | |
| tree | 2ba309f49b47a5fbb0b226801b224c2532b7ab1a /kexi/main | |
| parent | 3fe437def8063926892bddf2dcc733861308836d (diff) | |
| download | koffice-7422cac1a18dca897d3830a267eb91683d05a95b.tar.gz koffice-7422cac1a18dca897d3830a267eb91683d05a95b.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kexi/main')
| -rw-r--r-- | kexi/main/keximainwindowimpl.cpp | 12 | ||||
| -rw-r--r-- | kexi/main/kexistatusbar.cpp | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp index 4135421d..b3d36240 100644 --- a/kexi/main/keximainwindowimpl.cpp +++ b/kexi/main/keximainwindowimpl.cpp @@ -48,7 +48,7 @@ #include <kedittoolbar.h> #include <tdeversion.h> #include <kglobalsettings.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <ktip.h> #include <kstandarddirs.h> #include <kpushbutton.h> @@ -250,7 +250,7 @@ KexiMainWindowImpl::KexiMainWindowImpl() resize (kMin (s.width(), desk.width()), kMin(s.height(), desk.height())); } - setManagedDockPositionModeEnabled(true);//TODO(js): remove this if will be default in kmdi :) + setManagedDockPositionModeEnabled(true);//TODO(js): remove this if will be default in tdemdi :) manager()->setSplitterHighResolution(true); manager()->setSplitterKeepSize(true); setStandardMDIMenuEnabled(false); @@ -316,9 +316,9 @@ KexiMainWindowImpl::KexiMainWindowImpl() //disabled (possible crash) d->hideMenuItem("file", i18n("&Import"), true); //disabled (possible crash) d->hideMenuItem("help", i18n( "&Report Bug..." ), true); #endif - KAction *kmdi_tooldock_menu_action = childClients()->getFirst() ? childClients()->getFirst()->actionCollection()->action("kmdi_tooldock_menu") : 0; - if (kmdi_tooldock_menu_action) { - kmdi_tooldock_menu_action->setEnabled(false); + KAction *tdemdi_tooldock_menu_action = childClients()->getFirst() ? childClients()->getFirst()->actionCollection()->action("tdemdi_tooldock_menu") : 0; + if (tdemdi_tooldock_menu_action) { + tdemdi_tooldock_menu_action->setEnabled(false); } if (!isFakingSDIApplication()/* && !userMode()*/) { @@ -2235,7 +2235,7 @@ KexiMainWindowImpl::registerChild(KexiDialogBase *dlg) } kdDebug() << "KexiMainWindowImpl::registerChild() ID = " << dlg->id() << endl; - if (m_mdiMode==KMdi::ToplevelMode || m_mdiMode==KMdi::ChildframeMode) {//kmdi fix + if (m_mdiMode==KMdi::ToplevelMode || m_mdiMode==KMdi::ChildframeMode) {//tdemdi fix //js TODO: check if taskbar is switched in menu if (m_pTaskBar && !m_pTaskBar->isSwitchedOn()) m_pTaskBar->switchOn(true); diff --git a/kexi/main/kexistatusbar.cpp b/kexi/main/kexistatusbar.cpp index 2245f23c..85468e1d 100644 --- a/kexi/main/kexistatusbar.cpp +++ b/kexi/main/kexistatusbar.cpp @@ -31,11 +31,11 @@ #include <kdebug.h> #include <kglobalsettings.h> #include <klocale.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #if KexitStatusBar_KTEXTEDITOR_USED -#include <ktexteditor/viewcursorinterface.h> -#include <ktexteditor/viewstatusmsginterface.h> +#include <tdetexteditor/viewcursorinterface.h> +#include <tdetexteditor/viewstatusmsginterface.h> #endif KexitStatusBar::KexitStatusBar(TQWidget *parent, const char *name) |