[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [lokalize] src: fix osx build
From:       Nick Shaforostoff <shafff () ukr ! net>
Date:       2016-04-15 23:43:58
Message-ID: E1arDP4-0007Hy-3E () scm ! kde ! org
[Download RAW message or body]

Git commit 319d68a80285273ea94faef3d07008ba23c4a8c3 by Nick Shaforostoff.
Committed on 15/04/2016 at 23:43.
Pushed by shaforo into branch 'master'.

fix osx build

M  +15   -0    src/nokde-stubs/kmessagebox.h
M  +2    -0    src/nokde-stubs/prefs.cpp
M  +4    -0    src/nokde-stubs/projectlocal.h
M  +2    -1    src/project/project.cpp

http://commits.kde.org/lokalize/319d68a80285273ea94faef3d07008ba23c4a8c3

diff --git a/src/nokde-stubs/kmessagebox.h b/src/nokde-stubs/kmessagebox.h
index 8304297..f0df519 100644
--- a/src/nokde-stubs/kmessagebox.h
+++ b/src/nokde-stubs/kmessagebox.h
@@ -7,8 +7,12 @@ namespace KStandardGuiItem
 {
     static inline int save(){return 0;}
     static inline int discard(){return 0;}
+    static inline int yes(){return 0;}
+    static inline int no(){return 0;}
 };
 
+#define KGuiItem(x) 0
+
 class KMessageBox: public QMessageBox
 {
 public:
@@ -23,6 +27,17 @@ public:
         Q_UNUSED(y) Q_UNUSED(n) Q_UNUSED(c) Q_UNUSED(dontAskAgainName)
         return warning(parent, caption, text, Yes|No|Cancel, Yes);
     }
+    static QMessageBox::StandardButton questionYesNoCancel(QWidget *parent, const \
QString &text, +                               const QString &caption,
+                               int y=0,
+                               int n=0,
+                               int c=0,
+                               const QString &dontAskAgainName=QString())
+    {
+        Q_UNUSED(y) Q_UNUSED(n) Q_UNUSED(c) Q_UNUSED(dontAskAgainName)
+        return question(parent, caption, text, Yes|No|Cancel, Yes);
+    }
+
     static QMessageBox::StandardButton questionYesNo(QWidget *parent, const QString \
&text,  const QString &caption,
                               int y=0,
diff --git a/src/nokde-stubs/prefs.cpp b/src/nokde-stubs/prefs.cpp
index 48d9b54..039501a 100644
--- a/src/nokde-stubs/prefs.cpp
+++ b/src/nokde-stubs/prefs.cpp
@@ -141,12 +141,14 @@ ProjectLocal::ProjectLocal()
 {
     QSettings s;
     mRole = s.value("Project/AuthorRole", mRole).toInt();
+    mSourceDir = s.value("Project/SourceDir", mSourceDir).toString();
 }
 
 void ProjectLocal::save()
 {
     QSettings s;
     s.setValue(QStringLiteral("Project/AuthorRole"), mRole);
+    s.setValue(QStringLiteral("Project/SourceDir"), mSourceDir);
 }
 
 EditorTab* ProjectBase::fileOpen(QString filePath, int entry, bool setAsActive, \
                const QString& mergeFile, bool silent)
diff --git a/src/nokde-stubs/projectlocal.h b/src/nokde-stubs/projectlocal.h
index fb60573..dcdc064 100644
--- a/src/nokde-stubs/projectlocal.h
+++ b/src/nokde-stubs/projectlocal.h
@@ -22,6 +22,9 @@ public:
     void setFirstRun( bool v ){mFirstRun = v;}
     bool firstRun() const{return mFirstRun;}
 
+    void setSourceDir( const QString& s){mSourceDir = s;}
+    QString sourceDir() const{return mSourceDir;}
+
     void save();
     void setDefaults(){}
   protected:
@@ -29,6 +32,7 @@ public:
     // Personal
     int mRole;
     bool mFirstRun;
+    QString mSourceDir;
 
   private:
 };
diff --git a/src/project/project.cpp b/src/project/project.cpp
index f59fd62..d975139 100644
--- a/src/project/project.cpp
+++ b/src/project/project.cpp
@@ -37,7 +37,6 @@
 
 #include <klocalizedstring.h>
 #include <kmessagebox.h>
-#include <knotification.h>
 
 #include <QLocale>
 #include <QTimer>
@@ -51,6 +50,8 @@
 #include "projectmodel.h"
 #include "webquerycontroller.h"
 
+#include <knotification.h>
+
 #include <kio/global.h>
 #include <kjob.h>
 #include <kjobtrackerinterface.h>


[prev in list] [next in list] [prev in thread] [next in thread]