diff options
Diffstat (limited to 'kghostview')
| -rw-r--r-- | kghostview/kgv_miniwidget.cpp | 18 | ||||
| -rw-r--r-- | kghostview/kgvshell.cpp | 8 |
2 files changed, 1 insertions, 25 deletions
diff --git a/kghostview/kgv_miniwidget.cpp b/kghostview/kgv_miniwidget.cpp index e7d391b4..bad774f2 100644 --- a/kghostview/kgv_miniwidget.cpp +++ b/kghostview/kgv_miniwidget.cpp @@ -24,18 +24,9 @@ #include <tdeconfig.h> #include <kdebug.h> #include <tdeinstance.h> -#include <tdeversion.h> #include <tdelocale.h> #include <tdemessagebox.h> - -// KLineEditDlg is depricated as of 3.2. use KInputDialog instead -#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90) - #include <kinputdialog.h> -#else - #include <tqvalidator.h> - #include <tqwidget.h> - #include <klineeditdlg.h> -#endif +#include <kinputdialog.h> #include <config.h> #include <stdlib.h> @@ -115,18 +106,11 @@ void KGVMiniWidget::setPSWidget( KPSWidget* psWidget ) void KGVMiniWidget::goToPage() { -#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90) int num; bool ok = false; num = KInputDialog::getInteger(i18n("Go to Page"), i18n("Page:"), 1, 1, dsc()->page_count(), 1, 10, &ok, _part->widget()); if (ok) goToPage( num-1 ); -#else - TQString num; - bool b = false; - num = KLineEditDlg::getText(i18n("Go to Page"), i18n("Page:"), TQString(), &b, _part->widget(), new TQIntValidator(1, dsc()->page_count(), this)); - if (b) goToPage( num.toInt() - 1 ); -#endif } void KGVMiniWidget::info() diff --git a/kghostview/kgvshell.cpp b/kghostview/kgvshell.cpp index 8217ce47..f2ac7b65 100644 --- a/kghostview/kgvshell.cpp +++ b/kghostview/kgvshell.cpp @@ -85,16 +85,10 @@ KGVShell::KGVShell() : _showMenuBarAction = KStdAction::showMenubar( this, TQ_SLOT( slotShowMenubar() ), actionCollection() ); /*---- Settings -------------------------------------------------------*/ -#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90) createStandardStatusBarAction(); -#endif setAutoSaveSettings(); setStandardToolBarMenuEnabled(true); -#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90) m_fullScreenAction = KStdAction::fullScreen( this, TQ_SLOT( slotUpdateFullScreen() ), actionCollection(), this ); -#else - m_fullScreenAction = new TDEToggleAction( this, TQ_SLOT( slotUpdateFullScreen() ) ); -#endif KStdAction::configureToolbars( this, TQ_SLOT( slotConfigureToolbars() ), actionCollection() ); KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); @@ -338,11 +332,9 @@ void KGVShell::slotUpdateFullScreen() kapp->removeEventFilter( m_fsFilter ); m_gvpart->updateFullScreen( false ); menuBar()->show(); -#if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90) TDEToggleAction *statusbarAction = dynamic_cast<TDEToggleAction *>(actionCollection()->action(KStdAction::name(KStdAction::ShowStatusbar))); assert( statusbarAction ); if (statusbarAction->isChecked()) statusBar()->show(); -#endif toolBar()->show(); showNormal(); } |