[Xfce4-commits] [panel-plugins/xfce4-whiskermenu-plugin] 238/473: Clean up includes.
noreply at xfce.org
noreply at xfce.org
Mon Feb 16 23:56:48 CET 2015
This is an automated email from the git hooks/post-receive script.
gottcode pushed a commit to branch master
in repository panel-plugins/xfce4-whiskermenu-plugin.
commit ae16209426f2912ed12f62120653d814399cf2e0
Author: Graeme Gott <graeme at gottcode.org>
Date: Fri Nov 15 10:12:07 2013 -0500
Clean up includes.
---
panel-plugin/applications-page.h | 5 -----
panel-plugin/category.cpp | 5 +----
panel-plugin/category.h | 5 +----
panel-plugin/command-edit.cpp | 2 +-
panel-plugin/command-edit.h | 3 ---
panel-plugin/command.cpp | 3 ---
panel-plugin/command.h | 3 ---
panel-plugin/configuration-dialog.cpp | 3 ---
panel-plugin/configuration-dialog.h | 3 ---
panel-plugin/element.h | 5 +----
panel-plugin/favorites-page.cpp | 2 ++
panel-plugin/favorites-page.h | 2 --
panel-plugin/icon-size.cpp | 5 +----
panel-plugin/launcher-view.cpp | 3 ---
panel-plugin/launcher-view.h | 3 ---
panel-plugin/launcher.cpp | 3 ---
panel-plugin/launcher.h | 3 ---
panel-plugin/list-page.h | 9 ---------
panel-plugin/page.cpp | 3 ---
panel-plugin/page.h | 4 ----
panel-plugin/plugin.cpp | 5 +++++
panel-plugin/plugin.h | 3 ---
panel-plugin/query.cpp | 3 ---
panel-plugin/recent-page.cpp | 3 ++-
panel-plugin/recent-page.h | 3 ---
panel-plugin/resizer-widget.h | 3 ---
panel-plugin/search-page.cpp | 3 ---
panel-plugin/search-page.h | 2 --
panel-plugin/section-button.cpp | 3 ---
panel-plugin/section-button.h | 3 ---
panel-plugin/settings.cpp | 3 ---
panel-plugin/window.cpp | 3 ---
panel-plugin/window.h | 6 ------
33 files changed, 14 insertions(+), 103 deletions(-)
diff --git a/panel-plugin/applications-page.h b/panel-plugin/applications-page.h
index 7bcb0cb..62462f2 100644
--- a/panel-plugin/applications-page.h
+++ b/panel-plugin/applications-page.h
@@ -24,17 +24,12 @@
#include <string>
#include <vector>
-extern "C"
-{
#include <garcon/garcon.h>
-}
namespace WhiskerMenu
{
class Category;
-class Launcher;
-class LauncherView;
class SectionButton;
class ApplicationsPage : public Page
diff --git a/panel-plugin/category.cpp b/panel-plugin/category.cpp
index 137091e..a7233f2 100644
--- a/panel-plugin/category.cpp
+++ b/panel-plugin/category.cpp
@@ -22,10 +22,7 @@
#include <algorithm>
-extern "C"
-{
-#include <glib/gi18n.h>
-}
+#include <glib/gi18n-lib.h>
using namespace WhiskerMenu;
diff --git a/panel-plugin/category.h b/panel-plugin/category.h
index 7900655..400a593 100644
--- a/panel-plugin/category.h
+++ b/panel-plugin/category.h
@@ -22,15 +22,12 @@
#include <vector>
-extern "C"
-{
#include <garcon/garcon.h>
-}
+#include <gtk/gtk.h>
namespace WhiskerMenu
{
-class Launcher;
class SectionButton;
class Category : public Element
diff --git a/panel-plugin/command-edit.cpp b/panel-plugin/command-edit.cpp
index ed1b30f..094b9b6 100644
--- a/panel-plugin/command-edit.cpp
+++ b/panel-plugin/command-edit.cpp
@@ -19,7 +19,7 @@
#include "command.h"
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
using namespace WhiskerMenu;
diff --git a/panel-plugin/command-edit.h b/panel-plugin/command-edit.h
index cb641a7..5a89ed9 100644
--- a/panel-plugin/command-edit.h
+++ b/panel-plugin/command-edit.h
@@ -18,10 +18,7 @@
#ifndef WHISKERMENU_COMMAND_EDIT_H
#define WHISKERMENU_COMMAND_EDIT_H
-extern "C"
-{
#include <gtk/gtk.h>
-}
namespace WhiskerMenu
{
diff --git a/panel-plugin/command.cpp b/panel-plugin/command.cpp
index 37fd12f..30ee78d 100644
--- a/panel-plugin/command.cpp
+++ b/panel-plugin/command.cpp
@@ -21,10 +21,7 @@
#include <string>
-extern "C"
-{
#include <libxfce4ui/libxfce4ui.h>
-}
using namespace WhiskerMenu;
diff --git a/panel-plugin/command.h b/panel-plugin/command.h
index d14be08..a5f73de 100644
--- a/panel-plugin/command.h
+++ b/panel-plugin/command.h
@@ -18,10 +18,7 @@
#ifndef WHISKERMENU_COMMAND_H
#define WHISKERMENU_COMMAND_H
-extern "C"
-{
#include <gtk/gtk.h>
-}
namespace WhiskerMenu
{
diff --git a/panel-plugin/configuration-dialog.cpp b/panel-plugin/configuration-dialog.cpp
index fbd98d8..8fe8d57 100644
--- a/panel-plugin/configuration-dialog.cpp
+++ b/panel-plugin/configuration-dialog.cpp
@@ -23,12 +23,9 @@
#include "plugin.h"
#include "settings.h"
-extern "C"
-{
#include <exo/exo.h>
#include <libxfce4panel/libxfce4panel.h>
#include <libxfce4ui/libxfce4ui.h>
-}
using namespace WhiskerMenu;
diff --git a/panel-plugin/configuration-dialog.h b/panel-plugin/configuration-dialog.h
index 4cfa55b..bd51f5b 100644
--- a/panel-plugin/configuration-dialog.h
+++ b/panel-plugin/configuration-dialog.h
@@ -18,10 +18,7 @@
#ifndef WHISKERMENU_CONFIGURATION_DIALOG_H
#define WHISKERMENU_CONFIGURATION_DIALOG_H
-extern "C"
-{
#include <gtk/gtk.h>
-}
namespace WhiskerMenu
{
diff --git a/panel-plugin/element.h b/panel-plugin/element.h
index 2f2f863..13c36c2 100644
--- a/panel-plugin/element.h
+++ b/panel-plugin/element.h
@@ -18,10 +18,7 @@
#ifndef WHISKERMENU_ELEMENT_H
#define WHISKERMENU_ELEMENT_H
-extern "C"
-{
-#include <gtk/gtk.h>
-}
+#include <glib.h>
namespace WhiskerMenu
{
diff --git a/panel-plugin/favorites-page.cpp b/panel-plugin/favorites-page.cpp
index d6f4a89..375c34a 100644
--- a/panel-plugin/favorites-page.cpp
+++ b/panel-plugin/favorites-page.cpp
@@ -25,6 +25,8 @@
#include <algorithm>
+#include <glib/gi18n-lib.h>
+
using namespace WhiskerMenu;
//-----------------------------------------------------------------------------
diff --git a/panel-plugin/favorites-page.h b/panel-plugin/favorites-page.h
index 6e140be..0598ca1 100644
--- a/panel-plugin/favorites-page.h
+++ b/panel-plugin/favorites-page.h
@@ -23,8 +23,6 @@
namespace WhiskerMenu
{
-class Launcher;
-
class FavoritesPage : public ListPage
{
public:
diff --git a/panel-plugin/icon-size.cpp b/panel-plugin/icon-size.cpp
index 11fd185..0d96b3a 100644
--- a/panel-plugin/icon-size.cpp
+++ b/panel-plugin/icon-size.cpp
@@ -17,10 +17,7 @@
#include "icon-size.h"
-extern "C"
-{
-#include <glib/gi18n.h>
-}
+#include <glib/gi18n-lib.h>
using namespace WhiskerMenu;
diff --git a/panel-plugin/launcher-view.cpp b/panel-plugin/launcher-view.cpp
index c708589..cc09534 100644
--- a/panel-plugin/launcher-view.cpp
+++ b/panel-plugin/launcher-view.cpp
@@ -21,11 +21,8 @@
#include <algorithm>
-extern "C"
-{
#include <exo/exo.h>
#include <gdk/gdkkeysyms.h>
-}
using namespace WhiskerMenu;
diff --git a/panel-plugin/launcher-view.h b/panel-plugin/launcher-view.h
index 70cc4cb..767863b 100644
--- a/panel-plugin/launcher-view.h
+++ b/panel-plugin/launcher-view.h
@@ -18,10 +18,7 @@
#ifndef WHISKERMENU_LAUNCHER_VIEW_H
#define WHISKERMENU_LAUNCHER_VIEW_H
-extern "C"
-{
#include <gtk/gtk.h>
-}
namespace WhiskerMenu
{
diff --git a/panel-plugin/launcher.cpp b/panel-plugin/launcher.cpp
index 117494b..d97aff0 100644
--- a/panel-plugin/launcher.cpp
+++ b/panel-plugin/launcher.cpp
@@ -20,11 +20,8 @@
#include "query.h"
#include "settings.h"
-extern "C"
-{
#include <exo/exo.h>
#include <libxfce4ui/libxfce4ui.h>
-}
using namespace WhiskerMenu;
diff --git a/panel-plugin/launcher.h b/panel-plugin/launcher.h
index 8537bcb..606fd96 100644
--- a/panel-plugin/launcher.h
+++ b/panel-plugin/launcher.h
@@ -22,11 +22,8 @@
#include <string>
-extern "C"
-{
#include <garcon/garcon.h>
#include <gdk/gdk.h>
-}
namespace WhiskerMenu
{
diff --git a/panel-plugin/list-page.h b/panel-plugin/list-page.h
index bd7f8df..54b112f 100644
--- a/panel-plugin/list-page.h
+++ b/panel-plugin/list-page.h
@@ -20,21 +20,12 @@
#include "page.h"
-#include <map>
#include <string>
#include <vector>
-extern "C"
-{
-#include <libxfce4util/libxfce4util.h>
-}
-
namespace WhiskerMenu
{
-class Launcher;
-class LauncherView;
-
class ListPage : public Page
{
public:
diff --git a/panel-plugin/page.cpp b/panel-plugin/page.cpp
index f456a95..23f6c6d 100644
--- a/panel-plugin/page.cpp
+++ b/panel-plugin/page.cpp
@@ -23,10 +23,7 @@
#include "recent-page.h"
#include "window.h"
-extern "C"
-{
#include <libxfce4ui/libxfce4ui.h>
-}
using namespace WhiskerMenu;
diff --git a/panel-plugin/page.h b/panel-plugin/page.h
index a697767..3ca1890 100644
--- a/panel-plugin/page.h
+++ b/panel-plugin/page.h
@@ -18,15 +18,11 @@
#ifndef WHISKERMENU_PAGE_H
#define WHISKERMENU_PAGE_H
-extern "C"
-{
#include <gtk/gtk.h>
-}
namespace WhiskerMenu
{
-class FavoritesPage;
class Launcher;
class LauncherView;
class Window;
diff --git a/panel-plugin/plugin.cpp b/panel-plugin/plugin.cpp
index 71e79ad..0845ab2 100644
--- a/panel-plugin/plugin.cpp
+++ b/panel-plugin/plugin.cpp
@@ -23,6 +23,11 @@
#include "settings.h"
#include "window.h"
+extern "C"
+{
+#include <libxfce4util/libxfce4util.h>
+}
+
using namespace WhiskerMenu;
//-----------------------------------------------------------------------------
diff --git a/panel-plugin/plugin.h b/panel-plugin/plugin.h
index 75b2c45..c81b3f8 100644
--- a/panel-plugin/plugin.h
+++ b/panel-plugin/plugin.h
@@ -20,11 +20,8 @@
#include <string>
-extern "C"
-{
#include <gtk/gtk.h>
#include <libxfce4panel/libxfce4panel.h>
-}
namespace WhiskerMenu
{
diff --git a/panel-plugin/query.cpp b/panel-plugin/query.cpp
index 6139185..4226844 100644
--- a/panel-plugin/query.cpp
+++ b/panel-plugin/query.cpp
@@ -22,10 +22,7 @@
#include <climits>
#include <cstring>
-extern "C"
-{
#include <glib.h>
-}
using namespace WhiskerMenu;
diff --git a/panel-plugin/recent-page.cpp b/panel-plugin/recent-page.cpp
index f77f65f..6d29e94 100644
--- a/panel-plugin/recent-page.cpp
+++ b/panel-plugin/recent-page.cpp
@@ -20,7 +20,8 @@
#include "launcher.h"
#include "launcher-view.h"
#include "settings.h"
-#include "window.h"
+
+#include <glib/gi18n-lib.h>
using namespace WhiskerMenu;
diff --git a/panel-plugin/recent-page.h b/panel-plugin/recent-page.h
index 33969d0..1dae170 100644
--- a/panel-plugin/recent-page.h
+++ b/panel-plugin/recent-page.h
@@ -23,9 +23,6 @@
namespace WhiskerMenu
{
-class Launcher;
-class LauncherView;
-
class RecentPage : public ListPage
{
public:
diff --git a/panel-plugin/resizer-widget.h b/panel-plugin/resizer-widget.h
index 258498f..8695fc3 100644
--- a/panel-plugin/resizer-widget.h
+++ b/panel-plugin/resizer-widget.h
@@ -20,10 +20,7 @@
#include <vector>
-extern "C"
-{
#include <gtk/gtk.h>
-}
namespace WhiskerMenu
{
diff --git a/panel-plugin/search-page.cpp b/panel-plugin/search-page.cpp
index c73c0b6..3463d7d 100644
--- a/panel-plugin/search-page.cpp
+++ b/panel-plugin/search-page.cpp
@@ -21,10 +21,7 @@
#include "launcher-view.h"
#include "window.h"
-extern "C"
-{
#include <gdk/gdkkeysyms.h>
-}
using namespace WhiskerMenu;
diff --git a/panel-plugin/search-page.h b/panel-plugin/search-page.h
index dd214fa..f29c8c5 100644
--- a/panel-plugin/search-page.h
+++ b/panel-plugin/search-page.h
@@ -28,8 +28,6 @@
namespace WhiskerMenu
{
-class LauncherView;
-
class SearchPage : public Page
{
public:
diff --git a/panel-plugin/section-button.cpp b/panel-plugin/section-button.cpp
index 3725d9d..13ea3bc 100644
--- a/panel-plugin/section-button.cpp
+++ b/panel-plugin/section-button.cpp
@@ -19,10 +19,7 @@
#include "settings.h"
-extern "C"
-{
#include <libxfce4panel/libxfce4panel.h>
-}
using namespace WhiskerMenu;
diff --git a/panel-plugin/section-button.h b/panel-plugin/section-button.h
index d91fc98..32b7511 100644
--- a/panel-plugin/section-button.h
+++ b/panel-plugin/section-button.h
@@ -18,10 +18,7 @@
#ifndef WHISKERMENU_SECTION_BUTTON_H
#define WHISKERMENU_SECTION_BUTTON_H
-extern "C"
-{
#include <gtk/gtk.h>
-}
namespace WhiskerMenu
{
diff --git a/panel-plugin/settings.cpp b/panel-plugin/settings.cpp
index 2ef685e..62d81a9 100644
--- a/panel-plugin/settings.cpp
+++ b/panel-plugin/settings.cpp
@@ -21,10 +21,7 @@
#include <algorithm>
-extern "C"
-{
#include <libxfce4util/libxfce4util.h>
-}
using namespace WhiskerMenu;
diff --git a/panel-plugin/window.cpp b/panel-plugin/window.cpp
index 7c79631..38b5a51 100644
--- a/panel-plugin/window.cpp
+++ b/panel-plugin/window.cpp
@@ -27,12 +27,9 @@
#include "section-button.h"
#include "settings.h"
-extern "C"
-{
#include <exo/exo.h>
#include <gdk/gdkkeysyms.h>
#include <libxfce4ui/libxfce4ui.h>
-}
#include <ctime>
diff --git a/panel-plugin/window.h b/panel-plugin/window.h
index 3ab000e..9a2d974 100644
--- a/panel-plugin/window.h
+++ b/panel-plugin/window.h
@@ -18,21 +18,15 @@
#ifndef WHISKERMENU_WINDOW_H
#define WHISKERMENU_WINDOW_H
-#include <string>
#include <vector>
-extern "C"
-{
#include <gtk/gtk.h>
-#include <libxfce4util/libxfce4util.h>
-}
namespace WhiskerMenu
{
class ApplicationsPage;
class FavoritesPage;
-class Launcher;
class Page;
class ResizerWidget;
class RecentPage;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list