martin/kima2
1
1
Fork 0
Code Issues Pull requests Releases 26 Wiki Activity

code cleanup

Browse source
This commit is contained in:
Martin Brodbeck 2019-10-07 14:08:01 +02:00
parent 710b4cf9fb
commit 9fd29d588f
24 changed files with 60 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/gui/basketmodel.cpp
View file

@ -1,8 +1,8 @@
#include "basketmodel.h"
#include <QFont>
#include <QSettings>
#include <QFontDatabase>
#include <QSettings>
BasketModel::BasketModel(Marketplace* market, QObject* parent)
: QAbstractTableModel(parent), marketplace_(market)
@ -22,7 +22,7 @@ QVariant BasketModel::data(const QModelIndex& index, int role) const
QFont myFont;
QFont myFixedFont = QFontDatabase::systemFont(QFontDatabase::FixedFont);
if (myFixedFont.fixedPitch() == false) {
if (myFixedFont.fixedPitch() == false) {
myFixedFont.setFamily("monospace");
}

7
src/gui/basketmodel.h
View file

@ -7,7 +7,7 @@
class BasketModel : public QAbstractTableModel
{
Q_OBJECT
Q_OBJECT
public:
explicit BasketModel(Marketplace* market, QObject* parent = nullptr);
@ -15,15 +15,12 @@ class BasketModel : public QAbstractTableModel
virtual int columnCount(const QModelIndex& parent = QModelIndex()) const override;
virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
virtual QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
//virtual Qt::ItemFlags flags(const QModelIndex& index) const override;
//virtual bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override;
//virtual bool insertRows(int row, int count, const QModelIndex& parent = QModelIndex()) override;
void addArticle(Seller* seller, int price, const std::string& desc);
void finishSale();
void cancelSale();
virtual bool removeRows(int row, int count, const QModelIndex& parent = QModelIndex()) override;
signals:
signals:
void basketDataChanged();
private:

8
src/gui/kima2.cpp
View file

@ -19,14 +19,6 @@ int main(int argc, char* argv[])
QCoreApplication::setOrganizationDomain("rustysoft.de");
QCoreApplication::setApplicationName("kima2");
// Make sure that only one instance of the application runs
// Of course the uuid used here is unique to this application
// (commented out in favour of SingleApplication)
/*QSharedMemory shared("26297455-946a-4607-bfb7-5025a5f1e136");
if (!shared.create(512, QSharedMemory::ReadWrite)) {
exit(0);
}*/
QTranslator qTranslator;
QLocale german(QLocale::German);
#ifdef __linux__

2
src/gui/mainwindow.h
View file

@ -29,7 +29,7 @@ class MainWindow : public QMainWindow
void onCancelAllArticlesButtonClicked(bool checked);
void onAboutQt();
void onAbout();
virtual bool eventFilter(QObject *target, QEvent *event) override;
virtual bool eventFilter(QObject* target, QEvent* event) override;
protected:
virtual void closeEvent(QCloseEvent* event) override;

5
src/gui/pricedialog.cpp
View file

@ -33,7 +33,4 @@ void PriceDialog::accept()
}
}
void PriceDialog::setForceDesc(bool force)
{
forceDesc_ = force;
}
void PriceDialog::setForceDesc(bool force) { forceDesc_ = force; }

3
src/gui/reportdialog.h
View file

@ -24,7 +24,8 @@ class ReportDialog : public QDialog
void onReportViewSelectionChanged(const QItemSelection& selected,
const QItemSelection& deselected);
private : Ui::ReportDialog ui_;
private:
Ui::ReportDialog ui_;
Marketplace* market_;
std::unique_ptr<ReportModel> model_;
};

2
src/gui/salemodel.h
View file

@ -12,7 +12,7 @@ class SaleModel : public QAbstractItemModel
public:
explicit SaleModel(Marketplace* market, QObject* parent = nullptr);
virtual QModelIndex index(int row, int column,
const QModelIndex& parent = QModelIndex()) const override;
const QModelIndex& parent = QModelIndex()) const override;
virtual QModelIndex parent(const QModelIndex& index) const override;
virtual QVariant data(const QModelIndex& index, int role) const override;
virtual int rowCount(const QModelIndex& parent) const override;

3
src/gui/sellermodel.cpp
View file

@ -26,9 +26,6 @@ QVariant SellerModel::data(const QModelIndex& index, int role) const
Seller* seller = marketplace_->getSellers().at(index.row()).get();
/* if (seller->getState() == Seller::State::DELETE)
return QVariant();
*/
switch (index.column()) {
case 0:
return seller->getId();

5
src/gui/sellermodel.h
View file

@ -7,7 +7,7 @@
class SellerModel : public QAbstractTableModel
{
Q_OBJECT
Q_OBJECT
public:
explicit SellerModel(Marketplace* market, QObject* parent = nullptr);
@ -16,7 +16,8 @@ class SellerModel : public QAbstractTableModel
virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
virtual QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
virtual Qt::ItemFlags flags(const QModelIndex& index) const override;
virtual bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override;
virtual bool setData(const QModelIndex& index, const QVariant& value,
int role = Qt::EditRole) override;
virtual bool insertRows(int row, int count, const QModelIndex& parent = QModelIndex()) override;
virtual bool removeRows(int row, int count, const QModelIndex& parent = QModelIndex()) override;