Merge lp:~air-dex/reyn-tweets/qt5port into lp:reyn-tweets

[air-dex]

[Qt5 bump] Merge with trunk

Merge the Qt5 port work with the trunk.

[air-dex (air-dex)]

Merge OK

review: Approve

=== modified file 'ReynTweets.pro'
--- ReynTweets.pro	2013-02-15 23:30:42 +0000
+++ ReynTweets.pro	2013-08-20 00:10:09 +0000
@@ -1,514 +1,160 @@
-#-----------------------------------#
-# ReynTweets.pro                    #
-# Reyn Tweets' Qt .pro project file #
-# Auteur : Romain Ducher            #
-#-----------------------------------#
-
-#-----------------------------------------------------------------------------#
-#                                                                             #
-# Copyright 2011 Romain Ducher                                                #
-#                                                                             #
-# This file is part of Reyn Tweets.                                           #
-#                                                                             #
-# Reyn Tweets is free software: you can redistribute it and/or modify         #
-# it under the terms of the GNU Lesser General Public License as published by #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# Reyn Tweets is distributed in the hope that it will be useful,              #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                #
-# GNU Lesser General Public License for more details.                         #
-#                                                                             #
-# You should have received a copy of the GNU Lesser General Public License    #
-# along with Reyn Tweets. If not, see <http://www.gnu.org/licenses/>.         #
-#                                                                             #
-#-----------------------------------------------------------------------------#
-
-#-------------------------------------------------------------#
-# This file was known as ReynTweets.pri between r232 and r355 #
-#-------------------------------------------------------------#
-
-
-#----------------------#
-# Common configuration #
-#----------------------#
-
-QT += core gui network webkit declarative xml
-
-TARGET = ReynTweets
-TEMPLATE = app
-
-
-#--------------#
-# Source files #
-#--------------#
-
-# NB : the QML Application Viewer is here in a .pri :
-# ui/qmlapplicationviewer.pri
-
-SOURCES += \
-	tools/utils.cpp \
-	tools/reyntweetsdatetime.cpp \
-	tools/parsers/htmlparser.cpp \
-	tools/parsers/jsonparser.cpp \
-	tools/parsers/oauthparser.cpp \
-	tools/parsers/xmlparser.cpp \
-	connection/model/managers/oauthmanager.cpp \
-	connection/model/managers/twitlongermanager.cpp \
-	connection/twittercommunicators/twittercommunicator.cpp \
-	connection/requests/twitlonger/twitlongerurls.cpp \
-	connection/requests/twitter/twitterurls.cpp \
-	connection/model/resultwrapper.cpp \
-	connection/requests/genericrequester.cpp \
-	connection/requests/twitter/twitterrequester.cpp \
-	connection/requests/twitter/accounts/verifycredentialsrequester.cpp \
-	connection/requests/twitter/favorites/favoriterequester.cpp \
-	connection/requests/twitter/favorites/favoritestimelinerequester.cpp \
-	connection/requests/twitter/oauth/oauthrequester.cpp \
-	connection/requests/twitter/oauth/requesttokenrequester.cpp \
-	connection/requests/twitter/oauth/authorizerequester.cpp \
-	connection/requests/twitter/oauth/postauthorizerequester.cpp \
-	connection/requests/twitter/oauth/accesstokenrequester.cpp \
-	connection/requests/twitter/searches/searchrequester.cpp \
-	connection/requests/twitter/timelines/hometimelinerequester.cpp \
-	connection/requests/twitter/timelines/mentionstimelinerequester.cpp \
-	connection/requests/twitter/tweets/destroytweetrequester.cpp \
-	connection/requests/twitter/tweets/posttweetrequester.cpp \
-	connection/requests/twitter/tweets/retweetrequester.cpp \
-	connection/requests/twitter/tweets/showtweetrequester.cpp \
-	connection/requests/twitter/users/showuserrequester.cpp \
-	connection/requests/twitlonger/twitlongerrequester.cpp \
-	connection/requests/twitlonger/posttotwitlongerrequester.cpp \
-	connection/requests/twitlonger/sendidtotwitlongerrequester.cpp \
-	connection/model/requestinfos.cpp \
-	connection/model/requestermanager.cpp \
-	connection/calls/genericcalls.cpp \
-	connection/calls/reyntwittercalls.cpp \
-	connection/calls/twitlongercalls.cpp \
-	model/reyntweetslistable.cpp \
-	model/reyntweetsmappable.cpp \
-	model/tweets/tweetentity.cpp \
-	model/tweets/indexbounds.cpp \
-	model/tweets/mediasize.cpp \
-	model/tweets/mediasizes.cpp \
-	model/tweets/media.cpp \
-	model/tweets/medialist.cpp \
-	model/tweets/urlentity.cpp \
-	model/tweets/urlentitylist.cpp \
-	model/tweets/usermention.cpp \
-	model/tweets/usermentionlist.cpp \
-	model/tweets/hashtag.cpp \
-	model/tweets/hashtaglist.cpp \
-	model/tweets/tweetentities.cpp \
-	model/users/userinfos.cpp \
-	model/tweets/retweetinfos.cpp \
-	model/tweets/tweet.cpp \
-	model/timelines/timeline.cpp \
-	model/users/user.cpp \
-	model/configuration/reyntweetsappconfiguration.cpp \
-	model/configuration/useraccount.cpp \
-	model/configuration/reyntweetsuserconfiguration.cpp \
-	logic/processes/processwrapper.cpp \
-	tools/processutils.cpp \
-	logic/processes/genericprocess.cpp \
-	logic/processes/singletwittercallprocess.cpp \
-	logic/processes/retweetprocess.cpp \
-	logic/processes/oauthprocess.cpp \
-	logic/processes/allowprocess.cpp \
-	logic/processes/deletetweetprocess.cpp \
-	logic/processes/favoriteprocess.cpp \
-	logic/processes/gettweetprocess.cpp \
-	logic/processes/launchingprocess.cpp \
-	logic/processes/loadinghometimelineprocess.cpp \
-	logic/processes/loadmentionstimelineprocess.cpp \
-	logic/processes/posttweetprocess.cpp \
-	logic/processes/postviatwitlongerprocess.cpp \
-	logic/processes/processmanager.cpp \
-	logic/reyncore.cpp \
-	logic/controls/genericcontrol.cpp \
-	logic/controls/allowcontrol.cpp \
-	logic/controls/launchingcontrol.cpp \
-	logic/controls/logincontrol.cpp \
-	logic/controls/reyncontrol.cpp \
-	logic/controls/settingscontrol.cpp \
-	logic/controls/timelinecontrol.cpp \
-	logic/controls/tweetcontrol.cpp \
-	logic/controls/writetweetcontrol.cpp \
-	main.cpp \
-	logic/coreresult.cpp
-
-
-HEADERS  += \
-	tools/qmldebug.hpp \
-	tools/utils.hpp \
-	tools/reyntweetsdatetime.hpp \
-	tools/parsers/genericparser.hpp \
-	tools/parsers/htmlparser.hpp \
-	tools/parsers/jsonparser.hpp \
-	tools/parsers/oauthparser.hpp \
-	tools/parsers/xmlparser.hpp \
-	connection/model/managers/oauthmanager.hpp \
-	connection/model/managers/twitlongermanager.hpp \
-	connection/model/requesttype.hpp \
-	connection/model/headersmap.hpp \
-	connection/twittercommunicators/twittercommunicator.hpp \
-	connection/model/errortypes.hpp \
-	connection/model/responseinfos.hpp \
-	connection/requests/twitlonger/twitlongerurls.hpp \
-	connection/requests/twitter/twitterurls.hpp \
-	connection/model/requestresult.hpp \
-	connection/model/resultwrapper.hpp \
-	connection/model/identificationway.hpp \
-	connection/requests/genericrequester.hpp \
-	connection/requests/twitter/twitterrequester.hpp \
-	connection/requests/twitter/accounts/verifycredentialsrequester.hpp \
-	connection/requests/twitter/favorites/favoriterequester.hpp \
-	connection/requests/twitter/favorites/favoritestimelinerequester.hpp \
-	connection/requests/twitter/oauth/oauthrequester.hpp \
-	connection/requests/twitter/oauth/requesttokenrequester.hpp \
-	connection/requests/twitter/oauth/authorizerequester.hpp \
-	connection/requests/twitter/oauth/postauthorizerequester.hpp \
-	connection/requests/twitter/oauth/accesstokenrequester.hpp \
-	connection/requests/twitter/searches/searchrequester.hpp \
-	connection/requests/twitter/timelines/hometimelinerequester.hpp \
-	connection/requests/twitter/timelines/mentionstimelinerequester.hpp \
-	connection/requests/twitter/tweets/destroytweetrequester.hpp \
-	connection/requests/twitter/tweets/posttweetrequester.hpp \
-	connection/requests/twitter/tweets/retweetrequester.hpp \
-	connection/requests/twitter/tweets/showtweetrequester.hpp \
-	connection/requests/twitter/users/showuserrequester.hpp \
-	connection/requests/twitter/twitterrequests.hpp \
-	connection/requests/twitlonger/twitlongerrequester.hpp \
-	connection/requests/twitlonger/posttotwitlongerrequester.hpp \
-	connection/requests/twitlonger/sendidtotwitlongerrequester.hpp \
-	connection/requests/twitlonger/twitlongerrequests.hpp \
-	connection/model/requestinfos.hpp \
-	connection/model/requestermanager.hpp \
-	connection/calls/genericcalls.hpp \
-	connection/calls/reyntwittercalls.hpp \
-	connection/calls/twitlongercalls.hpp \
-	model/reyntweetsserializable.hpp \
-	model/reyntweetslistable.hpp \
-	model/reyntweetslistable.tpp \
-	model/reyntweetsmappable.hpp \
-	model/tweets/tweetentity.hpp \
-	model/tweets/indexbounds.hpp \
-	model/tweets/mediasize.hpp \
-	model/tweets/mediasizes.hpp \
-	model/tweets/urlentity.hpp \
-	model/tweets/urlentitylist.hpp \
-	model/tweets/media.hpp \
-	model/tweets/medialist.hpp \
-	model/tweets/usermention.hpp \
-	model/tweets/usermentionlist.hpp \
-	model/tweets/hashtag.hpp \
-	model/tweets/hashtaglist.hpp \
-	model/tweets/tweetentities.hpp \
-	model/users/userinfos.hpp \
-	model/tweets/retweetinfos.hpp \
-	model/tweets/tweet.hpp \
-	model/timelines/timeline.hpp \
-	model/users/user.hpp \
-	model/configuration/reyntweetsappconfiguration.hpp \
-	model/configuration/useraccount.hpp \
-	model/configuration/reyntweetsuserconfiguration.hpp \
-	logic/coreresult.hpp \
-	logic/processes/processresult.hpp \
-	logic/processes/processwrapper.hpp \
-	tools/processutils.hpp \
-	logic/processes/genericprocess.hpp \
-	logic/processes/singletwittercallprocess.hpp \
-	logic/processes/oauthprocess.hpp \
-	logic/processes/allowprocess.hpp \
-	logic/processes/deletetweetprocess.hpp \
-	logic/processes/favoriteprocess.hpp \
-	logic/processes/gettweetprocess.hpp \
-	logic/processes/launchingprocess.hpp \
-	logic/processes/loadinghometimelineprocess.hpp \
-	logic/processes/loadmentionstimelineprocess.hpp \
-	logic/processes/posttweetprocess.hpp \
-	logic/processes/postviatwitlongerprocess.hpp \
-	logic/processes/retweetprocess.hpp \
-	logic/processes/processes.hpp \
-	logic/processes/processinfos.hpp \
-	logic/processes/processmanager.hpp \
-	logic/reyncore.hpp \
-	logic/controls/genericcontrol.hpp \
-	logic/controls/allowcontrol.hpp \
-	logic/controls/launchingcontrol.hpp \
-	logic/controls/logincontrol.hpp \
-	logic/controls/reyncontrol.hpp \
-	logic/controls/settingscontrol.hpp \
-	logic/controls/timelinecontrol.hpp \
-	logic/controls/tweetcontrol.hpp \
-	logic/controls/writetweetcontrol.hpp \
-	logic/controls/controls.hpp
-
-
-OTHER_FILES = \
-	conf/ReynTweets.conf \
-	conf/ReynTweetsEmpty.conf \
-	conf/ReynTweetsSettings.conf \
-	i18n/reyntweets_en.ts \
-	i18n/reyntweets_fr.ts \
-	resources/Logo Reyn Tweets.svg \
-	resources/Logo Reyn Tweets.png \
-	ui/qml/tools.js \
-	ui/qml/twitter-text-js-wrapper.js \
-	ui/qml/twitter-text-1.4.16.js \
-	Doxyfile.txt \
-	.bzrignore \
-	ReynTweets.rc
-
-
-#---------------------------------------#
-# Directories for mocs and object files #
-#---------------------------------------#
-
-MOC_DIR = mocs
-OBJECTS_DIR = obj
-
-
-#----------------------#
-# Icon for the program #
-#----------------------#
-win32 {
-	RC_FILE = ReynTweets.rc
-}
-
-# TODO : Linux, Symbian
-
-
-#--------------#
-# Translations #
-#--------------#
-
-TRANSLATIONS = reyntweets_en.ts reyntweets_fr.ts
-
-
-#-------------------------------------#
-# Extra targets - General definitions #
-#-------------------------------------#
-
-# SEPARATOR : Separator in path systems
-# RMDIR_CMD : Command to delete directories
-# RMFILE_CMD : Command to delete files
-# COPY_CMD : Command to copy files
-
-win32 {
-	# Leave an empty line because of the backslash at the end of the variable
-	SEPARATOR = \\
-
-	RMDIR_CMD = rd /s /q
-	RMFILE_CMD = del /s /q
-	COPY_CMD = copy /y
-}
-
-linux-g++ {
-	SEPARATOR = /
-	RMDIR_CMD = rm -rfv
-	RMFILE_CMD = rm -rfv
-	COPY_CMD = cp -v
-}
-
-
-#-----------------------#
-# Documentation targets #
-#-----------------------#
-
-win32 {
-	DOXYGEN_CMD = C:\\Program Files\\doxygen\\bin\\doxygen.exe
-}
-
-linux-g++ {
-    DOXYGEN_CMD = /usr/bin/doxygen
-}
-
-# Create doc
-doc.target = doc
-doc.commands = $${DOXYGEN_CMD} $${PWD}Doxyfile.txt
-
-# Clean doc
-cleandoc.target = cleandoc
-cleandoc.commands = $${RMDIR_CMD} ..$${SEPARATOR}doc$${SEPARATOR}html
-
-# Extra targets
-QMAKE_EXTRA_TARGETS += doc cleandoc
-
-
-#---------------------#
-# Translation targets #
-#---------------------#
-
-# Folder containing translations
-TR_FOLDER = $${PWD}i18n$${SEPARATOR}
-
-# lupdate
-LUPDATE_FR = lupdate -noobsolete $${PWD} -ts $${TR_FOLDER}reyntweets_fr.ts
-LUPDATE_EN = lupdate -noobsolete $${PWD} -ts $${TR_FOLDER}reyntweets_en.ts
-
-trupdate.target = trupdate
-win32 {
-	trupdate.commands = ($${LUPDATE_FR}) & ($${LUPDATE_EN})
-}
-linux-g++ {
-	trupdate.commands = $${LUPDATE_FR} ; $${LUPDATE_EN}
-}
-
-# lrelease
-LRELEASE_FR = lrelease $${TR_FOLDER}reyntweets_fr.ts
-LRELEASE_EN = lrelease $${TR_FOLDER}reyntweets_en.ts
-
-trrelease.target = trrelease
-win32 {
-	trrelease.commands = ($${LRELEASE_FR}) & ($${LRELEASE_EN})
-}
-linux-g++ {
-	trrelease.commands = $${LRELEASE_FR} ; $${LRELEASE_EN}
-}
-
-# Deploy .qm files in build directories
-trdeploy.target = trdeploy
-trdeploy.commands = $${COPY_CMD} $${TR_FOLDER}*.qm .
-
-# Delete .qm files
-trclean.target = trclean
-trclean.commands = $${RMFILE_CMD} $${TR_FOLDER}*.qm
-
-# Extra targets
-QMAKE_EXTRA_TARGETS += trupdate trrelease trdeploy trclean
-
-
-#------------------------#
-# Folders with QML files #
-#------------------------#
-
-# QML files
-qml_files.source = ui/qml
-qml_files.target = ui
-
-# Resources
-resource.source = resources
-resource.target = .
-
-# Configuration files
-# Uncomment this folder in DEPLOYMENTFOLDERS if you want the configuration to
-# be reset each time the application is launched
-conf_files.source = conf
-conf_files.target = .
-
-DEPLOYMENTFOLDERS = qml_files \
-	resource \
-	conf_files
-
-
-#-------#
-# QJSON #
-#-------#
-
-# QJSON (http://qjson.sourceforge.net/) is an open source parser for JSON
-# written in Qt (LGPLv2.1 license). It is compatible with Windows, Mac, Linux,
-# Symbian and MeeGo.
-# QJSON_PATH is the location of QJSON in the system.
-
-win32 {
-	QJSON_PATH = C:\\Libs\\qjson
-	LIB_QJSON = qjson0
-}
-
-linux-g++ {
-	QJSON_PATH = /home/ducher/Libs/qjson
-	LIB_QJSON = qjson
-}
-
-INCLUDEPATH += $${QJSON_PATH}$${SEPARATOR}include
-LIBS += -L$${QJSON_PATH}$${SEPARATOR}lib -l$${LIB_QJSON}
-
-symbian {
-#	QJSON_PATH = # TODO
-#	INCLUDEPATH += c:\Libs\Qjson\include
-#	LIBS += -Lc:\Libs\Qjson\lib -lqjson
-}
-
-
-#---------------------------#
-# Qt Components for Desktop #
-#---------------------------#
-
-# Qt Components for Desktop (http://qt.gitorious.org/qt-components/desktop)
-# is a library with QML Components for desktop. It is under LGPL license (v2.1).
-# QMLCOMP_DESKTOP_PATH is the location of Qt Components for Desktop in the system.
-
-win32 {
-#	QMLCOMP_DESKTOP_PATH = C:\\Libs\\QtComponentsForDesktop
-#	INCLUDEPATH += $${QMLCOMP_DESKTOP_PATH}\\include
-#	debug {
-#		LIBS += -L$${QMLCOMP_DESKTOP_PATH}\\build\\debug -lstyleplugin
-#	}
-#	release {
-#		LIBS += -L$${QMLCOMP_DESKTOP_PATH}\\build\\release -lstyleplugin
-#	}
-#
-}
-
-linux {
-#	QMLCOMP_DESKTOP_PATH = C:\\Libs\\QtComponentsForDesktop
-#	INCLUDEPATH += $${QMLCOMP_DESKTOP_PATH}\\include
-#	debug {
-#		LIBS += -L$${QMLCOMP_DESKTOP_PATH}\\build\\debug -lstyleplugin
-#	}
-#	release {
-#		LIBS += -L$${QMLCOMP_DESKTOP_PATH}\\build\\release -lstyleplugin
-#	}
-#
-}
-
-
-#-------------------------------#
-# Symbian special configuration #
-#-------------------------------#
-
-CONFIG += mobility
-MOBILITY =
-
-# Add dependency to Symbian components
-CONFIG += qt-components
-
-symbian {
-
-TARGET.UID3 = 0xE541D97B
-#TARGET.EPOCSTACKSIZE = 0x14000
-#TARGET.EPOCHEAPSIZE = 0x020000 0x800000
-
-# Allow network access on Symbian
-TARGET.CAPABILITY += NetworkServices
-
-# Smart Installer package's UID
-# This UID is from the protected range and therefore the package will
-# fail to install if self-signed. By default qmake uses the unprotected
-# range value if unprotected UID is defined for the application and
-# 0x2002CCCF value if protected UID is given to the application
-#DEPLOYMENT.installer_header = 0x2002CCCF
-
-}
-
-
-#--------------#
-# Miscanellous #
-#--------------#
-
-# Additional import path used to resolve QML modules in Creator's code model
-QML_IMPORT_PATH =
-
-# If your application uses the Qt Mobility libraries, uncomment the following
-# lines and add the respective components to the MOBILITY variable.
-# CONFIG += mobility
-# MOBILITY +=
-
-# Speed up launching on MeeGo/Harmattan when using applauncherd daemon
-# CONFIG += qdeclarative-boostable
-
-# Please do not modify the following two lines. Required for deployment.
-include(ui/qmlapplicationviewer.pri)
-qtcAddDeployment()
+#-----------------------------------#
+# ReynTweets.pro                    #
+# Reyn Tweets' Qt .pro project file #
+# Auteur : Romain Ducher            #
+#-----------------------------------#
+
+#-----------------------------------------------------------------------------#
+#                                                                             #
+# Copyright 2011 Romain Ducher                                                #
+#                                                                             #
+# This file is part of Reyn Tweets.                                           #
+#                                                                             #
+# Reyn Tweets is free software: you can redistribute it and/or modify         #
+# it under the terms of the GNU Lesser General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# Reyn Tweets is distributed in the hope that it will be useful,              #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                #
+# GNU Lesser General Public License for more details.                         #
+#                                                                             #
+# You should have received a copy of the GNU Lesser General Public License    #
+# along with Reyn Tweets. If not, see <http://www.gnu.org/licenses/>.         #
+#                                                                             #
+#-----------------------------------------------------------------------------#
+
+#-------------------------------------------------------------#
+# This file was known as ReynTweets.pri between r232 and r355 #
+#-------------------------------------------------------------#
+
+
+#----------------------#
+# Common configuration #
+#----------------------#
+
+QT += core gui network webkitwidgets declarative xml
+
+TARGET = ReynTweets
+TEMPLATE = app
+
+
+#--------------#
+# Source files #
+#--------------#
+
+# connection (libRT)
+include(connection/libRT.pri)
+
+# logic
+include(logic/logic.pri)
+
+# UI (with the QML Application Viewer)
+include(ui/reyntweetsui.pri)
+
+SOURCES += \
+	main.cpp
+
+HEADERS  += \
+
+OTHER_FILES = \
+	.bzrignore \
+	connection/libRT.pri \
+	logic/logic.pri \
+	ui/reyntweetsui.pri \
+	conf/configuration.pri \
+	doc/documentation.pri \
+	i18n/translation.pri \
+	resources/resources.pri
+
+#---------------------------------------#
+# Directories for mocs and object files #
+#---------------------------------------#
+
+MOC_DIR = mocs
+OBJECTS_DIR = obj
+
+
+#-------------------------------------#
+# Extra targets - General definitions #
+#-------------------------------------#
+
+# RMDIR_CMD : Command to delete directories
+# RMFILE_CMD : Command to delete files
+# COPY_CMD : Command to copy files
+
+win32 {
+	RMDIR_CMD = rd /s /q
+	RMFILE_CMD = del /s /q
+	COPY_CMD = copy /y
+}
+
+linux-g++ {
+	RMDIR_CMD = rm -rfv
+	RMFILE_CMD = rm -rfv
+	COPY_CMD = cp -v
+}
+
+
+#--------------------------#
+# Non coding project parts #
+#--------------------------#
+
+# Configuration files
+include(conf/configuration.pri)
+
+# Documentation targets
+include(doc/documentation.pri)
+
+# Translations targets
+include(i18n/translation.pri)
+
+# (Graphical) resources
+include(resources/resources.pri)
+
+
+#---------------------------#
+# Qt Components for Desktop #
+#---------------------------#
+
+# Qt Components for Desktop (http://qt.gitorious.org/qt-components/desktop)
+# is a library with QML Components for desktop. It is under LGPL license (v2.1).
+# QMLCOMP_DESKTOP_PATH is the location of Qt Components for Desktop in the system.
+
+win32 {
+#	QMLCOMP_DESKTOP_PATH = C:\\Libs\\QtComponentsForDesktop
+#	INCLUDEPATH += $${QMLCOMP_DESKTOP_PATH}\\include
+#	debug {
+#		LIBS += -L$${QMLCOMP_DESKTOP_PATH}\\build\\debug -lstyleplugin
+#	}
+#	release {
+#		LIBS += -L$${QMLCOMP_DESKTOP_PATH}\\build\\release -lstyleplugin
+#	}
+#
+}
+
+linux {
+#	QMLCOMP_DESKTOP_PATH = C:\\Libs\\QtComponentsForDesktop
+#	INCLUDEPATH += $${QMLCOMP_DESKTOP_PATH}\\include
+#	debug {
+#		LIBS += -L$${QMLCOMP_DESKTOP_PATH}\\build\\debug -lstyleplugin
+#	}
+#	release {
+#		LIBS += -L$${QMLCOMP_DESKTOP_PATH}\\build\\release -lstyleplugin
+#	}
+#
+}
+
+
+#--------------#
+# Miscanellous #
+#--------------#
+
+# If your application uses the Qt Mobility libraries, uncomment the following
+# lines and add the respective components to the MOBILITY variable.
+# CONFIG += mobility
+# MOBILITY +=
+
+# Required for deployment. DO NOT MODIFY.
+qtcAddDeployment()

=== modified file 'conf/ReynTweets.conf'
Binary files conf/ReynTweets.conf	2012-05-23 23:43:29 +0000 and conf/ReynTweets.conf	2013-08-20 00:10:09 +0000 differ
=== modified file 'conf/ReynTweetsEmpty.conf'
Binary files conf/ReynTweetsEmpty.conf	2012-05-23 23:43:29 +0000 and conf/ReynTweetsEmpty.conf	2013-08-20 00:10:09 +0000 differ
=== modified file 'conf/ReynTweetsSettings.conf'
--- conf/ReynTweetsSettings.conf	2013-02-15 23:18:12 +0000
+++ conf/ReynTweetsSettings.conf	2013-08-20 00:10:09 +0000
@@ -1,1 +1,1 @@
-{ "callback_url" : "http://twitter.com", "consumer_key" : "V1VsVU16RkZOR0U0TjI5Q1ZGZHFlVVJsVW5jPQ==", "consumer_secret" : "ZHprM2VuVjBVRXBuTmtaNmRGWmxlVE5YTmtWaWNHNTJOMHgyTVdadE5FVlVXR3BzYnpaRmVWUXc=", "pocket_api_key" : "WkdrMFZEQlBNVEpuTVRSaE1YQTBOekZtWkRCYVZ6bDRPV0Z3T0VWaE16ST0=", "twitlonger_api_key" : "VVV0WmMwNTBNMmhOYjI1VFozVnVSQT09", "twitlonger_application_name" : "reyntweets" }
+{ "callback_url" : "http://twitter.com", "consumer_key" : "WUlUMzFFNGE4N29CVFdqeURlUnc=", "consumer_secret" : "dzk3enV0UEpnNkZ6dFZleTNXNkVicG52N0x2MWZtNEVUWGpsbzZFeVQw", "pocket_api_key" : "WkdrMFZEQlBNVEpuTVRSaE1YQTBOekZtWkRCYVZ6bDRPV0Z3T0VWaE16ST0=", "twitlonger_api_key" : "UUtZc050M2hNb25TZ3VuRA==", "twitlonger_application_name" : "reyntweets", "data_dir" : { "windows" : "/AppData/Roaming/reyn-tweets", "linux" : "/.config/reyn-tweets" } }

=== added file 'conf/configuration.pri'
--- conf/configuration.pri	1970-01-01 00:00:00 +0000
+++ conf/configuration.pri	2013-08-20 00:10:09 +0000
@@ -0,0 +1,42 @@
+#-----------------------------------------#
+# configuration.pri                       #
+# .pri sub project file for configuration #
+# Author : Romain Ducher                  #
+#-----------------------------------------#
+
+#-----------------------------------------------------------------------------#
+#                                                                             #
+# Copyright 2013 Romain Ducher                                                #
+#                                                                             #
+# This file is part of Reyn Tweets.                                           #
+#                                                                             #
+# Reyn Tweets is free software: you can redistribute it and/or modify         #
+# it under the terms of the GNU Lesser General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# Reyn Tweets is distributed in the hope that it will be useful,              #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                #
+# GNU Lesser General Public License for more details.                         #
+#                                                                             #
+# You should have received a copy of the GNU Lesser General Public License    #
+# along with Reyn Tweets. If not, see <http://www.gnu.org/licenses/>.         #
+#                                                                             #
+#-----------------------------------------------------------------------------#
+
+OTHER_FILES = \
+	conf/ReynTweets.conf \
+	conf/ReynTweetsEmpty.conf \
+	conf/ReynTweetsSettings.conf
+
+
+#-------------------------------#
+# Deploying configuration files #
+#-------------------------------#
+# Uncomment this folder in DEPLOYMENTFOLDERS if you want the configuration to
+# be reset each time the application is launched
+conf_files.source = conf
+conf_files.target = .
+
+DEPLOYMENTFOLDERS += conf_files

=== removed directory 'connection/calls'
=== added directory 'connection/common'
=== added directory 'connection/common/authenticators'
=== added file 'connection/common/authenticators/apikeyauthenticator.cpp'
--- connection/common/authenticators/apikeyauthenticator.cpp	1970-01-01 00:00:00 +0000
+++ connection/common/authenticators/apikeyauthenticator.cpp	2013-08-20 00:10:09 +0000
@@ -0,0 +1,43 @@
+/// @file apikeyauthenticator.cpp
+/// @brief Implementation of APIKeyAuthenticator
+/// @author Romain Ducher
+///
+/// @section LICENSE
+///
+/// Copyright 2013 Romain Ducher
+///
+/// This file is part of Reyn Tweets.
+///
+/// Reyn Tweets is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU Lesser General Public License as published by
+/// the Free Software Foundation, either version 3 of the License, or
+/// (at your option) any later version.
+///
+/// Reyn Tweets is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+/// GNU Lesser General Public License for more details.
+///
+/// You should have received a copy of the GNU Lesser General Public License
+/// along with Reyn Tweets. If not, see <http://www.gnu.org/licenses/>.
+
+#include "apikeyauthenticator.hpp"
+#include "../utils/librtconstants.hpp"
+
+// Constructor
+APIKeyAuthenticator::APIKeyAuthenticator():
+	apiKey(LibRT::FAKE_TOKEN)
+{}
+
+// Destructor
+APIKeyAuthenticator::~APIKeyAuthenticator() {}
+
+// Getting the API Key
+QByteArray APIKeyAuthenticator::getAPIKey() {
+	return apiKey;
+}
+
+// Setting the API Key
+void APIKeyAuthenticator::setAPIKey(QByteArray newAPIKey) {
+	apiKey = newAPIKey;
+}

=== added file 'connection/common/authenticators/apikeyauthenticator.hpp'
--- connection/common/authenticators/apikeyauthenticator.hpp	1970-01-01 00:00:00 +0000
+++ connection/common/authenticators/apikeyauthenticator.hpp	2013-08-20 00:10:09 +0000
@@ -0,0 +1,57 @@
+/// @file apikeyauthenticator.hpp
+/// @brief Header of APIKeyAuthenticator
+/// @author Romain Ducher
+///
+/// @section LICENSE
+///
+/// Copyright 2013 Romain Ducher
+///
+/// This file is part of Reyn Tweets.
+///
+/// Reyn Tweets is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU Lesser General Public License as published by
+/// the Free Software Foundation, either version 3 of the License, or
+/// (at your option) any later version.
+///
+/// Reyn Tweets is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+/// GNU Lesser General Public License for more details.
+///
+/// You should have received a copy of the GNU Lesser General Public License
+/// along with Reyn Tweets. If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef APIKEYAUTHENTICATOR_HPP
+#define APIKEYAUTHENTICATOR_HPP
+
+#include <QByteArray>
+
+/// @class APIKeyAuthenticator
+/// @brief Base class for Authentication managers with needs a simple API key.
+class APIKeyAuthenticator
+{
+	public:
+		/// @fn APIKeyAuthenticator();
+		/// @brief Constructor
+		APIKeyAuthenticator();
+
+		/// @fn ~APIKeyAuthenticator();
+		/// @brief Destructor
+		~APIKeyAuthenticator();
+
+		/// @fn QByteArray getAPIKey();
+		/// @brief Getting the API key
+		/// @return apiKey
+		QByteArray getAPIKey();
+
+		/// @fn void setAPIKey(QByteArray newAPIKey);
+		/// @brief Setting the API key
+		/// @param newAPIKey New value for apiKey
+		void setAPIKey(QByteArray newAPIKey);
+
+	protected:
+		/// @brief API Key of the application on TwitLonger
+		QByteArray apiKey;
+};
+
+#endif // APIKEYAUTHENTICATOR_HPP

=== added file 'connection/common/authenticators/basicauthenticators.hpp'
--- connection/common/authenticators/basicauthenticators.hpp	1970-01-01 00:00:00 +0000
+++ connection/common/authenticators/basicauthenticators.hpp	2013-08-20 00:10:09 +0000
@@ -0,0 +1,47 @@
+/// @file basicauthenticators.hpp
+/// @brief Typedefs of BasicAuthenticator and TokenPair
+/// @author Romain Ducher
+///
+/// @section LICENSE
+///
+/// Copyright 2013 Romain Ducher
+///
+/// This file is part of Reyn Tweets.
+///
+/// Reyn Tweets is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU Lesser General Public License as published by
+/// the Free Software Foundation, either version 3 of the License, or
+/// (at your option) any later version.
+///
+/// Reyn Tweets is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+/// GNU Lesser General Public License for more details.
+///
+/// You should have received a copy of the GNU Lesser General Public License
+/// along with Reyn Tweets. If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef BASICAUTHENTICATORS_HPP
+#define BASICAUTHENTICATORS_HPP
+
+#include <QByteArray>
+#include <QPair>
+#include <QString>
+
+/// @typedef QPair <QString, QByteArray> BasicAuthenticator;
+/// @brief QPair for classic authentications with a login and a pasword :<ul>
+/// <li>first : the login.</li>
+/// <li>secret : the password.</li></ul>
+/// @see TokenPair
+typedef QPair<QString, QByteArray> BasicAuthenticator;
+
+/// @typedef QPair<QByteArray, QByteArray> TokenPair;
+/// @brief A token pair.
+///
+/// A token pair is a QPair whose field are:<ul>
+/// <li>first : the public key (token).</li>
+/// <li>secret : the private key (secret).</li>
+/// </ul>
+typedef QPair<QByteArray, QByteArray> TokenPair;
+
+#endif // BASICAUTHENTICATORS_HPP

=== added directory 'connection/common/authenticators/oauth'
=== added file 'connection/common/authenticators/oauth/oauth10aauthenticator.cpp'
--- connection/common/authenticators/oauth/oauth10aauthenticator.cpp	1970-01-01 00:00:00 +0000
+++ connection/common/authenticators/oauth/oauth10aauthenticator.cpp	2013-08-20 00:10:09 +0000
@@ -0,0 +1,300 @@
+/// @file oauth10aauthenticator.cpp
+/// @brief Implementation of OAuth10aAuthenticator
+/// @author Romain Ducher
+///
+/// @section LICENSE
+///
+/// Copyright 2013 Romain Ducher
+///
+/// This file is part of Reyn Tweets.
+///
+/// Reyn Tweets is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU Lesser General Public License as published by
+/// the Free Software Foundation, either version 3 of the License, or
+/// (at your option) any later version.
+///
+/// Reyn Tweets is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+/// GNU Lesser General Public License for more details.
+///
+/// You should have received a copy of the GNU Lesser General Public License
+/// along with Reyn Tweets. If not, see <http://www.gnu.org/licenses/>.
+
+#include "oauth10aauthenticator.hpp"
+
+#include <QUrl>
+#include "oauthutils.hpp"
+#include "../../utils/connectionutils.hpp"
+#include "../../utils/librtconstants.hpp"
+
+// Constructor
+OAuth10aAuthenticator::OAuth10aAuthenticator(QString signatureAlgorithm) :
+	OAuthAuthenticator("1.0"),
+	callbackUrl(LibRT::FAKE_URL),
+	oauthTokens(),
+	oauthSignatureMethod(signatureAlgorithm),
+	oauthVerifier(LibRT::FAKE_TOKEN)
+{}
+
+// Destructor
+OAuth10aAuthenticator::~OAuth10aAuthenticator() {}
+
+
+/////////////////////
+// Getters on data //
+/////////////////////
+
+// Callback URL
+QString OAuth10aAuthenticator::getCallbackUrl() {
+	return callbackUrl;
+}
+
+void OAuth10aAuthenticator::setCallbackUrl(QString newURL) {
+	callbackUrl = newURL;
+}
+
+// OAuth Token
+QByteArray OAuth10aAuthenticator::getOAuthToken() {
+	return oauthTokens.first;
+}
+
+void OAuth10aAuthenticator::setOAuthToken(QByteArray authToken) {
+	oauthTokens.first = authToken;
+}
+
+// OAuth secret
+void OAuth10aAuthenticator::setOAuthSecret(QByteArray authSecret) {
+	oauthTokens.second = authSecret;
+}
+
+// OAuth verifier
+QByteArray OAuth10aAuthenticator::getVerifier() {
+	return oauthVerifier;
+}
+
+void OAuth10aAuthenticator::setVerifier(QByteArray verifier) {
+	oauthVerifier = verifier;
+}
+
+////////////////////////////
+// Utilities for requests //
+////////////////////////////
+
+// Resetting tokens
+void OAuth10aAuthenticator::resetTokens() {
+	oauthTokens.first = LibRT::FAKE_TOKEN;
+	oauthTokens.second = LibRT::FAKE_TOKEN;
+	oauthVerifier = LibRT::FAKE_TOKEN;
+}
+
+// Getting the "Authorization" header
+QByteArray OAuth10aAuthenticator::getAuthorizationHeader(LibRT::HTTPRequestType type,
+														 QString baseURL,
+														 ArgsMap getDatas,
+														 ArgsMap postDatas,
+														 bool oauthTokenNeeded,
+														 bool callbackUrlNeeded,
+														 bool oauthVerifierNeeded)
+{
+	QString authorizationHeader = "OAuth ";
+	QString nonce = generateNonce();
+	QString timestamp = generateTimestamp();
+	QByteArray signature = signDatas(type,
+								  baseURL,
+								  getDatas,
+								  postDatas,
+								  nonce,
+								  timestamp,
+								  oauthTokenNeeded,
+								  callbackUrlNeeded,
+								  oauthVerifierNeeded);
+
+	// Building the string with all the parameters
+	QString oauthString = buildOAuthParameterString(nonce,
+													timestamp,
+													", ",
+													oauthTokenNeeded,
+													callbackUrlNeeded,
+													oauthVerifierNeeded,
+													true,
+													true,
+													signature);
+	authorizationHeader.append(oauthString);
+
+	return authorizationHeader.toLatin1();
+}
+
+// Signing datas
+QByteArray OAuth10aAuthenticator::signDatas(LibRT::HTTPRequestType type,
+											QString baseURL,
+											ArgsMap getDatas,
+											ArgsMap postDatas,
+											QString nonce,
+											QString timestamp,
+											bool oauthTokenNeeded,
+											bool callbackUrlNeeded,
+											bool oauthVerifierNeeded)
+{
+	// Building the key
+	QByteArray key = "";
+
+	key.append(QUrl::toPercentEncoding(QString::fromLatin1(consumerTokens.second)));
+	key.append('&');
+	key.append(QUrl::toPercentEncoding(QString::fromLatin1(oauthTokens.second)));
+
+
+	// Building that will be signed
+
+	// OAuth parameters
+	QString oauthString = this->buildOAuthParameterString(nonce,
+														  timestamp,
+														  "&",
+														  oauthTokenNeeded,
+														  callbackUrlNeeded,
+														  oauthVerifierNeeded,
+														  false,
+														  false);
+
+	QString parameterString = this->buildSignatureBaseString(getDatas,
+															 postDatas,
+															 oauthString);
+
+	// Building the base String
+	QByteArray toSign = "";
+
+	toSign.append(requestTypeToString(type).toLatin1());
+	toSign.append('&');
+	toSign.append(QUrl::toPercentEncoding(baseURL));
+	toSign.append('&');
+	toSign.append(QUrl::toPercentEncoding(parameterString));
+
+	return hmacSha1(key, toSign);
+}
+
+// Generic method to build strings with OAuth parameters.
+QString OAuth10aAuthenticator::buildOAuthParameterString(QString nonce,
+														 QString timestamp,
+														 QString separator,
+														 bool oauthTokenNeeded,
+														 bool callbackUrlNeeded,
+														 bool oauthVerifierNeeded,
+														 bool putDoubleQuotes,
+														 bool signatureNeeded,
+														 QByteArray signature)
+{
+	QString oauthParamString = "";		// Final string
+	QString formattedParamString = "";	// Temporary string containg a formatted parameter
+
+	// oauth_callback
+	if (callbackUrlNeeded) {
+		formattedParamString = formatParam("oauth_callback",
+										   callbackUrl,
+										   putDoubleQuotes);
+		oauthParamString.append(formattedParamString);
+		oauthParamString.append(separator);
+	}
+
+	// oauth_consumer_key
+	formattedParamString = formatParam("oauth_consumer_key",
+									   QString::fromLatin1(consumerTokens.first),
+									   putDoubleQuotes);
+	oauthParamString.append(formattedParamString);
+	oauthParamString.append(separator);
+
+	// oauth_nonce
+	formattedParamString = formatParam("oauth_nonce",
+									   nonce,
+									   putDoubleQuotes);
+	oauthParamString.append(formattedParamString);
+	oauthParamString.append(separator);
+
+	// oauth_signature
+	if (signatureNeeded) {
+		formattedParamString = formatParam("oauth_signature",
+										   QString::fromLatin1(signature),
+										   putDoubleQuotes);
+		oauthParamString.append(formattedParamString);
+		oauthParamString.append(separator);
+	}
+
+	// oauth_signature_method
+	formattedParamString = formatParam("oauth_signature_method",
+									   oauthSignatureMethod,
+									   putDoubleQuotes);
+	oauthParamString.append(formattedParamString);
+	oauthParamString.append(separator);
+
+	// oauth_timestamp
+	formattedParamString = formatParam("oauth_timestamp",
+									   timestamp,
+									   putDoubleQuotes);
+	oauthParamString.append(formattedParamString);
+	oauthParamString.append(separator);
+
+	// oauth_token
+	if (oauthTokenNeeded) {
+		formattedParamString = formatParam("oauth_token",
+										   QString::fromLatin1(oauthTokens.first),
+										   putDoubleQuotes);
+		oauthParamString.append(formattedParamString);
+		oauthParamString.append(separator);
+	}
+
+	// oauth_verifier
+	if (oauthVerifierNeeded) {
+		formattedParamString = formatParam("oauth_verifier",
+										   QString::fromLatin1(oauthVerifier),
+										   putDoubleQuotes);
+		oauthParamString.append(formattedParamString);
+		oauthParamString.append(separator);
+	}
+
+	// oauth_version
+	formattedParamString = formatParam("oauth_version",
+									   oauthVersion,
+									   putDoubleQuotes);
+	oauthParamString.append(formattedParamString);
+
+	return oauthParamString;
+}
+
+// Method builing the base string for the OAuth Signature.
+QString OAuth10aAuthenticator::buildSignatureBaseString(ArgsMap getDatas,
+														ArgsMap postDatas,
+														QString oauthString)
+{
+	QString oauthKey = "oauth_*";
+
+	// Building a big ArgsMap with all the parameters
+	ArgsMap allParametersMap;
+	allParametersMap.unite(getDatas);
+	allParametersMap.unite(postDatas);
+	allParametersMap.insert(oauthKey, oauthString);
+
+	// Sorting the keys in the alphabetical order
+	QStringList allKeys(allParametersMap.keys());
+	allKeys.sort();
+
+	// Building the string
+	QString signatureBaseString = "";
+
+	for (QStringList::iterator it = allKeys.begin();
+		 it != allKeys.end();
+		 ++it)
+	{
+		QString paramName = *it;
+		QString paramValue = allParametersMap.value(paramName);
+		QString formattedParam = (paramName == oauthKey) ?
+					paramValue	// All the OAuth parameters already treated
+				  : formatParam(paramName, paramValue);
+
+		signatureBaseString.append(formattedParam);
+		signatureBaseString.append('&');
+	}
+
+	// Erasing the last '&'
+	signatureBaseString.chop(1);
+
+	return signatureBaseString;
+}

=== added file 'connection/common/authenticators/oauth/oauth10aauthenticator.hpp'
--- connection/common/authenticators/oauth/oauth10aauthenticator.hpp	1970-01-01 00:00:00 +0000
+++ connection/common/authenticators/oauth/oauth10aauthenticator.hpp	2013-08-20 00:10:09 +0000
@@ -0,0 +1,237 @@
+/// @file oauth10aauthenticator.hpp
+/// @brief Header of OAuth10aAuthenticator
+/// @author Romain Ducher
+///
+/// @section LICENSE
+///
+/// Copyright 2013 Romain Ducher
+///
+/// This file is part of Reyn Tweets.
+///
+/// Reyn Tweets is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU Lesser General Public License as published by
+/// the Free Software Foundation, either version 3 of the License, or
+/// (at your option) any later version.
+///
+/// Reyn Tweets is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+/// GNU Lesser General Public License for more details.
+///
+/// You should have received a copy of the GNU Lesser General Public License
+/// along with Reyn Tweets. If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef OAUTH10AAUTHENTICATOR_HPP
+#define OAUTH10AAUTHENTICATOR_HPP
+
+#include <QByteArray>
+#include <QMap>
+#include <QString>
+#include "oauthauthenticator.hpp"
+#include "../../httprequesttype.hpp"
+#include "../../headersmap.hpp"
+
+/// @class OAuth10aAuthenticator
+/// @brief Authenticator for stuff related to OAuth 1.0a.
+class OAuth10aAuthenticator : public virtual OAuthAuthenticator
+{
+	public:
+		/// @fn OAuth10aAuthenticator(QString signatureAlgorithm = "SHA-1");
+		/// @brief Constructor.
+		///
+		/// Application settings (callback URL, oauth credentials) will be
+		/// filled later.
+		/// @param signatureAlgorithm Algorithm used for signing requests.
+		OAuth10aAuthenticator(QString signatureAlgorithm = "HMAC-SHA1");
+
+		/// @fn virtual ~OAuth10aAuthenticator();
+		/// @brief Destructor
+		virtual ~OAuth10aAuthenticator();
+
+
+		/////////////////////
+		// Getters on data //
+		/////////////////////
+
+		/// @fn QString getCallbackUrl();
+		/// @brief Getter for callbackUrl
+		/// @return The callback URL
+		QString getCallbackUrl();
+
+		/// @fn void setCallbackUrl(QString newURL);
+		/// @brief Setter for callbackUrl
+		/// @param newURL New value for the callback URL
+		void setCallbackUrl(QString newURL);
+
+		/// @fn QByteArray getOAuthToken();
+		/// @brief Getting the OAuth Token
+		/// @return The OAuth Token
+		QByteArray getOAuthToken();
+
+		/// @fn void setOAuthToken(QByteArray authToken);
+		/// @brief Setter on the OAuth token
+		/// @param authToken The new value of the OAuth token
+		void setOAuthToken(QByteArray authToken);
+
+		/// @fn void setOAuthSecret(QByteArray oauthSecret);
+		/// @brief Setter on the OAuth secret
+		/// @param oauthSecret The new value of the OAuth secret
+		void setOAuthSecret(QByteArray authSecret);
+
+		/// @fn QByteArray getVerifier();
+		/// @brief Getter on the verifier
+		/// @return The verifier
+		QByteArray getVerifier();
+
+		/// @fn void setVerifier(QByteArray verifier);
+		/// @brief Setter on the verifier
+		/// @param verifier The new verifier
+		void setVerifier(QByteArray verifier);
+
+		////////////////////////////
+		// Utilities for requests //
+		////////////////////////////
+
+		/// @fn QByteArray getAuthorizationHeader(Network::HTTPRequestType type,
+		///										  QString baseURL,
+		///										  ArgsMap getDatas,
+		///										  ArgsMap postDatas,
+		///										  bool oauthTokenNeeded = true,
+		///										  bool callbackUrlNeeded = false,
+		///										  bool oauthVerifierNeeded = false);
+		/// @brief Getting that will be written in the "Authorization" field
+		/// of requests
+		/// @param type Request type (GET or POST)
+		/// @param baseURL URL for the request
+		/// @param getDatas GET arguments of the request
+		/// @param postDatas POST arguments of the request
+		/// @param oauthTokenNeeded Boolean indicating whether
+		/// the oauth_token is required for the header.
+		/// @param callbackUrlNeeded Boolean indicating whether
+		/// the oauth_callback is required for the header.
+		/// @param oauthVerifierNeeded Boolean indicating whether
+		/// the oauth_verifier is required for the header.
+		/// @return Value of the "Authorization" header.
+		QByteArray getAuthorizationHeader(LibRT::HTTPRequestType type,
+										  QString baseURL,
+										  ArgsMap getDatas,
+										  ArgsMap postDatas,
+										  bool oauthTokenNeeded = true,
+										  bool callbackUrlNeeded = false,
+										  bool oauthVerifierNeeded = false);
+
+		/// @fn void resetTokens();
+		/// @brief Resetting the tokens. A full new OAuth authentication process
+		/// has to be launch to get tokens and for authentication in requests
+		void resetTokens();
+
+
+	protected:
+		/// @brief Callback URL of the application
+		QString callbackUrl;
+
+		/// @brief Access tokens
+		TokenPair oauthTokens;
+
+		/// @brief Algorithm used for signing requests
+		QString oauthSignatureMethod;
+
+		/// @brief Verifier for authentication
+		QByteArray oauthVerifier;
+
+		/// @fn QByteArray signDatas(Network::RequestType type,
+		///							 QString baseURL,
+		///							 ArgsMap getDatas,
+		///							 ArgsMap postDatas,
+		///							 QString nonce,
+		///							 QString timestamp,
+		///							 bool oauthTokenNeeded = true,
+		///							 bool callbackUrlNeeded = false,
+		///							 bool oauthVerifierNeeded = false);
+		/// @brief Method for signing datas. It is described
+		/// <a href="https://dev.twitter.com/docs/auth/creating-signature">here
+		/// </a>.
+		/// @param type Request type (GET or POST)
+		/// @param baseURL URL of the service, without the GET arguments.
+		/// @param getDatas GET datas to sign
+		/// @param postDatas POST datas to sign
+		/// @param nonce Nonce of the request
+		/// @param timestamp Timestamp of the request
+		/// @param oauthTokenNeeded Boolean indicating whether
+		/// the oauth_token is required.
+		/// @param callbackUrlNeeded Boolean indicating whether
+		/// the oauth_callback is required.
+		/// @param oauthVerifierNeeded Boolean indicating whether
+		/// the oauth_verifier is required.
+		/// @return The signature of the given datas
+		QByteArray signDatas(LibRT::HTTPRequestType type,
+							 QString baseURL,
+							 ArgsMap getDatas,
+							 ArgsMap postDatas,
+							 QString nonce,
+							 QString timestamp,
+							 bool oauthTokenNeeded = true,
+							 bool callbackUrlNeeded = false,
+							 bool oauthVerifierNeeded = false);
+
+		/// @fn QString buildOAuthParameterString(QString nonce,
+		///										  QString timestamp,
+		///										  QString separator,
+		///										  bool oauthTokenNeeded,
+		///										  bool callbackUrlNeeded,
+		///										  bool oauthVerifierNeeded,
+		///										  bool putDoubleQuotes,
+		///										  bool signatureNeeded,
+		///										  QByteArray signature = "");
+		/// @brief Generic method to build strings with OAuth parameters.
+		///
+		/// It is used for the signature (string with the OAuth parameters) and
+		/// for the Authorization Header
+		/// @param nonce Nonce of the request
+		/// @param timestamp Timestamp of the request
+		/// @param separator Separator between parameters
+		/// @param oauthTokenNeeded Boolean indicating whether
+		/// the oauth_token is required.
+		/// @param callbackUrlNeeded Boolean indicating whether
+		/// the oauth_callback is required.
+		/// @param oauthVerifierNeeded Boolean indicating whether
+		/// the oauth_verifier is required.
+		/// @param putDoubleQuotes Boolean indicating if double quotes have to
+		/// surround the percent encoded value.
+		/// @param signatureNeeded Boolean indicating that the signature of
+		/// the request is required.
+		/// @param signature Signature of the request, if needed.
+		/// @return The string with the parameters.
+		QString buildOAuthParameterString(QString nonce,
+										  QString timestamp,
+										  QString separator,
+										  bool oauthTokenNeeded,
+										  bool callbackUrlNeeded,
+										  bool oauthVerifierNeeded,
+										  bool putDoubleQuotes,
+										  bool signatureNeeded,
+										  QByteArray signature = "");
+
+		/// @fn QString buildSignatureBaseString(ArgsMap getDatas,
+		///										 ArgsMap postDatas,
+		///										 QString oauthString);
+		/// @brief Method builing the base string for the OAuth Signature.
+		/// @param getDatas GET datas of the request
+		/// @param postDatas POST datas of the request
+		/// @param oauthString String with the OAuth parameters.
+		///
+		/// At a certain point of the algorithm, all the parameters have to be
+		/// sorted lexicographically with their name. All the OAuth parameters
+		/// are named "&lt;oauth_something&gt;" and likely to be one after
+		/// another after sorting the parameters. That's why they are all
+		/// put into a "oauthString" parameter which will be inserted
+		/// at the right place.
+		/// @return The string built just like Twitter describes
+		/// <a href="https://dev.twitter.com/docs/auth/creating-signature">
+		/// here</a>.
+		QString buildSignatureBaseString(ArgsMap getDatas,
+										 ArgsMap postDatas,
+										 QString oauthString);
+};
+
+#endif // OAUTH10AAUTHENTICATOR_HPP

=== added file 'connection/common/authenticators/oauth/oauth2authenticator.cpp'
--- connection/common/authenticators/oauth/oauth2authenticator.cpp	1970-01-01 00:00:00 +0000
+++ connection/common/authenticators/oauth/oauth2authenticator.cpp	2013-08-20 00:10:09 +0000
@@ -0,0 +1,75 @@
+/// @file oauth2authenticator.cpp
+/// @brief Implementation of OAuth2Authenticator
+/// @author Romain Ducher
+///
+/// @section LICENSE
+///
+/// Copyright 2013 Romain Ducher
+///
+/// This file is part of Reyn Tweets.
+///
+/// Reyn Tweets is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU Lesser General Public License as published by
+/// the Free Software Foundation, either version 3 of the License, or
+/// (at your option) any later version.
+///
+/// Reyn Tweets is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+/// GNU Lesser General Public License for more details.
+///
+/// You should have received a copy of the GNU Lesser General Public License
+/// along with Reyn Tweets. If not, see <http://www.gnu.org/licenses/>.
+
+#include "oauth2authenticator.hpp"
+
+#include <QUrl>
+#include "../../utils/librtconstants.hpp"
+
+// Constructor
+OAuth2Authenticator::OAuth2Authenticator() :
+	OAuthAuthenticator("2.0"),
+	bearerToken(LibRT::FAKE_TOKEN)
+{}
+
+// Destructor
+OAuth2Authenticator::~OAuth2Authenticator() {}
+
+/////////////////////////////
+// Bearer token management //
+/////////////////////////////
+
+void OAuth2Authenticator::setBearerToken(QByteArray newBearer) {
+	bearerToken = newBearer;
+}
+
+void OAuth2Authenticator::resetTokens() {
+	bearerToken = LibRT::FAKE_TOKEN;
+}
+
+
+///////////////////////////////////////
+// OAuth 2 Authentication management //
+///////////////////////////////////////
+
+QByteArray OAuth2Authenticator::getBasicHeader() {
+	QByteArray bearerCredentials = "";
+
+	bearerCredentials.append(QUrl::toPercentEncoding(consumerTokens.first))
+			.append(':')
+			.append(QUrl::toPercentEncoding(consumerTokens.second));
+
+	QByteArray basicHeader = "Basic ";
+
+	basicHeader.append(bearerCredentials.toBase64());
+
+	return basicHeader;
+}
+
+QByteArray OAuth2Authenticator::getBearerHeader() {
+	QByteArray bearerHeader = "Bearer ";
+
+	bearerHeader.append(bearerToken.toBase64());
+
+	return bearerHeader;
+}

=== added file 'connection/common/authenticators/oauth/oauth2authenticator.hpp'
--- connection/common/authenticators/oauth/oauth2authenticator.hpp	1970-01-01 00:00:00 +0000
+++ connection/common/authenticators/oauth/oauth2authenticator.hpp	2013-08-20 00:10:09 +0000
@@ -0,0 +1,68 @@
+/// @file oauth2authenticator.hpp
+/// @brief Header of OAuth2Authenticator
+/// @author Romain Ducher
+///
+/// @section LICENSE
+///
+/// Copyright 2013 Romain Ducher
+///
+/// This file is part of Reyn Tweets.
+///
+/// Reyn Tweets is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU Lesser General Public License as published by
+/// the Free Software Foundation, either version 3 of the License, or
+/// (at your option) any later version.
+///
+/// Reyn Tweets is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+/// GNU Lesser General Public License for more details.
+///
+/// You should have received a copy of the GNU Lesser General Public License
+/// along with Reyn Tweets. If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef OAUTH2AUTHENTICATOR_HPP
+#define OAUTH2AUTHENTICATOR_HPP
+
+#include "oauthauthenticator.hpp"
+
+/// @class OAuth2Authenticator
+/// @brief Authenticator for stuff related to OAuth 2.
+class OAuth2Authenticator : public virtual OAuthAuthenticator
+{
+	public:
+		/// @fn OAuth2Authenticator();
+		/// @brief Constructor
+		OAuth2Authenticator();
+
+		/// @fn virtual ~OAuth2Authenticator();
+		/// @brief Destructor
+		virtual ~OAuth2Authenticator();
+
+		/// @fn void setBearerToken(QByteArray newBearer);
+		/// @brief Setter for bearerToken
+		/// @param newBearer New value for bearerToken
+		void setBearerToken(QByteArray newBearer);
+
+		/// @fn void resetTokens();
+		/// @brief Resetting the tokens. A full new OAuth authentication process
+		/// has to be launch to get tokens and for authentication in requests
+		void resetTokens();
+
+		/// @fn QByteArray getBasicHeader();
+		/// @brief Building the header used to retrieve or to invalidate
+		/// a Bearer Token.
+		/// @return The corresponding header
+		QByteArray getBasicHeader();
+
+		/// @fn QByteArray getBearerHeader();
+		/// @brief Building the header used to authenticate requests.
+		/// @return The corresponding header
+		QByteArray getBearerHeader();
+
+	protected:
+		/// @brief Bearer token
+		QByteArray bearerToken;
+};
+
+#endif // OAUTH2AUTHENTICATOR_HPP

=== added file 'connection/common/authenticators/oauth/oauthauthenticator.cpp'
--- connection/common/authenticators/oauth/oauthauthenticator.cpp	1970-01-01 00:00:00 +0000
+++ connection/common/authenticators/oauth/oauthauthenticator.cpp	2013-08-20 00:10:09 +0000
@@ -0,0 +1,46 @@
+/// @file oauthauthenticator.cpp
+/// @brief Implementation of OAuthAuthenticator
+/// @author Romain Ducher
+///
+/// @section LICENSE
+///
+/// Copyright 2013 Romain Ducher
+///
+/// This file is part of Reyn Tweets.
+///
+/// Reyn Tweets is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU Lesser General Public License as published by
+/// the Free Software Foundation, either version 3 of the License, or
+/// (at your option) any later version.
+///
+/// Reyn Tweets is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+/// GNU Lesser General Public License for more details.
+///
+/// You should have received a copy of the GNU Lesser General Public License
+/// along with Reyn Tweets. If not, see <http://www.gnu.org/licenses/>.
+
+#include "oauthauthenticator.hpp"
+
+OAuthAuthenticator::OAuthAuthenticator(QString version) :
+	consumerTokens(),
+	oauthVersion(version)
+{}
+
+OAuthAuthenticator::~OAuthAuthenticator() {}
+
+
+/////////////////////
+// Getters on data //
+/////////////////////
+
+// Consumer key
+void OAuthAuthenticator::setConsumerKey(QByteArray clientKey) {
+	consumerTokens.first = clientKey;
+}
+
+// Consumer secret
+void OAuthAuthenticator::setConsumerSecret(QByteArray clientSecret) {
+	consumerTokens.second = clientSecret;
+}

=== added file 'connection/common/authenticators/oauth/oauthauthenticator.hpp'
--- connection/common/authenticators/oauth/oauthauthenticator.hpp	1970-01-01 00:00:00 +0000
+++ connection/common/authenticators/oauth/oauthauthenticator.hpp	2013-08-20 00:10:09 +0000
@@ -0,0 +1,66 @@
+/// @file oauthauthenticator.hpp
+/// @brief Header of OAuthAuthenticator
+/// @author Romain Ducher
+///
+/// @section LICENSE
+///
+/// Copyright 2013 Romain Ducher
+///
+/// This file is part of Reyn Tweets.
+///
+/// Reyn Tweets is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU Lesser General Public License as published by
+/// the Free Software Foundation, either version 3 of the License, or
+/// (at your option) any later version.
+///
+/// Reyn Tweets is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+/// GNU Lesser General Public License for more details.
+///
+/// You should have received a copy of the GNU Lesser General Public License
+/// along with Reyn Tweets. If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef OAUTHAUTHENTICATOR_HPP
+#define OAUTHAUTHENTICATOR_HPP
+
+#include "../basicauthenticators.hpp"
+
+/// @class OAuthAuthenticator
+/// @brief Base class for Authentication managers related to OAuth.
+///
+/// It contains the Consumer tokens pair
+class OAuthAuthenticator {
+	public:
+		/// @fn OAuthAuthenticator(QString version = "");
+		/// @brief Constructor
+		/// @param version Version of OAuth
+		OAuthAuthenticator(QString version = "");
+
+		/// @fn virtual ~OAuthAuthenticator();
+		/// @brief Destructor
+		virtual ~OAuthAuthenticator();
+
+		/////////////////////
+		// Getters on data //
+		/////////////////////
+
+		/// @fn void setConsumerKey(QByteArray clientKey);
+		/// @brief Setter on the consumer key
+		/// @param clientKey New consumer key
+		void setConsumerKey(QByteArray clientKey);
+
+		/// @fn void setConsumerSecret(QByteArray clientSecret);
+		/// @brief Setter on the consumer secret
+		/// @param clientSecret New consumer secret
+		void setConsumerSecret(QByteArray clientSecret);
+
+	protected:
+		/// @brief Consumer tokens
+		TokenPair consumerTokens;
+
+		/// @brief Version of the OAuth protocol used for the authentication.
+		QString oauthVersion;
+};
+
+#endif // OAUTHAUTHENTICATOR_HPP

=== added file 'connection/common/authenticators/oauth/oauthutils.cpp'
--- connection/common/authenticators/oauth/oauthutils.cpp	1970-01-01 00:00:00 +0000
+++ connection/common/authenticators/oauth/oauthutils.cpp	2013-08-20 00:10:09 +0000
@@ -0,0 +1,86 @@
+/// @file oauthutils.cpp
+/// @brief Utilities for OAuth (implementation)
+/// @author Romain Ducher
+///
+/// @section LICENSE
+///
+/// Copyright 2013 Romain Ducher
+///
+/// This file is part of Reyn Tweets.
+///
+/// Reyn Tweets is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU Lesser General Public License as published by
+/// the Free Software Foundation, either version 3 of the License, or
+/// (at your option) any later version.
+///
+/// Reyn Tweets is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+/// GNU Lesser General Public License for more details.
+///
+/// You should have received a copy of the GNU Lesser General Public License
+/// along with Reyn Tweets. If not, see <http://www.gnu.org/licenses/>.
+
+#include "oauthutils.hpp"
+
+#include <QCryptographicHash>
+#include <QDateTime>
+
+// Generates a nonce for a request
+QString generateNonce() {
+	QString base = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+	int baseLength = base.length();
+
+	QString randomString = "";
+	int randomStringLength = 32;
+
+	// Taking random word characters
+	for (int i = 0; i < randomStringLength; ++i) {
+		int position = qrand() % baseLength;
+		randomString.append(base.at(position));
+	}
+
+	QByteArray encodedNonce = randomString.toLatin1().toBase64();
+
+	return QString::fromLatin1(encodedNonce);
+}
+
+// Generates a timestamp for a request
+QString generateTimestamp() {
+	qint64 timestamp = QDateTime::currentMSecsSinceEpoch() / 1000;
+	return QString::number(timestamp);
+}
+
+// HMAC-SHA1 algorithm for signatures.
+QByteArray hmacSha1(QByteArray key, QByteArray baseString) {
+	int blockSize = 64; // HMAC-SHA-1 block size, defined in SHA-1 standard
+
+	if (key.length() > blockSize) {
+		// if key is longer than block size (64), reduce key length with
+		// SHA-1 compression
+		key = QCryptographicHash::hash(key, QCryptographicHash::Sha1);
+	}
+
+	// initialize inner padding with char "6"
+	QByteArray innerPadding(blockSize, char(0x36));
+	// initialize outer padding with char "\"
+	QByteArray outerPadding(blockSize, char(0x5c));
+
+	// ascii characters 0x36 ("6") and 0x5c ("\") are selected because they have
+	// large Hamming distance (http://en.wikipedia.org/wiki/Hamming_distance)
+
+	for (int i = 0; i < key.length(); i++) {
+		// XOR operation between every byte in key and innerpadding, of key length
+		innerPadding[i] = innerPadding[i] ^ key.at(i);
+		// XOR operation between every byte in key and outerpadding, of key length
+		outerPadding[i] = outerPadding[i] ^ key.at(i);
+	}
+
+	// result = hash ( outerPadding CONCAT hash ( innerPadding CONCAT baseString ) ).toBase64
+	QByteArray total = outerPadding;
+	QByteArray part = innerPadding;
+	part.append(baseString);
+	total.append(QCryptographicHash::hash(part, QCryptographicHash::Sha1));
+	QByteArray hashed = QCryptographicHash::hash(total, QCryptographicHash::Sha1);
+	return hashed.toBase64();
+}

=== added file 'connection/common/authenticators/oauth/oauthutils.hpp'
--- connection/common/authenticators/oauth/oauthutils.hpp	1970-01-01 00:00:00 +0000
+++ connection/common/authenticators/oauth/oauthutils.hpp	2013-08-20 00:10:09 +0000
@@ -0,0 +1,56 @@
+/// @file oauthutils.hpp
+/// @brief Utilities for OAuth (header)
+/// @author Romain Ducher
+///
+/// @section LICENSE
+///
+/// Copyright 2013 Romain Ducher
+///
+/// This file is part of Reyn Tweets.
+///
+/// Reyn Tweets is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU Lesser General Public License as published by
+/// the Free Software Foundation, either version 3 of the License, or
+/// (at your option) any later version.
+///
+/// Reyn Tweets is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+/// GNU Lesser General Public License for more details.
+///
+/// You should have received a copy of the GNU Lesser General Public License
+/// along with Reyn Tweets. If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef OAUTHUTILS_HPP
+#define OAUTHUTILS_HPP
+
+#include <QByteArray>
+#include <QString>
+
+/// @fn QString generateNonce();
+/// @brief Generates a nonce for a request. To generate a nonce,
+/// a random string is generated by taking 32 times one letter in the
+/// alphabet. The letter could be in upper case or lower case. The final
+/// nonce is the 64 base-encoding of the random string.
+/// @return A nonce for a request.
+QString generateNonce();
+
+/// @fn QString generateTimestamp();
+/// @brief Generates a timestamp for a request. The timestamp is the
+/// number of seconds since the Unix Epoch (1/1/1970 at midnight).
+/// @return A timestamp corresponding to the current date.
+QString generateTimestamp();
+
+/// @fn QByteArray hmacSha1(QByteArray key, QByteArray baseString);
+/// @brief HMAC-SHA1 algorithm for signatures.
+///
+/// Its implementation for Reyn Tweets was found on the
+/// <a href="http://qt-project.org">Qt Project website</a> here :
+/// <a href="http://qt-project.org/wiki/HMAC-SHA1">
+/// http://qt-project.org/wiki/HMAC-SHA1</a>.
+/// @param key Key for signature
+/// @param baseString String that we want to sign
+/// @return The signature
+QByteArray hmacSha1(QByteArray key, QByteArray baseString);
+
+#endif // OAUTHUTILS_HPP

=== added directory 'connection/common/calls'
=== renamed file 'connection/calls/genericcalls.cpp' => 'connection/common/calls/genericcalls.cpp'
--- connection/calls/genericcalls.cpp	2012-05-19 13:58:56 +0000
+++ connection/common/calls/genericcalls.cpp	2013-08-20 00:10:09 +0000
@@ -28,13 +28,13 @@
 
 // Protected constructor
 GenericCalls::GenericCalls(QObject * requester) :
-    QObject(),
-    requestDemander(requester)
+	QObject(),
+	requestDemander(requester)
 {}
 
 // Destructor
 GenericCalls::~GenericCalls() {
-    requestDemander = 0;
+	requestDemander = 0;
 }
 
 
@@ -44,45 +44,34 @@
 
 // Adding a requester to the requester manager
 void GenericCalls::addRequester(GenericRequester * requester) {
-    if (requester != 0) {
-        connect(requester, SIGNAL(requestDone()),
-                this, SLOT(endRequest()));
-        requesterManager.addRequest(requestDemander, requester);
-    }
+	if (requester != 0) {
+		connect(requester, &GenericRequester::requestDone,
+				this, &GenericCalls::endRequest);
+		requesterManager.addRequest(requestDemander, requester);
+	}
 }
 
 // Removing a requester of the requester manager
 void GenericCalls::removeRequester(GenericRequester * requester) {
-    if (requester != 0) {
-        disconnect(requester, SIGNAL(requestDone()),
-                   this, SLOT(endRequest()));
-        requesterManager.removeRequest(requester->getUuid());
-    }
+	if (requester != 0) {
+		disconnect(requester, &GenericRequester::requestDone,
+				   this, &GenericCalls::endRequest);
+		requesterManager.removeRequest(requester);
+	}
 }
 
 // Slot executed when a requester has finished its work
-void GenericCalls::endRequest() {
-    GenericRequester * requester = qobject_cast<GenericRequester *>(sender());
-    ResultWrapper res = buildResultSender(requester);
-    removeRequester(requester);
-    emit sendResult(res);
-}
-
-// Method that builds the wrapper of a result
-ResultWrapper GenericCalls::buildResultSender(GenericRequester * endedRequest) {
-    if (endedRequest) {
-        RequestInfos & requestInfos = requesterManager.getRequestInfos(endedRequest->getUuid());
-        return ResultWrapper(requestInfos.getAsker(),
-                             requestInfos.getRequester()->getRequestResult());
-    } else {
-        return ResultWrapper();
-    }
+void GenericCalls::endRequest(RequestResult requestResult) {
+	GenericRequester * requester = qobject_cast<GenericRequester *>(sender());
+	ResultWrapper res(requesterManager.getAsker(requester), requestResult);
+	removeRequester(requester);
+	emit sendResult(res);
 }
 
 // Inline method for executing requests
 void GenericCalls::executeRequest(GenericRequester * requester) {
-    if (requester != 0) {
-        addRequester(requester);
-        requester->executeRequest();
-    }
+	if (requester != 0) {
+		addRequester(requester);
+		requester->executeRequest();
+	}
 }

=== renamed file 'connection/calls/genericcalls.hpp' => 'connection/common/calls/genericcalls.hpp'
--- connection/calls/genericcalls.hpp	2012-09-12 22:38:35 +0000
+++ connection/common/calls/genericcalls.hpp	2013-08-20 00:10:09 +0000
@@ -26,8 +26,8 @@
 
 #include <QObject>
 #include "../requests/genericrequester.hpp"
-#include "../model/resultwrapper.hpp"
-#include "../model/requestermanager.hpp"
+#include "../resultwrapper.hpp"
+#include "requestermanager.hpp"
 
 /// @class GenericCalls
 /// @brief Base class for all classes which manage calls to services.
@@ -59,9 +59,10 @@
 		void sendResult(ResultWrapper res);
 
 	public slots:
-		/// @fn void endRequest();
+		/// @fn void endRequest(RequestResult requestResult);
 		/// @brief Slot executed when a requester has finished its work
-		void endRequest();
+		/// @param requestResult Result of the request.
+		void endRequest(RequestResult requestResult);
 
 	protected:
 		/// @brief QObject that asks for the request
@@ -84,12 +85,6 @@
 		/// @param requester Address of the requester
 		void removeRequester(GenericRequester * requester);
 
-		/// @fn ResultSender buildResultSender(GenericRequester * endedRequest);
-		/// @brief Method that builds the wrapper of a result
-		/// @param endedRequest Ended request that contaons the result
-		/// @return The wrapper of the request result
-		ResultWrapper buildResultSender(GenericRequester * endedRequest);
-
 		/// @fn void executeRequest(GenericRequester * requester);
 		/// @brief Inline method for executing requests
 		/// @param requester The requester

=== renamed file 'connection/model/requestermanager.cpp' => 'connection/common/calls/requestermanager.cpp'
--- connection/model/requestermanager.cpp	2012-09-12 22:38:35 +0000
+++ connection/common/calls/requestermanager.cpp	2013-08-20 00:10:09 +0000
@@ -25,23 +25,37 @@
 
 #include "requestermanager.hpp"
 
+// Constructor
 RequesterManager::RequesterManager() :
 	QMap<QUuid, RequestInfos>()
-{
-}
+{}
 
+// Adding a request to the manager
 void RequesterManager::addRequest(QObject * asker, GenericRequester * requester) {
 	if (requester != 0) {
-		insert(requester->getUuid(), RequestInfos(asker, requester));
-	}
-}
-
-void RequesterManager::removeRequest(QUuid requestUuid) {
-	GenericRequester * requester = getRequestInfos(requestUuid).getRequester();
-	delete requester;
-	remove(requestUuid);
-}
-
+		RequestInfos reqinf;
+
+		reqinf.asker = asker;
+		reqinf.requester = requester;
+
+		insert(requester->getUuid(), reqinf);
+	}
+}
+
+// Removing a request to the manager
+void RequesterManager::removeRequest(GenericRequester * requester) {
+	if (requester) {
+		remove(requester->getUuid());
+		delete requester;
+	}
+}
+
+// Getting informations on a request
 RequestInfos & RequesterManager::getRequestInfos(QUuid requestUuid) {
 	return (*this)[requestUuid];
 }
+
+// Getting the QObject which asked for the request
+QObject * RequesterManager::getAsker(GenericRequester * requester) {
+	return requester ? getRequestInfos(requester->getUuid()).asker : 0;
+}

=== renamed file 'connection/model/requestermanager.hpp' => 'connection/common/calls/requestermanager.hpp'
--- connection/model/requestermanager.hpp	2012-09-12 22:38:35 +0000
+++ connection/common/calls/requestermanager.hpp	2013-08-20 00:10:09 +0000
@@ -51,10 +51,17 @@
 		/// @param requester Entity that executing the request
 		void addRequest(QObject * asker, GenericRequester * requester);
 
-		/// @fn void removeRequest(QUuid requestUuid);
+		/// @fn void removeRequest(GenericRequester * requester);
 		/// @brief Removing a request from the manager
-		/// @param requestUuid UUID of the requester
-		void removeRequest(QUuid requestUuid);
+		/// @param requester Requester to remove
+		void removeRequest(GenericRequester * requester);
+
+		/// @fn QObject * getAsker(GenericRequester * requester);
+		/// @brief Getting the QObject which asked for the request
+		/// @param requester The requester which executes the request
+		/// @return The QObject which asked for the process. It should be
+		/// a Process.
+		QObject * getAsker(GenericRequester * requester);
 };
 
 #endif // REQUESTERMANAGER_HPP

=== renamed file 'connection/model/requestinfos.hpp' => 'connection/common/calls/requestinfos.hpp'
--- connection/model/requestinfos.hpp	2012-09-12 22:38:35 +0000
+++ connection/common/calls/requestinfos.hpp	2013-08-20 00:10:09 +0000
@@ -29,38 +29,15 @@
 #include <QObject>
 #include "../requests/genericrequester.hpp"
 
-/// @class RequestInfos
-/// @brief Class containing the entity which asks for the request (the "asker")
-/// and the requester that executes the request (the "requester").
-class RequestInfos
-{
-	public:
-		/// @fn RequestInfos(QObject * requestAsker = 0,
-		///					 GenericRequester * twitterRequest = 0);
-		/// @brief Constructor
-		/// @param requestAsker The asker
-		/// @param twitterRequest The requester
-		RequestInfos(QObject * requestAsker = 0,
-					 GenericRequester * twitterRequest = 0);
-
-		/// @fn ~RequestInfos();
-		/// @brief Destructor
-		~RequestInfos();
-
-		/// @fn QObject * getAsker();
-		/// @brief Getter on the asker
-		QObject * getAsker();
-
-		/// @fn GenericRequester * getRequester();
-		/// @brief Getter on the requester
-		GenericRequester * getRequester();
-
-	protected:
-		/// @brief Entity which asks for the request
-		QObject * asker;
-
-		/// @brief Requester that executes the request
-		GenericRequester * requester;
+/// @struct RequestInfos
+/// @brief Struct containing the entity which asks for the request
+/// (the "asker") and the requester that executes the request (the "requester").
+struct RequestInfos {
+	/// @brief Entity which asks for the request
+	QObject * asker;
+
+	/// @brief Requester that executes the request
+	GenericRequester * requester;
 };
 
 #endif // REQUESTINFOS_HPP

=== renamed directory 'connection/twittercommunicators' => 'connection/common/communicators'
=== modified file 'connection/common/communicators/twittercommunicator.cpp'
--- connection/twittercommunicators/twittercommunicator.cpp	2013-02-15 23:30:42 +0000
+++ connection/common/communicators/twittercommunicator.cpp	2013-08-20 00:10:09 +0000
@@ -26,17 +26,15 @@
 
 #include <QNetworkRequest>
 #include "twittercommunicator.hpp"
-#include "../../tools/utils.hpp"
+#include "../utils/connectionutils.hpp"
+
+//#include <QtDebug>		// For debug purposes
 
 // Network manager
-#ifdef Q_OS_WIN32
-    QNetworkAccessManager REYN_TWEETS_NETWORK_MANAGER = QNetworkAccessManager();
-#endif
-#ifdef Q_OS_LINUX
-    QNetworkAccessManager REYN_TWEETS_NETWORK_MANAGER;
-#endif
-#ifdef Q_OS_SYMBIAN    // TODO
-//    QNetworkAccessManager REYN_TWEETS_NETWORK_MANAGER = QNetworkAccessManager();
+#ifdef Q_OS_WIN
+	QNetworkAccessManager LibRT::REYN_TWEETS_NETWORK_MANAGER = QNetworkAccessManager();
+#elif defined(Q_OS_LINUX)
+	QNetworkAccessManager LibRT::REYN_TWEETS_NETWORK_MANAGER;
 #endif
 
 /////////////
@@ -45,35 +43,29 @@
 
 // Constructor
 TwitterCommunicator::TwitterCommunicator(QString &url,
-                                         RequestType type,
-                                         ArgsMap & getArgs,
-                                         ArgsMap & postArgs,
-                                         HeadersMap & headersParam) :
-    QObject(),
-    network(&REYN_TWEETS_NETWORK_MANAGER),
-    timeoutTimer(),
-    serviceURL(url),
-    requestType(type),
-    getParameters(getArgs),
-    postParameters(postArgs),
-    headers(headersParam),
-    responseBuffer(""),
-    httpResponse(),
-    errorMessage("Request not done"),
-    replyURL("")
+										 LibRT::HTTPRequestType type,
+										 ArgsMap & getArgs,
+										 ArgsMap & postArgs,
+										 HeadersMap & headersParam) :
+	QObject(),
+	timeoutTimer(),
+	serviceURL(url),
+	requestType(type),
+	getParameters(getArgs),
+	postParameters(postArgs),
+	headers(headersParam)
 {
-    // Setting the timer
-    timeoutTimer.setInterval(10*1000); // 10 seconds
-    timeoutTimer.setSingleShot(true);
-    connect(&timeoutTimer, SIGNAL(timeout()),
-            this, SLOT(timeout()));
+	// Setting the timer
+	timeoutTimer.setInterval(10*1000); // 10 seconds
+	timeoutTimer.setSingleShot(true);
+	connect(&timeoutTimer, &QTimer::timeout,
+			this, &TwitterCommunicator::timeout);
 }
 
 // Destructor
 TwitterCommunicator::~TwitterCommunicator() {
-    disconnect(&timeoutTimer, SIGNAL(timeout()),
-               this, SLOT(timeout()));
-    network = 0;
+	disconnect(&timeoutTimer, &QTimer::timeout,
+			   this, &TwitterCommunicator::timeout);
 }
 
 
@@ -83,52 +75,52 @@
 
 // Preparing the request
 QNetworkRequest * TwitterCommunicator::prepareRequest() {
-    // GET arguments
-    QString getArgs = buildGetDatas();
-
-    // Adding the potential GET arguments at the end of the URL
-    if ("" != getArgs) {
-        serviceURL.append('?').append(getArgs);
-    }
-
-    QNetworkRequest * requestToTwitter = new QNetworkRequest(serviceURL);
-
-    // Adding the headers
-    for (HeadersMap::Iterator it = headers.begin();
-         it != headers.end();
-         ++it)
-    {
-       requestToTwitter->setRawHeader(it.key(), it.value());
-    }
-
-    // Tag of the request with the originatingObject to identify the reply
-    requestToTwitter->setOriginatingObject(this);
-
-    return requestToTwitter;
+	// GET arguments
+	QString getArgs = buildGetDatas();
+
+	// Adding the potential GET arguments at the end of the URL
+	if ("" != getArgs) {
+		serviceURL.append('?').append(getArgs);
+	}
+
+	QNetworkRequest * requestToTwitter = new QNetworkRequest(serviceURL);
+
+	// Adding the headers
+	for (HeadersMap::Iterator it = headers.begin();
+		 it != headers.end();
+		 ++it)
+	{
+	   requestToTwitter->setRawHeader(it.key(), it.value());
+	}
+
+	// Tag of the request with the originatingObject to identify the reply
+	requestToTwitter->setOriginatingObject(this);
+
+	return requestToTwitter;
 }
 
 // Executing the request
 void TwitterCommunicator::executeRequest() {
-    // Preparing the request
-    QNetworkRequest * request = prepareRequest();
-
-    // Connection for receiving the response
-    connect(network, SIGNAL(finished(QNetworkReply*)),
-            this, SLOT(endRequest(QNetworkReply*)));
-
-    // Executing the request
-    if (POST == requestType) {
-        // POST arguments
-        QByteArray postArgs = buildPostDatas();
-
-        // There is some POST arguments -> networkManager.post()
-        network->post(*request, postArgs);
-    } else {
-        // There is not any POST arguments -> networkManager.get()
-        network->get(*request);
-    }
-
-    timeoutTimer.start();
+	// Preparing the request
+	QNetworkRequest * request = prepareRequest();
+
+	// Connection for receiving the response
+	connect(&LibRT::REYN_TWEETS_NETWORK_MANAGER, &QNetworkAccessManager::finished,
+			this, &TwitterCommunicator::endRequest);
+
+	// Executing the request
+	if (LibRT::POST == requestType) {
+		// POST arguments
+		QByteArray postArgs = buildPostDatas();
+
+		// There is some POST arguments -> networkManager.post()
+		LibRT::REYN_TWEETS_NETWORK_MANAGER.post(*request, postArgs);
+	} else {
+		// There is not any POST arguments -> networkManager.get()
+		LibRT::REYN_TWEETS_NETWORK_MANAGER.get(*request);
+	}
+
+	timeoutTimer.start();
 }
 
 
@@ -138,85 +130,52 @@
 
 // Treatments that have to be done at the end of the request
 void TwitterCommunicator::endRequest(QNetworkReply * response) {
-    // Treating the response
-
-    // Is it the response of that precise request ?
-    if (!response || this != response->request().originatingObject()) {
-        // Null reply or bad sender -> No -> doing nothing
-        return;
-    }
-
-    // That's our request. Let's do the treatments !
-
-    // No timeout : stop the timer.
-    timeoutTimer.stop();
-
-    // Unwiring
-    disconnect(network, SIGNAL(finished(QNetworkReply*)),
-               this, SLOT(endRequest(QNetworkReply*)));
-
-    // Analysing the response
-    extractHttpStatuses(response);
-	errorMessage = response->errorString();
-    replyURL = response->url().toString();
-
-    // Extracting informations
-    responseBuffer = response->readAll();
-    response->deleteLater();
-
-    // responseBuffer (for debug purposes)
-	/*
-    qDebug("responseBuffer :");
-    qDebug(responseBuffer.data());
-    qDebug("\n");
-    //*/
-
-    // Ending the request
-    emit requestDone();
+	// Treating the response
+
+	// Is it the response of that precise request ?
+	if (!response || this != response->request().originatingObject()) {
+		// Null reply or bad sender -> No -> doing nothing
+		return;
+	}
+
+	// That's our request. Let's do the treatments !
+
+	// No timeout : stop the timer.
+	timeoutTimer.stop();
+
+	// Unwiring
+	disconnect(&LibRT::REYN_TWEETS_NETWORK_MANAGER, &QNetworkAccessManager::finished,
+			   this, &TwitterCommunicator::endRequest);
+
+	// Extracting informations
+	NetworkResponse netrep(response);
+	response->deleteLater();
+
+	/* responseBuffer (for debug purposes)
+	qDebug() << "responseBuffer :" << '\n'
+			 << netrep.getResponseBody() << '\n';
+	//*/
+
+	// Ending the request
+	emit requestDone(netrep);
 }
 
 // Network timeout
 void TwitterCommunicator::timeout() {
-    // It seems that no response will arrive. That's enough ! Stop it !
-
-    // Unwiring
-    disconnect(network, SIGNAL(finished(QNetworkReply*)),
-               this, SLOT(endRequest(QNetworkReply*)));
-
-    // Analysing the response
-    httpResponse.code = 0;
-    httpResponse.message = "";
-    errorMessage = "timeout";
-    replyURL = serviceURL;
-    responseBuffer = "";
-
-    // Ending the request
-    emit requestDone();
-}
-
-
-/////////////
-// Getters //
-/////////////
-
-// Getting the raw response
-QByteArray TwitterCommunicator::getResponseBuffer() {
-    return responseBuffer;
-}
-
-// Getting the HTTP response (code and reason)
-ResponseInfos TwitterCommunicator::getHttpResponse() {
-    return httpResponse;
-}
-
-// Getting the URL of the reply
-QString TwitterCommunicator::getReplyURL() {
-    return replyURL;
-}
-
-// Getter on the error massage
-QString TwitterCommunicator::getErrorMessage() {
-    return errorMessage;
+	// It seems that no response will arrive. That's enough ! Stop it !
+
+	// Unwiring
+	disconnect(&LibRT::REYN_TWEETS_NETWORK_MANAGER, &QNetworkAccessManager::finished,
+			   this, &TwitterCommunicator::endRequest);
+
+	NetworkResponse response(LibRT::TIMEOUT_HTTP_CODE,
+							 "timeout",
+							 "",
+							 "timeout",
+							 serviceURL);
+
+	// Ending the request
+	emit requestDone(response);
 }
 
 
@@ -226,62 +185,41 @@
 
 // Building a string that will contain all the GET arguments
 QString TwitterCommunicator::buildGetDatas() {
-    return buildDatas(getParameters);
+	return buildDatas(getParameters);
 }
 
 // Building a QByteArray that will contain all the POST arguments
 QByteArray TwitterCommunicator::buildPostDatas() {
-    QString postString = buildDatas(postParameters);
-    return QByteArray().append(postString);
+	QString postString = buildDatas(postParameters);
+	return QByteArray().append(postString);
 }
 
 // Building the string that will contain all the arguments
 // of the given ArgsMap just like in an URL.
 QString TwitterCommunicator::buildDatas(ArgsMap argsMap) {
-    QString res = "";
-
-    // Writing the arguments
-    for (ArgsMap::iterator argsIterator = argsMap.begin();
-         argsIterator != argsMap.end();
-         ++argsIterator) {
-        // Getting the value of the argument
-        QString argValue = argsIterator.value();
-
-        if (argValue.isEmpty()) {
-            continue;
-        }
-
-        // Getting the name of the argument
-        QString argName = argsIterator.key();
-
-        // Append the argument in the argument string
-        res.append(formatParam(argName, argValue));
-        res.append('&');
-    }
-
-    // Erasing the last '&'
-    res.chop(1);
-
-    return res;
-}
-
-
-////////////////////////////////////////////
-// Extracting http results from the reply //
-////////////////////////////////////////////
-
-void TwitterCommunicator::extractHttpStatuses(QNetworkReply * reply) {
-    if (reply == 0) {
-        return;
-    }
-
-    QVariant httpStatus;
-
-    // Extract return code
-    httpStatus = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute);
-    httpResponse.code = httpStatus.toInt();
-
-    // Extract return reason
-    httpStatus = reply->attribute(QNetworkRequest::HttpReasonPhraseAttribute);
-    httpResponse.message = QString::fromAscii(httpStatus.toByteArray());
+	QString res = "";
+
+	// Writing the arguments
+	for (ArgsMap::iterator argsIterator = argsMap.begin();
+		 argsIterator != argsMap.end();
+		 ++argsIterator) {
+		// Getting the value of the argument
+		QString argValue = argsIterator.value();
+
+		if (argValue.isEmpty()) {
+			continue;
+		}
+
+		// Getting the name of the argument
+		QString argName = argsIterator.key();
+
+		// Append the argument in the argument string
+		res.append(formatParam(argName, argValue));
+		res.append('&');
+	}
+
+	// Erasing the last '&'
+	res.chop(1);
+
+	return res;
 }

=== modified file 'connection/common/communicators/twittercommunicator.hpp'
--- connection/twittercommunicators/twittercommunicator.hpp	2012-09-12 22:38:35 +0000
+++ connection/common/communicators/twittercommunicator.hpp	2013-08-20 00:10:09 +0000
@@ -35,20 +35,23 @@
 #include <QUrl>
 #include <QMap>
 #include <QTimer>
-#include "../model/responseinfos.hpp"
-#include "../model/headersmap.hpp"
-#include "../model/requesttype.hpp"
+#include "../headersmap.hpp"
+#include "../httprequesttype.hpp"
+#include "../networkresult.hpp"
 
 
 /////////////////////
 // Network Manager //
 /////////////////////
 
-/// @brief Network manager used by all the requesters for all the request.
-/// <strong>Including him in the TwitterCommunicator
-/// <a href="https://code.google.com/p/reyn-tweets/issues/detail?id=36">
-/// could cause crashes</a></strong>.
-extern QNetworkAccessManager REYN_TWEETS_NETWORK_MANAGER;
+
+namespace LibRT {
+	/// @brief Network manager used by all the requesters for all the request.
+	/// <strong>Including him in the TwitterCommunicator
+	/// <a href="https://code.google.com/p/reyn-tweets/issues/detail?id=36">
+	/// could cause crashes</a></strong>.
+	extern QNetworkAccessManager REYN_TWEETS_NETWORK_MANAGER;
+}
 
 
 /// @class TwitterCommunicator
@@ -63,7 +66,7 @@
 
 	public:
 		/// @fn TwitterCommunicator(QString &url,
-		///							RequestType type,
+		///							Network::HTTPRequestType type,
 		///							ArgsMap &getArgs,
 		///							ArgsMap &postArgs,
 		///							HeadersMap &headersParam);
@@ -74,7 +77,7 @@
 		/// @param postArgs POST arguments
 		/// @param headersParam HTTP headers
 		TwitterCommunicator(QString & url,
-							RequestType type,
+							LibRT::HTTPRequestType type,
 							ArgsMap &getArgs,
 							ArgsMap &postArgs,
 							HeadersMap &headersParam);
@@ -93,31 +96,11 @@
 		/// @brief Executing the request
 		virtual void executeRequest();
 
-		/// @fn QByteArray getResponseBuffer();
-		/// @brief Getting the content of the response
-		/// @return The buffer containing the response
-		QByteArray getResponseBuffer();
-
-		/// @fn ResponseInfos getHttpResponse();
-		/// @brief Getting the HTTP response (code and reason).
-		/// @return The description of the HTTP return code.
-		ResponseInfos getHttpResponse();
-
-		/// @fn QString getReplyURL();
-		/// @brief Getting the URL of the reply.
-		/// @return replyURL
-		QString getReplyURL();
-
-		/// @fn QString getErrorMessage();
-		/// @brief Getter on the error massage
-		/// @return The error message
-		QString getErrorMessage();
-
 
 	signals:
-		/// @fn void requestDone();
+		/// @fn void requestDone(NetworkResponse result);
 		/// @brief Signal indicating the end of a request
-		void requestDone();
+		void requestDone(NetworkResponse result);
 
 
 	protected slots:
@@ -131,9 +114,6 @@
 		void timeout();
 
 	protected:
-		/// @brief Entity managing the Network (Internet).
-		QNetworkAccessManager * network;
-
 		/// @brief Timer to avoid to wait for responses ad vitam aeternam.
 		QTimer timeoutTimer;
 
@@ -143,7 +123,7 @@
 		QString & serviceURL;
 
 		/// @brief Request type
-		RequestType requestType;
+		LibRT::HTTPRequestType requestType;
 
 		/// @brief GET datas
 		ArgsMap & getParameters;
@@ -155,21 +135,6 @@
 		HeadersMap & headers;
 
 
-		// Entities for response
-
-		/// @brief Content of the response
-		QByteArray responseBuffer;
-
-		/// @brief HTTP response code and reason
-		ResponseInfos httpResponse;
-
-		/// @brief Error message
-		QString errorMessage;
-
-		/// @brief URL of the reply
-		QString replyURL;
-
-
 	private:
 		/// @fn QString buildGetDatas();
 		/// @brief Building the string that will contain all the GET arguments
@@ -193,11 +158,6 @@
 		/// @param argsMap The argument map
 		/// @return A QString representation looks like val1=arg1&val2=arg2...
 		QString buildDatas(ArgsMap argsMap);
-
-		/// @fn void extractHttpStatuses(QNetworkReply * reply);
-		/// @brief Extract the HTTP return code and reason of the request
-		/// @param reply Network reply containing the statuses.
-		void extractHttpStatuses(QNetworkReply * reply);
 };
 
 #endif // TWITTERCOMMUNICATOR_HPP

=== renamed file 'connection/model/headersmap.hpp' => 'connection/common/headersmap.hpp'
=== renamed file 'connection/model/requesttype.hpp' => 'connection/common/httprequesttype.hpp'
--- connection/model/requesttype.hpp	2012-09-12 22:38:35 +0000
+++ connection/common/httprequesttype.hpp	2013-08-20 00:10:09 +0000
@@ -1,12 +1,10 @@
-/// @file requesttype.hpp
-/// @brief Header of RequestType
-///
-/// Revisions older than r242 were in /trunk/ReynTweets/connection
+/// @file httprequesttype.hpp
+/// @brief Header of LibRT::HTTPRequestType
 /// @author Romain Ducher
 ///
 /// @section LICENSE
 ///
-/// Copyright 2011 Romain Ducher
+/// Copyright 2011, 2013 Romain Ducher
 ///
 /// This file is part of Reyn Tweets.
 ///
@@ -23,19 +21,21 @@
 /// You should have received a copy of the GNU Lesser General Public License
 /// along with Reyn Tweets. If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef REQUESTTYPE_HPP
-#define REQUESTTYPE_HPP
+#ifndef HTTPREQUESTTYPE_HPP
+#define HTTPREQUESTTYPE_HPP
 
 #include <QString>
 
-/// @enum RequestType
-/// @brief Enum indicating the type of the request
-enum RequestType {
-	/// @brief GET requests
-	GET,
-
-	/// @brief POST requests
-	POST
-};
-
-#endif // REQUESTTYPE_HPP
+namespace LibRT {
+	/// @enum HTTPRequestType
+	/// @brief Enum indicating the type of the request
+	enum HTTPRequestType {
+		/// @brief GET requests
+		GET,
+
+		/// @brief POST requests
+		POST
+	};
+}
+
+#endif // HTTPREQUESTTYPE_HPP

=== added file 'connection/common/networkresult.cpp'
--- connection/common/networkresult.cpp	1970-01-01 00:00:00 +0000
+++ connection/common/networkresult.cpp	2013-08-20 00:10:09 +0000
@@ -0,0 +1,88 @@
+/// @file networkresult.cpp
+/// @brief Implementation of NetworkResponse
+/// @author Romain Ducher
+///
+/// @section LICENSE
+///
+/// Copyright 2011 Romain Ducher
+///
+/// This file is part of Reyn Tweets.
+///
+/// Reyn Tweets is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU Lesser General Public License as published by
+/// the Free Software Foundation, either version 3 of the License, or
+/// (at your option) any later version.
+///
+/// Reyn Tweets is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+/// GNU Lesser General Public License for more details.
+///
+/// You should have received a copy of the GNU Lesser General Public License
+/// along with Reyn Tweets. If not, see <http://www.gnu.org/licenses/>.
+
+#include "networkresult.hpp"
+
+// Constructor
+NetworkResponse::NetworkResponse(LibRT::HTTPCode httpCode,
+								 QString httpReason,
+								 QByteArray response,
+								 QString error,
+								 QString repURL) :
+	httpResponse(httpCode, httpReason),
+	responseBody(response),
+	requestError(error),
+	replyURL(repURL)
+{}
+
+// Building a NetworkResponse with the content of a QNetworkReply.
+NetworkResponse::NetworkResponse(QNetworkReply * reply) :
+	httpResponse(extractHttpStatusesFromNetworkReply(reply)),
+	responseBody(reply ? reply->readAll() : ""),
+	requestError(reply ? reply->errorString() : "null reply"),
+	replyURL(reply ? reply->url().toString() : LibRT::FAKE_URL)
+{}
+
+// Extracting the HTTP code and the HTTP reason from an HTTP reply.
+ResponseInfos NetworkResponse::extractHttpStatusesFromNetworkReply(QNetworkReply * reply) {
+	ResponseInfos httpResponse;
+
+	if (reply) {
+		QVariant httpStatus;
+
+		// Extract return code
+		httpStatus = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute);
+		httpResponse.code = httpStatus.toInt();
+
+		// Extract return reason
+		httpStatus = reply->attribute(QNetworkRequest::HttpReasonPhraseAttribute);
+		httpResponse.message = QString::fromLatin1(httpStatus.toByteArray());
+	}
+
+
+	return httpResponse;
+}
+
+/////////////
+// Getters //
+/////////////
+
+// httpResponse
+ResponseInfos NetworkResponse::getHttpResponse() {
+	return httpResponse;
+}
+
+// responseBody
+QByteArray NetworkResponse::getResponseBody() {
+	return responseBody;
+}
+
+// requestError
+QString NetworkResponse::getRequestError() {
+	return requestError;
+}
+
+// replyURL
+QString NetworkResponse::getReplyURL() {
+	return replyURL;
+}

=== added file 'connection/common/networkresult.hpp'
--- connection/common/networkresult.hpp	1970-01-01 00:00:00 +0000
+++ connection/common/networkresult.hpp	2013-08-20 00:10:09 +0000
@@ -0,0 +1,104 @@
+/// @file networkresult.hpp
+/// @brief Header of NetworkResponse
+/// @author Romain Ducher
+///
+/// @section LICENSE
+///
+/// Copyright 2011 Romain Ducher
+///
+/// This file is part of Reyn Tweets.
+///
+/// Reyn Tweets is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU Lesser General Public License as published by
+/// the Free Software Foundation, either version 3 of the License, or
+/// (at your option) any later version.
+///
+/// Reyn Tweets is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+/// GNU Lesser General Public License for more details.
+///
+/// You should have received a copy of the GNU Lesser General Public License
+/// along with Reyn Tweets. If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef NETWORKRESPONSE_HPP
+#define NETWORKRESPONSE_HPP
+
+#include <QNetworkReply>
+#include "responseinfos.hpp"
+#include "utils/librtconstants.hpp"
+#include "utils/httpcode.hpp"
+
+/// @struct NetworkResponse
+/// @brief Struct with relevant elements of network reply
+class NetworkResponse {
+	public:
+
+		/// @fn NetworkResponse(LibRT::HTTPCode httpCode = LibRT::INVALID_HTTP_CODE,
+		///						QString httpReason = "",
+		///						QByteArray response = "",
+		///						QString error = "",
+		///						QString repURL = LibRT::FAKE_URL);
+		/// @brief Full constructor
+		/// @param httpCode Value for httpResponse.code.
+		/// @param httpReason Value for httpResponse.message.
+		/// @param response Value for responseBody.
+		/// @param error Value for requestError.
+		/// @param repURL Value for replyURL.
+		NetworkResponse(LibRT::HTTPCode httpCode = LibRT::INVALID_HTTP_CODE,
+						QString httpReason = "",
+						QByteArray response = "",
+						QString error = "",
+						QString repURL = LibRT::FAKE_URL);
+
+		/// @fn NetworkResponse(QNetworkReply * reply);
+		/// @brief Building a NetworkResponse with the content of a QNetworkReply.
+		/// @param reply the QNetworkReply
+		NetworkResponse(QNetworkReply * reply);
+
+
+		/////////////
+		// Getters //
+		/////////////
+
+		/// @fn ResponseInfos getHttpResponse();
+		/// @brief Getter on httpResponse.
+		/// @return httpResponse
+		ResponseInfos getHttpResponse();
+
+		/// @fn QByteArray getResponseBody();
+		/// @brief Getter on responseBody.
+		/// @return responseBody
+		QByteArray getResponseBody();
+
+		/// @fn QString getRequestError();
+		/// @brief Getter on requestError.
+		/// @return requestError
+		QString getRequestError();
+
+		/// @fn QString getReplyURL();
+		/// @brief Getter on replyURL.
+		/// @return replyURL
+		QString getReplyURL();
+
+	protected:
+		/// @brief HTTP rsponse code and reason
+		ResponseInfos httpResponse;
+
+		/// @brief Content of the response
+		QByteArray responseBody;
+
+		/// @brief Error which happened in the request
+		QString requestError;
+
+		/// @brief Reply URL
+		QString replyURL;
+
+		/// @fn ResponseInfos extractHttpStatusesFromNetworkReply(QNetworkReply reply);
+		/// @brief Extracting the HTTP code and the HTTP reason from an HTTP reply.
+		/// @param reply The QNetworkReply containing the reply of the HTTP request.
+		/// @return A ResponseInfos with the code and the reason.
+		ResponseInfos extractHttpStatusesFromNetworkReply(QNetworkReply * reply);
+};
+
+#endif // NETWORKRESPONSE_HPP

=== renamed file 'connection/model/errortypes.hpp' => 'connection/common/networkresulttype.hpp'
--- connection/model/errortypes.hpp	2012-09-12 22:38:35 +0000
+++ connection/common/networkresulttype.hpp	2013-08-20 00:10:09 +0000
@@ -1,10 +1,10 @@
-/// @file errortypes.hpp
-/// @brief Header containing the ErrorType enum
+/// @file networkresulttype.hpp
+/// @brief Header containing the LibRT::NetworkResultType enum
 /// @author Romain Ducher
 ///
 /// @section LICENSE
 ///
-/// Copyright 2011 Romain Ducher
+/// Copyright 2011, 2012 Romain Ducher
 ///
 /// This file is part of Reyn Tweets.
 ///
@@ -24,37 +24,42 @@
 #ifndef ERRORTYPES_HPP
 #define ERRORTYPES_HPP
 
-/// @enum ErrorType
-/// @brief Enumeration which indicates if something bad happened during the
-/// request. It can takes three values depending on what happened. See the
-/// enum values for more details.
-enum ErrorType {
-	/// @brief Code indicating that there was no error.
-	NO_ERROR,
-
-	/// @brief Code for an invalid request result.
-	INVALID_RESULT,
-
-	/// @brief Code indicating that there were an error while calling the
-	/// Twitter API.
-	API_CALL,
-
-	/// @brief Code indicating that the service (ex. Twitter) has returned errors.
-	SERVICE_ERRORS,
-
-	/// @brief Code indicating that there was an error while parsing results
-	/// with <a href="http://qjson.sourceforge.net">QJson</a>.
-	QJSON_PARSING,
-
-	/// @brief Code indicating that there was an error while parsing results
-	/// under the form <code>arg1=val1&arg2=val2&...&argN=valN</code>.
-	OAUTH_PARSING,
-
-	/// @brief Code indicating that there was an error while parsing HTML.
-	HTML_PARSING,
-
-	/// @brief Code indicating that there was an error while parsing XML.
-	XML_PARSING
-};
+/// @namespace LibRT
+/// @brief General namespace for stuff related to libRT (connection part of Reyn Tweets)
+namespace LibRT {
+	/// @enum NetworkResultType
+	/// @brief Enumeration which indicates if something bad happened during the
+	/// request. It can takes three values depending on what happened. See the
+	/// enum values for more details.
+	enum NetworkResultType {
+		/// @brief There was no error.
+		NO_REQUEST_ERROR,
+
+		/// @brief Code for an invalid request result.
+		INVALID_RESULT,
+
+		/// @brief There were an error while calling the API.
+		API_CALL,
+
+		/// @brief The service (ex. Twitter) has returned errors.
+		SERVICE_ERRORS,
+
+		/// @brief There was an error while parsing JSON.
+		JSON_PARSING,
+
+		/// @brief There was an error while parsing results under the form
+		/// <code>arg1=val1&arg2=val2&...&argN=valN</code>.
+		OAUTH_PARSING,
+
+		/// @brief There was an error while parsing HTML.
+		HTML_PARSING,
+
+		/// @brief There was an error while parsing XML.
+		XML_PARSING,
+
+		/// @brief There is not any parsing.
+		NO_PARSING
+	};
+}
 
 #endif // ERRORTYPES_HPP

=== renamed file 'connection/model/requestresult.hpp' => 'connection/common/requestresult.hpp'
--- connection/model/requestresult.hpp	2012-09-12 22:38:35 +0000
+++ connection/common/requestresult.hpp	2013-08-20 00:10:09 +0000
@@ -27,16 +27,17 @@
 #define REQUESTRESULT_HPP
 
 #include <QVariant>
-#include "errortypes.hpp"
+#include "networkresulttype.hpp"
 #include "responseinfos.hpp"
+#include "utils/httpcode.hpp"
 
 /// @struct RequestResult
 /// @brief Results of a request
 struct RequestResult {
 	/// @brief Code indicating whether an error occured during the request.
-	ErrorType resultType;
+	LibRT::NetworkResultType resultType;
 
-	/// @brief Results of the request parsed by QJson.
+	/// @brief Parsed results.
 	QVariant parsedResult;
 
 	/// @brief HTTP response (code and reason)
@@ -57,13 +58,20 @@
 	/// @fn RequestResult();
 	/// @brief Constructor
 	RequestResult() :
-		resultType(INVALID_RESULT),
+		resultType(LibRT::INVALID_RESULT),
 		parsedResult(),
 		httpResponse(),
 		serviceErrors(),
 		parsingErrors(),
 		errorMessage("")
 	{}
+
+	/// @fn LibRT::HTTPCode getHTTPCode();
+	/// @brief HTTP response code (shortcut)
+	/// @return The HTTP response code as a LibRT::HTTPCode.
+	LibRT::HTTPCode getHTTPCode() {
+		return LibRT::HTTPCode(httpResponse.code);
+	}
 };
 
 #endif // REQUESTRESULT_HPP

=== added directory 'connection/common/requests'
=== renamed file 'connection/requests/genericrequester.cpp' => 'connection/common/requests/genericrequester.cpp'
--- connection/requests/genericrequester.cpp	2012-06-06 23:26:13 +0000
+++ connection/common/requests/genericrequester.cpp	2013-08-20 00:10:09 +0000
@@ -22,12 +22,13 @@
 /// along with Reyn Tweets. If not, see <http://www.gnu.org/licenses/>.
 
 #include "genericrequester.hpp"
-#include "../../tools/parsers/jsonparser.hpp"
+#include "../utils/parsers/jsonparser.hpp"
+#include "../utils/librtconstants.hpp"
 
 // Constructor. It just calls the parent constructor.
-GenericRequester::GenericRequester(RequestType type,
+GenericRequester::GenericRequester(LibRT::HTTPRequestType type,
 								   QString url,
-								   ErrorType parseError) :
+								   LibRT::NetworkResultType parseError) :
 	QObject(),
 	uuid(QUuid::createUuid()),
 	requestURL(url),
@@ -36,8 +37,7 @@
 	postParameters(),
 	headers(),
 	weblink(requestURL, requestType, getParameters, postParameters, headers),
-	parsingErrorType(parseError),
-	requestResult()
+	parsingErrorType(parseError)
 {}
 
 
@@ -49,18 +49,13 @@
 // Getters //
 /////////////
 
-// Getting parsed results
-RequestResult GenericRequester::getRequestResult() {
-	return requestResult;
-}
-
 // Getter on the requester's UUID
 QUuid GenericRequester::getUuid() {
 	return uuid;
 }
 
 // Setting parsingErrorType
-void GenericRequester::setParsingErrorType(ErrorType parseErrorType) {
+void GenericRequester::setParsingErrorType(LibRT::NetworkResultType parseErrorType) {
 	parsingErrorType = parseErrorType;
 }
 
@@ -72,17 +67,11 @@
 // Building GET Parameters
 void GenericRequester::buildGETParameters() {}
 
-// Bbuilding POST Parameters
+// Building POST Parameters
 void GenericRequester::buildPOSTParameters() {}
 
-// Bbuilding HTTP Headers
-void GenericRequester::buildHTTPHeaders() {
-	// Be careful for update with medias
-	#ifndef Q_OS_SYMBIAN
-		// Needed for Qt 4.8.x (Windows and Linux) and Symbian version is 4.7.4.
-		headers.insert("Content-Type", "application/x-www-form-urlencoded");
-	#endif
-}
+// Building HTTP Headers
+void GenericRequester::buildHTTPHeaders() {}
 
 // Executing the request
 void GenericRequester::executeRequest() {
@@ -91,8 +80,8 @@
 	buildHTTPHeaders();
 
 	// Request time !
-	connect(&weblink, SIGNAL(requestDone()),
-			this, SLOT(treatResults()));
+	connect(&weblink, &TwitterCommunicator::requestDone,
+			this, &GenericRequester::treatResults);
 
 	weblink.executeRequest();
 }
@@ -103,36 +92,55 @@
 //////////////////////////
 
 // Slot executed when the Twitter Communicator has just finished its work.
-void GenericRequester::treatResults() {
-	disconnect(&weblink, SIGNAL(requestDone()),
-			   this, SLOT(treatResults()));
+void GenericRequester::treatResults(NetworkResponse netResponse) {
+	disconnect(&weblink, &TwitterCommunicator::requestDone,
+			   this, &GenericRequester::treatResults);
+
+	RequestResult requestResult;
 
 	// Looking the HTTP request
-	requestResult.httpResponse = weblink.getHttpResponse();
-	requestResult.errorMessage = weblink.getErrorMessage();
-
-	int httpReturnCode = weblink.getHttpResponse().code;
-
-	if (httpReturnCode == 0) {
-		// No response => API_CALL
-		requestResult.resultType = API_CALL;
-	} else {
-		// A response to parse
-		bool parseOK;
-		QVariantMap parseErrorMap;
-		requestResult.parsedResult = this->parseResult(parseOK, parseErrorMap);
-		requestResult.resultType = parseOK ? NO_ERROR : parsingErrorType;
-		requestResult.parsingErrors.code = parseErrorMap.value("lineError").toInt();
-		requestResult.parsingErrors.message = parseErrorMap.value("errorMsg").toString();
-
-		if (!parseOK) {
-			// Giving the response just in case the user would like to do sthg with it.
-			requestResult.parsedResult = QVariant::fromValue(weblink.getResponseBuffer());
-		} else {
-			this->treatParsedResult();
-		}
+	ResponseInfos netHTTPRep = netResponse.getHttpResponse();
+	requestResult.httpResponse = netHTTPRep;
+	requestResult.errorMessage = netResponse.getRequestError();
+
+	switch (netHTTPRep.code) {
+		case LibRT::INVALID_HTTP_CODE:
+			// Invalid response => INVALID_RESULT
+			requestResult.resultType = LibRT::INVALID_RESULT;
+			break;
+
+		case LibRT::TIMEOUT_HTTP_CODE:
+			// No response (because of timeout) => API_CALL
+			requestResult.resultType = LibRT::API_CALL;
+			break;
+
+		default: {
+			// Parsing the response and filling requestResult
+			bool parseOK;
+			QVariantMap parseErrorMap;
+			requestResult.parsedResult = this->parseResult(netResponse,
+														   parseOK,
+														   parseErrorMap);
+			requestResult.parsingErrors.code = parseErrorMap.value("lineError").toInt();
+			requestResult.parsingErrors.message = parseErrorMap.value("errorMsg").toString();
+
+			if (parseOK) {
+				// Other treatments related to the service
+				requestResult.serviceErrors = this->treatServiceErrors(requestResult.parsedResult,
+																	   netResponse);
+				// Updating the NetworkResultType with service errors
+				requestResult.resultType = requestResult.serviceErrors.isEmpty() ?
+							LibRT::NO_REQUEST_ERROR
+						  : LibRT::SERVICE_ERRORS;
+			} else {
+				requestResult.resultType = parsingErrorType;
+
+				// Giving the response just in case the user would like to do sthg with it.
+				requestResult.parsedResult = QVariant::fromValue(netResponse.getResponseBody());
+			}
+		} break;
 	}
 
-	// Telling the ReynTwitterCalls that the request is finished
-	emit requestDone();
+	// Telling the Calls that the request is finished
+	emit requestDone(requestResult);
 }

=== renamed file 'connection/requests/genericrequester.hpp' => 'connection/common/requests/genericrequester.hpp'
--- connection/requests/genericrequester.hpp	2012-09-12 23:18:26 +0000
+++ connection/common/requests/genericrequester.hpp	2013-08-20 00:10:09 +0000
@@ -27,8 +27,9 @@
 #include <QObject>
 #include <QUuid>
 #include <QVariant>
-#include "../model/requestresult.hpp"
-#include "../twittercommunicators/twittercommunicator.hpp"
+#include "../requestresult.hpp"
+#include "../communicators/twittercommunicator.hpp"
+#include "../networkresult.hpp"
 
 /// @class GenericRequester
 /// @brief Base class for all the requesters.
@@ -37,19 +38,19 @@
 	Q_OBJECT
 
 	public:
-		/// @fn GenericRequester(RequestType type,
+		/// @fn GenericRequester(Network::HTTPRequestType type,
 		///						 QString url,
-		///						 ErrorType parseError = QJSON_PARSING);
+		///						 LibRT::NetworkResultType parseError = Network::JSON_PARSING);
 		/// @brief Constructor
 		/// @param type Type of the request (GET ou POST).
 		/// @param url URL called by the requester
 		/// @param parseError Error type if an error occurs while parsing. Most
-		/// of the time, this value is set to QJSON_PARSING because results are
-		/// QJson stream parsed with QJson. However, OAuth requesters use their
+		/// of the time, this value is set to JSON_PARSING because results are
+		/// written in JSON. However, OAuth requesters use their
 		/// own parsing process so they need a special value called OAUTH_PARSING.
-		GenericRequester(RequestType type,
+		GenericRequester(LibRT::HTTPRequestType type,
 						 QString url,
-						 ErrorType parseError = QJSON_PARSING);
+						 LibRT::NetworkResultType parseError = LibRT::JSON_PARSING);
 
 		/// @fn virtual ~GenericRequester();
 		/// @brief Destructor.
@@ -66,11 +67,6 @@
 		/// from the other ones.
 		virtual void executeRequest();
 
-		/// @fn RequestResult getRequestResult();
-		/// @brief Getting parsed results
-		/// @return Parsed results in a QVariant object.
-		RequestResult getRequestResult();
-
 	protected:
 		/// @brief UUID of the request
 		QUuid uuid;
@@ -79,7 +75,7 @@
 		QString requestURL;
 
 		/// @brief Request type
-		RequestType requestType;
+		LibRT::HTTPRequestType requestType;
 
 		/// @brief GET parameters that will be passed to the Communicator.
 		ArgsMap getParameters;
@@ -98,8 +94,8 @@
 		/// @brief HTTP headers that will be passed to the Communicator.
 		HeadersMap headers;
 
-		/// @fn virtual void buildPOSTParameters();
-		/// @brief Virtual method building postParameters
+		/// @fn virtual void buildHTTPHeaders();
+		/// @brief Virtual method building headers
 		virtual void buildHTTPHeaders();
 
 		/// @brief Pointer on the Twitter Communicator that will purely execute
@@ -107,13 +103,13 @@
 		TwitterCommunicator weblink;
 
 		/// @brief Type of parsing error
-		ErrorType parsingErrorType;
+		LibRT::NetworkResultType parsingErrorType;
 
-		/// @fn void setParsingErrorType(ErrorType parseErrorType);
+		/// @fn void setParsingErrorType(LibRT::NetworkResultType parseErrorType);
 		/// @brief Setting parsingErrorType in classes which inherits from
 		/// GenericRequesters.
 		/// @param parseErrorType New value for parsingErrorType
-		void setParsingErrorType(ErrorType parseErrorType);
+		void setParsingErrorType(LibRT::NetworkResultType parseErrorType);
 
 
 	//////////////////////////
@@ -121,35 +117,44 @@
 	//////////////////////////
 
 	public slots:
-		/// @fn void treatResults();
+		/// @fn void treatResults(NetworkResponse netResponse);
 		/// @brief Slot that is executed when the Twitter Communicator has just
 		/// finished its work.
-		void treatResults();
+		/// @param netResponse Struct with response elements
+		void treatResults(NetworkResponse netResponse);
 
 	protected:
-		/// @brief Result of the request.
-		RequestResult requestResult;
-
-		/// @fn virtual QVariant parseResult(bool & parseOK,
+		/// @fn virtual QVariant parseResult(NetworkResponse results,
+		///									 bool & parseOK,
 		///									 QVariantMap & parsingErrors) = 0;
 		/// @brief Method that will parse the raw results of the request.
+		/// @param results Results to parse. Most of the time the method only
+		/// uses the responseBody field.
 		/// @param parseOK Boolean whose value will be set to true if there was
 		/// no problem while parsing, false otherwise.
 		/// @param parsingErrors QVariantMap that may contain information about
 		/// errors that may occur while parsing.
 		/// @return Parsed results
-		virtual QVariant parseResult(bool & parseOK,
+		virtual QVariant parseResult(NetworkResponse results,
+									 bool & parseOK,
 									 QVariantMap & parsingErrors) = 0;
 
-		/// @fn virtual void treatParsedResult() = 0;
+		/// @fn virtual QList<ResponseInfos> treatServiceErrors(QVariant parsedResults,
+		///														NetworkResponse netResponse) = 0;
 		/// @brief Treating parsed results
-		virtual void treatParsedResult() = 0;
+		/// @param parsedResults Parsed results to analyse in order to retrieve
+		/// service errors.
+		/// @param netResponse Other network response elements, if needed.
+		/// @return The list of service errors
+		virtual QList<ResponseInfos> treatServiceErrors(QVariant parsedResults,
+														NetworkResponse netResponse) = 0;
 
 	signals:
-		/// @fn void requestDone();
+		/// @fn void requestDone(RequestResult requestResult);
 		/// @brief Signal sent when the results of the request received by
 		/// the Twitter Communicator have been treated.
-		void requestDone();
+		/// @param requestResult Result of the request.
+		void requestDone(RequestResult requestResult);
 };
 
 #endif // GENERICREQUESTER_HPP

=== renamed file 'connection/model/identificationway.hpp' => 'connection/common/requests/identificationway.hpp'
--- connection/model/identificationway.hpp	2012-09-12 22:38:35 +0000
+++ connection/common/requests/identificationway.hpp	2013-08-20 00:10:09 +0000
@@ -1,5 +1,5 @@
 /// @file identificationway.hpp
-/// @brief Header of IdentificationWay
+/// @brief Header of LibRT::IdentificationWay
 /// @author Romain Ducher
 ///
 /// @section LICENSE
@@ -24,14 +24,16 @@
 #ifndef IDENTIFICATIONWAY_HPP
 #define IDENTIFICATIONWAY_HPP
 
-/// @enum IdentificationWay
-/// @brief How the user is identified in a request ?
-enum IdentificationWay {
-	/// @brief With an ID.
-	ID,
+namespace LibRT {
+	/// @enum IdentificationWay
+	/// @brief How the user is identified in a request ?
+	enum IdentificationWay {
+		/// @brief With an ID.
+		ID,
 
-	/// @brief With a screen name
-	SCREEN_NAME
-};
+		/// @brief With a screen name
+		SCREEN_NAME
+	};
+}
 
 #endif // IDENTIFICATIONWAY_HPP

=== renamed file 'connection/model/responseinfos.hpp' => 'connection/common/responseinfos.hpp'
--- connection/model/responseinfos.hpp	2012-09-12 22:38:35 +0000
+++ connection/common/responseinfos.hpp	2013-08-20 00:10:09 +0000
@@ -29,18 +29,27 @@
 /// @struct ResponseInfos
 /// @brief Struct with an integer (field "code") and its meaning (field "message").
 ///
-/// When used to store QJSON parsing errors, "message" is the error message and
-/// "code" the number of the line where the error occurs.
+/// When used to store JSON parsing errors, "message" is the error message and
+/// "code" the offset.
 struct ResponseInfos {
 	/// @brief Code
 	int code;
 
 	/// @brief Decription of the code
 	QString message;
-
+/*
 	/// @fn ResponseInfos();
 	/// @brief Constructor
 	ResponseInfos() : code(-1), message("") {}
+//*/
+	/// @fn ResponseInfos(int codeNum = -1, QString msg = "");
+	/// @brief Full constructor
+	/// @param codeNum Value for code
+	/// @param msg Value for message
+	ResponseInfos(int codeNum = -1, QString msg = "") :
+		code(codeNum),
+		message(msg)
+	{}
 };
 
 #endif // RESPONSEINFOS_HPP

=== renamed file 'connection/model/resultwrapper.cpp' => 'connection/common/resultwrapper.cpp'
--- connection/model/resultwrapper.cpp	2012-09-12 22:38:35 +0000
+++ connection/common/resultwrapper.cpp	2013-08-20 00:10:09 +0000
@@ -1,5 +1,5 @@
 /// @file resultwrapper.cpp
-/// @brief Implementation of ResultSender
+/// @brief Implementation of ResultWrapper
 ///
 /// Revisions older than r242 were in /trunk/ReynTweets/connection
 /// @author Romain Ducher

=== renamed file 'connection/model/resultwrapper.hpp' => 'connection/common/resultwrapper.hpp'
=== added directory 'connection/common/utils'
=== renamed file 'tools/utils.cpp' => 'connection/common/utils/connectionutils.cpp'
--- tools/utils.cpp	2012-05-04 02:46:20 +0000
+++ connection/common/utils/connectionutils.cpp	2013-08-20 00:10:09 +0000
@@ -1,5 +1,5 @@
-/// @file utils.cpp
-/// @brief Implementation of the useful methods declared in utils.hpp.
+/// @file connectionutils.cpp
+/// @brief Implementation of the useful methods declared in connectionutils.hpp.
 ///
 /// Revisions older than r120 are in the folder /trunk/ReynTweets/connection/.
 /// @author Romain Ducher
@@ -23,23 +23,24 @@
 /// You should have received a copy of the GNU Lesser General Public License
 /// along with Reyn Tweets. If not, see <http://www.gnu.org/licenses/>.
 
+#include "connectionutils.hpp"
 #include <QCryptographicHash>
-#include <QJson/QObjectHelper>
-#include <QJson/Parser>
-#include <QJson/Serializer>
+#include <QVariant>
+#include <QMapIterator>
+#include <QMetaProperty>
+#include <QJsonDocument>
 #include <QUrl>
-#include "utils.hpp"
 
 ///////////////////////
 // String convertion //
 ///////////////////////
 
 // Converting a RequestType into a QString
-QString requestTypeToString(RequestType type) {
+QString requestTypeToString(LibRT::HTTPRequestType type) {
 	switch (type) {
-		case GET:
+		case LibRT::GET:
 			return "GET";
-		case POST:
+		case LibRT::POST:
 			return "POST";
 		default:
 			return "";
@@ -63,84 +64,13 @@
 }
 
 
-////////////////////
-// JSON Streaming //
-////////////////////
-
-// Output stream operator for serialization
-QDataStream & jsonStreamingOut(QDataStream & out,
-							   const QObject & objectToStream,
-							   const QStringList & blacklist)
-{
-	// Converting the object into a JSON file
-	QVariantMap accountMap = QJson::QObjectHelper::qobject2qvariant(&objectToStream, blacklist);
-	QJson::Serializer serializer;
-	QByteArray jsonedAccount = serializer.serialize(accountMap);
-
-	// Putting it in the stream
-	out << jsonedAccount;
-
-	return out;
-}
-
-// Input stream operator for serialization
-QDataStream & jsonStreamingIn(QDataStream & in, QObject & objectToStream) {
-	QByteArray jsonedAccount = "";
-	in >> jsonedAccount;
-
-	QJson::Parser parser;
-	bool parseOK;
-	QVariant accountVariant = parser.parse(jsonedAccount, &parseOK);
-
-	if (parseOK) {
-		QJson::QObjectHelper::qvariant2qobject(accountVariant.toMap(), &objectToStream);
-	}
-
-	return in;
-}
-
-
 //////////////////
 // Miscanellous //
 //////////////////
 
-// HMAC-SHA1 algorithm for signatures.
-QString hmacSha1(QByteArray key, QByteArray baseString) {
-	int blockSize = 64; // HMAC-SHA-1 block size, defined in SHA-1 standard
-
-	if (key.length() > blockSize) {
-		// if key is longer than block size (64), reduce key length with
-		// SHA-1 compression
-		key = QCryptographicHash::hash(key, QCryptographicHash::Sha1);
-	}
-
-	// initialize inner padding with char "6"
-	QByteArray innerPadding(blockSize, char(0x36));
-	// initialize outer padding with char "\"
-	QByteArray outerPadding(blockSize, char(0x5c));
-
-	// ascii characters 0x36 ("6") and 0x5c ("\") are selected because they have
-	// large Hamming distance (http://en.wikipedia.org/wiki/Hamming_distance)
-
-	for (int i = 0; i < key.length(); i++) {
-		// XOR operation between every byte in key and innerpadding, of key length
-		innerPadding[i] = innerPadding[i] ^ key.at(i);
-		// XOR operation between every byte in key and outerpadding, of key length
-		outerPadding[i] = outerPadding[i] ^ key.at(i);
-	}
-
-	// result = hash ( outerPadding CONCAT hash ( innerPadding CONCAT baseString ) ).toBase64
-	QByteArray total = outerPadding;
-	QByteArray part = innerPadding;
-	part.append(baseString);
-	total.append(QCryptographicHash::hash(part, QCryptographicHash::Sha1));
-	QByteArray hashed = QCryptographicHash::hash(total, QCryptographicHash::Sha1);
-	return hashed.toBase64();
-}
-
 // Exclusive OR
 bool ouBien(bool a, bool b) {
-    return  (a && !b) || (!a && b);
+	return  (a && !b) || (!a && b);
 }
 
 // Formatting parameters in the Authorization header

=== renamed file 'tools/utils.hpp' => 'connection/common/utils/connectionutils.hpp'
--- tools/utils.hpp	2012-09-12 22:38:35 +0000
+++ connection/common/utils/connectionutils.hpp	2013-08-20 00:10:09 +0000
@@ -1,4 +1,4 @@
-/// @file utils.hpp
+/// @file connectionutils.hpp
 /// @brief Header with useful methods
 ///
 /// Revisions older than r120 are in the folder /trunk/ReynTweets/connection/
@@ -23,24 +23,24 @@
 /// You should have received a copy of the GNU Lesser General Public License
 /// along with Reyn Tweets. If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef UTILS_HPP
-#define UTILS_HPP
+#ifndef CONNECTIONUTILS_HPP
+#define CONNECTIONUTILS_HPP
 
 #include <QByteArray>
 #include <QColor>
 #include <QDataStream>
 #include <QString>
-#include "../connection/model/requesttype.hpp"
+#include "../httprequesttype.hpp"
 
 ///////////////////////
 // String convertion //
 ///////////////////////
 
-/// @fn QString requestTypeToString(RequestType type)
+/// @fn QString requestTypeToString(Network::HTTPRequestType type)
 /// @brief Converting a RequestType into a QString
 /// @param type The RequestType
 /// @return The corresponding QString
-QString requestTypeToString(RequestType type);
+QString requestTypeToString(LibRT::HTTPRequestType type);
 
 /// @fn QString boolInString(bool b);
 /// @brief Converting a bool into a QString
@@ -48,62 +48,16 @@
 /// @return The corresponding QString
 QString boolInString(bool b);
 
-/// @fn QColor string2color(QString coloredString);
-/// @brief Converting a String into a QColor.
-///
-/// This function was written because of Twitter which forgets the '#'
-/// character before the hexadecimal code under the form 'RRGGBB'.
-/// @param coloredString The string with the RRGGBB format.
-/// @return The corresponding color : &#135;RRGGBB
-QColor string2color(QString coloredString);
-
-
-////////////////////
-// JSON Streaming //
-////////////////////
-
-/// @fn QDataStream & jsonStreamingOut(QDataStream & out,
-///									   const QObject & objectToStream,
-///									   const QStringList & blacklist =
-///											QStringList(QString(QLatin1String("objectName"))));
-/// @brief Output stream operator for JSON serialization
-/// @param out The output stream
-/// @param objectToStream Object to put in the stream
-/// @param blacklist Properties to ignore while conserting the QObject into
-/// a QVariant before serializing.
-/// @return The stream with the object
-QDataStream & jsonStreamingOut(QDataStream & out,
-							   const QObject & objectToStream,
-							   const QStringList & blacklist = QStringList(QString(QLatin1String("objectName"))));
-
-/// @fn QDataStream & jsonStreamingIn(QDataStream & in, QObject & objectToStream);
-/// @brief Input stream operator for JSON serialization
-/// @param in The input stream
-/// @param objectToStream Object to put in the stream
-/// @return The stream with the object
-QDataStream & jsonStreamingIn(QDataStream & in, QObject & objectToStream);
-
 
 //////////////////
 // Miscanellous //
 //////////////////
 
-/// @fn QString hmacSha1(QByteArray key, QByteArray baseString);
-/// @brief HMAC-SHA1 algorithm for signatures.
-///
-/// Its implementation for Reyn Tweets was found on the
-/// <a href="http://developer.qt.nokia.com/">Qt Developer Network</a> here :
-/// <a href="http://developer.qt.nokia.com/wiki/HMAC-SHA1">
-/// http://developer.qt.nokia.com/wiki/HMAC-SHA1</a>.
-/// @param key Key for signature
-/// @param baseString String that we want to sign
-/// @return The signature
-QString hmacSha1(QByteArray key, QByteArray baseString);
-
 /// @fn bool ouBien(bool a, bool b);
 /// @brief Logical XOR : <code>a XOR b == a && !b || !a && b</code>
 /// @param a 1st bool
 /// @param b 2nd bool
+/// @returns a XOR b
 bool ouBien(bool a, bool b);
 
 /// @fn QString formatParam(QString name, QString value, bool putDoubleQuotes = false);
@@ -124,4 +78,4 @@
 /// @return The formatted parameters
 QString formatParam(QString name, QString value, bool putDoubleQuotes = false);
 
-#endif // UTILS_HPP
+#endif // CONNECTIONUTILS_HPP

=== added file 'connection/common/utils/httpcode.hpp'
--- connection/common/utils/httpcode.hpp	1970-01-01 00:00:00 +0000
+++ connection/common/utils/httpcode.hpp	2013-08-20 00:10:09 +0000
@@ -0,0 +1,286 @@
+/// @file httpcode.hpp
+/// @brief Header for the LibRT::HTTPCode enum.
+/// @author Romain Ducher
+///
+/// @section LICENSE
+///
+/// Copyright 2013 Romain Ducher
+///
+/// This file is part of Reyn Tweets.
+///
+/// Reyn Tweets is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU Lesser General Public License as published by
+/// the Free Software Foundation, either version 3 of the License, or
+/// (at your option) any later version.
+///
+/// Reyn Tweets is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+/// GNU Lesser General Public License for more details.
+///
+/// You should have received a copy of the GNU Lesser General Public License
+/// along with Reyn Tweets. If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef HTTPCODE_HPP
+#define HTTPCODE_HPP
+
+namespace LibRT {
+
+	/// @enum HTTPCode
+	/// @brief Enum with the HTTP codes.
+	///
+	/// It contains all the official HTTP return codes as defined by the
+	/// <a href="http://tools.ietf.org/html/rfc2616">RFC 2616</a> + two other
+	/// custom codes, LibRT::INVALID_HTTP_CODE (for fake values) and
+	/// LibRT::TIMEOUT_HTTP_CODE (for timeouts).
+	enum HTTPCode {
+		/// @brief Invalid HTTP response code
+		INVALID_HTTP_CODE = -1,
+
+		/// @brief HTTP response code for timeouts
+		TIMEOUT_HTTP_CODE = 0,
+
+		/// @brief 100 HTTP return code.
+		CONTINUE = 100,
+
+		/// @brief 101 HTTP return code.
+		SWITCHING_PROTOCOLS = 101,
+
+		/// @brief 102 HTTP return code.
+		PROCESSING = 102,
+
+		/// @brief 118 HTTP return code.
+		CONNECTION_TIMED_OUT = 118,
+
+		/// @brief 200 HTTP return code.
+		OK = 200,
+
+		/// @brief 201 HTTP return code.
+		CREATED = 201,
+
+		/// @brief 202 HTTP return code.
+		ACCEPTED = 202,
+
+		/// @brief 203 HTTP return code.
+		NON_AUTHORITATIVE_INFORMATION = 203,
+
+		/// @brief 204 HTTP return code.
+		NO_CONTENT = 204,
+
+		/// @brief 205 HTTP return code.
+		RESET_CONTENT = 205,
+
+		/// @brief 206 HTTP return code.
+		PARTIAL_CONTENT = 206,
+
+		/// @brief 207 HTTP return code.
+		MULTI_STATUS = 207,
+
+		/// @brief 208 HTTP return code.
+		ALREADY_REPORTED = 208,
+
+		/// @brief 210 HTTP return code.
+		CONTENT_DIFFERENT = 210,
+
+		/// @brief 226 HTTP return code.
+		IM_USED = 226,
+
+		/// @brief 300 HTTP return code.
+		MULTIPLE_CHOICES = 300,
+
+		/// @brief 301 HTTP return code.
+		MOVED_PERMANENTLY = 301,
+
+		/// @brief 302 HTTP return code.
+		MOVED_TEMPORARILY = 302,
+
+		/// @brief 303 HTTP return code.
+		SEE_OTHER = 303,
+
+		/// @brief 304 HTTP return code.
+		NOT_MODIFIED = 304,
+
+		/// @brief 305 HTTP return code.
+		USE_PROXY = 305,
+
+		/// @brief 306 HTTP return code.
+		SWITCH_PROXY = 306,
+
+		/// @brief 307 HTTP return code.
+		TEMPORARY_REDIRECT = 307,
+
+		/// @brief 308 HTTP return code.
+		PERMANENT_REDIRECT = 308,
+
+		/// @brief 310 HTTP return code.
+		TOO_MANY_REDIRECTS = 310,
+
+		/// @brief 400 HTTP return code.
+		BAD_REQUEST = 400,
+
+		/// @brief 401 HTTP return code.
+		UNAUTHORIZED = 401,
+
+		/// @brief 402 HTTP return code.
+		PAYMENT_REQUIRED = 402,
+
+		/// @brief 403 HTTP return code.
+		FORBIDDEN = 403,
+
+		/// @brief 404 HTTP return code.
+		NOT_FOUND = 404,
+
+		/// @brief 405 HTTP return code.
+		METHOD_NOT_ALLOWED = 405,
+
+		/// @brief 406 HTTP return code.
+		NOT_ACCEPTABLE = 406,
+
+		/// @brief 407 HTTP return code.
+		PROXY_AUTHENTICATION_REQUIRED = 407,
+
+		/// @brief 408 HTTP return code.
+		REQUEST_TIMEOUT = 408,
+
+		/// @brief 409 HTTP return code.
+		CONFLICT = 409,
+
+		/// @brief 410 HTTP return code.
+		GONE = 410,
+
+		/// @brief 411 HTTP return code.
+		LENGTH_REQUIRED = 411,
+
+		/// @brief 412 HTTP return code.
+		PRECONDITION_FAILED = 412,
+
+		/// @brief 413 HTTP return code.
+		REQUEST_ENTITY_TOO_LARGE = 413,
+
+		/// @brief 414 HTTP return code.
+		REQUEST_URI_TOO_LONG = 414,
+
+		/// @brief 415 HTTP return code.
+		UNSUPPORTED_MEDIA_TYPE = 415,
+
+		/// @brief 416 HTTP return code.
+		REQUEST_RANGE_UNSATISFIABLE = 416,
+
+		/// @brief 417 HTTP return code.
+		EXPECTATION_FAILED = 417,
+
+		/// @brief 418 HTTP return code.
+		I_AM_A_TEAPOT = 418,
+
+		/// @brief 419 HTTP return code.
+		AUTHENTICATION_TIMEOUT = 419,
+
+		/// @brief 420 HTTP return code (used by Twitter).
+		ENHANCE_YOUR_CALM = 420,
+
+		/// @brief 422 HTTP return code.
+		UNPROCESSABLLE_ENTITY = 422,
+
+		/// @brief 423 HTTP return code.
+		LOCKED = 423,
+
+		/// @brief 424 HTTP return code.
+		METHOD_FAILURE = 424,
+
+		/// @brief 424 HTTP return code (WebDAV + RFC 4918).
+		FAILED_DEPENDENCY = 424,
+
+		/// @brief 425 HTTP return code.
+		UNORDERED_COLLECTION = 425,
+
+		/// @brief 426 HTTP return code.
+		UPGRADE_REQUIRED = 426,
+
+		/// @brief 428 HTTP return code.
+		PRECONDITION_REQUIRED = 428,
+
+		/// @brief 429 HTTP return code.
+		TOO_MANY_REQUESTS = 429,
+
+		/// @brief 431 HTTP return code.
+		REQUEST_HEADER_FIELDS_TOO_LARGE = 431,
+
+		/// @brief 444 HTTP return code.
+		NO_RESPONSE = 444,
+
+		/// @brief 449 HTTP return code.
+		RETRY_WITH = 449,
+
+		/// @brief 450 HTTP return code.
+		BLOCKED_BY_WINDOWS_PARENTAL_CONTROLS = 450,
+
+		/// @brief 451 HTTP return code.
+		UNAVAILABLE_FOR_LEGAL_REASONS = 451,
+
+		/// @brief 456 HTTP return code.
+		UNRECOVERABLE_ERROR = 456,
+
+		/// @brief 494 HTTP return code.
+		REQUEST_HEADER_TOO_LARGE = 494,
+
+		/// @brief 495 HTTP return code.
+		CERT_ERROR = 495,
+
+		/// @brief 496 HTTP return code.
+		NO_CERT = 496,
+
+		/// @brief 497 HTTP return code.
+		HTTP_TO_HTTPS = 497,
+
+		/// @brief 499 HTTP return code.
+		CLIENT_HAS_CLOSED_CONNECTION = 499,
+
+		/// @brief 500 HTTP return code.
+		INTERNAL_SERVER_ERROR = 500,
+
+		/// @brief 501 HTTP return code.
+		NOT_IMPLEMENTED = 501,
+
+		/// @brief 502 HTTP return code.
+		BAD_GATEWAY = 502,
+
+		/// @brief 502 HTTP return code.
+		PROXY_ERROR = 502,
+
+		/// @brief 503 HTTP return code.
+		SERVICE_UNAVAILABLE = 503,
+
+		/// @brief 504 HTTP return code.
+		GATEWAY_TIMEOUT = 504,
+
+		/// @brief 505 HTTP return code.
+		HTTP_VERSION_NOT_SUPPORTED = 505,
+
+		/// @brief 506 HTTP return code.
+		VARIANT_ALSO_NEGOCIATE = 506,
+
+		/// @brief 507 HTTP return code.
+		INSUFFICENT_STORAGE = 507,
+
+		/// @brief 508 HTTP return code.
+		LOOP_DETECTED = 508,
+
+		/// @brief 509 HTTP return code.
+		BANDWITH_LIMIT_EXCEEDED = 509,
+
+		/// @brief 510 HTTP return code.
+		NOT_EXTENDED = 510,
+
+		/// @brief 511 HTTP return code.
+		NETWORK_AUTHENTICATION_REQUIRED = 511,
+
+		/// @brief 598 HTTP return code.
+		NETWORK_READ_TIMEOUT_ERROR = 598,
+
+		/// @brief 599 HTTP return code.
+		NETWORK_CONNECT_TIMEOUT_ERROR = 599
+	};
+
+}
+
+#endif // HTTPCODE_HPP

=== added file 'connection/common/utils/librtconstants.cpp'
--- connection/common/utils/librtconstants.cpp	1970-01-01 00:00:00 +0000
+++ connection/common/utils/librtconstants.cpp	2013-08-20 00:10:09 +0000
@@ -0,0 +1,48 @@
+/// @file librtconstants.cpp
+/// @brief Implementation for libRT constants.
+/// @author Romain Ducher
+///
+/// @section LICENSE
+///
+/// Copyright 2013 Romain Ducher
+///
+/// This file is part of Reyn Tweets.
+///
+/// Reyn Tweets is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU Lesser General Public License as published by
+/// the Free Software Foundation, either version 3 of the License, or
+/// (at your option) any later version.
+///
+/// Reyn Tweets is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+/// GNU Lesser General Public License for more details.
+///
+/// You should have received a copy of the GNU Lesser General Public License
+/// along with Reyn Tweets. If not, see <http://www.gnu.org/licenses/>.
+
+#include "librtconstants.hpp"
+
+// Fake tweet ID
+const qlonglong LibRT::FAKE_ID = -1;
+
+/// @brief Generic fake value for ID represented by a string (empty string)
+const QString LibRT::FAKE_STRING_ID = "";
+
+// Fake longitude
+const float LibRT::FAKE_LONGITUDE = 181;
+
+// Fake latitude
+const float LibRT::FAKE_LATITUDE = 91;
+
+// Maximum longitude
+const float LibRT::MAX_LONGITUDE = 180;
+
+// Maximum latitude
+const float LibRT::MAX_LATITUDE = 90;
+
+// Fake value for a token (empty string)
+const QByteArray LibRT::FAKE_TOKEN = "";
+
+// Fake value for an URL (empty string)
+const QString LibRT::FAKE_URL = "";

=== added file 'connection/common/utils/librtconstants.hpp'
--- connection/common/utils/librtconstants.hpp	1970-01-01 00:00:00 +0000
+++ connection/common/utils/librtconstants.hpp	2013-08-20 00:10:09 +0000
@@ -0,0 +1,57 @@
+/// @file librtconstants.hpp
+/// @brief Header for libRT constants.
+/// @author Romain Ducher
+///
+/// @section LICENSE
+///
+/// Copyright 2013 Romain Ducher
+///
+/// This file is part of Reyn Tweets.
+///
+/// Reyn Tweets is free software: you can redistribute it and/or modify
+/// it under the terms of the GNU Lesser General Public License as published by
+/// the Free Software Foundation, either version 3 of the License, or
+/// (at your option) any later version.
+///
+/// Reyn Tweets is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+/// GNU Lesser General Public License for more details.
+///
+/// You should have received a copy of the GNU Lesser General Public License
+/// along with Reyn Tweets. If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef LIBRTCONSTANTS_HPP
+#define LIBRTCONSTANTS_HPP
+
+#include <QString>
+
+namespace LibRT {
+	/// @brief Generic fake ID.
+	extern const qlonglong FAKE_ID;
+
+	/// @brief Generic fake value for ID represented by a string (empty string)
+	extern const QString FAKE_STRING_ID;
+
+	/// @brief Fake longitude
+	extern const float FAKE_LONGITUDE;
+
+	/// @brief Fake latitude
+	extern const float FAKE_LATITUDE;
+
+	/// @brief Maximum absolute value for a longitude (180 since a valid
+	/// longitude is between -180 and +180).
+	extern const float MAX_LONGITUDE;
+
+	/// @brief Maximum absolute value for a latitude (180 since a valid
+	/// latitude is between -90 and +90).
+	extern const float MAX_LATITUDE;
+
+	/// @brief Fake value for a token (empty string)
+	extern const QByteArray FAKE_TOKEN;
+
+	/// @brief Fake value for an URL (empty string)
+	extern const QString FAKE_URL;
+}
+
+#endif // LIBRTCONSTANTS_HPP

=== renamed directory 'tools/parsers' => 'connection/common/utils/parsers'
=== modified file 'connection/common/utils/parsers/genericparser.hpp'
--- tools/parsers/genericparser.hpp	2012-05-19 15:39:56 +0000
+++ connection/common/utils/parsers/genericparser.hpp	2013-08-20 00:10:09 +0000
@@ -32,13 +32,13 @@
 /// @class GenericParser
 /// @brief Base class for all the parsers.
 /// @param T Type of parsed results
-template <class T>
+template <typename T>
 class GenericParser
 {
 	public:
 		/// @fn virtual QVariantMap parse(QByteArray data,
-		///								  bool & parseOK,
-		///								  QString & parseError,
+		///								  bool * parseOK = 0,
+		///								  QString * parseError = 0,
 		///								  int * lineError = 0,
 		///								  int * columnError = 0) = 0;
 		/// @brief Method for parsing results
@@ -48,8 +48,8 @@
 		/// @param lineError Line of the error
 		/// @param columnError Column of the error
 		virtual T parse(QByteArray data,
-						bool & parseOK,
-						QString & parseError,
+						bool * parseOK = 0,
+						QString * parseError = 0,
 						int * lineError = 0,
 						int * columnError = 0) = 0;
 };

=== modified file 'connection/common/utils/parsers/htmlparser.cpp'
--- tools/parsers/htmlparser.cpp	2012-05-19 15:39:56 +0000
+++ connection/common/utils/parsers/htmlparser.cpp	2013-08-20 00:10:09 +0000
@@ -23,27 +23,33 @@
 /// You should have received a copy of the GNU Lesser General Public License
 /// along with Reyn Tweets. If not, see <http://www.gnu.org/licenses/>.
 
+#include "htmlparser.hpp"
 #include <QWebFrame>
 #include <QWebPage>
-#include "htmlparser.hpp"
 
 // Parsing results
 QWebElement HTMLParser::parse(QByteArray data,
-							  bool & parseOK,
-							  QString & parseError,
+							  bool * parseOK,
+							  QString * parseError,
 							  int *, int *)
 {
 	QWebPage webPage;
 	QWebFrame * frame = webPage.mainFrame();
 
+	if (parseOK) {
+		*parseOK = frame != 0;
+	}
+
 	if (frame) {
 		frame->setHtml(QString::fromUtf8(data.data()));
-		parseOK = true;
-		parseError = "";
+		if (parseError) {
+			*parseError = "";
+		}
 		return frame->documentElement();
 	} else {
-		parseOK = false;
-		parseError = QObject::trUtf8("No HTML parser available.").append('\n');
+		if (parseError) {
+			*parseError = QObject::trUtf8("No HTML parser available.");
+		}
 		return QWebElement();
 	}
 }

=== modified file 'connection/common/utils/parsers/htmlparser.hpp'
--- tools/parsers/htmlparser.hpp	2012-05-19 15:39:56 +0000
+++ connection/common/utils/parsers/htmlparser.hpp	2013-08-20 00:10:09 +0000
@@ -35,8 +35,8 @@
 {
 	public:
 		/// @fn QWebElement parse(QByteArray data,
-		///						  bool & parseOK,
-		///						  QString & parseError,
+		///						  bool * parseOK = 0,
+		///						  QString * parseError = 0,
 		///						  int * lineError = 0,
 		///						  int * columnError = 0);
 		/// @brief Method for parsing results
@@ -46,8 +46,8 @@
 		/// @param lineError Line of the error. Unused
 		/// @param columnError Column of the error. Unused
 		QWebElement parse(QByteArray data,
-						  bool & parseOK,
-						  QString & parseError,
+						  bool * parseOK = 0,
+						  QString * parseError = 0,
 						  int * lineError = 0,
 						  int * columnError = 0);
 };

=== modified file 'connection/common/utils/parsers/jsonparser.cpp'
--- tools/parsers/jsonparser.cpp	2012-05-19 15:39:56 +0000
+++ connection/common/utils/parsers/jsonparser.cpp	2013-08-20 00:10:09 +0000
@@ -1,12 +1,13 @@
 /// @file jsonparser.cpp
 /// @brief Implementation of JSONParser
 ///
-/// Revisions older than r120 are in the folder /trunk/ReynTweets/connection/parsers.
+/// Revisions older than r120 (SVN) are in the folder
+/// /trunk/ReynTweets/connection/parsers.
 /// @author Romain Ducher
 ///
 /// @section LICENSE
 ///
-/// Copyright 2011 Romain Ducher
+/// Copyright 2011, 2013 Romain Ducher
 ///
 /// This file is part of Reyn Tweets.
 ///
@@ -23,26 +24,36 @@
 /// You should have received a copy of the GNU Lesser General Public License
 /// along with Reyn Tweets. If not, see <http://www.gnu.org/licenses/>.
 
-#include <QJson/Parser>
 #include "jsonparser.hpp"
+#include <QJsonDocument>
 
 // Parsing method
-QVariantMap JSONParser::parse(QByteArray data,
-							  bool & parseOK,
-							  QString & parseError,
-							  int * lineError,
-							  int *)
+QJsonValue JSONParser::parse(QByteArray data,
+							 bool *parseOK,
+							 QString *parseError,
+							 int * lineError,
+							 int *)
 {
-	// Parsing with QJson
-	QJson::Parser parser;
-	QVariant result = parser.parse(data, &parseOK);
-
-	if (!parseOK) {
-		parseError = parser.errorString();
-		if (lineError) {
-			*lineError = parser.errorLine();
-		}
-	}
-
-	return result.toMap();
+	QJsonParseError jsonParseError;
+
+	// Ensure that datas are encoded with UTF-8
+	QString utf8data = QString::fromLatin1(data);
+	QJsonDocument jsonDoc = QJsonDocument::fromJson(utf8data.toUtf8(),
+													&jsonParseError);
+
+	if (parseOK) {
+		*parseOK = jsonParseError.error == QJsonParseError::NoError;
+	}
+
+	if (parseError) {
+		*parseError = jsonParseError.errorString();
+	}
+
+	if (lineError) {
+		*lineError = jsonParseError.offset;
+	}
+
+	QVariant jsonVar = jsonDoc.toVariant();
+
+	return QJsonValue::fromVariant(jsonVar);
 }

=== modified file 'connection/common/utils/parsers/jsonparser.hpp'
--- tools/parsers/jsonparser.hpp	2012-05-20 20:29:32 +0000
+++ connection/common/utils/parsers/jsonparser.hpp	2013-08-20 00:10:09 +0000
@@ -1,7 +1,8 @@
 /// @file jsonparser.hpp
 /// @brief Header of JSONParser
 ///
-/// Revisions older than r120 are in the folder /trunk/ReynTweets/connection/parsers.
+/// Revisions older than r120 (SVN) are in the folder
+/// /trunk/ReynTweets/connection/parsers.
 /// @author Romain Ducher
 ///
 /// @section LICENSE
@@ -26,29 +27,28 @@
 #ifndef JSONPARSER_HPP
 #define JSONPARSER_HPP
 
+#include <QJsonValue>
 #include "genericparser.hpp"
 
 /// @class JSONParser
 /// @brief Parser for JSON datas.
-///
-/// It uses the <a href="http://qjson.sourceforge.net">QJSON</a> library to parse.
-class JSONParser : public GenericParser<QVariantMap>
+class JSONParser : public GenericParser<QJsonValue>
 {
 	public:
-		/// @fn QVariantMap parse(QByteArray data,
-		///						  bool & parseOK,
-		///						  QString & parseError,
-		///						  int * lineError = 0,
-		///						  int * columnError = 0);
+		/// @fn QJsonValue parse(QByteArray data,
+		///						 bool * parseOK = 0,
+		///						 QString * parseError = 0,
+		///						 int * lineError = 0,
+		///						 int * columnError = 0);
 		/// @brief Parsing JSON datas
 		/// @param data Datas to parse
 		/// @param parseOK Boolean indicating if the parcing process was successful
 		/// @param parseError Error message about a parsing error
 		/// @param lineError Line of the error
 		/// @param columnError Column of the error. Unused
-		QVariantMap parse(QByteArray data,
-						  bool & parseOK,
-						  QString & parseError,
+		QJsonValue parse(QByteArray data,
+						  bool * parseOK = 0,
+						  QString * parseError = 0,
 						  int * lineError = 0,
 						  int * columnError = 0);
 };

=== modified file 'connection/common/utils/parsers/oauthparser.cpp'
--- tools/parsers/oauthparser.cpp	2012-05-19 15:39:56 +0000
+++ connection/common/utils/parsers/oauthparser.cpp	2013-08-20 00:10:09 +0000
@@ -23,70 +23,28 @@
 /// You should have received a copy of the GNU Lesser General Public License
 /// along with Reyn Tweets. If not, see <http://www.gnu.org/licenses/>.
 
+#include "oauthparser.hpp"
 #include <QList>
-#include "oauthparser.hpp"
+#include <QUrlQuery>
 
 // Parsing method
 QVariantMap OAuthParser::parse(QByteArray data,
-							   bool & parseOK,
-							   QString & parseError,
+							   bool *, QString *,
 							   int *, int *)
 {
 	QVariantMap res;
-	QString errorMsg = QObject::trUtf8("Following arguments are invalid : ");
-	parseOK = true;
-
-	// Split the couples of arguments
-	QList<QByteArray> arguments = data.split('&');
-
-	foreach (QByteArray argument, arguments) {
-		QList<QByteArray> couple = argument.split('=');
-		bool validCouple = couple.length() == 2 || argument.isEmpty();
-
-		// Ensures that there is a name and a value
-		parseOK = parseOK && validCouple;
-
-		if (validCouple) {
-			QString name = QString(couple.at(0));
-			QString value = QString(couple.at(1));
-			res.insert(name, QVariant(value));
-		} else {
-			errorMsg.append(QObject::trUtf8("OAuth parsing : cannot parse '"));
-			errorMsg.append(argument);
-			errorMsg.append("'.\n");
-		}
-	}
-
-
-	// Writing parsing errors
-	parseError = "";
-
-	if (!parseOK) {
-		parseError = errorMsg;
-	}
-
-	return res;
-}
-
-// Extracting one parameter from the parsed result
-QVariant OAuthParser::extractParameter(QVariantMap & parsedMap,
-									   QString parameterName,
-									   bool & extractOK,
-									   QString & extractError)
-{
-	QVariant res;
-	extractError = "";
-	extractOK = parsedMap.contains(parameterName);
-
-	if (extractOK) {
-		res = parsedMap.value(parameterName);
-		parsedMap.remove(parameterName);
-	} else {
-		extractError.append(QObject::trUtf8("Parameter extraction : parameter '"));
-		extractError.append(parameterName);
-		extractError.append(QObject::trUtf8("' expected.")).append('\n');
-	}
-
+
+	QUrlQuery args(QString::fromLatin1(data));
+
+	QList<QPair<QString, QString> > listArgs = args.queryItems();
+
+	for (QList<QPair<QString, QString> >::iterator it = listArgs.begin();
+		 it != listArgs.end();
+		 ++it)
+	{
+		QPair<QString, QString> couple = *it;
+		res.insert(couple.first, QVariant::fromValue(couple.second));
+	}
 	return res;
 }
 
@@ -114,18 +72,18 @@
 			}
 
 			parsedMap.remove(parameterName);
-			parsedMap.insert(parameterName, QVariant(booleanValue));
+			parsedMap.insert(parameterName, QVariant::fromValue(booleanValue));
 		} else {
 			// Unexpected value. This is an error.
 			rewriteError.append(QObject::trUtf8("Rewriting as bool : unexpected value '"))
 					.append(result)
 					.append(QObject::trUtf8("' for parameter '"))
 					.append(parameterName)
-					.append("'.\n");
+					.append("'.");
 		}
 	} else {
 		rewriteError.append(QObject::trUtf8("Rewriting as bool : parameter '"))
 				.append(parameterName)
-				.append(QObject::trUtf8("' expected.")).append('\n');
+				.append(QObject::trUtf8("' expected."));
 	}
 }

=== modified file 'connection/common/utils/parsers/oauthparser.hpp'
--- tools/parsers/oauthparser.hpp	2012-05-19 15:39:56 +0000
+++ connection/common/utils/parsers/oauthparser.hpp	2013-08-20 00:10:09 +0000
@@ -37,8 +37,8 @@
 {
 	public:
 		/// @fn QVariantMap parse(QByteArray data,
-		///						  bool & parseOK,
-		///						  QString & parseError,
+		///						  bool * parseOK = 0,
+		///						  QString * parseError = 0,
 		///						  int * lineError = 0,
 		///						  int * columnError = 0);
 		/// @brief Parsing datas for OAuth
@@ -48,26 +48,11 @@
 		/// @param lineError Line of the error. Unused.
 		/// @param columnError Column of the error. Unused.
 		QVariantMap parse(QByteArray data,
-						  bool & parseOK,
-						  QString & parseError,
+						  bool * parseOK = 0,
+						  QString * parseError = 0,
 						  int * lineError = 0,
 						  int * columnError = 0);
 
-		/// @fn QVariant extractParameter(QVariantMap & parsedMap,
-		///								  QString parameterName,
-		///								  bool & extractOK,
-		///								  QString & extractError);
-		/// @brief Extracting one parameter from the parsed result
-		/// @param parsedMap Parsed result
-		/// @param parameterName Name of the the parameter to extract
-		/// @param extractOK Boolean indicating if the extraction was successful
-		/// @param extractError Error message about an extraction error
-		/// @return The value of the extracted parameter
-		QVariant extractParameter(QVariantMap & parsedMap,
-								  QString parameterName,
-								  bool & extractOK,
-								  QString & extractError);
-
 		/// @fn void rewriteAsBool(QVariantMap & parsedMap,
 		///						   QString parameterName,
 		///						   bool & rewriteOK,

=== modified file 'connection/common/utils/parsers/xmlparser.cpp'
--- tools/parsers/xmlparser.cpp	2012-05-23 02:20:16 +0000
+++ connection/common/utils/parsers/xmlparser.cpp	2013-08-20 00:10:09 +0000
@@ -21,17 +21,22 @@
 /// You should have received a copy of the GNU Lesser General Public License
 /// along with Reyn Tweets. If not, see <http://www.gnu.org/licenses/>.
 
+#include "xmlparser.hpp"
 #include <QDomDocument>
-#include "xmlparser.hpp"
 
 // Parsing an XML document
 QDomElement XMLParser::parse(QByteArray data,
-							  bool &parseOK,
-							  QString &parseError,
-							  int * lineError,
-							  int * columnError)
+							 bool *parseOK,
+							 QString *parseError,
+							 int * lineError,
+							 int * columnError)
 {
 	QDomDocument res("XMLdoc");
-	parseOK = res.setContent(data, &parseError, lineError, columnError);
+
+	bool parseRes = res.setContent(data, parseError, lineError, columnError);
+	if (parseOK) {
+		*parseOK = parseRes;
+	}
+
 	return res.documentElement();
 }

=== modified file 'connection/common/utils/parsers/xmlparser.hpp'
--- tools/parsers/xmlparser.hpp	2012-05-23 02:20:16 +0000
+++ connection/common/utils/parsers/xmlparser.hpp	2013-08-20 00:10:09 +0000
@@ -33,8 +33,8 @@
 {
 	public:
 		/// @fn QDomElement parse(QByteArray data,
-		///						  bool & parseOK,
-		///						  QString & parseError,
+		///						  bool * parseOK = 0,
+		///						  QString * parseError = 0,
 		///						  int * lineError = 0,
 		///						  int * columnError = 0);
 		/// @brief Method for parsing results
@@ -44,8 +44,8 @@
 		/// @param lineError Line of the error
 		/// @param columnError Column of the error
 		QDomElement parse(QByteArray data,
-						  bool & parseOK,
-						  QString & parseError,
+						  bool * parseOK = 0,
+						  QString * parseError = 0,
 						  int * lineError = 0,
 						  int * columnError = 0);
 };

=== added file 'connection/libRT.pri'
--- connection/libRT.pri	1970-01-01 00:00:00 +0000
+++ connection/libRT.pri	2013-08-20 00:10:09 +0000
@@ -0,0 +1,99 @@
+#--------------------------------------------------------#
+# logic.pri                                              #
+# .pri sub project file with the connection part (libRT) #
+# Author : Romain Ducher                                 #
+#--------------------------------------------------------#
+
+#-----------------------------------------------------------------------------#
+#                                                                             #
+# Copyright 2013 Romain Ducher                                                #
+#                                                                             #
+# This file is part of Reyn Tweets.                                           #
+#                                                                             #
+# Reyn Tweets is free software: you can redistribute it and/or modify         #
+# it under the terms of the GNU Lesser General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# Reyn Tweets is distributed in the hope that it will be useful,              #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the                #
+# GNU Lesser General Public License for more details.                         #
+#                                                                             #
+# You should have received a copy of the GNU Lesser General Public License    #
+# along with Reyn Tweets. If not, see <http://www.gnu.org/licenses/>.         #
+#                                                                             #
+#-----------------------------------------------------------------------------#
+
+#-------------------------------------------------#
+# Core sources in libRT (used by all the services #
+#-------------------------------------------------#
+
+SOURCES += \
+	connection/common/utils/librtconstants.cpp \
+	connection/common/utils/connectionutils.cpp \
+	connection/common/utils/parsers/htmlparser.cpp \
+	connection/common/utils/parsers/jsonparser.cpp \
+	connection/common/utils/parsers/oauthparser.cpp \
+	connection/common/utils/parsers/xmlparser.cpp \
+	connection/common/networkresult.cpp \
+	connection/common/authenticators/apikeyauthenticator.cpp \
+	connection/common/authenticators/oauth/oauthutils.cpp \
+	connection/common/authenticators/oauth/oauthauthenticator.cpp \
+	connection/common/authenticators/oauth/oauth10aauthenticator.cpp \
+	connection/common/authenticators/oauth/oauth2authenticator.cpp \
+	connection/common/communicators/twittercommunicator.cpp \
+	connection/common/resultwrapper.cpp \
+	connection/common/requests/genericrequester.cpp \
+	connection/common/calls/requestermanager.cpp \
+	connection/common/calls/genericcalls.cpp
+
+
+HEADERS  += \
+	connection/common/utils/httpcode.hpp \
+	connection/common/utils/librtconstants.hpp \
+	connection/common/utils/connectionutils.hpp \
+	connection/common/utils/parsers/genericparser.hpp \
+	connection/common/utils/parsers/htmlparser.hpp \
+	connection/common/utils/parsers/jsonparser.hpp \
+	connection/common/utils/parsers/oauthparser.hpp \
+	connection/common/utils/parsers/xmlparser.hpp \
+	connection/common/httprequesttype.hpp \
+	connection/common/headersmap.hpp \
+	connection/common/networkresult.hpp \
+	connection/common/responseinfos.hpp \
+	connection/common/authenticators/apikeyauthenticator.hpp \
+	connection/common/authenticators/basicauthenticators.hpp \
+	connection/common/authenticators/oauth/oauthutils.hpp \
+	connection/common/authenticators/oauth/oauthauthenticator.hpp \
+	connection/common/authenticators/oauth/oauth10aauthenticator.hpp \
+	connection/common/authenticators/oauth/oauth2authenticator.hpp \
+	connection/common/communicators/twittercommunicator.hpp \
+	connection/common/networkresulttype.hpp \
+	connection/common/requestresult.hpp \
+	connection/common/resultwrapper.hpp \
+	connection/common/requests/identificationway.hpp \
+	connection/common/requests/genericrequester.hpp \
+	connection/common/calls/requestinfos.hpp \
+	connection/common/calls/requestermanager.hpp \
+	connection/common/calls/genericcalls.hpp
+
+
+#----------------------------------------#
+# Third party services included in libRT #
+#----------------------------------------#
+
+# Twitter
+include(twitter/twitter.pri)
+
+# Twitlonger
+include(twitlonger/twitlonger.pri)
+
+
+#-------------#
+# Other files #
+#-------------#
+
+OTHER_FILES += \
+    connection/twitlonger/twitlonger.pri \
+    connection/twitter/twitter.pri

=== removed directory 'connection/model'
=== removed directory 'connection/model/managers'
=== removed file 'connection/model/requestinfos.cpp'
--- connection/model/requestinfos.cpp	2012-09-12 22:38:35 +0000
+++ connection/model/requestinfos.cpp	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-/// @file requestinfos.cpp
-/// @brief Implementation of RequestInfos
-///
-/// Revisions older than r242 were in /trunk/ReynTweets/connection
-/// @author Romain Ducher
-///
-/// @section LICENSE
-///
-/// Copyright 2012 Romain Ducher
-///
-/// This file is part of Reyn Tweets.
-///
-/// Reyn Tweets is free software: you can redistribute it and/or modify
-/// it under the terms of the GNU Lesser General Public License as published by
-/// the Free Software Foundation, either version 3 of the License, or
-/// (at your option) any later version.
-///
-/// Reyn Tweets is distributed in the hope that it will be useful,
-/// but WITHOUT ANY WARRANTY; without even the implied warranty of
-/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-/// GNU Lesser General Public License for more details.
-///
-/// You should have received a copy of the GNU Lesser General Public License
-/// along with Reyn Tweets. If not, see <http://www.gnu.org/licenses/>.
-
-#include "requestinfos.hpp"
-
-// Constructor
-RequestInfos::RequestInfos(QObject * requestAsker,
-						   GenericRequester * twitterRequest) :
-	asker(requestAsker),
-	requester(twitterRequest)
-{}
-
-// Destructor
-RequestInfos::~RequestInfos() {
-	asker = 0;
-	requester = 0;
-}
-
-// Getter on asker
-QObject * RequestInfos::getAsker() {
-	return asker;
-}
-
-// Getter on requester
-GenericRequester * RequestInfos::getRequester() {
-	return requester;
-}

=== removed directory 'connection/requests'
=== removed file 'connection/requests/twitter/oauth/authenticaterequester.cpp'
--- connection/requests/twitter/oauth/authenticaterequester.cpp	2012-01-07 01:10:23 +0000
+++ connection/requests/twitter/oauth/authenticaterequester.cpp	1970-01-01 00:00:00 +0000
@@ -1,130 +0,0 @@
-/// @file authenticaterequester.cpp
-/// @brief Implementation of AuthenticateRequester
-/// @author Romain Ducher
-
-/*
-Copyright 2011 Romain Ducher
-
-This file is part of Reyn Tweets.
-
-Reyn Tweets is free software: you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-Reyn Tweets is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with Reyn Tweets. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "authenticaterequester.hpp"
-
-AuthenticateRequester::AuthenticateRequester(OAuthManager & authManager,
-											 QObject *requester) :
-	OAuthRequester(authManager,
-				   GET,
-				   TwitterURL::AUTHENTICATE_URL,
-				   requester)
-{}
-
-// Building GET Parameters
-void AuthenticateRequester::buildGETParameters() {
-	getParameters.insert("oauth_token", oauthManager->getOAuthToken());
-}
-
-// Building POST Parameters
-void AuthenticateRequester::buildPOSTParameters() {}
-
-// Parse the raw results of the request.
-QVariant AuthenticateRequester::parseResult(bool & parseOK, QVariantMap & parsingErrors) {
-	/*
-	QVariantMap resultMap;	// Result of the request
-	bool rightParameter;	// Boolean indicating if the parameter name is right
-	QString errorMsg = "Error for parameter ";
-	QString subErrorMsg;
-
-	// Parsing
-	QByteArray rawResponse = communicator->getResponseBuffer();
-	QList<QByteArray> results = rawResponse.split('&');
-
-	QList<QByteArray> resultPair;
-	QByteArray parameterName;
-	QByteArray result;
-
-	// Getting the request token
-	resultPair = results.at(0).split('=');
-
-	// Ensures that the parameter name is "oauth_token"
-	parameterName = resultPair.at(0);
-	rightParameter = "oauth_token" == parameterName;
-	parseOK = rightParameter;
-
-	if (rightParameter) {
-		result = resultPair.at(1);
-		oauthManager->setOAuthToken(QString(result));
-	} else {
-		subErrorMsg = "'";
-		subErrorMsg.append(parameterName);
-		subErrorMsg.append("' (supposed to be 'oauth_token'), ");
-		errorMsg.append(subErrorMsg);
-	}
-
-	// Getting the request secret
-	resultPair = results.at(1).split('=');
-
-	// Ensures that the parameter name is "oauth_token_secret"
-	parameterName = resultPair.at(0);
-	rightParameter = "oauth_token_secret" == parameterName;
-	parseOK = parseOK && rightParameter;
-
-	if (rightParameter) {
-		result = resultPair.at(1);
-		oauthManager->setOAuthSecret(QString(result));
-	} else {
-		subErrorMsg = "parameter '";
-		subErrorMsg.append(parameterName);
-		subErrorMsg.append("' (supposed to be 'oauth_token_secret'), ");
-		errorMsg.append(subErrorMsg);
-	}
-
-
-	// Was the callback URL confirmed ?
-	resultPair = results.at(2).split('=');
-
-	// Ensures that the parameter name is "oauth_callback_confirmed"
-	parameterName = resultPair.at(0);
-	rightParameter = "oauth_callback_confirmed" == parameterName;
-	parseOK = parseOK && rightParameter;
-
-	if (rightParameter) {
-		result = resultPair.at(1);
-		bool callbackUrlConfirmed = ("true" == result) || !("false" == result);
-		resultMap.insert("oauth_callback_confirmed", QVariant(callbackUrlConfirmed));
-	} else {
-		subErrorMsg = "parameter '";
-		subErrorMsg.append(parameterName);
-		subErrorMsg.append("' (supposed to be 'oauth_callback_confirmed')");
-		errorMsg.append(subErrorMsg);
-	}
-
-
-	// There was a problem while parsing -> fill the parsingErrors map !
-	if (!parseOK) {
-		if (errorMsg.endsWith(", ")) {
-			errorMsg.chop(2);
-			errorMsg.append('.');
-		}
-
-		parsingErrors.insert("errorMsg", QVariant(errorMsg));
-	}
-
-	return QVariant(resultMap);
-	//*/
-
-	return QVariant();
-}
-

=== removed file 'connection/requests/twitter/oauth/authenticaterequester.hpp'
--- connection/requests/twitter/oauth/authenticaterequester.hpp	2012-01-07 01:32:25 +0000
+++ connection/requests/twitter/oauth/authenticaterequester.hpp	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-/// @file authenticaterequester.hpp
-/// @brief Header of AuthenticateRequester
-/// @author Romain Ducher
-
-/*
-Copyright 2011 Romain Ducher
-
-This file is part of Reyn Tweets.
-
-Reyn Tweets is free software: you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-Reyn Tweets is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with Reyn Tweets. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef AUTHENTICATEREQUESTER_HPP
-#define AUTHENTICATEREQUESTER_HPP
-
-#include "oauthrequester.hpp"
-
-/// @class AuthenticateRequester
-/// @brief Requester for OAuth authentication.
-/// <strong>Unused for the moment.</strong>
-class AuthenticateRequester : public OAuthRequester
-{
-	Q_OBJECT
-
-	public:
-		/// @fn AuthenticateRequester(OAuthManager & authManager,
-		///							  QObject * requester = 0);
-		/// @brief Constructor
-		/// @param authManager Information for OAuth. It has to be not null
-		/// @param requester QObject which asks for this search.
-		AuthenticateRequester(OAuthManager & authManager,
-							  QObject * requester = 0);
-
-	protected:
-		/// @fn void buildGETParameters();
-		/// @brief Method building GET Parameters
-		void buildGETParameters();
-
-		/// @fn void buildPOSTParameters();
-		/// @brief Method building POST Parameters
-		void buildPOSTParameters();
-
-		// TODO
-		/// @fn QVariant parseResult(bool & parseOK, QVariantMap & parsingErrors);
-		/// @brief Method that will parse the raw results of the request.
-		/// @param parseOK Boolean whose value will be set to true if there was
-		/// no problem while parsing, false otherwise.
-		/// @param parsingErrors QVariantMap that may contain information about
-		/// errors that may occur while parsing.
-		/// @return Parsed results
-		QVariant parseResult(bool & parseOK, QVariantMap & parsingErrors);
-
-};
-
-#endif // AUTHENTICATEREQUESTER_HPP

=== removed file 'connection/requests/twitter/oauth/postauthorizerequester.cpp'
--- connection/requests/twitter/oauth/postauthorizerequester.cpp	2012-09-12 22:38:35 +0000
+++ connection/requests/twitter/oauth/postauthorizerequester.cpp	1970-01-01 00:00:00 +0000
@@ -1,228 +0,0 @@
-/// @file postauthorizerequester.cpp
-/// @brief Implementation of PostAuthorizeRequester
-/// @author Romain Ducher
-///
-/// @section LICENSE
-///
-/// Copyright 2011 Romain Ducher
-///
-/// This file is part of Reyn Tweets.
-///
-/// Reyn Tweets is free software: you can redistribute it and/or modify
-/// it under the terms of the GNU Lesser General Public License as published by
-/// the Free Software Foundation, either version 3 of the License, or
-/// (at your option) any later version.
-///
-/// Reyn Tweets is distributed in the hope that it will be useful,
-/// but WITHOUT ANY WARRANTY; without even the implied warranty of
-/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-/// GNU Lesser General Public License for more details.
-///
-/// You should have received a copy of the GNU Lesser General Public License
-/// along with Reyn Tweets. If not, see <http://www.gnu.org/licenses/>.
-
-#include "postauthorizerequester.hpp"
-#include "../../../../tools/parsers/htmlparser.hpp"
-#include "../../../../tools/parsers/oauthparser.hpp"
-
-// Constructor
-PostAuthorizeRequester::PostAuthorizeRequester(OAuthManager &authManager,
-											   QString pseudo,
-											   QString pwd,
-											   bool deny) :
-	OAuthRequester(POST,
-				   TwitterURL::AUTHORIZE_URL,
-				   authManager,
-				   HTML_PARSING),
-	login(pseudo),
-	password(pwd),
-	denyReynTweets(deny)
-{}
-
-// Building postParameters
-void PostAuthorizeRequester::buildPOSTParameters() {
-	postParameters.insert("authenticity_token",
-						  QString::fromAscii(oauthManager.getAuthenticityToken().data()));
-	getParameters.insert("oauth_token",
-						 QString::fromAscii(oauthManager.getOAuthToken().data()));
-
-	postParameters.insert("session[username_or_email]", login);
-	postParameters.insert("session[password]", password);
-
-	if (denyReynTweets) {
-		postParameters.insert("deny", oauthManager.getDeny());
-	}
-}
-
-// Parsing the raw results of the request.
-QVariant PostAuthorizeRequester::parseResult(bool & parseOK,
-											 QVariantMap & parsingErrors)
-{
-	QVariantMap parsedResults;		// Map for results
-	QString errorMsg = "";			// Error message written while parsing
-