cmake: avoid de-duplication of user's CXXFLAGS

[quassel.git] / src / common / aliasmanager.cpp

diff --git a/src/common/aliasmanager.cpp b/src/common/aliasmanager.cpp
index d8dd082..57e73e0 100644 (file)
--- a/src/common/aliasmanager.cpp
+++ b/src/common/aliasmanager.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2019 by the Quassel Project                        *
+ *   Copyright (C) 2005-2022 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -25,16 +25,6 @@
 
 #include "network.h"
 
-AliasManager& AliasManager::operator=(const AliasManager& other)
-{
-    if (this == &other)
-        return *this;
-
-    SyncableObject::operator=(other);
-    _aliases = other._aliases;
-    return *this;
-}
-
 int AliasManager::indexOf(const QString& name) const
 {
     for (int i = 0; i < _aliases.count(); i++) {
@@ -91,9 +81,10 @@ void AliasManager::addAlias(const QString& name, const QString& expansion)
 AliasManager::AliasList AliasManager::defaults()
 {
     AliasList aliases;
-    aliases << Alias("j", "/join $0") << Alias("ns", "/msg nickserv $0") << Alias("nickserv", "/msg nickserv $0")
-            << Alias("cs", "/msg chanserv $0") << Alias("chanserv", "/msg chanserv $0") << Alias("hs", "/msg hostserv $0")
-            << Alias("hostserv", "/msg hostserv $0") << Alias("wii", "/whois $0 $0") << Alias("back", "/quote away");
+    aliases << Alias("j", "/join $0") << Alias("ns", "/quote nickserv $0") << Alias("nickserv", "/quote nickserv $0")
+            << Alias("cs", "/quote chanserv $0") << Alias("chanserv", "/quote chanserv $0") << Alias("hs", "/quote hostserv $0")
+            << Alias("hostserv", "/quote hostserv $0") << Alias("wii", "/whois $0 $0") << Alias("back", "/quote away")
+            << Alias("raw", "/quote $0");
 
 #ifdef Q_OS_LINUX
     // let's add aliases for scripts that only run on linux
@@ -202,7 +193,7 @@ void AliasManager::expand(const QString& alias, const BufferInfo& bufferInfo, co
             command = command.replace(QString("$%1:ident").arg(j), (ircUser && !ircUser->user().isEmpty()) ? ircUser->user() : QString("*"));
 
             // Nickname
-            // Must be replaced last to avoid interferring with more specific aliases
+            // Must be replaced last to avoid interfering with more specific aliases
             command = command.replace(QString("$%1").arg(j), params[j - 1]);
         }
         command = command.replace("$0", msg);