clang-format

psi-im · Mar 15, 2024 · bc0af92 · bc0af92
1 parent 8b66dd4
commit bc0af92
Show file tree

Hide file tree

Showing 346 changed files with 1,367 additions and 1,498 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,15 +10,15 @@ jobs:
     - os: linux
       dist: bionic
       env: TARGET=linux64 CHAT_TYPE=basic DIST=bionic
-      
+
     - os: linux
       dist: bionic
       env: TARGET=linux64 CHAT_TYPE=webkit DIST=bionic
-      
+
     - os: linux
       dist: bionic
       env: TARGET=linux64 CHAT_TYPE=webengine DIST=bionic
-      
+
     - os: osx
       osx_image: xcode12.3
       env: TARGET=macos64 CHAT_TYPE=basic macOS=11.1

diff --git a/admin/psi-plus-nightly-version b/admin/psi-plus-nightly-version
@@ -32,4 +32,3 @@ FEATURES=""
 [ "${1}" = "--webengine" ] && FEATURES=", webengine"
 
 echo "${PSI_TAG}.${PATCHES_NUM} (${DATE_STR}, ${PSI_HASH}${FEATURES})"
-
diff --git a/plugins/include/accountinfoaccessinghost.h b/plugins/include/accountinfoaccessinghost.h
@@ -20,8 +20,8 @@ class AccountInfoAccessingHost {
     virtual QString     getId(int account)            = 0; // if account out of range return "-1"
     virtual QString     getName(int account)          = 0; // if account out of range return ""
     virtual QStringList getRoster(int account) = 0; // if account out of range return List with one element, value "-1"
-    virtual int         findOnlineAccountForContact(const QString &jid)
-        const = 0; // gets all accounts and searches for specified contact in them. return -1 if account is not found
+    virtual int         findOnlineAccountForContact(const QString &jid) const
+        = 0; // gets all accounts and searches for specified contact in them. return -1 if account is not found
     virtual QString                getPgpKey(int account)       = 0;
     virtual QMap<QString, QString> getKnownPgpKeys(int account) = 0;
 };

diff --git a/plugins/include/gctoolbariconaccessor.h b/plugins/include/gctoolbariconaccessor.h
@@ -14,7 +14,7 @@ class GCToolbarIconAccessor {
     virtual ~GCToolbarIconAccessor() { }
 
     virtual QList<QVariantHash> getGCButtonParam()                                                = 0;
-    virtual QAction *           getGCAction(QObject *parent, int account, const QString &contact) = 0;
+    virtual QAction            *getGCAction(QObject *parent, int account, const QString &contact) = 0;
 };
 
 Q_DECLARE_INTERFACE(GCToolbarIconAccessor, "org.psi-im.GCToolbarIconAccessor/0.1");

diff --git a/plugins/include/iqfilteringhost.h b/plugins/include/iqfilteringhost.h
@@ -11,10 +11,10 @@ class IqFilteringHost {
 public:
     virtual ~IqFilteringHost() { }
 
-    virtual void addIqNamespaceFilter(const QString &ns, IqNamespaceFilter *filter) = 0;
+    virtual void addIqNamespaceFilter(const QString &ns, IqNamespaceFilter *filter)            = 0;
     virtual void addIqNamespaceFilter(const QRegularExpression &ns, IqNamespaceFilter *filter) = 0;
 
-    virtual void removeIqNamespaceFilter(const QString &ns, IqNamespaceFilter *filter) = 0;
+    virtual void removeIqNamespaceFilter(const QString &ns, IqNamespaceFilter *filter)            = 0;
     virtual void removeIqNamespaceFilter(const QRegularExpression &ns, IqNamespaceFilter *filter) = 0;
 };
 

diff --git a/plugins/include/menuaccessor.h b/plugins/include/menuaccessor.h
@@ -15,8 +15,8 @@ class MenuAccessor {
 
     virtual QList<QVariantHash> getAccountMenuParam()                                                  = 0;
     virtual QList<QVariantHash> getContactMenuParam()                                                  = 0;
-    virtual QAction *           getContactAction(QObject *parent, int account, const QString &contact) = 0;
-    virtual QAction *           getAccountAction(QObject *parent, int account)                         = 0;
+    virtual QAction            *getContactAction(QObject *parent, int account, const QString &contact) = 0;
+    virtual QAction            *getAccountAction(QObject *parent, int account)                         = 0;
 };
 
 Q_DECLARE_INTERFACE(MenuAccessor, "org.psi-im.MenuAccessor/0.1");

diff --git a/plugins/include/pluginaccessinghost.h b/plugins/include/pluginaccessinghost.h
@@ -9,7 +9,7 @@ class PluginAccessingHost {
 public:
     virtual ~PluginAccessingHost() { }
 
-    virtual QObject *   getPlugin(const QString &name) = 0;
+    virtual QObject    *getPlugin(const QString &name) = 0;
     virtual QVariantMap selfMetadata() const           = 0;
 };
 

diff --git a/plugins/include/psimediaprovider.h b/plugins/include/psimediaprovider.h
@@ -141,8 +141,8 @@ class Provider : public QObjectInterface {
     virtual QString creditName() const = 0;
     virtual QString creditText() const = 0;
 
-    virtual FeaturesContext *     createFeatures()      = 0;
-    virtual RtpSessionContext *   createRtpSession()    = 0;
+    virtual FeaturesContext      *createFeatures()      = 0;
+    virtual RtpSessionContext    *createRtpSession()    = 0;
     virtual AudioRecorderContext *createAudioRecorder() = 0;
 
     HINT_SIGNALS : HINT_METHOD(initialized())

diff --git a/plugins/include/toolbariconaccessor.h b/plugins/include/toolbariconaccessor.h
@@ -14,7 +14,7 @@ class ToolbarIconAccessor {
     virtual ~ToolbarIconAccessor() { }
 
     virtual QList<QVariantHash> getButtonParam()                                                = 0;
-    virtual QAction *           getAction(QObject *parent, int account, const QString &contact) = 0;
+    virtual QAction            *getAction(QObject *parent, int account, const QString &contact) = 0;
 };
 
 Q_DECLARE_INTERFACE(ToolbarIconAccessor, "org.psi-im.ToolbarIconAccessor/0.1");

diff --git a/plugins/include/webkitaccessinghost.h b/plugins/include/webkitaccessinghost.h
@@ -26,7 +26,7 @@ class WebkitAccessingHost {
     // reloading.
 
     // installs global chat log data filter, where data is all the possible message types added to chatlog
-    virtual QString installChatLogJSDataFilter(const QString &     js,
+    virtual QString installChatLogJSDataFilter(const QString      &js,
                                                PsiPlugin::Priority priority = PsiPlugin::PriorityNormal)
         = 0;
     // uninstall global chat log data filter

diff --git a/src/AutoUpdater/guitest/testapp/main.cpp b/src/AutoUpdater/guitest/testapp/main.cpp
@@ -76,7 +76,7 @@ public slots:
     }
 
 private:
-    QTcpServer *              tcpServer_;
+    QTcpServer               *tcpServer_;
     QMap<QString, QByteArray> pages_;
 };
 
@@ -168,7 +168,7 @@ public slots:
     }
 
 private:
-    AutoUpdater *     updater_;
+    AutoUpdater      *updater_;
     SimpleHTTPServer *server_;
     QString           appCastURL_, releaseNotesURL_, releaseURL_;
 };

diff --git a/src/Certificates/CertificateDisplayDialog.cpp b/src/Certificates/CertificateDisplayDialog.cpp
@@ -27,8 +27,7 @@
 #include <QtCrypto>
 
 CertificateDisplayDialog::CertificateDisplayDialog(const QCA::Certificate &cert, int result, QCA::Validity validity,
-                                                   QWidget *parent) :
-    QDialog(parent)
+                                                   QWidget *parent) : QDialog(parent)
 {
     ui_.setupUi(this);
     setModal(true);

diff --git a/src/Certificates/CertificateErrorDialog.cpp b/src/Certificates/CertificateErrorDialog.cpp
@@ -21,16 +21,15 @@ CertificateErrorDialog::CertificateErrorDialog(const QString &title, const QStri
                                                int result, QCA::Validity validity, const QString &domainOverride,
                                                QString &tlsOverrideDomain, QByteArray &tlsOverrideCert,
                                                QWidget *parent) :
-    QDialog(parent),
-    certificate_(cert), result_(result), validity_(validity), tlsOverrideDomain_(tlsOverrideDomain),
+    QDialog(parent), certificate_(cert), result_(result), validity_(validity), tlsOverrideDomain_(tlsOverrideDomain),
     tlsOverrideCert_(tlsOverrideCert), domainOverride_(domainOverride), host_(host)
 {
     setWindowTitle(title);
-    QVBoxLayout *     _layout        = new QVBoxLayout(this);
+    QVBoxLayout      *_layout        = new QVBoxLayout(this);
     QDialogButtonBox *btnBox         = new QDialogButtonBox(this);
-    QPushButton *     detailsButton  = new QPushButton(QObject::tr("&Details..."), this);
-    QPushButton *     continueButton = new QPushButton(QObject::tr("&Connect anyway"), this);
-    QPushButton *     saveButton     = new QPushButton(
+    QPushButton      *detailsButton  = new QPushButton(QObject::tr("&Details..."), this);
+    QPushButton      *continueButton = new QPushButton(QObject::tr("&Connect anyway"), this);
+    QPushButton      *saveButton     = new QPushButton(
         domainOverride.isEmpty() ? QObject::tr("&Trust this certificate") : QObject::tr("&Trust this domain"), this);
     btnBox->addButton(detailsButton, QDialogButtonBox::NoRole);
     btnBox->addButton(continueButton, QDialogButtonBox::AcceptRole);

diff --git a/src/Certificates/CertificateErrorDialog.h b/src/Certificates/CertificateErrorDialog.h
@@ -22,8 +22,8 @@ class CertificateErrorDialog : public QDialog {
     QCA::Certificate certificate_;
     int              result_;
     QCA::Validity    validity_;
-    QString &        tlsOverrideDomain_;
-    QByteArray &     tlsOverrideCert_;
+    QString         &tlsOverrideDomain_;
+    QByteArray      &tlsOverrideCert_;
     QString          domainOverride_;
     QString          host_;
 };

diff --git a/src/CocoaUtilities/CocoaTrayClick.cpp b/src/CocoaUtilities/CocoaTrayClick.cpp
@@ -24,7 +24,7 @@
 #include <objc/message.h>
 #include <objc/runtime.h>
 
-//#define DEBUG_OUTPUT
+// #define DEBUG_OUTPUT
 
 bool dockClickHandler(id /*self*/, SEL /*_cmd*/, ...)
 {
@@ -42,7 +42,7 @@ CocoaTrayClick *CocoaTrayClick::instance()
 
 CocoaTrayClick::CocoaTrayClick() : QObject(qApp)
 {
-    typedef objc_object *(*object_type)(struct objc_object * self, SEL _cmd);
+    typedef objc_object *(*object_type)(struct objc_object *self, SEL _cmd);
     object_type objc_msgSendObject = (object_type)objc_msgSend;
 
     Class        cls     = objc_getClass("NSApplication");

diff --git a/src/abstracttreeitem.h b/src/abstracttreeitem.h
@@ -40,7 +40,7 @@ class AbstractTreeItem {
     void appendChild(AbstractTreeItem *child);
     void removeChild(AbstractTreeItem *child);
 
-    AbstractTreeItem *   child(int row) const;
+    AbstractTreeItem    *child(int row) const;
     int                  childCount() const;
     AbstractTreeItemList children() const;
 
@@ -49,6 +49,6 @@ class AbstractTreeItem {
     virtual QString           toString() const { return QString(); /* no default implementation */ }
 
 private:
-    AbstractTreeItem *   _parent;
+    AbstractTreeItem    *_parent;
     AbstractTreeItemList _children;
 };
diff --git a/src/accountmanagedlg.cpp b/src/accountmanagedlg.cpp
@@ -22,14 +22,14 @@
 #include "accountadddlg.h"
 #include "common.h"
 #include "iconaction.h"
+#include "iris/xmpp_tasks.h"
 #include "miniclient.h"
 #include "psiaccount.h"
 #include "psicon.h"
 #include "psicontactlist.h"
 #include "psiiconset.h"
 #include "shortcutmanager.h"
 #include "ui_accountremove.h"
-#include "iris/xmpp_tasks.h"
 
 #include <QButtonGroup>
 #include <QDropEvent>
@@ -75,7 +75,7 @@ private slots:
     class Private;
     Private *d;
 
-    MiniClient * client;
+    MiniClient  *client;
     QPushButton *pb_close_;
     QPushButton *pb_remove_;
 };
@@ -135,7 +135,7 @@ void AccountRemoveDlg::done(int r)
 {
     if (busy->isActive()) {
         QMessageBox  messageBox(QMessageBox::Information, CAP(tr("Warning")),
-                               tr("Are you sure you want to cancel the unregistration?"));
+                                tr("Are you sure you want to cancel the unregistration?"));
         QPushButton *cancel = messageBox.addButton(tr("&No"), QMessageBox::RejectRole);
         QPushButton *accept = messageBox.addButton(tr("&Yes"), QMessageBox::AcceptRole);
         messageBox.setDefaultButton(accept);
@@ -171,7 +171,7 @@ void AccountRemoveDlg::remove()
     }
 
     QMessageBox  messageBox(QMessageBox::Information, CAP(tr("Warning")),
-                           tr("Are you sure you want to remove <b>%1</b> ?").arg(d->acc.name));
+                            tr("Are you sure you want to remove <b>%1</b> ?").arg(d->acc.name));
     QPushButton *cancel = messageBox.addButton(QMessageBox::Cancel);
     QPushButton *remove = messageBox.addButton(tr("&Remove"), QMessageBox::AcceptRole);
     messageBox.setDefaultButton(remove);
@@ -294,7 +294,7 @@ void AccountManageTree::dropEvent(QDropEvent *event)
 
     if (tree) {
         QList<PsiAccount *> accountsList;
-        const auto &        items = tree->findItems("*", Qt::MatchWildcard);
+        const auto         &items = tree->findItems("*", Qt::MatchWildcard);
         for (QTreeWidgetItem *ami : items) {
             accountsList.append(static_cast<AccountManageItem *>(ami)->pa.data());
         }
@@ -387,7 +387,7 @@ void AccountManageDlg::remove()
 
     if (i->pa->isActive()) {
         QMessageBox  messageBox(QMessageBox::Information, CAP(tr("Error")),
-                               tr("Please disconnect before removing the account."));
+                                tr("Please disconnect before removing the account."));
         QPushButton *cancel     = messageBox.addButton(QMessageBox::Cancel);
         QPushButton *disconnect = messageBox.addButton(tr("&Disconnect"), QMessageBox::AcceptRole);
         messageBox.setDefaultButton(disconnect);

diff --git a/src/accountmanagedlg.h b/src/accountmanagedlg.h
@@ -64,7 +64,7 @@ private slots:
     void accountRemoved(PsiAccount *);
 
 private:
-    PsiCon * psi;
+    PsiCon  *psi;
     QAction *removeAction_;
 };
 

diff --git a/src/accountmodifydlg.h b/src/accountmodifydlg.h
@@ -77,8 +77,8 @@ private slots:
     bool checkSSL();
 
 private:
-    PsiCon *      psi;
-    PsiAccount *  pa;
+    PsiCon       *psi;
+    PsiAccount   *pa;
     ProxyChooser *pc;
     UserAccount   acc;
 

diff --git a/src/accountregdlg.cpp b/src/accountregdlg.cpp
@@ -19,6 +19,7 @@
 
 #include "accountregdlg.h"
 
+#include "iris/xmpp_tasks.h"
 #include "jidutil.h"
 #include "miniclient.h"
 #include "proxy.h"
@@ -27,7 +28,6 @@
 #include "serverlistquerier.h"
 #include "textutil.h"
 #include "xdata_widget.h"
-#include "iris/xmpp_tasks.h"
 
 #include <QMessageBox>
 #include <QScrollArea>

diff --git a/src/accountregdlg.h b/src/accountregdlg.h
@@ -20,9 +20,9 @@
 #ifndef ACCOUNTREGDLG_H
 #define ACCOUNTREGDLG_H
 
+#include "iris/xmpp_jid.h"
 #include "profiles.h"
 #include "ui_accountreg.h"
-#include "iris/xmpp_jid.h"
 
 #include <QDialog>
 #include <QString>
@@ -48,10 +48,10 @@ class AccountRegDlg : public QDialog {
     AccountRegDlg(PsiCon *psi, QWidget *parent = nullptr);
     ~AccountRegDlg();
 
-    const XMPP::Jid &    jid() const { return jid_; }
-    const QString &      pass() const { return pass_; }
+    const XMPP::Jid     &jid() const { return jid_; }
+    const QString       &pass() const { return pass_; }
     bool                 useHost() const { return opt_host_; }
-    const QString &      host() const { return host_; }
+    const QString       &host() const { return host_; }
     int                  port() const { return port_; }
     UserAccount::SSLFlag ssl() const { return ssl_; }
     QString              proxy() const { return proxy_; }
@@ -86,12 +86,12 @@ protected slots:
 
 private:
     Ui::AccountReg     ui_;
-    PsiCon *           psi;
-    QScrollArea *      fields_container_;
-    XDataWidget *      fields_;
-    ProxyChooser *     proxy_chooser_;
+    PsiCon            *psi;
+    QScrollArea       *fields_container_;
+    XDataWidget       *fields_;
+    ProxyChooser      *proxy_chooser_;
     ServerListQuerier *serverlist_querier_;
-    MiniClient *       client_;
+    MiniClient        *client_;
     bool               isOld_;
 
     // Account settings

diff --git a/src/accountscombobox.h b/src/accountscombobox.h
@@ -48,7 +48,7 @@ private slots:
     void updateAccounts();
 
 private:
-    PsiCon *    controller_;
+    PsiCon     *controller_;
     PsiAccount *account_;
     bool        onlineOnly_;
 

diff --git a/src/actionlist.h b/src/actionlist.h
@@ -37,8 +37,8 @@ class ActionList : public QObject {
     QString name() const;
     int     id() const;
 
-    IconAction *       action(const QString &name) const;
-    IconAction *       copyAction(const QString &name, QObject *parent = nullptr) const;
+    IconAction        *action(const QString &name) const;
+    IconAction        *copyAction(const QString &name, QObject *parent = nullptr) const;
     const QStringList &actions() const;
 
     void addAction(const QString &name, IconAction *action);
@@ -61,8 +61,8 @@ class MetaActionList : public QObject {
     MetaActionList();
     ~MetaActionList();
 
-    ActionList *        actionList(const QString &name) const;
-    ActionList *        actionList(const QString &name, int id) const;
+    ActionList         *actionList(const QString &name) const;
+    ActionList         *actionList(const QString &name, int id) const;
     QList<ActionList *> actionLists(const unsigned int id) const;
     QStringList         actionLists() const;
 

diff --git a/src/activeprofiles_dbus.cpp b/src/activeprofiles_dbus.cpp
@@ -100,8 +100,7 @@ QString ActiveProfiles::Private::dbusName(QString prof)
 {
     QString name = PSIDBUSNAME;
     name += ".";
-    name
-        += encodeAlNumD(ApplicationInfo::homeDir(ApplicationInfo::ConfigLocation)).right(qMax(0, 200 - name.size()));
+    name += encodeAlNumD(ApplicationInfo::homeDir(ApplicationInfo::ConfigLocation)).right(qMax(0, 200 - name.size()));
     if (!prof.isEmpty()) {
         name += ".";
         name += encodeAlNumD(prof).right(qMax(0, 250 - name.size()));
@@ -201,7 +200,7 @@ bool ActiveProfiles::openUri(const QString &profile, const QString &uri) const
 
 bool ActiveProfiles::raise(const QString &profile, bool withUI) const
 {
-    QLabel *     lab = nullptr;
+    QLabel      *lab = nullptr;
     QDBusMessage msg = QDBusMessage::createMethodCall(d->dbusName(profile), "/Main", PSIDBUSMAINIF, "raise");
     if (withUI) {
         lab = new QLabel(tr("This psi profile is already running...<br>please wait..."));