aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Pinon <[email protected]>2015-04-17 22:35:06 +0200
committerVincent Pinon <[email protected]>2015-04-17 23:05:27 +0200
commitd5ab7e92cbf609151b4bd51fac0651a89e79d732 (patch)
tree3aa074c0949e3c470ecbaee156e6c04c2545df6f
parent44d277cd33571a22ce1c6e0480428db0e0f9dc4f (diff)
Fix OSX Compile
-rw-r--r--src/core.cpp2
-rw-r--r--src/dialogs/renderwidget.cpp2
-rw-r--r--src/doc/kdenlivedoc.cpp2
-rw-r--r--src/effectslist/initeffects.cpp1
-rw-r--r--src/timeline/track.h1
-rw-r--r--src/titler/titledocument.cpp2
6 files changed, 6 insertions, 4 deletions
diff --git a/src/core.cpp b/src/core.cpp
index f3efc23..4c4d8b7 100644
--- a/src/core.cpp
+++ b/src/core.cpp
@@ -15,9 +15,9 @@ the Free Software Foundation, either version 3 of the License, or
#include "mltcontroller/bincontroller.h"
#include "bin/bin.h"
#include <QCoreApplication>
-#include <locale>
#include <QDebug>
+#include <locale>
#ifdef Q_OS_MAC
#include <xlocale.h>
#endif
diff --git a/src/dialogs/renderwidget.cpp b/src/dialogs/renderwidget.cpp
index 2582308..7975b01 100644
--- a/src/dialogs/renderwidget.cpp
+++ b/src/dialogs/renderwidget.cpp
@@ -44,7 +44,7 @@
#include <QTimer>
#include <QStandardPaths>
-#include "locale.h"
+#include <locale>
#ifdef Q_OS_MAC
#include <xlocale.h>
#endif
diff --git a/src/doc/kdenlivedoc.cpp b/src/doc/kdenlivedoc.cpp
index ac46d65..75be06c 100644
--- a/src/doc/kdenlivedoc.cpp
+++ b/src/doc/kdenlivedoc.cpp
@@ -64,7 +64,7 @@
#include <KJobWidgets/KJobWidgets>
#include <QStandardPaths>
-#include "locale.h"
+#include <locale>
#ifdef Q_OS_MAC
#include <xlocale.h>
#endif
diff --git a/src/effectslist/initeffects.cpp b/src/effectslist/initeffects.cpp
index 68d1d37..420c70f 100644
--- a/src/effectslist/initeffects.cpp
+++ b/src/effectslist/initeffects.cpp
@@ -31,6 +31,7 @@
#include <klocalizedstring.h>
+#include <locale>
#ifdef Q_OS_MAC
#include <xlocale.h>
#endif
diff --git a/src/timeline/track.h b/src/timeline/track.h
index 491ed84..657d271 100644
--- a/src/timeline/track.h
+++ b/src/timeline/track.h
@@ -50,6 +50,7 @@ public:
explicit Track(Mlt::Playlist &playlist, qreal fps);
~Track();
+ /// Property access function
Mlt::Playlist & playlist();
qreal fps();
diff --git a/src/titler/titledocument.cpp b/src/titler/titledocument.cpp
index 59d70f3..2c3112a 100644
--- a/src/titler/titledocument.cpp
+++ b/src/titler/titledocument.cpp
@@ -40,7 +40,7 @@
#include <QFile>
#include <QTextCursor>
-#include <locale.h>
+#include <locale>
#ifdef Q_OS_MAC
#include <xlocale.h>
#endif