diff options
Diffstat (limited to 'src/utilities')
| -rw-r--r-- | src/utilities/cameragui/cameraui.cpp | 10 | ||||
| -rw-r--r-- | src/utilities/cameragui/renamecustomizer.cpp | 11 | ||||
| -rw-r--r-- | src/utilities/imageeditor/editor/editorwindow.cpp | 2 | ||||
| -rw-r--r-- | src/utilities/setup/setupcollections.cpp | 14 | ||||
| -rw-r--r-- | src/utilities/slideshow/slideshow.cpp | 8 |
5 files changed, 0 insertions, 45 deletions
diff --git a/src/utilities/cameragui/cameraui.cpp b/src/utilities/cameragui/cameraui.cpp index cc995dca..4190e14b 100644 --- a/src/utilities/cameragui/cameraui.cpp +++ b/src/utilities/cameragui/cameraui.cpp @@ -67,12 +67,7 @@ #include <kcalendarsystem.h> #include <kurllabel.h> #include <ksqueezedtextlabel.h> - -#if KDE_IS_VERSION(3,2,0) #include <kinputdialog.h> -#else -#include <klineeditdlg.h> -#endif // LibKDcraw includes. @@ -1063,12 +1058,7 @@ void CameraUI::slotUploadItems(const KURL::List& urls) TQString msg(i18n("Camera Folder <b>%1</b> already contains item <b>%2</b><br>" "Please enter a new file name (without extension):") .arg(cameraFolder).arg(fi.fileName())); -#if KDE_IS_VERSION(3,2,0) name = KInputDialog::getText(i18n("File already exists"), msg, name, &ok, this); - -#else - name = KLineEditDlg::getText(i18n("File already exists"), msg, name, &ok, this); -#endif if (!ok) return; } diff --git a/src/utilities/cameragui/renamecustomizer.cpp b/src/utilities/cameragui/renamecustomizer.cpp index 4d593959..433db21f 100644 --- a/src/utilities/cameragui/renamecustomizer.cpp +++ b/src/utilities/cameragui/renamecustomizer.cpp @@ -45,11 +45,7 @@ #include <klineedit.h> #include <knuminput.h> #include <kdialogbase.h> -#if KDE_IS_VERSION(3,2,0) #include <kinputdialog.h> -#else -#include <klineeditdlg.h> -#endif // Local includes. @@ -445,16 +441,9 @@ void RenameCustomizer::slotDateTimeButtonClicked() "<i>yyyy-MM-dd hh:mm:ss</i> " "for 2006-08-24 14:24:18.</p></qt>"); -#if KDE_IS_VERSION(3,2,0) TQString newFormat = KInputDialog::getText(i18n("Change Date and Time Format"), message, d->dateTimeFormatString, &ok, this); -#else - TQString newFormat = KLineEditDlg::getText(i18n("Change Date and Time Format"), - message, - d->dateTimeFormatString, &ok, this); -#endif - if (!ok) return; diff --git a/src/utilities/imageeditor/editor/editorwindow.cpp b/src/utilities/imageeditor/editor/editorwindow.cpp index 819627e1..623f6d6d 100644 --- a/src/utilities/imageeditor/editor/editorwindow.cpp +++ b/src/utilities/imageeditor/editor/editorwindow.cpp @@ -621,9 +621,7 @@ void EditorWindow::printImage(KURL url) TQString appName = tdeApp->aboutData()->appName(); printer.setDocName( url.filename() ); printer.setCreator( appName ); -#if KDE_IS_VERSION(3,2,0) printer.setUsePrinterResolution(true); -#endif KPrinter::addDialogPage( new ImageEditorPrintDialogPage(image, this, TQString(appName.append(" page")).ascii() )); diff --git a/src/utilities/setup/setupcollections.cpp b/src/utilities/setup/setupcollections.cpp index 10a25c31..e12dd6cb 100644 --- a/src/utilities/setup/setupcollections.cpp +++ b/src/utilities/setup/setupcollections.cpp @@ -46,12 +46,7 @@ #include <tdemessagebox.h> #include <kiconloader.h> #include <tdeversion.h> - -#if KDE_IS_VERSION(3,2,0) #include <kinputdialog.h> -#else -#include <klineeditdlg.h> -#endif // Local includes. @@ -174,19 +169,10 @@ void SetupCollections::slotCollectionSelectionChanged() void SetupCollections::slotAddCollection() { bool ok; - -#if KDE_IS_VERSION(3,2,0) TQString newCollection = KInputDialog::getText(i18n("New Collection Name"), i18n("Enter new collection name:"), TQString(), &ok, this); -#else - TQString newCollection = - KLineEditDlg::getText(i18n("New Collection Name"), - i18n("Enter new collection name:"), - TQString(), &ok, this); -#endif - if (!ok) return; bool found = false; diff --git a/src/utilities/slideshow/slideshow.cpp b/src/utilities/slideshow/slideshow.cpp index 08a4f997..4c4662c5 100644 --- a/src/utilities/slideshow/slideshow.cpp +++ b/src/utilities/slideshow/slideshow.cpp @@ -103,19 +103,11 @@ SlideShow::SlideShow(const SlideShowSettings& settings) // --------------------------------------------------------------- -#if KDE_IS_VERSION(3,2,0) TQRect deskRect = TDEGlobalSettings::desktopGeometry(this); d->deskX = deskRect.x(); d->deskY = deskRect.y(); d->deskWidth = deskRect.width(); d->deskHeight = deskRect.height(); -#else - TQRect deskRect = TQApplication::desktop()->screenGeometry(this); - d->deskX = deskRect.x(); - d->deskY = deskRect.y(); - d->deskWidth = deskRect.width(); - d->deskHeight = deskRect.height(); -#endif move(d->deskX, d->deskY); resize(d->deskWidth, d->deskHeight); |