Hello community, here is the log from the commit of package lxqt-session for openSUSE:Factory checked in at 2018-06-29 22:31:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lxqt-session (Old) and /work/SRC/openSUSE:Factory/.lxqt-session.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lxqt-session" Fri Jun 29 22:31:14 2018 rev:12 rq:618056 version:0.13.0 Changes: -------- --- /work/SRC/openSUSE:Factory/lxqt-session/lxqt-session.changes 2018-05-10 15:49:48.876351913 +0200 +++ /work/SRC/openSUSE:Factory/.lxqt-session.new/lxqt-session.changes 2018-06-29 22:31:41.570242241 +0200 @@ -1,0 +2,13 @@ +Wed Jun 20 13:14:01 UTC 2018 - mvet...@suse.com + +- Obsolete lxqt-l10n: its not needed for 0.13.0 + All packages now contain the translations themselves + +------------------------------------------------------------------- +Tue May 22 15:18:03 UTC 2018 - mvet...@suse.com + +- Update to 0.13.0: + * Better support for *BSD world by changed usage of libudev + * Use more directories for searching defaults (add /usr/share & /etc into XDG_CONFIG_DIRS) + +------------------------------------------------------------------- Old: ---- lxqt-session-0.12.0.tar.xz lxqt-session-0.12.0.tar.xz.asc New: ---- lxqt-session-0.13.0.tar.xz lxqt-session-0.13.0.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxqt-session.spec ++++++ --- /var/tmp/diff_new_pack.sHG2ah/_old 2018-06-29 22:31:42.062241865 +0200 +++ /var/tmp/diff_new_pack.sHG2ah/_new 2018-06-29 22:31:42.062241865 +0200 @@ -1,7 +1,7 @@ # # spec file for package lxqt-session # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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,32 +17,33 @@ Name: lxqt-session -Version: 0.12.0 +Version: 0.13.0 Release: 0 Summary: LXQt Session Manager -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/GUI/LXQt -Url: http://www.lxqt.org +URL: http://www.lxqt.org Source: https://github.com/lxde/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz Source1: https://github.com/lxde/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz.asc Source2: %{name}.keyring BuildRequires: cmake >= 3.0.2 BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: lxqt-build-tools-devel +BuildRequires: lxqt-build-tools-devel >= 0.5.0 +BuildRequires: pkgconfig +BuildRequires: xdg-user-dirs BuildRequires: cmake(KF5WindowSystem) BuildRequires: pkgconfig(Qt5UiTools) BuildRequires: pkgconfig(Qt5Xdg) -BuildRequires: pkgconfig(lxqt) >= %{version} BuildRequires: pkgconfig(libudev) +BuildRequires: pkgconfig(lxqt) >= %{version} BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11-xcb) -BuildRequires: xdg-user-dirs Requires(post): update-alternatives Requires(postun): update-alternatives Recommends: %{name}-lang Obsoletes: lxqt-common -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Obsoletes: lxqt-l10n %description lxqt-session is the standard session manager used by LXQt. The lxqt-session manager @@ -77,10 +78,9 @@ --remove default-xsession.desktop %{_datadir}/xsessions/lxqt.desktop %files -%defattr(-,root,root) -%doc AUTHORS LICENSE +%license LICENSE +%doc AUTHORS %dir %{_sysconfdir}/xdg/ -%dir %{_sysconfdir}/xdg/lxqt/ %dir %{_sysconfdir}/xdg/autostart %dir %{_sysconfdir}/xdg/openbox %dir %{_datadir}/kdm/ @@ -91,14 +91,15 @@ %{_datadir}/applications/*.desktop %{_mandir}/man?/lxqt-*%{ext_man} %config %{_sysconfdir}/xdg/autostart/lxqt-xscreensaver-autostart.desktop -%config %{_sysconfdir}/xdg/lxqt/lxqt.conf -%config %{_sysconfdir}/xdg/lxqt/session.conf -%config %{_sysconfdir}/xdg/lxqt/windowmanagers.conf %config %{_sysconfdir}/xdg/openbox/lxqt-rc.xml %{_bindir}/startlxqt %{_datadir}/kdm/sessions/lxqt.desktop -%{_mandir}/man1/startlxqt.1%{ext_man} +%{_mandir}/man1/startlxqt.1%{?ext_man} %{_datadir}/xsessions/lxqt.desktop +%config %{_datadir}/lxqt/lxqt.conf +%config %{_datadir}/lxqt/session.conf +%config %{_datadir}/lxqt/windowmanagers.conf + # for default-xsession %ghost %{_sysconfdir}/alternatives/default-xsession.desktop %{_datadir}/xsessions/*.desktop ++++++ lxqt-session-0.12.0.tar.xz -> lxqt-session-0.13.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/AUTHORS new/lxqt-session-0.13.0/AUTHORS --- old/lxqt-session-0.12.0/AUTHORS 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/AUTHORS 2018-05-21 20:58:27.000000000 +0200 @@ -1,5 +1,5 @@ Upstream Authors: - LXQt team: http://lxqt.org + LXQt team: https://lxqt.org Razor team: http://razor-qt.org Copyright: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/CHANGELOG new/lxqt-session-0.13.0/CHANGELOG --- old/lxqt-session-0.12.0/CHANGELOG 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/CHANGELOG 2018-05-21 20:58:27.000000000 +0200 @@ -1,7 +1,26 @@ -lxqt-session-0.12.0 / 2017-10-21 +lxqt-session-0.13.0 / 2018-05-21 ================================ + * Spanish translation update + * CMake: Prevent in-source builds + * use devnode instead of devpath, so FreeBSD + * fixed razor-qt -> lxqt and http -> https + * Fixed some mentions of LXDE + * Update Simplified Chinese translations (#120) + * Use constant iterators + * Use static QFileInfo::exists() + * Drop Qt foreach + * cmake: Handle CMP0063 + * install session configs in /usr/share/lxqt + * startlxqt: Add /usr/share & /etc into XDG_CONFIG_DIRS + * Remove left over file from the lxqt-common split + * Add Spanish desktop entries + +0.12.0 / 2017-10-21 +=================== + + * Release 0.12.0: Update changelog * Set patch version * lxqt-session: Unify arguments parsing * Don't export github templates diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/CMakeLists.txt new/lxqt-session-0.13.0/CMakeLists.txt --- old/lxqt-session-0.12.0/CMakeLists.txt 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/CMakeLists.txt 2018-05-21 20:58:27.000000000 +0200 @@ -37,8 +37,12 @@ set(LXQT_SESSION_PATCH_VERSION 0) set(LXQT_SESSION_VERSION ${LXQT_MAJOR_VERSION}.${LXQT_MINOR_VERSION}.${LXQT_SESSION_PATCH_VERSION}) -add_definitions("-DLXQT_SESSION_VERSION=\"${LXQT_SESSION_VERSION}\"") +add_definitions( + "-DLXQT_SESSION_VERSION=\"${LXQT_SESSION_VERSION}\"" + "-DQT_NO_FOREACH" +) +include(LXQtPreventInSourceBuilds) include(LXQtCompilerSettings NO_POLICY_SCOPE) # Translations ********************************** @@ -57,6 +61,7 @@ set(PREDEF_XDG_DATA_DIRS "${PREDEF_XDG_DATA_DIRS}:${LXQT_DATA_DIR}") endif() set(PREDEF_XDG_DATA_DIRS "${PREDEF_XDG_DATA_DIRS}:/usr/local/share:/usr/share") +set(PREDEF_XDG_CONFIG_DIRS "/etc:${LXQT_ETC_XDG_DIR}:/usr/share") configure_file(startlxqt.in startlxqt @ONLY) install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/startlxqt" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/CMakeLists.txt.lxqt-common new/lxqt-session-0.13.0/CMakeLists.txt.lxqt-common --- old/lxqt-session-0.12.0/CMakeLists.txt.lxqt-common 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/CMakeLists.txt.lxqt-common 1970-01-01 01:00:00.000000000 +0100 @@ -1,27 +0,0 @@ -include(LXQtTranslateDesktop) -include(LXQtConfigVars) - -# startlxqt script -set(PREDEF_XDG_DATA_DIRS "$XDG_DATA_HOME") -if(NOT("${LXQT_DATA_DIR}" MATCHES "^/usr(/local)?/share$")) - set(PREDEF_XDG_DATA_DIRS "${PREDEF_XDG_DATA_DIRS}:${LXQT_DATA_DIR}") -endif() -set(PREDEF_XDG_DATA_DIRS "${PREDEF_XDG_DATA_DIRS}:/usr/local/share:/usr/share") -configure_file(startlxqt.in startlxqt @ONLY) -install(PROGRAMS - "${CMAKE_CURRENT_BINARY_DIR}/startlxqt" - DESTINATION "${CMAKE_INSTALL_BINDIR}" - COMPONENT Runtime -) -install(FILES - startlxqt.1 - DESTINATION "${CMAKE_INSTALL_MANDIR}/man1" - COMPONENT Runtime -) - -# default config files -add_subdirectory(config) -add_subdirectory(autostart) - -# xsession *.desktop file for display managers -add_subdirectory(xsession) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/README.md new/lxqt-session-0.13.0/README.md --- old/lxqt-session-0.12.0/README.md 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/README.md 2018-05-21 20:58:27.000000000 +0200 @@ -21,8 +21,8 @@ ### Compiling source code -Runtime dependencies are xdg-user-dirs and [liblxqt](https://github.com/lxde/liblxqt). -Additional build dependencies are CMake and optionally Git to pull latest VCS checkouts. The localization files were outsourced to repository [lxqt-l10n](https://github.com/lxde/lxqt-l10n) so the corresponding dependencies are needed, too. Please refer to this repository's `README.md` for further information. +Runtime dependencies are xdg-user-dirs and [liblxqt](https://github.com/lxqt/liblxqt). +Additional build dependencies are CMake and optionally Git to pull latest VCS checkouts. The localization files were outsourced to repository [lxqt-l10n](https://github.com/lxqt/lxqt-l10n) so the corresponding dependencies are needed, too. Please refer to this repository's `README.md` for further information. Code configuration is handled by CMake. CMake variable `CMAKE_INSTALL_PREFIX` has to be set to `/usr` on most operating systems. @@ -45,7 +45,7 @@  -It can be launched from panel's main menu - Preferences - LXQt settings - Session Settings and is provided by "Configuration Center" (binary `lxqt-config`) of [lxqt-config](https://github.com/lxde/lxqt-config) as well. +It can be launched from panel's main menu - Preferences - LXQt settings - Session Settings and is provided by "Configuration Center" (binary `lxqt-config`) of [lxqt-config](https://github.com/lxqt/lxqt-config) as well. Notes on some settings: @@ -54,8 +54,8 @@ #### Default Applications Defines a default terminal emulator and web browser by setting environment variables `TERM` and `BROWSER`. -The usage of `TERM` is faulty in this context, see [lxqt #433](https://github.com/lxde/lxqt/issues/433). Usage of `BROWSER` is correct but not recognized by too many applications any longer. -All in all the configuration of default applications will probably be handled by a different approach one day like improving GUI "File Associations" of [lxqt-config](https://github.com/lxde/lxqt-config) so setting environment variables `TERM` and `BROWSER` with `lxqt-config-session` has actually to be discouraged. +The usage of `TERM` is faulty in this context, see [lxqt #433](https://github.com/lxqt/lxqt/issues/433). Usage of `BROWSER` is correct but not recognized by too many applications any longer. +All in all the configuration of default applications will probably be handled by a different approach one day like improving GUI "File Associations" of [lxqt-config](https://github.com/lxqt/lxqt-config) so setting environment variables `TERM` and `BROWSER` with `lxqt-config-session` has actually to be discouraged. #### User Directories This refers to defining directories in terms of the [xdg-user-dirs](https://www.freedesktop.org/wiki/Software/xdg-user-dirs/) concept. This is a specification to define a number of directories used for certain kinds of content like documents, audio or video files and to create those directories in each user's home directory in case they do not preexist. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/autostart/CMakeLists.txt new/lxqt-session-0.13.0/autostart/CMakeLists.txt --- old/lxqt-session-0.12.0/autostart/CMakeLists.txt 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/autostart/CMakeLists.txt 2018-05-21 20:58:27.000000000 +0200 @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR) - file(GLOB DESKTOP_FILES_IN *.desktop.in) # Translations ********************************** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/autostart/translations/lxqt-xscreensaver-autostart_es.desktop new/lxqt-session-0.13.0/autostart/translations/lxqt-xscreensaver-autostart_es.desktop --- old/lxqt-session-0.12.0/autostart/translations/lxqt-xscreensaver-autostart_es.desktop 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/autostart/translations/lxqt-xscreensaver-autostart_es.desktop 2018-05-21 20:58:27.000000000 +0200 @@ -1,2 +1 @@ -# Translations Name[es]=XScreenSaver diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/autostart/translations/lxqt-xscreensaver-autostart_zh_CN.desktop new/lxqt-session-0.13.0/autostart/translations/lxqt-xscreensaver-autostart_zh_CN.desktop --- old/lxqt-session-0.12.0/autostart/translations/lxqt-xscreensaver-autostart_zh_CN.desktop 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/autostart/translations/lxqt-xscreensaver-autostart_zh_CN.desktop 2018-05-21 20:58:27.000000000 +0200 @@ -1,2 +1,2 @@ # Translations -Name[zh_CN]=屏保 +Name[zh_CN]=屏幕保护程序 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/config/CMakeLists.txt new/lxqt-session-0.13.0/config/CMakeLists.txt --- old/lxqt-session-0.12.0/config/CMakeLists.txt 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/config/CMakeLists.txt 2018-05-21 20:58:27.000000000 +0200 @@ -3,7 +3,7 @@ lxqt.conf session.conf windowmanagers.conf - DESTINATION "${LXQT_ETC_XDG_DIR}/lxqt" + DESTINATION "${CMAKE_INSTALL_DATADIR}/lxqt" COMPONENT Runtime ) install(DIRECTORY openbox diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-config-session/CMakeLists.txt new/lxqt-session-0.13.0/lxqt-config-session/CMakeLists.txt --- old/lxqt-session-0.12.0/lxqt-config-session/CMakeLists.txt 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-config-session/CMakeLists.txt 2018-05-21 20:58:27.000000000 +0200 @@ -1,4 +1,4 @@ -project(lxqt-config-session) +set(LXQT_CONFIG_SESSION_PROJECT_NAME "lxqt-config-session") set(lxqt-sessioncfg_HDRS @@ -48,7 +48,7 @@ ${lxqt-sessioncfg_SRCS} ${lxqt-sessioncfg_UI_FILES} INSTALL_DIR - "${LXQT_TRANSLATIONS_DIR}/${PROJECT_NAME}" + "${LXQT_TRANSLATIONS_DIR}/${LXQT_CONFIG_SESSION_PROJECT_NAME}" PULL_TRANSLATIONS ${PULL_TRANSLATIONS} CLEAN_TRANSLATIONS @@ -58,10 +58,10 @@ TRANSLATIONS_REFSPEC ${TRANSLATIONS_REFSPEC} REPO_SUBDIR - "lxqt-session/${PROJECT_NAME}" + "lxqt-session/${LXQT_CONFIG_SESSION_PROJECT_NAME}" ) -lxqt_app_translation_loader(lxqt-sessioncfg_QM_LOADER ${PROJECT_NAME}) +lxqt_app_translation_loader(lxqt-sessioncfg_QM_LOADER ${LXQT_CONFIG_SESSION_PROJECT_NAME}) lxqt_translate_desktop(lxqt-sessioncfg_DESKTOP_FILES SOURCES lxqt-config-session.desktop.in) add_executable(lxqt-config-session diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-config-session/autostartedit.cpp new/lxqt-session-0.13.0/lxqt-config-session/autostartedit.cpp --- old/lxqt-session-0.12.0/lxqt-config-session/autostartedit.cpp 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-config-session/autostartedit.cpp 2018-05-21 20:58:27.000000000 +0200 @@ -2,7 +2,7 @@ * (c)LGPL2+ * * LXQt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org, http://lxde.org/ + * https://lxqt.org/ * * Copyright (C) 2011 Alec Moskvin <al...@gmx.com> * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-config-session/autostartedit.h new/lxqt-session-0.13.0/lxqt-config-session/autostartedit.h --- old/lxqt-session-0.12.0/lxqt-config-session/autostartedit.h 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-config-session/autostartedit.h 2018-05-21 20:58:27.000000000 +0200 @@ -2,7 +2,7 @@ * (c)LGPL2+ * * LXQt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org, http://lxde.org/ + * https://lxqt.org/ * * Copyright (C) 2011 Alec Moskvin <al...@gmx.com> * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-config-session/autostartitem.cpp new/lxqt-session-0.13.0/lxqt-config-session/autostartitem.cpp --- old/lxqt-session-0.12.0/lxqt-config-session/autostartitem.cpp 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-config-session/autostartitem.cpp 2018-05-21 20:58:27.000000000 +0200 @@ -2,7 +2,7 @@ * (c)LGPL2+ * * LXQt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org, http://lxde.org/ + * https://lxqt.org/ * * Copyright (C) 2012 Alec Moskvin <al...@gmx.com> * @@ -49,15 +49,15 @@ { QMap<QString,AutostartItem> items; - XdgDesktopFileList systemList = XdgAutoStart::desktopFileList(XdgDirs::autostartDirs(), false); - foreach (const XdgDesktopFile& file, systemList) + const XdgDesktopFileList systemList = XdgAutoStart::desktopFileList(XdgDirs::autostartDirs(), false); + for (const XdgDesktopFile& file : systemList) { QString name = QFileInfo(file.fileName()).fileName(); items.insert(name, AutostartItem(file)); } - XdgDesktopFileList localList = XdgAutoStart::desktopFileList(QStringList(XdgDirs::autostartHome()), false); - foreach (const XdgDesktopFile& file, localList) + const XdgDesktopFileList localList = XdgAutoStart::desktopFileList(QStringList(XdgDirs::autostartHome()), false); + for (const XdgDesktopFile& file : localList) { QString name = QFileInfo(file.fileName()).fileName(); if (items.contains(name)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-config-session/autostartitem.h new/lxqt-session-0.13.0/lxqt-config-session/autostartitem.h --- old/lxqt-session-0.12.0/lxqt-config-session/autostartitem.h 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-config-session/autostartitem.h 2018-05-21 20:58:27.000000000 +0200 @@ -2,7 +2,7 @@ * (c)LGPL2+ * * LXQt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org, http://lxde.org/ + * https://lxqt.org/ * * Copyright (C) 2012 Alec Moskvin <al...@gmx.com> * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-config-session/autostartmodel.cpp new/lxqt-session-0.13.0/lxqt-config-session/autostartmodel.cpp --- old/lxqt-session-0.12.0/lxqt-config-session/autostartmodel.cpp 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-config-session/autostartmodel.cpp 2018-05-21 20:58:27.000000000 +0200 @@ -2,7 +2,7 @@ * (c)LGPL2+ * * LXQt - The Lightweight Desktop Environment - * http://lxqt.org + * https://lxqt.org * * Copyright (C) 2011 Alec Moskvin <al...@gmx.com> * @@ -57,7 +57,7 @@ */ bool AutoStartItemModel::writeChanges() { - foreach (AutostartItem item, mItemMap.values()) + for(AutostartItem& item : mItemMap) item.commit(); return true; } @@ -66,10 +66,10 @@ { QMap<QString, AutostartItem> allItems; - foreach(const QString &s, mLXQtItems) + for(const QString &s : qAsConst(mLXQtItems)) allItems[s] = mItemMap.value(s); - foreach(const QString &s, mGlobalItems) + for(const QString &s : qAsConst(mGlobalItems)) allItems[s] = mItemMap.value(s); return allItems; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-config-session/autostartmodel.h new/lxqt-session-0.13.0/lxqt-config-session/autostartmodel.h --- old/lxqt-session-0.12.0/lxqt-config-session/autostartmodel.h 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-config-session/autostartmodel.h 2018-05-21 20:58:27.000000000 +0200 @@ -2,7 +2,7 @@ * (c)LGPL2+ * * LXQt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org, http://lxde.org/ + * https://lxqt.org/ * * Copyright (C) 2011 Alec Moskvin <al...@gmx.com> * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-config-session/autostartpage.cpp new/lxqt-session-0.13.0/lxqt-config-session/autostartpage.cpp --- old/lxqt-session-0.12.0/lxqt-config-session/autostartpage.cpp 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-config-session/autostartpage.cpp 2018-05-21 20:58:27.000000000 +0200 @@ -2,7 +2,7 @@ * (c)LGPL2+ * * LXQt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org, http://lxde.org/ + * https://lxqt.org/ * * Copyright (C) 2012 Alec Moskvin <al...@gmx.com> * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-config-session/autostartpage.h new/lxqt-session-0.13.0/lxqt-config-session/autostartpage.h --- old/lxqt-session-0.12.0/lxqt-config-session/autostartpage.h 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-config-session/autostartpage.h 2018-05-21 20:58:27.000000000 +0200 @@ -2,7 +2,7 @@ * (c)LGPL2+ * * LXQt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org, http://lxde.org/ + * https://lxqt.org/ * * Copyright (C) 2012 Alec Moskvin <al...@gmx.com> * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-config-session/autostartutils.cpp new/lxqt-session-0.13.0/lxqt-config-session/autostartutils.cpp --- old/lxqt-session-0.12.0/lxqt-config-session/autostartutils.cpp 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-config-session/autostartutils.cpp 2018-05-21 20:58:27.000000000 +0200 @@ -1,4 +1,4 @@ -/* This file is part of the LXQt project. <http://lxqt.org> +/* This file is part of the LXQt project. <https://lxqt.org> * Copyright (C) 2015 Luís Pereira <luis.artur.pere...@gmail.com> * * This library is free software; you can redistribute it and/or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-config-session/autostartutils.h new/lxqt-session-0.13.0/lxqt-config-session/autostartutils.h --- old/lxqt-session-0.12.0/lxqt-config-session/autostartutils.h 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-config-session/autostartutils.h 2018-05-21 20:58:27.000000000 +0200 @@ -1,4 +1,4 @@ -/* This file is part of the LXQt project. <http://lxqt.org> +/* This file is part of the LXQt project. <https://lxqt.org> * Copyright (C) 2015 Luís Pereira <luis.artur.pere...@gmail.com> * * This library is free software; you can redistribute it and/or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-config-session/basicsettings.cpp new/lxqt-session-0.13.0/lxqt-config-session/basicsettings.cpp --- old/lxqt-session-0.12.0/lxqt-config-session/basicsettings.cpp 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-config-session/basicsettings.cpp 2018-05-21 20:58:27.000000000 +0200 @@ -2,7 +2,7 @@ * (c)LGPL2+ * * LXQt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org, http://lxde.org/ + * https://lxqt.org/ * * Copyright: 2010-2012 LXQt team * Authors: @@ -62,7 +62,8 @@ void BasicSettings::restoreSettings() { QStringList knownWMs; - foreach (const WindowManager &wm, getWindowManagerList(true)) + const auto wmList = getWindowManagerList(true); + for (const WindowManager &wm : wmList) { knownWMs << wm.command; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-config-session/basicsettings.h new/lxqt-session-0.13.0/lxqt-config-session/basicsettings.h --- old/lxqt-session-0.12.0/lxqt-config-session/basicsettings.h 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-config-session/basicsettings.h 2018-05-21 20:58:27.000000000 +0200 @@ -2,7 +2,7 @@ * (c)LGPL2+ * * LXQt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org, http://lxde.org/ + * https://lxqt.org/ * * Copyright: 2010-2012 LXQt team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-config-session/defaultappspage.cpp new/lxqt-session-0.13.0/lxqt-config-session/defaultappspage.cpp --- old/lxqt-session-0.12.0/lxqt-config-session/defaultappspage.cpp 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-config-session/defaultappspage.cpp 2018-05-21 20:58:27.000000000 +0200 @@ -2,7 +2,7 @@ * (c)LGPL2+ * * LXQt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org, http://lxde.org/ + * https://lxqt.org/ * * Copyright: 2010-2012 LXQt team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-config-session/defaultappspage.h new/lxqt-session-0.13.0/lxqt-config-session/defaultappspage.h --- old/lxqt-session-0.12.0/lxqt-config-session/defaultappspage.h 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-config-session/defaultappspage.h 2018-05-21 20:58:27.000000000 +0200 @@ -2,7 +2,7 @@ * (c)LGPL2+ * * LXQt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org, http://lxde.org/ + * https://lxqt.org/ * * Copyright: 2010-2012 LXQt team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-config-session/environmentpage.cpp new/lxqt-session-0.13.0/lxqt-config-session/environmentpage.cpp --- old/lxqt-session-0.12.0/lxqt-config-session/environmentpage.cpp 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-config-session/environmentpage.cpp 2018-05-21 20:58:27.000000000 +0200 @@ -2,7 +2,7 @@ * (c)LGPL2+ * * LXQt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org, http://lxde.org/ + * https://lxqt.org/ * * Copyright: 2010-2012 LXQt team * Authors: @@ -54,7 +54,8 @@ m_settings->beginGroup("Environment"); QString value; ui->treeWidget->clear(); - foreach (const QString& i, m_settings->childKeys()) + const auto keys = m_settings->childKeys(); + for (const QString& i : keys) { value = m_settings->value(i).toString(); QTreeWidgetItem *item = new QTreeWidgetItem(ui->treeWidget, QStringList() << i << value); @@ -81,7 +82,8 @@ /* We erase the Enviroment group and them write the Ui settings. To know if they changed or not we need to save them to memory. */ - foreach (const QString &key, m_settings->childKeys()) + const auto keys = m_settings->childKeys(); + for (const QString &key : keys) oldSettings[key] = m_settings->value(key, QString()).toString(); m_settings->remove(""); @@ -116,7 +118,8 @@ void EnvironmentPage::deleteButton_clicked() { - foreach (QTreeWidgetItem* item, ui->treeWidget->selectedItems()) + const auto items = ui->treeWidget->selectedItems(); + for (QTreeWidgetItem* item : items) { emit envVarChanged(item->text(0), ""); delete item; @@ -131,7 +134,7 @@ void EnvironmentPage::updateItem(const QString& var, const QString& val) { - QList<QTreeWidgetItem*> itemList = ui->treeWidget->findItems(var, Qt::MatchExactly); + const QList<QTreeWidgetItem*> itemList = ui->treeWidget->findItems(var, Qt::MatchExactly); if (itemList.isEmpty()) { QTreeWidgetItem *item = new QTreeWidgetItem(ui->treeWidget, QStringList() << var << val); @@ -140,7 +143,7 @@ return; } - foreach (QTreeWidgetItem* item, itemList) + for (QTreeWidgetItem* item : itemList) { if (!val.isEmpty()) item->setText(1, val); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-config-session/environmentpage.h new/lxqt-session-0.13.0/lxqt-config-session/environmentpage.h --- old/lxqt-session-0.12.0/lxqt-config-session/environmentpage.h 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-config-session/environmentpage.h 2018-05-21 20:58:27.000000000 +0200 @@ -2,7 +2,7 @@ * (c)LGPL2+ * * LXQt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org, http://lxde.org/ + * https://lxqt.org/ * * Copyright: 2010-2012 LXQt team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-config-session/main.cpp new/lxqt-session-0.13.0/lxqt-config-session/main.cpp --- old/lxqt-session-0.12.0/lxqt-config-session/main.cpp 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-config-session/main.cpp 2018-05-21 20:58:27.000000000 +0200 @@ -2,7 +2,7 @@ * (c)LGPL2+ * * LXQt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org, http://lxde.org/ + * https://lxqt.org/ * * Copyright: 2010-2011 LXQt team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-config-session/man/lxqt-config-session.1 new/lxqt-session-0.13.0/lxqt-config-session/man/lxqt-config-session.1 --- old/lxqt-session-0.12.0/lxqt-config-session/man/lxqt-config-session.1 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-config-session/man/lxqt-config-session.1 2018-05-21 20:58:27.000000000 +0200 @@ -9,7 +9,7 @@ This application handles \fBLXQt\fR default applications settings, autostart configuration, and environment settings. .SH "REPORTING BUGS" -Report bugs to https://github.com/lxde/lxqt/issues +Report bugs to https://github.com/lxqt/lxqt/issues .SH "SEE ALSO" .\" any module must refer to the session application, for module overview and initiation \fBstartlxqt.1\fR LXQt session initialization and launch script (e.g. in \fB.xinitrc\fR) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-config-session/modulemodel.cpp new/lxqt-session-0.13.0/lxqt-config-session/modulemodel.cpp --- old/lxqt-session-0.12.0/lxqt-config-session/modulemodel.cpp 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-config-session/modulemodel.cpp 2018-05-21 20:58:27.000000000 +0200 @@ -2,7 +2,7 @@ * (c)LGPL2+ * * LXQt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org, http://lxde.org/ + * https://lxqt.org/ * * Copyright (C) 2012 Alec Moskvin <al...@gmx.com> * @@ -58,7 +58,7 @@ QDBusReply<QVariant> reply = mInterface->call("listModules"); const QStringList moduleList = reply.value().toStringList(); - foreach (const QString& moduleName, moduleList) + for (const QString& moduleName : moduleList) { if (mItemMap.contains(moduleName)) mStateMap[moduleName] = true; @@ -110,7 +110,7 @@ { QMap<QString, AutostartItem> allItems; - foreach(const QString &s, mKeyList) + for(const QString &s : qAsConst(mKeyList)) allItems[s] = mItemMap.value(s); return allItems; @@ -124,7 +124,7 @@ void ModuleModel::writeChanges() { - foreach (const QString& key, mKeyList) + for (const QString& key : qAsConst(mKeyList)) mItemMap[key].commit(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-config-session/modulemodel.h new/lxqt-session-0.13.0/lxqt-config-session/modulemodel.h --- old/lxqt-session-0.12.0/lxqt-config-session/modulemodel.h 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-config-session/modulemodel.h 2018-05-21 20:58:27.000000000 +0200 @@ -2,7 +2,7 @@ * (c)LGPL2+ * * LXQt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org, http://lxde.org/ + * https://lxqt.org/ * * Copyright (C) 2012 Alec Moskvin <al...@gmx.com> * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-config-session/sessionconfigwindow.cpp new/lxqt-session-0.13.0/lxqt-config-session/sessionconfigwindow.cpp --- old/lxqt-session-0.12.0/lxqt-config-session/sessionconfigwindow.cpp 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-config-session/sessionconfigwindow.cpp 2018-05-21 20:58:27.000000000 +0200 @@ -2,7 +2,7 @@ * (c)LGPL2+ * * LXQt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org, http://lxde.org/ + * https://lxqt.org/ * * Copyright: 2010-2011 LXQt team * Authors: @@ -103,7 +103,7 @@ ) { QStringList realValues; - foreach (const QString &s, availableValues) + for (const QString &s : availableValues) { if (findProgram(s)) realValues << s; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-config-session/sessionconfigwindow.h new/lxqt-session-0.13.0/lxqt-config-session/sessionconfigwindow.h --- old/lxqt-session-0.12.0/lxqt-config-session/sessionconfigwindow.h 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-config-session/sessionconfigwindow.h 2018-05-21 20:58:27.000000000 +0200 @@ -2,7 +2,7 @@ * (c)LGPL2+ * * LXQt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org, http://lxde.org/ + * https://lxqt.org/ * * Copyright: 2010-2011 LXQt team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-config-session/translations/lxqt-config-session_es.desktop new/lxqt-session-0.13.0/lxqt-config-session/translations/lxqt-config-session_es.desktop --- old/lxqt-session-0.12.0/lxqt-config-session/translations/lxqt-config-session_es.desktop 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-config-session/translations/lxqt-config-session_es.desktop 2018-05-21 20:58:27.000000000 +0200 @@ -1,4 +1,3 @@ -# Translations -Comment[es]=Configura el módulo de sesiones de LXQt -GenericName[es]=Configuración de sesiones LXQt -Name[es]=Configuración de sesiones LXQt +Name[es]=Configuración de la sesión +GenericName[es]=Configuración de la sesión de LXQt +Comment[es]=Configuración de sesiones de LXQt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-config-session/translations/lxqt-config-session_zh_CN.desktop new/lxqt-session-0.13.0/lxqt-config-session/translations/lxqt-config-session_zh_CN.desktop --- old/lxqt-session-0.12.0/lxqt-config-session/translations/lxqt-config-session_zh_CN.desktop 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-config-session/translations/lxqt-config-session_zh_CN.desktop 2018-05-21 20:58:27.000000000 +0200 @@ -1,4 +1,4 @@ # Translations Comment[zh_CN]=配置 LXQt 会话模块 GenericName[zh_CN]=LXQt 会话配置 -Name[zh_CN]=LXQt 会话配置 +Name[zh_CN]=会话配置 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-config-session/translations/lxqt-config-session_zh_TW.desktop new/lxqt-session-0.13.0/lxqt-config-session/translations/lxqt-config-session_zh_TW.desktop --- old/lxqt-session-0.12.0/lxqt-config-session/translations/lxqt-config-session_zh_TW.desktop 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-config-session/translations/lxqt-config-session_zh_TW.desktop 2018-05-21 20:58:27.000000000 +0200 @@ -1,4 +1,4 @@ # Translations Comment[zh_TW]=LXQt會話模組設定 GenericName[zh_TW]=LXQt會話設定 -Name[zh_TW]=LXQt會話設定 +Name[zh_TW]=會話設定 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-config-session/userlocationspage.cpp new/lxqt-session-0.13.0/lxqt-config-session/userlocationspage.cpp --- old/lxqt-session-0.12.0/lxqt-config-session/userlocationspage.cpp 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-config-session/userlocationspage.cpp 2018-05-21 20:58:27.000000000 +0200 @@ -1,5 +1,5 @@ /* - * This file is part of the LXQt project. <http://lxqt.org> + * This file is part of the LXQt project. <https://lxqt.org> * Copyright (C) 2015 Luís Pereira <luis.artur.pere...@gmail.com> * * This library is free software; you can redistribute it and/or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-config-session/userlocationspage.h new/lxqt-session-0.13.0/lxqt-config-session/userlocationspage.h --- old/lxqt-session-0.12.0/lxqt-config-session/userlocationspage.h 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-config-session/userlocationspage.h 2018-05-21 20:58:27.000000000 +0200 @@ -1,5 +1,5 @@ /* - * This file is part of the LXQt project. <http://lxqt.org> + * This file is part of the LXQt project. <https://lxqt.org> * Copyright (C) 2015 Luís Pereira <luis.artur.pere...@gmail.com> * * This library is free software; you can redistribute it and/or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-leave/CMakeLists.txt new/lxqt-session-0.13.0/lxqt-leave/CMakeLists.txt --- old/lxqt-session-0.12.0/lxqt-leave/CMakeLists.txt 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-leave/CMakeLists.txt 2018-05-21 20:58:27.000000000 +0200 @@ -1,4 +1,4 @@ -project(lxqt-leave) +set(LXQT_LEAVE_PROJECT_NAME "lxqt-leave") set(CPP_FILES main.cpp @@ -36,7 +36,7 @@ ${UI_FILES} ${H_FILES} INSTALL_DIR - "${LXQT_TRANSLATIONS_DIR}/${PROJECT_NAME}" + "${LXQT_TRANSLATIONS_DIR}/${LXQT_LEAVE_PROJECT_NAME}" PULL_TRANSLATIONS ${PULL_TRANSLATIONS} CLEAN_TRANSLATIONS @@ -46,10 +46,10 @@ TRANSLATIONS_REFSPEC ${TRANSLATIONS_REFSPEC} REPO_SUBDIR - "lxqt-session/${PROJECT_NAME}" + "lxqt-session/${LXQT_LEAVE_PROJECT_NAME}" ) -lxqt_app_translation_loader(lxqt-leave_QM_LOADER ${PROJECT_NAME}) +lxqt_app_translation_loader(lxqt-leave_QM_LOADER ${LXQT_LEAVE_PROJECT_NAME}) #************************************************ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-leave/leavedialog.cpp new/lxqt-session-0.13.0/lxqt-leave/leavedialog.cpp --- old/lxqt-session-0.12.0/lxqt-leave/leavedialog.cpp 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-leave/leavedialog.cpp 2018-05-21 20:58:27.000000000 +0200 @@ -2,7 +2,7 @@ * (c)LGPL2+ * * LXQt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org, http://lxde.org/ + * https://lxqt.org/ * * Copyright: 2010-2015 LXQt team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-leave/leavedialog.h new/lxqt-session-0.13.0/lxqt-leave/leavedialog.h --- old/lxqt-session-0.12.0/lxqt-leave/leavedialog.h 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-leave/leavedialog.h 2018-05-21 20:58:27.000000000 +0200 @@ -2,7 +2,7 @@ * (c)LGPL2+ * * LXQt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org, http://lxde.org/ + * https:///lxqt.org/ * * Copyright: 2010-2015 LXQt team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-leave/listwidget.cpp new/lxqt-session-0.13.0/lxqt-leave/listwidget.cpp --- old/lxqt-session-0.12.0/lxqt-leave/listwidget.cpp 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-leave/listwidget.cpp 2018-05-21 20:58:27.000000000 +0200 @@ -2,7 +2,7 @@ * (c)LGPL2+ * * LXQt - a lightweight, Qt based, desktop toolset - * http://lxqt.org/ + * https://lxqt.org/ * * Copyright: 2017 LXQt team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-leave/listwidget.h new/lxqt-session-0.13.0/lxqt-leave/listwidget.h --- old/lxqt-session-0.12.0/lxqt-leave/listwidget.h 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-leave/listwidget.h 2018-05-21 20:58:27.000000000 +0200 @@ -2,7 +2,7 @@ * (c)LGPL2+ * * LXQt - a lightweight, Qt based, desktop toolset - * http://lxqt.org/ + * https://lxqt.org/ * * Copyright: 2017 LXQt team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-leave/main.cpp new/lxqt-session-0.13.0/lxqt-leave/main.cpp --- old/lxqt-session-0.12.0/lxqt-leave/main.cpp 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-leave/main.cpp 2018-05-21 20:58:27.000000000 +0200 @@ -1,8 +1,8 @@ /* BEGIN_COMMON_COPYRIGHT_HEADER * (c)LGPL2+ * - * LXDE-Qt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org + * LXQt - a lightweight, Qt based, desktop toolset + * https://lxqt.org * * Copyright: 2010-2011 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-leave/resources/lxqt-leave.1 new/lxqt-session-0.13.0/lxqt-leave/resources/lxqt-leave.1 --- old/lxqt-session-0.12.0/lxqt-leave/resources/lxqt-leave.1 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-leave/resources/lxqt-leave.1 2018-05-21 20:58:27.000000000 +0200 @@ -33,7 +33,7 @@ \fB\-\-help\fR .RE .SH "REPORTING BUGS" -Report bugs to https://github.com/lxde/lxqt/issues +Report bugs to https://github.com/lxqt/lxqt/issues .SH "SEE ALSO" .\" any module must refer to the session application, for module overview and initiation \fBstartlxqt.1\fR LXQt session initialization and launch script (e.g. in \fB.xinitrc\fR) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-leave/translations/lxqt-hibernate_es.desktop new/lxqt-session-0.13.0/lxqt-leave/translations/lxqt-hibernate_es.desktop --- old/lxqt-session-0.12.0/lxqt-leave/translations/lxqt-hibernate_es.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-session-0.13.0/lxqt-leave/translations/lxqt-hibernate_es.desktop 2018-05-21 20:58:27.000000000 +0200 @@ -0,0 +1,3 @@ +Name[es]=Hibernar +GenericName[es]=Hibernar +Comment[es]=Hibernar el sistema diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-leave/translations/lxqt-hibernate_zh_CN.desktop new/lxqt-session-0.13.0/lxqt-leave/translations/lxqt-hibernate_zh_CN.desktop --- old/lxqt-session-0.12.0/lxqt-leave/translations/lxqt-hibernate_zh_CN.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-session-0.13.0/lxqt-leave/translations/lxqt-hibernate_zh_CN.desktop 2018-05-21 20:58:27.000000000 +0200 @@ -0,0 +1,2 @@ +Name[zh_CN]=休眠 +Comment[zh_CN]=休眠计算机 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-leave/translations/lxqt-leave_es.desktop new/lxqt-session-0.13.0/lxqt-leave/translations/lxqt-leave_es.desktop --- old/lxqt-session-0.12.0/lxqt-leave/translations/lxqt-leave_es.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-session-0.13.0/lxqt-leave/translations/lxqt-leave_es.desktop 2018-05-21 20:58:27.000000000 +0200 @@ -0,0 +1,3 @@ +Name[es]=Salir +GenericName[es]=Salir +Comment[es]=Diálogo para salir del sistema diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-leave/translations/lxqt-leave_zh_CN.desktop new/lxqt-session-0.13.0/lxqt-leave/translations/lxqt-leave_zh_CN.desktop --- old/lxqt-session-0.12.0/lxqt-leave/translations/lxqt-leave_zh_CN.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-session-0.13.0/lxqt-leave/translations/lxqt-leave_zh_CN.desktop 2018-05-21 20:58:27.000000000 +0200 @@ -0,0 +1,2 @@ +Name[zh_CN]=离开 +Comment[zh_CN]=显示“离开”对话框 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-leave/translations/lxqt-lockscreen_es.desktop new/lxqt-session-0.13.0/lxqt-leave/translations/lxqt-lockscreen_es.desktop --- old/lxqt-session-0.12.0/lxqt-leave/translations/lxqt-lockscreen_es.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-session-0.13.0/lxqt-leave/translations/lxqt-lockscreen_es.desktop 2018-05-21 20:58:27.000000000 +0200 @@ -0,0 +1,3 @@ +Name[es]=Bloquear la pantalla +GenericName[es]=Bloquear la pantalla +Comment[es]=Bloquear la sesión actual diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-leave/translations/lxqt-lockscreen_zh_CN.desktop new/lxqt-session-0.13.0/lxqt-leave/translations/lxqt-lockscreen_zh_CN.desktop --- old/lxqt-session-0.12.0/lxqt-leave/translations/lxqt-lockscreen_zh_CN.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-session-0.13.0/lxqt-leave/translations/lxqt-lockscreen_zh_CN.desktop 2018-05-21 20:58:27.000000000 +0200 @@ -0,0 +1,2 @@ +Name[zh_CN]=锁屏 +Comment[zh_CN]=锁定屏幕 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-leave/translations/lxqt-logout_es.desktop new/lxqt-session-0.13.0/lxqt-leave/translations/lxqt-logout_es.desktop --- old/lxqt-session-0.12.0/lxqt-leave/translations/lxqt-logout_es.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-session-0.13.0/lxqt-leave/translations/lxqt-logout_es.desktop 2018-05-21 20:58:27.000000000 +0200 @@ -0,0 +1,3 @@ +Name[es]=Cerrar la sesión +GenericName[es]=Cerrar la sesión +Comment[es]=Cerrar la sesión actual diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-leave/translations/lxqt-logout_zh_CN.desktop new/lxqt-session-0.13.0/lxqt-leave/translations/lxqt-logout_zh_CN.desktop --- old/lxqt-session-0.12.0/lxqt-leave/translations/lxqt-logout_zh_CN.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-session-0.13.0/lxqt-leave/translations/lxqt-logout_zh_CN.desktop 2018-05-21 20:58:27.000000000 +0200 @@ -0,0 +1,2 @@ +Name[zh_CN]=注销 +Comment[zh_CN]=离开当前会话 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-leave/translations/lxqt-reboot_es.desktop new/lxqt-session-0.13.0/lxqt-leave/translations/lxqt-reboot_es.desktop --- old/lxqt-session-0.12.0/lxqt-leave/translations/lxqt-reboot_es.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-session-0.13.0/lxqt-leave/translations/lxqt-reboot_es.desktop 2018-05-21 20:58:27.000000000 +0200 @@ -0,0 +1,3 @@ +Name[es]=Reiniciar +GenericName[es]=Reiniciar +Comment[es]=Reiniciar el sistema diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-leave/translations/lxqt-reboot_zh_CN.desktop new/lxqt-session-0.13.0/lxqt-leave/translations/lxqt-reboot_zh_CN.desktop --- old/lxqt-session-0.12.0/lxqt-leave/translations/lxqt-reboot_zh_CN.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-session-0.13.0/lxqt-leave/translations/lxqt-reboot_zh_CN.desktop 2018-05-21 20:58:27.000000000 +0200 @@ -0,0 +1,2 @@ +Name[zh_CN]=重新启动 +Comment[zh_CN]=重新启动计算机 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-leave/translations/lxqt-shutdown_es.desktop new/lxqt-session-0.13.0/lxqt-leave/translations/lxqt-shutdown_es.desktop --- old/lxqt-session-0.12.0/lxqt-leave/translations/lxqt-shutdown_es.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-session-0.13.0/lxqt-leave/translations/lxqt-shutdown_es.desktop 2018-05-21 20:58:27.000000000 +0200 @@ -0,0 +1,3 @@ +Name[es]=Apagar +GenericName[es]=Apagar +Comment[es]=Apagar el sistema diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-leave/translations/lxqt-shutdown_zh_CN.desktop new/lxqt-session-0.13.0/lxqt-leave/translations/lxqt-shutdown_zh_CN.desktop --- old/lxqt-session-0.12.0/lxqt-leave/translations/lxqt-shutdown_zh_CN.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-session-0.13.0/lxqt-leave/translations/lxqt-shutdown_zh_CN.desktop 2018-05-21 20:58:27.000000000 +0200 @@ -0,0 +1,2 @@ +Name[zh_CN]=关机 +Comment[zh_CN]=关闭计算机 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-leave/translations/lxqt-suspend_es.desktop new/lxqt-session-0.13.0/lxqt-leave/translations/lxqt-suspend_es.desktop --- old/lxqt-session-0.12.0/lxqt-leave/translations/lxqt-suspend_es.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-session-0.13.0/lxqt-leave/translations/lxqt-suspend_es.desktop 2018-05-21 20:58:27.000000000 +0200 @@ -0,0 +1,3 @@ +Name[es]=Suspender +GenericName[es]=Suspender +Comment[es]=Suspender el sistema diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-leave/translations/lxqt-suspend_zh_CN.desktop new/lxqt-session-0.13.0/lxqt-leave/translations/lxqt-suspend_zh_CN.desktop --- old/lxqt-session-0.12.0/lxqt-leave/translations/lxqt-suspend_zh_CN.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-session-0.13.0/lxqt-leave/translations/lxqt-suspend_zh_CN.desktop 2018-05-21 20:58:27.000000000 +0200 @@ -0,0 +1,2 @@ +Name[zh_CN]=挂起 +Comment[zh_CN]=挂起计算机 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-session/CMakeLists.txt new/lxqt-session-0.13.0/lxqt-session/CMakeLists.txt --- old/lxqt-session-0.12.0/lxqt-session/CMakeLists.txt 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-session/CMakeLists.txt 2018-05-21 20:58:27.000000000 +0200 @@ -1,5 +1,4 @@ -cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR) -project(lxqt-session) +set(LXQT_SESSION_PROJECT_NAME "lxqt-session") if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) @@ -47,7 +46,7 @@ ${lxqt-session_SRCS} ${lxqt-session_UI} INSTALL_DIR - "${LXQT_TRANSLATIONS_DIR}/${PROJECT_NAME}" + "${LXQT_TRANSLATIONS_DIR}/${LXQT_SESSION_PROJECT_NAME}" PULL_TRANSLATIONS ${PULL_TRANSLATIONS} CLEAN_TRANSLATIONS @@ -57,9 +56,9 @@ TRANSLATIONS_REFSPEC ${TRANSLATIONS_REFSPEC} REPO_SUBDIR - "lxqt-session/${PROJECT_NAME}" + "lxqt-session/${LXQT_SESSION_PROJECT_NAME}" ) -lxqt_app_translation_loader(lxqt-session_QM_LOADER ${PROJECT_NAME}) +lxqt_app_translation_loader(lxqt-session_QM_LOADER ${LXQT_SESSION_PROJECT_NAME}) add_executable(lxqt-session ${lxqt-session_SRCS} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-session/man/lxqt-session.1 new/lxqt-session-0.13.0/lxqt-session/man/lxqt-session.1 --- old/lxqt-session-0.12.0/lxqt-session/man/lxqt-session.1 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-session/man/lxqt-session.1 2018-05-21 20:58:27.000000000 +0200 @@ -40,7 +40,7 @@ The modules are only shown by default in the \fBLXQt\fR desktop environment, but an autostart action can be created for other preferred desktop environments. .SH "REPORTING BUGS" -Report bugs to https://github.com/LXDE/LXQt/issues +Report bugs to https://github.com/lxqt/lxqt/issues .SH "SEE ALSO" .\" any module must refer to the session application, for module overview and initiation \fBstartlxqt.1\fR LXQt session initialization and launch script (e.g. in \fB.xinitrc\fR) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-session/src/UdevNotifier.cpp new/lxqt-session-0.13.0/lxqt-session/src/UdevNotifier.cpp --- old/lxqt-session-0.12.0/lxqt-session/src/UdevNotifier.cpp 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-session/src/UdevNotifier.cpp 2018-05-21 20:58:27.000000000 +0200 @@ -2,7 +2,7 @@ * (c)LGPL2+ * * LXQt - a lightweight, Qt based, desktop toolset - * http://lxqt.org + * https://lxqt.org * * Copyright: 2015 LXQt team * Authors: @@ -81,7 +81,7 @@ while (nullptr != (dev = udev_monitor_receive_device(d->monitor))) { QString const action = udev_device_get_action(dev); - QString const device = udev_device_get_devpath(dev); + QString const device = udev_device_get_devnode(dev); if (QStringLiteral("add") == action) emit deviceAdded(std::move(device)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-session/src/UdevNotifier.h new/lxqt-session-0.13.0/lxqt-session/src/UdevNotifier.h --- old/lxqt-session-0.12.0/lxqt-session/src/UdevNotifier.h 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-session/src/UdevNotifier.h 2018-05-21 20:58:27.000000000 +0200 @@ -2,7 +2,7 @@ * (c)LGPL2+ * * LXQt - a lightweight, Qt based, desktop toolset - * http://lxqt.org + * https://lxqt.org * * Copyright: 2015 LXQt team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-session/src/lockscreenmanager.cpp new/lxqt-session-0.13.0/lxqt-session/src/lockscreenmanager.cpp --- old/lxqt-session-0.12.0/lxqt-session/src/lockscreenmanager.cpp 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-session/src/lockscreenmanager.cpp 2018-05-21 20:58:27.000000000 +0200 @@ -2,7 +2,7 @@ * (c)LGPL2+ * * LXQt - a lightweight, Qt based, desktop toolset - * http://lxqt.org/ + * https://lxqt.org/ * * Copyright: 2016 LXQt team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-session/src/lockscreenmanager.h new/lxqt-session-0.13.0/lxqt-session/src/lockscreenmanager.h --- old/lxqt-session-0.12.0/lxqt-session/src/lockscreenmanager.h 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-session/src/lockscreenmanager.h 2018-05-21 20:58:27.000000000 +0200 @@ -2,7 +2,7 @@ * (c)LGPL2+ * * LXQt - a lightweight, Qt based, desktop toolset - * http://lxqt.org/ + * https://lxqt.org/ * * Copyright: 2016 LXQt team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-session/src/log.cpp new/lxqt-session-0.13.0/lxqt-session/src/log.cpp --- old/lxqt-session-0.12.0/lxqt-session/src/log.cpp 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-session/src/log.cpp 2018-05-21 20:58:27.000000000 +0200 @@ -1,9 +1,8 @@ - /* BEGIN_COMMON_COPYRIGHT_HEADER * (c)LGPL2+ * * LXQt - a lightweight, Qt based, desktop toolset - * http://lxqt.org + * https://lxqt.org * * Copyright: 2016 LXQt team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-session/src/log.h new/lxqt-session-0.13.0/lxqt-session/src/log.h --- old/lxqt-session-0.12.0/lxqt-session/src/log.h 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-session/src/log.h 2018-05-21 20:58:27.000000000 +0200 @@ -2,7 +2,7 @@ * (c)LGPL2+ * * LXQt - a lightweight, Qt based, desktop toolset - * http://lxqt.org + * https://lxqt.org * * Copyright: 2016 LXQt team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-session/src/lxqtmodman.cpp new/lxqt-session-0.13.0/lxqt-session/src/lxqtmodman.cpp --- old/lxqt-session-0.12.0/lxqt-session/src/lxqtmodman.cpp 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-session/src/lxqtmodman.cpp 2018-05-21 20:58:27.000000000 +0200 @@ -2,7 +2,7 @@ * (c)LGPL2+ * * LXQt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org, http://lxde.org/ + * https://lxqt.org/ * * Copyright: 2010-2011 LXQt team * Authors: @@ -90,7 +90,7 @@ paths << XdgDirs::dataHome(false); paths << XdgDirs::dataDirs(); - foreach(const QString &path, paths) + for(const QString &path : qAsConst(paths)) { QFileInfo fi(QString("%1/lxqt/themes").arg(path)); if (fi.exists()) @@ -103,9 +103,9 @@ void LXQtModuleManager::startAutostartApps() { // XDG autostart - XdgDesktopFileList fileList = XdgAutoStart::desktopFileList(); - QList<XdgDesktopFile*> trayApps; - for (XdgDesktopFileList::iterator i = fileList.begin(); i != fileList.end(); ++i) + const XdgDesktopFileList fileList = XdgAutoStart::desktopFileList(); + QList<const XdgDesktopFile*> trayApps; + for (XdgDesktopFileList::const_iterator i = fileList.constBegin(); i != fileList.constEnd(); ++i) { if (i->value("X-LXQt-Need-Tray", false).toBool()) trayApps.append(&(*i)); @@ -128,7 +128,7 @@ waitLoop.exec(); mWaitLoop = NULL; } - foreach (XdgDesktopFile* f, trayApps) + for (const XdgDesktopFile* const f : qAsConst(trayApps)) { qCDebug(SESSION) << "start tray app" << f->fileName(); startProcess(*f); @@ -139,7 +139,7 @@ void LXQtModuleManager::themeFolderChanged(const QString& /*path*/) { QString newTheme; - if (!QFileInfo(mCurrentThemePath).exists()) + if (!QFileInfo::exists(mCurrentThemePath)) { const QList<LXQtTheme> &allThemes = lxqtTheme.allThemes(); if (!allThemes.isEmpty()) @@ -251,7 +251,8 @@ { if (!mNameMap.contains(name)) { - foreach (const XdgDesktopFile& file, XdgAutoStart::desktopFileList(false)) + const auto files = XdgAutoStart::desktopFileList(false); + for (const XdgDesktopFile& file : files) { if (QFileInfo(file.fileName()).fileName() == name) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-session/src/lxqtmodman.h new/lxqt-session-0.13.0/lxqt-session/src/lxqtmodman.h --- old/lxqt-session-0.12.0/lxqt-session/src/lxqtmodman.h 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-session/src/lxqtmodman.h 2018-05-21 20:58:27.000000000 +0200 @@ -2,7 +2,7 @@ * (c)LGPL2+ * * LXQt - a lightweight, Qt based, deskop environment - * http://razor-qt.org, http://lxqt.org/ + * https://lxqt.org/ * * Copyright: 2010-2011 LXQt team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-session/src/main.cpp new/lxqt-session-0.13.0/lxqt-session/src/main.cpp --- old/lxqt-session-0.12.0/lxqt-session/src/main.cpp 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-session/src/main.cpp 2018-05-21 20:58:27.000000000 +0200 @@ -2,9 +2,10 @@ * (c)LGPL2+ * * LXQt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org, http://lxde.org/ + * https://lxqt.org/ * - * Copyright: 2010-2011 LXQt team + * Copyright: 2010-2013 Razor team + 2014-2018 LXQt team * Authors: * Petr Vanek <p...@scribus.info> * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-session/src/numlock.cpp new/lxqt-session-0.13.0/lxqt-session/src/numlock.cpp --- old/lxqt-session-0.12.0/lxqt-session/src/numlock.cpp 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-session/src/numlock.cpp 2018-05-21 20:58:27.000000000 +0200 @@ -2,7 +2,7 @@ * (c)LGPL2+ * * LxQt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org, http://lxde.org/ + * https://lxqt.org/ * * Copyright: 2010-2011 LxQt team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-session/src/numlock.h new/lxqt-session-0.13.0/lxqt-session/src/numlock.h --- old/lxqt-session-0.12.0/lxqt-session/src/numlock.h 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-session/src/numlock.h 2018-05-21 20:58:27.000000000 +0200 @@ -1,10 +1,10 @@ /* BEGIN_COMMON_COPYRIGHT_HEADER * (c)LGPL2+ * - * LxQt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org, http://lxde.org/ + * LXQt - a lightweight, Qt based, desktop toolset + * https://lxqt.org/ * - * Copyright: 2010-2011 LxQt team + * Copyright: 2010-2011 LXQt team * Authors: * Hong Jen Yee (PCMan) <pcman...@gmail.com> * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-session/src/sessionapplication.cpp new/lxqt-session-0.13.0/lxqt-session/src/sessionapplication.cpp --- old/lxqt-session-0.12.0/lxqt-session/src/sessionapplication.cpp 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-session/src/sessionapplication.cpp 2018-05-21 20:58:27.000000000 +0200 @@ -125,7 +125,8 @@ // first - set some user defined environment variables (like TERM...) settings.beginGroup("Environment"); QByteArray envVal; - Q_FOREACH (QString i, settings.childKeys()) + const QStringList keys = settings.childKeys(); + for(const QString& i : keys) { envVal = settings.value(i).toByteArray(); lxqt_setenv(i.toLocal8Bit().constData(), envVal); @@ -150,7 +151,7 @@ } } if(!options.isEmpty()) { - Q_FOREACH(const QString& option, options) { + for(const QString& option : qAsConst(options)) { args << QStringLiteral("-option"); args << option; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-session/src/sessiondbusadaptor.h new/lxqt-session-0.13.0/lxqt-session/src/sessiondbusadaptor.h --- old/lxqt-session-0.12.0/lxqt-session/src/sessiondbusadaptor.h 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-session/src/sessiondbusadaptor.h 2018-05-21 20:58:27.000000000 +0200 @@ -2,7 +2,7 @@ * (c)LGPL2+ * * LXQt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org, http://lxde.org/ + * https://lxqt.org/ * * Copyright: 2010-2011 LXQt team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-session/src/windowmanager.cpp new/lxqt-session-0.13.0/lxqt-session/src/windowmanager.cpp --- old/lxqt-session-0.12.0/lxqt-session/src/windowmanager.cpp 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-session/src/windowmanager.cpp 2018-05-21 20:58:27.000000000 +0200 @@ -2,7 +2,7 @@ * (c)LGPL2+ * * LXQt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org, http://lxde.org/ + * https://lxqt.org/ * * Copyright: 2010-2011 LXQt team * Authors: @@ -42,7 +42,8 @@ return true; QString path = qgetenv("PATH"); - foreach(const QString &dir, path.split(":")) + const auto paths = path.split(":"); + for(const QString &dir : paths) { QFileInfo fi= QFileInfo(dir + QDir::separator() + program); if (fi.isExecutable() ) @@ -55,11 +56,11 @@ { LXQt::Settings cfg("windowmanagers"); cfg.beginGroup("KnownManagers"); - QStringList names = cfg.childGroups(); + const QStringList names = cfg.childGroups(); WindowManagerList ret; - foreach (const QString &name, names) + for (const QString &name : names) { bool exists = findProgram(name); if (!onlyAvailable || exists) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-session/src/windowmanager.h new/lxqt-session-0.13.0/lxqt-session/src/windowmanager.h --- old/lxqt-session-0.12.0/lxqt-session/src/windowmanager.h 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-session/src/windowmanager.h 2018-05-21 20:58:27.000000000 +0200 @@ -2,7 +2,7 @@ * (c)LGPL2+ * * LXQt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org, http://lxde.org/ + * https://lxqt.org/ * * Copyright: 2010-2011 LXQt team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-session/src/wmselectdialog.cpp new/lxqt-session-0.13.0/lxqt-session/src/wmselectdialog.cpp --- old/lxqt-session-0.12.0/lxqt-session/src/wmselectdialog.cpp 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-session/src/wmselectdialog.cpp 2018-05-21 20:58:27.000000000 +0200 @@ -2,7 +2,7 @@ * (c)LGPL2+ * * LXQt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org, http://lxde.org/ + * https://lxqt.org/ * * Copyright: 2010-2011 LXQt team * Authors: @@ -52,7 +52,7 @@ connect(ui->wmList, SIGNAL(clicked(QModelIndex)), this, SLOT(selectFileDialog(QModelIndex))); connect(ui->wmList, SIGNAL(activated(QModelIndex)), this, SLOT(changeBtnStatus(QModelIndex))); - foreach (const WindowManager &wm, availableWindowManagers) + for (const WindowManager &wm : availableWindowManagers) { addWindowManager(wm); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/lxqt-session/src/wmselectdialog.h new/lxqt-session-0.13.0/lxqt-session/src/wmselectdialog.h --- old/lxqt-session-0.12.0/lxqt-session/src/wmselectdialog.h 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/lxqt-session/src/wmselectdialog.h 2018-05-21 20:58:27.000000000 +0200 @@ -2,7 +2,7 @@ * (c)LGPL2+ * * LXQt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org, http://lxde.org/ + * https://lxqt.org/ * * Copyright: 2010-2011 LXQt team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/startlxqt.1 new/lxqt-session-0.13.0/startlxqt.1 --- old/lxqt-session-0.12.0/startlxqt.1 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/startlxqt.1 2018-05-21 20:58:27.000000000 +0200 @@ -21,7 +21,7 @@ by display managers. .RE .SH BUGS -None at the time of this writing. Bugs can be reported on https://github.com/lxde/lxqt/issues. +None at the time of this writing. Bugs can be reported on https://github.com/lxqt/lxqt/issues. .SH EXAMPLE To start an LXQt session from a virtual terminal (virtual console) add a line .P @@ -42,7 +42,7 @@ .BR startx (1) .BR sddm (1) .P -.B http://www.freedesktop.org/wiki/Specifications/desktop-entry-spec/ +.B https://www.freedesktop.org/wiki/Specifications/desktop-entry-spec/ .RS 5 Desktop Entry Specification defining desktop entry files (*.desktop). .RE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/startlxqt.in new/lxqt-session-0.13.0/startlxqt.in --- old/lxqt-session-0.12.0/startlxqt.in 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/startlxqt.in 2018-05-21 20:58:27.000000000 +0200 @@ -24,7 +24,7 @@ export XDG_DATA_DIRS if [ -z "$XDG_CONFIG_DIRS" ]; then - export XDG_CONFIG_DIRS="@LXQT_ETC_XDG_DIR@" + export XDG_CONFIG_DIRS="@PREDEF_XDG_CONFIG_DIRS@" else if ! contains "$XDG_CONFIG_DIRS" '@LXQT_ETC_XDG_DIR@'; then XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS:@LXQT_ETC_XDG_DIR@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/xsession/translations/lxqt_es.desktop new/lxqt-session-0.13.0/xsession/translations/lxqt_es.desktop --- old/lxqt-session-0.12.0/xsession/translations/lxqt_es.desktop 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/xsession/translations/lxqt_es.desktop 2018-05-21 20:58:27.000000000 +0200 @@ -1,3 +1,2 @@ -# Translations Name[es]=Escritorio LXQt -Comment[es]=Escritorio Qt +Comment[es]=Escritorio Qt ligero diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-session-0.12.0/xsession/translations/lxqt_zh_CN.desktop new/lxqt-session-0.13.0/xsession/translations/lxqt_zh_CN.desktop --- old/lxqt-session-0.12.0/xsession/translations/lxqt_zh_CN.desktop 2017-10-21 21:39:00.000000000 +0200 +++ new/lxqt-session-0.13.0/xsession/translations/lxqt_zh_CN.desktop 2018-05-21 20:58:27.000000000 +0200 @@ -1,3 +1,3 @@ # Translations Name[zh_CN]=LXQt 桌面 -Comment[zh_CN]=Qt 桌面 +Comment[zh_CN]=轻量级的 Qt 桌面环境
