Qt5 Upgrade: Code changes for compilation

Brewtarget · Nov 2, 2014 · 6f6315d · 6f6315d
1 parent 272378c
commit 6f6315d
Show file tree

Hide file tree

Showing 19 changed files with 63 additions and 59 deletions.
diff --git a/src/BtTreeModel.cpp b/src/BtTreeModel.cpp
@@ -24,6 +24,7 @@
 #include <Qt>
 #include <QObject>
 #include <QStringBuilder>
+#include <QMimeData>
 
 #include "brewtarget.h"
 #include "BtTreeItem.h"

diff --git a/src/BtTreeView.cpp b/src/BtTreeView.cpp
@@ -24,6 +24,7 @@
 #include <QDebug>
 #include <QHeaderView>
 #include <QMessageBox>
+#include <QMimeData>
 #include "BtTreeView.h"
 #include "BtTreeModel.h"
 #include "BtTreeFilterProxyModel.h"

diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
@@ -55,6 +55,7 @@
 #include <QLinearGradient>
 #include <QBrush>
 #include <QPen>
+#include <QDesktopWidget>
 
 #include "Algorithms.h"
 #include "MashStepEditor.h"
@@ -2156,12 +2157,12 @@ QFile* MainWindow::openForWrite( QString filterStr, QString defaultSuff)
    const char* filename;
    QFile* outFile = new QFile();
 
-   fileSaver->setFilter( filterStr );
+   fileSaver->setNameFilter( filterStr );
    fileSaver->setDefaultSuffix( defaultSuff );
 
    if( fileSaver->exec() )
    {
-      filename = fileSaver->selectedFiles()[0].toAscii();
+      filename = fileSaver->selectedFiles()[0].toLatin1();
       outFile->setFileName(filename);
 
       if( ! outFile->open(QIODevice::WriteOnly | QIODevice::Truncate) )

diff --git a/src/MashListModel.cpp b/src/MashListModel.cpp
@@ -23,6 +23,7 @@
 #include "style.h"
 #include "database.h"
 #include "recipe.h"
+#include "mash.h"
 
 MashListModel::MashListModel(QWidget* parent)
    : QAbstractListModel(parent), recipe(0)

diff --git a/src/MashStepTableModel.cpp b/src/MashStepTableModel.cpp
@@ -102,8 +102,6 @@ void MashStepTableModel::mashStepChanged(QMetaProperty prop, QVariant val)
       emit dataChanged( QAbstractItemModel::createIndex(i, 0),
                         QAbstractItemModel::createIndex(i, MASHSTEPNUMCOLS-1));
    }
-   else
-      reset();
 
    if( parentTableWidget )
    {

diff --git a/src/OptionDialog.cpp b/src/OptionDialog.cpp
@@ -287,7 +287,7 @@ void OptionDialog::saveAndClose()
    newUserDataDir = lineEdit_dbDir->text();
 
    // Make sure the dir ends with a "/" or "\"
-#if defined(Q_WS_X11) || defined(Q_WS_MAC)
+#if defined(Q_OS_LINUX) || defined(Q_OS_MAC)
    if( !newUserDataDir.endsWith("/") )
       newUserDataDir += "/";
 #else
@@ -366,45 +366,45 @@ void OptionDialog::showChanges()
    switch( Brewtarget::weightUnitSystem )
    {
       case Imperial:
-         weight_imperial->setChecked(TRUE);
+         weight_imperial->setChecked(true);
          break;
       case USCustomary:
-         weight_us->setChecked(TRUE);
+         weight_us->setChecked(true);
          break;
       case SI:
       default:
-         weight_si->setChecked(TRUE);
+         weight_si->setChecked(true);
    }
 
    // Check the right volume unit system box.
    switch( Brewtarget::volumeUnitSystem )
    {
       case Imperial:
-         volume_imperial->setChecked(TRUE);
+         volume_imperial->setChecked(true);
          break;
       case USCustomary:
-         volume_us->setChecked(TRUE);
+         volume_us->setChecked(true);
          break;
       case SI:
       default:
-         volume_si->setChecked(TRUE);
+         volume_si->setChecked(true);
    }
 
    // Check gravity.
    if( Brewtarget::usePlato )
-      radioButton_plato->setChecked(TRUE);
+      radioButton_plato->setChecked(true);
    else
-      radioButton_sg->setChecked(TRUE);
+      radioButton_sg->setChecked(true);
 
    // Temp.
    switch( Brewtarget::tempScale )
    {
       case Fahrenheit:
-         fahrenheit->setChecked(TRUE);
+         fahrenheit->setChecked(true);
          break;
       case Celsius:
       default:
-         celsius->setChecked(TRUE);
+         celsius->setChecked(true);
          break;
   }
 

diff --git a/src/WaterTableModel.cpp b/src/WaterTableModel.cpp
@@ -91,9 +91,10 @@ void WaterTableModel::addWater(Water* water)
    )
       return;
 
+   beginInsertRows( QModelIndex(), waterObs.size(), waterObs.size() );
    waterObs.append(water);
    connect( water, SIGNAL(changed(QMetaProperty,QVariant)), this, SLOT(changed(QMetaProperty,QVariant)) );
-   reset(); // Tell everybody that the table has changed.
+   endInsertRows();
 
    if(parentTableWidget)
    {
@@ -140,9 +141,10 @@ void WaterTableModel::removeWater(Water* water)
    i = waterObs.indexOf(water);
    if( i >= 0 )
    {
+      beginRemoveRows( QModelIndex(), i, i );
       disconnect( water, 0, this, 0 );
       waterObs.removeAt(i);
-      reset(); // Tell everybody the table has changed.
+      endRemoveRows();
 
       if(parentTableWidget)
       {

diff --git a/src/brewnote.cpp b/src/brewnote.cpp
@@ -32,6 +32,9 @@
 #include "Algorithms.h"
 #include "mashstep.h"
 #include "recipe.h"
+#include "equipment.h"
+#include "mash.h"
+#include "yeast.h"
 
 QHash<QString,QString> BrewNote::tagToProp = BrewNote::tagToPropHash();
 

diff --git a/src/brewnote.h b/src/brewnote.h
@@ -28,11 +28,6 @@
 #include <QStringList>
 #include <QDate>
 
-#include "equipment.h"
-#include "mash.h"
-#include "mashstep.h"
-#include "yeast.h"
-
 #include "BeerXMLElement.h"
 
 // Forward declarations;
@@ -204,6 +199,8 @@ class BrewNote : public BeerXMLElement
    static QHash<QString,QString> tagToProp;
 };
 
+Q_DECLARE_METATYPE( QList<BrewNote*> )
+
 inline bool BrewNotePtrLt( BrewNote* lhs, BrewNote* rhs)
 {
    return *lhs < *rhs;

diff --git a/src/brewtarget.cpp b/src/brewtarget.cpp
@@ -65,6 +65,9 @@
 #include "ImperialVolumeUnitSystem.h"
 #include "BtSplashScreen.h"
 #include "MainWindow.h"
+#include "mash.h"
+#include "instruction.h"
+#include "water.h"
 
 MainWindow* Brewtarget::_mainWindow = 0;
 QDomDocument* Brewtarget::optionsDoc;
@@ -274,19 +277,21 @@ TempScale Brewtarget::getTemperatureScale()
 QString Brewtarget::getDataDir()
 {
    QString dir = qApp->applicationDirPath();
-#if defined(Q_WS_X11) // Linux OS.
+#if defined(Q_OS_LINUX) // Linux OS.
 
    dir = QString(CONFIGDATADIR);
 
-#elif defined(Q_WS_MAC) // MAC OS.
+#elif defined(Q_OS_MAC) // MAC OS.
 
    // We should be inside an app bundle.
    dir += "/../Resources/";
 
-#else // Windows OS.
+#elif defined(Q_OS_WIN) // Windows OS.
 
    dir += "/../data/";
 
+#else
+# error "Unsupported OS"
 #endif
 
    if( ! dir.endsWith('/') )
@@ -298,19 +303,21 @@ QString Brewtarget::getDataDir()
 QString Brewtarget::getDocDir()
 {
    QString dir = qApp->applicationDirPath();
-#if defined(Q_WS_X11) // Linux OS.
+#if defined(Q_OS_LINUX) // Linux OS.
 
    dir = QString(CONFIGDOCDIR);
 
-#elif defined(Q_WS_MAC) // MAC OS.
+#elif defined(Q_OS_MAC) // MAC OS.
 
    // We should be inside an app bundle.
    dir += "/../Resources/en.lproj/";
 
-#else // Windows OS.
+#elif defined(Q_OS_WIN) // Windows OS.
 
    dir += "/../doc/";
 
+#else
+# error "Unsupported OS"
 #endif
 
    if( ! dir.endsWith('/') )
@@ -321,7 +328,7 @@ QString Brewtarget::getDocDir()
 
 QString Brewtarget::getConfigDir(bool *success)
 {
-#if defined(Q_WS_X11) || defined(Q_WS_MAC) // Linux OS or Mac OS.
+#if defined(Q_OS_LINUX) || defined(Q_OS_MAC) // Linux OS or Mac OS.
 
    QDir dir;
    QFileInfo fileInfo;
@@ -397,7 +404,7 @@ QString Brewtarget::getConfigDir(bool *success)
       *success = true;
    return dir.absolutePath() + "/";
 
-#else // Windows OS.
+#elif defined(Q_OS_WIN) // Windows OS.
 
    QDir dir;
    // This is the bin/ directory.
@@ -410,7 +417,10 @@ QString Brewtarget::getConfigDir(bool *success)
       *success = true;
    return dir.absolutePath() + "/";
 
+#else
+# error "Unsupported OS"
 #endif
+
 }
 
 QString Brewtarget::getUserDataDir()
@@ -438,7 +448,7 @@ bool Brewtarget::initialize()
    qRegisterMetaType< QList<Water*> >();
 
    // In Unix, make sure the user isn't running 2 copies.
-#if defined(Q_WS_X11)
+#if defined(Q_OS_LINUX)
    pidFile.setFileName(QString("%1.pid").arg(getUserDataDir()));
    if( pidFile.exists() )
    {
@@ -488,7 +498,7 @@ bool Brewtarget::initialize()
 
    loadTranslations(); // Do internationalization.
 
-#if defined(Q_WS_MAC)
+#if defined(Q_OS_MAC)
    qt_set_sequence_auto_mnemonic(TRUE); // turns on Mac Keyboard shortcuts
 #endif
 
@@ -527,7 +537,7 @@ void Brewtarget::cleanup()
    delete _mainWindow;
 
    Database::dropInstance();
-#if defined(Q_WS_X11)
+#if defined(Q_OS_LINUX)
    pidFile.remove();
 #endif
 

diff --git a/src/brewtarget.h b/src/brewtarget.h
@@ -46,30 +46,11 @@ extern void qt_set_sequence_auto_mnemonic(bool b);
 #include <QList>
 #include "UnitSystem.h"
 
-// Forward declarations.
 class BeerXMLElement;
-class BrewNote;
-class Equipment;
-class Fermentable;
-class Hop;
-class Instruction;
 class MainWindow;
-class Mash;
-class Misc;
-class Style;
-class Unit;
-class Water;
-class Yeast;
 
 // Need these for changed(QMetaProperty,QVariant) to be emitted across threads.
 Q_DECLARE_METATYPE( QMetaProperty )
-Q_DECLARE_METATYPE( QList<BrewNote*> )
-Q_DECLARE_METATYPE( QList<Hop*> )
-Q_DECLARE_METATYPE( QList<Instruction*> )
-Q_DECLARE_METATYPE( QList<Fermentable*> )
-Q_DECLARE_METATYPE( QList<Misc*> )
-Q_DECLARE_METATYPE( QList<Yeast*> )
-Q_DECLARE_METATYPE( QList<Water*> )
 
 /*!
  * \class Brewtarget

diff --git a/src/equipment.h b/src/equipment.h
@@ -25,12 +25,6 @@
 #include <QDomNode>
 #include "BeerXMLElement.h"
 
-// Forward declarations.
-class Equipment;
-class EquipmentException;
-bool operator<(Equipment &e1, Equipment &e2);
-bool operator==(Equipment &e1, Equipment &e2);
-
 /*!
  * \class Equipment
  * \author Philip G. Lee
@@ -160,6 +154,9 @@ class Equipment : public BeerXMLElement
 
 Q_DECLARE_METATYPE( Equipment* )
 
+bool operator<(Equipment &e1, Equipment &e2);
+bool operator==(Equipment &e1, Equipment &e2);
+
 inline bool EquipmentPtrLt( Equipment* lhs, Equipment* rhs)
 {
    return *lhs < *rhs;

diff --git a/src/fermentable.h b/src/fermentable.h
@@ -190,6 +190,8 @@ class Fermentable : public BeerXMLElement
    static QHash<QString,QString> tagToPropHash();
 };
 
+Q_DECLARE_METATYPE( QList<Fermentable*> )
+
 inline bool FermentablePtrLt( Fermentable* lhs, Fermentable* rhs)
 {
    return *lhs < *rhs;

diff --git a/src/hop.h b/src/hop.h
@@ -178,6 +178,8 @@ class Hop : public BeerXMLElement
    static QHash<QString,QString> tagToPropHash();
 };
 
+Q_DECLARE_METATYPE( QList<Hop*> )
+
 inline bool HopPtrLt( Hop* lhs, Hop* rhs)
 {
    return *lhs < *rhs;

diff --git a/src/instruction.h b/src/instruction.h
@@ -23,7 +23,6 @@
 #define _INSTRUCTION_H
 
 // This class is completely outside the BeerXML spec.
-class Instruction;
 
 #include <QString>
 #include <QVector>
@@ -101,6 +100,8 @@ class Instruction : public BeerXMLElement
    static QHash<QString,QString> tagToPropHash();
 };
 
+Q_DECLARE_METATYPE( QList<Instruction*> )
+
 //! \brief Compares Instruction pointers by Instruction::instructionNumber().
 inline bool insPtrLtByNumber( Instruction* lhs, Instruction* rhs)
 {

diff --git a/src/misc.h b/src/misc.h
@@ -132,6 +132,8 @@ class Misc : public BeerXMLElement
    static QHash<QString,QString> tagToPropHash();
 };
 
+Q_DECLARE_METATYPE( QList<Misc*> )
+
 inline bool MiscPtrLt( Misc* lhs, Misc* rhs)
 {
    return lhs->name() < rhs->name();

diff --git a/src/recipe.h b/src/recipe.h
@@ -49,6 +49,7 @@ class Water;
 class Instruction;
 class PreInstruction;
 class BrewNote;
+class MashStep;
 
 //! \brief Compares recipes based on name.
 bool operator<(Recipe &r1, Recipe &r2 );