diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-26 20:24:48 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-26 20:24:48 -0600 |
| commit | ce48650b8741a7beef1703080bd0f8f36a02c75e (patch) | |
| tree | f8861052797f13c0ecb7e068077734d3b99666f2 | |
| parent | 1aa0bb45dc0a8f890f1419d01ca3b9328ad03f4a (diff) | |
| download | tdegraphics-ce48650b8741a7beef1703080bd0f8f36a02c75e.tar.gz tdegraphics-ce48650b8741a7beef1703080bd0f8f36a02c75e.zip | |
Rename KDE_MAKE_VERSION and update TDE version string
| -rw-r--r-- | kghostview/kgv_miniwidget.cpp | 4 | ||||
| -rw-r--r-- | kghostview/kgvshell.cpp | 6 | ||||
| -rw-r--r-- | kuickshow/src/kuickfile.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/kghostview/kgv_miniwidget.cpp b/kghostview/kgv_miniwidget.cpp index c5bbdedf..3e108866 100644 --- a/kghostview/kgv_miniwidget.cpp +++ b/kghostview/kgv_miniwidget.cpp @@ -29,7 +29,7 @@ #include <kmessagebox.h> // KLineEditDlg is depricated as of 3.2. use KInputDialog instead -#if TDE_VERSION >= KDE_MAKE_VERSION(3,1,90) +#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90) #include <kinputdialog.h> #else #include <tqvalidator.h> @@ -115,7 +115,7 @@ void KGVMiniWidget::setPSWidget( KPSWidget* psWidget ) void KGVMiniWidget::goToPage() { -#if TDE_VERSION >= KDE_MAKE_VERSION(3,1,90) +#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90) int num; bool ok = false; num = KInputDialog::getInteger(i18n("Go to Page"), i18n("Page:"), 1, diff --git a/kghostview/kgvshell.cpp b/kghostview/kgvshell.cpp index 7f099032..d6a2fe4f 100644 --- a/kghostview/kgvshell.cpp +++ b/kghostview/kgvshell.cpp @@ -85,12 +85,12 @@ KGVShell::KGVShell() : _showMenuBarAction = KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT( slotShowMenubar() ), actionCollection() ); /*---- Settings -------------------------------------------------------*/ -#if TDE_VERSION >= KDE_MAKE_VERSION(3,1,90) +#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90) createStandardStatusBarAction(); #endif setAutoSaveSettings(); setStandardToolBarMenuEnabled(true); -#if TDE_VERSION >= KDE_MAKE_VERSION(3,1,90) +#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90) m_fullScreenAction = KStdAction::fullScreen( TQT_TQOBJECT(this), TQT_SLOT( slotUpdateFullScreen() ), actionCollection(), this ); #else m_fullScreenAction = new KToggleAction( this, TQT_SLOT( slotUpdateFullScreen() ) ); @@ -338,7 +338,7 @@ void KGVShell::slotUpdateFullScreen() kapp->removeEventFilter( m_fsFilter ); m_gvpart->updateFullScreen( false ); menuBar()->show(); -#if TDE_VERSION >= KDE_MAKE_VERSION(3,1,90) +#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90) KToggleAction *statusbarAction = dynamic_cast<KToggleAction *>(actionCollection()->action(KStdAction::name(KStdAction::ShowStatusbar))); assert( statusbarAction ); if (statusbarAction->isChecked()) statusBar()->show(); diff --git a/kuickshow/src/kuickfile.cpp b/kuickshow/src/kuickfile.cpp index 247e56a8..a48c27db 100644 --- a/kuickshow/src/kuickfile.cpp +++ b/kuickshow/src/kuickfile.cpp @@ -160,7 +160,7 @@ void KuickFile::slotResult( KIO::Job *job ) if ( m_progress ) { m_progress->setProgress( 100 ); -#define BUGGY_VERSION KDE_MAKE_VERSION(3,5,2) +#define BUGGY_VERSION TDE_MAKE_VERSION(3,5,2) if ( KDE::version() <= BUGGY_VERSION ) { m_progress->topLevelWidget()->hide(); // ### workaround broken KProgressDialog } |