[Xfce4-commits] [panel-plugins/xfce4-whiskermenu-plugin] 207/473: Rearrange files to match standard layout of Xfce plugins.
noreply at xfce.org
noreply at xfce.org
Mon Feb 16 23:56:17 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 dfe06fe0a428cbe5ba91b3d20fe3ca37b0b921e7
Author: Graeme Gott <graeme at gottcode.org>
Date: Thu Oct 31 12:02:09 2013 -0400
Rearrange files to match standard layout of Xfce plugins.
---
AUTHORS | 1 +
CMakeLists.txt | 12 ++-----
CREDITS | 8 -----
{src => panel-plugin}/CMakeLists.txt | 37 ++++++++++++--------
.../applications-page.cpp | 16 ++++-----
.../applications-page.h | 8 ++---
{src => panel-plugin}/category.cpp | 6 ++--
src/category.hpp => panel-plugin/category.h | 8 ++---
.../command-button.cpp | 2 +-
.../command-button.h | 6 ++--
.../configuration-dialog.cpp | 20 +++++------
.../configuration-dialog.h | 6 ++--
src/element.hpp => panel-plugin/element.h | 6 ++--
.../favorites-page.cpp | 12 +++----
.../favorites-page.h | 8 ++---
src/icon_size.cpp => panel-plugin/icon-size.cpp | 2 +-
src/icon_size.hpp => panel-plugin/icon-size.h | 6 ++--
.../launcher-model.cpp | 4 +--
.../launcher-model.h | 6 ++--
.../launcher-view.cpp | 6 ++--
.../launcher-view.h | 6 ++--
{src => panel-plugin}/launcher.cpp | 4 ++-
src/launcher.hpp => panel-plugin/launcher.h | 11 +++---
src/list_page.cpp => panel-plugin/list-page.cpp | 12 +++----
src/list_page.hpp => panel-plugin/list-page.h | 8 ++---
{src => panel-plugin}/page.cpp | 16 ++++-----
src/page.hpp => panel-plugin/page.h | 6 ++--
{src => panel-plugin}/plugin.cpp | 20 +++++------
src/plugin.hpp => panel-plugin/plugin.h | 6 ++--
{src => panel-plugin}/query.cpp | 2 +-
src/query.hpp => panel-plugin/query.h | 6 ++--
.../recent-page.cpp | 10 +++---
src/recent_page.hpp => panel-plugin/recent-page.h | 8 ++---
.../register-plugin.c | 0
.../resizer-widget.cpp | 2 +-
.../resizer-widget.h | 6 ++--
.../search-page.cpp | 10 +++---
src/search_page.hpp => panel-plugin/search-page.h | 10 +++---
.../section-button.cpp | 4 +--
.../section-button.h | 6 ++--
.../whiskermenu.desktop | 0
{src => panel-plugin}/window.cpp | 22 ++++++------
src/window.hpp => panel-plugin/window.h | 6 ++--
.../xfce4-popup-whiskermenu.1 | 0
.../xfce4-popup-whiskermenu.in | 0
45 files changed, 178 insertions(+), 183 deletions(-)
diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..99ba70f
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1 @@
+Graeme Gott <graeme at gottcode.org>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 055101d..71f17fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,17 +28,9 @@ option(ENABLE_LINKER_OPTIMIZED_HASH_TABLES "Enable -Wl,-O1 for the linker" ON)
include(GNUInstallDirs)
-add_subdirectory(src)
-add_subdirectory(po)
add_subdirectory(icons)
-
-# popup script
-configure_file(${PROJECT_SOURCE_DIR}/xfce4-popup-whiskermenu.in
- ${PROJECT_BINARY_DIR}/xfce4-popup-whiskermenu ESCAPE_QUOTES @ONLY)
-install(PROGRAMS ${PROJECT_BINARY_DIR}/xfce4-popup-whiskermenu
- DESTINATION ${CMAKE_INSTALL_BINDIR})
-install(FILES ${PROJECT_SOURCE_DIR}/xfce4-popup-whiskermenu.1
- DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT doc)
+add_subdirectory(panel-plugin)
+add_subdirectory(po)
# uninstall target
configure_file(
diff --git a/CREDITS b/CREDITS
deleted file mode 100644
index 54799ea..0000000
--- a/CREDITS
+++ /dev/null
@@ -1,8 +0,0 @@
-Developers
-----------
-* Graeme Gott
-
-Libraries
----------
-* Xfce >= 4.8 (exo, garcon, libxfce4panel, libxfce4ui, libxfce4util), http://xfce.org/
-* GTK+, http://gtk.org/
diff --git a/src/CMakeLists.txt b/panel-plugin/CMakeLists.txt
similarity index 77%
rename from src/CMakeLists.txt
rename to panel-plugin/CMakeLists.txt
index c7455b5..093a092 100644
--- a/src/CMakeLists.txt
+++ b/panel-plugin/CMakeLists.txt
@@ -59,25 +59,25 @@ if(${libxfce4panel_VERSION} VERSION_GREATER "4.9")
endif()
add_library(whiskermenu MODULE
- applications_page.cpp
+ applications-page.cpp
category.cpp
- command_button.cpp
- configuration_dialog.cpp
- element.hpp
- favorites_page.cpp
- icon_size.cpp
+ command-button.cpp
+ configuration-dialog.cpp
+ element.h
+ favorites-page.cpp
+ icon-size.cpp
launcher.cpp
- launcher_model.cpp
- launcher_view.cpp
- list_page.cpp
+ launcher-model.cpp
+ launcher-view.cpp
+ list-page.cpp
page.cpp
plugin.cpp
query.cpp
- recent_page.cpp
- register_plugin.c
- resizer_widget.cpp
- search_page.cpp
- section_button.cpp
+ recent-page.cpp
+ register-plugin.c
+ resizer-widget.cpp
+ search-page.cpp
+ section-button.cpp
window.cpp)
target_link_libraries(whiskermenu
@@ -96,4 +96,11 @@ if(CMAKE_BUILD_TYPE_TOLOWER MATCHES "release|minsizerel")
endif()
install(TARGETS whiskermenu LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/xfce4/panel/plugins)
-install(FILES ../whiskermenu.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/xfce4/panel/plugins)
+install(FILES whiskermenu.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/xfce4/panel/plugins)
+
+# popup script
+configure_file(${PROJECT_SOURCE_DIR}/panel-plugin/xfce4-popup-whiskermenu.in
+ ${PROJECT_BINARY_DIR}/xfce4-popup-whiskermenu ESCAPE_QUOTES @ONLY)
+install(PROGRAMS ${PROJECT_BINARY_DIR}/xfce4-popup-whiskermenu
+ DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(FILES xfce4-popup-whiskermenu.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT doc)
diff --git a/src/applications_page.cpp b/panel-plugin/applications-page.cpp
similarity index 97%
rename from src/applications_page.cpp
rename to panel-plugin/applications-page.cpp
index 77a3219..dc53c1b 100644
--- a/src/applications_page.cpp
+++ b/panel-plugin/applications-page.cpp
@@ -14,14 +14,14 @@
// along with this library. If not, see <http://www.gnu.org/licenses/>.
-#include "applications_page.hpp"
-
-#include "category.hpp"
-#include "launcher.hpp"
-#include "launcher_model.hpp"
-#include "launcher_view.hpp"
-#include "section_button.hpp"
-#include "window.hpp"
+#include "applications-page.h"
+
+#include "category.h"
+#include "launcher.h"
+#include "launcher-model.h"
+#include "launcher-view.h"
+#include "section-button.h"
+#include "window.h"
#include <algorithm>
diff --git a/src/applications_page.hpp b/panel-plugin/applications-page.h
similarity index 93%
rename from src/applications_page.hpp
rename to panel-plugin/applications-page.h
index 5bd4982..e9dad2b 100644
--- a/src/applications_page.hpp
+++ b/panel-plugin/applications-page.h
@@ -14,10 +14,10 @@
// along with this library. If not, see <http://www.gnu.org/licenses/>.
-#ifndef WHISKERMENU_APPLICATIONS_PAGE_HPP
-#define WHISKERMENU_APPLICATIONS_PAGE_HPP
+#ifndef WHISKERMENU_APPLICATIONS_PAGE_H
+#define WHISKERMENU_APPLICATIONS_PAGE_H
-#include "page.hpp"
+#include "page.h"
#include <map>
#include <string>
@@ -88,4 +88,4 @@ private:
}
-#endif // WHISKERMENU_APPLICATIONS_PAGE_HPP
+#endif // WHISKERMENU_APPLICATIONS_PAGE_H
diff --git a/src/category.cpp b/panel-plugin/category.cpp
similarity index 98%
rename from src/category.cpp
rename to panel-plugin/category.cpp
index 0e0c52c..58b3403 100644
--- a/src/category.cpp
+++ b/panel-plugin/category.cpp
@@ -14,10 +14,10 @@
// along with this library. If not, see <http://www.gnu.org/licenses/>.
-#include "category.hpp"
+#include "category.h"
-#include "launcher_model.hpp"
-#include "section_button.hpp"
+#include "launcher-model.h"
+#include "section-button.h"
#include <algorithm>
diff --git a/src/category.hpp b/panel-plugin/category.h
similarity index 93%
rename from src/category.hpp
rename to panel-plugin/category.h
index 7f4c995..0f79a60 100644
--- a/src/category.hpp
+++ b/panel-plugin/category.h
@@ -14,10 +14,10 @@
// along with this library. If not, see <http://www.gnu.org/licenses/>.
-#ifndef WHISKERMENU_CATEGORY_HPP
-#define WHISKERMENU_CATEGORY_HPP
+#ifndef WHISKERMENU_CATEGORY_H
+#define WHISKERMENU_CATEGORY_H
-#include "launcher.hpp"
+#include "launcher.h"
#include <vector>
@@ -86,4 +86,4 @@ private:
}
-#endif // WHISKERMENU_CATEGORY_HPP
+#endif // WHISKERMENU_CATEGORY_H
diff --git a/src/command_button.cpp b/panel-plugin/command-button.cpp
similarity index 98%
rename from src/command_button.cpp
rename to panel-plugin/command-button.cpp
index 68299e6..b420d77 100644
--- a/src/command_button.cpp
+++ b/panel-plugin/command-button.cpp
@@ -14,7 +14,7 @@
// along with this library. If not, see <http://www.gnu.org/licenses/>.
-#include "command_button.hpp"
+#include "command-button.h"
extern "C"
{
diff --git a/src/command_button.hpp b/panel-plugin/command-button.h
similarity index 92%
rename from src/command_button.hpp
rename to panel-plugin/command-button.h
index 4f0bde3..72e8cdb 100644
--- a/src/command_button.hpp
+++ b/panel-plugin/command-button.h
@@ -14,8 +14,8 @@
// along with this library. If not, see <http://www.gnu.org/licenses/>.
-#ifndef WHISKERMENU_COMMAND_BUTTON_HPP
-#define WHISKERMENU_COMMAND_BUTTON_HPP
+#ifndef WHISKERMENU_COMMAND_BUTTON_H
+#define WHISKERMENU_COMMAND_BUTTON_H
#include <string>
@@ -73,4 +73,4 @@ private:
}
-#endif // WHISKERMENU_COMMAND_BUTTON_HPP
+#endif // WHISKERMENU_COMMAND_BUTTON_H
diff --git a/src/configuration_dialog.cpp b/panel-plugin/configuration-dialog.cpp
similarity index 98%
rename from src/configuration_dialog.cpp
rename to panel-plugin/configuration-dialog.cpp
index 563aea3..2ab1ada 100644
--- a/src/configuration_dialog.cpp
+++ b/panel-plugin/configuration-dialog.cpp
@@ -14,16 +14,16 @@
// along with this library. If not, see <http://www.gnu.org/licenses/>.
-#include "configuration_dialog.hpp"
-
-#include "applications_page.hpp"
-#include "favorites_page.hpp"
-#include "icon_size.hpp"
-#include "launcher.hpp"
-#include "launcher_view.hpp"
-#include "plugin.hpp"
-#include "section_button.hpp"
-#include "window.hpp"
+#include "configuration-dialog.h"
+
+#include "applications-page.h"
+#include "favorites-page.h"
+#include "icon-size.h"
+#include "launcher.h"
+#include "launcher-view.h"
+#include "plugin.h"
+#include "section-button.h"
+#include "window.h"
extern "C"
{
diff --git a/src/configuration_dialog.hpp b/panel-plugin/configuration-dialog.h
similarity index 97%
rename from src/configuration_dialog.hpp
rename to panel-plugin/configuration-dialog.h
index 088fe0a..8d67814 100644
--- a/src/configuration_dialog.hpp
+++ b/panel-plugin/configuration-dialog.h
@@ -14,8 +14,8 @@
// along with this library. If not, see <http://www.gnu.org/licenses/>.
-#ifndef WHISKERMENU_CONFIGURATION_DIALOG_HPP
-#define WHISKERMENU_CONFIGURATION_DIALOG_HPP
+#ifndef WHISKERMENU_CONFIGURATION_DIALOG_H
+#define WHISKERMENU_CONFIGURATION_DIALOG_H
extern "C"
{
@@ -180,4 +180,4 @@ private:
}
-#endif // WHISKERMENU_CONFIGURATION_DIALOG_HPP
+#endif // WHISKERMENU_CONFIGURATION_DIALOG_H
diff --git a/src/element.hpp b/panel-plugin/element.h
similarity index 94%
rename from src/element.hpp
rename to panel-plugin/element.h
index bfed283..e0abfc7 100644
--- a/src/element.hpp
+++ b/panel-plugin/element.h
@@ -14,8 +14,8 @@
// along with this library. If not, see <http://www.gnu.org/licenses/>.
-#ifndef WHISKERMENU_ELEMENT_HPP
-#define WHISKERMENU_ELEMENT_HPP
+#ifndef WHISKERMENU_ELEMENT_H
+#define WHISKERMENU_ELEMENT_H
extern "C"
{
@@ -90,4 +90,4 @@ private:
}
-#endif // WHISKERMENU_ELEMENT_HPP
+#endif // WHISKERMENU_ELEMENT_H
diff --git a/src/favorites_page.cpp b/panel-plugin/favorites-page.cpp
similarity index 96%
rename from src/favorites_page.cpp
rename to panel-plugin/favorites-page.cpp
index a36ea44..dc7c389 100644
--- a/src/favorites_page.cpp
+++ b/panel-plugin/favorites-page.cpp
@@ -14,13 +14,13 @@
// along with this library. If not, see <http://www.gnu.org/licenses/>.
-#include "favorites_page.hpp"
+#include "favorites-page.h"
-#include "applications_page.hpp"
-#include "launcher.hpp"
-#include "launcher_model.hpp"
-#include "launcher_view.hpp"
-#include "window.hpp"
+#include "applications-page.h"
+#include "launcher.h"
+#include "launcher-model.h"
+#include "launcher-view.h"
+#include "window.h"
#include <algorithm>
diff --git a/src/favorites_page.hpp b/panel-plugin/favorites-page.h
similarity index 90%
rename from src/favorites_page.hpp
rename to panel-plugin/favorites-page.h
index 82337d8..d990e5a 100644
--- a/src/favorites_page.hpp
+++ b/panel-plugin/favorites-page.h
@@ -14,10 +14,10 @@
// along with this library. If not, see <http://www.gnu.org/licenses/>.
-#ifndef WHISKERMENU_FAVORITES_PAGE_HPP
-#define WHISKERMENU_FAVORITES_PAGE_HPP
+#ifndef WHISKERMENU_FAVORITES_PAGE_H
+#define WHISKERMENU_FAVORITES_PAGE_H
-#include "list_page.hpp"
+#include "list-page.h"
namespace WhiskerMenu
{
@@ -56,4 +56,4 @@ private:
}
-#endif // WHISKERMENU_FAVORITES_PAGE_HPP
+#endif // WHISKERMENU_FAVORITES_PAGE_H
diff --git a/src/icon_size.cpp b/panel-plugin/icon-size.cpp
similarity index 98%
rename from src/icon_size.cpp
rename to panel-plugin/icon-size.cpp
index 8e1a4f0..266613e 100644
--- a/src/icon_size.cpp
+++ b/panel-plugin/icon-size.cpp
@@ -14,7 +14,7 @@
// along with this library. If not, see <http://www.gnu.org/licenses/>.
-#include "icon_size.hpp"
+#include "icon-size.h"
extern "C"
{
diff --git a/src/icon_size.hpp b/panel-plugin/icon-size.h
similarity index 91%
rename from src/icon_size.hpp
rename to panel-plugin/icon-size.h
index 72af550..0dd99bf 100644
--- a/src/icon_size.hpp
+++ b/panel-plugin/icon-size.h
@@ -14,8 +14,8 @@
// along with this library. If not, see <http://www.gnu.org/licenses/>.
-#ifndef WHISKERMENU_ICON_SIZE_HPP
-#define WHISKERMENU_ICON_SIZE_HPP
+#ifndef WHISKERMENU_ICON_SIZE_H
+#define WHISKERMENU_ICON_SIZE_H
#include <string>
#include <vector>
@@ -57,4 +57,4 @@ private:
}
-#endif // WHISKERMENU_ICON_SIZE_HPP
+#endif // WHISKERMENU_ICON_SIZE_H
diff --git a/src/launcher_model.cpp b/panel-plugin/launcher-model.cpp
similarity index 98%
rename from src/launcher_model.cpp
rename to panel-plugin/launcher-model.cpp
index 7bb0da0..08e82f8 100644
--- a/src/launcher_model.cpp
+++ b/panel-plugin/launcher-model.cpp
@@ -14,9 +14,9 @@
// along with this library. If not, see <http://www.gnu.org/licenses/>.
-#include "launcher_model.hpp"
+#include "launcher-model.h"
-#include "launcher.hpp"
+#include "launcher.h"
using namespace WhiskerMenu;
diff --git a/src/launcher_model.hpp b/panel-plugin/launcher-model.h
similarity index 92%
rename from src/launcher_model.hpp
rename to panel-plugin/launcher-model.h
index 731bd43..7c78316 100644
--- a/src/launcher_model.hpp
+++ b/panel-plugin/launcher-model.h
@@ -14,8 +14,8 @@
// along with this library. If not, see <http://www.gnu.org/licenses/>.
-#ifndef WHISKERMENU_LAUNCHER_MODEL_HPP
-#define WHISKERMENU_LAUNCHER_MODEL_HPP
+#ifndef WHISKERMENU_LAUNCHER_MODEL_H
+#define WHISKERMENU_LAUNCHER_MODEL_H
extern "C"
{
@@ -73,4 +73,4 @@ private:
}
-#endif // WHISKERMENU_LAUNCHER_MODEL_HPP
+#endif // WHISKERMENU_LAUNCHER_MODEL_H
diff --git a/src/launcher_view.cpp b/panel-plugin/launcher-view.cpp
similarity index 98%
rename from src/launcher_view.cpp
rename to panel-plugin/launcher-view.cpp
index e47dcd0..e667d2a 100644
--- a/src/launcher_view.cpp
+++ b/panel-plugin/launcher-view.cpp
@@ -14,10 +14,10 @@
// along with this library. If not, see <http://www.gnu.org/licenses/>.
-#include "launcher_view.hpp"
+#include "launcher-view.h"
-#include "icon_size.hpp"
-#include "launcher_model.hpp"
+#include "icon-size.h"
+#include "launcher-model.h"
#include <algorithm>
diff --git a/src/launcher_view.hpp b/panel-plugin/launcher-view.h
similarity index 94%
rename from src/launcher_view.hpp
rename to panel-plugin/launcher-view.h
index bac5754..1bd8b5a 100644
--- a/src/launcher_view.hpp
+++ b/panel-plugin/launcher-view.h
@@ -14,8 +14,8 @@
// along with this library. If not, see <http://www.gnu.org/licenses/>.
-#ifndef WHISKERMENU_LAUNCHER_VIEW_HPP
-#define WHISKERMENU_LAUNCHER_VIEW_HPP
+#ifndef WHISKERMENU_LAUNCHER_VIEW_H
+#define WHISKERMENU_LAUNCHER_VIEW_H
extern "C"
{
@@ -90,4 +90,4 @@ private:
}
-#endif // WHISKERMENU_LAUNCHER_VIEW_HPP
+#endif // WHISKERMENU_LAUNCHER_VIEW_H
diff --git a/src/launcher.cpp b/panel-plugin/launcher.cpp
similarity index 99%
rename from src/launcher.cpp
rename to panel-plugin/launcher.cpp
index 7c26e7d..05f5090 100644
--- a/src/launcher.cpp
+++ b/panel-plugin/launcher.cpp
@@ -14,7 +14,9 @@
// along with this library. If not, see <http://www.gnu.org/licenses/>.
-#include "launcher.hpp"
+#include "launcher.h"
+
+#include "query.h"
extern "C"
{
diff --git a/src/launcher.hpp b/panel-plugin/launcher.h
similarity index 92%
rename from src/launcher.hpp
rename to panel-plugin/launcher.h
index 1f1a74c..ff0c79f 100644
--- a/src/launcher.hpp
+++ b/panel-plugin/launcher.h
@@ -14,11 +14,10 @@
// along with this library. If not, see <http://www.gnu.org/licenses/>.
-#ifndef WHISKERMENU_LAUNCHER_HPP
-#define WHISKERMENU_LAUNCHER_HPP
+#ifndef WHISKERMENU_LAUNCHER_H
+#define WHISKERMENU_LAUNCHER_H
-#include "element.hpp"
-#include "query.hpp"
+#include "element.h"
#include <string>
@@ -31,6 +30,8 @@ extern "C"
namespace WhiskerMenu
{
+class Query;
+
class Launcher : public Element
{
public:
@@ -84,4 +85,4 @@ private:
}
-#endif // WHISKERMENU_LAUNCHER_HPP
+#endif // WHISKERMENU_LAUNCHER_H
diff --git a/src/list_page.cpp b/panel-plugin/list-page.cpp
similarity index 97%
rename from src/list_page.cpp
rename to panel-plugin/list-page.cpp
index 9fcc3d7..7983492 100644
--- a/src/list_page.cpp
+++ b/panel-plugin/list-page.cpp
@@ -14,13 +14,13 @@
// along with this library. If not, see <http://www.gnu.org/licenses/>.
-#include "list_page.hpp"
+#include "list-page.h"
-#include "applications_page.hpp"
-#include "launcher.hpp"
-#include "launcher_model.hpp"
-#include "launcher_view.hpp"
-#include "window.hpp"
+#include "applications-page.h"
+#include "launcher.h"
+#include "launcher-model.h"
+#include "launcher-view.h"
+#include "window.h"
#include <algorithm>
diff --git a/src/list_page.hpp b/panel-plugin/list-page.h
similarity index 94%
rename from src/list_page.hpp
rename to panel-plugin/list-page.h
index 5894944..d9fa357 100644
--- a/src/list_page.hpp
+++ b/panel-plugin/list-page.h
@@ -14,10 +14,10 @@
// along with this library. If not, see <http://www.gnu.org/licenses/>.
-#ifndef WHISKERMENU_LIST_PAGE_HPP
-#define WHISKERMENU_LIST_PAGE_HPP
+#ifndef WHISKERMENU_LIST_PAGE_H
+#define WHISKERMENU_LIST_PAGE_H
-#include "page.hpp"
+#include "page.h"
#include <map>
#include <string>
@@ -89,4 +89,4 @@ private:
}
-#endif // WHISKERMENU_LIST_PAGE_HPP
+#endif // WHISKERMENU_LIST_PAGE_H
diff --git a/src/page.cpp b/panel-plugin/page.cpp
similarity index 98%
rename from src/page.cpp
rename to panel-plugin/page.cpp
index b776eb0..49f29e5 100644
--- a/src/page.cpp
+++ b/panel-plugin/page.cpp
@@ -14,14 +14,14 @@
// along with this library. If not, see <http://www.gnu.org/licenses/>.
-#include "page.hpp"
-
-#include "favorites_page.hpp"
-#include "launcher.hpp"
-#include "launcher_model.hpp"
-#include "launcher_view.hpp"
-#include "recent_page.hpp"
-#include "window.hpp"
+#include "page.h"
+
+#include "favorites-page.h"
+#include "launcher.h"
+#include "launcher-model.h"
+#include "launcher-view.h"
+#include "recent-page.h"
+#include "window.h"
extern "C"
{
diff --git a/src/page.hpp b/panel-plugin/page.h
similarity index 97%
rename from src/page.hpp
rename to panel-plugin/page.h
index 5eb89b4..a1ede66 100644
--- a/src/page.hpp
+++ b/panel-plugin/page.h
@@ -14,8 +14,8 @@
// along with this library. If not, see <http://www.gnu.org/licenses/>.
-#ifndef WHISKERMENU_PAGE_HPP
-#define WHISKERMENU_PAGE_HPP
+#ifndef WHISKERMENU_PAGE_H
+#define WHISKERMENU_PAGE_H
extern "C"
{
@@ -121,4 +121,4 @@ private:
}
-#endif // WHISKERMENU_PAGE_HPP
+#endif // WHISKERMENU_PAGE_H
diff --git a/src/plugin.cpp b/panel-plugin/plugin.cpp
similarity index 98%
rename from src/plugin.cpp
rename to panel-plugin/plugin.cpp
index 66430a4..56f809f 100644
--- a/src/plugin.cpp
+++ b/panel-plugin/plugin.cpp
@@ -14,16 +14,16 @@
// along with this library. If not, see <http://www.gnu.org/licenses/>.
-#include "plugin.hpp"
-
-#include "applications_page.hpp"
-#include "configuration_dialog.hpp"
-#include "favorites_page.hpp"
-#include "icon_size.hpp"
-#include "launcher.hpp"
-#include "launcher_view.hpp"
-#include "section_button.hpp"
-#include "window.hpp"
+#include "plugin.h"
+
+#include "applications-page.h"
+#include "configuration-dialog.h"
+#include "favorites-page.h"
+#include "icon-size.h"
+#include "launcher.h"
+#include "launcher-view.h"
+#include "section-button.h"
+#include "window.h"
using namespace WhiskerMenu;
diff --git a/src/plugin.hpp b/panel-plugin/plugin.h
similarity index 97%
rename from src/plugin.hpp
rename to panel-plugin/plugin.h
index 9b2f283..d1bafa3 100644
--- a/src/plugin.hpp
+++ b/panel-plugin/plugin.h
@@ -14,8 +14,8 @@
// along with this library. If not, see <http://www.gnu.org/licenses/>.
-#ifndef WHISKERMENU_PLUGIN_HPP
-#define WHISKERMENU_PLUGIN_HPP
+#ifndef WHISKERMENU_PLUGIN_H
+#define WHISKERMENU_PLUGIN_H
#include <string>
@@ -147,4 +147,4 @@ private:
}
-#endif // WHISKERMENU_PLUGIN_HPP
+#endif // WHISKERMENU_PLUGIN_H
diff --git a/src/query.cpp b/panel-plugin/query.cpp
similarity index 99%
rename from src/query.cpp
rename to panel-plugin/query.cpp
index cebee10..e6294a9 100644
--- a/src/query.cpp
+++ b/panel-plugin/query.cpp
@@ -14,7 +14,7 @@
// along with this library. If not, see <http://www.gnu.org/licenses/>.
-#include "query.hpp"
+#include "query.h"
#include <sstream>
diff --git a/src/query.hpp b/panel-plugin/query.h
similarity index 92%
rename from src/query.hpp
rename to panel-plugin/query.h
index fbd61a5..840291b 100644
--- a/src/query.hpp
+++ b/panel-plugin/query.h
@@ -14,8 +14,8 @@
// along with this library. If not, see <http://www.gnu.org/licenses/>.
-#ifndef WHISKERMENU_QUERY_HPP
-#define WHISKERMENU_QUERY_HPP
+#ifndef WHISKERMENU_QUERY_H
+#define WHISKERMENU_QUERY_H
#include <string>
#include <vector>
@@ -52,4 +52,4 @@ private:
}
-#endif // WHISKERMENU_QUERY_HPP
+#endif // WHISKERMENU_QUERY_H
diff --git a/src/recent_page.cpp b/panel-plugin/recent-page.cpp
similarity index 95%
rename from src/recent_page.cpp
rename to panel-plugin/recent-page.cpp
index ab45d1b..7761e55 100644
--- a/src/recent_page.cpp
+++ b/panel-plugin/recent-page.cpp
@@ -14,12 +14,12 @@
// along with this library. If not, see <http://www.gnu.org/licenses/>.
-#include "recent_page.hpp"
+#include "recent-page.h"
-#include "launcher.hpp"
-#include "launcher_model.hpp"
-#include "launcher_view.hpp"
-#include "window.hpp"
+#include "launcher.h"
+#include "launcher-model.h"
+#include "launcher-view.h"
+#include "window.h"
using namespace WhiskerMenu;
diff --git a/src/recent_page.hpp b/panel-plugin/recent-page.h
similarity index 89%
rename from src/recent_page.hpp
rename to panel-plugin/recent-page.h
index 0d575f8..9ae3904 100644
--- a/src/recent_page.hpp
+++ b/panel-plugin/recent-page.h
@@ -14,10 +14,10 @@
// along with this library. If not, see <http://www.gnu.org/licenses/>.
-#ifndef WHISKERMENU_RECENT_PAGE_HPP
-#define WHISKERMENU_RECENT_PAGE_HPP
+#ifndef WHISKERMENU_RECENT_PAGE_H
+#define WHISKERMENU_RECENT_PAGE_H
-#include "list_page.hpp"
+#include "list-page.h"
namespace WhiskerMenu
{
@@ -49,4 +49,4 @@ private:
}
-#endif // WHISKERMENU_RECENT_PAGE_HPP
+#endif // WHISKERMENU_RECENT_PAGE_H
diff --git a/src/register_plugin.c b/panel-plugin/register-plugin.c
similarity index 100%
rename from src/register_plugin.c
rename to panel-plugin/register-plugin.c
diff --git a/src/resizer_widget.cpp b/panel-plugin/resizer-widget.cpp
similarity index 99%
rename from src/resizer_widget.cpp
rename to panel-plugin/resizer-widget.cpp
index 3cdf2f2..d692a03 100644
--- a/src/resizer_widget.cpp
+++ b/panel-plugin/resizer-widget.cpp
@@ -14,7 +14,7 @@
// along with this library. If not, see <http://www.gnu.org/licenses/>.
-#include "resizer_widget.hpp"
+#include "resizer-widget.h"
using namespace WhiskerMenu;
diff --git a/src/resizer_widget.hpp b/panel-plugin/resizer-widget.h
similarity index 94%
rename from src/resizer_widget.hpp
rename to panel-plugin/resizer-widget.h
index 91b6406..37644fa 100644
--- a/src/resizer_widget.hpp
+++ b/panel-plugin/resizer-widget.h
@@ -14,8 +14,8 @@
// along with this library. If not, see <http://www.gnu.org/licenses/>.
-#ifndef WHISKERMENU_RESIZER_WIDGET_HPP
-#define WHISKERMENU_RESIZER_WIDGET_HPP
+#ifndef WHISKERMENU_RESIZER_WIDGET_H
+#define WHISKERMENU_RESIZER_WIDGET_H
#include <vector>
@@ -86,4 +86,4 @@ private:
}
-#endif // WHISKERMENU_RESIZER_WIDGET_HPP
+#endif // WHISKERMENU_RESIZER_WIDGET_H
diff --git a/src/search_page.cpp b/panel-plugin/search-page.cpp
similarity index 98%
rename from src/search_page.cpp
rename to panel-plugin/search-page.cpp
index c91989d..12d7b3d 100644
--- a/src/search_page.cpp
+++ b/panel-plugin/search-page.cpp
@@ -14,12 +14,12 @@
// along with this library. If not, see <http://www.gnu.org/licenses/>.
-#include "search_page.hpp"
+#include "search-page.h"
-#include "launcher.hpp"
-#include "launcher_model.hpp"
-#include "launcher_view.hpp"
-#include "window.hpp"
+#include "launcher.h"
+#include "launcher-model.h"
+#include "launcher-view.h"
+#include "window.h"
extern "C"
{
diff --git a/src/search_page.hpp b/panel-plugin/search-page.h
similarity index 92%
rename from src/search_page.hpp
rename to panel-plugin/search-page.h
index 765b870..bc04710 100644
--- a/src/search_page.hpp
+++ b/panel-plugin/search-page.h
@@ -14,11 +14,11 @@
// along with this library. If not, see <http://www.gnu.org/licenses/>.
-#ifndef WHISKERMENU_SEARCH_PAGE_HPP
-#define WHISKERMENU_SEARCH_PAGE_HPP
+#ifndef WHISKERMENU_SEARCH_PAGE_H
+#define WHISKERMENU_SEARCH_PAGE_H
-#include "page.hpp"
-#include "query.hpp"
+#include "page.h"
+#include "query.h"
#include <map>
#include <string>
@@ -69,4 +69,4 @@ private:
}
-#endif // WHISKERMENU_SEARCH_PAGE_HPP
+#endif // WHISKERMENU_SEARCH_PAGE_H
diff --git a/src/section_button.cpp b/panel-plugin/section-button.cpp
similarity index 98%
rename from src/section_button.cpp
rename to panel-plugin/section-button.cpp
index d6fbf1d..5c9c703 100644
--- a/src/section_button.cpp
+++ b/panel-plugin/section-button.cpp
@@ -14,9 +14,9 @@
// along with this library. If not, see <http://www.gnu.org/licenses/>.
-#include "section_button.hpp"
+#include "section-button.h"
-#include "icon_size.hpp"
+#include "icon-size.h"
extern "C"
{
diff --git a/src/section_button.hpp b/panel-plugin/section-button.h
similarity index 92%
rename from src/section_button.hpp
rename to panel-plugin/section-button.h
index e77c512..b451af6 100644
--- a/src/section_button.hpp
+++ b/panel-plugin/section-button.h
@@ -14,8 +14,8 @@
// along with this library. If not, see <http://www.gnu.org/licenses/>.
-#ifndef WHISKERMENU_SECTION_BUTTON_HPP
-#define WHISKERMENU_SECTION_BUTTON_HPP
+#ifndef WHISKERMENU_SECTION_BUTTON_H
+#define WHISKERMENU_SECTION_BUTTON_H
extern "C"
{
@@ -70,4 +70,4 @@ private:
}
-#endif // WHISKERMENU_SECTION_BUTTON_HPP
+#endif // WHISKERMENU_SECTION_BUTTON_H
diff --git a/whiskermenu.desktop b/panel-plugin/whiskermenu.desktop
similarity index 100%
rename from whiskermenu.desktop
rename to panel-plugin/whiskermenu.desktop
diff --git a/src/window.cpp b/panel-plugin/window.cpp
similarity index 99%
rename from src/window.cpp
rename to panel-plugin/window.cpp
index 5599e5c..be4f2cd 100644
--- a/src/window.cpp
+++ b/panel-plugin/window.cpp
@@ -14,18 +14,16 @@
// along with this library. If not, see <http://www.gnu.org/licenses/>.
-#include "window.hpp"
+#include "window.h"
-#include "applications_page.hpp"
-#include "command_button.hpp"
-#include "favorites_page.hpp"
-#include "launcher_view.hpp"
-#include "recent_page.hpp"
-#include "resizer_widget.hpp"
-#include "search_page.hpp"
-#include "section_button.hpp"
-
-#include <ctime>
+#include "applications-page.h"
+#include "command-button.h"
+#include "favorites-page.h"
+#include "launcher-view.h"
+#include "recent-page.h"
+#include "resizer-widget.h"
+#include "search-page.h"
+#include "section-button.h"
extern "C"
{
@@ -34,6 +32,8 @@ extern "C"
#include <libxfce4ui/libxfce4ui.h>
}
+#include <ctime>
+
using namespace WhiskerMenu;
//-----------------------------------------------------------------------------
diff --git a/src/window.hpp b/panel-plugin/window.h
similarity index 98%
rename from src/window.hpp
rename to panel-plugin/window.h
index 5a23107..83738c5 100644
--- a/src/window.hpp
+++ b/panel-plugin/window.h
@@ -14,8 +14,8 @@
// along with this library. If not, see <http://www.gnu.org/licenses/>.
-#ifndef WHISKERMENU_WINDOW_HPP
-#define WHISKERMENU_WINDOW_HPP
+#ifndef WHISKERMENU_WINDOW_H
+#define WHISKERMENU_WINDOW_H
#include <map>
#include <string>
@@ -232,4 +232,4 @@ private:
}
-#endif // WHISKERMENU_WINDOW_HPP
+#endif // WHISKERMENU_WINDOW_H
diff --git a/xfce4-popup-whiskermenu.1 b/panel-plugin/xfce4-popup-whiskermenu.1
similarity index 100%
rename from xfce4-popup-whiskermenu.1
rename to panel-plugin/xfce4-popup-whiskermenu.1
diff --git a/xfce4-popup-whiskermenu.in b/panel-plugin/xfce4-popup-whiskermenu.in
similarity index 100%
rename from xfce4-popup-whiskermenu.in
rename to panel-plugin/xfce4-popup-whiskermenu.in
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list