# HG changeset patch # User James Aley # Date 1274453110 -3600 # Node ID 77a56c951f86984c98a3efcc65812fc31586f820 # Parent be09cf1f39dde381b16bd9e4c378fe10b22f270f Fixed build for Qt desktop diff -r be09cf1f39dd -r 77a56c951f86 .hgignore --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgignore Fri May 21 15:45:10 2010 +0100 @@ -0,0 +1,5 @@ +syntax: regexp +^.*~$ +^.*\.o$ +^.*moc_.*$ +^.*Makefile.*$ diff -r be09cf1f39dd -r 77a56c951f86 smf/Makefile --- a/smf/Makefile Tue May 18 17:37:12 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,180 +0,0 @@ -# ============================================================================== -# Generated by qmake (2.01a) (Qt 4.6.1) on: Wed May 5 13:57:42 2010 -# This file is generated by qmake and should not be modified by the -# user. -# Name : Makefile -# Description : Wrapper Makefile for calling Symbian build tools -# -# ============================================================================== - - -MAKEFILE = Makefile -QMAKE = e:\Qt\4.6.1\bin\qmake -DEL_FILE = del -DEL_DIR = rmdir -MOVE = move -XCOPY = xcopy /d /f /h /r /y /i -ABLD = ABLD.BAT -DEBUG_PLATFORMS = winscw gcce armv5 armv6 -RELEASE_PLATFORMS = gcce armv5 armv6 -MAKE = make - -ifeq (WINS,$(findstring WINS, $(PLATFORM))) -ZDIR=$(EPOCROOT)epoc32\release\$(PLATFORM)\$(CFG)\Z -else -ZDIR=$(EPOCROOT)epoc32\data\z -endif - -DEFINES = -DSYMBIAN -DUNICODE -DQT_KEYPAD_NAVIGATION -DQT_SOFTKEYS_ENABLED -DQT_USE_MATH_H_FLOATS -DQT_GUI_LIB -DQT_CORE_LIB -INCPATH = -I"E:/Qt/4.6.1/include/QtCore" -I"E:/Qt/4.6.1/include/QtCore/tmp" -I"E:/Qt/4.6.1/include/QtGui" -I"E:/Qt/4.6.1/include/QtGui/tmp" -I"E:/Qt/4.6.1/include" -I"E:/Qt/4.6.1/include/tmp" -I"E:/Qt/4.6.1/mkspecs/common/symbian" -I"E:/Qt/4.6.1/mkspecs/common/symbian/tmp" -I"E:/Symbian/S60_5th_Edition_SDK_v1.0_2/epoc32/include" -I"E:/qt-mobility-src-1.0.0-tp2/smf_integrated_30apr/smfrepo/smf/smfcredentialmgr" -I"E:/qt-mobility-src-1.0.0-tp2/smf_integrated_30apr/smfrepo/smf/smfcredentialmgr/tmp" -I"E:/Symbian/S60_5th_Edition_SDK_v1.0_2/epoc32/include/stdapis" -I"E:/Symbian/S60_5th_Edition_SDK_v1.0_2/epoc32/include/stdapis/sys" -I"E:/Symbian/S60_5th_Edition_SDK_v1.0_2/epoc32/include/stdapis/stlport" -I"E:/Symbian/S60_5th_Edition_SDK_v1.0_2/epoc32/include/middleware" -I"E:/Symbian/S60_5th_Edition_SDK_v1.0_2/epoc32/include/domain/middleware" -I"E:/Symbian/S60_5th_Edition_SDK_v1.0_2/epoc32/include/domain/middleware/loc" -I"E:/qt-mobility-src-1.0.0-tp2/smf_integrated_30apr/smfrepo/smf" -I"E:/qt-mobility-src-1.0.0-tp2/smf_integrated_30apr/smfrepo/smf/tmp" -first: default -default: debug-winscw -all: debug release - -qmake: - $(QMAKE) -spec symbian-abld -o "bld.inf" "E:/qt-mobility-src-1.0.0-tp2/smf_integrated_30apr/smfrepo/smf/smf.pro" - -bld.inf: - $(QMAKE) - -$(ABLD): bld.inf - bldmake bldfiles - -debug: $(ABLD) - $(ABLD) build winscw udeb - $(ABLD) build gcce udeb - $(ABLD) build armv5 udeb - $(ABLD) build armv6 udeb - -release: $(ABLD) - $(ABLD) build gcce urel - $(ABLD) build armv5 urel - $(ABLD) build armv6 urel - -debug-winscw: $(ABLD) - $(ABLD) build winscw udeb -debug-gcce: $(ABLD) - $(ABLD) build gcce udeb -debug-armv5: $(ABLD) - $(ABLD) build armv5 udeb -debug-armv6: $(ABLD) - $(ABLD) build armv6 udeb -release-gcce: $(ABLD) - $(ABLD) build gcce urel -release-armv5: $(ABLD) - $(ABLD) build armv5 urel -release-armv6: $(ABLD) - $(ABLD) build armv6 urel - -export: $(ABLD) - $(ABLD) export - -cleanexport: $(ABLD) - $(ABLD) cleanexport - -smfcredentialmgr\$(MAKEFILE): - @$(CHK_DIR_EXISTS) smfcredentialmgr\ $(MKDIR) smfcredentialmgr\ - cd smfcredentialmgr\ && $(QMAKE) smfcredentialmgr.pro -win32 -o $(MAKEFILE) -sub-smfcredentialmgr-qmake_all: FORCE - @$(CHK_DIR_EXISTS) smfcredentialmgr\ $(MKDIR) smfcredentialmgr\ - cd smfcredentialmgr\ && $(QMAKE) smfcredentialmgr.pro -win32 -o $(MAKEFILE) -sub-smfcredentialmgr: smfcredentialmgr\$(MAKEFILE) FORCE - cd smfcredentialmgr\ && $(MAKE) -f $(MAKEFILE) -smfservermodule\$(MAKEFILE): - @$(CHK_DIR_EXISTS) smfservermodule\ $(MKDIR) smfservermodule\ - cd smfservermodule\ && $(QMAKE) smfservermodule.pro -win32 -o $(MAKEFILE) -sub-smfservermodule-qmake_all: FORCE - @$(CHK_DIR_EXISTS) smfservermodule\ $(MKDIR) smfservermodule\ - cd smfservermodule\ && $(QMAKE) smfservermodule.pro -win32 -o $(MAKEFILE) -sub-smfservermodule: smfservermodule\$(MAKEFILE) FORCE - cd smfservermodule\ && $(MAKE) -f $(MAKEFILE) -smfsettingsui\$(MAKEFILE): - @$(CHK_DIR_EXISTS) smfsettingsui\ $(MKDIR) smfsettingsui\ - cd smfsettingsui\ && $(QMAKE) smfsettingsui.pro -win32 -o $(MAKEFILE) -sub-smfsettingsui-qmake_all: FORCE - @$(CHK_DIR_EXISTS) smfsettingsui\ $(MKDIR) smfsettingsui\ - cd smfsettingsui\ && $(QMAKE) smfsettingsui.pro -win32 -o $(MAKEFILE) -sub-smfsettingsui: smfsettingsui\$(MAKEFILE) FORCE - cd smfsettingsui\ && $(MAKE) -f $(MAKEFILE) - - -E:\Qt\4.6.1\bin\moc.exe: - (cd $(QTDIR)/src/tools/moc && $(MAKE)) - -mocclean: compiler_moc_header_clean compiler_moc_source_clean - -mocables: compiler_moc_header_make_all compiler_moc_source_make_all -FORCE: - -winscw_deployment: - -winscw_deployment_clean: - -sis: restore_build - $(if $(wildcard smf_template.pkg),$(if $(wildcard .make.cache),$(MAKE) -s -f $(MAKEFILE) ok_sis,$(if $(QT_SIS_TARGET),$(MAKE) -s -f $(MAKEFILE) ok_sis,$(MAKE) -s -f $(MAKEFILE) fail_sis_nocache)),$(MAKE) -s -f $(MAKEFILE) fail_sis_nopkg) - -ok_sis: - createpackage.bat $(QT_SIS_OPTIONS) smf_template.pkg $(QT_SIS_TARGET) $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE) - -fail_sis_nopkg: - $(error PKG file does not exist, 'SIS' target is only supported for executables or projects with DEPLOYMENT statement) - -fail_sis_nocache: - $(error Project has to be built or QT_SIS_TARGET environment variable has to be set before calling 'SIS' target) - -restore_build: --include .make.cache - -store_build: - @echo # ============================================================================== > .make.cache - @echo # This file is generated by make and should not be modified by the user >> .make.cache - @echo # Name : .make.cache >> .make.cache - @echo # Part of : smf >> .make.cache - @echo # Description : This file is used to cache last build target for >> .make.cache - @echo # make sis target. >> .make.cache - @echo # Version : >> .make.cache - @echo # >> .make.cache - @echo # ============================================================================== >> .make.cache - @echo. >> .make.cache - @echo QT_SIS_TARGET ?= $(QT_SIS_TARGET) >> .make.cache - -dodistclean: - -$(MAKE) -f "e:\qt-mobility-src-1.0.0-tp2\smf_integrated_30apr\smfrepo\smf\smfcredentialmgr\Makefile" dodistclean - -$(MAKE) -f "e:\qt-mobility-src-1.0.0-tp2\smf_integrated_30apr\smfrepo\smf\smfservermodule\Makefile" dodistclean - -$(MAKE) -f "e:\qt-mobility-src-1.0.0-tp2\smf_integrated_30apr\smfrepo\smf\smfsettingsui\Makefile" dodistclean - -@ if EXIST "e:\qt-mobility-src-1.0.0-tp2\smf_integrated_30apr\smfrepo\smf\Makefile" $(DEL_FILE) "e:\qt-mobility-src-1.0.0-tp2\smf_integrated_30apr\smfrepo\smf\Makefile" - -@ if EXIST "e:\qt-mobility-src-1.0.0-tp2\smf_integrated_30apr\smfrepo\smf\.make.cache" $(DEL_FILE) "e:\qt-mobility-src-1.0.0-tp2\smf_integrated_30apr\smfrepo\smf\.make.cache" - -@ if EXIST "e:\qt-mobility-src-1.0.0-tp2\smf_integrated_30apr\smfrepo\smf\bld.inf" $(DEL_FILE) "e:\qt-mobility-src-1.0.0-tp2\smf_integrated_30apr\smfrepo\smf\bld.inf" - -distclean: clean dodistclean - -clean: $(ABLD) - -$(ABLD) reallyclean - -bldmake clean - -clean-debug: $(ABLD) - $(ABLD) reallyclean winscw udeb - $(ABLD) reallyclean gcce udeb - $(ABLD) reallyclean armv5 udeb - $(ABLD) reallyclean armv6 udeb - -clean-release: $(ABLD) - $(ABLD) reallyclean gcce urel - $(ABLD) reallyclean armv5 urel - $(ABLD) reallyclean armv6 urel - -clean-debug-winscw: $(ABLD) - $(ABLD) reallyclean winscw udeb -clean-debug-gcce: $(ABLD) - $(ABLD) reallyclean gcce udeb -clean-debug-armv5: $(ABLD) - $(ABLD) reallyclean armv5 udeb -clean-debug-armv6: $(ABLD) - $(ABLD) reallyclean armv6 udeb -clean-release-gcce: $(ABLD) - $(ABLD) reallyclean gcce urel -clean-release-armv5: $(ABLD) - $(ABLD) reallyclean armv5 urel -clean-release-armv6: $(ABLD) - $(ABLD) reallyclean armv6 urel - diff -r be09cf1f39dd -r 77a56c951f86 smf/smf.pro --- a/smf/smf.pro Tue May 18 17:37:12 2010 +0530 +++ b/smf/smf.pro Fri May 21 15:45:10 2010 +0100 @@ -1,5 +1,5 @@ TEMPLATE = subdirs -SUBDIRS = smfcredentialmgr \ - smfservermodule \ - smfsettingsui +SUBDIRS = smfservermodule \ + # smfsettingsui \ + # smfcredentialmgr diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/Makefile --- a/smf/smfservermodule/Makefile Tue May 18 17:37:12 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,171 +0,0 @@ -# ============================================================================== -# Generated by qmake (2.01a) (Qt 4.6.1) on: Wed May 5 13:58:12 2010 -# This file is generated by qmake and should not be modified by the -# user. -# Name : Makefile -# Description : Wrapper Makefile for calling Symbian build tools -# -# ============================================================================== - - -MAKEFILE = Makefile -QMAKE = e:\Qt\4.6.1\bin\qmake -DEL_FILE = del -DEL_DIR = rmdir -MOVE = move -XCOPY = xcopy /d /f /h /r /y /i -ABLD = ABLD.BAT -DEBUG_PLATFORMS = winscw gcce armv5 armv6 -RELEASE_PLATFORMS = gcce armv5 armv6 -MAKE = make - -ifeq (WINS,$(findstring WINS, $(PLATFORM))) -ZDIR=$(EPOCROOT)epoc32\release\$(PLATFORM)\$(CFG)\Z -else -ZDIR=$(EPOCROOT)epoc32\data\z -endif - -DEFINES = -DSYMBIAN -DUNICODE -DQT_KEYPAD_NAVIGATION -DQT_SOFTKEYS_ENABLED -DQT_USE_MATH_H_FLOATS -DQT_GUI_LIB -DQT_CORE_LIB -INCPATH = -I"E:/Qt/4.6.1/include/QtCore" -I"E:/Qt/4.6.1/include/QtCore/tmp" -I"E:/Qt/4.6.1/include/QtGui" -I"E:/Qt/4.6.1/include/QtGui/tmp" -I"E:/Qt/4.6.1/include" -I"E:/Qt/4.6.1/include/tmp" -I"E:/Qt/4.6.1/mkspecs/common/symbian" -I"E:/Qt/4.6.1/mkspecs/common/symbian/tmp" -I"E:/Symbian/S60_5th_Edition_SDK_v1.0_2/epoc32/include" -I"E:/qt-mobility-src-1.0.0-tp2/smf_integrated_30apr/smfrepo/smf/smfservermodule/smfserver" -I"E:/qt-mobility-src-1.0.0-tp2/smf_integrated_30apr/smfrepo/smf/smfservermodule/smfserver/tmp" -I"E:/Symbian/S60_5th_Edition_SDK_v1.0_2/epoc32/include/stdapis" -I"E:/Symbian/S60_5th_Edition_SDK_v1.0_2/epoc32/include/stdapis/sys" -I"E:/Symbian/S60_5th_Edition_SDK_v1.0_2/epoc32/include/stdapis/stlport" -I"E:/Symbian/S60_5th_Edition_SDK_v1.0_2/epoc32/include/middleware" -I"E:/Symbian/S60_5th_Edition_SDK_v1.0_2/epoc32/include/domain/middleware" -I"E:/Symbian/S60_5th_Edition_SDK_v1.0_2/epoc32/include/domain/middleware/loc" -I"E:/qt-mobility-src-1.0.0-tp2/smf_integrated_30apr/smfrepo/smf/smfservermodule" -I"E:/qt-mobility-src-1.0.0-tp2/smf_integrated_30apr/smfrepo/smf/smfservermodule/tmp" -first: default -default: debug-winscw -all: debug release - -qmake: - $(QMAKE) -spec symbian-abld -o "bld.inf" "E:/qt-mobility-src-1.0.0-tp2/smf_integrated_30apr/smfrepo/smf/smfservermodule/smfservermodule.pro" - -bld.inf: - $(QMAKE) - -$(ABLD): bld.inf - bldmake bldfiles - -debug: $(ABLD) - $(ABLD) build winscw udeb - $(ABLD) build gcce udeb - $(ABLD) build armv5 udeb - $(ABLD) build armv6 udeb - -release: $(ABLD) - $(ABLD) build gcce urel - $(ABLD) build armv5 urel - $(ABLD) build armv6 urel - -debug-winscw: $(ABLD) - $(ABLD) build winscw udeb -debug-gcce: $(ABLD) - $(ABLD) build gcce udeb -debug-armv5: $(ABLD) - $(ABLD) build armv5 udeb -debug-armv6: $(ABLD) - $(ABLD) build armv6 udeb -release-gcce: $(ABLD) - $(ABLD) build gcce urel -release-armv5: $(ABLD) - $(ABLD) build armv5 urel -release-armv6: $(ABLD) - $(ABLD) build armv6 urel - -export: $(ABLD) - $(ABLD) export - -cleanexport: $(ABLD) - $(ABLD) cleanexport - -smfserver\$(MAKEFILE): - @$(CHK_DIR_EXISTS) smfserver\ $(MKDIR) smfserver\ - cd smfserver\ && $(QMAKE) smfserver.pro -win32 -o $(MAKEFILE) -sub-smfserver-qmake_all: FORCE - @$(CHK_DIR_EXISTS) smfserver\ $(MKDIR) smfserver\ - cd smfserver\ && $(QMAKE) smfserver.pro -win32 -o $(MAKEFILE) -sub-smfserver: smfserver\$(MAKEFILE) FORCE - cd smfserver\ && $(MAKE) -f $(MAKEFILE) -smfclient\$(MAKEFILE): - @$(CHK_DIR_EXISTS) smfclient\ $(MKDIR) smfclient\ - cd smfclient\ && $(QMAKE) smfclient.pro -win32 -o $(MAKEFILE) -sub-smfclient-qmake_all: FORCE - @$(CHK_DIR_EXISTS) smfclient\ $(MKDIR) smfclient\ - cd smfclient\ && $(QMAKE) smfclient.pro -win32 -o $(MAKEFILE) -sub-smfclient: smfclient\$(MAKEFILE) FORCE - cd smfclient\ && $(MAKE) -f $(MAKEFILE) - - -E:\Qt\4.6.1\bin\moc.exe: - (cd $(QTDIR)/src/tools/moc && $(MAKE)) - -mocclean: compiler_moc_header_clean compiler_moc_source_clean - -mocables: compiler_moc_header_make_all compiler_moc_source_make_all -FORCE: - -winscw_deployment: - -winscw_deployment_clean: - -sis: restore_build - $(if $(wildcard smfservermodule_template.pkg),$(if $(wildcard .make.cache),$(MAKE) -s -f $(MAKEFILE) ok_sis,$(if $(QT_SIS_TARGET),$(MAKE) -s -f $(MAKEFILE) ok_sis,$(MAKE) -s -f $(MAKEFILE) fail_sis_nocache)),$(MAKE) -s -f $(MAKEFILE) fail_sis_nopkg) - -ok_sis: - createpackage.bat $(QT_SIS_OPTIONS) smfservermodule_template.pkg $(QT_SIS_TARGET) $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE) - -fail_sis_nopkg: - $(error PKG file does not exist, 'SIS' target is only supported for executables or projects with DEPLOYMENT statement) - -fail_sis_nocache: - $(error Project has to be built or QT_SIS_TARGET environment variable has to be set before calling 'SIS' target) - -restore_build: --include .make.cache - -store_build: - @echo # ============================================================================== > .make.cache - @echo # This file is generated by make and should not be modified by the user >> .make.cache - @echo # Name : .make.cache >> .make.cache - @echo # Part of : smfservermodule >> .make.cache - @echo # Description : This file is used to cache last build target for >> .make.cache - @echo # make sis target. >> .make.cache - @echo # Version : >> .make.cache - @echo # >> .make.cache - @echo # ============================================================================== >> .make.cache - @echo. >> .make.cache - @echo QT_SIS_TARGET ?= $(QT_SIS_TARGET) >> .make.cache - -dodistclean: - -$(MAKE) -f "e:\qt-mobility-src-1.0.0-tp2\smf_integrated_30apr\smfrepo\smf\smfservermodule\smfserver\Makefile" dodistclean - -$(MAKE) -f "e:\qt-mobility-src-1.0.0-tp2\smf_integrated_30apr\smfrepo\smf\smfservermodule\smfclient\Makefile" dodistclean - -@ if EXIST "e:\qt-mobility-src-1.0.0-tp2\smf_integrated_30apr\smfrepo\smf\smfservermodule\Makefile" $(DEL_FILE) "e:\qt-mobility-src-1.0.0-tp2\smf_integrated_30apr\smfrepo\smf\smfservermodule\Makefile" - -@ if EXIST "e:\qt-mobility-src-1.0.0-tp2\smf_integrated_30apr\smfrepo\smf\smfservermodule\.make.cache" $(DEL_FILE) "e:\qt-mobility-src-1.0.0-tp2\smf_integrated_30apr\smfrepo\smf\smfservermodule\.make.cache" - -@ if EXIST "e:\qt-mobility-src-1.0.0-tp2\smf_integrated_30apr\smfrepo\smf\smfservermodule\bld.inf" $(DEL_FILE) "e:\qt-mobility-src-1.0.0-tp2\smf_integrated_30apr\smfrepo\smf\smfservermodule\bld.inf" - -distclean: clean dodistclean - -clean: $(ABLD) - -$(ABLD) reallyclean - -bldmake clean - -clean-debug: $(ABLD) - $(ABLD) reallyclean winscw udeb - $(ABLD) reallyclean gcce udeb - $(ABLD) reallyclean armv5 udeb - $(ABLD) reallyclean armv6 udeb - -clean-release: $(ABLD) - $(ABLD) reallyclean gcce urel - $(ABLD) reallyclean armv5 urel - $(ABLD) reallyclean armv6 urel - -clean-debug-winscw: $(ABLD) - $(ABLD) reallyclean winscw udeb -clean-debug-gcce: $(ABLD) - $(ABLD) reallyclean gcce udeb -clean-debug-armv5: $(ABLD) - $(ABLD) reallyclean armv5 udeb -clean-debug-armv6: $(ABLD) - $(ABLD) reallyclean armv6 udeb -clean-release-gcce: $(ABLD) - $(ABLD) reallyclean gcce urel -clean-release-armv5: $(ABLD) - $(ABLD) reallyclean armv5 urel -clean-release-armv6: $(ABLD) - $(ABLD) reallyclean armv6 urel - diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/smfclient/Makefile --- a/smf/smfservermodule/smfclient/Makefile Tue May 18 17:37:12 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,270 +0,0 @@ -# ============================================================================== -# Generated by qmake (2.01a) (Qt 4.6.1) on: Tue May 18 15:53:35 2010 -# This file is generated by qmake and should not be modified by the -# user. -# Name : Makefile -# Description : Wrapper Makefile for calling Symbian build tools -# -# ============================================================================== - - -MAKEFILE = Makefile -QMAKE = d:\Qt\4.6.1\bin\qmake -DEL_FILE = del -DEL_DIR = rmdir -MOVE = move -XCOPY = xcopy /d /f /h /r /y /i -ABLD = ABLD.BAT -DEBUG_PLATFORMS = winscw gcce armv5 armv6 -RELEASE_PLATFORMS = gcce armv5 armv6 -MAKE = make - -ifeq (WINS,$(findstring WINS, $(PLATFORM))) -ZDIR=$(EPOCROOT)epoc32\release\$(PLATFORM)\$(CFG)\Z -else -ZDIR=$(EPOCROOT)epoc32\data\z -endif - -DEFINES = -DSYMBIAN -DUNICODE -DQT_KEYPAD_NAVIGATION -DQT_SOFTKEYS_ENABLED -DQT_USE_MATH_H_FLOATS -DWRITE_LOG -DSMFCLIENT_LIB_EXPORT -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -INCPATH = -I"D:/Qt/4.6.1/include/QtCore" -I"D:/Qt/4.6.1/include/QtCore/tmp" -I"D:/Qt/4.6.1/include/QtNetwork" -I"D:/Qt/4.6.1/include/QtNetwork/tmp" -I"D:/Qt/4.6.1/include/QtGui" -I"D:/Qt/4.6.1/include/QtGui/tmp" -I"D:/Qt/4.6.1/include" -I"D:/Qt/4.6.1/include/tmp" -I"D:/CarbideWorkspace/smfserver_cleaned/smf/smfservermodule/smfclient" -I"D:/CarbideWorkspace/smfserver_cleaned/smf/smfservermodule/smfclient/tmp" -I"D:/Qt/4.6.1/mkspecs/common/symbian" -I"D:/Qt/4.6.1/mkspecs/common/symbian/tmp" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include/stdapis" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include/stdapis/sys" -I"D:/CarbideWorkspace/smfserver_cleaned/smf/smfservermodule/smfclient/client" -I"D:/CarbideWorkspace/smfserver_cleaned/smf/smfservermodule/smfclient/client/tmp" -I"D:/CarbideWorkspace/smfserver_cleaned/smf/smfservermodule/smfclient/common" -I"D:/CarbideWorkspace/smfserver_cleaned/smf/smfservermodule/smfclient/common/tmp" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include/middleware" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include/domain/middleware" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include/applications" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include/domain/applications" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include/domain/middleware/loc" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include/stdapis/stlport" -first: default -default: debug-winscw -all: debug release - -qmake: - $(QMAKE) -spec symbian-abld -o "bld.inf" "D:/CarbideWorkspace/smfserver_cleaned/smf/smfservermodule/smfclient/smfclient.pro" - -bld.inf: - $(QMAKE) - -$(ABLD): bld.inf - bldmake bldfiles - -debug: $(ABLD) - $(ABLD) build winscw udeb - $(ABLD) build gcce udeb - $(ABLD) build armv5 udeb - $(ABLD) build armv6 udeb - -release: $(ABLD) - $(ABLD) build gcce urel - $(ABLD) build armv5 urel - $(ABLD) build armv6 urel - -debug-winscw: $(ABLD) - $(ABLD) build winscw udeb -debug-gcce: $(ABLD) - $(ABLD) build gcce udeb -debug-armv5: $(ABLD) - $(ABLD) build armv5 udeb -debug-armv6: $(ABLD) - $(ABLD) build armv6 udeb -release-gcce: $(ABLD) - $(ABLD) build gcce urel -release-armv5: $(ABLD) - $(ABLD) build armv5 urel -release-armv6: $(ABLD) - $(ABLD) build armv6 urel - -export: $(ABLD) - $(ABLD) export - -cleanexport: $(ABLD) - $(ABLD) cleanexport - -D:\Qt\4.6.1\bin\moc.exe: - (cd $(QTDIR)/src/tools/moc && $(MAKE)) - -mocclean: compiler_moc_header_clean compiler_moc_source_clean - -mocables: compiler_moc_header_make_all compiler_moc_source_make_all - -compiler_moc_header_make_all: moc_smfcontactfetcher.cpp moc_smfpostprovider.cpp moc_smfgallery.cpp moc_smfclient_p.cpp moc_smfcontactfetcher_p.cpp moc_smfpostprovider_p.cpp moc_smfgallery_p.cpp -compiler_moc_header_clean: - -$(DEL_FILE) moc_smfcontactfetcher.cpp moc_smfpostprovider.cpp moc_smfgallery.cpp moc_smfclient_p.cpp moc_smfcontactfetcher_p.cpp moc_smfpostprovider_p.cpp moc_smfgallery_p.cpp 2> NUL -moc_smfcontactfetcher.cpp: client\smfcontactfetcher.h \ - d:\Qt\4.6.1\bin\moc.exe - D:\Qt\4.6.1\bin\moc.exe $(DEFINES) $(INCPATH) -DSYMBIAN client\smfcontactfetcher.h -o moc_smfcontactfetcher.cpp - -moc_smfpostprovider.cpp: client\smfpostprovider_p.h \ - client\smfpostprovider.h \ - client\smfpostprovider.h \ - d:\Qt\4.6.1\bin\moc.exe - D:\Qt\4.6.1\bin\moc.exe $(DEFINES) $(INCPATH) -DSYMBIAN client\smfpostprovider.h -o moc_smfpostprovider.cpp - -moc_smfgallery.cpp: client\smfgallery.h \ - d:\Qt\4.6.1\bin\moc.exe - D:\Qt\4.6.1\bin\moc.exe $(DEFINES) $(INCPATH) -DSYMBIAN client\smfgallery.h -o moc_smfgallery.cpp - -moc_smfclient_p.cpp: client\smfclient.h \ - client\smfclientsymbian.h \ - client\smfclientsymbiansession.h \ - client\smfclient_p.h \ - d:\Qt\4.6.1\bin\moc.exe - D:\Qt\4.6.1\bin\moc.exe $(DEFINES) $(INCPATH) -DSYMBIAN client\smfclient_p.h -o moc_smfclient_p.cpp - -moc_smfcontactfetcher_p.cpp: client\smfcontactfetcher.h \ - client\smfpostprovider.h \ - client\smfpostprovider_p.h \ - client\smfcontactfetcher_p.h \ - d:\Qt\4.6.1\bin\moc.exe - D:\Qt\4.6.1\bin\moc.exe $(DEFINES) $(INCPATH) -DSYMBIAN client\smfcontactfetcher_p.h -o moc_smfcontactfetcher_p.cpp - -moc_smfpostprovider_p.cpp: client\smfpostprovider.h \ - client\smfpostprovider_p.h \ - client\smfpostprovider_p.h \ - d:\Qt\4.6.1\bin\moc.exe - D:\Qt\4.6.1\bin\moc.exe $(DEFINES) $(INCPATH) -DSYMBIAN client\smfpostprovider_p.h -o moc_smfpostprovider_p.cpp - -moc_smfgallery_p.cpp: client\smfgallery.h \ - client\smfgallery_p.h \ - d:\Qt\4.6.1\bin\moc.exe - D:\Qt\4.6.1\bin\moc.exe $(DEFINES) $(INCPATH) -DSYMBIAN client\smfgallery_p.h -o moc_smfgallery_p.cpp - -compiler_rcc_make_all: -compiler_rcc_clean: -compiler_image_collection_make_all: qmake_image_collection.cpp -compiler_image_collection_clean: - -$(DEL_FILE) qmake_image_collection.cpp 2> NUL -compiler_moc_source_make_all: -compiler_moc_source_clean: -compiler_uic_make_all: -compiler_uic_clean: -compiler_yacc_decl_make_all: -compiler_yacc_decl_clean: -compiler_yacc_impl_make_all: -compiler_yacc_impl_clean: -compiler_lex_make_all: -compiler_lex_clean: -compiler_clean: compiler_moc_header_clean - -create_temps: - -@ if NOT EXIST "D:\Qt\4.6.1\include\QtCore\tmp" mkdir "D:\Qt\4.6.1\include\QtCore\tmp" - -@ if NOT EXIST "D:\Qt\4.6.1\include\QtNetwork\tmp" mkdir "D:\Qt\4.6.1\include\QtNetwork\tmp" - -@ if NOT EXIST "D:\Qt\4.6.1\include\QtGui\tmp" mkdir "D:\Qt\4.6.1\include\QtGui\tmp" - -@ if NOT EXIST "D:\Qt\4.6.1\include\tmp" mkdir "D:\Qt\4.6.1\include\tmp" - -@ if NOT EXIST "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfclient\tmp" mkdir "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfclient\tmp" - -@ if NOT EXIST "D:\Qt\4.6.1\mkspecs\common\symbian\tmp" mkdir "D:\Qt\4.6.1\mkspecs\common\symbian\tmp" - -@ if NOT EXIST "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfclient\client\tmp" mkdir "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfclient\client\tmp" - -@ if NOT EXIST "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfclient\common\tmp" mkdir "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfclient\common\tmp" - -extension_clean: compiler_clean - -@ if EXIST "D:\Qt\4.6.1\include\QtCore\tmp" rmdir /S /Q "D:\Qt\4.6.1\include\QtCore\tmp" - -@ if EXIST "D:\Qt\4.6.1\include\QtNetwork\tmp" rmdir /S /Q "D:\Qt\4.6.1\include\QtNetwork\tmp" - -@ if EXIST "D:\Qt\4.6.1\include\QtGui\tmp" rmdir /S /Q "D:\Qt\4.6.1\include\QtGui\tmp" - -@ if EXIST "D:\Qt\4.6.1\include\tmp" rmdir /S /Q "D:\Qt\4.6.1\include\tmp" - -@ if EXIST "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfclient\tmp" rmdir /S /Q "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfclient\tmp" - -@ if EXIST "D:\Qt\4.6.1\mkspecs\common\symbian\tmp" rmdir /S /Q "D:\Qt\4.6.1\mkspecs\common\symbian\tmp" - -@ if EXIST "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfclient\client\tmp" rmdir /S /Q "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfclient\client\tmp" - -@ if EXIST "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfclient\common\tmp" rmdir /S /Q "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfclient\common\tmp" - -pre_targetdeps: \ - generated_sources \ - all_source_deps - -generated_sources: \ - moc_smfcontactfetcher.cpp \ - moc_smfpostprovider.cpp \ - moc_smfgallery.cpp \ - moc_smfclient_p.cpp \ - moc_smfcontactfetcher_p.cpp \ - moc_smfpostprovider_p.cpp \ - moc_smfgallery_p.cpp - -all_source_deps: \ - client\smfgallery.h \ - client\smfgallery_p.h \ - client\smfclientsymbian.h \ - client\smfclientsymbiansession.h \ - client\smfpostprovider.h \ - client\smfpostprovider_p.h \ - client\smfclient.h \ - client\smfclient_p.h \ - client\smfcontactfetcher.h \ - client\smfcontactfetcher_p.h \ - client\SmfClientSymbian.h \ - common\smfcomment.h \ - common\smfcomment_p.h \ - common\smfcontact.h \ - common\SmfClientGlobal.h \ - common\smfcontact_p.h \ - common\smfgroup.h \ - common\smfclientglobal.h \ - common\smfgroup_p.h \ - common\smfpost.h \ - common\smfpost_p.h \ - common\smfprovider.h - -finalize: - -winscw_deployment: - -winscw_deployment_clean: - -sis: restore_build - $(if $(wildcard smfclient_template.pkg),$(if $(wildcard .make.cache),$(MAKE) -s -f $(MAKEFILE) ok_sis,$(if $(QT_SIS_TARGET),$(MAKE) -s -f $(MAKEFILE) ok_sis,$(MAKE) -s -f $(MAKEFILE) fail_sis_nocache)),$(MAKE) -s -f $(MAKEFILE) fail_sis_nopkg) - -ok_sis: - createpackage.bat $(QT_SIS_OPTIONS) smfclient_template.pkg $(QT_SIS_TARGET) $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE) - -fail_sis_nopkg: - $(error PKG file does not exist, 'SIS' target is only supported for executables or projects with DEPLOYMENT statement) - -fail_sis_nocache: - $(error Project has to be built or QT_SIS_TARGET environment variable has to be set before calling 'SIS' target) - -restore_build: --include .make.cache - -store_build: - @echo # ============================================================================== > .make.cache - @echo # This file is generated by make and should not be modified by the user >> .make.cache - @echo # Name : .make.cache >> .make.cache - @echo # Part of : smfclient >> .make.cache - @echo # Description : This file is used to cache last build target for >> .make.cache - @echo # make sis target. >> .make.cache - @echo # Version : >> .make.cache - @echo # >> .make.cache - @echo # ============================================================================== >> .make.cache - @echo. >> .make.cache - @echo QT_SIS_TARGET ?= $(QT_SIS_TARGET) >> .make.cache - -dodistclean: - -@ if EXIST "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfclient\Makefile" $(DEL_FILE) "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfclient\Makefile" - -@ if EXIST "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfclient\Makefile_0xE08059D4.mk" $(DEL_FILE) "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfclient\Makefile_0xE08059D4.mk" - -@ if EXIST "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfclient\smfclient_0xE08059D4.mmp" $(DEL_FILE) "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfclient\smfclient_0xE08059D4.mmp" - -@ if EXIST "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfclient\.make.cache" $(DEL_FILE) "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfclient\.make.cache" - -@ if EXIST "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfclient\bld.inf" $(DEL_FILE) "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfclient\bld.inf" - -distclean: clean dodistclean - -clean: $(ABLD) - -$(ABLD) reallyclean - -bldmake clean - -clean-debug: $(ABLD) - $(ABLD) reallyclean winscw udeb - $(ABLD) reallyclean gcce udeb - $(ABLD) reallyclean armv5 udeb - $(ABLD) reallyclean armv6 udeb - -clean-release: $(ABLD) - $(ABLD) reallyclean gcce urel - $(ABLD) reallyclean armv5 urel - $(ABLD) reallyclean armv6 urel - -clean-debug-winscw: $(ABLD) - $(ABLD) reallyclean winscw udeb -clean-debug-gcce: $(ABLD) - $(ABLD) reallyclean gcce udeb -clean-debug-armv5: $(ABLD) - $(ABLD) reallyclean armv5 udeb -clean-debug-armv6: $(ABLD) - $(ABLD) reallyclean armv6 udeb -clean-release-gcce: $(ABLD) - $(ABLD) reallyclean gcce urel -clean-release-armv5: $(ABLD) - $(ABLD) reallyclean armv5 urel -clean-release-armv6: $(ABLD) - $(ABLD) reallyclean armv6 urel - diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/smfclient/client/client.pri --- a/smf/smfservermodule/smfclient/client/client.pri Tue May 18 17:37:12 2010 +0530 +++ b/smf/smfservermodule/smfclient/client/client.pri Fri May 21 15:45:10 2010 +0100 @@ -1,15 +1,16 @@ INCLUDEPATH += client \ ./ + PUBLIC_HEADERS += client/smfclient.h \ client/smfcontactfetcher.h \ client/smfpostprovider.h \ - client/smfgallery.h \ - client/smfclientsymbian.h \ - client/smfclientsymbiansession.h + client/smfgallery.h + PRIVATE_HEADERS += client/smfclient_p.h \ client/smfcontactfetcher_p.h \ client/smfpostprovider_p.h \ client/smfgallery_p.h + SOURCES += client/smfgallery.cpp \ client/smfgallery_p.cpp \ client/smfpostprovider.cpp \ @@ -17,8 +18,8 @@ client/smfclient.cpp \ client/smfclient_p.cpp \ client/smfcontactfetcher.cpp \ - client/smfcontactfetcher_p.cpp \ - client/smfclientsymbian.cpp + client/smfcontactfetcher_p.cpp + symbian: { BLD_INF_RULES.prj_exports += client/smfclient.h BLD_INF_RULES.prj_exports += client/smfclient_p.h @@ -30,5 +31,13 @@ BLD_INF_RULES.prj_exports += client/smfpostprovider_p.h BLD_INF_RULES.prj_exports += client/smfgallery.h BLD_INF_RULES.prj_exports += client/smfgallery_p.h + + PUBLIC_HEADERS += client/smfclientsymbian.h \ + client/smfclientsymbiansession.h + + SOURCES += client/smfclientsymbian.cpp + +} else { + PRIVATE_HEADERS += client/smfclientqt.h + SOURCES += client/smfclientqt.cpp } - diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/smfclient/client/smfclient_p.h --- a/smf/smfservermodule/smfclient/client/smfclient_p.h Tue May 18 17:37:12 2010 +0530 +++ b/smf/smfservermodule/smfclient/client/smfclient_p.h Fri May 21 15:45:10 2010 +0100 @@ -17,7 +17,7 @@ #define SMFCLIENT_P_H_ #include "smfprovider.h" -#include "SmfObserver.h" +#include "smfobserver.h" #include #include #include @@ -27,7 +27,7 @@ #ifdef Q_OS_SYMBIAN #include "smfclientsymbian.h" #else -class SmfClientQt; +#include "smfclientqt.h" #endif /** @@ -46,13 +46,13 @@ /** * Constructs SmfClientPrivate - * @param client SmfClient instance, so that it can directly emit SmfClient's signal + * @param client SmfClient instance, so that it can directly emit SmfClient's signal */ SmfClientPrivate(SmfClient* client=0); ~SmfClientPrivate(){}; public: /** - * Corresponds to SmfClient::GetServices(const QString ) + * Corresponds to SmfClient::GetServices(const QString ) */ QList* GetServices(const QString serviceName); /** @@ -61,7 +61,7 @@ * other components of Smf (specially from plugin manager). * @param result Parsed and serialized result. * @param opcode Request code. - * @param error Error + * @param error Error */ void resultsAvailable(QByteArray result,SmfRequestTypeID opcode,SmfError error); private: diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/smfclient/client/smfclientqt.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/smf/smfservermodule/smfclient/client/smfclientqt.cpp Fri May 21 15:45:10 2010 +0100 @@ -0,0 +1,61 @@ +/** + * Copyright (c) 2010 Sasken Communication Technologies Ltd. + * All rights reserved. + * This component and the accompanying materials are made available + * under the terms of the "Eclipse Public License v1.0" + * which accompanies this distribution, and is available + * at the URL "http://www.eclipse.org/legal/epl-v10.html" + * + * Initial Contributors: + * Chandradeep Gandhi, Sasken Communication Technologies Ltd - Initial contribution + * + * Contributors: + * Manasij Roy, Nalina Hariharan + */ + +#include "smfclientqt.h" + +SmfClientQt::SmfClientQt(QObject *parent) : + QObject(parent) +{ +} + +/** + * Send a request to the server. + * @param aSerializedData serialized by the caller. + * @param aInterfaceName Interface name + * @param requestType Opcode + */ +int SmfClientQt::sendRequest(QByteArray& aSerializedData, QString aInterfaceName, + SmfRequestTypeID requestType) +{ + +} + +/** + * This overloaded API is for ESmfGetServices, where data should be + * fetched synchronously + */ +QByteArray SmfClientQt::sendRequest(QString aInterfaceName, + SmfRequestTypeID requestType) +{ + +} + +/** + * For testing purpose only + */ +int SmfClientQt::sendDummyRequest(QByteArray* provider,QString aInterfaceName, + SmfRequestTypeID requestType) +{ + +} + +/** +* CancelRequest. +* Cancels an outstanding request. +*/ +void SmfClientQt::CancelRequest() +{ + +} diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/smfclient/client/smfclientqt.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/smf/smfservermodule/smfclient/client/smfclientqt.h Fri May 21 15:45:10 2010 +0100 @@ -0,0 +1,68 @@ +/** + * Copyright (c) 2010 Sasken Communication Technologies Ltd. + * All rights reserved. + * This component and the accompanying materials are made available + * under the terms of the "Eclipse Public License v1.0" + * which accompanies this distribution, and is available + * at the URL "http://www.eclipse.org/legal/epl-v10.html" + * + * Initial Contributors: + * Chandradeep Gandhi, Sasken Communication Technologies Ltd - Initial contribution + * + * Contributors: + * Manasij Roy, Nalina Hariharan + */ + +#ifndef SMFCLIENTQT_H +#define SMFCLIENTQT_H + +#include +#include +#include +#include "smfglobal.h" + +class SmfClientQt : public QObject +{ +Q_OBJECT + +public: + explicit SmfClientQt(QObject *parent = 0); + +public: + /** + * Send a request to the server. + * @param aSerializedData serialized by the caller. + * @param aInterfaceName Interface name + * @param requestType Opcode + */ + int sendRequest(QByteArray& aSerializedData, + QString aInterfaceName, + SmfRequestTypeID requestType); + + /** + * This overloaded API is for ESmfGetServices, where data should be + * fetched synchronously + */ + QByteArray sendRequest(QString aInterfaceName, + SmfRequestTypeID requestType); + + /** + * For testing purpose only + */ + int sendDummyRequest(QByteArray* provider,QString aInterfaceName, + SmfRequestTypeID requestType); + + /** + * CancelRequest. + * Cancels an outstanding request. + */ + void CancelRequest(); + + +signals: + +public slots: + +}; + +#endif // SMFCLIENTQT_H diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/smfclient/client/smfcontactfetcher.h --- a/smf/smfservermodule/smfclient/client/smfcontactfetcher.h Tue May 18 17:37:12 2010 +0530 +++ b/smf/smfservermodule/smfclient/client/smfcontactfetcher.h Fri May 21 15:45:10 2010 +0100 @@ -26,9 +26,11 @@ #include "smfcontact.h" #include "smflocation.h" #include "smfgroup.h" + class SmfProvider; //base-class for service provider class SmfContact; //class for Contact in a social network class SmfGroup; //class for a group in social network +class SmfContactFetcherPrivate; typedef QList SmfContactList; typedef QList SmfGroupList; @@ -57,7 +59,7 @@ * @param parent base provider info * @param contact Used for searching friends of the given contact * Seeing as this is a plug-in implementation, these will realistically - * be generated by SMF factory of some kind + * be generated by SMF factory of some kind */ SmfContactFetcher(SmfProvider* baseProvider); SmfContactFetcher(SmfProvider* baseProvider, SmfContact* contact); @@ -91,7 +93,7 @@ * When the list is big user can specify the page number and per page item data. * If not supplied by the user default values are used. * @param pageNum Page number to download, SMF_FIRST_PAGE denotes fresh query. - * @param perPage Item per page, default is SMF_ITEMS_PER_PAGE + * @param perPage Item per page, default is SMF_ITEMS_PER_PAGE */ void search(SmfContact* contact,int pageNum=SMF_FIRST_PAGE,int perPage=SMF_ITEMS_PER_PAGE) ; // list of contact objects @@ -134,14 +136,14 @@ * @param customData Custom data to be sent * Note:-Interpretation of operationId and customData is upto the concerned * plugin and client application. service provider should provide some - * serializing-deserializing utilities for these custom data + * serializing-deserializing utilities for these custom data */ void customRequest(const int& operationId,QByteArray* customData); //APIs to get/set base provider info (SmfProvider) /** - * Gets the base provider info + * Gets the base provider info */ SmfProvider* getProvider() ; @@ -154,7 +156,7 @@ * @param list list of friends * @param error error value * @param resultPage Page number info - * @see friends() + * @see friends() */ void friendsListAvailable(SmfContactList* list, SmfError error, SmfResultPage resultPage); @@ -186,7 +188,7 @@ * In that case this signal is emitted multiple times. * @param list List of filtered contacts * @param resultPage Page number info - * @see search() + * @see search() */ void searchContactFinished(SmfContactList* list,SmfError error, SmfResultPage resultPage); @@ -214,7 +216,7 @@ /** * Emitted when custom data is available * @param operationId Requested operation id - * @param customData Custom data received, interpretation is not the responsibility of Smf + * @param customData Custom data received, interpretation is not the responsibility of Smf */ void customDataAvailable(int operationId, QByteArray* customData); //so that private impl can directly call emit diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/smfclient/client/smfcontactfetcher_p.cpp --- a/smf/smfservermodule/smfclient/client/smfcontactfetcher_p.cpp Tue May 18 17:37:12 2010 +0530 +++ b/smf/smfservermodule/smfclient/client/smfcontactfetcher_p.cpp Fri May 21 15:45:10 2010 +0100 @@ -15,12 +15,12 @@ #include "smfcontactfetcher_p.h" #ifdef WRITE_LOG #include -#include +#include #endif #ifdef Q_OS_SYMBIAN #include "SmfClientSymbian.h" #else -#include "SmfClientQt.h" +#include "smfclientqt.h" #endif /** * Constructs the SmfContactFetcher. diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/smfclient/client/smfcontactfetcher_p.h --- a/smf/smfservermodule/smfclient/client/smfcontactfetcher_p.h Tue May 18 17:37:12 2010 +0530 +++ b/smf/smfservermodule/smfclient/client/smfcontactfetcher_p.h Fri May 21 15:45:10 2010 +0100 @@ -24,9 +24,9 @@ * Note:- only symbian client-server impl is provided at the moment **/ #include "smfprovider.h" -#include "SmfClientGlobal.h" -#include "smfGlobal.h" -#include "SmfObserver.h" +#include "smfclientglobal.h" +#include "smfglobal.h" +#include "smfobserver.h" class SmfProvider; @@ -35,9 +35,10 @@ #include #include -#include "SmfObserver.h" +#include "smfobserver.h" #include "smfcontactfetcher.h" #include "smfpostprovider.h" + #ifdef Q_OS_SYMBIAN class CSmfClientSymbian; #else diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/smfclient/client/smfgallery_p.cpp --- a/smf/smfservermodule/smfclient/client/smfgallery_p.cpp Tue May 18 17:37:12 2010 +0530 +++ b/smf/smfservermodule/smfclient/client/smfgallery_p.cpp Fri May 21 15:45:10 2010 +0100 @@ -25,7 +25,7 @@ #ifdef Q_OS_SYMBIAN #include "smfclientsymbian.h" #else -#include "SmfClientQt.h" +#include "smfclientqt.h" #endif SmfGalleryPrivate::SmfGalleryPrivate(SmfGallery* gallery) diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/smfclient/client/smfgallery_p.h --- a/smf/smfservermodule/smfclient/client/smfgallery_p.h Tue May 18 17:37:12 2010 +0530 +++ b/smf/smfservermodule/smfclient/client/smfgallery_p.h Fri May 21 15:45:10 2010 +0100 @@ -26,9 +26,9 @@ **/ #include "smfprovider.h" -#include "SmfClientGlobal.h" -#include "smfGlobal.h" -#include "SmfObserver.h" +#include "smfclientglobal.h" +#include "smfglobal.h" +#include "smfobserver.h" class SmfProvider; @@ -37,7 +37,7 @@ #include #include -#include "SmfObserver.h" +#include "smfobserver.h" #include "smfgallery.h" #ifdef Q_OS_SYMBIAN class CSmfClientSymbian; diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/smfclient/client/smfpostprovider.cpp --- a/smf/smfservermodule/smfclient/client/smfpostprovider.cpp Tue May 18 17:37:12 2010 +0530 +++ b/smf/smfservermodule/smfclient/client/smfpostprovider.cpp Fri May 21 15:45:10 2010 +0100 @@ -18,6 +18,8 @@ */ #include "smfpostprovider.h" +#include "smfpostprovider_p.h" + #include #include diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/smfclient/client/smfpostprovider.h --- a/smf/smfservermodule/smfclient/client/smfpostprovider.h Tue May 18 17:37:12 2010 +0530 +++ b/smf/smfservermodule/smfclient/client/smfpostprovider.h Fri May 21 15:45:10 2010 +0100 @@ -30,7 +30,8 @@ #include "smfcontact.h" #include "smflocation.h" #include "smfpost.h" -#include "smfpostprovider_p.h" + +class SmfPostProviderPrivate; /** * @ingroup smf_client_group @@ -50,7 +51,7 @@ * Constructs SmfPostProvider. * @param baseProvider The base provider info * Seeing as this is a plug-in implementation, these will realistically - * be generated by SMF factory of some kind + * be generated by SMF factory of some kind */ SmfPostProvider(SmfProvider* baseProvider); ~SmfPostProvider(); @@ -59,23 +60,23 @@ public: /** * returns maximum no of chars (unicode) that service provider can post without truncation - * negative value means no limit + * negative value means no limit */ qint32 maxCharsInPost() const; /** * returns maximum no of items that can be returned in a single query to getPosts - * negative value means feature not supported. + * negative value means feature not supported. */ qint32 maxItems() const; /** * returns all the formatting of posts that this service provider supports. - * May return 0 items to mean only QString is supported. + * May return 0 items to mean only QString is supported. */ QVector supportedFormats () const; /** - * returns whether this SP supports Appearence @see SmfAppearenceInfo + * returns whether this SP supports Appearence @see SmfAppearenceInfo */ bool supportsAppearence () const; @@ -86,7 +87,7 @@ * @param user user's contact in this SP, omit for self contact * @param pageNum Page number to download, SMF_FIRST_PAGE denotes fresh query. * @param perPage Item per page, default is SMF_ITEMS_PER_PAGE - * @see postsAvailable() + * @see postsAvailable() */ void posts(SmfContact* user = 0,int pageNum=SMF_FIRST_PAGE,int perPage=SMF_ITEMS_PER_PAGE); @@ -110,7 +111,7 @@ * updatePostFinished() signal. * @param postData data to be posted * @param contact contact to which the post is to be directed - * @param location location data + * @param location location data */ void postDirected(SmfPost& postData,SmfContact& contact,SmfLocation* location=0); @@ -118,7 +119,7 @@ * Posts appearance info of the user.e.g. appear offline, busy, do-not-disturb * @param appearence user appearance * @see SmfPresenceInfo - * @return False on Failure/Not supported + * @return False on Failure/Not supported */ bool postAppearence(SmfAppearenceInfo appearence); /** @@ -153,13 +154,13 @@ * In that case this signal is emitted multiple times. * @param list list of posts * @param error error string - * @param resultPage Page number info + * @param resultPage Page number info */ void postsAvailable(SmfPostList* list, SmfError error, SmfResultPage resultPage); /** * Emitted when update post is finished. - * @param success the success of the update + * @param success the success of the update */ void postFinished(bool success); /** diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/smfclient/client/smfpostprovider_p.cpp --- a/smf/smfservermodule/smfclient/client/smfpostprovider_p.cpp Tue May 18 17:37:12 2010 +0530 +++ b/smf/smfservermodule/smfclient/client/smfpostprovider_p.cpp Fri May 21 15:45:10 2010 +0100 @@ -26,7 +26,7 @@ #ifdef Q_OS_SYMBIAN #include "smfclientsymbian.h" #else -#include "SmfClientQt.h" +#include "smfclientqt.h" #endif SmfPostProviderPrivate::SmfPostProviderPrivate(SmfPostProvider* postProvider) : m_postProvider(postProvider),m_postList(NULL) diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/smfclient/client/smfpostprovider_p.h --- a/smf/smfservermodule/smfclient/client/smfpostprovider_p.h Tue May 18 17:37:12 2010 +0530 +++ b/smf/smfservermodule/smfclient/client/smfpostprovider_p.h Fri May 21 15:45:10 2010 +0100 @@ -20,9 +20,9 @@ #define SMFPOSTPROVIDER_P_H_ #include "smfprovider.h" -#include "SmfClientGlobal.h" -#include "smfGlobal.h" -#include "SmfObserver.h" +#include "smfclientglobal.h" +#include "smfglobal.h" +#include "smfobserver.h" class SmfProvider; class SmfPostProvider; @@ -40,10 +40,10 @@ #endif /** - * Data size limits + * Data size limits */ /** - * Single Post-1 MB + * Single Post-1 MB */ const int KSmfPostMaxSize = 1000000; /** diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/smfclient/common/common.pri --- a/smf/smfservermodule/smfclient/common/common.pri Tue May 18 17:37:12 2010 +0530 +++ b/smf/smfservermodule/smfclient/common/common.pri Fri May 21 15:45:10 2010 +0100 @@ -1,105 +1,103 @@ -INCLUDEPATH += common \ - ./ +INCLUDEPATH += $$PWD PUBLIC_HEADERS += \ - common/smfalbum.h \ - common/smfartists.h \ - common/smfcomment.h \ - common/smfcontact.h \ - common/smfevent.h \ - common/smfgroup.h \ - common/smflocation.h \ - common/smflyrics.h \ - common/smfmusicfingerprint.h \ - common/smfmusicprofile.h \ - common/smfmusicrating.h \ - common/smfpicture.h \ - common/smfplaylist.h \ - common/smfpluginutil.h \ - common/smfpost.h \ - common/smfprovider.h \ - common/smfsubtitle.h \ - common/smftrackinfo.h \ - common/smfclientglobal.h \ - common/smfglobal.h \ - common/smfobserver.h + $$PWD/smfalbum.h \ + $$PWD/smfartists.h \ + $$PWD/smfcomment.h \ + $$PWD/smfcontact.h \ + $$PWD/smfevent.h \ + $$PWD/smfgroup.h \ + $$PWD/smflocation.h \ + $$PWD/smflyrics.h \ + $$PWD/smfmusicfingerprint.h \ + $$PWD/smfmusicprofile.h \ + $$PWD/smfmusicrating.h \ + $$PWD/smfpicture.h \ + $$PWD/smfplaylist.h \ + $$PWD/smfpluginutil.h \ + $$PWD/smfpost.h \ + $$PWD/smfprovider.h \ + $$PWD/smfsubtitle.h \ + $$PWD/smftrackinfo.h \ + $$PWD/smfclientglobal.h \ + $$PWD/smfglobal.h \ + $$PWD/smfobserver.h PRIVATE_HEADERS += \ - common/smfalbum_p.h \ - common/smfartists_p.h \ - common/smfcomment_p.h \ - common/smfcontact_p.h \ - common/smfevent_p.h \ - common/smfgroup_p.h \ - common/smflocation_p.h \ - common/smflyrics_p.h \ - common/smfmusicfingerprint_p.h \ - common/smfmusicprofile_p.h \ - common/smfmusicrating_p.h \ - common/smfpicture_p.h \ - common/smfplaylist_p.h \ - common/smfpost_p.h \ - common/smfsubtitle_p.h \ - common/smftrackinfo_p.h \ - common/smfobserver.h + $$PWD/smfalbum_p.h \ + $$PWD/smfartists_p.h \ + $$PWD/smfcomment_p.h \ + $$PWD/smfcontact_p.h \ + $$PWD/smfevent_p.h \ + $$PWD/smfgroup_p.h \ + $$PWD/smflocation_p.h \ + $$PWD/smflyrics_p.h \ + $$PWD/smfmusicfingerprint_p.h \ + $$PWD/smfmusicprofile_p.h \ + $$PWD/smfmusicrating_p.h \ + $$PWD/smfpicture_p.h \ + $$PWD/smfplaylist_p.h \ + $$PWD/smfpost_p.h \ + $$PWD/smfsubtitle_p.h \ + $$PWD/smftrackinfo_p.h \ + $$PWD/smfobserver.h SOURCES += \ - common/smfalbum.cpp \ - common/smfartists.cpp \ - common/smfcomment.cpp \ - common/smfcontact.cpp \ - common/smfevent.cpp \ - common/smfgroup.cpp \ - common/smflocation.cpp \ - common/smflyrics.cpp \ - common/smfmusicfingerprint.cpp \ - common/smfmusicprofile.cpp \ - common/smfmusicrating.cpp \ - common/smfpicture.cpp \ - common/smfplaylist.cpp \ - common/smfpluginutil.cpp \ - common/smfpost.cpp \ - common/smfprovider.cpp \ - common/smfsubtitle.cpp \ - common/smftrackinfo.cpp - + $$PWD/smfalbum.cpp \ + $$PWD/smfartists.cpp \ + $$PWD/smfcomment.cpp \ + $$PWD/smfcontact.cpp \ + $$PWD/smfevent.cpp \ + $$PWD/smfgroup.cpp \ + $$PWD/smflocation.cpp \ + $$PWD/smflyrics.cpp \ + $$PWD/smfmusicfingerprint.cpp \ + $$PWD/smfmusicprofile.cpp \ + $$PWD/smfmusicrating.cpp \ + $$PWD/smfpicture.cpp \ + $$PWD/smfplaylist.cpp \ + $$PWD/smfpluginutil.cpp \ + $$PWD/smfpost.cpp \ + $$PWD/smfprovider.cpp \ + $$PWD/smfsubtitle.cpp \ + $$PWD/smftrackinfo.cpp symbian: { - BLD_INF_RULES.prj_exports += common/smfclientglobal.h - BLD_INF_RULES.prj_exports += common/smfglobal.h - BLD_INF_RULES.prj_exports += common/smfobserver.h - BLD_INF_RULES.prj_exports += common/smfalbum.h - BLD_INF_RULES.prj_exports += common/smfalbum_p.h - BLD_INF_RULES.prj_exports += common/smfartists.h - BLD_INF_RULES.prj_exports += common/smfartists_p.h - BLD_INF_RULES.prj_exports += common/smfcomment.h - BLD_INF_RULES.prj_exports += common/smfcomment_p.h - BLD_INF_RULES.prj_exports += common/smfcontact.h - BLD_INF_RULES.prj_exports += common/smfcontact_p.h - BLD_INF_RULES.prj_exports += common/smfevent.h - BLD_INF_RULES.prj_exports += common/smfevent_p.h - BLD_INF_RULES.prj_exports += common/smfgroup.h - BLD_INF_RULES.prj_exports += common/smfgroup_p.h - BLD_INF_RULES.prj_exports += common/smflocation.h - BLD_INF_RULES.prj_exports += common/smflocation_p.h - BLD_INF_RULES.prj_exports += common/smflyrics.h - BLD_INF_RULES.prj_exports += common/smflyrics_p.h - BLD_INF_RULES.prj_exports += common/smfmusicfingerprint.h - BLD_INF_RULES.prj_exports += common/smfmusicfingerprint_p.h - BLD_INF_RULES.prj_exports += common/smfmusicprofile.h - BLD_INF_RULES.prj_exports += common/smfmusicprofile_p.h - BLD_INF_RULES.prj_exports += common/smfmusicrating.h - BLD_INF_RULES.prj_exports += common/smfmusicrating_p.h - BLD_INF_RULES.prj_exports += common/smfpicture.h - BLD_INF_RULES.prj_exports += common/smfpicture_p.h - BLD_INF_RULES.prj_exports += common/smfplaylist.h - BLD_INF_RULES.prj_exports += common/smfplaylist_p.h - BLD_INF_RULES.prj_exports += common/smfpluginutil.h - BLD_INF_RULES.prj_exports += common/smfpost.h - BLD_INF_RULES.prj_exports += common/smfpost_p.h - BLD_INF_RULES.prj_exports += common/smfprovider.h - BLD_INF_RULES.prj_exports += common/smfsubtitle.h - BLD_INF_RULES.prj_exports += common/smfsubtitle_p.h - BLD_INF_RULES.prj_exports += common/smftrackinfo.h - BLD_INF_RULES.prj_exports += common/smftrackinfo_p.h + BLD_INF_RULES.prj_exports += $$PWD/smfclientglobal.h + BLD_INF_RULES.prj_exports += $$PWD/smfglobal.h + BLD_INF_RULES.prj_exports += $$PWD/smfobserver.h + BLD_INF_RULES.prj_exports += $$PWD/smfalbum.h + BLD_INF_RULES.prj_exports += $$PWD/smfalbum_p.h + BLD_INF_RULES.prj_exports += $$PWD/smfartists.h + BLD_INF_RULES.prj_exports += $$PWD/smfartists_p.h + BLD_INF_RULES.prj_exports += $$PWD/smfcomment.h + BLD_INF_RULES.prj_exports += $$PWD/smfcomment_p.h + BLD_INF_RULES.prj_exports += $$PWD/smfcontact.h + BLD_INF_RULES.prj_exports += $$PWD/smfcontact_p.h + BLD_INF_RULES.prj_exports += $$PWD/smfevent.h + BLD_INF_RULES.prj_exports += $$PWD/smfevent_p.h + BLD_INF_RULES.prj_exports += $$PWD/smfgroup.h + BLD_INF_RULES.prj_exports += $$PWD/smfgroup_p.h + BLD_INF_RULES.prj_exports += $$PWD/smflocation.h + BLD_INF_RULES.prj_exports += $$PWD/smflocation_p.h + BLD_INF_RULES.prj_exports += $$PWD/smflyrics.h + BLD_INF_RULES.prj_exports += $$PWD/smflyrics_p.h + BLD_INF_RULES.prj_exports += $$PWD/smfmusicfingerprint.h + BLD_INF_RULES.prj_exports += $$PWD/smfmusicfingerprint_p.h + BLD_INF_RULES.prj_exports += $$PWD/smfmusicprofile.h + BLD_INF_RULES.prj_exports += $$PWD/smfmusicprofile_p.h + BLD_INF_RULES.prj_exports += $$PWD/smfmusicrating.h + BLD_INF_RULES.prj_exports += $$PWD/smfmusicrating_p.h + BLD_INF_RULES.prj_exports += $$PWD/smfpicture.h + BLD_INF_RULES.prj_exports += $$PWD/smfpicture_p.h + BLD_INF_RULES.prj_exports += $$PWD/smfplaylist.h + BLD_INF_RULES.prj_exports += $$PWD/smfplaylist_p.h + BLD_INF_RULES.prj_exports += $$PWD/smfpluginutil.h + BLD_INF_RULES.prj_exports += $$PWD/smfpost.h + BLD_INF_RULES.prj_exports += $$PWD/smfpost_p.h + BLD_INF_RULES.prj_exports += $$PWD/smfprovider.h + BLD_INF_RULES.prj_exports += $$PWD/smfsubtitle.h + BLD_INF_RULES.prj_exports += $$PWD/smfsubtitle_p.h + BLD_INF_RULES.prj_exports += $$PWD/smftrackinfo.h + BLD_INF_RULES.prj_exports += $$PWD/smftrackinfo_p.h } diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/smfclient/common/smfclientglobal.h --- a/smf/smfservermodule/smfclient/common/smfclientglobal.h Tue May 18 17:37:12 2010 +0530 +++ b/smf/smfservermodule/smfclient/common/smfclientglobal.h Fri May 21 15:45:10 2010 +0100 @@ -8,11 +8,12 @@ #ifndef SMFCLIENTGLOBAL_H_ #define SMFCLIENTGLOBAL_H_ - #include +#include +#include +const QString KSmfServerName("smfserver"); +const QString KSmfServerSemaphoreName("smfserverSemaphore"); +const QString KSmfServerFilename("smfserver"); -_LIT(KSmfServerName,"smfserver"); -_LIT( KSmfServerSemaphoreName, "smfserverSemaphore" ); -_LIT( KSmfServerFilename, "smfserver" ); //TUid KSmfServerUID3 = { 0xE37E0269 }; #ifdef SMFCLIENT_LIB_EXPORT @@ -22,7 +23,7 @@ #endif /** - * To be designed later + * To be designed later */ #define SMF_GETSERVICES(INTERFACE,INTERFACESTRING) ; #endif /* SMFCLIENTDEFS_H_ */ diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/smfclient/common/smfcontact.cpp --- a/smf/smfservermodule/smfclient/common/smfcontact.cpp Tue May 18 17:37:12 2010 +0530 +++ b/smf/smfservermodule/smfclient/common/smfcontact.cpp Fri May 21 15:45:10 2010 +0100 @@ -15,6 +15,7 @@ */ SmfContact::SmfContact( QObject *aParent)//:QObject(aParent) { + Q_UNUSED(aParent); d = new SmfContactPrivate; } @@ -36,7 +37,7 @@ } QStringList SmfContact::subTypes( ) const { - + return QStringList(); } /** @@ -47,7 +48,7 @@ */ void SmfContact::convert( QContact &aContact ) const { - + Q_UNUSED(aContact); } /** diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/smfclient/common/smfcontact.h --- a/smf/smfservermodule/smfclient/common/smfcontact.h Tue May 18 17:37:12 2010 +0530 +++ b/smf/smfservermodule/smfclient/common/smfcontact.h Fri May 21 15:45:10 2010 +0100 @@ -22,7 +22,7 @@ #define SMFCONTACT_H_ #include "qtcontacts.h" -#include "SmfClientGlobal.h" +#include "smfclientglobal.h" #include #include #include @@ -123,7 +123,7 @@ QVariant value( const QString& aSubType ) const; /** - * Method to set value for a subtype + * Method to set value for a subtype */ void setValue(const QString& aSubType,QVariant& value); void writeLog(QString log) const; @@ -160,7 +160,7 @@ SmfContact &aContact ); typedef QList SmfContactList; /** - * Serialization support for Qt mobility contact + * Serialization support for Qt mobility contact */ SMFCLIENT_EXPORT QDataStream &operator<<( QDataStream &aDataStream, const QContactName &aContact ); diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/smfclient/common/smfglobal.h --- a/smf/smfservermodule/smfclient/common/smfglobal.h Tue May 18 17:37:12 2010 +0530 +++ b/smf/smfservermodule/smfclient/common/smfglobal.h Fri May 21 15:45:10 2010 +0100 @@ -20,7 +20,11 @@ #ifndef SMFGLOBAL_H #define SMFGLOBAL_H + +#ifdef Q_OS_SYMBIAN #include +#endif + #include #include #include @@ -44,7 +48,9 @@ */ const int SMF_ITEMS_PER_PAGE=10; + class SmfServerSymbianSession; +class SmfServerQtSession; /** @@ -313,7 +319,7 @@ ESmfAuthKeyExpiredComplete };*/ /** - * Smf wide errors + * Smf wide errors */ enum SmfError { diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/smfclient/common/smfprovider.h --- a/smf/smfservermodule/smfclient/common/smfprovider.h Tue May 18 17:37:12 2010 +0530 +++ b/smf/smfservermodule/smfclient/common/smfprovider.h Fri May 21 15:45:10 2010 +0100 @@ -26,7 +26,8 @@ #include #include -#include "SmfClientGlobal.h" +#include "smfclientglobal.h" + /** * @ingroup smf_client_group * Interface for a base service provider. Other service provider classes contains @@ -43,7 +44,7 @@ public: /** - * Seeing as this is a plug-in implementation, these will realistically be generated by SMF factory of some kind + * Seeing as this is a plug-in implementation, these will realistically be generated by SMF factory of some kind */ SmfProvider(QObject* parent = 0); @@ -52,34 +53,34 @@ public: /** * Localizable name of the service - * @return service name + * @return service name */ QString serviceName() const; /** * Logo of the service - * @return logo image of the service + * @return logo image of the service */ QImage serviceIcon() const; /** * Readable service description - * @return service description + * @return service description */ QString description() const; /* - * Website of the service + * Website of the service */ QUrl serviceUrl() const; /** - * URL of the application providing this service + * URL of the application providing this service */ QUrl applicationUrl() const; // /** - * service types - list of interfaces that this provider support + * service types - list of interfaces that this provider support */ QList serviceTypes() const; diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/smfclient/smfclient.pro --- a/smf/smfservermodule/smfclient/smfclient.pro Tue May 18 17:37:12 2010 +0530 +++ b/smf/smfservermodule/smfclient/smfclient.pro Fri May 21 15:45:10 2010 +0100 @@ -9,18 +9,15 @@ DEFINES += WRITE_LOG \ SMFCLIENT_LIB_EXPORT #\ # OLDER_QT_MOBILITY + include(client/client.pri) include(common/common.pri) -PUBLIC_HEADERS += # Private Headers -PRIVATE_HEADERS += HEADERS += $$PUBLIC_HEADERS \ $$PRIVATE_HEADERS -SOURCES += main.cpp \ - smfclient_reg.rss -FORMS += -RESOURCES += +SOURCES += main.cpp + symbian: { TARGET.UID3 = 0xE08059D4 TARGET.CAPABILITY = ReadUserData \ @@ -29,5 +26,10 @@ NetworkServices \ UserEnvironment TARGET.EPOCALLOWDLLDATA = 1 + SOURCES += smfclient_reg.rss LIBS += -lqjson.dll +} else { + INCLUDEPATH += ../util/qjson/src + LIBS += -L../util/qjson/lib -lqjson } + diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/smfserver/Makefile --- a/smf/smfservermodule/smfserver/Makefile Tue May 18 17:37:12 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,260 +0,0 @@ -# ============================================================================== -# Generated by qmake (2.01a) (Qt 4.6.1) on: Tue May 18 15:52:55 2010 -# This file is generated by qmake and should not be modified by the -# user. -# Name : Makefile -# Description : Wrapper Makefile for calling Symbian build tools -# -# ============================================================================== - - -MAKEFILE = Makefile -QMAKE = d:\Qt\4.6.1\bin\qmake -DEL_FILE = del -DEL_DIR = rmdir -MOVE = move -XCOPY = xcopy /d /f /h /r /y /i -ABLD = ABLD.BAT -DEBUG_PLATFORMS = winscw gcce armv5 armv6 -RELEASE_PLATFORMS = gcce armv5 armv6 -MAKE = make - -ifeq (WINS,$(findstring WINS, $(PLATFORM))) -ZDIR=$(EPOCROOT)epoc32\release\$(PLATFORM)\$(CFG)\Z -else -ZDIR=$(EPOCROOT)epoc32\data\z -endif - -DEFINES = -DSYMBIAN -DUNICODE -DQT_KEYPAD_NAVIGATION -DQT_SOFTKEYS_ENABLED -DQT_USE_MATH_H_FLOATS -DNO_OTHER_MODULES -DQT_SQL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -INCPATH = -I"D:/Qt/4.6.1/include/QtCore" -I"D:/Qt/4.6.1/include/QtCore/tmp" -I"D:/Qt/4.6.1/include/QtNetwork" -I"D:/Qt/4.6.1/include/QtNetwork/tmp" -I"D:/Qt/4.6.1/include/QtGui" -I"D:/Qt/4.6.1/include/QtGui/tmp" -I"D:/Qt/4.6.1/include/QtSql" -I"D:/Qt/4.6.1/include/QtSql/tmp" -I"D:/Qt/4.6.1/include" -I"D:/Qt/4.6.1/include/tmp" -I"D:/CarbideWorkspace/smfserver_cleaned/smf/smfservermodule/smfserver" -I"D:/CarbideWorkspace/smfserver_cleaned/smf/smfservermodule/smfserver/tmp" -I"D:/Qt/4.6.1/mkspecs/common/symbian" -I"D:/Qt/4.6.1/mkspecs/common/symbian/tmp" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include/stdapis" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include/stdapis/sys" -I"D:/CarbideWorkspace/smfserver_cleaned/smf/smfservermodule/smfserver/pluginmgr" -I"D:/CarbideWorkspace/smfserver_cleaned/smf/smfservermodule/smfserver/pluginmgr/tmp" -I"D:/CarbideWorkspace/smfserver_cleaned/smf/smfservermodule/smfserver/server" -I"D:/CarbideWorkspace/smfserver_cleaned/smf/smfservermodule/smfserver/server/tmp" -I"D:/CarbideWorkspace/smfserver_cleaned/smf/smfservermodule/smfserver/smfplugins" -I"D:/CarbideWorkspace/smfserver_cleaned/smf/smfservermodule/smfserver/smfplugins/tmp" -I"D:/CarbideWorkspace/smfserver_cleaned/smf/smfservermodule/smfserver/transportmgr" -I"D:/CarbideWorkspace/smfserver_cleaned/smf/smfservermodule/smfserver/transportmgr/tmp" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include/middleware" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include/domain/middleware" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include/applications" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include/domain/applications" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include/domain/middleware/loc" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include/stdapis/stlport" -first: default -default: debug-winscw -all: debug release - -qmake: - $(QMAKE) -spec symbian-abld -o "bld.inf" "D:/CarbideWorkspace/smfserver_cleaned/smf/smfservermodule/smfserver/smfserver.pro" - -bld.inf: - $(QMAKE) - -$(ABLD): bld.inf - bldmake bldfiles - -debug: $(ABLD) - $(ABLD) build winscw udeb - $(ABLD) build gcce udeb - $(ABLD) build armv5 udeb - $(ABLD) build armv6 udeb - -release: $(ABLD) - $(ABLD) build gcce urel - $(ABLD) build armv5 urel - $(ABLD) build armv6 urel - -debug-winscw: $(ABLD) - $(ABLD) build winscw udeb -debug-gcce: $(ABLD) - $(ABLD) build gcce udeb -debug-armv5: $(ABLD) - $(ABLD) build armv5 udeb -debug-armv6: $(ABLD) - $(ABLD) build armv6 udeb -release-gcce: $(ABLD) - $(ABLD) build gcce urel -release-armv5: $(ABLD) - $(ABLD) build armv5 urel -release-armv6: $(ABLD) - $(ABLD) build armv6 urel - -export: $(ABLD) - $(ABLD) export - -cleanexport: $(ABLD) - $(ABLD) cleanexport - -D:\Qt\4.6.1\bin\moc.exe: - (cd $(QTDIR)/src/tools/moc && $(MAKE)) - -mocclean: compiler_moc_header_clean compiler_moc_source_clean - -mocables: compiler_moc_header_make_all compiler_moc_source_make_all - -compiler_moc_header_make_all: moc_smfpluginmanager.cpp moc_smfpluginmanagerutil.cpp moc_smfserver.cpp moc_smftransportmanager.cpp moc_smftransportmanagerutil.cpp moc_smfserverqt_p.cpp -compiler_moc_header_clean: - -$(DEL_FILE) moc_smfpluginmanager.cpp moc_smfpluginmanagerutil.cpp moc_smfserver.cpp moc_smftransportmanager.cpp moc_smftransportmanagerutil.cpp moc_smfserverqt_p.cpp 2> NUL -moc_smfpluginmanager.cpp: smfserverglobal.h \ - pluginmgr\smfpluginmanager.h \ - d:\Qt\4.6.1\bin\moc.exe - D:\Qt\4.6.1\bin\moc.exe $(DEFINES) $(INCPATH) -DSYMBIAN pluginmgr\smfpluginmanager.h -o moc_smfpluginmanager.cpp - -moc_smfpluginmanagerutil.cpp: smfserverglobal.h \ - pluginmgr\smfpluginmanagerutil.h \ - d:\Qt\4.6.1\bin\moc.exe - D:\Qt\4.6.1\bin\moc.exe $(DEFINES) $(INCPATH) -DSYMBIAN pluginmgr\smfpluginmanagerutil.h -o moc_smfpluginmanagerutil.cpp - -moc_smfserver.cpp: server\smfserver.h \ - d:\Qt\4.6.1\bin\moc.exe - D:\Qt\4.6.1\bin\moc.exe $(DEFINES) $(INCPATH) -DSYMBIAN server\smfserver.h -o moc_smfserver.cpp - -moc_smftransportmanager.cpp: smfserverglobal.h \ - transportmgr\smftransportmanager.h \ - d:\Qt\4.6.1\bin\moc.exe - D:\Qt\4.6.1\bin\moc.exe $(DEFINES) $(INCPATH) -DSYMBIAN transportmgr\smftransportmanager.h -o moc_smftransportmanager.cpp - -moc_smftransportmanagerutil.cpp: smfserverglobal.h \ - transportmgr\smftransportmanagerutil.h \ - d:\Qt\4.6.1\bin\moc.exe - D:\Qt\4.6.1\bin\moc.exe $(DEFINES) $(INCPATH) -DSYMBIAN transportmgr\smftransportmanagerutil.h -o moc_smftransportmanagerutil.cpp - -moc_smfserverqt_p.cpp: server\smfserverqt_p.h \ - d:\Qt\4.6.1\bin\moc.exe - D:\Qt\4.6.1\bin\moc.exe $(DEFINES) $(INCPATH) -DSYMBIAN server\smfserverqt_p.h -o moc_smfserverqt_p.cpp - -compiler_rcc_make_all: -compiler_rcc_clean: -compiler_image_collection_make_all: qmake_image_collection.cpp -compiler_image_collection_clean: - -$(DEL_FILE) qmake_image_collection.cpp 2> NUL -compiler_moc_source_make_all: -compiler_moc_source_clean: -compiler_uic_make_all: -compiler_uic_clean: -compiler_yacc_decl_make_all: -compiler_yacc_decl_clean: -compiler_yacc_impl_make_all: -compiler_yacc_impl_clean: -compiler_lex_make_all: -compiler_lex_clean: -compiler_clean: compiler_moc_header_clean - -create_temps: - -@ if NOT EXIST "D:\Qt\4.6.1\include\QtCore\tmp" mkdir "D:\Qt\4.6.1\include\QtCore\tmp" - -@ if NOT EXIST "D:\Qt\4.6.1\include\QtNetwork\tmp" mkdir "D:\Qt\4.6.1\include\QtNetwork\tmp" - -@ if NOT EXIST "D:\Qt\4.6.1\include\QtGui\tmp" mkdir "D:\Qt\4.6.1\include\QtGui\tmp" - -@ if NOT EXIST "D:\Qt\4.6.1\include\QtSql\tmp" mkdir "D:\Qt\4.6.1\include\QtSql\tmp" - -@ if NOT EXIST "D:\Qt\4.6.1\include\tmp" mkdir "D:\Qt\4.6.1\include\tmp" - -@ if NOT EXIST "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\tmp" mkdir "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\tmp" - -@ if NOT EXIST "D:\Qt\4.6.1\mkspecs\common\symbian\tmp" mkdir "D:\Qt\4.6.1\mkspecs\common\symbian\tmp" - -@ if NOT EXIST "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\pluginmgr\tmp" mkdir "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\pluginmgr\tmp" - -@ if NOT EXIST "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\server\tmp" mkdir "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\server\tmp" - -@ if NOT EXIST "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\smfplugins\tmp" mkdir "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\smfplugins\tmp" - -@ if NOT EXIST "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\transportmgr\tmp" mkdir "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\transportmgr\tmp" - -extension_clean: compiler_clean - -@ if EXIST "D:\Qt\4.6.1\include\QtCore\tmp" rmdir /S /Q "D:\Qt\4.6.1\include\QtCore\tmp" - -@ if EXIST "D:\Qt\4.6.1\include\QtNetwork\tmp" rmdir /S /Q "D:\Qt\4.6.1\include\QtNetwork\tmp" - -@ if EXIST "D:\Qt\4.6.1\include\QtGui\tmp" rmdir /S /Q "D:\Qt\4.6.1\include\QtGui\tmp" - -@ if EXIST "D:\Qt\4.6.1\include\QtSql\tmp" rmdir /S /Q "D:\Qt\4.6.1\include\QtSql\tmp" - -@ if EXIST "D:\Qt\4.6.1\include\tmp" rmdir /S /Q "D:\Qt\4.6.1\include\tmp" - -@ if EXIST "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\tmp" rmdir /S /Q "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\tmp" - -@ if EXIST "D:\Qt\4.6.1\mkspecs\common\symbian\tmp" rmdir /S /Q "D:\Qt\4.6.1\mkspecs\common\symbian\tmp" - -@ if EXIST "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\pluginmgr\tmp" rmdir /S /Q "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\pluginmgr\tmp" - -@ if EXIST "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\server\tmp" rmdir /S /Q "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\server\tmp" - -@ if EXIST "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\smfplugins\tmp" rmdir /S /Q "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\smfplugins\tmp" - -@ if EXIST "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\transportmgr\tmp" rmdir /S /Q "D:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\transportmgr\tmp" - -pre_targetdeps: \ - generated_sources \ - all_source_deps - -generated_sources: \ - moc_smfpluginmanager.cpp \ - moc_smfpluginmanagerutil.cpp \ - moc_smfserver.cpp \ - moc_smftransportmanager.cpp \ - moc_smftransportmanagerutil.cpp \ - moc_smfserverqt_p.cpp - -all_source_deps: \ - pluginmgr\smfpluginmanager.h \ - smfserverglobal.h \ - pluginmgr\smfpluginmanagerutil.h \ - server\smfserver.h \ - server\smfserversymbian_p.h \ - server\SmfServer.h \ - server\smfserverqt_p.h \ - transportmgr\smftransportmanager.h \ - transportmgr\smftransportmanagerutil.h - -finalize: - -winscw_deployment: - -winscw_deployment_clean: - -sis: restore_build - $(if $(wildcard smfserver_template.pkg),$(if $(wildcard .make.cache),$(MAKE) -s -f $(MAKEFILE) ok_sis,$(if $(QT_SIS_TARGET),$(MAKE) -s -f $(MAKEFILE) ok_sis,$(MAKE) -s -f $(MAKEFILE) fail_sis_nocache)),$(MAKE) -s -f $(MAKEFILE) fail_sis_nopkg) - -ok_sis: - createpackage.bat $(QT_SIS_OPTIONS) smfserver_template.pkg $(QT_SIS_TARGET) $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE) - -fail_sis_nopkg: - $(error PKG file does not exist, 'SIS' target is only supported for executables or projects with DEPLOYMENT statement) - -fail_sis_nocache: - $(error Project has to be built or QT_SIS_TARGET environment variable has to be set before calling 'SIS' target) - -restore_build: --include .make.cache - -store_build: - @echo # ============================================================================== > .make.cache - @echo # This file is generated by make and should not be modified by the user >> .make.cache - @echo # Name : .make.cache >> .make.cache - @echo # Part of : smfserver >> .make.cache - @echo # Description : This file is used to cache last build target for >> .make.cache - @echo # make sis target. >> .make.cache - @echo # Version : >> .make.cache - @echo # >> .make.cache - @echo # ============================================================================== >> .make.cache - @echo. >> .make.cache - @echo QT_SIS_TARGET ?= $(QT_SIS_TARGET) >> .make.cache - -dodistclean: - -@ if EXIST "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\smfserver_template.pkg" $(DEL_FILE) "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\smfserver_template.pkg" - -@ if EXIST "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\Makefile" $(DEL_FILE) "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\Makefile" - -@ if EXIST "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\Makefile_0xE5027327.mk" $(DEL_FILE) "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\Makefile_0xE5027327.mk" - -@ if EXIST "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\smfserver_0xE5027327.mmp" $(DEL_FILE) "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\smfserver_0xE5027327.mmp" - -@ if EXIST "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\smfserver_reg.rss" $(DEL_FILE) "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\smfserver_reg.rss" - -@ if EXIST "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\smfserver.rss" $(DEL_FILE) "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\smfserver.rss" - -@ if EXIST "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\smfserver.loc" $(DEL_FILE) "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\smfserver.loc" - -@ if EXIST "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\.make.cache" $(DEL_FILE) "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\.make.cache" - -@ if EXIST "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\bld.inf" $(DEL_FILE) "d:\CarbideWorkspace\smfserver_cleaned\smf\smfservermodule\smfserver\bld.inf" - -distclean: clean dodistclean - -clean: $(ABLD) - -$(ABLD) reallyclean - -bldmake clean - -clean-debug: $(ABLD) - $(ABLD) reallyclean winscw udeb - $(ABLD) reallyclean gcce udeb - $(ABLD) reallyclean armv5 udeb - $(ABLD) reallyclean armv6 udeb - -clean-release: $(ABLD) - $(ABLD) reallyclean gcce urel - $(ABLD) reallyclean armv5 urel - $(ABLD) reallyclean armv6 urel - -clean-debug-winscw: $(ABLD) - $(ABLD) reallyclean winscw udeb -clean-debug-gcce: $(ABLD) - $(ABLD) reallyclean gcce udeb -clean-debug-armv5: $(ABLD) - $(ABLD) reallyclean armv5 udeb -clean-debug-armv6: $(ABLD) - $(ABLD) reallyclean armv6 udeb -clean-release-gcce: $(ABLD) - $(ABLD) reallyclean gcce urel -clean-release-armv5: $(ABLD) - $(ABLD) reallyclean armv5 urel -clean-release-armv6: $(ABLD) - $(ABLD) reallyclean armv6 urel - -run: - -call /S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/release/winscw/udeb/smfserver.exe $(QT_RUN_OPTIONS) -runonphone: sis - runonphone $(QT_RUN_ON_PHONE_OPTIONS) --sis smfserver_$(QT_SIS_TARGET).sis smfserver.exe $(QT_RUN_OPTIONS) - diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/smfserver/pluginmgr/smfpluginmanager.cpp --- a/smf/smfservermodule/smfserver/pluginmgr/smfpluginmanager.cpp Tue May 18 17:37:12 2010 +0530 +++ b/smf/smfservermodule/smfserver/pluginmgr/smfpluginmanager.cpp Fri May 21 15:45:10 2010 +0100 @@ -26,6 +26,7 @@ #include #include +#include "smfpluginutil.h" #include "smfpluginmanager.h" #include "smfpluginmanagerutil.h" #include "smftransportmanagerutil.h" @@ -524,7 +525,7 @@ { m_server->writeLog("Inside SmfPluginManager::load()"); - QPluginLoader *pluginLoader; + QPluginLoader *pluginLoader = 0; // Find the plugin Path QString pluginPath = m_pluginIdPathHash.value(aPluginId); @@ -792,7 +793,7 @@ // Open the database bool opened = m_pluginDataBase.open(); if(!opened) - ;//return; + {}//return; // If plugin is changed if( newPlugins.count() == availablePlugins.count() ) diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/smfserver/pluginmgr/smfpluginmanagerutil.cpp --- a/smf/smfservermodule/smfserver/pluginmgr/smfpluginmanagerutil.cpp Tue May 18 17:37:12 2010 +0530 +++ b/smf/smfservermodule/smfserver/pluginmgr/smfpluginmanagerutil.cpp Fri May 21 15:45:10 2010 +0100 @@ -86,7 +86,7 @@ SmfPluginManagerResult &aResult ) { SmfPluginManager::getInstance()->server()->writeLog("SmfPluginManagerUtil::createRequest"); - SmfPluginError pluginErrorVal; + SmfPluginError pluginErrorVal = SmfPluginErrNone; // Find the type of service required switch(aOperation) @@ -198,7 +198,7 @@ // typecast instance to the contact - fetcher type, here SmfContactFetcherPlugin SmfContactFetcherPlugin *plugin = qobject_cast(aPlugin); - SmfPluginError pluginErrorVal; + SmfPluginError pluginErrorVal = SmfPluginErrNone; if(plugin) { @@ -298,7 +298,7 @@ // typecast instance to SmfPostProviderPlugin SmfPostProviderPlugin *plugin = qobject_cast(aPlugin); - SmfPluginError pluginErrorVal; + SmfPluginError pluginErrorVal = SmfPluginErrNone; if(plugin) { @@ -407,7 +407,7 @@ // typecast instance to SmfLyricsServicePlugin SmfLyricsServicePlugin *plugin = qobject_cast(aPlugin); - SmfPluginError pluginErrorVal; + SmfPluginError pluginErrorVal = SmfPluginErrNone; if(plugin) { @@ -476,7 +476,7 @@ // typecast instance to SmfMusicEventsPlugin SmfMusicEventsPlugin *plugin = qobject_cast(aPlugin); - SmfPluginError pluginErrorVal; + SmfPluginError pluginErrorVal = SmfPluginErrNone; if(plugin) { @@ -559,7 +559,7 @@ // typecast instance to SmfMusicSearchPlugin SmfMusicSearchPlugin *plugin = qobject_cast(aPlugin); - SmfPluginError pluginErrorVal; + SmfPluginError pluginErrorVal = SmfPluginErrNone; if(plugin) { @@ -646,7 +646,7 @@ // typecast instance to SmfMusicServicePlugin SmfMusicServicePlugin *plugin = qobject_cast(aPlugin); - SmfPluginError pluginErrorVal; + SmfPluginError pluginErrorVal = SmfPluginErrNone; if(plugin) { @@ -710,7 +710,7 @@ // typecast instance to SmfPlaylistServicePlugin SmfPlaylistServicePlugin *plugin = qobject_cast(aPlugin); - SmfPluginError pluginErrorVal; + SmfPluginError pluginErrorVal = SmfPluginErrNone; if(plugin) { @@ -790,7 +790,7 @@ // typecast instance to SmfGalleryPlugin SmfGalleryPlugin *plugin = qobject_cast(aPlugin); - SmfPluginError pluginErrorVal; + SmfPluginError pluginErrorVal = SmfPluginErrNone; if(plugin) { diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/smfserver/server/server.pri --- a/smf/smfservermodule/smfserver/server/server.pri Tue May 18 17:37:12 2010 +0530 +++ b/smf/smfservermodule/smfserver/server/server.pri Fri May 21 15:45:10 2010 +0100 @@ -4,10 +4,12 @@ PUBLIC_HEADERS += \ server/smfserver.h -PRIVATE_HEADERS += \ - server/smfserverqt_p.h \ - server/smfserversymbian_p.h +SOURCES += server/smfserver.cpp -SOURCES += \ - server/smfserver.cpp \ - server/smfserversymbian.cpp +symbian { + PRIVATE_HEADERS += server/smfserversymbian_p.h + SOURCES += server/smfserversymbian.cpp +} else { + PRIVATE_HEADERS += server/smfserverqt_p.h + SOURCES += server/smfserverqt.cpp +} diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/smfserver/server/smfserver.cpp --- a/smf/smfservermodule/smfserver/server/smfserver.cpp Tue May 18 17:37:12 2010 +0530 +++ b/smf/smfservermodule/smfserver/server/smfserver.cpp Fri May 21 15:45:10 2010 +0100 @@ -310,7 +310,7 @@ //TODO:- implement this api in session class //note:- in case success is false client completes the request with SmfErrClientAuthFailed //TODO:- define set of smf wide error after consulting with other module owners - authID.session->clientathorizationFinished(success); + authID.session->clientAuthorizationFinished(success); } /** * This API is called by PM once its done with request and parsing diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/smfserver/server/smfserver.h --- a/smf/smfservermodule/smfserver/server/smfserver.h Tue May 18 17:37:12 2010 +0530 +++ b/smf/smfservermodule/smfserver/server/smfserver.h Fri May 21 15:45:10 2010 +0100 @@ -72,7 +72,7 @@ *simply return *else *it'll start the server exe and initialize all other SMF components - *returns whether server is started successfully or not + *returns whether server is started successfully or not */ bool startServer(); @@ -84,7 +84,7 @@ * been authorized previously. * SmfClientAuthID may be same as SID of the client which can be retrieved * if using Symbian Client-Server private implementation. Not supported for - * other platforms + * other platforms */ bool isClientAuthorized(SmfClientAuthID clientID); @@ -94,35 +94,35 @@ * The SLOT clientAuthorizationFinished is called once its done. * SmfClientAuthID may be same as SID of the client which can be retrieved * if using Symbian Client-Server private implementation. Not supported for - * other platforms. + * other platforms. */ void authorizeClient(SmfClientAuthID clientID); /* * Requests Plugin Manager to get a list of plugin IDs who implement * the interface interfaceID. - * This is used got SmfClient::GetServices () where we need a list of plugins + * This is used got SmfClient::GetServices () where we need a list of plugins */ void getPlugins(SmfInterfaceID interfaceID, QMap& pluginIDMap); /** * Same as above, except this is used for rest of the requests where we need - * a particular plugin + * a particular plugin */ SmfPluginID getPlugin(SmfInterfaceID interfaceID,SmfProvider provider); /* * Requests the Credential Manager to filter out non-authorized plugin IDs - * from the list and get authorized plugins into authList. + * from the list and get authorized plugins into authList. */ void getAuthorizedPlugins(QList& list,QList& authList); /* * Prepares the transport. - * What it'll do is not yet clear + * What it'll do is not yet clear */ void prepareTransport(); /** - * DEbugging purpose only + * DEbugging purpose only */ void writeLog(QString log) const; /* @@ -136,21 +136,17 @@ * Note:- Should there be an overloaded function which takes * list of SmfPluginID ? * Note:- SmfPluginManager will invoke resultsAvailable on session object once - * it receives parsed data. + * it receives parsed data. */ -#ifdef Q_OS_SYMBIAN /** * Request the Plugin manager to get the data. * @param requestID Corresponds to a client's session * @param pluginID Plugin for which the request is intended * @param interfaceID Interface name * @param dataForPlugin Data to be sent for this request - * + * */ void getRequestedData(int requestID,SmfPluginID pluginID,SmfInterfaceID interfaceID, SmfRequestTypeID requestTypeID,QByteArray dataForPlugin = QByteArray()); -#else - void getRequestedData(SmfServerQtSession* session,SmfPluginID pluginID, SmfRequestTypeID requestTypeID); -#endif public slots: @@ -158,7 +154,7 @@ * This slot is called when Credential Manager is done with the autherizing * the client for the first time. See isClientAuthorized() and authorizeClient(). * success specifies the success of the authorization, authID is the authentication - * ID in case its not same as SID of the client. + * ID in case its not same as SID of the client. */ void clientAuthorizationFinished(bool success,SmfClientAuthID authID ); @@ -166,20 +162,20 @@ * This slot is called as a result of trigger from Plugin manager when the * parsed data is available. * @param requestID The request ID for which result is available - * @param parsedData Serialized data + * @param parsedData Serialized data */ void resultsAvailable(int requestID,QByteArray* parsedData,SmfError error); /* * Services the client request by sending the requested data. - * Note:- This will be handled by private implementation. + * Note:- This will be handled by private implementation. */ void serviceClient(QByteArray* parsedData); /* * This slot is called for every cleanup timer expiry, in this slot, we need - * to call SmfDataStoreManager's API to refresh data store + * to call SmfDataStoreManager's API to refresh data store */ void timerExpired(){}; @@ -187,25 +183,25 @@ * This method is called every time timerExpired slot is trigerred * Fetches the last saved requests through Transport Manager and Plugin Manager * Who will save the last request (Tranport Manager or Data Store Manager) TBD later - * + * */ void runSavedRequest(){}; /* * This slot is called when the data store updates are available as a result of * "runSavedRequest()". - * Note:- The "10.4.1.11 updateDatastore" can be merged with this + * Note:- The "10.4.1.11 updateDatastore" can be merged with this */ void dataStoreUpdateAvailable(QByteArray* respData){Q_UNUSED(respData)}; /** - * Request the CM to get the authentication keys for the given pluginID + * Request the CM to get the authentication keys for the given pluginID */ void getAuthenticationKeys(int pluginID,QStringList& keys,QStringList& urls); /** * Server calls this method when it receives message from the CM - * that authentication keys for the pluginID has expired + * that authentication keys for the pluginID has expired */ void authenticationKeysExpired(NotificationType type,SmfPluginID id); signals: @@ -213,7 +209,7 @@ private: /* * Starts the clean-up timer for data store refresh, called from the "startServer()" - * timeOutValue should be picked out from SmfSettingsAuthManager's API + * timeOutValue should be picked out from SmfSettingsAuthManager's API */ bool startCleanupTimer(int timeOutValue){Q_UNUSED(timeOutValue) return true;}; diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/smfserver/server/smfserverqt.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/smf/smfservermodule/smfserver/server/smfserverqt.cpp Fri May 21 15:45:10 2010 +0100 @@ -0,0 +1,98 @@ +/** + * Copyright (c) 2010 Sasken Communication Technologies Ltd. + * All rights reserved. + * This component and the accompanying materials are made available + * under the terms of the "Eclipse Public License v1.0" + * which accompanies this distribution, and is available + * at the URL "http://www.eclipse.org/legal/epl-v10.html" + * + * Initial Contributors: + * Chandradeep Gandhi, Sasken Communication Technologies Ltd - Initial contribution + * + * Contributors: + * Manasij Roy, Nalina Hariharan +* Description: +* SMF Server implementation for platforms other than Symbian. +* Uses QLocalServer-QLocalSocket classes +* +*/ + +#include "smfserverqt_p.h" + +#include +#include + +// +// SmfServerQt +// + +SmfServerQt::SmfServerQt() +{ +} + +SmfServerQt::~SmfServerQt() +{ +} + +bool SmfServerQt::start() +{ + return false; +} + +int SmfServerQt::sessionListCount() const +{ + return 0; +} + +void SmfServerQt::writeLog(QString log) const +{ + Q_UNUSED(log); +} + +/** + * Called by the SmfServer when client authorization finishes. + * @param success success of the authorization + */ +void SmfServerQt::clientAuthorizationFinished(bool success) +{ + Q_UNUSED(success); +} + +void SmfServerQt::newClientConnected() +{ +} + +void SmfServerQt::removeFromList() +{ +} + +int SmfServerQt::findAndServiceclient(int requestID,QByteArray* parsedData,SmfError error) +{ + Q_UNUSED(requestID); + Q_UNUSED(parsedData); + Q_UNUSED(error); + return 0; +} + +// +// SmfServerQtSession +// + +SmfServerQtSession::SmfServerQtSession(QLocalSocket *clientConnection, SmfServerQt *server) +{ + Q_UNUSED(server); + Q_UNUSED(clientConnection); +} + +SmfServerQtSession::~SmfServerQtSession() +{ +} + +void SmfServerQtSession::readDataFromClient() +{ +} + +void SmfServerQtSession::clientAuthorizationFinished(bool success) +{ + Q_UNUSED(success); +} diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/smfserver/server/smfserverqt_p.h --- a/smf/smfservermodule/smfserver/server/smfserverqt_p.h Tue May 18 17:37:12 2010 +0530 +++ b/smf/smfservermodule/smfserver/server/smfserverqt_p.h Fri May 21 15:45:10 2010 +0100 @@ -11,15 +11,17 @@ * * Contributors: * Manasij Roy, Nalina Hariharan -* Description: -* SMF Server implementation for platforms other than Symbian. -* Uses QLocalServer-QLocalSocket classes -* -*/ + * Description: + * SMF Server implementation for platforms other than Symbian. + * Uses QLocalServer-QLocalSocket classes + * + */ #ifndef SMFSERVERQT_P_H #define SMFSERVERQT_P_H +#include "smfglobal.h" + #include class QLocalServer; class QLocalSocket; @@ -29,35 +31,41 @@ Q_OBJECT public: - SmfServerQt() {} -#endif + SmfServerQt(); + ~SmfServerQt(); - ~SmfServerQt() {} - bool start() {return false;} - int sessionListCount() const {return 0;} + bool start(); + int sessionListCount() const; + void writeLog(QString log) const; + void clientAuthorizationFinished(bool success); + int findAndServiceclient(int requestID,QByteArray* parsedData,SmfError error); + private slots: - void newClientConnected() {} - void removeFromList() {} + void newClientConnected(); + void removeFromList(); private: - QLocalServer *server; - QLocalSocket *iClient; + QLocalServer *m_server; + QLocalSocket *m_client; }; class SmfServerQtSession : public QObject { Q_OBJECT + public: - SmfServerQtSession(QLocalSocket *clientConnection, SmfServerQt *server) {Q_UNUSED(server) Q_UNUSED(clientConnection)} - ~SmfServerQtSession() {} + SmfServerQtSession(QLocalSocket *clientConnection, SmfServerQt *server); + ~SmfServerQtSession(); + + void clientAuthorizationFinished(bool success); public slots: - void readDataFromClient() {} + void readDataFromClient(); private: - SmfServerQt *iServer; - QLocalSocket *iClientConnection; + SmfServerQt *m_server; + QLocalSocket *m_clientConnection; }; -//#endif // SMFSERVERQT_P_H +#endif // SMFSERVERQT_P_H diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/smfserver/server/smfserversymbian.cpp --- a/smf/smfservermodule/smfserver/server/smfserversymbian.cpp Tue May 18 17:37:12 2010 +0530 +++ b/smf/smfservermodule/smfserver/server/smfserversymbian.cpp Fri May 21 15:45:10 2010 +0100 @@ -162,7 +162,7 @@ } -void SmfServerSymbianSession::clientathorizationFinished(bool success) +void SmfServerSymbianSession::clientAuthorizationFinished(bool success) { //Client authorization failed if(!success) diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/smfserver/server/smfserversymbian_p.h --- a/smf/smfservermodule/smfserver/server/smfserversymbian_p.h Tue May 18 17:37:12 2010 +0530 +++ b/smf/smfservermodule/smfserver/server/smfserversymbian_p.h Fri May 21 15:45:10 2010 +0100 @@ -1,267 +1,267 @@ -/** - * Copyright (c) 2010 Sasken Communication Technologies Ltd. - * All rights reserved. - * This component and the accompanying materials are made available - * under the terms of the "Eclipse Public License v1.0" - * which accompanies this distribution, and is available - * at the URL "http://www.eclipse.org/legal/epl-v10.html" - * - * Initial Contributors: - * Chandradeep Gandhi, Sasken Communication Technologies Ltd - Initial contribution - * - * Contributors: - * Manasij Roy, Nalina Hariharan* - * Description: - * SMF Server private implementation for Symbian - * - **/ - -#ifndef SMFSERVERSYMBIAN_H -#define SMFSERVERSYMBIAN_H -#include -#include -#include -#include -#include -//testing -start -#include "smfprovider.h" -//end -//SMF wide global const and macros, to be shared among SMF components as well as SMF aware apps -//#include - -//#include "clientGlobal.h" - -#include "SmfServer.h" -//Forward declarations -class SmfServerSymbianSession; - -/** - * Stores session and request information. +/** + * Copyright (c) 2010 Sasken Communication Technologies Ltd. + * All rights reserved. + * This component and the accompanying materials are made available + * under the terms of the "Eclipse Public License v1.0" + * which accompanies this distribution, and is available + * at the URL "http://www.eclipse.org/legal/epl-v10.html" + * + * Initial Contributors: + * Chandradeep Gandhi, Sasken Communication Technologies Ltd - Initial contribution + * + * Contributors: + * Manasij Roy, Nalina Hariharan* + * Description: + * SMF Server private implementation for Symbian + * + **/ + +#ifndef SMFSERVERSYMBIAN_H +#define SMFSERVERSYMBIAN_H +#include +#include +#include +#include +#include +//testing -start +#include "smfprovider.h" +//end +//SMF wide global const and macros, to be shared among SMF components as well as SMF aware apps +//#include + +//#include "clientGlobal.h" + +#include "SmfServer.h" +//Forward declarations +class SmfServerSymbianSession; + +/** + * Stores session and request information. * For now storing RMessage2 is reduntant as we are allowing only one outstanding request per session - */ -struct CSessionStruct - { - SmfServerSymbianSession* iSession; - RMessage2 iMsg; - }; - - - -//Policy table---start -//note capabilities are yet to be finalized -//46 services as of 15th apr -const TUint myRangeCount = 1/*7*/; - -//Passing everything for the time being -const TInt myRanges[myRangeCount] = - { - 0/*, //ERequestPass - 1, //ERequestFail - 2, //ERequestNotSupported - 3, //ERequestDrmService - 4, //ERequestUserEnvironmentService - 5, //ERequestCustomCheckPass - 6 //ERequestCustomCheckFail*/ - }; - - -/* bis: each element of this array actually indexes to a particular element of -TPolicyElement. For eg. element 0 of this array maps element 0 of myRanges to -a particular element of TpolicyElement array which is in this case element 0 -of TPolicyElement -*/ -const TUint8 myElementsIndex[myRangeCount] = - { - CPolicyServer::EAlwaysPass, //passing everything for now - }; - - -/* bis: Policies used by the server to check messages from the client -for each message, the server will carry out security check according -to this policy. -*/ -const CPolicyServer::TPolicyElement myElements[] = - { - {_INIT_SECURITY_POLICY_PASS, CPolicyServer::EFailClient} - }; - -/* bis: TPolicy used by the server to check messages from the client -for each message. This structure is passed to the server at its creation. -The Symbian client-server architecture will make sure that each client request -passes through the security test as indicated by myPolicy before it is handled -by myPolciyServer */ -const CPolicyServer::TPolicy myPolicy = - { - //bis: - //the connection policy (CPolicyServer::EAlwaysPass) should be changed if the - //server wants to check for a particular policy before grating any connection - //to the client. For eg. DRM manager server should only allow clients having DRM - //capability to connect to it. To do so, change CPolicyserver::EAlwaysPass, - //to the index no. of myElements which checks for ECapabilityDRM i.e index 2 - //in this case. For EACM server, the server should allow only clients having - //ECapabilityUserEnvironment to connect to it. - CPolicyServer::EAlwaysPass, //specifies all connect attempts should pass - myRangeCount, - myRanges, - myElementsIndex, - myElements, - }; -//Policy table---end -/** -* Our server class - an active object - and therefore derived ultimately from CActive. -* It accepts requests from client threads and forwards -* them to the client session to be dealt with. It also handles the creation -* of the server-side client session. -**/ -class SmfServerSymbian : public CPolicyServer -{ - -public: - /** - * Creates a new session with the server; the function - * implements the pure virtutal function - * defined in class CServer2 - */ - SmfServerSymbian(CActive::TPriority aActiveObjectPriority,SmfServer* aWrapper); - static SmfServerSymbian * NewL(CActive::TPriority aActiveObjectPriority,SmfServer* aWrapper); - ~SmfServerSymbian(); - CSession2 * NewSessionL(const TVersion& aVersion, const RMessage2& aMessage) const; - - /** + */ +struct CSessionStruct + { + SmfServerSymbianSession* iSession; + RMessage2 iMsg; + }; + + + +//Policy table---start +//note capabilities are yet to be finalized +//46 services as of 15th apr +const TUint myRangeCount = 1/*7*/; + +//Passing everything for the time being +const TInt myRanges[myRangeCount] = + { + 0/*, //ERequestPass + 1, //ERequestFail + 2, //ERequestNotSupported + 3, //ERequestDrmService + 4, //ERequestUserEnvironmentService + 5, //ERequestCustomCheckPass + 6 //ERequestCustomCheckFail*/ + }; + + +/* bis: each element of this array actually indexes to a particular element of +TPolicyElement. For eg. element 0 of this array maps element 0 of myRanges to +a particular element of TpolicyElement array which is in this case element 0 +of TPolicyElement +*/ +const TUint8 myElementsIndex[myRangeCount] = + { + CPolicyServer::EAlwaysPass, //passing everything for now + }; + + +/* bis: Policies used by the server to check messages from the client +for each message, the server will carry out security check according +to this policy. +*/ +const CPolicyServer::TPolicyElement myElements[] = + { + {_INIT_SECURITY_POLICY_PASS, CPolicyServer::EFailClient} + }; + +/* bis: TPolicy used by the server to check messages from the client +for each message. This structure is passed to the server at its creation. +The Symbian client-server architecture will make sure that each client request +passes through the security test as indicated by myPolicy before it is handled +by myPolciyServer */ +const CPolicyServer::TPolicy myPolicy = + { + //bis: + //the connection policy (CPolicyServer::EAlwaysPass) should be changed if the + //server wants to check for a particular policy before grating any connection + //to the client. For eg. DRM manager server should only allow clients having DRM + //capability to connect to it. To do so, change CPolicyserver::EAlwaysPass, + //to the index no. of myElements which checks for ECapabilityDRM i.e index 2 + //in this case. For EACM server, the server should allow only clients having + //ECapabilityUserEnvironment to connect to it. + CPolicyServer::EAlwaysPass, //specifies all connect attempts should pass + myRangeCount, + myRanges, + myElementsIndex, + myElements, + }; +//Policy table---end +/** +* Our server class - an active object - and therefore derived ultimately from CActive. +* It accepts requests from client threads and forwards +* them to the client session to be dealt with. It also handles the creation +* of the server-side client session. +**/ +class SmfServerSymbian : public CPolicyServer +{ + +public: + /** + * Creates a new session with the server; the function + * implements the pure virtutal function + * defined in class CServer2 + */ + SmfServerSymbian(CActive::TPriority aActiveObjectPriority,SmfServer* aWrapper); + static SmfServerSymbian * NewL(CActive::TPriority aActiveObjectPriority,SmfServer* aWrapper); + ~SmfServerSymbian(); + CSession2 * NewSessionL(const TVersion& aVersion, const RMessage2& aMessage) const; + + /** * Returns SmfServer - */ - SmfServer* wrapper(); - /** - * Adds session info to the currently active session map iMap. This map is used to - * retreive the corresponding session to be serviced. The keys for this map is sent - * alongwith the request to other components - * @param aSession Session to be added + */ + SmfServer* wrapper(); + /** + * Adds session info to the currently active session map iMap. This map is used to + * retreive the corresponding session to be serviced. The keys for this map is sent + * alongwith the request to other components + * @param aSession Session to be added * @param aMsg Currently redundant - */ - TInt addToSessionMap(SmfServerSymbianSession* aSession,const RMessage2& aMsg); - /** - * Removes the session from the active list of session map - * @param aSession Session to be removed. + */ + TInt addToSessionMap(SmfServerSymbianSession* aSession,const RMessage2& aMsg); + /** + * Removes the session from the active list of session map + * @param aSession Session to be removed. * @param aMsg Currently redundant - */ - TInt removeFromSessionMap(SmfServerSymbianSession* aSession,RMessage2& aMsg); - /** - * Returns a symbian session for the given key from the iMap. + */ + TInt removeFromSessionMap(SmfServerSymbianSession* aSession,RMessage2& aMsg); + /** + * Returns a symbian session for the given key from the iMap. * @param id Session ID in the SmfServer Session map - */ - SmfServerSymbianSession* findSession(TInt id); - /** - * Finds the given session and services it with the data. - * @param requestID Session ID - * @param parsedData Parsed and serialized data to be sent to client. + */ + SmfServerSymbianSession* findSession(TInt id); + /** + * Finds the given session and services it with the data. + * @param requestID Session ID + * @param parsedData Parsed and serialized data to be sent to client. * @param error Error code - */ - TInt findAndServiceclient(TInt requestID,QByteArray* parsedData,SmfError error); - /** + */ + TInt findAndServiceclient(TInt requestID,QByteArray* parsedData,SmfError error); + /** * Debugging - */ - void writeLog(QString log)const; -//private: - void ConstructL(); - SmfServer* iWrapper; - - /** + */ + void writeLog(QString log)const; +//private: + void ConstructL(); + SmfServer* iWrapper; + + /** * Keeps track of the requests sent by each session - */ - RHashMap iMap; - - /** - * The key in the iMap. + */ + RHashMap iMap; + + /** + * The key in the iMap. * Its sent to the wrapper - */ - TInt iRequestID; - - TInt iSessionCount; -}; - -/** -This class represents a session with the Smf server. -Functions are provided to respond appropriately to client messages. -*/ -class SmfServerSymbianSession : public CSession2 -{ -public: - /** - * Creates a session. + */ + TInt iRequestID; + + TInt iSessionCount; +}; + +/** +This class represents a session with the Smf server. +Functions are provided to respond appropriately to client messages. +*/ +class SmfServerSymbianSession : public CSession2 +{ +public: + /** + * Creates a session. * @param aServer The server handle - */ - SmfServerSymbianSession(SmfServerSymbian* aServer); - ~SmfServerSymbianSession(); - /** + */ + SmfServerSymbianSession(SmfServerSymbian* aServer); + ~SmfServerSymbianSession(); + /** * From CSession2 - */ - void ServiceL(const RMessage2 & aMessage); - /** - * Called by the SmfServerSymbian when results are available - * @param parsedData Parsed serialized data + */ + void ServiceL(const RMessage2 & aMessage); + /** + * Called by the SmfServerSymbian when results are available + * @param parsedData Parsed serialized data * @param error Smf Error code - */ - void resultsAvailable(QByteArray* parsedData,SmfError error); - /** - * Called by the SmfServer when client authorization finishes. + */ + void resultsAvailable(QByteArray* parsedData,SmfError error); + /** + * Called by the SmfServer when client authorization finishes. * @param success success of the authorization - */ - void clientathorizationFinished(bool success); -protected: - //TMessageParams ReadMessageAndRetrieveParams (const RMessage2 & aMessage); - void PanicClient(const RMessage2 & aMessage, TInt aPanic) const; - /** - * Called by ServiceL() - * It tests the function code and then delegates to - * the appropriate function. - */ - void HandleClientMessageL(const RMessage2 & aMessage); - - //Following are for handling specific client requests - /** + */ + void clientAuthorizationFinished(bool success); +protected: + //TMessageParams ReadMessageAndRetrieveParams (const RMessage2 & aMessage); + void PanicClient(const RMessage2 & aMessage, TInt aPanic) const; + /** + * Called by ServiceL() + * It tests the function code and then delegates to + * the appropriate function. + */ + void HandleClientMessageL(const RMessage2 & aMessage); + + //Following are for handling specific client requests + /** * ESmfGetService - */ - void HandleGetService(const RMessage2 & aMessage); - - /** + */ + void HandleGetService(const RMessage2 & aMessage); + + /** * Handles all the opcodes except ESmfGetService - */ - void HandleCommonServiceL(const RMessage2 & aMessage); - - -//private: - SmfServerSymbian* iServer; - RMessage2 iMessage; - - //this interface id will be provided by Smf client, will map Smf Client - // interface hierarchy - SmfInterfaceID iInterfaceID; - TPtr8 iIntfNmaeSymbian; - TPtr iIntfNameSymbian16; - TBuf8<125> iInterfaceNametbuf; - TPtr8 iProviderSymbian; - HBufC8* iProviderBuf; - HBufC8* iIntfNameBuf; - QMap iPluginIDMap; - QList iPluginIDList; - QList iAuthList; - - /** - * To keep track of the requests sent by this session,not required for now, as only one + */ + void HandleCommonServiceL(const RMessage2 & aMessage); + + +//private: + SmfServerSymbian* iServer; + RMessage2 iMessage; + + //this interface id will be provided by Smf client, will map Smf Client + // interface hierarchy + SmfInterfaceID iInterfaceID; + TPtr8 iIntfNmaeSymbian; + TPtr iIntfNameSymbian16; + TBuf8<125> iInterfaceNametbuf; + TPtr8 iProviderSymbian; + HBufC8* iProviderBuf; + HBufC8* iIntfNameBuf; + QMap iPluginIDMap; + QList iPluginIDList; + QList iAuthList; + + /** + * To keep track of the requests sent by this session,not required for now, as only one * outstanding request per session is required - */ - RArray iRequestList; - /** + */ + RArray iRequestList; + /** * Last request opcode - */ - TInt iLastRequest; - //testing - TBuf<525> dataToPass; - HBufC8* iBuf; - HBufC* iBuf16; - TPtr8 iPtrToBuf; - QByteArray byteArrayToClnt; - SmfProvider* providerToClnt; - TInt iError; -}; -#endif // SMFSERVERSYMBIAN_H + */ + TInt iLastRequest; + //testing + TBuf<525> dataToPass; + HBufC8* iBuf; + HBufC* iBuf16; + TPtr8 iPtrToBuf; + QByteArray byteArrayToClnt; + SmfProvider* providerToClnt; + TInt iError; +}; +#endif // SMFSERVERSYMBIAN_H diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/smfserver/smfserver.pro --- a/smf/smfservermodule/smfserver/smfserver.pro Tue May 18 17:37:12 2010 +0530 +++ b/smf/smfservermodule/smfserver/smfserver.pro Fri May 21 15:45:10 2010 +0100 @@ -21,6 +21,14 @@ include(smfplugins/smfplugins.pri) include(transportmgr/transportmgr.pri) +!symbian { + # On desktop, we need to include these locally, as there is + # no /epoc32/include available. + INCLUDEPATH += ../util/qjson/src + LIBS += -L../util/qjson/lib -lqjson + include(../smfclient/common/common.pri) +} + PUBLIC_HEADERS += \ smfserverglobal.h @@ -29,8 +37,7 @@ $$PRIVATE_HEADERS SOURCES += \ - main.cpp \ - smfserver_reg.rss + main.cpp FORMS += RESOURCES += @@ -45,4 +52,6 @@ UserEnvironment LIBS += -lsmfclient.dll + + SOURCES += smfserver_reg.rss } diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/smfserver/transportmgr/smftransportmanager.cpp --- a/smf/smfservermodule/smfserver/transportmgr/smftransportmanager.cpp Tue May 18 17:37:12 2010 +0530 +++ b/smf/smfservermodule/smfserver/transportmgr/smftransportmanager.cpp Fri May 21 15:45:10 2010 +0100 @@ -174,6 +174,7 @@ void SmfTransportManager::configurationAdded ( const QNetworkConfiguration &aConfig ) { + Q_UNUSED(aConfig); SmfTransportManagerUtil::getInstance()->configurationAdded(SmfTransportOpIAPChanged); } diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/smfservermodule.pro --- a/smf/smfservermodule/smfservermodule.pro Tue May 18 17:37:12 2010 +0530 +++ b/smf/smfservermodule/smfservermodule.pro Fri May 21 15:45:10 2010 +0100 @@ -1,4 +1,5 @@ TEMPLATE = subdirs -SUBDIRS = smfserver \ - smfclient +SUBDIRS = util \ + smfserver \ + smfclient diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/util/qjson/Makefile --- a/smf/smfservermodule/util/qjson/Makefile Tue May 18 17:37:12 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,171 +0,0 @@ -# ============================================================================== -# Generated by qmake (2.01a) (Qt 4.6.1) on: Mon May 17 12:46:26 2010 -# This file is generated by qmake and should not be modified by the -# user. -# Name : Makefile -# Description : Wrapper Makefile for calling Symbian build tools -# -# ============================================================================== - - -MAKEFILE = Makefile -QMAKE = d:\Qt\4.6.1\bin\qmake -DEL_FILE = del -DEL_DIR = rmdir -MOVE = move -XCOPY = xcopy /d /f /h /r /y /i -ABLD = ABLD.BAT -DEBUG_PLATFORMS = winscw gcce armv5 armv6 -RELEASE_PLATFORMS = gcce armv5 armv6 -MAKE = make - -ifeq (WINS,$(findstring WINS, $(PLATFORM))) -ZDIR=$(EPOCROOT)epoc32\release\$(PLATFORM)\$(CFG)\Z -else -ZDIR=$(EPOCROOT)epoc32\data\z -endif - -DEFINES = -DSYMBIAN -DUNICODE -DQT_KEYPAD_NAVIGATION -DQT_SOFTKEYS_ENABLED -DQT_USE_MATH_H_FLOATS -DQT_GUI_LIB -DQT_CORE_LIB -INCPATH = -I"D:/Qt/4.6.1/include/QtCore" -I"D:/Qt/4.6.1/include/QtCore/tmp" -I"D:/Qt/4.6.1/include/QtGui" -I"D:/Qt/4.6.1/include/QtGui/tmp" -I"D:/Qt/4.6.1/include" -I"D:/Qt/4.6.1/include/tmp" -I"D:/Qt/4.6.1/mkspecs/common/symbian" -I"D:/Qt/4.6.1/mkspecs/common/symbian/tmp" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include" -I"D:/CarbideWorkspace/TestQJson/qjson/src" -I"D:/CarbideWorkspace/TestQJson/qjson/src/tmp" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include/stdapis" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include/stdapis/sys" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include/stdapis/stlport" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include/middleware" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include/domain/middleware" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include/domain/middleware/loc" -I"D:/CarbideWorkspace/TestQJson/qjson" -I"D:/CarbideWorkspace/TestQJson/qjson/tmp" -first: default -default: debug-winscw -all: debug release - -qmake: - $(QMAKE) -spec symbian-abld -o "bld.inf" "D:/CarbideWorkspace/TestQJson/qjson/qjson.pro" - -bld.inf: - $(QMAKE) - -$(ABLD): bld.inf - bldmake bldfiles - -debug: $(ABLD) - $(ABLD) build winscw udeb - $(ABLD) build gcce udeb - $(ABLD) build armv5 udeb - $(ABLD) build armv6 udeb - -release: $(ABLD) - $(ABLD) build gcce urel - $(ABLD) build armv5 urel - $(ABLD) build armv6 urel - -debug-winscw: $(ABLD) - $(ABLD) build winscw udeb -debug-gcce: $(ABLD) - $(ABLD) build gcce udeb -debug-armv5: $(ABLD) - $(ABLD) build armv5 udeb -debug-armv6: $(ABLD) - $(ABLD) build armv6 udeb -release-gcce: $(ABLD) - $(ABLD) build gcce urel -release-armv5: $(ABLD) - $(ABLD) build armv5 urel -release-armv6: $(ABLD) - $(ABLD) build armv6 urel - -export: $(ABLD) - $(ABLD) export - -cleanexport: $(ABLD) - $(ABLD) cleanexport - -src\$(MAKEFILE): - @$(CHK_DIR_EXISTS) src\ $(MKDIR) src\ - cd src\ && $(QMAKE) src.pro -win32 -o $(MAKEFILE) -sub-src-qmake_all: FORCE - @$(CHK_DIR_EXISTS) src\ $(MKDIR) src\ - cd src\ && $(QMAKE) src.pro -win32 -o $(MAKEFILE) -sub-src: src\$(MAKEFILE) FORCE - cd src\ && $(MAKE) -f $(MAKEFILE) -tests\$(MAKEFILE): - @$(CHK_DIR_EXISTS) tests\ $(MKDIR) tests\ - cd tests\ && $(QMAKE) tests.pro -win32 -o $(MAKEFILE) -sub-tests-qmake_all: FORCE - @$(CHK_DIR_EXISTS) tests\ $(MKDIR) tests\ - cd tests\ && $(QMAKE) tests.pro -win32 -o $(MAKEFILE) -sub-tests: tests\$(MAKEFILE) sub-src FORCE - cd tests\ && $(MAKE) -f $(MAKEFILE) - - -D:\Qt\4.6.1\bin\moc.exe: - (cd $(QTDIR)/src/tools/moc && $(MAKE)) - -mocclean: compiler_moc_header_clean compiler_moc_source_clean - -mocables: compiler_moc_header_make_all compiler_moc_source_make_all -FORCE: - -winscw_deployment: - -winscw_deployment_clean: - -sis: restore_build - $(if $(wildcard qjson_template.pkg),$(if $(wildcard .make.cache),$(MAKE) -s -f $(MAKEFILE) ok_sis,$(if $(QT_SIS_TARGET),$(MAKE) -s -f $(MAKEFILE) ok_sis,$(MAKE) -s -f $(MAKEFILE) fail_sis_nocache)),$(MAKE) -s -f $(MAKEFILE) fail_sis_nopkg) - -ok_sis: - createpackage.bat $(QT_SIS_OPTIONS) qjson_template.pkg $(QT_SIS_TARGET) $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE) - -fail_sis_nopkg: - $(error PKG file does not exist, 'SIS' target is only supported for executables or projects with DEPLOYMENT statement) - -fail_sis_nocache: - $(error Project has to be built or QT_SIS_TARGET environment variable has to be set before calling 'SIS' target) - -restore_build: --include .make.cache - -store_build: - @echo # ============================================================================== > .make.cache - @echo # This file is generated by make and should not be modified by the user >> .make.cache - @echo # Name : .make.cache >> .make.cache - @echo # Part of : qjson >> .make.cache - @echo # Description : This file is used to cache last build target for >> .make.cache - @echo # make sis target. >> .make.cache - @echo # Version : >> .make.cache - @echo # >> .make.cache - @echo # ============================================================================== >> .make.cache - @echo. >> .make.cache - @echo QT_SIS_TARGET ?= $(QT_SIS_TARGET) >> .make.cache - -dodistclean: - -$(MAKE) -f "d:\CarbideWorkspace\TestQJson\qjson\src\Makefile" dodistclean - -$(MAKE) -f "d:\CarbideWorkspace\TestQJson\qjson\tests\Makefile" dodistclean - -@ if EXIST "d:\CarbideWorkspace\TestQJson\qjson\Makefile" $(DEL_FILE) "d:\CarbideWorkspace\TestQJson\qjson\Makefile" - -@ if EXIST "d:\CarbideWorkspace\TestQJson\qjson\.make.cache" $(DEL_FILE) "d:\CarbideWorkspace\TestQJson\qjson\.make.cache" - -@ if EXIST "d:\CarbideWorkspace\TestQJson\qjson\bld.inf" $(DEL_FILE) "d:\CarbideWorkspace\TestQJson\qjson\bld.inf" - -distclean: clean dodistclean - -clean: $(ABLD) - -$(ABLD) reallyclean - -bldmake clean - -clean-debug: $(ABLD) - $(ABLD) reallyclean winscw udeb - $(ABLD) reallyclean gcce udeb - $(ABLD) reallyclean armv5 udeb - $(ABLD) reallyclean armv6 udeb - -clean-release: $(ABLD) - $(ABLD) reallyclean gcce urel - $(ABLD) reallyclean armv5 urel - $(ABLD) reallyclean armv6 urel - -clean-debug-winscw: $(ABLD) - $(ABLD) reallyclean winscw udeb -clean-debug-gcce: $(ABLD) - $(ABLD) reallyclean gcce udeb -clean-debug-armv5: $(ABLD) - $(ABLD) reallyclean armv5 udeb -clean-debug-armv6: $(ABLD) - $(ABLD) reallyclean armv6 udeb -clean-release-gcce: $(ABLD) - $(ABLD) reallyclean gcce urel -clean-release-armv5: $(ABLD) - $(ABLD) reallyclean armv5 urel -clean-release-armv6: $(ABLD) - $(ABLD) reallyclean armv6 urel - diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/util/qjson/qjson.pro --- a/smf/smfservermodule/util/qjson/qjson.pro Tue May 18 17:37:12 2010 +0530 +++ b/smf/smfservermodule/util/qjson/qjson.pro Fri May 21 15:45:10 2010 +0100 @@ -1,6 +1,6 @@ TEMPLATE = subdirs -SUBDIRS = sub_src sub_unittest +SUBDIRS = sub_src # sub_unittest sub_src.subdir = src sub_unittest.subdir = tests -sub_unittest.depends = sub_src \ No newline at end of file +sub_unittest.depends = sub_src diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/util/qjson/src/Makefile --- a/smf/smfservermodule/util/qjson/src/Makefile Tue May 18 17:37:12 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,221 +0,0 @@ -# ============================================================================== -# Generated by qmake (2.01a) (Qt 4.6.1) on: Mon May 17 16:06:46 2010 -# This file is generated by qmake and should not be modified by the -# user. -# Name : Makefile -# Description : Wrapper Makefile for calling Symbian build tools -# -# ============================================================================== - - -MAKEFILE = Makefile -QMAKE = d:\Qt\4.6.1\bin\qmake -DEL_FILE = del -DEL_DIR = rmdir -MOVE = move -XCOPY = xcopy /d /f /h /r /y /i -ABLD = ABLD.BAT -DEBUG_PLATFORMS = winscw gcce armv5 armv6 -RELEASE_PLATFORMS = gcce armv5 armv6 -MAKE = make - -ifeq (WINS,$(findstring WINS, $(PLATFORM))) -ZDIR=$(EPOCROOT)epoc32\release\$(PLATFORM)\$(CFG)\Z -else -ZDIR=$(EPOCROOT)epoc32\data\z -endif - -DEFINES = -DSYMBIAN -DUNICODE -DQT_KEYPAD_NAVIGATION -DQT_SOFTKEYS_ENABLED -DQT_USE_MATH_H_FLOATS -DQJSON_MAKEDLL -DQT_CORE_LIB -INCPATH = -I"D:/Qt/4.6.1/include/QtCore" -I"D:/Qt/4.6.1/include/QtCore/tmp" -I"D:/Qt/4.6.1/include" -I"D:/Qt/4.6.1/include/tmp" -I"D:/Qt/4.6.1/mkspecs/common/symbian" -I"D:/Qt/4.6.1/mkspecs/common/symbian/tmp" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include" -I"D:/CarbideWorkspace/TestQJson/qjson/src" -I"D:/CarbideWorkspace/TestQJson/qjson/src/tmp" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include/stdapis" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include/stdapis/sys" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include/stdapis/stlport" -first: default -default: debug-winscw -all: debug release - -qmake: - $(QMAKE) -spec symbian-abld -o "bld.inf" "D:/CarbideWorkspace/TestQJson/qjson/src/src.pro" - -bld.inf: - $(QMAKE) - -$(ABLD): bld.inf - bldmake bldfiles - -debug: $(ABLD) - $(ABLD) build winscw udeb - $(ABLD) build gcce udeb - $(ABLD) build armv5 udeb - $(ABLD) build armv6 udeb - -release: $(ABLD) - $(ABLD) build gcce urel - $(ABLD) build armv5 urel - $(ABLD) build armv6 urel - -debug-winscw: $(ABLD) - $(ABLD) build winscw udeb -debug-gcce: $(ABLD) - $(ABLD) build gcce udeb -debug-armv5: $(ABLD) - $(ABLD) build armv5 udeb -debug-armv6: $(ABLD) - $(ABLD) build armv6 udeb -release-gcce: $(ABLD) - $(ABLD) build gcce urel -release-armv5: $(ABLD) - $(ABLD) build armv5 urel -release-armv6: $(ABLD) - $(ABLD) build armv6 urel - -export: $(ABLD) - $(ABLD) export - -cleanexport: $(ABLD) - $(ABLD) cleanexport - -D:\Qt\4.6.1\bin\moc.exe: - (cd $(QTDIR)/src/tools/moc && $(MAKE)) - -mocclean: compiler_moc_header_clean compiler_moc_source_clean - -mocables: compiler_moc_header_make_all compiler_moc_source_make_all - -compiler_moc_header_make_all: moc_parserrunnable.cpp moc_serializerrunnable.cpp -compiler_moc_header_clean: - -$(DEL_FILE) moc_parserrunnable.cpp moc_serializerrunnable.cpp 2> NUL -moc_parserrunnable.cpp: qjson_export.h \ - parserrunnable.h \ - ..\..\..\..\Qt\4.6.1\bin\moc.exe - D:\Qt\4.6.1\bin\moc.exe $(DEFINES) $(INCPATH) -DSYMBIAN parserrunnable.h -o moc_parserrunnable.cpp - -moc_serializerrunnable.cpp: qjson_export.h \ - serializerrunnable.h \ - ..\..\..\..\Qt\4.6.1\bin\moc.exe - D:\Qt\4.6.1\bin\moc.exe $(DEFINES) $(INCPATH) -DSYMBIAN serializerrunnable.h -o moc_serializerrunnable.cpp - -compiler_rcc_make_all: -compiler_rcc_clean: -compiler_image_collection_make_all: qmake_image_collection.cpp -compiler_image_collection_clean: - -$(DEL_FILE) qmake_image_collection.cpp 2> NUL -compiler_moc_source_make_all: -compiler_moc_source_clean: -compiler_uic_make_all: -compiler_uic_clean: -compiler_yacc_decl_make_all: -compiler_yacc_decl_clean: -compiler_yacc_impl_make_all: -compiler_yacc_impl_clean: -compiler_lex_make_all: -compiler_lex_clean: -compiler_clean: compiler_moc_header_clean - -create_temps: - -@ if NOT EXIST "D:\Qt\4.6.1\include\QtCore\tmp" mkdir "D:\Qt\4.6.1\include\QtCore\tmp" - -@ if NOT EXIST "D:\Qt\4.6.1\include\tmp" mkdir "D:\Qt\4.6.1\include\tmp" - -@ if NOT EXIST "D:\Qt\4.6.1\mkspecs\common\symbian\tmp" mkdir "D:\Qt\4.6.1\mkspecs\common\symbian\tmp" - -@ if NOT EXIST "D:\CarbideWorkspace\TestQJson\qjson\src\tmp" mkdir "D:\CarbideWorkspace\TestQJson\qjson\src\tmp" - -extension_clean: compiler_clean - -@ if EXIST "D:\Qt\4.6.1\include\QtCore\tmp" rmdir /S /Q "D:\Qt\4.6.1\include\QtCore\tmp" - -@ if EXIST "D:\Qt\4.6.1\include\tmp" rmdir /S /Q "D:\Qt\4.6.1\include\tmp" - -@ if EXIST "D:\Qt\4.6.1\mkspecs\common\symbian\tmp" rmdir /S /Q "D:\Qt\4.6.1\mkspecs\common\symbian\tmp" - -@ if EXIST "D:\CarbideWorkspace\TestQJson\qjson\src\tmp" rmdir /S /Q "D:\CarbideWorkspace\TestQJson\qjson\src\tmp" - -pre_targetdeps: \ - generated_sources \ - all_source_deps - -generated_sources: \ - moc_parserrunnable.cpp \ - moc_serializerrunnable.cpp - -all_source_deps: \ - json_parser.hh \ - stack.hh \ - parser_p.h \ - parser.h \ - qjson_export.h \ - json_scanner.h \ - qjson_debug.h \ - location.hh \ - position.hh \ - parserrunnable.h \ - qobjecthelper.h \ - serializer.h \ - serializerrunnable.h - -finalize: - -winscw_deployment: - -winscw_deployment_clean: - -sis: restore_build - $(if $(wildcard qjson_template.pkg),$(if $(wildcard .make.cache),$(MAKE) -s -f $(MAKEFILE) ok_sis,$(if $(QT_SIS_TARGET),$(MAKE) -s -f $(MAKEFILE) ok_sis,$(MAKE) -s -f $(MAKEFILE) fail_sis_nocache)),$(MAKE) -s -f $(MAKEFILE) fail_sis_nopkg) - -ok_sis: - createpackage.bat $(QT_SIS_OPTIONS) qjson_template.pkg $(QT_SIS_TARGET) $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE) - -fail_sis_nopkg: - $(error PKG file does not exist, 'SIS' target is only supported for executables or projects with DEPLOYMENT statement) - -fail_sis_nocache: - $(error Project has to be built or QT_SIS_TARGET environment variable has to be set before calling 'SIS' target) - -restore_build: --include .make.cache - -store_build: - @echo # ============================================================================== > .make.cache - @echo # This file is generated by make and should not be modified by the user >> .make.cache - @echo # Name : .make.cache >> .make.cache - @echo # Part of : qjson >> .make.cache - @echo # Description : This file is used to cache last build target for >> .make.cache - @echo # make sis target. >> .make.cache - @echo # Version : >> .make.cache - @echo # >> .make.cache - @echo # ============================================================================== >> .make.cache - @echo. >> .make.cache - @echo QT_SIS_TARGET ?= $(QT_SIS_TARGET) >> .make.cache - -dodistclean: - -@ if EXIST "d:\CarbideWorkspace\TestQJson\qjson\src\qjson_template.pkg" $(DEL_FILE) "d:\CarbideWorkspace\TestQJson\qjson\src\qjson_template.pkg" - -@ if EXIST "d:\CarbideWorkspace\TestQJson\qjson\src\Makefile" $(DEL_FILE) "d:\CarbideWorkspace\TestQJson\qjson\src\Makefile" - -@ if EXIST "d:\CarbideWorkspace\TestQJson\qjson\src\Makefile_0xEe29a5ee.mk" $(DEL_FILE) "d:\CarbideWorkspace\TestQJson\qjson\src\Makefile_0xEe29a5ee.mk" - -@ if EXIST "d:\CarbideWorkspace\TestQJson\qjson\src\src_0xEe29a5ee.mmp" $(DEL_FILE) "d:\CarbideWorkspace\TestQJson\qjson\src\src_0xEe29a5ee.mmp" - -@ if EXIST "d:\CarbideWorkspace\TestQJson\qjson\src\.make.cache" $(DEL_FILE) "d:\CarbideWorkspace\TestQJson\qjson\src\.make.cache" - -@ if EXIST "d:\CarbideWorkspace\TestQJson\qjson\src\bld.inf" $(DEL_FILE) "d:\CarbideWorkspace\TestQJson\qjson\src\bld.inf" - -@ if EXIST "d:\CarbideWorkspace\TestQJson\qjson\lib\qjson.prl" $(DEL_FILE) "d:\CarbideWorkspace\TestQJson\qjson\lib\qjson.prl" - -distclean: clean dodistclean - -clean: $(ABLD) - -$(ABLD) reallyclean - -bldmake clean - -clean-debug: $(ABLD) - $(ABLD) reallyclean winscw udeb - $(ABLD) reallyclean gcce udeb - $(ABLD) reallyclean armv5 udeb - $(ABLD) reallyclean armv6 udeb - -clean-release: $(ABLD) - $(ABLD) reallyclean gcce urel - $(ABLD) reallyclean armv5 urel - $(ABLD) reallyclean armv6 urel - -clean-debug-winscw: $(ABLD) - $(ABLD) reallyclean winscw udeb -clean-debug-gcce: $(ABLD) - $(ABLD) reallyclean gcce udeb -clean-debug-armv5: $(ABLD) - $(ABLD) reallyclean armv5 udeb -clean-debug-armv6: $(ABLD) - $(ABLD) reallyclean armv6 udeb -clean-release-gcce: $(ABLD) - $(ABLD) reallyclean gcce urel -clean-release-armv5: $(ABLD) - $(ABLD) reallyclean armv5 urel -clean-release-armv6: $(ABLD) - $(ABLD) reallyclean armv6 urel - diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/util/qjson/tests/Makefile --- a/smf/smfservermodule/util/qjson/tests/Makefile Tue May 18 17:37:12 2010 +0530 +++ b/smf/smfservermodule/util/qjson/tests/Makefile Fri May 21 15:45:10 2010 +0100 @@ -1,178 +1,135 @@ -# ============================================================================== -# Generated by qmake (2.01a) (Qt 4.6.1) on: Mon May 17 12:46:26 2010 -# This file is generated by qmake and should not be modified by the -# user. -# Name : Makefile -# Description : Wrapper Makefile for calling Symbian build tools -# -# ============================================================================== +############################################################################# +# Makefile for building: tests +# Generated by qmake (2.01a) (Qt 4.6.2) on: Wed May 19 14:07:21 2010 +# Project: tests.pro +# Template: app +# Command: /usr/bin/qmake-qt4 -spec /usr/share/qt4/mkspecs/linux-g++ -unix CONFIG+=debug -o Makefile tests.pro +############################################################################# + +####### Compiler, tools and options + +CC = gcc +CXX = g++ +DEFINES = +CFLAGS = -pipe $(DEFINES) +CXXFLAGS = -pipe $(DEFINES) +INCPATH = -I/usr/share/qt4/mkspecs/linux-g++ -I. +LINK = g++ +LFLAGS = +LIBS = $(SUBLIBS) +AR = ar cqs +RANLIB = +QMAKE = /usr/bin/qmake-qt4 +TAR = tar -cf +COMPRESS = gzip -9f +COPY = cp -f +SED = sed +COPY_FILE = $(COPY) +COPY_DIR = $(COPY) -r +STRIP = strip +INSTALL_FILE = install -m 644 -p +INSTALL_DIR = $(COPY_DIR) +INSTALL_PROGRAM = install -m 755 -p +DEL_FILE = rm -f +SYMLINK = ln -f -s +DEL_DIR = rmdir +MOVE = mv -f +CHK_DIR_EXISTS= test -d +MKDIR = mkdir -p + +####### Output directory + +OBJECTS_DIR = ./ + +####### Files + +SOURCES = +OBJECTS = +DIST = /usr/share/qt4/mkspecs/common/g++.conf \ + /usr/share/qt4/mkspecs/common/unix.conf \ + /usr/share/qt4/mkspecs/common/linux.conf \ + /usr/share/qt4/mkspecs/qconfig.pri \ + /usr/share/qt4/mkspecs/features/qt_functions.prf \ + /usr/share/qt4/mkspecs/features/qt_config.prf \ + /usr/share/qt4/mkspecs/features/exclusive_builds.prf \ + /usr/share/qt4/mkspecs/features/default_pre.prf \ + tests.pro +QMAKE_TARGET = tests +DESTDIR = +TARGET = tests + +first: all +####### Implicit rules + +.SUFFIXES: .o .c .cpp .cc .cxx .C + +.cpp.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.cc.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.cxx.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.C.o: + $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<" + +.c.o: + $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<" + +####### Build rules + +all: Makefile $(TARGET) + +$(TARGET): $(OBJECTS) + $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) + +Makefile: tests.pro /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mkspecs/common/g++.conf \ + /usr/share/qt4/mkspecs/common/unix.conf \ + /usr/share/qt4/mkspecs/common/linux.conf \ + /usr/share/qt4/mkspecs/qconfig.pri \ + /usr/share/qt4/mkspecs/features/qt_functions.prf \ + /usr/share/qt4/mkspecs/features/qt_config.prf \ + /usr/share/qt4/mkspecs/features/exclusive_builds.prf \ + /usr/share/qt4/mkspecs/features/default_pre.prf + $(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ -unix CONFIG+=debug -o Makefile tests.pro +/usr/share/qt4/mkspecs/common/g++.conf: +/usr/share/qt4/mkspecs/common/unix.conf: +/usr/share/qt4/mkspecs/common/linux.conf: +/usr/share/qt4/mkspecs/qconfig.pri: +/usr/share/qt4/mkspecs/features/qt_functions.prf: +/usr/share/qt4/mkspecs/features/qt_config.prf: +/usr/share/qt4/mkspecs/features/exclusive_builds.prf: +/usr/share/qt4/mkspecs/features/default_pre.prf: +qmake: FORCE + @$(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ -unix CONFIG+=debug -o Makefile tests.pro + +dist: + @$(CHK_DIR_EXISTS) .tmp/tests1.0.0 || $(MKDIR) .tmp/tests1.0.0 + $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/tests1.0.0/ && (cd `dirname .tmp/tests1.0.0` && $(TAR) tests1.0.0.tar tests1.0.0 && $(COMPRESS) tests1.0.0.tar) && $(MOVE) `dirname .tmp/tests1.0.0`/tests1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/tests1.0.0 -MAKEFILE = Makefile -QMAKE = d:\Qt\4.6.1\bin\qmake -DEL_FILE = del -DEL_DIR = rmdir -MOVE = move -XCOPY = xcopy /d /f /h /r /y /i -ABLD = ABLD.BAT -DEBUG_PLATFORMS = winscw gcce armv5 armv6 -RELEASE_PLATFORMS = gcce armv5 armv6 -MAKE = make +clean:compiler_clean + -$(DEL_FILE) *~ core *.core -ifeq (WINS,$(findstring WINS, $(PLATFORM))) -ZDIR=$(EPOCROOT)epoc32\release\$(PLATFORM)\$(CFG)\Z -else -ZDIR=$(EPOCROOT)epoc32\data\z -endif - -DEFINES = -DSYMBIAN -DUNICODE -DQT_KEYPAD_NAVIGATION -DQT_SOFTKEYS_ENABLED -DQT_USE_MATH_H_FLOATS -INCPATH = -I"D:/Qt/4.6.1/mkspecs/common/symbian/stl-off" -I"D:/Qt/4.6.1/mkspecs/common/symbian/stl-off/tmp" -I"D:/Qt/4.6.1/mkspecs/common/symbian" -I"D:/Qt/4.6.1/mkspecs/common/symbian/tmp" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include" -I"D:/CarbideWorkspace/TestQJson/qjson/src" -I"D:/CarbideWorkspace/TestQJson/qjson/src/tmp" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include/stdapis" -I"D:/S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/include/stdapis/sys" -I"D:/Qt/4.6.1/include" -I"D:/Qt/4.6.1/include/tmp" -first: default -default: debug-winscw -all: debug release - -qmake: - $(QMAKE) -spec symbian-abld -o "bld.inf" "D:/CarbideWorkspace/TestQJson/qjson/tests/tests.pro" - -bld.inf: - $(QMAKE) - -$(ABLD): bld.inf - bldmake bldfiles -debug: $(ABLD) - $(ABLD) build winscw udeb - $(ABLD) build gcce udeb - $(ABLD) build armv5 udeb - $(ABLD) build armv6 udeb - -release: $(ABLD) - $(ABLD) build gcce urel - $(ABLD) build armv5 urel - $(ABLD) build armv6 urel +####### Sub-libraries -debug-winscw: $(ABLD) - $(ABLD) build winscw udeb -debug-gcce: $(ABLD) - $(ABLD) build gcce udeb -debug-armv5: $(ABLD) - $(ABLD) build armv5 udeb -debug-armv6: $(ABLD) - $(ABLD) build armv6 udeb -release-gcce: $(ABLD) - $(ABLD) build gcce urel -release-armv5: $(ABLD) - $(ABLD) build armv5 urel -release-armv6: $(ABLD) - $(ABLD) build armv6 urel +distclean: clean + -$(DEL_FILE) $(TARGET) + -$(DEL_FILE) Makefile -export: $(ABLD) - $(ABLD) export - -cleanexport: $(ABLD) - $(ABLD) cleanexport compiler_clean: -create_temps: - -@ if NOT EXIST "D:\Qt\4.6.1\mkspecs\common\symbian\stl-off\tmp" mkdir "D:\Qt\4.6.1\mkspecs\common\symbian\stl-off\tmp" - -@ if NOT EXIST "D:\Qt\4.6.1\mkspecs\common\symbian\tmp" mkdir "D:\Qt\4.6.1\mkspecs\common\symbian\tmp" - -@ if NOT EXIST "D:\CarbideWorkspace\TestQJson\qjson\src\tmp" mkdir "D:\CarbideWorkspace\TestQJson\qjson\src\tmp" - -@ if NOT EXIST "D:\Qt\4.6.1\include\tmp" mkdir "D:\Qt\4.6.1\include\tmp" - -extension_clean: compiler_clean - -@ if EXIST "D:\Qt\4.6.1\mkspecs\common\symbian\stl-off\tmp" rmdir /S /Q "D:\Qt\4.6.1\mkspecs\common\symbian\stl-off\tmp" - -@ if EXIST "D:\Qt\4.6.1\mkspecs\common\symbian\tmp" rmdir /S /Q "D:\Qt\4.6.1\mkspecs\common\symbian\tmp" - -@ if EXIST "D:\CarbideWorkspace\TestQJson\qjson\src\tmp" rmdir /S /Q "D:\CarbideWorkspace\TestQJson\qjson\src\tmp" - -@ if EXIST "D:\Qt\4.6.1\include\tmp" rmdir /S /Q "D:\Qt\4.6.1\include\tmp" - -pre_targetdeps: \ - generated_sources \ - all_source_deps - -generated_sources: - -all_source_deps: +####### Compile -finalize: - -winscw_deployment: - -winscw_deployment_clean: - -sis: restore_build - $(if $(wildcard tests_template.pkg),$(if $(wildcard .make.cache),$(MAKE) -s -f $(MAKEFILE) ok_sis,$(if $(QT_SIS_TARGET),$(MAKE) -s -f $(MAKEFILE) ok_sis,$(MAKE) -s -f $(MAKEFILE) fail_sis_nocache)),$(MAKE) -s -f $(MAKEFILE) fail_sis_nopkg) - -ok_sis: - createpackage.bat $(QT_SIS_OPTIONS) tests_template.pkg $(QT_SIS_TARGET) $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE) - -fail_sis_nopkg: - $(error PKG file does not exist, 'SIS' target is only supported for executables or projects with DEPLOYMENT statement) - -fail_sis_nocache: - $(error Project has to be built or QT_SIS_TARGET environment variable has to be set before calling 'SIS' target) - -restore_build: --include .make.cache +####### Install -store_build: - @echo # ============================================================================== > .make.cache - @echo # This file is generated by make and should not be modified by the user >> .make.cache - @echo # Name : .make.cache >> .make.cache - @echo # Part of : tests >> .make.cache - @echo # Description : This file is used to cache last build target for >> .make.cache - @echo # make sis target. >> .make.cache - @echo # Version : >> .make.cache - @echo # >> .make.cache - @echo # ============================================================================== >> .make.cache - @echo. >> .make.cache - @echo QT_SIS_TARGET ?= $(QT_SIS_TARGET) >> .make.cache - -dodistclean: - -@ if EXIST "d:\CarbideWorkspace\TestQJson\qjson\tests\tests_template.pkg" $(DEL_FILE) "d:\CarbideWorkspace\TestQJson\qjson\tests\tests_template.pkg" - -@ if EXIST "d:\CarbideWorkspace\TestQJson\qjson\tests\Makefile" $(DEL_FILE) "d:\CarbideWorkspace\TestQJson\qjson\tests\Makefile" - -@ if EXIST "d:\CarbideWorkspace\TestQJson\qjson\tests\Makefile_0xEdfa80af.mk" $(DEL_FILE) "d:\CarbideWorkspace\TestQJson\qjson\tests\Makefile_0xEdfa80af.mk" - -@ if EXIST "d:\CarbideWorkspace\TestQJson\qjson\tests\tests_0xEdfa80af.mmp" $(DEL_FILE) "d:\CarbideWorkspace\TestQJson\qjson\tests\tests_0xEdfa80af.mmp" - -@ if EXIST "d:\CarbideWorkspace\TestQJson\qjson\tests\tests_reg.rss" $(DEL_FILE) "d:\CarbideWorkspace\TestQJson\qjson\tests\tests_reg.rss" - -@ if EXIST "d:\CarbideWorkspace\TestQJson\qjson\tests\tests.rss" $(DEL_FILE) "d:\CarbideWorkspace\TestQJson\qjson\tests\tests.rss" - -@ if EXIST "d:\CarbideWorkspace\TestQJson\qjson\tests\tests.loc" $(DEL_FILE) "d:\CarbideWorkspace\TestQJson\qjson\tests\tests.loc" - -@ if EXIST "d:\CarbideWorkspace\TestQJson\qjson\tests\.make.cache" $(DEL_FILE) "d:\CarbideWorkspace\TestQJson\qjson\tests\.make.cache" - -@ if EXIST "d:\CarbideWorkspace\TestQJson\qjson\tests\bld.inf" $(DEL_FILE) "d:\CarbideWorkspace\TestQJson\qjson\tests\bld.inf" - -distclean: clean dodistclean - -clean: $(ABLD) - -$(ABLD) reallyclean - -bldmake clean +install: FORCE -clean-debug: $(ABLD) - $(ABLD) reallyclean winscw udeb - $(ABLD) reallyclean gcce udeb - $(ABLD) reallyclean armv5 udeb - $(ABLD) reallyclean armv6 udeb - -clean-release: $(ABLD) - $(ABLD) reallyclean gcce urel - $(ABLD) reallyclean armv5 urel - $(ABLD) reallyclean armv6 urel +uninstall: FORCE -clean-debug-winscw: $(ABLD) - $(ABLD) reallyclean winscw udeb -clean-debug-gcce: $(ABLD) - $(ABLD) reallyclean gcce udeb -clean-debug-armv5: $(ABLD) - $(ABLD) reallyclean armv5 udeb -clean-debug-armv6: $(ABLD) - $(ABLD) reallyclean armv6 udeb -clean-release-gcce: $(ABLD) - $(ABLD) reallyclean gcce urel -clean-release-armv5: $(ABLD) - $(ABLD) reallyclean armv5 urel -clean-release-armv6: $(ABLD) - $(ABLD) reallyclean armv6 urel +FORCE: -run: - -call /S60/devices/S60_5th_Edition_SDK_v0.9/epoc32/release/winscw/udeb/tests.exe $(QT_RUN_OPTIONS) -runonphone: sis - runonphone $(QT_RUN_ON_PHONE_OPTIONS) --sis tests_$(QT_SIS_TARGET).sis tests.exe $(QT_RUN_OPTIONS) - diff -r be09cf1f39dd -r 77a56c951f86 smf/smfservermodule/util/util.pro --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/smf/smfservermodule/util/util.pro Fri May 21 15:45:10 2010 +0100 @@ -0,0 +1,3 @@ +TEMPLATE = subdirs + +SUBDIRS = qjson