summaryrefslogtreecommitdiffstats
path: root/kuickshow/src
diff options
context:
space:
mode:
Diffstat (limited to 'kuickshow/src')
-rw-r--r--kuickshow/src/filewidget.cpp3
-rw-r--r--kuickshow/src/imagewindow.cpp11
-rw-r--r--kuickshow/src/kuickfile.cpp5
-rw-r--r--kuickshow/src/kuickshow.cpp5
4 files changed, 1 insertions, 23 deletions
diff --git a/kuickshow/src/filewidget.cpp b/kuickshow/src/filewidget.cpp
index d65e98b4..3bb6834b 100644
--- a/kuickshow/src/filewidget.cpp
+++ b/kuickshow/src/filewidget.cpp
@@ -18,7 +18,6 @@
#include <tqkeycode.h>
-#include <tdeversion.h>
#include <tdeglobal.h>
#include <tdeglobalsettings.h>
#include <tdelocale.h>
@@ -42,9 +41,7 @@ FileWidget::FileWidget( const KURL& url, TQWidget *parent, const char *name )
{
setEnableDirHighlighting( true );
-#if TDE_VERSION >= 310
setViewConfig( TDEGlobal::config(), "Filebrowser" );
-#endif
readConfig( TDEGlobal::config(), "Filebrowser" );
setView( KFile::Default );
diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp
index f344dbc1..8b85a1cd 100644
--- a/kuickshow/src/imagewindow.cpp
+++ b/kuickshow/src/imagewindow.cpp
@@ -40,7 +40,6 @@
#include <tdeconfig.h>
#include <kcursor.h>
#include <kdebug.h>
-#include <tdeversion.h>
#ifdef KDE_USE_FINAL
#undef Unsorted
#endif
@@ -924,11 +923,7 @@ void ImageWindow::saveImage()
KuickData tmp;
TQCheckBox *keepSize = new TQCheckBox( i18n("Keep original image size"), 0L);
keepSize->setChecked( true );
- KFileDialog dlg( m_saveDirectory, tmp.fileFilter, this, "filedialog", true
-#if TDE_VERSION >= 310
- ,keepSize
-#endif
- );
+ KFileDialog dlg( m_saveDirectory, tmp.fileFilter, this, "filedialog", true ,keepSize);
TQString selection = m_saveDirectory.isEmpty() ?
m_kuim->url().url() :
@@ -961,10 +956,6 @@ void ImageWindow::saveImage()
TQString lastDir = dlg.baseURL().path(+1);
if ( lastDir != m_saveDirectory )
m_saveDirectory = lastDir;
-
-#if TDE_VERSION < 310
- delete keepSize;
-#endif
}
bool ImageWindow::saveImage( const KURL& dest, bool keepOriginalSize )
diff --git a/kuickshow/src/kuickfile.cpp b/kuickshow/src/kuickfile.cpp
index 18c80331..170ce317 100644
--- a/kuickshow/src/kuickfile.cpp
+++ b/kuickshow/src/kuickfile.cpp
@@ -1,7 +1,6 @@
#include <tqfile.h>
#include <kdebug.h>
-#include <tdeversion.h>
#include <tdeinstance.h>
#include <tdelocale.h>
#include <kprogress.h>
@@ -160,10 +159,6 @@ void KuickFile::slotResult( TDEIO::Job *job )
if ( m_progress ) {
m_progress->setProgress( 100 );
-#define BUGGY_VERSION TDE_MAKE_VERSION(3,5,2)
- if ( KDE::version() <= BUGGY_VERSION ) {
- m_progress->topLevelWidget()->hide(); // ### workaround broken KProgressDialog
- }
}
}
}
diff --git a/kuickshow/src/kuickshow.cpp b/kuickshow/src/kuickshow.cpp
index 13d0a8f2..44c3d9d4 100644
--- a/kuickshow/src/kuickshow.cpp
+++ b/kuickshow/src/kuickshow.cpp
@@ -35,7 +35,6 @@
#include <tdecmdlineargs.h>
#include <tdeconfig.h>
#include <kcursor.h>
-#include <tdeversion.h>
#include <tdefiledialog.h>
#include <tdefilemetainfo.h>
#include <tdeglobal.h>
@@ -1125,9 +1124,6 @@ void KuickShow::about()
aboutWidget->adjustSize();
-#if TDE_VERSION >= 310
- KDialog::centerOnScreen( aboutWidget );
-#else
// Not fixed because it must be dead code now.
TQDesktopWidget *desktop = TQApplication::desktop();
int screen = desktop->screenNumber( aboutWidget );
@@ -1137,7 +1133,6 @@ void KuickShow::about()
TQRect r = desktop->screenGeometry( screen );
aboutWidget->move( r.center().x() - aboutWidget->width()/2,
r.center().y() - aboutWidget->height()/2 );
-#endif
aboutWidget->show();
}