diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-26 20:07:39 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-26 20:07:39 -0600 |
| commit | 4163a7bc764c85387ab50a0a9042401aac430547 (patch) | |
| tree | c2ede39f3fbc7e64aa67e9823aa37182289e22c3 /kexi/main | |
| parent | 039393e199a49b5158929668908f9cb1fe226484 (diff) | |
| download | koffice-4163a7bc764c85387ab50a0a9042401aac430547.tar.gz koffice-4163a7bc764c85387ab50a0a9042401aac430547.zip | |
Rename KDE_MAKE_VERSION and update TDE version string
Diffstat (limited to 'kexi/main')
| -rw-r--r-- | kexi/main/keximainwindowimpl_p.h | 2 | ||||
| -rw-r--r-- | kexi/main/kexistatusbar.cpp | 6 | ||||
| -rw-r--r-- | kexi/main/kexistatusbar.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/kexi/main/keximainwindowimpl_p.h b/kexi/main/keximainwindowimpl_p.h index b3d60b89..d95107c0 100644 --- a/kexi/main/keximainwindowimpl_p.h +++ b/kexi/main/keximainwindowimpl_p.h @@ -290,7 +290,7 @@ void updatePropEditorDockWidthInfo() { // ds->setKeepSize(true); config->setGroup("MainWindow"); -# if TDE_VERSION >= KDE_MAKE_VERSION(3,4,0) +# if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0) if (wasAutoOpen) //(dw2->isVisible()) // ds->setSeparatorPosInPercent( 100 * nav->width() / wnd->width() ); diff --git a/kexi/main/kexistatusbar.cpp b/kexi/main/kexistatusbar.cpp index 02778208..2245f23c 100644 --- a/kexi/main/kexistatusbar.cpp +++ b/kexi/main/kexistatusbar.cpp @@ -80,7 +80,7 @@ void KexitStatusBar::activePartChanged(KParts::Part *part) connect( part->widget(), TQT_SIGNAL( viewStatusMsg( const TQString & ) ), this, TQT_SLOT( setStatus( const TQString & ) ) ); -# if TDE_VERSION < KDE_MAKE_VERSION(3,1,90) +# if TDE_VERSION < TDE_MAKE_VERSION(3,1,90) changeItem(m_map[ m_activePart ], m_msgID); // m_status->setText( m_map[ m_activePart ] ); # endif @@ -116,8 +116,8 @@ void KexitStatusBar::setStatus(const TQString &str) // m_status->setText(str); changeItem(str, m_msgID); -#if defined(KDE_MAKE_VERSION) -# if TDE_VERSION < KDE_MAKE_VERSION(3,1,90) +#if defined(TDE_MAKE_VERSION) +# if TDE_VERSION < TDE_MAKE_VERSION(3,1,90) m_map[m_activePart] = str; # endif #endif diff --git a/kexi/main/kexistatusbar.h b/kexi/main/kexistatusbar.h index 0d20e0a8..6f415af3 100644 --- a/kexi/main/kexistatusbar.h +++ b/kexi/main/kexistatusbar.h @@ -67,8 +67,8 @@ class KexitStatusBar : public KStatusBar KParts::Part *m_activePart; // still hoping for a fix for KDE-3.1 -#if defined(KDE_MAKE_VERSION) -# if TDE_VERSION < KDE_MAKE_VERSION(3,1,90) +#if defined(TDE_MAKE_VERSION) +# if TDE_VERSION < TDE_MAKE_VERSION(3,1,90) TQMap<KParts::Part*, TQString> m_map; # endif #endif |