From ce74100e632dbc94d1248776c4ce49c05889f1e3 Mon Sep 17 00:00:00 2001 From: Unai IRIGOYEN Date: Thu, 16 Sep 2010 16:46:35 +0200 Subject: [PATCH] Qt creator 2 adaptations --- code/.gitignore | 7 + code/family-shop-mgr/.gitignore | 7 - code/family-shop-mgr/GUI/FamilyShopManager.cpp | 80 +++++ code/family-shop-mgr/GUI/FamilyShopManager.h | 39 +++ code/family-shop-mgr/GUI/FamilyShopManagerPC.cpp | 80 ----- code/family-shop-mgr/GUI/FamilyShopManagerPC.h | 39 --- code/family-shop-mgr/family-shop-mgr.pro | 4 +- code/family-shop-mgr/family-shop-mgr.pro.user | 322 ++++++--------------- code/family-shop-mgr/family-shop-mgr.pro.user.1.3 | 245 ++++++++++++++++ code/family-shop-mgr/main.cpp | 10 +- code/family-shop-mgr/model/ShoppingTreeModel.cpp | 4 +- code/family-shop-mgr/model/ShoppingTreeModel.h | 4 +- 12 files changed, 477 insertions(+), 364 deletions(-) create mode 100644 code/.gitignore delete mode 100644 code/family-shop-mgr/.gitignore create mode 100644 code/family-shop-mgr/GUI/FamilyShopManager.cpp create mode 100644 code/family-shop-mgr/GUI/FamilyShopManager.h delete mode 100644 code/family-shop-mgr/GUI/FamilyShopManagerPC.cpp delete mode 100644 code/family-shop-mgr/GUI/FamilyShopManagerPC.h create mode 100644 code/family-shop-mgr/family-shop-mgr.pro.user.1.3 diff --git a/code/.gitignore b/code/.gitignore new file mode 100644 index 0000000..51e1ff7 --- /dev/null +++ b/code/.gitignore @@ -0,0 +1,7 @@ +*build* +tmp +Makefile +*.bak +ShoppingList.xml +ui_*.h + diff --git a/code/family-shop-mgr/.gitignore b/code/family-shop-mgr/.gitignore deleted file mode 100644 index 9595d7e..0000000 --- a/code/family-shop-mgr/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -build -tmp -Makefile -*.bak -ShoppingList.xml -ui_*.h - diff --git a/code/family-shop-mgr/GUI/FamilyShopManager.cpp b/code/family-shop-mgr/GUI/FamilyShopManager.cpp new file mode 100644 index 0000000..8d6ee75 --- /dev/null +++ b/code/family-shop-mgr/GUI/FamilyShopManager.cpp @@ -0,0 +1,80 @@ +#include "FamilyShopManager.h" +#include "ui_FamilyShopManagerPC.h" + +#include + +FamilyShopManager::FamilyShopManager(QWidget *parent) : + QMainWindow(parent), + ui(new Ui::FamilyShopManagerPC) +{ + ui->setupUi(this); + + connect(ui->actionEdit_shopping_list, SIGNAL(triggered()), this, SLOT(showEditMode())); + connect(ui->actionGo_shopping, SIGNAL(triggered()), this, SLOT(showShoppingMode())); + + connect(ui->actionAdd_category, SIGNAL(triggered()), this, SLOT(addCategory())); + connect(ui->actionAdd_item, SIGNAL(triggered()), this, SLOT(addItem())); + connect(ui->actionRemove, SIGNAL(triggered()), this, SLOT(remove())); + +} + +FamilyShopManager::~FamilyShopManager() +{ + delete ui; +} + +void FamilyShopManager::changeEvent(QEvent *e) +{ + QMainWindow::changeEvent(e); + switch (e->type()) { + case QEvent::LanguageChange: + ui->retranslateUi(this); + break; + default: + break; + } +} + +void FamilyShopManager::setModel(QAbstractItemModel *model) +{ + ui->listTreeView->setModel(model); +} + +void FamilyShopManager::showEditMode() +{ + +} + +void FamilyShopManager::showShoppingMode() +{ + +} + +void FamilyShopManager::addCategory() +{ + bool ok = false; + QString name = QInputDialog::getText(this, tr("Enter category name"), tr("Category name"), + QLineEdit::Normal, "", &ok); + + if(ok) + { + emit addCategory(ui->listTreeView->currentIndex(), name); + } +} + +void FamilyShopManager::addItem() +{ + bool ok = false; + QString name = QInputDialog::getText(this, tr("Enter item name"), tr("Item name"), + QLineEdit::Normal, "", &ok); + + if(ok) + { + emit addItem(ui->listTreeView->currentIndex(), name); + } +} + +void FamilyShopManager::remove() +{ + emit removeSignal(ui->listTreeView->currentIndex()); +} diff --git a/code/family-shop-mgr/GUI/FamilyShopManager.h b/code/family-shop-mgr/GUI/FamilyShopManager.h new file mode 100644 index 0000000..52d76d9 --- /dev/null +++ b/code/family-shop-mgr/GUI/FamilyShopManager.h @@ -0,0 +1,39 @@ +#ifndef FAMILYSHOPMANAGERPC_H +#define FAMILYSHOPMANAGERPC_H + +#include +#include + +namespace Ui { + class FamilyShopManagerPC; +} + +class FamilyShopManager : public QMainWindow { + Q_OBJECT +public: + FamilyShopManager(QWidget *parent = 0); + ~FamilyShopManager(); + + void setModel(QAbstractItemModel* model); + +public slots: + void showEditMode(); + void showShoppingMode(); + + void addCategory(); + void addItem(); + void remove(); + +signals: + void addCategory(const QModelIndex &index, QString name); + void addItem(const QModelIndex &index, QString name); + void removeSignal(QModelIndex index); + +protected: + void changeEvent(QEvent *e); + +private: + Ui::FamilyShopManagerPC *ui; +}; + +#endif // FAMILYSHOPMANAGERPC_H diff --git a/code/family-shop-mgr/GUI/FamilyShopManagerPC.cpp b/code/family-shop-mgr/GUI/FamilyShopManagerPC.cpp deleted file mode 100644 index 584df60..0000000 --- a/code/family-shop-mgr/GUI/FamilyShopManagerPC.cpp +++ /dev/null @@ -1,80 +0,0 @@ -#include "FamilyShopManagerPC.h" -#include "ui_FamilyShopManagerPC.h" - -#include - -FamilyShopManagerPC::FamilyShopManagerPC(QWidget *parent) : - QMainWindow(parent), - ui(new Ui::FamilyShopManagerPC) -{ - ui->setupUi(this); - - connect(ui->actionEdit_shopping_list, SIGNAL(triggered()), this, SLOT(showEditMode())); - connect(ui->actionGo_shopping, SIGNAL(triggered()), this, SLOT(showShoppingMode())); - - connect(ui->actionAdd_category, SIGNAL(triggered()), this, SLOT(addCategory())); - connect(ui->actionAdd_item, SIGNAL(triggered()), this, SLOT(addItem())); - connect(ui->actionRemove, SIGNAL(triggered()), this, SLOT(remove())); - -} - -FamilyShopManagerPC::~FamilyShopManagerPC() -{ - delete ui; -} - -void FamilyShopManagerPC::changeEvent(QEvent *e) -{ - QMainWindow::changeEvent(e); - switch (e->type()) { - case QEvent::LanguageChange: - ui->retranslateUi(this); - break; - default: - break; - } -} - -void FamilyShopManagerPC::setModel(QAbstractItemModel *model) -{ - ui->listTreeView->setModel(model); -} - -void FamilyShopManagerPC::showEditMode() -{ - -} - -void FamilyShopManagerPC::showShoppingMode() -{ - -} - -void FamilyShopManagerPC::addCategory() -{ - bool ok = false; - QString name = QInputDialog::getText(this, tr("Enter category name"), tr("Category name"), - QLineEdit::Normal, "", &ok); - - if(ok) - { - emit addCategory(ui->listTreeView->currentIndex(), name); - } -} - -void FamilyShopManagerPC::addItem() -{ - bool ok = false; - QString name = QInputDialog::getText(this, tr("Enter item name"), tr("Item name"), - QLineEdit::Normal, "", &ok); - - if(ok) - { - emit addItem(ui->listTreeView->currentIndex(), name); - } -} - -void FamilyShopManagerPC::remove() -{ - emit removeSignal(ui->listTreeView->currentIndex()); -} diff --git a/code/family-shop-mgr/GUI/FamilyShopManagerPC.h b/code/family-shop-mgr/GUI/FamilyShopManagerPC.h deleted file mode 100644 index 6eeb08b..0000000 --- a/code/family-shop-mgr/GUI/FamilyShopManagerPC.h +++ /dev/null @@ -1,39 +0,0 @@ -#ifndef FAMILYSHOPMANAGERPC_H -#define FAMILYSHOPMANAGERPC_H - -#include -#include - -namespace Ui { - class FamilyShopManagerPC; -} - -class FamilyShopManagerPC : public QMainWindow { - Q_OBJECT -public: - FamilyShopManagerPC(QWidget *parent = 0); - ~FamilyShopManagerPC(); - - void setModel(QAbstractItemModel* model); - -public slots: - void showEditMode(); - void showShoppingMode(); - - void addCategory(); - void addItem(); - void remove(); - -signals: - void addCategory(QModelIndex index, QString name); - void addItem(QModelIndex index, QString name); - void removeSignal(QModelIndex index); - -protected: - void changeEvent(QEvent *e); - -private: - Ui::FamilyShopManagerPC *ui; -}; - -#endif // FAMILYSHOPMANAGERPC_H diff --git a/code/family-shop-mgr/family-shop-mgr.pro b/code/family-shop-mgr/family-shop-mgr.pro index 393d48e..507f6bf 100644 --- a/code/family-shop-mgr/family-shop-mgr.pro +++ b/code/family-shop-mgr/family-shop-mgr.pro @@ -8,10 +8,10 @@ INCLUDEPATH += model \ GUI \ sync SOURCES += main.cpp \ - GUI/FamilyShopManagerPC.cpp \ + GUI/FamilyShopManager.cpp \ model/ShoppingTreeModel.cpp \ model/ShoppingTreeItem.cpp -HEADERS += GUI/FamilyShopManagerPC.h \ +HEADERS += GUI/FamilyShopManager.h \ model/ShoppingTreeItem.h \ model/ShoppingTreeModel.h FORMS += GUI/FamilyShopManagerPC.ui diff --git a/code/family-shop-mgr/family-shop-mgr.pro.user b/code/family-shop-mgr/family-shop-mgr.pro.user index d914ccd..cda9967 100644 --- a/code/family-shop-mgr/family-shop-mgr.pro.user +++ b/code/family-shop-mgr/family-shop-mgr.pro.user @@ -1,245 +1,113 @@ - RunConfiguration0-BaseEnvironmentBase - 2 - - - RunConfiguration0-CommandLineArguments - - - - RunConfiguration0-ProFile - family-shop-mgr.pro - - - RunConfiguration0-RunConfiguration.name - family-shop-mgr - - - RunConfiguration0-UseDyldImageSuffix - false - - - RunConfiguration0-UseTerminal - false - - - RunConfiguration0-UserEnvironmentChanges - - - - RunConfiguration0-UserSetName - false - - - RunConfiguration0-UserSetWorkingDirectory - false - - - RunConfiguration0-UserWorkingDirectory - - - - RunConfiguration0-type - Qt4ProjectManager.Qt4RunConfiguration - - - activeRunConfiguration + ProjectExplorer.Project.ActiveTarget 0 - activebuildconfiguration - Debug - - - buildConfiguration-Debug - - Debug - 0 - 0 - - 2 - - - - buildConfiguration-Release - - Release - 0 - - 0 - - - - buildconfiguration-Debug-buildstep0 - - Debug - - DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-fGFreQMQCi,guid=40982632b0a35018e38badbd4c4c0958 - DESKTOP_SESSION=default - DISPLAY=:0.0 - DM_CONTROL=/var/run/xdmctl - GPG_AGENT_INFO=/tmp/gpg-zBm3MG/S.gpg-agent:1465:1 - GS_LIB=/home/onil/.fonts - GTK2_RC_FILES=/etc/gtk-2.0/gtkrc:/home/onil/.gtkrc-2.0:/home/onil/.gtkrc-2.0-kde4:/home/onil/.kde/share/config/gtkrc-2.0 - GTK_RC_FILES=/etc/gtk/gtkrc:/home/onil/.gtkrc::/home/onil/.kde/share/config/gtkrc - HOME=/home/onil - KDE_FULL_SESSION=true - KDE_MULTIHEAD=false - KDE_SESSION_UID=1000 - KDE_SESSION_VERSION=4 - LANG=fr_FR.UTF-8 - LD_LIBRARY_PATH=/usr/lib/qtcreator: - LOGNAME=onil - PATH=/usr/bin:/home/onil/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games - PWD=/home/onil/Documents - QTDIR=/usr/share/qt4 - QT_PLUGIN_PATH=/home/onil/.kde/lib/kde4/plugins/:/usr/lib/kde4/plugins/ - SESSION_MANAGER=local/onil-netbook:@/tmp/.ICE-unix/1603,unix/onil-netbook:/tmp/.ICE-unix/1603 - SHELL=/bin/bash - SHLVL=0 - SSH_AGENT_PID=1464 - SSH_AUTH_SOCK=/tmp/ssh-vgudGK1419/agent.1419 - USER=onil - WINDOWPATH=7 - XCURSOR_THEME=oxy-white - XDG_DATA_DIRS=/usr/share:/usr/share:/usr/local/share - XDG_SESSION_COOKIE=4cb4c39594fcf9ea2256393c4c2e6053-1280051542.996827-333265015 - XDM_MANAGED=method=classic - - - /home/onil/Documents/Programmation/FamilyShoppingManager/family-shop-mgr/code/family-shop-mgr/family-shop-mgr.pro - -spec - linux-g++ - -r - CONFIG+=debug - - /usr/bin/qmake-qt4 - false - /home/onil/Documents/Programmation/FamilyShoppingManager/family-shop-mgr/code/family-shop-mgr - - - - buildconfiguration-Debug-buildstep1 + ProjectExplorer.Project.EditorSettings - Debug - - DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-fGFreQMQCi,guid=40982632b0a35018e38badbd4c4c0958 - DESKTOP_SESSION=default - DISPLAY=:0.0 - DM_CONTROL=/var/run/xdmctl - GPG_AGENT_INFO=/tmp/gpg-zBm3MG/S.gpg-agent:1465:1 - GS_LIB=/home/onil/.fonts - GTK2_RC_FILES=/etc/gtk-2.0/gtkrc:/home/onil/.gtkrc-2.0:/home/onil/.gtkrc-2.0-kde4:/home/onil/.kde/share/config/gtkrc-2.0 - GTK_RC_FILES=/etc/gtk/gtkrc:/home/onil/.gtkrc::/home/onil/.kde/share/config/gtkrc - HOME=/home/onil - KDE_FULL_SESSION=true - KDE_MULTIHEAD=false - KDE_SESSION_UID=1000 - KDE_SESSION_VERSION=4 - LANG=fr_FR.UTF-8 - LD_LIBRARY_PATH=/usr/lib/qtcreator: - LOGNAME=onil - PATH=/usr/bin:/home/onil/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games - PWD=/home/onil/Documents - QTDIR=/usr/share/qt4 - QT_PLUGIN_PATH=/home/onil/.kde/lib/kde4/plugins/:/usr/lib/kde4/plugins/ - SESSION_MANAGER=local/onil-netbook:@/tmp/.ICE-unix/1603,unix/onil-netbook:/tmp/.ICE-unix/1603 - SHELL=/bin/bash - SHLVL=0 - SSH_AGENT_PID=1464 - SSH_AUTH_SOCK=/tmp/ssh-vgudGK1419/agent.1419 - USER=onil - WINDOWPATH=7 - XCURSOR_THEME=oxy-white - XDG_DATA_DIRS=/usr/share:/usr/share:/usr/local/share - XDG_SESSION_COOKIE=4cb4c39594fcf9ea2256393c4c2e6053-1280051542.996827-333265015 - XDM_MANAGED=method=classic - - false - - -w - - /usr/bin/make - true - /home/onil/Documents/Programmation/FamilyShoppingManager/family-shop-mgr/code/family-shop-mgr + UTF-8 - buildconfiguration-Debug-cleanstep0 + ProjectExplorer.Project.Target.0 - Debug - true - - clean - + Desktop + Qt4ProjectManager.Target.DesktopTarget + 0 + 0 + + + + QtProjectManager.QMakeBuildStep + + + + + Qt4ProjectManager.MakeStep + false + + + + 2 + + + Qt4ProjectManager.MakeStep + true + + clean + + + + 1 + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + /home/onil/Documents/Programmation/FamilyShoppingManager/family-shop-mgr/code/family-shop-mgr-build-desktop + 2 + 0 + true + + + + + QtProjectManager.QMakeBuildStep + + + + + Qt4ProjectManager.MakeStep + false + + + + 2 + + + Qt4ProjectManager.MakeStep + true + + + + 1 + false + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + /home/onil/Documents/Programmation/FamilyShoppingManager/family-shop-mgr/code/family-shop-mgr-build-desktop + 2 + 0 + true + + 2 + + family-shop-mgr + Qt4ProjectManager.Qt4RunConfiguration + 2 + + /home/onil/Documents/Programmation/FamilyShoppingManager/family-shop-mgr/code/ShoppingList.xml + + family-shop-mgr.pro + false + false + + false + false + + + 1 - buildconfiguration-Release-buildstep0 - - Release - - - - buildconfiguration-Release-buildstep1 - - Release - - - - buildconfiguration-Release-cleanstep0 - - Release - - - - buildconfigurations - - Debug - Release - - - - buildstep0 - - - - - - - buildstep1 - - - - - - buildsteps - - trolltech.qt4projectmanager.qmake - trolltech.qt4projectmanager.make - - - - cleanstep0 - - - true - - - - cleansteps - - trolltech.qt4projectmanager.make - - - - defaultFileEncoding - UTF-8 + ProjectExplorer.Project.TargetCount + 1 - project - + ProjectExplorer.Project.Updater.FileVersion + 4 diff --git a/code/family-shop-mgr/family-shop-mgr.pro.user.1.3 b/code/family-shop-mgr/family-shop-mgr.pro.user.1.3 new file mode 100644 index 0000000..d914ccd --- /dev/null +++ b/code/family-shop-mgr/family-shop-mgr.pro.user.1.3 @@ -0,0 +1,245 @@ + + + + RunConfiguration0-BaseEnvironmentBase + 2 + + + RunConfiguration0-CommandLineArguments + + + + RunConfiguration0-ProFile + family-shop-mgr.pro + + + RunConfiguration0-RunConfiguration.name + family-shop-mgr + + + RunConfiguration0-UseDyldImageSuffix + false + + + RunConfiguration0-UseTerminal + false + + + RunConfiguration0-UserEnvironmentChanges + + + + RunConfiguration0-UserSetName + false + + + RunConfiguration0-UserSetWorkingDirectory + false + + + RunConfiguration0-UserWorkingDirectory + + + + RunConfiguration0-type + Qt4ProjectManager.Qt4RunConfiguration + + + activeRunConfiguration + 0 + + + activebuildconfiguration + Debug + + + buildConfiguration-Debug + + Debug + 0 + 0 + + 2 + + + + buildConfiguration-Release + + Release + 0 + + 0 + + + + buildconfiguration-Debug-buildstep0 + + Debug + + DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-fGFreQMQCi,guid=40982632b0a35018e38badbd4c4c0958 + DESKTOP_SESSION=default + DISPLAY=:0.0 + DM_CONTROL=/var/run/xdmctl + GPG_AGENT_INFO=/tmp/gpg-zBm3MG/S.gpg-agent:1465:1 + GS_LIB=/home/onil/.fonts + GTK2_RC_FILES=/etc/gtk-2.0/gtkrc:/home/onil/.gtkrc-2.0:/home/onil/.gtkrc-2.0-kde4:/home/onil/.kde/share/config/gtkrc-2.0 + GTK_RC_FILES=/etc/gtk/gtkrc:/home/onil/.gtkrc::/home/onil/.kde/share/config/gtkrc + HOME=/home/onil + KDE_FULL_SESSION=true + KDE_MULTIHEAD=false + KDE_SESSION_UID=1000 + KDE_SESSION_VERSION=4 + LANG=fr_FR.UTF-8 + LD_LIBRARY_PATH=/usr/lib/qtcreator: + LOGNAME=onil + PATH=/usr/bin:/home/onil/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games + PWD=/home/onil/Documents + QTDIR=/usr/share/qt4 + QT_PLUGIN_PATH=/home/onil/.kde/lib/kde4/plugins/:/usr/lib/kde4/plugins/ + SESSION_MANAGER=local/onil-netbook:@/tmp/.ICE-unix/1603,unix/onil-netbook:/tmp/.ICE-unix/1603 + SHELL=/bin/bash + SHLVL=0 + SSH_AGENT_PID=1464 + SSH_AUTH_SOCK=/tmp/ssh-vgudGK1419/agent.1419 + USER=onil + WINDOWPATH=7 + XCURSOR_THEME=oxy-white + XDG_DATA_DIRS=/usr/share:/usr/share:/usr/local/share + XDG_SESSION_COOKIE=4cb4c39594fcf9ea2256393c4c2e6053-1280051542.996827-333265015 + XDM_MANAGED=method=classic + + + /home/onil/Documents/Programmation/FamilyShoppingManager/family-shop-mgr/code/family-shop-mgr/family-shop-mgr.pro + -spec + linux-g++ + -r + CONFIG+=debug + + /usr/bin/qmake-qt4 + false + /home/onil/Documents/Programmation/FamilyShoppingManager/family-shop-mgr/code/family-shop-mgr + + + + buildconfiguration-Debug-buildstep1 + + Debug + + DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-fGFreQMQCi,guid=40982632b0a35018e38badbd4c4c0958 + DESKTOP_SESSION=default + DISPLAY=:0.0 + DM_CONTROL=/var/run/xdmctl + GPG_AGENT_INFO=/tmp/gpg-zBm3MG/S.gpg-agent:1465:1 + GS_LIB=/home/onil/.fonts + GTK2_RC_FILES=/etc/gtk-2.0/gtkrc:/home/onil/.gtkrc-2.0:/home/onil/.gtkrc-2.0-kde4:/home/onil/.kde/share/config/gtkrc-2.0 + GTK_RC_FILES=/etc/gtk/gtkrc:/home/onil/.gtkrc::/home/onil/.kde/share/config/gtkrc + HOME=/home/onil + KDE_FULL_SESSION=true + KDE_MULTIHEAD=false + KDE_SESSION_UID=1000 + KDE_SESSION_VERSION=4 + LANG=fr_FR.UTF-8 + LD_LIBRARY_PATH=/usr/lib/qtcreator: + LOGNAME=onil + PATH=/usr/bin:/home/onil/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games + PWD=/home/onil/Documents + QTDIR=/usr/share/qt4 + QT_PLUGIN_PATH=/home/onil/.kde/lib/kde4/plugins/:/usr/lib/kde4/plugins/ + SESSION_MANAGER=local/onil-netbook:@/tmp/.ICE-unix/1603,unix/onil-netbook:/tmp/.ICE-unix/1603 + SHELL=/bin/bash + SHLVL=0 + SSH_AGENT_PID=1464 + SSH_AUTH_SOCK=/tmp/ssh-vgudGK1419/agent.1419 + USER=onil + WINDOWPATH=7 + XCURSOR_THEME=oxy-white + XDG_DATA_DIRS=/usr/share:/usr/share:/usr/local/share + XDG_SESSION_COOKIE=4cb4c39594fcf9ea2256393c4c2e6053-1280051542.996827-333265015 + XDM_MANAGED=method=classic + + false + + -w + + /usr/bin/make + true + /home/onil/Documents/Programmation/FamilyShoppingManager/family-shop-mgr/code/family-shop-mgr + + + + buildconfiguration-Debug-cleanstep0 + + Debug + true + + clean + + + + + buildconfiguration-Release-buildstep0 + + Release + + + + buildconfiguration-Release-buildstep1 + + Release + + + + buildconfiguration-Release-cleanstep0 + + Release + + + + buildconfigurations + + Debug + Release + + + + buildstep0 + + + + + + + buildstep1 + + + + + + buildsteps + + trolltech.qt4projectmanager.qmake + trolltech.qt4projectmanager.make + + + + cleanstep0 + + + true + + + + cleansteps + + trolltech.qt4projectmanager.make + + + + defaultFileEncoding + UTF-8 + + + project + + + diff --git a/code/family-shop-mgr/main.cpp b/code/family-shop-mgr/main.cpp index 2f18d9e..ba6b275 100644 --- a/code/family-shop-mgr/main.cpp +++ b/code/family-shop-mgr/main.cpp @@ -1,16 +1,16 @@ #include -#include "FamilyShopManagerPC.h" +#include "FamilyShopManager.h" #include "ShoppingTreeModel.h" int main(int argc, char *argv[]) { QApplication a(argc, argv); - FamilyShopManagerPC w; - ShoppingTreeModel model("ShoppingList.xml"); + FamilyShopManager w; + ShoppingTreeModel model(argv[1]); w.setModel(&model); - QObject::connect(&w, SIGNAL(addCategory(QModelIndex, QString)), &model, SLOT(addCategory(QModelIndex&,QString))); - QObject::connect(&w, SIGNAL(addItem(QModelIndex,QString)), &model, SLOT(addItem(QModelIndex&,QString))); + QObject::connect(&w, SIGNAL(addCategory(const QModelIndex&, QString)), &model, SLOT(addCategory(const QModelIndex&,QString))); + QObject::connect(&w, SIGNAL(addItem(const QModelIndex&,QString)), &model, SLOT(addItem(const QModelIndex&,QString))); QObject::connect(&w, SIGNAL(removeSignal(QModelIndex)), &model, SLOT(removeElement(QModelIndex&))); w.show(); diff --git a/code/family-shop-mgr/model/ShoppingTreeModel.cpp b/code/family-shop-mgr/model/ShoppingTreeModel.cpp index 60314b2..bde8626 100644 --- a/code/family-shop-mgr/model/ShoppingTreeModel.cpp +++ b/code/family-shop-mgr/model/ShoppingTreeModel.cpp @@ -254,7 +254,7 @@ bool ShoppingTreeModel::removeRows(int row, int count, const QModelIndex &parent } /*******************************************************************/ -bool ShoppingTreeModel::addCategory(QModelIndex &index, QString name) +bool ShoppingTreeModel::addCategory(const QModelIndex &index, QString name) { ShoppingTreeItem *selectedItem; @@ -274,7 +274,7 @@ bool ShoppingTreeModel::addCategory(QModelIndex &index, QString name) } /*******************************************************************/ -bool ShoppingTreeModel::addItem(QModelIndex &index, QString name) +bool ShoppingTreeModel::addItem(const QModelIndex &index, QString name) { ShoppingTreeItem *selectedItem; diff --git a/code/family-shop-mgr/model/ShoppingTreeModel.h b/code/family-shop-mgr/model/ShoppingTreeModel.h index 4c54931..3b6c974 100644 --- a/code/family-shop-mgr/model/ShoppingTreeModel.h +++ b/code/family-shop-mgr/model/ShoppingTreeModel.h @@ -58,8 +58,8 @@ public: bool setData(const QModelIndex & index, const QVariant & value, int role = Qt::EditRole); public slots: - bool addCategory(QModelIndex & index, QString name = QString()); - bool addItem(QModelIndex & index, QString name = QString()); + bool addCategory(const QModelIndex & index, QString name = QString()); + bool addItem(const QModelIndex & index, QString name = QString()); bool removeElement(QModelIndex & index); void save(); -- 1.7.9.5