projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix an issue with QStringList being declared differently on Qt4
[quassel.git]
/
src
/
qtui
/
mainwin.cpp
diff --git
a/src/qtui/mainwin.cpp
b/src/qtui/mainwin.cpp
index
f6aa446
..
d9c7cc3
100644
(file)
--- a/
src/qtui/mainwin.cpp
+++ b/
src/qtui/mainwin.cpp
@@
-27,6
+27,7
@@
#include <QTableView>
#include <QToolBar>
#include <QInputDialog>
#include <QTableView>
#include <QToolBar>
#include <QInputDialog>
+#include <settingspages/corehighlightsettingspage.h>
#ifdef HAVE_KDE4
# include <KHelpMenu>
#ifdef HAVE_KDE4
# include <KHelpMenu>
@@
-1366,9
+1367,9
@@
void MainWin::showCoreConnectionDlg()
}
}
-void MainWin::showCoreConfigWizard(const QVariantList &backends, const QVariantList &auth
Backend
s)
+void MainWin::showCoreConfigWizard(const QVariantList &backends, const QVariantList &auth
enticator
s)
{
{
- CoreConfigWizard *wizard = new CoreConfigWizard(Client::coreConnection(), backends, auth
Backend
s, this);
+ CoreConfigWizard *wizard = new CoreConfigWizard(Client::coreConnection(), backends, auth
enticator
s, this);
wizard->show();
}
wizard->show();
}
@@
-1442,6
+1443,7
@@
void MainWin::showSettingsDlg()
dlg->registerSettingsPage(new SonnetSettingsPage(dlg));
#endif
dlg->registerSettingsPage(new HighlightSettingsPage(dlg));
dlg->registerSettingsPage(new SonnetSettingsPage(dlg));
#endif
dlg->registerSettingsPage(new HighlightSettingsPage(dlg));
+ dlg->registerSettingsPage(new CoreHighlightSettingsPage(dlg));
dlg->registerSettingsPage(new NotificationsSettingsPage(dlg));
dlg->registerSettingsPage(new BacklogSettingsPage(dlg));
dlg->registerSettingsPage(new NotificationsSettingsPage(dlg));
dlg->registerSettingsPage(new BacklogSettingsPage(dlg));