Hello community,
here is the log from the commit of package vacuum-im for openSUSE:Factory
checked in at 2016-06-19 12:53:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vacuum-im (Old)
and /work/SRC/openSUSE:Factory/.vacuum-im.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vacuum-im"
Changes:
--------
--- /work/SRC/openSUSE:Factory/vacuum-im/vacuum-im.changes 2015-06-12
20:31:37.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.vacuum-im.new/vacuum-im.changes 2016-06-19
12:53:50.000000000 +0200
@@ -1,0 +2,5 @@
+Sat Jun 18 18:51:55 UTC 2016 - egdf...@opensuse.org
+
+- add vacuum-im-gcc6.patch to resolve bnc#985094
+
+-------------------------------------------------------------------
Old:
----
vacuum-im-1.2.5+rc9ea75a.tar.xz
New:
----
vacuum-im-1.2.5+rab1f3e3.tar.xz
vacuum-im-gcc6.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vacuum-im.spec ++++++
--- /var/tmp/diff_new_pack.zTcyxt/_old 2016-06-19 12:53:51.000000000 +0200
+++ /var/tmp/diff_new_pack.zTcyxt/_new 2016-06-19 12:53:51.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package vacuum-im
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,8 +17,8 @@
%define sname vacuum
-%define rtime 1433926841
-%define rhash c9ea75a
+%define rtime 1433788363
+%define rhash ab1f3e3
Name: %{sname}-im
Summary: Crossplatform Jabber client written on Qt
License: GPL-3.0
@@ -32,6 +32,8 @@
Patch1: paranoia.patch
# PATCH-FIX-OPENSUSE fix_default_smiles.patch
Patch2: fix_default_smiles.patch
+# PATCH-FEATURE-UPSTREAM to resolve build time issue via gcc6 (bnc#985094).
+Patch3: vacuum-im-gcc6.patch
Url: http://www.vacuum-im.org/
BuildRequires: cmake >= 2.8
BuildRequires: fdupes
@@ -73,6 +75,9 @@
%patch0 -p1
%patch1 -p0
%patch2 -p0
+%patch3 -p0
+# fix shlib-policy-name-error
+sed -i -e '/set(VERSION_UTILS_ABI/ s/[[:digit:]]*\.\([[:digit:]]*\)/\1/'
config.cmake
%build
%{__mkdir} build
++++++ vacuum-im-1.2.5+rc9ea75a.tar.xz -> vacuum-im-1.2.5+rab1f3e3.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vacuum-im/CMakeLists.txt new/vacuum-im/CMakeLists.txt
--- old/vacuum-im/CMakeLists.txt 2015-06-11 20:53:31.000000000 +0200
+++ new/vacuum-im/CMakeLists.txt 2016-03-26 19:09:02.000000000 +0100
@@ -2,10 +2,6 @@
project(vacuum-im)
-if(POLICY CMP0022)
- cmake_policy(SET CMP0022 NEW)
-endif()
-
find_package(Qt4 REQUIRED)
add_custom_target(updatets)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vacuum-im/config.cmake new/vacuum-im/config.cmake
--- old/vacuum-im/config.cmake 2015-06-11 20:49:21.000000000 +0200
+++ new/vacuum-im/config.cmake 2016-03-26 19:09:02.000000000 +0100
@@ -3,7 +3,7 @@
if (UNIX)
set(VERSION_UTILS 1.17.0)
- set(VERSION_UTILS_ABI 17)
+ set(VERSION_UTILS_ABI 1.17)
endif (UNIX)
if (APPLE)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vacuum-im/src/loader/CMakeLists.txt
new/vacuum-im/src/loader/CMakeLists.txt
--- old/vacuum-im/src/loader/CMakeLists.txt 2015-06-11 20:44:08.000000000
+0200
+++ new/vacuum-im/src/loader/CMakeLists.txt 2016-03-26 19:09:02.000000000
+0100
@@ -12,25 +12,20 @@
set(QT_USE_QTMAIN YES)
include(${QT_USE_FILE})
-set(GIT_HASH "" CACHE STRING "GIT HASH: git log -n 1 --format=%H")
-set(GIT_DATE "" CACHE STRING "GIT DATE: git log -n 1 --format=%ct")
+set(VER_STRING "" CACHE STRING "This string will be appended to program
version (defaults to SVN revision number)")
-if (GIT_HASH STREQUAL "")
- execute_process(COMMAND git log -n 1 --format=%H WORKING_DIRECTORY
${CMAKE_SOURCE_DIR}
- OUTPUT_VARIABLE GIT_HASH
OUTPUT_STRIP_TRAILING_WHITESPACE)
-endif (GIT_HASH STREQUAL "")
+if (VER_STRING STREQUAL "")
+execute_process(COMMAND svnversion -n -c "${CMAKE_SOURCE_DIR}"
+ OUTPUT_VARIABLE SVN_REVISION)
+else (VER_STRING STREQUAL "")
+ set(SVN_REVISION "0:${VER_STRING}") # see PluginManager::revision()
+endif (VER_STRING STREQUAL "")
-if (GIT_DATE STREQUAL "")
- execute_process(COMMAND git log -n 1 --format=%ct WORKING_DIRECTORY
${CMAKE_SOURCE_DIR}
- OUTPUT_VARIABLE GIT_DATE
OUTPUT_STRIP_TRAILING_WHITESPACE)
-endif (GIT_DATE STREQUAL "")
-
-if (NOT (GIT_DATE STREQUAL ""))
- file(REMOVE "${CMAKE_BINARY_DIR}/src/loader/gitinfo.h")
- file(APPEND "${CMAKE_BINARY_DIR}/src/loader/gitinfo.h" "#define
GIT_HASH \"${GIT_HASH}\"\n")
- file(APPEND "${CMAKE_BINARY_DIR}/src/loader/gitinfo.h" "#define
GIT_DATE \"${GIT_DATE}\"\n")
- add_definitions(-DGITINFO)
-endif (NOT (GIT_DATE STREQUAL ""))
+if (NOT (SVN_REVISION STREQUAL "" OR SVN_REVISION STREQUAL "exported" OR
SVN_REVISION STREQUAL "Unversioned directory"))
+ file(REMOVE "svninfo.h")
+ file(WRITE "svninfo.h" "#define SVN_REVISION \"${SVN_REVISION}\"\n")
+ add_definitions(-DSVNINFO)
+endif (NOT (SVN_REVISION STREQUAL "" OR SVN_REVISION STREQUAL "exported" OR
SVN_REVISION STREQUAL "Unversioned directory"))
if (WIN32)
if (MINGW)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vacuum-im/src/loader/loader.pro
new/vacuum-im/src/loader/loader.pro
--- old/vacuum-im/src/loader/loader.pro 2015-06-11 20:44:08.000000000 +0200
+++ new/vacuum-im/src/loader/loader.pro 2016-03-26 19:09:02.000000000 +0100
@@ -1,88 +1,85 @@
-include(../config.inc)
-include(../install.inc)
-
-TARGET = $$TARGET_LOADER
-TEMPLATE = app
-QT += xml
-LIBS += -L../libs
-LIBS += -l$$TARGET_UTILS
-DEPENDPATH += ..
-INCLUDEPATH += ..
-DESTDIR = ../..
-include(loader.pri)
-
-#Appication icon
-win32:RC_FILE = loader.rc
-
-#GIT Info
-GIT_HASH = $$system(git log -n 1 --format=%H)
-GIT_DATE = $$system(git log -n 1 --format=%ct)
-GIT_DATE = $$find(GIT_DATE,^\\d*)
-!isEmpty(GIT_DATE) {
- win32 {
- WIN_OUT_PWD = $$replace(OUT_PWD, /, \\)
- system(mkdir $${WIN_OUT_PWD} & echo $${LITERAL_HASH}define GIT_HASH
\"$${GIT_HASH}\" > $${WIN_OUT_PWD}\\gitinfo.h) {
- system(echo $${LITERAL_HASH}define GIT_DATE \"$${GIT_DATE}\" >>
$${WIN_OUT_PWD}\\gitinfo.h)
- DEFINES += GITINFO
- QMAKE_DISTCLEAN += $${OUT_PWD}/gitinfo.h
- }
- } else {
- system(mkdir -p $${OUT_PWD} && echo \\$${LITERAL_HASH}define GIT_HASH
\\\"$${GIT_HASH}\\\" > $${OUT_PWD}/gitinfo.h) {
- system(echo \\$${LITERAL_HASH}define GIT_DATE \\\"$${GIT_DATE}\\\" >>
$${OUT_PWD}/gitinfo.h)
- DEFINES += GITINFO
- QMAKE_DISTCLEAN += $${OUT_PWD}/gitinfo.h
- }
- }
-}
-
-#Install
-target.path = $$INSTALL_BINS
-resources.path = $$INSTALL_RESOURCES
-resources.files = ../../resources/*
-documents.path = $$INSTALL_DOCUMENTS
-documents.files = ../../AUTHORS ../../CHANGELOG ../../README ../../COPYING
../../TRANSLATORS
-INSTALLS += target resources documents
-
-#Translation
-TRANS_SOURCE_ROOT = ..
-include(../translations.inc)
-
-#Linux desktop install
-unix:!macx {
- icons.path = $$INSTALL_PREFIX/$$INSTALL_RES_DIR/pixmaps
- icons.files = ../../resources/menuicons/shared/vacuum.png
- INSTALLS += icons
-
- desktop.path = $$INSTALL_PREFIX/$$INSTALL_RES_DIR/applications
- desktop.files = ../../src/packages/linux/*.desktop
- INSTALLS += desktop
-}
-
-#MacOS Install
-macx {
- UTILS_LIB_NAME = lib$${TARGET_UTILS}.$${VERSION_UTILS}.dylib
- UTILS_LIB_LINK = lib$${TARGET_UTILS}.1.dylib
- UTILS_LIB_LINK_EXTERNAL_PLUGINS = lib$${TARGET_UTILS}.dylib
-
- lib_utils.path = $$INSTALL_LIBS
- lib_utils.extra = cp -f ../libs/$$UTILS_LIB_NAME
$(INSTALL_ROOT)$$INSTALL_LIBS/$$UTILS_LIB_NAME && \
- ln -sf $$UTILS_LIB_NAME
$(INSTALL_ROOT)$$INSTALL_LIBS/$$UTILS_LIB_LINK && \
- ln -sf $$UTILS_LIB_NAME
$(INSTALL_ROOT)$$INSTALL_LIBS/$$UTILS_LIB_LINK_EXTERNAL_PLUGINS
- INSTALLS += lib_utils
-
- name_tool.path = $$INSTALL_BINS
- name_tool.extra = install_name_tool -change $$UTILS_LIB_LINK
@executable_path/../Frameworks/$$UTILS_LIB_LINK
$(INSTALL_ROOT)$$INSTALL_BINS/$$INSTALL_APP_DIR/Contents/MacOS/$$TARGET_LOADER
- INSTALLS += name_tool
-
- #Dirty hack to install utils translations
- TARGET = $$TARGET_UTILS
- include(../translations.inc)
- TARGET = $$TARGET_LOADER
-
- ICON = ../../vacuum.icns
- QMAKE_INFO_PLIST = ../packages/macosx/Info.plist
-
- en_lproj.path = $$INSTALL_RESOURCES/en.lproj/
- en_lproj.files = ../packages/macosx/InfoPlist.strings
- INSTALLS += en_lproj
-}
+include(../config.inc)
+include(../install.inc)
+
+TARGET = $$TARGET_LOADER
+TEMPLATE = app
+QT += xml
+LIBS += -L../libs
+LIBS += -l$$TARGET_UTILS
+DEPENDPATH += ..
+INCLUDEPATH += ..
+DESTDIR = ../..
+include(loader.pri)
+
+#Appication icon
+win32:RC_FILE = loader.rc
+macx:ICON = ../../vacuum.icns
+
+#MacOS Info.plist
+macx:QMAKE_INFO_PLIST = ../../src/packages/macosx/Info.plist
+
+#GIT Info
+GIT_HASH = $$system(git log -n 1 --format=%H)
+GIT_DATE = $$system(git log -n 1 --format=%ct)
+GIT_DATE = $$find(GIT_DATE,^\\d*)
+!isEmpty(GIT_DATE) {
+ win32 {
+ WIN_OUT_PWD = $$replace(OUT_PWD, /, \\)
+ system(mkdir $${WIN_OUT_PWD} & echo $${LITERAL_HASH}define GIT_HASH
\"$${GIT_HASH}\" > $${WIN_OUT_PWD}\\gitinfo.h) {
+ system(echo $${LITERAL_HASH}define GIT_DATE \"$${GIT_DATE}\" >>
$${WIN_OUT_PWD}\\gitinfo.h)
+ DEFINES += GITINFO
+ QMAKE_DISTCLEAN += $${OUT_PWD}/gitinfo.h
+ }
+ } else {
+ system(mkdir -p $${OUT_PWD} && echo \\$${LITERAL_HASH}define GIT_HASH
\\\"$${GIT_HASH}\\\" > $${OUT_PWD}/gitinfo.h) {
+ system(echo \\$${LITERAL_HASH}define GIT_DATE \\\"$${GIT_DATE}\\\" >>
$${OUT_PWD}/gitinfo.h)
+ DEFINES += GITINFO
+ QMAKE_DISTCLEAN += $${OUT_PWD}/gitinfo.h
+ }
+ }
+}
+
+#Install
+target.path = $$INSTALL_BINS
+resources.path = $$INSTALL_RESOURCES
+resources.files = ../../resources/*
+documents.path = $$INSTALL_DOCUMENTS
+documents.files = ../../AUTHORS ../../CHANGELOG ../../README ../../COPYING
../../TRANSLATORS
+INSTALLS += target resources documents
+
+#Translation
+TRANS_SOURCE_ROOT = ..
+include(../translations.inc)
+
+#Linux desktop install
+unix:!macx {
+ icons.path = $$INSTALL_PREFIX/$$INSTALL_RES_DIR/pixmaps
+ icons.files = ../../resources/menuicons/shared/vacuum.png
+ INSTALLS += icons
+
+ desktop.path = $$INSTALL_PREFIX/$$INSTALL_RES_DIR/applications
+ desktop.files = ../../src/packages/linux/*.desktop
+ INSTALLS += desktop
+}
+
+#MacOS Install
+macx {
+ UTILS_LIB_NAME = lib$${TARGET_UTILS}.$${VERSION_UTILS}.dylib
+ UTILS_LIB_LINK = lib$${TARGET_UTILS}.1.dylib
+ UTILS_LIB_LINK_EXTERNAL_PLUGINS = lib$${TARGET_UTILS}.dylib
+
+ lib_utils.path = $$INSTALL_LIBS
+ lib_utils.extra = cp -f ../libs/$$UTILS_LIB_NAME
$(INSTALL_ROOT)$$INSTALL_LIBS/$$UTILS_LIB_NAME && \
+ ln -sf $$UTILS_LIB_NAME
$(INSTALL_ROOT)$$INSTALL_LIBS/$$UTILS_LIB_LINK && \
+ ln -sf $$UTILS_LIB_NAME
$(INSTALL_ROOT)$$INSTALL_LIBS/$$UTILS_LIB_LINK_EXTERNAL_PLUGINS
+ INSTALLS += lib_utils
+
+ name_tool.path = $$INSTALL_BINS
+ name_tool.extra = install_name_tool -change $$UTILS_LIB_LINK
@executable_path/../Frameworks/$$UTILS_LIB_LINK
$(INSTALL_ROOT)$$INSTALL_BINS/$$INSTALL_APP_DIR/Contents/MacOS/$$TARGET_LOADER
+ INSTALLS += name_tool
+
+ #Dirty hack to install utils translations
+ TARGET = $$TARGET_UTILS
+ include(../translations.inc)
+ TARGET = $$TARGET_LOADER
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vacuum-im/src/loader/main.cpp
new/vacuum-im/src/loader/main.cpp
--- old/vacuum-im/src/loader/main.cpp 2015-06-11 20:44:08.000000000 +0200
+++ new/vacuum-im/src/loader/main.cpp 2016-03-26 19:09:02.000000000 +0100
@@ -4,13 +4,6 @@
int main(int argc, char *argv[])
{
-#ifdef Q_OS_MACX
- if (QSysInfo::MacintoshVersion == QSysInfo::MV_YOSEMITE )
- {
- // https://bugreports.qt-project.org/browse/QTBUG-40833
- QFont::insertSubstitution(".Helvetica Neue DeskInterface",
"Helvetica Neue");
- }
-#endif
QApplication app(argc, argv);
app.setQuitOnLastWindowClosed(false);
app.addLibraryPath(app.applicationDirPath());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vacuum-im/src/thirdparty/jdns/CMakeLists.txt
new/vacuum-im/src/thirdparty/jdns/CMakeLists.txt
--- old/vacuum-im/src/thirdparty/jdns/CMakeLists.txt 2015-06-11
20:44:08.000000000 +0200
+++ new/vacuum-im/src/thirdparty/jdns/CMakeLists.txt 2016-03-26
19:09:02.000000000 +0100
@@ -14,6 +14,7 @@
add_library(jdns STATIC ${SOURCES} ${MOC_SOURCES}
"${CMAKE_CURRENT_BINARY_DIR}/qjdns.moc")
target_link_libraries(jdns ${QT_LIBRARIES} ${LIBS})
+target_link_libraries(jdns LINK_INTERFACE_LIBRARIES)
set_target_properties(jdns PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/src/libs"
COMPILE_FLAGS "-w ${CMAKE_SHARED_LIBRARY_C_FLAGS}"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vacuum-im/src/utils/CMakeLists.txt
new/vacuum-im/src/utils/CMakeLists.txt
--- old/vacuum-im/src/utils/CMakeLists.txt 2015-06-11 20:44:08.000000000
+0200
+++ new/vacuum-im/src/utils/CMakeLists.txt 2016-03-26 19:09:02.000000000
+0100
@@ -14,10 +14,12 @@
add_definitions("-DUTILS_DLL")
add_definitions("-DQXT_STATIC")
link_directories("${CMAKE_BINARY_DIR}/libs")
-include_directories(AFTER "${CMAKE_SOURCE_DIR}/src")
-
-set(ADD_LIBS qxtglobalshortcut idle)
-
+include_directories(AFTER "${CMAKE_SOURCE_DIR}/src/thirdparty/zlib")
+include(FindX11)
+include_directories(AFTER ${X11_INCLUDE_DIR})
+if (NOT SYSTEM_IDN_FOUND)
+ include_directories("${CMAKE_SOURCE_DIR}/src/thirdparty/idn")
+endif (NOT SYSTEM_IDN_FOUND)
add_translations(TRANSLATIONS "${TARGET_UTILS}" ${SOURCES})
add_library(${TARGET_UTILS} SHARED ${SOURCES} ${MOC_SOURCES} ${TRANSLATIONS})
@@ -25,18 +27,12 @@
VERSION "${VERSION_UTILS}"
SOVERSION "${VERSION_UTILS_ABI}")
-if (UNIX AND NOT APPLE)
- include(FindX11)
- include_directories(AFTER ${X11_INCLUDE_DIR})
- list(APPEND ADD_LIBS ${X11_LIBRARIES})
-
- if (X11_Xscreensaver_FOUND)
- message(STATUS "Found Xscreensaver: ${X11_Xscreensaver_LIB}")
- list(APPEND ADD_LIBS "${X11_Xscreensaver_LIB}")
- else (X11_Xscreensaver_FOUND)
- message(STATUS "Xscreensaver not found")
- endif (X11_Xscreensaver_FOUND)
-endif (UNIX AND NOT APPLE)
+set(ADD_LIBS qxtglobalshortcut idle)
+if (SYSTEM_ZLIB_FOUND)
+ list(APPEND ADD_LIBS "${SYSTEM_ZLIB_FOUND}")
+else (SYSTEM_ZLIB_FOUND)
+ list(APPEND ADD_LIBS zlib)
+endif (SYSTEM_ZLIB_FOUND)
if (SYSTEM_IDN_FOUND)
list(APPEND ADD_LIBS "${SYSTEM_IDN_FOUND}")
@@ -44,22 +40,25 @@
list(APPEND ADD_LIBS idn)
endif (SYSTEM_IDN_FOUND)
-if (SYSTEM_ZLIB_FOUND)
- list(APPEND ADD_LIBS "${SYSTEM_ZLIB_FOUND}")
-else (SYSTEM_ZLIB_FOUND)
- list(APPEND ADD_LIBS zlib)
-endif (SYSTEM_ZLIB_FOUND)
-
if (SYSTEM_MINIZIP_FOUND)
list(APPEND ADD_LIBS "${SYSTEM_MINIZIP_FOUND}")
else (SYSTEM_MINIZIP_FOUND)
list(APPEND ADD_LIBS minizip)
endif (SYSTEM_MINIZIP_FOUND)
+
+if (X11_Xscreensaver_FOUND)
+ message(STATUS "Found Xscreensaver: ${X11_Xscreensaver_LIB}")
+ list(APPEND ADD_LIBS "${X11_Xscreensaver_LIB}")
+else (X11_Xscreensaver_FOUND)
+ message(STATUS "Xscreensaver not found")
+endif (X11_Xscreensaver_FOUND)
+
if (APPLE)
list(APPEND ADD_LIBS "-framework Carbon")
endif (APPLE)
+target_link_libraries(${TARGET_UTILS} LINK_INTERFACE_LIBRARIES ${QT_LIBRARIES})
target_link_libraries(${TARGET_UTILS} ${QT_LIBRARIES} ${ADD_LIBS})
if (WIN32)
++++++ vacuum-im-gcc6.patch ++++++
diff --git src/plugins/adiummessagestyle/adiummessagestyle.cpp
src/plugins/adiummessagestyle/adiummessagestyle.cpp
index 0332ac5..7260d10 100644
--- src/plugins/adiummessagestyle/adiummessagestyle.cpp
+++ src/plugins/adiummessagestyle/adiummessagestyle.cpp
@@ -19,7 +19,7 @@
#define SCROLL_TIMEOUT 100
#define EVALUTE_TIMEOUT 10
-#define SHARED_STYLE_PATH
RESOURCES_DIR"/"RSR_STORAGE_ADIUMMESSAGESTYLES"/"STORAGE_SHARED_DIR
+#define SHARED_STYLE_PATH RESOURCES_DIR "/"
RSR_STORAGE_ADIUMMESSAGESTYLES "/" STORAGE_SHARED_DIR
#define STYLE_CONTENTS_PATH "Contents"
#define STYLE_RESOURCES_PATH STYLE_CONTENTS_PATH"/Resources"
@@ -54,14 +54,14 @@ AdiumMessageStyle::AdiumMessageStyle(const QString
&AStylePath, QNetworkAccessMa
if (FSharedPath.isEmpty())
{
if (QDir::isRelativePath(SHARED_STYLE_PATH))
- FSharedPath =
qApp->applicationDirPath()+"/"SHARED_STYLE_PATH;
+ FSharedPath = qApp->applicationDirPath() + "/"
SHARED_STYLE_PATH;
else
FSharedPath = SHARED_STYLE_PATH;
}
FInfo = styleInfo(AStylePath);
FVariants = styleVariants(AStylePath);
- FResourcePath = AStylePath+"/"STYLE_RESOURCES_PATH;
+ FResourcePath = AStylePath + "/" STYLE_RESOURCES_PATH;
FNetworkAccessManager = ANetworkAccessManager;
initStyleSettings();
@@ -248,7 +248,7 @@ QList<QString> AdiumMessageStyle::styleVariants(const
QString &AStylePath)
QList<QString> files;
if (!AStylePath.isEmpty())
{
- QDir dir(AStylePath+"/"STYLE_RESOURCES_PATH"/Variants");
+ QDir dir(AStylePath + "/" STYLE_RESOURCES_PATH "/Variants");
files =
dir.entryList(QStringList("*.css"),QDir::Files,QDir::Name);
for (int i=0; i<files.count();i++)
files[i].chop(4);
@@ -260,7 +260,7 @@ QMap<QString, QVariant> AdiumMessageStyle::styleInfo(const
QString &AStylePath)
{
QMap<QString, QVariant> info;
- QFile file(AStylePath+"/"STYLE_CONTENTS_PATH"/Info.plist");
+ QFile file(AStylePath + "/" STYLE_CONTENTS_PATH "/Info.plist");
if (!AStylePath.isEmpty() && file.open(QFile::ReadOnly))
{
QDomDocument doc;
diff --git src/plugins/filemessagearchive/filemessagearchive.cpp
src/plugins/filemessagearchive/filemessagearchive.cpp
index 92104b3..ef72c9b 100644
--- src/plugins/filemessagearchive/filemessagearchive.cpp
+++ src/plugins/filemessagearchive/filemessagearchive.cpp
@@ -511,7 +511,7 @@ IArchiveModifications
FileMessageArchive::loadFileModifications(const Jid &AStre
if (!dirPath.isEmpty() && AStreamJid.isValid() && AStart.isValid())
{
FThreadLock.lockForRead();
- QFile log(dirPath+"/"LOG_FILE_NAME);
+ QFile log(dirPath + "/" LOG_FILE_NAME);
if (log.open(QFile::ReadOnly|QIODevice::Text))
{
qint64 sbound = 0;
@@ -655,7 +655,7 @@ void FileMessageArchive::loadGatewayTypes()
{
FGatewayTypes.clear();
QString dirPath = collectionDirPath(Jid::null,Jid::null);
- QFile gateways(dirPath+"/"GATEWAY_FILE_NAME);
+ QFile gateways(dirPath + "/" GATEWAY_FILE_NAME);
if (!dirPath.isEmpty() && gateways.open(QFile::ReadOnly|QFile::Text))
{
while (!gateways.atEnd())
@@ -776,7 +776,7 @@ bool FileMessageArchive::saveFileModification(const Jid
&AStreamJid, const IArch
if (!dirPath.isEmpty() && AStreamJid.isValid() &&
AHeader.with.isValid() && AHeader.start.isValid())
{
FThreadLock.lockForWrite();
- QFile log(dirPath+"/"LOG_FILE_NAME);
+ QFile log(dirPath + "/" LOG_FILE_NAME);
if (log.open(QFile::WriteOnly|QFile::Append|QIODevice::Text))
{
QStringList logFields;
@@ -944,7 +944,7 @@ void FileMessageArchive::onDiscoInfoReceived(const
IDiscoInfo &AInfo)
if (identity.category==CATEGORY_GATEWAY &&
!identity.type.isEmpty())
{
QString dirPath =
collectionDirPath(Jid::null,Jid::null);
- QFile gateways(dirPath+"/"GATEWAY_FILE_NAME);
+ QFile gateways(dirPath + "/" GATEWAY_FILE_NAME);
if (!dirPath.isEmpty() &&
gateways.open(QFile::WriteOnly|QFile::Append|QFile::Text))
{
QStringList gateway;
diff --git src/plugins/messagearchiver/messagearchiver.cpp
src/plugins/messagearchiver/messagearchiver.cpp
index becc8fa..b7c4e16 100644
--- src/plugins/messagearchiver/messagearchiver.cpp
+++ src/plugins/messagearchiver/messagearchiver.cpp
@@ -9,8 +9,8 @@
#define SESSIONS_FILE_NAME "sessions.xml"
#define SHC_MESSAGE_BODY "/message/body"
-#define SHC_PREFS "/iq[@type='set']/pref[@xmlns="NS_ARCHIVE"]"
-#define SHC_PREFS_OLD "/iq[@type='set']/pref[@xmlns="NS_ARCHIVE_OLD"]"
+#define SHC_PREFS "/iq[@type='set']/pref[@xmlns=" NS_ARCHIVE "]"
+#define SHC_PREFS_OLD "/iq[@type='set']/pref[@xmlns=" NS_ARCHIVE_OLD
"]"
#define ADR_STREAM_JID Action::DR_StreamJid
#define ADR_CONTACT_JID Action::DR_Parametr1
diff --git src/plugins/privacylists/privacylists.cpp
src/plugins/privacylists/privacylists.cpp
index b909962..42d64fa 100644
--- src/plugins/privacylists/privacylists.cpp
+++ src/plugins/privacylists/privacylists.cpp
@@ -1,7 +1,7 @@
#include "privacylists.h"
-#define SHC_PRIVACY
"/iq[@type='set']/query[@xmlns='"NS_JABBER_PRIVACY"']"
-#define SHC_ROSTER "/iq/query[@xmlns='"NS_JABBER_ROSTER"']"
+#define SHC_PRIVACY "/iq[@type='set']/query[@xmlns='"
NS_JABBER_PRIVACY "']"
+#define SHC_ROSTER "/iq/query[@xmlns='" NS_JABBER_ROSTER "']"
#define PRIVACY_TIMEOUT 60000
#define AUTO_LISTS_TIMEOUT 2000
diff --git src/plugins/sessionnegotiation/sessionnegotiation.cpp
src/plugins/sessionnegotiation/sessionnegotiation.cpp
index 46566fb..b5d1cf7 100644
--- src/plugins/sessionnegotiation/sessionnegotiation.cpp
+++ src/plugins/sessionnegotiation/sessionnegotiation.cpp
@@ -4,7 +4,7 @@
#include <QTextDocument>
#include <QCryptographicHash>
-#define SHC_STANZA_SESSION
"/message/feature[@xmlns='"NS_FEATURENEG"']"
+#define SHC_STANZA_SESSION "/message/feature[@xmlns='"
NS_FEATURENEG "']"
#define SFP_DISCLOSURE "disclosure"
#define SFP_MULTISESSION "multisession"
diff --git src/plugins/simplemessagestyle/simplemessagestyle.cpp
src/plugins/simplemessagestyle/simplemessagestyle.cpp
index 689a05b..57c662e 100644
--- src/plugins/simplemessagestyle/simplemessagestyle.cpp
+++ src/plugins/simplemessagestyle/simplemessagestyle.cpp
@@ -15,7 +15,7 @@
#include <utils/options.h>
#define SCROLL_TIMEOUT 100
-#define SHARED_STYLE_PATH
RESOURCES_DIR"/"RSR_STORAGE_SIMPLEMESSAGESTYLES"/"STORAGE_SHARED_DIR
+#define SHARED_STYLE_PATH RESOURCES_DIR "/"
RSR_STORAGE_SIMPLEMESSAGESTYLES "/" STORAGE_SHARED_DIR
static const char *SenderColors[] = {
"blue", "blueviolet", "brown", "cadetblue", "chocolate", "coral",
"cornflowerblue", "crimson",
@@ -37,7 +37,7 @@ SimpleMessageStyle::SimpleMessageStyle(const QString
&AStylePath, QNetworkAccess
if (FSharedPath.isEmpty())
{
if (QDir::isRelativePath(SHARED_STYLE_PATH))
- FSharedPath =
qApp->applicationDirPath()+"/"SHARED_STYLE_PATH;
+ FSharedPath = qApp->applicationDirPath() + "/"
SHARED_STYLE_PATH;
else
FSharedPath = SHARED_STYLE_PATH;
}
