projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modernize: Require member function pointers for Settings::notify()
[quassel.git]
/
src
/
common
/
aliasmanager.h
diff --git
a/src/common/aliasmanager.h
b/src/common/aliasmanager.h
index
aaac54d
..
b061465
100644
(file)
--- a/
src/common/aliasmanager.h
+++ b/
src/common/aliasmanager.h
@@
-23,6
+23,7
@@
#include "common-export.h"
#include <QVariantMap>
#include "common-export.h"
#include <QVariantMap>
+#include <utility>
#include "bufferinfo.h"
#include "syncableobject.h"
#include "bufferinfo.h"
#include "syncableobject.h"
@@
-35,15
+36,15
@@
class COMMON_EXPORT AliasManager : public SyncableObject
SYNCABLE_OBJECT
public:
SYNCABLE_OBJECT
public:
- inline AliasManager(QObject *parent =
0
) : SyncableObject(parent) { setAllowClientUpdates(true); }
+ inline AliasManager(QObject *parent =
nullptr
) : SyncableObject(parent) { setAllowClientUpdates(true); }
AliasManager &operator=(const AliasManager &other);
struct Alias {
QString name;
QString expansion;
AliasManager &operator=(const AliasManager &other);
struct Alias {
QString name;
QString expansion;
- Alias(
const QString &name_, const QString &expansion_) : name(name_), expansion(expansion_
) {}
+ Alias(
QString name_, QString expansion_) : name(std::move(name_)), expansion(std::move(expansion_)
) {}
};
};
-
typedef QList<Alias> AliasList
;
+
using AliasList = QList<Alias>
;
int indexOf(const QString &name) const;
inline bool contains(const QString &name) const { return indexOf(name) != -1; }
int indexOf(const QString &name) const;
inline bool contains(const QString &name) const { return indexOf(name) != -1; }
@@
-56,7
+57,7
@@
public:
static AliasList defaults();
static AliasList defaults();
-
typedef QList<QPair<BufferInfo, QString> > CommandList
;
+
using CommandList = QList<QPair<BufferInfo, QString>>
;
CommandList processInput(const BufferInfo &info, const QString &message);
CommandList processInput(const BufferInfo &info, const QString &message);