From 776675464c69ead9c75a9c326ca707326b91f4cf Mon Sep 17 00:00:00 2001 From: onil Date: Sat, 30 Jan 2010 18:20:26 +0000 Subject: [PATCH 1/1] git-svn-id: file:///svnroot/family-shop-mgr@15 26eb2498-383b-47a6-be48-5d6f36779e85 --- code/family-shop-mgr/ShoppingTreeModel.cpp | 3 +- code/family-shop-mgr/family-shop-mgr.pro | 2 +- code/family-shop-mgr/family-shop-mgr.pro.user | 228 ++++++++++++------------- 3 files changed, 113 insertions(+), 120 deletions(-) diff --git a/code/family-shop-mgr/ShoppingTreeModel.cpp b/code/family-shop-mgr/ShoppingTreeModel.cpp index 1d0120d..20852e4 100644 --- a/code/family-shop-mgr/ShoppingTreeModel.cpp +++ b/code/family-shop-mgr/ShoppingTreeModel.cpp @@ -23,6 +23,7 @@ #include "ShoppingTreeItem.h" #include +#include #include ShoppingTreeModel::ShoppingTreeModel(const QString &xmlFileName, @@ -33,7 +34,7 @@ QAbstractItemModel(parent), m_document("ShoppingList") int errLine; int errColumn; - m_xmlFileName = xmlFileName; + m_xmlFileName = QApplication::applicationDirPath() + "/" + xmlFileName; QFile file(m_xmlFileName); if(!file.open(QIODevice::ReadOnly)) return; diff --git a/code/family-shop-mgr/family-shop-mgr.pro b/code/family-shop-mgr/family-shop-mgr.pro index 2ed95e0..12099f2 100644 --- a/code/family-shop-mgr/family-shop-mgr.pro +++ b/code/family-shop-mgr/family-shop-mgr.pro @@ -2,7 +2,7 @@ # Project created by QtCreator 2009-12-01T15:41:15 # ------------------------------------------------- QT += xml -TARGET = family-shop-mgr +TARGET = build/family-shop-mgr TEMPLATE = app SOURCES += main.cpp \ FamilyShoppingManagerStartView.cpp \ diff --git a/code/family-shop-mgr/family-shop-mgr.pro.user b/code/family-shop-mgr/family-shop-mgr.pro.user index 9a81fae..c5de9dc 100644 --- a/code/family-shop-mgr/family-shop-mgr.pro.user +++ b/code/family-shop-mgr/family-shop-mgr.pro.user @@ -57,7 +57,7 @@ Debug 0 - 2 + 0 2 @@ -67,7 +67,7 @@ Release 0 - 2 + 0 0 @@ -77,7 +77,7 @@ S60_3rd_FP1 (Qt ) Debug 0 - 2 + 0 10 @@ -87,7 +87,7 @@ S60_3rd_FP1 (Qt ) Release 0 - 2 + 0 8 @@ -97,51 +97,49 @@ Debug - ALLUSERSPROFILE=C:\Documents and Settings\All Users - APPDATA=C:\Documents and Settings\Unai\Application Data - APR_ICONV_PATH=C:\Program Files\Subversion\iconv - CLIENTNAME=Console - COMMONPROGRAMFILES=C:\Program Files\Fichiers communs - COMPUTERNAME=UNAI-LAPTOP - COMSPEC=C:\WINDOWS\system32\cmd.exe - DBCONFIG=C:\adabas\sql - DBROOT=C:\adabas\ - DBWORK=C:\adabas\sql - DXSDK_DIR=C:\Program Files\Microsoft DirectX SDK (April 2007)\ - FP_NO_HOST_CHECK=NO - HOMEDRIVE=C: - HOMEPATH=\Documents and Settings\Unai - LOGONSERVER=\\UNAI-LAPTOP - NUMBER_OF_PROCESSORS=2 - OS=Windows_NT - PATH=C:\Qt\2009.05\mingw\bin;C:\Qt\2009.05\qt\bin;C:\Program Files\PC Connectivity Solution\;C:\Program Files\CSL Arm Toolchain\bin;C:\Program Files\Fichiers communs\Symbian\Tools;C:\Perl\site\bin;C:\Perl\bin;C:\Program Files\Microsoft DirectX SDK (April 2007)\Utilities\Bin\x86;C:\Program Files\MiKTeX 2.7\miktex\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\Microsoft SQL Server\90\Tools\binn\;C:\MySQL\MySQL_Server_51\bin;C:\OpenCV2.0\bin;C:\Program Files\TortoiseSVN\bin;C:\Program Files\Subversion\bin;C:\adabas\bin;C:\adabas\pgm;C:\Program Files\CVSNT\;C:\Program Files\CMake 2.6\bin - PATHEXT=.COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH - PROCESSOR_ARCHITECTURE=x86 - PROCESSOR_IDENTIFIER=x86 Family 6 Model 28 Stepping 2, GenuineIntel - PROCESSOR_LEVEL=6 - PROCESSOR_REVISION=1c02 - PROGRAMFILES=C:\Program Files - QTDIR=C:/Qt/2009.05/qt - SESSIONNAME=Console - SYSTEMDRIVE=C: - SYSTEMROOT=C:\WINDOWS - TEMP=C:\DOCUME~1\Unai\LOCALS~1\Temp - TMP=C:\DOCUME~1\Unai\LOCALS~1\Temp - USERDOMAIN=UNAI-LAPTOP - USERNAME=Unai - USERPROFILE=C:\Documents and Settings\Unai - VS90COMNTOOLS=c:\Program Files\Microsoft Visual Studio 9.0\Common7\Tools\ - WINDIR=C:\WINDOWS + DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-21hFrv8OuU,guid=63ff99b453359d96a6bd09924b645f2a + DESKTOP_SESSION=default + DISPLAY=:0.0 + DM_CONTROL=/var/run/xdmctl + GPG_AGENT_INFO=/tmp/gpg-pfLcXv/S.gpg-agent:1922: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 + LANGUAGE= + LD_LIBRARY_PATH=/usr/lib/qtcreator: + LOGNAME=onil + PATH=/usr/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/2011,unix/onil-netbook:/tmp/.ICE-unix/2011 + SHELL=/bin/bash + SHLVL=0 + SSH_AGENT_PID=1921 + SSH_AUTH_SOCK=/tmp/ssh-xwUQXF1871/agent.1871 + USER=onil + WINDOWPATH=7 + XCURSOR_THEME=oxy-white + XDG_DATA_DIRS=/usr/share:/usr/share:/usr/local/share + XDG_SESSION_COOKIE=67465ad3dd74e5003d0b02474b126985-1264869161.939016-301214867 + XDM_MANAGED=method=classic - C:/Documents and Settings/Unai/Mes documents/Developpement/FamilyShoppingManager/code/family-shop-mgr/family-shop-mgr.pro + /home/onil/Documents/Programmation/FamilyShoppingManager/family-shop-mgr/code/family-shop-mgr/family-shop-mgr.pro -spec - win32-g++ + linux-g++ -r + CONFIG+=debug - c:/qt/2009.05/qt/bin/qmake.exe - true - C:/Documents and Settings/Unai/Mes documents/Developpement/FamilyShoppingManager/code/family-shop-mgr + /usr/bin/qmake-qt4 + false + /home/onil/Documents/Programmation/FamilyShoppingManager/family-shop-mgr/code/family-shop-mgr @@ -150,49 +148,46 @@ Debug - ALLUSERSPROFILE=C:\Documents and Settings\All Users - APPDATA=C:\Documents and Settings\Unai\Application Data - APR_ICONV_PATH=C:\Program Files\Subversion\iconv - CLIENTNAME=Console - COMMONPROGRAMFILES=C:\Program Files\Fichiers communs - COMPUTERNAME=UNAI-LAPTOP - COMSPEC=C:\WINDOWS\system32\cmd.exe - DBCONFIG=C:\adabas\sql - DBROOT=C:\adabas\ - DBWORK=C:\adabas\sql - DXSDK_DIR=C:\Program Files\Microsoft DirectX SDK (April 2007)\ - FP_NO_HOST_CHECK=NO - HOMEDRIVE=C: - HOMEPATH=\Documents and Settings\Unai - LOGONSERVER=\\UNAI-LAPTOP - NUMBER_OF_PROCESSORS=2 - OS=Windows_NT - PATH=C:\Qt\2009.05\mingw\bin;C:\Qt\2009.05\qt\bin;C:\Program Files\PC Connectivity Solution\;C:\Program Files\CSL Arm Toolchain\bin;C:\Program Files\Fichiers communs\Symbian\Tools;C:\Perl\site\bin;C:\Perl\bin;C:\Program Files\Microsoft DirectX SDK (April 2007)\Utilities\Bin\x86;C:\Program Files\MiKTeX 2.7\miktex\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\Microsoft SQL Server\90\Tools\binn\;C:\MySQL\MySQL_Server_51\bin;C:\OpenCV2.0\bin;C:\Program Files\TortoiseSVN\bin;C:\Program Files\Subversion\bin;C:\adabas\bin;C:\adabas\pgm;C:\Program Files\CVSNT\;C:\Program Files\CMake 2.6\bin - PATHEXT=.COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH - PROCESSOR_ARCHITECTURE=x86 - PROCESSOR_IDENTIFIER=x86 Family 6 Model 28 Stepping 2, GenuineIntel - PROCESSOR_LEVEL=6 - PROCESSOR_REVISION=1c02 - PROGRAMFILES=C:\Program Files - QTDIR=C:/Qt/2009.05/qt - SESSIONNAME=Console - SYSTEMDRIVE=C: - SYSTEMROOT=C:\WINDOWS - TEMP=C:\DOCUME~1\Unai\LOCALS~1\Temp - TMP=C:\DOCUME~1\Unai\LOCALS~1\Temp - USERDOMAIN=UNAI-LAPTOP - USERNAME=Unai - USERPROFILE=C:\Documents and Settings\Unai - VS90COMNTOOLS=c:\Program Files\Microsoft Visual Studio 9.0\Common7\Tools\ - WINDIR=C:\WINDOWS + DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-21hFrv8OuU,guid=63ff99b453359d96a6bd09924b645f2a + DESKTOP_SESSION=default + DISPLAY=:0.0 + DM_CONTROL=/var/run/xdmctl + GPG_AGENT_INFO=/tmp/gpg-pfLcXv/S.gpg-agent:1922: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 + LANGUAGE= + LD_LIBRARY_PATH=/usr/lib/qtcreator: + LOGNAME=onil + PATH=/usr/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/2011,unix/onil-netbook:/tmp/.ICE-unix/2011 + SHELL=/bin/bash + SHLVL=0 + SSH_AGENT_PID=1921 + SSH_AUTH_SOCK=/tmp/ssh-xwUQXF1871/agent.1871 + USER=onil + WINDOWPATH=7 + XCURSOR_THEME=oxy-white + XDG_DATA_DIRS=/usr/share:/usr/share:/usr/local/share + XDG_SESSION_COOKIE=67465ad3dd74e5003d0b02474b126985-1264869161.939016-301214867 + XDM_MANAGED=method=classic false -w - C:/Qt/2009.05/mingw/bin/mingw32-make.exe + /usr/bin/make true - C:/Documents and Settings/Unai/Mes documents/Developpement/FamilyShoppingManager/code/family-shop-mgr + /home/onil/Documents/Programmation/FamilyShoppingManager/family-shop-mgr/code/family-shop-mgr @@ -200,50 +195,47 @@ Debug - ALLUSERSPROFILE=C:\Documents and Settings\All Users - APPDATA=C:\Documents and Settings\Unai\Application Data - APR_ICONV_PATH=C:\Program Files\Subversion\iconv - CLIENTNAME=Console - COMMONPROGRAMFILES=C:\Program Files\Fichiers communs - COMPUTERNAME=UNAI-LAPTOP - COMSPEC=C:\WINDOWS\system32\cmd.exe - DBCONFIG=C:\adabas\sql - DBROOT=C:\adabas\ - DBWORK=C:\adabas\sql - DXSDK_DIR=C:\Program Files\Microsoft DirectX SDK (April 2007)\ - FP_NO_HOST_CHECK=NO - HOMEDRIVE=C: - HOMEPATH=\Documents and Settings\Unai - LOGONSERVER=\\UNAI-LAPTOP - NUMBER_OF_PROCESSORS=2 - OS=Windows_NT - PATH=C:\Qt\2009.05\mingw\bin;C:\Qt\2009.05\qt\bin;C:\Program Files\PC Connectivity Solution\;C:\Program Files\CSL Arm Toolchain\bin;C:\Program Files\Fichiers communs\Symbian\Tools;C:\Perl\site\bin;C:\Perl\bin;C:\Program Files\Microsoft DirectX SDK (April 2007)\Utilities\Bin\x86;C:\Program Files\MiKTeX 2.7\miktex\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\Microsoft SQL Server\90\Tools\binn\;C:\MySQL\MySQL_Server_51\bin;C:\OpenCV2.0\bin;C:\Program Files\TortoiseSVN\bin;C:\Program Files\Subversion\bin;C:\adabas\bin;C:\adabas\pgm;C:\Program Files\CVSNT\;C:\Program Files\CMake 2.6\bin - PATHEXT=.COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH - PROCESSOR_ARCHITECTURE=x86 - PROCESSOR_IDENTIFIER=x86 Family 6 Model 28 Stepping 2, GenuineIntel - PROCESSOR_LEVEL=6 - PROCESSOR_REVISION=1c02 - PROGRAMFILES=C:\Program Files - QTDIR=C:/Qt/2009.05/qt - SESSIONNAME=Console - SYSTEMDRIVE=C: - SYSTEMROOT=C:\WINDOWS - TEMP=C:\DOCUME~1\Unai\LOCALS~1\Temp - TMP=C:\DOCUME~1\Unai\LOCALS~1\Temp - USERDOMAIN=UNAI-LAPTOP - USERNAME=Unai - USERPROFILE=C:\Documents and Settings\Unai - VS90COMNTOOLS=c:\Program Files\Microsoft Visual Studio 9.0\Common7\Tools\ - WINDIR=C:\WINDOWS + DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-21hFrv8OuU,guid=63ff99b453359d96a6bd09924b645f2a + DESKTOP_SESSION=default + DISPLAY=:0.0 + DM_CONTROL=/var/run/xdmctl + GPG_AGENT_INFO=/tmp/gpg-pfLcXv/S.gpg-agent:1922: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 + LANGUAGE= + LD_LIBRARY_PATH=/usr/lib/qtcreator: + LOGNAME=onil + PATH=/usr/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/2011,unix/onil-netbook:/tmp/.ICE-unix/2011 + SHELL=/bin/bash + SHLVL=0 + SSH_AGENT_PID=1921 + SSH_AUTH_SOCK=/tmp/ssh-xwUQXF1871/agent.1871 + USER=onil + WINDOWPATH=7 + XCURSOR_THEME=oxy-white + XDG_DATA_DIRS=/usr/share:/usr/share:/usr/local/share + XDG_SESSION_COOKIE=67465ad3dd74e5003d0b02474b126985-1264869161.939016-301214867 + XDM_MANAGED=method=classic true clean -w - C:/Qt/2009.05/mingw/bin/mingw32-make.exe + /usr/bin/make true - C:/Documents and Settings/Unai/Mes documents/Developpement/FamilyShoppingManager/code/family-shop-mgr + /home/onil/Documents/Programmation/FamilyShoppingManager/family-shop-mgr/code/family-shop-mgr true clean -- 1.7.9.5