projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Store the HighlightNickType as int instead of custom enum
[quassel.git]
/
src
/
qtui
/
qtuiapplication.cpp
diff --git
a/src/qtui/qtuiapplication.cpp
b/src/qtui/qtuiapplication.cpp
index
2b6b58c
..
0ef3bc5
100644
(file)
--- a/
src/qtui/qtuiapplication.cpp
+++ b/
src/qtui/qtuiapplication.cpp
@@
-21,6
+21,7
@@
#include "qtuiapplication.h"
#include <QIcon>
#include "qtuiapplication.h"
#include <QIcon>
+#include <QDir>
#include <QStringList>
#ifdef HAVE_KDE4
#include <QStringList>
#ifdef HAVE_KDE4
@@
-210,6
+211,9
@@
bool QtUiApplication::migrateSettings()
// --------
// Check minor settings version, handling upgrades/downgrades as needed
// Current minor version
// --------
// Check minor settings version, handling upgrades/downgrades as needed
// Current minor version
+ //
+ // NOTE: If you increase the minor version, you MUST ALSO add new version upgrade logic in
+ // applySettingsMigration()! Otherwise, settings upgrades will fail.
const uint VERSION_MINOR_CURRENT = 6;
// Stored minor version
uint versionMinor = s.versionMinor();
const uint VERSION_MINOR_CURRENT = 6;
// Stored minor version
uint versionMinor = s.versionMinor();
@@
-273,6
+277,8
@@
bool QtUiApplication::applySettingsMigration(QtUiSettings settings, const uint n
//
// In most cases, the goal is to preserve the older default values for keys that haven't been
// saved. Exceptions will be noted below.
//
// In most cases, the goal is to preserve the older default values for keys that haven't been
// saved. Exceptions will be noted below.
+ // NOTE: If you add new upgrade logic here, you MUST ALSO increase VERSION_MINOR_CURRENT in
+ // migrateSettings()! Otherwise, your upgrade logic won't ever be called.
case 6:
{
// New default changes: sender colors switched around to Tango-ish theme
case 6:
{
// New default changes: sender colors switched around to Tango-ish theme