SVN_SILENT made messages (.desktop file) - always resolve ours

[dolphin.git] / src / settings / viewmodes / viewsettingspage.h

diff --git a/src/settings/viewmodes/viewsettingspage.h b/src/settings/viewmodes/viewsettingspage.h
index 61671077efd787973b299ddee42873526d84f65b..eae2a64278a8601e7d94ea681d84d24de3176c28 100644 (file)
--- a/src/settings/viewmodes/viewsettingspage.h
+++ b/src/settings/viewmodes/viewsettingspage.h
@@ -1,29 +1,17 @@
-/***************************************************************************
- *   Copyright (C) 2006 by Peter Penz                                      *
- *   peter.penz@gmx.at                                                     *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
- ***************************************************************************/
+/*
+ * SPDX-FileCopyrightText: 2006 Peter Penz <peter.penz@gmx.at>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 #ifndef VIEWSETTINGSPAGE_H
 #define VIEWSETTINGSPAGE_H
 
-#include <settings/settingspagebase.h>
+#include "settings/settingspagebase.h"
 
 class ViewSettingsTab;
 class QWidget;
+class ContentDisplayTab;
+class QTabWidget;
 
 /**
  * @brief Page for the 'View' settings of the Dolphin settings dialog.
@@ -36,17 +24,19 @@ class ViewSettingsPage : public SettingsPageBase
     Q_OBJECT
 
 public:
-    ViewSettingsPage(QWidget* parent);
-    virtual ~ViewSettingsPage();
+    explicit ViewSettingsPage(const QUrl &url, QWidget *parent);
+    ~ViewSettingsPage() override;
 
     /** @see SettingsPageBase::applySettings() */
-    virtual void applySettings() Q_DECL_OVERRIDE;
+    void applySettings() override;
 
     /** @see SettingsPageBase::restoreDefaults() */
-    virtual void restoreDefaults() Q_DECL_OVERRIDE;
+    void restoreDefaults() override;
 
 private:
-    QList<ViewSettingsTab*> m_tabs;
+    ContentDisplayTab *contentDisplayTab;
+    QTabWidget *tabWidget;
+    QList<SettingsPageBase *> m_tabs;
 };
 
 #endif