From c36efb27b78c406ac69064efa57480ae0edc9120 Mon Sep 17 00:00:00 2001 From: Alberto Villa Date: Wed, 9 Nov 2011 11:02:43 +0100 Subject: [PATCH] Lower requirements to Qt 4.5 and KDE 4.3 It looks like there's still people running Qt 4.5: http://kdenlive.org/mantis/view.php?id=2303 --- CMakeLists.txt | 4 ++-- src/archivewidget.cpp | 2 -- src/customtrackview.cpp | 2 -- src/dvdwizardvob.cpp | 8 -------- src/dvdwizardvob.h | 7 ------- src/kdenlivesettingsdialog.cpp | 7 ------- src/monitor.cpp | 2 -- src/projectsettings.cpp | 2 -- src/recmonitor.cpp | 19 ------------------- src/recmonitor.h | 5 ----- src/titlewidget.cpp | 2 -- 11 files changed, 2 insertions(+), 58 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f85634ef..8b1e2c83 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,8 +7,8 @@ set(KDENLIVE_VERSION 0.8.3) # Minimum versions of main dependencies. set(LIBMLT_MIN_VERSION 0.7.6) -set(QT_MIN_VERSION 4.6.0) -set(KDE_MIN_VERSION 4.4.0) +set(QT_MIN_VERSION 4.5.0) +set(KDE_MIN_VERSION 4.3.0) set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) diff --git a/src/archivewidget.cpp b/src/archivewidget.cpp index 363781df..db2b9e8d 100644 --- a/src/archivewidget.cpp +++ b/src/archivewidget.cpp @@ -140,9 +140,7 @@ ArchiveWidget::ArchiveWidget(QString projectName, QDomDocument doc, QList = 0x040500 allFonts.removeDuplicates(); -#endif //TODO: fonts diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index 35b11c21..f5e7d91a 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -6420,9 +6420,7 @@ QStringList CustomTrackView::extractTransitionsLumas() if (!luma.isEmpty()) urls << KUrl(luma).path(); } } -#if QT_VERSION >= 0x040500 urls.removeDuplicates(); -#endif return urls; } diff --git a/src/dvdwizardvob.cpp b/src/dvdwizardvob.cpp index 68a2dfa3..ebc4b844 100644 --- a/src/dvdwizardvob.cpp +++ b/src/dvdwizardvob.cpp @@ -68,22 +68,16 @@ DvdWizardVob::DvdWizardVob(const QString &profile, QWidget *parent) : m_view.vobs_list->header()->setResizeMode(1, QHeaderView::Custom); m_view.vobs_list->header()->setResizeMode(2, QHeaderView::Custom); -#if KDE_IS_VERSION(4,2,0) m_capacityBar = new KCapacityBar(KCapacityBar::DrawTextInline, this); QHBoxLayout *layout = new QHBoxLayout; layout->addWidget(m_capacityBar); m_view.size_box->setLayout(layout); -#else - m_view.size_box->setHidden(true); -#endif slotCheckVobList(); } DvdWizardVob::~DvdWizardVob() { -#if KDE_IS_VERSION(4,2,0) delete m_capacityBar; -#endif } @@ -300,7 +294,6 @@ void DvdWizardVob::slotCheckVobList() if (hasItem && m_view.vobs_list->indexOfTopLevelItem(item) == max - 1) m_view.button_down->setEnabled(false); else m_view.button_down->setEnabled(hasItem); -#if KDE_IS_VERSION(4,2,0) qint64 totalSize = 0; for (int i = 0; i < max; i++) { item = m_view.vobs_list->topLevelItem(i); @@ -310,7 +303,6 @@ void DvdWizardVob::slotCheckVobList() qint64 maxSize = (qint64) 47000 * 100000; m_capacityBar->setValue(100 * totalSize / maxSize); m_capacityBar->setText(KIO::convertSize(totalSize)); -#endif } void DvdWizardVob::slotItemUp() diff --git a/src/dvdwizardvob.h b/src/dvdwizardvob.h index 58698cf0..aa024dd8 100644 --- a/src/dvdwizardvob.h +++ b/src/dvdwizardvob.h @@ -24,11 +24,7 @@ #include "ui_dvdwizardvob_ui.h" #include - -#if KDE_IS_VERSION(4,2,0) #include -#endif - #include #include @@ -57,10 +53,7 @@ public: private: Ui::DvdWizardVob_UI m_view; QString m_errorMessage; - -#if KDE_IS_VERSION(4,2,0) KCapacityBar *m_capacityBar; -#endif public slots: void slotAddVobFile(KUrl url = KUrl(), const QString &chapters = QString()); diff --git a/src/kdenlivesettingsdialog.cpp b/src/kdenlivesettingsdialog.cpp index a81bd553..d1a586d5 100644 --- a/src/kdenlivesettingsdialog.cpp +++ b/src/kdenlivesettingsdialog.cpp @@ -712,10 +712,7 @@ void KdenliveSettingsDialog::updateSettings() KdenliveSettings::setShuttlebuttons(maps); #endif -#if KDE_IS_VERSION(4,3,0) KConfigDialog::settingsChangedSlot(); -#endif - //KConfigDialog::updateSettings(); if (resetProfile) emit doResetProfile(); } @@ -801,17 +798,13 @@ void KdenliveSettingsDialog::slotShuttleModified() QString maps = JogShuttleConfig::actionMap(actions); m_shuttleModified = KdenliveSettings::shuttlebuttons() != maps; #endif -#if KDE_IS_VERSION(4,3,0) KConfigDialog::updateButtons(); -#endif } void KdenliveSettingsDialog::slotDialogModified() { m_modified = true; -#if KDE_IS_VERSION(4,3,0) KConfigDialog::updateButtons(); -#endif } //virtual diff --git a/src/monitor.cpp b/src/monitor.cpp index 905cad4a..1090112d 100644 --- a/src/monitor.cpp +++ b/src/monitor.cpp @@ -577,9 +577,7 @@ void Monitor::slotExtractCurrentFrame() KFileDialog *fs = new KFileDialog(KUrl(), "image/png", this); fs->setOperationMode(KFileDialog::Saving); fs->setMode(KFile::File); -#if KDE_IS_VERSION(4,2,0) fs->setConfirmOverwrite(true); -#endif fs->setKeepLocation(true); fs->exec(); QString path = fs->selectedFile(); diff --git a/src/projectsettings.cpp b/src/projectsettings.cpp index 08bda5a1..270845f3 100644 --- a/src/projectsettings.cpp +++ b/src/projectsettings.cpp @@ -298,9 +298,7 @@ void ProjectSettings::slotUpdateFiles(bool cacheOnly) usedSize += clip->fileSize(); } } -#if QT_VERSION >= 0x040500 allFonts.removeDuplicates(); -#endif // Hide unused categories for (int i = 0; i < files_list->topLevelItemCount(); i++) { if (files_list->topLevelItem(i)->childCount() == 0) { diff --git a/src/recmonitor.cpp b/src/recmonitor.cpp index a2b8906a..9ec0c442 100644 --- a/src/recmonitor.cpp +++ b/src/recmonitor.cpp @@ -35,11 +35,7 @@ #include #include #include - -#if KDE_IS_VERSION(4,2,0) #include -#endif - #include #include #include @@ -112,7 +108,6 @@ RecMonitor::RecMonitor(QString name, MonitorManager *manager, QWidget *parent) : m_logger.setFrame(false); //m_logger.setInsertPolicy(QComboBox::InsertAtTop); -#if KDE_IS_VERSION(4,2,0) m_freeSpace = new KCapacityBar(KCapacityBar::DrawTextInline, this); m_freeSpace->setMaximumWidth(150); QFontMetricsF fontMetrics(font()); @@ -122,7 +117,6 @@ RecMonitor::RecMonitor(QString name, MonitorManager *manager, QWidget *parent) : connect(&m_spaceTimer, SIGNAL(timeout()), this, SLOT(slotUpdateFreeSpace())); m_spaceTimer.setInterval(30000); m_spaceTimer.setSingleShot(false); -#endif control_frame_firewire->setLayout(layout); m_displayProcess = new QProcess; @@ -165,9 +159,7 @@ RecMonitor::RecMonitor(QString name, MonitorManager *manager, QWidget *parent) : RecMonitor::~RecMonitor() { -#if KDE_IS_VERSION(4,2,0) m_spaceTimer.stop(); -#endif delete m_captureProcess; delete m_displayProcess; if (m_captureDevice) delete m_captureDevice; @@ -203,10 +195,8 @@ void RecMonitor::slotUpdateCaptureFolder(const QString ¤tProjectFolder) else KMessageBox::information(this, i18n("You need to stop capture before your changes can be applied"), i18n("Capturing")); } else slotVideoDeviceChanged(device_selector->currentIndex()); -#if KDE_IS_VERSION(4,2,0) // update free space info slotUpdateFreeSpace(); -#endif } void RecMonitor::slotVideoDeviceChanged(int ix) @@ -539,9 +529,7 @@ void RecMonitor::slotRecord() m_isCapturing = true; m_didCapture = true; m_captureProcess->write("c\n", 3); -#if KDE_IS_VERSION(4,2,0) m_spaceTimer.start(); -#endif return; } if (m_captureProcess->state() == QProcess::NotRunning) { @@ -792,12 +780,9 @@ void RecMonitor::slotProcessStatus(QProcess::ProcessState status) } m_isCapturing = false; -#if KDE_IS_VERSION(4,2,0) m_spaceTimer.stop(); // update free space info slotUpdateFreeSpace(); -#endif - } else { if (device_selector->currentIndex() != SCREENGRAB) m_stopAction->setEnabled(true); device_selector->setEnabled(false); @@ -860,21 +845,17 @@ void RecMonitor::manageCapturedFiles() // virtual void RecMonitor::mousePressEvent(QMouseEvent * /*event*/) { -#if KDE_IS_VERSION(4,2,0) if (m_freeSpace->underMouse()) slotUpdateFreeSpace(); -#endif } void RecMonitor::slotUpdateFreeSpace() { -#if KDE_IS_VERSION(4,2,0) KDiskFreeSpaceInfo info = KDiskFreeSpaceInfo::freeSpaceInfo(m_capturePath); if (info.isValid() && info.size() > 0) { m_freeSpace->setValue(100 * info.used() / info.size()); m_freeSpace->setText(i18n("Free space: %1", KIO::convertSize(info.available()))); m_freeSpace->update(); } -#endif } void RecMonitor::refreshRecMonitor(bool visible) diff --git a/src/recmonitor.h b/src/recmonitor.h index fe1d90fb..86cb0d97 100644 --- a/src/recmonitor.h +++ b/src/recmonitor.h @@ -40,10 +40,7 @@ #include #include #include - -#if KDE_IS_VERSION(4,2,0) #include -#endif class MonitorManager; class MltDeviceCapture; @@ -76,10 +73,8 @@ private: KComboBox m_logger; QString m_capturePath; -#if KDE_IS_VERSION(4,2,0) KCapacityBar *m_freeSpace; QTimer m_spaceTimer; -#endif KUrl m_captureFile; KIcon m_playIcon; diff --git a/src/titlewidget.cpp b/src/titlewidget.cpp index 0e98ceeb..5a00bd44 100644 --- a/src/titlewidget.cpp +++ b/src/titlewidget.cpp @@ -1800,9 +1800,7 @@ void TitleWidget::saveTitle(KUrl url) KFileDialog *fs = new KFileDialog(KUrl(m_projectTitlePath), "application/x-kdenlivetitle", this); fs->setOperationMode(KFileDialog::Saving); fs->setMode(KFile::File); -#if KDE_IS_VERSION(4,2,0) fs->setConfirmOverwrite(true); -#endif fs->setKeepLocation(true); fs->exec(); url = fs->selectedUrl(); -- 2.39.2