some missing headers

plugins/cffadaptor/src/UBCFFAdaptor.cpp

@@ -3,24 +3,24 @@
  *
  * This file is part of Open-Sankoré.
  *
- * Open-Sankoré is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation, version 2,
+ * Open-Sankoré is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License,
  * with a specific linking exception for the OpenSSL project's
  * "OpenSSL" library (or with modified versions of it that use the
  * same license as the "OpenSSL" library).
  *
  * Open-Sankoré is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with Open-Sankoré; if not, see
- * <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Open-Sankoré.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 
+
 #include "UBCFFAdaptor.h"
 
 #include <QtCore>

plugins/cffadaptor/src/UBCFFAdaptor.h

@@ -3,21 +3,20 @@
  *
  * This file is part of Open-Sankoré.
  *
- * Open-Sankoré is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation, version 2,
+ * Open-Sankoré is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License,
  * with a specific linking exception for the OpenSSL project's
  * "OpenSSL" library (or with modified versions of it that use the
  * same license as the "OpenSSL" library).
  *
  * Open-Sankoré is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with Open-Sankoré; if not, see
- * <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Open-Sankoré.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 

plugins/cffadaptor/src/UBCFFAdaptor_global.h

@@ -3,21 +3,20 @@
  *
  * This file is part of Open-Sankoré.
  *
- * Open-Sankoré is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation, version 2,
+ * Open-Sankoré is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License,
  * with a specific linking exception for the OpenSSL project's
  * "OpenSSL" library (or with modified versions of it that use the
  * same license as the "OpenSSL" library).
  *
  * Open-Sankoré is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with Open-Sankoré; if not, see
- * <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Open-Sankoré.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 

plugins/cffadaptor/src/UBCFFConstants.h

@@ -3,21 +3,20 @@
  *
  * This file is part of Open-Sankoré.
  *
- * Open-Sankoré is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation, version 2,
+ * Open-Sankoré is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License,
  * with a specific linking exception for the OpenSSL project's
  * "OpenSSL" library (or with modified versions of it that use the
  * same license as the "OpenSSL" library).
  *
  * Open-Sankoré is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with Open-Sankoré; if not, see
- * <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Open-Sankoré.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 

plugins/cffadaptor/src/UBGlobals.h

@@ -3,21 +3,20 @@
  *
  * This file is part of Open-Sankoré.
  *
- * Open-Sankoré is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation, version 2,
+ * Open-Sankoré is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License,
  * with a specific linking exception for the OpenSSL project's
  * "OpenSSL" library (or with modified versions of it that use the
  * same license as the "OpenSSL" library).
  *
  * Open-Sankoré is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with Open-Sankoré; if not, see
- * <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Open-Sankoré.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 

src/adaptors/UBImportCFF.h

@@ -19,32 +19,32 @@
  * along with Open-Sankoré.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
-
-#ifndef UBIMPORTCFF_H
-#define UBIMPORTCFF_H
-
-#include <QtGui>
-#include "UBImportAdaptor.h"
-
-class UBDocumentProxy;
-
-class UBImportCFF : public UBDocumentBasedImportAdaptor
-{
-    Q_OBJECT;
-
-    public:
-        UBImportCFF(QObject *parent = 0);
-        virtual ~UBImportCFF();
-
-        virtual QStringList supportedExtentions();
-        virtual QString importFileFilter();
-
-        virtual bool addFileToDocument(UBDocumentProxy* pDocument, const QFile& pFile);
-        virtual UBDocumentProxy* importFile(const QFile& pFile, const QString& pGroup);
-
-    private:
-        QString expandFileToDir(const QFile& pZipFile, const QString& pDir);
-};
-
-#endif // UBIMPORTCFF_H
+
+
+#ifndef UBIMPORTCFF_H
+#define UBIMPORTCFF_H
+
+#include <QtGui>
+#include "UBImportAdaptor.h"
+
+class UBDocumentProxy;
+
+class UBImportCFF : public UBDocumentBasedImportAdaptor
+{
+    Q_OBJECT;
+
+    public:
+        UBImportCFF(QObject *parent = 0);
+        virtual ~UBImportCFF();
+
+        virtual QStringList supportedExtentions();
+        virtual QString importFileFilter();
+
+        virtual bool addFileToDocument(UBDocumentProxy* pDocument, const QFile& pFile);
+        virtual UBDocumentProxy* importFile(const QFile& pFile, const QString& pGroup);
+
+    private:
+        QString expandFileToDir(const QFile& pZipFile, const QString& pDir);
+};
+
+#endif // UBIMPORTCFF_H

src/adaptors/UBThumbnailAdaptor.h

@@ -19,34 +19,34 @@
  * along with Open-Sankoré.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
-
-#ifndef UBTHUMBNAILADAPTOR_H
-#define UBTHUMBNAILADAPTOR_H
-
-#include <QtCore>
-
-class UBDocument;
-class UBDocumentProxy;
-class UBGraphicsScene;
-
-class UBThumbnailAdaptor //static class
-{
-    Q_DECLARE_TR_FUNCTIONS(UBThumbnailAdaptor)
-
-public:
-    static QUrl thumbnailUrl(UBDocumentProxy* proxy, int pageIndex);
-
-    static void persistScene(UBDocumentProxy* proxy, UBGraphicsScene* pScene, int pageIndex, bool overrideModified = false);
-
-    static const QPixmap* get(UBDocumentProxy* proxy, int index);
-    static void load(UBDocumentProxy* proxy, QList<const QPixmap*>& list);
-
-private:
-    static void generateMissingThumbnails(UBDocumentProxy* proxy);
-    static void updateDocumentToHandleZeroPage(UBDocumentProxy* proxy);
-
-    UBThumbnailAdaptor() {}
-};
-
-#endif // UBTHUMBNAILADAPTOR_H
+
+
+#ifndef UBTHUMBNAILADAPTOR_H
+#define UBTHUMBNAILADAPTOR_H
+
+#include <QtCore>
+
+class UBDocument;
+class UBDocumentProxy;
+class UBGraphicsScene;
+
+class UBThumbnailAdaptor //static class
+{
+    Q_DECLARE_TR_FUNCTIONS(UBThumbnailAdaptor)
+
+public:
+    static QUrl thumbnailUrl(UBDocumentProxy* proxy, int pageIndex);
+
+    static void persistScene(UBDocumentProxy* proxy, UBGraphicsScene* pScene, int pageIndex, bool overrideModified = false);
+
+    static const QPixmap* get(UBDocumentProxy* proxy, int index);
+    static void load(UBDocumentProxy* proxy, QList<const QPixmap*>& list);
+
+private:
+    static void generateMissingThumbnails(UBDocumentProxy* proxy);
+    static void updateDocumentToHandleZeroPage(UBDocumentProxy* proxy);
+
+    UBThumbnailAdaptor() {}
+};
+
+#endif // UBTHUMBNAILADAPTOR_H

src/adaptors/publishing/UBDocumentPublisher.h

@@ -19,124 +19,124 @@
  * along with Open-Sankoré.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
-
-#ifndef UBDOCUMENTPUBLISHER_H
-#define UBDOCUMENTPUBLISHER_H
-
-#include <QtGui>
-#include <QtNetwork>
-
-#include "ui_webPublishing.h"
-
-#define DOCPUBLICATION_URL     "http://planete.sankore.org/xwiki/bin/view/CreateResources/UniboardUpload?xpage=plain&outputSyntax=plain"
-
-typedef struct
-{
-    QString title;
-    QString description;
-} sDocumentInfos;
-
-class UBDocumentProxy;
-class UBServerXMLHttpRequest;
-class UBGraphicsW3CWidgetItem;
-class QWebView;
-
-class UBProxyLoginDlg : public QDialog
-{
-    Q_OBJECT
-public:
-    UBProxyLoginDlg(QWidget* parent=0, const char* name="ProxyLoginDlg");
-    ~UBProxyLoginDlg();
-
-    QString username(){return mpUsername->text();}
-    QString password(){return mpPassword->text();}
-
-private:
-    QVBoxLayout* mpLayout;
-    QHBoxLayout* mpUserLayout;
-    QHBoxLayout* mpPasswordLayout;
-    QDialogButtonBox* mpButtons;
-    QLabel* mpUserLabel;
-    QLabel* mpPasswordLabel;
-    QLineEdit* mpUsername;
-    QLineEdit* mpPassword;
-};
-
-class UBPublicationDlg : public QDialog
-{
-    Q_OBJECT
-public:
-    UBPublicationDlg(QWidget* parent=0, const char* name="UBPublicationDlg");
-    ~UBPublicationDlg();
-
-    QString title(){return mpTitle->text();}
-    QString description(){return mpDescription->document()->toPlainText();}
-
-private slots:
-    void onTextChanged();
-
-private:
-    QVBoxLayout* mpLayout;
-    QHBoxLayout* mpTitleLayout;
-    QLabel* mpTitleLabel;
-    QLineEdit* mpTitle;
-    QLabel* mpDescLabel;
-    QTextEdit* mpDescription;
-    QDialogButtonBox* mpButtons;
-};
-
-
-class UBDocumentPublisher : public QObject
-{
-    Q_OBJECT;
-
-public:
-    explicit UBDocumentPublisher(UBDocumentProxy* sourceDocument, QObject *parent = 0);
-    virtual ~UBDocumentPublisher();
-
-    void publish();
-
-signals:
-
-    void loginDone();
-
-protected:
-
-    virtual void updateGoogleMapApiKey();
-    virtual void rasterizeScenes();
-    virtual void upgradeDocumentForPublishing();
-    virtual void generateWidgetPropertyScript(UBGraphicsW3CWidgetItem *widgetItem, int pageNumber);
-
-private slots:
-
-    void onFinished(QNetworkReply* reply);
-
-private:
-
-    UBDocumentProxy *mSourceDocument;
-
-    //UBDocumentProxy *mPublishingDocument;
-    QString mPublishingPath;
-    int mPublishingSize;
-
-
-    void init();
-    void sendUbw(QString username, QString password);
-    QString getBase64Of(QString stringToEncode);
-
-    QHBoxLayout* mpLayout;
-    QNetworkAccessManager* mpNetworkMgr;
-    QNetworkCookieJar* mpCookieJar;
-    QString mUsername;
-    QString mPassword;
-    QString mCrlf;
-    bool bLoginCookieSet;
-
-    void buildUbwFile();
-    QString mTmpZipFile;
-    QList<QNetworkCookie> mCookies;
-    sDocumentInfos mDocInfos;
-
-};
-#endif // UBDOCUMENTPUBLISHER_H
+
+
+#ifndef UBDOCUMENTPUBLISHER_H
+#define UBDOCUMENTPUBLISHER_H
+
+#include <QtGui>
+#include <QtNetwork>
+
+#include "ui_webPublishing.h"
+
+#define DOCPUBLICATION_URL     "http://planete.sankore.org/xwiki/bin/view/CreateResources/UniboardUpload?xpage=plain&outputSyntax=plain"
+
+typedef struct
+{
+    QString title;
+    QString description;
+} sDocumentInfos;
+
+class UBDocumentProxy;
+class UBServerXMLHttpRequest;
+class UBGraphicsW3CWidgetItem;
+class QWebView;
+
+class UBProxyLoginDlg : public QDialog
+{
+    Q_OBJECT
+public:
+    UBProxyLoginDlg(QWidget* parent=0, const char* name="ProxyLoginDlg");
+    ~UBProxyLoginDlg();
+
+    QString username(){return mpUsername->text();}
+    QString password(){return mpPassword->text();}
+
+private:
+    QVBoxLayout* mpLayout;
+    QHBoxLayout* mpUserLayout;
+    QHBoxLayout* mpPasswordLayout;
+    QDialogButtonBox* mpButtons;
+    QLabel* mpUserLabel;
+    QLabel* mpPasswordLabel;
+    QLineEdit* mpUsername;
+    QLineEdit* mpPassword;
+};
+
+class UBPublicationDlg : public QDialog
+{
+    Q_OBJECT
+public:
+    UBPublicationDlg(QWidget* parent=0, const char* name="UBPublicationDlg");
+    ~UBPublicationDlg();
+
+    QString title(){return mpTitle->text();}
+    QString description(){return mpDescription->document()->toPlainText();}
+
+private slots:
+    void onTextChanged();
+
+private:
+    QVBoxLayout* mpLayout;
+    QHBoxLayout* mpTitleLayout;
+    QLabel* mpTitleLabel;
+    QLineEdit* mpTitle;
+    QLabel* mpDescLabel;
+    QTextEdit* mpDescription;
+    QDialogButtonBox* mpButtons;
+};
+
+
+class UBDocumentPublisher : public QObject
+{
+    Q_OBJECT;
+
+public:
+    explicit UBDocumentPublisher(UBDocumentProxy* sourceDocument, QObject *parent = 0);
+    virtual ~UBDocumentPublisher();
+
+    void publish();
+
+signals:
+
+    void loginDone();
+
+protected:
+
+    virtual void updateGoogleMapApiKey();
+    virtual void rasterizeScenes();
+    virtual void upgradeDocumentForPublishing();
+    virtual void generateWidgetPropertyScript(UBGraphicsW3CWidgetItem *widgetItem, int pageNumber);
+
+private slots:
+
+    void onFinished(QNetworkReply* reply);
+
+private:
+
+    UBDocumentProxy *mSourceDocument;
+
+    //UBDocumentProxy *mPublishingDocument;
+    QString mPublishingPath;
+    int mPublishingSize;
+
+
+    void init();
+    void sendUbw(QString username, QString password);
+    QString getBase64Of(QString stringToEncode);
+
+    QHBoxLayout* mpLayout;
+    QNetworkAccessManager* mpNetworkMgr;
+    QNetworkCookieJar* mpCookieJar;
+    QString mUsername;
+    QString mPassword;
+    QString mCrlf;
+    bool bLoginCookieSet;
+
+    void buildUbwFile();
+    QString mTmpZipFile;
+    QList<QNetworkCookie> mCookies;
+    sDocumentInfos mDocInfos;
+
+};
+#endif // UBDOCUMENTPUBLISHER_H

src/desktop/UBWindowCapture_mac.mm

@@ -28,22 +28,22 @@
 
 
 UBWindowCapture::UBWindowCapture(UBDesktopAnnotationController *parent) 
-	: QObject(parent)
-	, mParent(parent)
+    : QObject(parent)
+    , mParent(parent)
 {
-	// NOOP
+    // NOOP
 }
 
 
 UBWindowCapture::~UBWindowCapture() 
 {
-	// NOOP
+    // NOOP
 }
 
 
 const QPixmap UBWindowCapture::getCapturedWindow() 
 {
-	return mWindowPixmap;
+    return mWindowPixmap;
 }
 
 
@@ -51,20 +51,20 @@ int UBWindowCapture::execute()
 {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
     NSString *path = [NSString pathWithComponents: [NSArray arrayWithObjects: NSTemporaryDirectory(), 
-			[[NSString stringWithFormat:@"%d",[NSDate timeIntervalSinceReferenceDate]] stringByAppendingPathExtension:@"uninote"], 
-			nil]];
-	
+            [[NSString stringWithFormat:@"%d",[NSDate timeIntervalSinceReferenceDate]] stringByAppendingPathExtension:@"uninote"], 
+            nil]];
+    
     NSTask *task = [[NSTask alloc] init];
-	NSArray *arguments = [NSArray arrayWithObjects: @"-i", @"-W", @"-m", @"-tpng", path, nil];
+    NSArray *arguments = [NSArray arrayWithObjects: @"-i", @"-W", @"-m", @"-tpng", path, nil];
     [task setLaunchPath: @"/usr/sbin/screencapture"];
     [task setArguments: arguments];
-	
+    
     [task launch];
     [task waitUntilExit];
     [task release];
-	
+    
     QString resultPath = QString::fromUtf8([path UTF8String], strlen([path UTF8String]));
-	
+    
     mWindowPixmap.load(resultPath);
     
     QFile::remove(resultPath);

src/document/UBDocumentContainer.h

@@ -19,54 +19,54 @@
  * along with Open-Sankoré.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
-
-#ifndef UBDOCUMENTCONTAINER_H_
-#define UBDOCUMENTCONTAINER_H_
-
-#include <QtGui>
-#include "UBDocumentProxy.h"
-
-class UBDocumentContainer : public QObject
-{
-    Q_OBJECT
-
-    public:
-        UBDocumentContainer(QObject * parent = 0);
-        virtual ~UBDocumentContainer();
-
-        void setDocument(UBDocumentProxy* document, bool forceReload = false);
-
-        UBDocumentProxy* selectedDocument(){return mCurrentDocument;}
-        int pageCount(){return mDocumentThumbs.size();}
-        const QPixmap* pageAt(int index){return mDocumentThumbs[index];}
-
-        static int pageFromSceneIndex(int sceneIndex);    
-        static int sceneIndexFromPage(int sceneIndex); 
-
-        void duplicatePages(QList<int>& pageIndexes);
-        bool movePageToIndex(int source, int target);
-        void deletePages(QList<int>& pageIndexes);
-        void addPage(int index);
-        void updatePage(int index);
-        void addEmptyThumbPage();
-
-    private:
-        UBDocumentProxy* mCurrentDocument;
-        QList<const QPixmap*>  mDocumentThumbs;
-
-   
-    protected:
-        void deleteThumbPage(int index);
-        void updateThumbPage(int index);
-        void insertThumbPage(int index);
-        void reloadThumbnails();
-
-    signals:
-        void documentSet(UBDocumentProxy* document);
-        void documentPageUpdated(int index);
-        void documentThumbnailsUpdated(UBDocumentContainer* source);
-};
-
-
-#endif /* UBDOCUMENTPROXY_H_ */
+
+
+#ifndef UBDOCUMENTCONTAINER_H_
+#define UBDOCUMENTCONTAINER_H_
+
+#include <QtGui>
+#include "UBDocumentProxy.h"
+
+class UBDocumentContainer : public QObject
+{
+    Q_OBJECT
+
+    public:
+        UBDocumentContainer(QObject * parent = 0);
+        virtual ~UBDocumentContainer();
+
+        void setDocument(UBDocumentProxy* document, bool forceReload = false);
+
+        UBDocumentProxy* selectedDocument(){return mCurrentDocument;}
+        int pageCount(){return mDocumentThumbs.size();}
+        const QPixmap* pageAt(int index){return mDocumentThumbs[index];}
+
+        static int pageFromSceneIndex(int sceneIndex);    
+        static int sceneIndexFromPage(int sceneIndex); 
+
+        void duplicatePages(QList<int>& pageIndexes);
+        bool movePageToIndex(int source, int target);
+        void deletePages(QList<int>& pageIndexes);
+        void addPage(int index);
+        void updatePage(int index);
+        void addEmptyThumbPage();
+
+    private:
+        UBDocumentProxy* mCurrentDocument;
+        QList<const QPixmap*>  mDocumentThumbs;
+
+   
+    protected:
+        void deleteThumbPage(int index);
+        void updateThumbPage(int index);
+        void insertThumbPage(int index);
+        void reloadThumbnails();
+
+    signals:
+        void documentSet(UBDocumentProxy* document);
+        void documentPageUpdated(int index);
+        void documentThumbnailsUpdated(UBDocumentContainer* source);
+};
+
+
+#endif /* UBDOCUMENTPROXY_H_ */

src/frameworks/UBGeometryUtils.h

@@ -19,39 +19,39 @@
  * along with Open-Sankoré.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
-
-#ifndef UBGEOMETRYUTILS_H_
-#define UBGEOMETRYUTILS_H_
-
-#include <QtGui>
-
-class UBGeometryUtils
-{
-    private:
-        UBGeometryUtils();
-        virtual ~UBGeometryUtils();
-
-    public:
-        static QPolygonF lineToPolygon(const QLineF& pLine, const qreal& pWidth);
-        static QRectF lineToInnerRect(const QLineF& pLine, const qreal& pWidth);
-
-        static QPolygonF arcToPolygon(const QLineF& startRadius, qreal spanAngle, qreal width);
-
-        static QPolygonF lineToPolygon(const QPointF& pStart, const QPointF& pEnd,
-                const qreal& pStartWidth, const qreal& pEndWidth);
-
-        static QPointF pointConstrainedInRect(QPointF point, QRectF rect);
-        static QPoint pointConstrainedInRect(QPoint point, QRect rect);
-
-        static void crashPointList(QVector<QPointF> &points);
-
-        const static int centimeterGraduationHeight;
-        const static int halfCentimeterGraduationHeight;
-        const static int millimeterGraduationHeight;
-        const static int millimetersPerCentimeter;
-        const static int millimetersPerHalfCentimeter;
-        const static float inchSize;
-};
-
-#endif /* UBGEOMETRYUTILS_H_ */
+
+
+#ifndef UBGEOMETRYUTILS_H_
+#define UBGEOMETRYUTILS_H_
+
+#include <QtGui>
+
+class UBGeometryUtils
+{
+    private:
+        UBGeometryUtils();
+        virtual ~UBGeometryUtils();
+
+    public:
+        static QPolygonF lineToPolygon(const QLineF& pLine, const qreal& pWidth);
+        static QRectF lineToInnerRect(const QLineF& pLine, const qreal& pWidth);
+
+        static QPolygonF arcToPolygon(const QLineF& startRadius, qreal spanAngle, qreal width);
+
+        static QPolygonF lineToPolygon(const QPointF& pStart, const QPointF& pEnd,
+                const qreal& pStartWidth, const qreal& pEndWidth);
+
+        static QPointF pointConstrainedInRect(QPointF point, QRectF rect);
+        static QPoint pointConstrainedInRect(QPoint point, QRect rect);
+
+        static void crashPointList(QVector<QPointF> &points);
+
+        const static int centimeterGraduationHeight;
+        const static int halfCentimeterGraduationHeight;
+        const static int millimeterGraduationHeight;
+        const static int millimetersPerCentimeter;
+        const static int millimetersPerHalfCentimeter;
+        const static float inchSize;
+};
+
+#endif /* UBGEOMETRYUTILS_H_ */

src/frameworks/UBPlatformUtils_mac.mm

@@ -461,8 +461,8 @@ void UBPlatformUtils::initializeKeyboardLayouts()
     int count = CFArrayGetCount(kbds);
     QList<UBKeyboardLocale*> result;
 
-	qDebug() << "initializeKeyboardLayouts";
-	qDebug() << "Found system locales: " << count;
+    qDebug() << "initializeKeyboardLayouts";
+    qDebug() << "Found system locales: " << count;
 
     for(int i=0; i<count; i++)
     {
@@ -554,7 +554,7 @@ void UBPlatformUtils::initializeKeyboardLayouts()
         const QString resName = ":/images/flags/" + name + ".png";
         QIcon *iconLang = new QIcon(resName);
 
-		qDebug() << "Locale: " << ID << ", name: " << name;
+        qDebug() << "Locale: " << ID << ", name: " << name;
 
         result.append(new UBKeyboardLocale(fullName, name, ID, iconLang, keybt));
     }

tools/CrashReportViewer/main.cpp

@@ -3,21 +3,20 @@
  *
  * This file is part of Open-Sankoré.
  *
- * Open-Sankoré is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation, version 2,
+ * Open-Sankoré is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License,
  * with a specific linking exception for the OpenSSL project's
  * "OpenSSL" library (or with modified versions of it that use the
  * same license as the "OpenSSL" library).
  *
  * Open-Sankoré is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with Open-Sankoré; if not, see
- * <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Open-Sankoré.  If not, see <http://www.gnu.org/licenses/>.
  */