Commit 58d1f915 authored by Vincent PINON's avatar Vincent PINON

not release build; remove unnecessary includes; style

parent 00ae30dc
......@@ -26,7 +26,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
SET(CMAKE_CXX_FLAGS "-fPIC")
# To be switched on when releasing.
option(RELEASE_BUILD "Remove Git revision from program version (use for stable releases)" ON)
option(RELEASE_BUILD "Remove Git revision from program version (use for stable releases)" OFF)
# Get current version.
set(KDENLIVE_VERSION_STRING "${KDENLIVE_VERSION}")
......
......@@ -2257,12 +2257,12 @@ void RenderWidget::errorMessage(const QString &message)
m_infoMessage->animatedShow();
}
else {
if (m_view.tabWidget->currentIndex() == 0 && m_infoMessage->isVisible()) {
m_infoMessage->animatedHide();
} else {
// Seems like animated hide does not work when page is not visible
m_infoMessage->hide();
}
if (m_view.tabWidget->currentIndex() == 0 && m_infoMessage->isVisible()) {
m_infoMessage->animatedHide();
} else {
// Seems like animated hide does not work when page is not visible
m_infoMessage->hide();
}
}
}
......
......@@ -29,6 +29,8 @@
#include "project/clipmanager.h"
#include "project/dialogs/slideshowclip.h"
#include <klocalizedstring.h>
#include <QDebug>
#include <QCryptographicHash>
......
......@@ -29,7 +29,6 @@
#include <mlt++/Mlt.h>
#include <QDebug>
#include <klocalizedstring.h>
#include <kfileitem.h>
#include <kmessagebox.h>
......
......@@ -23,6 +23,7 @@
#include <QFuture>
#include <QUrl>
#include <mlt++/Mlt.h>
......@@ -71,9 +72,6 @@ public slots:
public:
static QPixmap getImage(const QUrl &url, int width, int height);
// static QPixmap getImage(QDomElement xml, int frame, int width, int height);
/* void getImage(QUrl url, int frame, int width, int height);
void getThumbs(QUrl url, int startframe, int endframe, int width, int height);*/
static QPixmap getImage(const QUrl &url, int frame, int width, int height);
static QImage getFrame(Mlt::Producer *producer, int framepos, int frameWidth, int displayWidth, int height);
static QImage getFrame(Mlt::Frame *frame, int frameWidth, int displayWidth, int height);
......
......@@ -206,10 +206,9 @@ bool DvdWizardMenu::isComplete() const
return false;
}
}
m_menuMessage->hide();
// check that we have a "Play all" entry
if (targets.contains(0)) return true;
// ... or that each video file has a button
......
......@@ -158,7 +158,7 @@ void DvdWizardVob::slotCheckProfiles()
if (conflict) {
showProfileError();
}
else {
else {
m_warnMessage->animatedHide();
}
}
......@@ -659,5 +659,3 @@ void DvdWizardVob::showError(const QString &error)
m_warnMessage->animatedShow();
}
......@@ -29,7 +29,7 @@
#include <QDir>
#include <QStandardPaths>
#include "locale.h"
#include <klocalizedstring.h>
initEffectsThumbnailer::initEffectsThumbnailer() :
QThread()
......
......@@ -18,9 +18,9 @@
#ifndef InitEffects_H
#define InitEffects_H
#include <klocalizedstring.h>
#include <QDomDocument>
#include <QThread>
#include <QStringList>
#include <mlt++/Mlt.h>
......
......@@ -45,7 +45,6 @@
// KDE includes.
#include <kcursor.h>
#include <klocalizedstring.h>
#define bounds(x,a,b) (x<a ? a : (x>b ? b :x))
#define MOUSE_AWAY_THRES 15
......
/* This file is part of the KDE project
Copyright (C) 2007 David Faure <faure@kde.org>
Copyright (C) 2007 Matthias Kretz <kretz@kde.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
......@@ -20,19 +20,15 @@
#ifndef _KDENLIVECORE_EXPORT_H
#define _KDENLIVECORE_EXPORT_H
/* needed for KDE_EXPORT and KDE_IMPORT macros */
#include <QtCore/QtGlobal>
#ifndef KDENLIVECORE_EXPORT
# if defined(KDELIBS_STATIC_LIBS)
/* No export/import for static libraries */
# define KDENLIVECORE_EXPORT
# elif defined(MAKE_KDENLIVECORE_LIB)
# if defined(MAKE_KDENLIVECORE_LIB)
/* We are building this library */
# define KDENLIVECORE_EXPORT KDE_EXPORT
# define KDENLIVECORE_EXPORT Q_DECL_EXPORT
# else
/* We are using this library */
# define KDENLIVECORE_EXPORT KDE_IMPORT
# define KDENLIVECORE_EXPORT Q_DECL_IMPORT
# endif
#endif
......
......@@ -81,6 +81,7 @@
#include <kns3/knewstuffaction.h>
#include <KToolBar>
#include <KColorScheme>
#include <klocalizedstring.h>
#include <QAction>
#include <QDesktopWidget>
......
......@@ -236,9 +236,8 @@ void RecMonitor::slotVideoDeviceChanged(int ix)
QString capturefile;
QString capturename;
if (m_infoMessage->isVisible()) {
m_infoMessage->animatedHide();
m_infoMessage->animatedHide();
}
m_previewSettings->setEnabled(ix == Video4Linux || ix == BlackMagic);
control_frame->setVisible(ix == Video4Linux);
m_playAction->setVisible(ix != ScreenBag);
......
......@@ -36,6 +36,7 @@
#include <QDateTime>
#include <QIcon>
#include <QUrl>
#include <KComboBox>
#include <kcapacitybar.h>
......@@ -103,6 +104,7 @@ private:
QAction *m_addCapturedClip;
QAction *m_previewSettings;
QString m_error;
KMessageWidget *m_infoMessage;
bool m_analyse;
......
......@@ -40,6 +40,7 @@
#include <solid/storageaccess.h>
#include <solid/storagedrive.h>
#include <solid/storagevolume.h>
#include <klocalizedstring.h>
#include <QGraphicsItemGroup>
#include <QtConcurrent>
......
......@@ -34,7 +34,6 @@
#include <QUrl>
#include <KDirWatch>
#include <klocalizedstring.h>
#include <KIO/CopyJob>
#include <kimagecache.h>
......
......@@ -25,6 +25,7 @@ the Free Software Foundation, either version 3 of the License, or
#include "timeline/customtrackview.h"
#include "ui_templateclip_ui.h"
#include <KMessageBox>
#include <klocalizedstring.h>
ClipPropertiesManager::ClipPropertiesManager(ProjectList *projectList) :
......
......@@ -28,6 +28,7 @@
#include <kio/global.h>
#include <KIO/CopyJob>
#include <QTemporaryFile>
#include <QDialog>
#include <QFuture>
#include <QList>
......@@ -41,6 +42,7 @@ class KArchive;
* @brief A widget allowing to archive a project (copy all project files to a new location)
* @author Jean-Baptiste Mardelle
*/
class KMessageWidget;
class ArchiveWidget : public QDialog, public Ui::ArchiveWidget_UI
......
......@@ -27,8 +27,8 @@
#include <kcolorscheme.h>
#include <kiconloader.h>
#include <QIcon>
#include <klocalizedstring.h>
#include <KNotification>
#include <klocalizedstring.h>
#include <QPainter>
#include <QPushButton>
......
......@@ -24,7 +24,6 @@
#include <QLineEdit>
#include <QFontDatabase>
#include <klocalizedstring.h>
#include <KColorScheme>
TimecodeDisplay::TimecodeDisplay(const Timecode& t, QWidget *parent)
......
......@@ -38,6 +38,7 @@
#include <KMessageBox>
#include <KIO/FileCopyJob>
#include <klocalizedstring.h>
TrackView::TrackView(KdenliveDoc *doc, const QList<QAction *> &actions, bool *ok, QWidget *parent) :
......
......@@ -23,7 +23,6 @@
#include "mainwindow.h"
#include <QDebug>
#include <klocalizedstring.h>
#include <QBrush>
#include <QDomElement>
......@@ -32,6 +31,7 @@
#if QT_VERSION >= 0x040600
#include <QPropertyAnimation>
#endif
#include <klocalizedstring.h>
Transition::Transition(const ItemInfo &info, int transitiontrack, double fps, const QDomElement &params, bool automaticTransition) :
AbstractClipItem(info, QRectF(), fps),
......
......@@ -33,7 +33,6 @@
#include <QMouseEvent>
#include <QDesktopWidget>
#include <klocale.h>
#include <QDebug>
class KoSliderComboContainer : public QMenu
......
......@@ -80,6 +80,7 @@ TitleWidget::TitleWidget(const QUrl &url, const Timecode &tc, const QString &pro
frame_properties->setFixedHeight(frame_toolbar->height());
int size = style()->pixelMetric(QStyle::PM_SmallIconSize);
QSize iconSize(size, size);
rectBColor->setAlphaChannelEnabled(true);
rectFColor->setAlphaChannelEnabled(true);
fontColorButton->setAlphaChannelEnabled(true);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment