projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'simplify-time-formatting' of https://github.com/justjanne/quassel
[quassel.git]
/
src
/
common
/
syncableobject.h
diff --git
a/src/common/syncableobject.h
b/src/common/syncableobject.h
index
7d5242b
..
a5bb210
100644
(file)
--- a/
src/common/syncableobject.h
+++ b/
src/common/syncableobject.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
8
by the Quassel Project *
+ * Copyright (C) 2005-201
9
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-94,7
+94,6
@@
public slots:
protected:
void sync_call__(SignalProxy::ProxyMode modeType, const char* funcname, ...) const;
protected:
void sync_call__(SignalProxy::ProxyMode modeType, const char* funcname, ...) const;
- void renameObject(const QString& newName);
SyncableObject& operator=(const SyncableObject& other);
signals:
SyncableObject& operator=(const SyncableObject& other);
signals:
@@
-108,6
+107,8
@@
private:
bool setInitValue(const QString& property, const QVariant& value);
bool setInitValue(const QString& property, const QVariant& value);
+private:
+ QString _objectName;
bool _initialized{false};
bool _allowClientUpdates{false};
bool _initialized{false};
bool _allowClientUpdates{false};