X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.h;h=900354b10d737716ae0f15ca5dc76a97340dbdc0;hb=c65cdada4836f01fe920b09c7fc861cb70c09ac7;hp=30e57269ff0a536d556a460ad8d97cccf2161ccb;hpb=c52a94cb937654bf06d5074bf0736a52ec94a52d;p=quassel.git diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h index 30e57269..900354b1 100644 --- a/src/qtui/mainwin.h +++ b/src/qtui/mainwin.h @@ -18,11 +18,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef MAINWIN_H_ -#define MAINWIN_H_ +#pragma once #ifdef HAVE_KDE4 # include +#elif defined HAVE_KF5 +# include #else # include #endif @@ -56,11 +57,10 @@ class KHelpMenu; //!\brief The main window of Quassel's QtUi. class MainWin -#ifdef HAVE_KDE4 - : public KMainWindow -{ +#ifdef HAVE_KDE + : public KMainWindow { #else -: public QMainWindow { + : public QMainWindow { #endif Q_OBJECT @@ -123,6 +123,7 @@ private slots: void showNotificationsDlg(); void showIgnoreList(QString newRule = QString()); void showShortcutsDlg(); + void showPasswordChangeDlg(); void showNewTransferDlg(const ClientTransfer *transfer); void onFullScreenToggled(); @@ -169,7 +170,7 @@ signals: void disconnectFromCore(); private: -#ifdef HAVE_KDE4 +#ifdef HAVE_KDE KHelpMenu *_kHelpMenu; #endif @@ -203,6 +204,7 @@ private: ChatMonitorView *_chatMonitorView; TopicWidget *_topicWidget; + QAction *_fullScreenAction; QMenu *_fileMenu, *_networksMenu, *_viewMenu, *_bufferViewsMenu, *_settingsMenu, *_helpMenu, *_helpDebugMenu; QMenu *_toolbarMenu; QToolBar *_mainToolBar, *_chatViewToolBar, *_nickToolBar; @@ -220,6 +222,3 @@ private: friend class QtUi; }; - - -#endif