Remove libtidy dependency (it caused more problems than it solved) &

general cleanup to remove warnings & depricated calls.

NixNote2.pro

@@ -8,23 +8,23 @@ greaterThan(QT_MAJOR_VERSION, 4) {
     QT       += core gui widgets printsupport webkit webkitwidgets sql network xml dbus qml
     DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
     unix:INCLUDEPATH += /usr/include/poppler/qt5
-    unix:INCLUDEPATH += /usr/include/tidy
+#    unix:INCLUDEPATH += /usr/include/tidy
     win32:INCLUDEPATH +="$$PWD/winlib/includes/poppler/qt5"
     win32:INCLUDEPATH+= "$$PWD/winlib/includes"
     win32:LIBS += -L"$$PWD/winlib" -lpoppler-qt5
     unix:LIBS +=    -lcurl \
-               -lpthread -L/usr/lib -lpoppler-qt5 -ltidy -g -rdynamic
-    win32:LIBS += -L"$$PWD/winlib" -lpoppler-qt5 -ltidy
+               -lpthread -L/usr/lib -lpoppler-qt5 -g -rdynamic
+    win32:LIBS += -L"$$PWD/winlib" -lpoppler-qt5
     win32:RC_ICONS += "$$PWD/images/windowIcon.ico"
 }
 
 
 equals(QT_MAJOR_VERSION, 4) {
     QT       += core gui webkit sql network xml script
     INCLUDEPATH += /usr/include/poppler/qt4
-    INCLUDEPATH += /usr/include/tidy
+#    INCLUDEPATH += /usr/include/tidy
     LIBS +=    -lcurl \
-               -lpthread -L/usr/lib -lpoppler-qt4 -ltidy -g -rdynamic
+               -lpthread -L/usr/lib -lpoppler-qt4 -g -rdynamic
 }
 
 TARGET = nixnote2

cmdtools/cmdlinetool.cpp

@@ -57,7 +57,7 @@ int CmdLineTool::run(StartupConfig &config) {
     if (config.sync()) {
         // If the shared memory segment doesn't exist, we just do a sync & exit
         if (!global.sharedMemory->attach()) {
-            return this->sync(config);
+            return this->sync();
         }
         global.sharedMemory->write(QString("SNCHRONIZE"));
         global.sharedMemory->detach();
@@ -760,7 +760,7 @@ int CmdLineTool::closeNotebook(StartupConfig config) {
 #include "sql/nsqlquery.h"
 
 // Do a sync
-int CmdLineTool::sync(StartupConfig config) {
+int CmdLineTool::sync() {
     if (!global.accountsManager->oauthTokenFound()) {
         std::cout << tr("OAuth token not found.").toStdString() << endl;
         return 16;

cmdtools/cmdlinetool.h

@@ -44,7 +44,7 @@ class CmdLineTool : public QObject
     int importNotes(StartupConfig config);
     int openNotebook(StartupConfig config);
     int closeNotebook(StartupConfig config);
-    int sync(StartupConfig config);
+    int sync();
     int signalGui(StartupConfig config);
 
 signals:

dialog/preferences/debugpreferences.cpp

@@ -68,9 +68,9 @@ DebugPreferences::DebugPreferences(QWidget *parent) :
     multiThreadSave->setChecked(global.getMultiThreadSave());
     mainLayout->addWidget(multiThreadSave,row++,1);
 
-    useLibTidy = new QCheckBox(tr("Use libtidy directly (experimental)."));
-    useLibTidy->setChecked(global.getUseLibTidy());
-    mainLayout->addWidget(useLibTidy,row++,1);
+//    useLibTidy = new QCheckBox(tr("Use libtidy directly (experimental)."));
+//    useLibTidy->setChecked(global.getUseLibTidy());
+//    mainLayout->addWidget(useLibTidy,row++,1);
 
     mainLayout->addWidget(new QLabel(tr("Auto-Save Interval (in seconds).")), row,0);
     autoSaveInterval = new QSpinBox();
@@ -141,6 +141,6 @@ void DebugPreferences::saveValues() {
     global.setInterceptSigHup(interceptSigHup->isChecked());
 #endif
 
-    global.setMultiThreadSave(multiThreadSave->isChecked());
-    global.setUseLibTidy(useLibTidy->isChecked());
+//    global.setMultiThreadSave(multiThreadSave->isChecked());
+//    global.setUseLibTidy(useLibTidy->isChecked());
 }

dialog/preferences/debugpreferences.h

@@ -43,7 +43,7 @@ class DebugPreferences : public QWidget
     QCheckBox *forceUTF8;
     QCheckBox *interceptSigHup;
     QCheckBox *multiThreadSave;
-    QCheckBox *useLibTidy;
+//    QCheckBox *useLibTidy;
     QSpinBox *autoSaveInterval;
     QLabel *debugLevelLabel;
     int getMessageLevel();

global.cpp

@@ -1432,4 +1432,5 @@ void Global::setUseLibTidy(bool value) {
     global.settings->setValue("useLibTidy", value);
     global.settings->endGroup();
     this->useLibTidy = value;
+    this->useLibTidy = false;  // Removing obsolete setting.
 }

gui/favoritesviewdelegate.cpp

@@ -41,8 +41,11 @@ QSize FavoritesViewDelegate::sizeHint(const QStyleOptionViewItem &option, const
 
 
 void FavoritesViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const {
-
+#if QT_VERSION < 0x050000
     QStyleOptionViewItemV4 options = option;
+#else
+    QStyleOptionViewItem options = option;
+#endif
     initStyleOption(&options, index);
 
     options.widget->style()->drawControl(QStyle::CE_ItemViewItem, &options, painter);

gui/imagedelegate.cpp

@@ -43,7 +43,11 @@ void ImageDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
 
     if(filename != "")
     {
+#if QT_VERSION < 0x050000
         QStyleOptionViewItemV4 options = option;
+#else
+        QStyleOptionViewItem options = option;
+#endif
         initStyleOption(&options, index);
 
         QImage image(filename);

gui/nnotebookviewdelegate.cpp

@@ -34,7 +34,11 @@ NNotebookViewDelegate::NNotebookViewDelegate(QObject *parent) :
 
 
 void NNotebookViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const {
+#if QT_VERSION < 0x050000
     QStyleOptionViewItemV4 options = option;
+#else
+    QStyleOptionViewItem options = option;
+#endif
     initStyleOption(&options, index);
 
     options.widget->style()->drawControl(QStyle::CE_ItemViewItem, &options, painter);

gui/ntagviewdelegate.cpp

@@ -35,7 +35,11 @@ NTagViewDelegate::NTagViewDelegate(QObject *parent) :
 
 
 void NTagViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const {
+#if QT_VERSION < 0x050000
     QStyleOptionViewItemV4 options = option;
+#else
+    QStyleOptionViewItem options = option;
+#endif
     initStyleOption(&options, index);
 
     options.widget->style()->drawControl(QStyle::CE_ItemViewItem, &options, painter);

gui/ntrashviewdelegate.cpp

@@ -33,7 +33,11 @@ NTrashViewDelegate::NTrashViewDelegate(QObject *parent) :
 
 
 void NTrashViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const {
+#if QT_VERSION < 0x050000
     QStyleOptionViewItemV4 options = option;
+#else
+    QStyleOptionViewItem options = option;
+#endif
     initStyleOption(&options, index);
 
     painter->save();

gui/plugins/popplerviewer.cpp

@@ -155,7 +155,11 @@ void PopplerViewer::findNextPage(QStringList searchHits, QList<QRectF> *searchLo
 
     while (page < doc->numPages() && !found) {
         for (int i=0; i<searchHits.size(); i++) {
-            QList<QRectF> results = doc->page(page)->search(searchHits[i], Poppler::Page::CaseInsensitive);
+//#if QT_VERSION < 0x050000
+//            QList<QRectF> results = doc->page(page)->search(searchHits[i], Poppler::Page::CaseInsensitive);
+//#else
+            QList<QRectF> results = doc->page(page)->search(searchHits[i], Poppler::Page::IgnoreCase);
+//#endif
             searchLocations->append(results);
             if (results.size() > 0) {
                 currentPage = page;
@@ -179,7 +183,12 @@ QPixmap PopplerViewer::highlightImage() {
 
     QList<QRectF> searchLocations;
     for (int i=0; i<searchHits.size(); i++) {
-        searchLocations.append(doc->page(currentPage)->search(searchHits[i], Poppler::Page::CaseInsensitive));
+//        searchLocations.append(doc->page(currentPage)->search(searchHits[i], Poppler::Page::CaseInsensitive));
+//#if QT_VERSION < 0x050000
+//        searchLocations.append(doc->page(currentPage)->search(searchHits[i], Poppler::Page::CaseInsensitive));
+//#else
+        searchLocations.append(doc->page(currentPage)->search(searchHits[i],Poppler::Page::IgnoreCase));
+//#endif
     }
     for (int i=0; i<searchLocations.size(); i++) {
         QRectF highlightRect = searchLocations[i];

html/enmlformatter.cpp

@@ -29,12 +29,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <QIcon>
 #include <QMessageBox>
 
+
+/*
 #include <tidy.h>
 #ifndef _WIN32
 #include <buffio.h>
 #else
 #include <tidy/tidybuffio.h>
 #endif
+*/
+
 
 #include <iostream>
 using namespace std;
@@ -241,6 +245,8 @@ QByteArray EnmlFormatter::rebuildNoteEnml() {
     content = content.replace("<ac:rich-text-body", "<div");
     content = content.replace("</ac:rich-text-body", "</div");
 
+    bool useLegacyTidy = true;
+    /*
     // Run it through "tidy".  It is a program which will fix any invalid HTML
     // and give us the results back through stdout.  In a perfect world this
     // wouldn't be needed, but WebKit doesn't always give back good HTML.
@@ -310,7 +316,7 @@ QByteArray EnmlFormatter::rebuildNoteEnml() {
             tidyBufFree(&errout);
         tidyRelease(tdoc);
     }
-
+    */
 
     // IF the new tidy had an error, or we choose to use the old method
     if ((useLegacyTidy || !global.useLibTidy) && !global.bypassTidy) {

html/noteformatter.cpp

@@ -356,7 +356,11 @@ QString NoteFormatter::addImageHighlight(qint32 resLid, QString imgfile) {
     // Go through the "item" nodes
     bool found=false;
     QDomNodeList anchors = doc.elementsByTagName("item");
+#if QT_VERSION < 0x050000
+    for (unsigned int i=0; i<anchors.length(); i++) {
+#else
     for (int i=0; i<anchors.length(); i++) {
+#endif
         QDomElement element = anchors.at(i).toElement();
         int x = element.attribute("x").toInt();
         int y = element.attribute("y").toInt();
@@ -365,7 +369,11 @@ QString NoteFormatter::addImageHighlight(qint32 resLid, QString imgfile) {
 
         // Get all children ("t" nodes)
         QDomNodeList children = element.childNodes();
+#if QT_VERSION < 0x050000
+        for (unsigned int j=0; j<children.length(); j++) {
+#else
         for (int j=0; j<children.length(); j++) {
+#endif
             QDomElement child = children.at(j).toElement();
             if (child.nodeName().toLower() == "t") {
                 QString text = child.text();

logger/qslog.cpp

@@ -136,7 +136,7 @@ Logger::Helper::~Helper()
       // you shouldn't throw exceptions from a sink
       Q_UNUSED(e);
       assert(!"exception in logger helper destructor");
-      throw;
+      //throw;
    }
 }
 

logger/qslogdest.h

@@ -38,7 +38,8 @@ class Destination
    virtual ~Destination(){}
    virtual void write(const QString& message) = 0;
 };
-typedef std::auto_ptr<Destination> DestinationPtr;
+//typedef std::auto_ptr<Destination> DestinationPtr;
+typedef std::unique_ptr<Destination> DestinationPtr;
 
 //! Creates logging destinations/sinks. The caller will have ownership of
 //! the newly created destinations.

threads/indexrunner.cpp

@@ -304,8 +304,11 @@ void IndexRunner::indexRecognition(qint32 lid, Resource &r) {
 
     // look for text tags
     QDomNodeList anchors = doc.documentElement().elementsByTagName("t");
-
+#if QT_VERSION < 0x050000
+    for (unsigned int i=0; keepRunning && !pauseIndexing && i<anchors.length(); i++) {
+#else
     for (int i=0; keepRunning && !pauseIndexing && i<anchors.length(); i++) {
+#endif
         QApplication::processEvents();
         QDomElement enmedia = anchors.at(i).toElement();
         QString weight = enmedia.attribute("w");

utilities/noteindexer.cpp

@@ -200,7 +200,11 @@ void NoteIndexer::indexRecognition(qint32 reslid, Resource &r) {
     QLOG_TRACE() << "Beginning insertion of recognition:";
     QLOG_TRACE() << "Anchors found: " << anchors.length();
     sql.exec("begin;");
-    for (int i=0;  i<anchors.length(); i++) {
+#if QT_VERSION < 0x050000
+    for (unsigned int i=0;  i<anchors.length(); i++) {
+#else
+    for (int i=0; i<anchors.length(); i++) {
+#endif
         QLOG_TRACE() << "Anchor: " << i;
         QApplication::processEvents();
         QDomElement enmedia = anchors.at(i).toElement();