Fix obsolete links. Some code refactoring

Author: Vitozz

CMakeLists.txt

@@ -174,6 +174,11 @@ elseif(NOT ENABLE_PLUGINS AND BUILD_PSIMEDIA)
     message(FATAL_ERROR "BUILD_PSIMEDIA flag not works without ENABLE_PLUGINS flag.\nPlease enable ENABLE_PLUGINS flag or disable BUILD_PSIMEDIA flag")
 endif()
 
+if(ENABLE_PLUGINS AND (NOT EXISTS "${PROJECT_SOURCE_DIR}/plugins/CMakeLists.txt"))
+    message(FATAL_ERROR "ENABLE_PLUGINS option is enabled but no plugins sources found at ${PROJECT_SOURCE_DIR}/plugins.\nPlease download and copy plguins sources from official repository or disable this option")
+endif()
+
+
 if(WIN32 OR USE_MXE)
     set(BUNDLED_IRIS_ALL ON)
 endif()

README.html

@@ -52,7 +52,7 @@ <h2>Installation</h2>
 
 <h2>Development</h2>
 
-<p>In 2009 a Psi fork named <a href="https://psi-plus.com/">Psi+</a> was started. Project purposes were: implementation of new features, writing of patches and plugins for transferring them to upstream. As of 2017 all active Psi+ developers have become official Psi developers and now Psi+ is just a development branch of Psi with rolling release development model.</p>
+<p>In 2009 a Psi fork named <a href="https://github.com/psi-plus">Psi+</a> was started. Project purposes were: implementation of new features, writing of patches and plugins for transferring them to upstream. As of 2017 all active Psi+ developers have become official Psi developers and now Psi+ is just a development branch of Psi with rolling release development model.</p>
 
 <p>Users who wants to receive new features and bug fixes very quickly may use Psi+ on daily basis. Users who do not care about new trends and prefer constancy may choose Psi as it uses classical development model and its releases are quite rare.</p>
 
@@ -98,7 +98,7 @@ <h3>Bug reports</h3>
 
 <h3>Beta testing</h3>
 
-<p>As we (intentionally) do not have nor beta versions of Psi, nor daily build builds for it, you are invited to use <a href="https://psi-plus.com/">Psi+ program</a> for suggesting and testing of new features, and for reporting about new bugs (if they happen).</p>
+<p>As we (intentionally) do not have nor beta versions of Psi, nor daily build builds for it, you are invited to use <a href="https://github.com/psi-plus">Psi+ program</a> for suggesting and testing of new features, and for reporting about new bugs (if they happen).</p>
 
 <h3>Comments and wishes</h3>
 
@@ -134,7 +134,7 @@ <h2>Main links</h2>
 <li><a href="https://github.com/psi-im/plugins">Officially supported plugins</a> (sources)</li>
 <li><a href="https://github.com/psi-im/psimedia">Multimedia plugin for audio and video calls</a> (sources)</li>
 <li><a href="https://github.com/psi-im/resources">Extra resources</a> (iconsets, sounds, skins, themes, etc.)</li>
-<li><a href="https://psi-plus.com/">Psi+ project</a> (official website)</li>
+<li><a href="https://psi-im.org/">Psi+ project</a> (official website)</li>
 <li><a href="https://github.com/psi-plus/psi-plus-snapshots">Psi+ snapshots</a> (sources)</li>
 <li><a href="https://github.com/psi-plus/psi-plus-l10n">Psi+ translations</a> (sources)</li>
 </ul>
@@ -149,7 +149,7 @@ <h2>Packages and installers</h2>
 <li><a href="https://sourceforge.net/projects/psiplus/files/macOS/tehnick/">Psi+ builds for macOS</a></li>
 <li><a href="https://depot.haiku-os.org/psi_plus">Psi+ package in Haiku</a></li>
 <li><a href="https://launchpad.net/~psi-plus/+archive/ubuntu/ppa">Official PPA for Ubuntu and distros based on it</a> (daily builds)</li>
-<li><a href="http://notesalexp.org/index-old.html">Unofficial PPA for Debian and Ubuntu</a> (see <a href="https://psi-plus.com/wiki/en:debian#nightly_builds">notes</a> about using it)</li>
+<li><a href="http://notesalexp.org/index-old.html">Unofficial PPA for Debian and Ubuntu</a></li>
 <li><a href="https://software.opensuse.org/package/psi-plus">Unofficial PPA for openSUSE</a> (daily builds)</li>
 <li><a href="https://copr.fedorainfracloud.org/coprs/valdikss/psi-plus-snapshots/">Unofficial PPA for Fedora</a> (outdated)</li>
 <li><a href="https://repology.org/metapackage/psi-plus/versions">Packages for different Linux distros</a></li>

README.md

@@ -50,7 +50,7 @@ MS Windows users may download official installers and portable builds from [Sour
 
 ## Development
 
-In 2009 a Psi fork named [Psi+](https://psi-plus.com/) was started. Project purposes were: implementation of new features, writing of patches and plugins for transferring them to upstream. As of 2017 all active Psi+ developers have become official Psi developers and now Psi+ is just a development branch of Psi with rolling release development model.
+In 2009 a Psi fork named [Psi+](https://github.com/psi-plus) was started. Project purposes were: implementation of new features, writing of patches and plugins for transferring them to upstream. As of 2017 all active Psi+ developers have become official Psi developers and now Psi+ is just a development branch of Psi with rolling release development model.
 
 Users who wants to receive new features and bug fixes very quickly may use Psi+ on daily basis. Users who do not care about new trends and prefer constancy may choose Psi as it uses classical development model and its releases are quite rare.
 
@@ -90,7 +90,7 @@ If you found a bug please report about it in our [Bug Tracker](https://github.co
 
 ### Beta testing
 
-As we (intentionally) do not have nor beta versions of Psi, nor daily build builds for it, you are invited to use [Psi+ program](https://psi-plus.com/) for suggesting and testing of new features, and for reporting about new bugs (if they happen).
+As we (intentionally) do not have nor beta versions of Psi, nor daily build builds for it, you are invited to use [Psi+ program](https://github.com/psi-plus) for suggesting and testing of new features, and for reporting about new bugs (if they happen).
 
 ### Comments and wishes
 
@@ -125,7 +125,7 @@ If you want to donate some money for development of Psi and Psi+ project, it is
 * [Officially supported plugins](https://github.com/psi-im/plugins) (sources)
 * [Multimedia plugin for audio and video calls](https://github.com/psi-im/psimedia) (sources)
 * [Extra resources](https://github.com/psi-im/resources) (iconsets, sounds, skins, themes, etc.)
-* [Psi+ project](https://psi-plus.com/) (official website)
+* [Psi+ project](https://psi-im.org/) (official website)
 * [Psi+ snapshots](https://github.com/psi-plus/psi-plus-snapshots) (sources)
 * [Psi+ translations](https://github.com/psi-plus/psi-plus-l10n) (sources)
 
@@ -138,11 +138,11 @@ If you want to donate some money for development of Psi and Psi+ project, it is
 * [Psi+ builds for macOS](https://sourceforge.net/projects/psiplus/files/macOS/tehnick/)
 * [Psi+ package in Haiku](https://depot.haiku-os.org/psi_plus)
 * [Official PPA for Ubuntu and distros based on it](https://launchpad.net/~psi-plus/+archive/ubuntu/ppa) (daily builds)
-* [Unofficial PPA for Debian and Ubuntu](http://notesalexp.org/index-old.html) (see [notes](https://psi-plus.com/wiki/en:debian#nightly_builds) about using it)
+* [Unofficial PPA for Debian and Ubuntu](http://notesalexp.org/index-old.html)
 * [Unofficial PPA for openSUSE](https://software.opensuse.org/package/psi-plus) (daily builds)
 * [Unofficial PPA for Fedora](https://copr.fedorainfracloud.org/coprs/valdikss/psi-plus-snapshots/) (outdated)
 * [Psi package for Arch Linux](https://archlinux.org/packages/extra/x86_64/psi/)
-* [Unofficial Psi+ AUR package](https://aur.archlinux.org/packages/psi-plus) 
+* [Unofficial Psi+ AUR package](https://aur.archlinux.org/packages/psi-plus)
 * [Packages for different Linux distros](https://repology.org/metapackage/psi-plus/versions)
 
 ## Extra links

linux/psi-plus.appdata.xml

@@ -30,11 +30,11 @@
     <p>Psi+ is a development branch of Psi with rolling release development model. Users who wants to receive new features and bug fixes very quickly may use Psi+ on daily basis. Users who do not care about new trends and prefer constancy may choose Psi as it uses classical development model and its releases are quite rare.</p>
     <p xml:lang="ru">Psi+ — это ветка разработки клиента Psi, для которой используется модель разработки с плавающим релизом. Пользователи, которые хотят быстро получать новые функции и исправления ошибок, могут использовать Psi+ на ежедневной основе. Пользователи, которые не заботятся о новых тенденциях и предпочитают постоянство, могут выбрать Psi, поскольку он использует классическую модель разработки и его выпуски довольно редки.</p>
   </description>
-  <url type="homepage">https://psi-plus.com/</url>
+  <url type="homepage">https://psi-im.org/</url>
   <url type="bugtracker">https://github.com/psi-im/psi/issues</url>
   <screenshots>
     <screenshot type="default">
-      <image>https://psi-plus.com/wi/psiplus_screen_linux_big.png</image>
+      <image>https://psi-im.org/wiki/lib/exe/fetch.php?cache=&media=psiplus_screen_linux_big.png</image>
     </screenshot>
   </screenshots>
   <content_rating type="oars-1.1">

src/CMakeLists.txt

@@ -188,16 +188,15 @@ elseif(IS_WEBENGINE)
     set(PSI_VER_SUFFIX ", webengine")
 endif()
 
+set(CLIENT_CAPS_NODE "https://psi-im.org")
 if( NOT PSI_PLUS )
     set(CLIENT_NAME "Psi")
     set(CLIENT_SNAME "psi")
-    set(CLIENT_CAPS_NODE "https://psi-im.org")
     set(PSILOGO_PREFIX "")
     set(MAIN_ICON "psimain.png")
 else()
     set(CLIENT_NAME "Psi+")
     set(CLIENT_SNAME "psi+")
-    set(CLIENT_CAPS_NODE "https://psi-plus.com")
     set(PSILOGO_PREFIX "psiplus/")
     set(MAIN_ICON "psiplus_icon.png")
 endif()

src/mainwin.cpp

@@ -225,7 +225,7 @@ void MainWin::Private::registerActions()
         IconAction *action = getAction(aName);
         mainWin->connect(action, &IconAction::triggered, mainWin, [this, id](bool) {
             QList<IconAction *> l = statusGroup->findChildren<IconAction *>();
-            for (IconAction *action : l) {
+            for (IconAction *action : std::as_const(l)) {
                 auto it = statusActions.constFind(action);
                 action->setChecked(it != statusActions.constEnd() && *it == id);
             }
@@ -927,7 +927,7 @@ void MainWin::buildOptionsMenu()
     d->updateMenu(actions, helpMenu);
 
     auto pluginActions = PluginManager::instance()->globalAboutMenuActions();
-    for (auto a : pluginActions) {
+    for (auto a : std::as_const(pluginActions)) {
         helpMenu->addAction(a);
     }
 
@@ -998,16 +998,15 @@ void MainWin::actReadmeActivated()
 void MainWin::actOnlineWikiActivated()
 {
     DesktopUtil::openUrl(
+#ifdef PSI_PLUS
+        "https://psi-im.org/wiki"
+#else
         "https://github.com/psi-im/psi/wiki"
+#endif
     );
 }
 
-void MainWin::actOnlineHomeActivated()
-{
-    DesktopUtil::openUrl(
-        "https://psi-im.org"
-    );
-}
+void MainWin::actOnlineHomeActivated() { DesktopUtil::openUrl("https://psi-im.org"); }
 
 void MainWin::actOnlineForumActivated() { DesktopUtil::openUrl("https://groups.google.com/forum/#!forum/psi-users"); }
 
@@ -1021,12 +1020,7 @@ void MainWin::actJoinPsiMUCActivated()
     account->actionJoin("[email protected]");
 }
 
-void MainWin::actBugReportActivated()
-{
-    DesktopUtil::openUrl(
-        "https://github.com/psi-im/psi/issues"
-    );
-}
+void MainWin::actBugReportActivated() { DesktopUtil::openUrl("https://github.com/psi-im/psi/issues"); }
 
 void MainWin::actAboutActivated()
 {
@@ -1314,7 +1308,7 @@ void MainWin::decorateButton(int status)
 {
     // update the 'change status' buttons
     QList<IconAction *> l = d->statusGroup->findChildren<IconAction *>();
-    for (IconAction *action : l) {
+    for (IconAction *action : std::as_const(l)) {
         action->setChecked(d->statusActions[action] == status);
     }
 

src/src.cmake

@@ -2,7 +2,6 @@ add_definitions(
     -DFILETRANSFER
     -DGROUPCHAT
     -DWHITEBOARDING
-    -DNEWCONTACTLIST
     -DHAVE_PGPUTIL
     -DPSI_PLUGINS
     -DUSE_PEP