From 693519841f363277ba4fd53163223c7fd4720a8b Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Mon, 6 Jan 2014 21:14:09 +0100 Subject: [PATCH] rename plugins --- plugins/deviceplugins/deviceplugins.pro | 5 ++++- .../{devicepluginelro => elro}/devicepluginelro.cpp | 0 .../{devicepluginelro => elro}/devicepluginelro.h | 0 .../{devicepluginelro => elro}/devicepluginelro.json | 0 .../devicepluginelro.pro => elro/elro.pro} | 0 .../devicepluginintertechno.cpp | 0 .../devicepluginintertechno.h | 0 .../devicepluginintertechno.json | 0 .../intertechno.pro} | 0 .../devicepluginmeisteranker.cpp | 0 .../devicepluginmeisteranker.h | 0 .../devicepluginmeisteranker.json | 0 .../meisteranker.pro} | 0 .../devicepluginwifidetector.cpp | 0 .../devicepluginwifidetector.h | 0 .../devicepluginwifidetector.json | 0 .../wifidetector.pro} | 0 server/server.pro | 8 ++++---- 18 files changed, 8 insertions(+), 5 deletions(-) rename plugins/deviceplugins/{devicepluginelro => elro}/devicepluginelro.cpp (100%) rename plugins/deviceplugins/{devicepluginelro => elro}/devicepluginelro.h (100%) rename plugins/deviceplugins/{devicepluginelro => elro}/devicepluginelro.json (100%) rename plugins/deviceplugins/{devicepluginelro/devicepluginelro.pro => elro/elro.pro} (100%) rename plugins/deviceplugins/{devicepluginintertechno => intertechno}/devicepluginintertechno.cpp (100%) rename plugins/deviceplugins/{devicepluginintertechno => intertechno}/devicepluginintertechno.h (100%) rename plugins/deviceplugins/{devicepluginintertechno => intertechno}/devicepluginintertechno.json (100%) rename plugins/deviceplugins/{devicepluginintertechno/devicepluginintertechno.pro => intertechno/intertechno.pro} (100%) rename plugins/deviceplugins/{devicepluginmeisteranker => meisteranker}/devicepluginmeisteranker.cpp (100%) rename plugins/deviceplugins/{devicepluginmeisteranker => meisteranker}/devicepluginmeisteranker.h (100%) rename plugins/deviceplugins/{devicepluginmeisteranker => meisteranker}/devicepluginmeisteranker.json (100%) rename plugins/deviceplugins/{devicepluginmeisteranker/devicepluginmeisteranker.pro => meisteranker/meisteranker.pro} (100%) rename plugins/deviceplugins/{devicepluginwifidetector => wifidetector}/devicepluginwifidetector.cpp (100%) rename plugins/deviceplugins/{devicepluginwifidetector => wifidetector}/devicepluginwifidetector.h (100%) rename plugins/deviceplugins/{devicepluginwifidetector => wifidetector}/devicepluginwifidetector.json (100%) rename plugins/deviceplugins/{devicepluginwifidetector/devicepluginwifidetector.pro => wifidetector/wifidetector.pro} (100%) diff --git a/plugins/deviceplugins/deviceplugins.pro b/plugins/deviceplugins/deviceplugins.pro index 475c4c9c..489e1875 100644 --- a/plugins/deviceplugins/deviceplugins.pro +++ b/plugins/deviceplugins/deviceplugins.pro @@ -1,3 +1,6 @@ TEMPLATE = subdirs -SUBDIRS += devicepluginelro devicepluginintertechno devicepluginmeisteranker devicepluginwifidetector +SUBDIRS += elro \ + intertechno \ + meisteranker \ + wifidetector \ diff --git a/plugins/deviceplugins/devicepluginelro/devicepluginelro.cpp b/plugins/deviceplugins/elro/devicepluginelro.cpp similarity index 100% rename from plugins/deviceplugins/devicepluginelro/devicepluginelro.cpp rename to plugins/deviceplugins/elro/devicepluginelro.cpp diff --git a/plugins/deviceplugins/devicepluginelro/devicepluginelro.h b/plugins/deviceplugins/elro/devicepluginelro.h similarity index 100% rename from plugins/deviceplugins/devicepluginelro/devicepluginelro.h rename to plugins/deviceplugins/elro/devicepluginelro.h diff --git a/plugins/deviceplugins/devicepluginelro/devicepluginelro.json b/plugins/deviceplugins/elro/devicepluginelro.json similarity index 100% rename from plugins/deviceplugins/devicepluginelro/devicepluginelro.json rename to plugins/deviceplugins/elro/devicepluginelro.json diff --git a/plugins/deviceplugins/devicepluginelro/devicepluginelro.pro b/plugins/deviceplugins/elro/elro.pro similarity index 100% rename from plugins/deviceplugins/devicepluginelro/devicepluginelro.pro rename to plugins/deviceplugins/elro/elro.pro diff --git a/plugins/deviceplugins/devicepluginintertechno/devicepluginintertechno.cpp b/plugins/deviceplugins/intertechno/devicepluginintertechno.cpp similarity index 100% rename from plugins/deviceplugins/devicepluginintertechno/devicepluginintertechno.cpp rename to plugins/deviceplugins/intertechno/devicepluginintertechno.cpp diff --git a/plugins/deviceplugins/devicepluginintertechno/devicepluginintertechno.h b/plugins/deviceplugins/intertechno/devicepluginintertechno.h similarity index 100% rename from plugins/deviceplugins/devicepluginintertechno/devicepluginintertechno.h rename to plugins/deviceplugins/intertechno/devicepluginintertechno.h diff --git a/plugins/deviceplugins/devicepluginintertechno/devicepluginintertechno.json b/plugins/deviceplugins/intertechno/devicepluginintertechno.json similarity index 100% rename from plugins/deviceplugins/devicepluginintertechno/devicepluginintertechno.json rename to plugins/deviceplugins/intertechno/devicepluginintertechno.json diff --git a/plugins/deviceplugins/devicepluginintertechno/devicepluginintertechno.pro b/plugins/deviceplugins/intertechno/intertechno.pro similarity index 100% rename from plugins/deviceplugins/devicepluginintertechno/devicepluginintertechno.pro rename to plugins/deviceplugins/intertechno/intertechno.pro diff --git a/plugins/deviceplugins/devicepluginmeisteranker/devicepluginmeisteranker.cpp b/plugins/deviceplugins/meisteranker/devicepluginmeisteranker.cpp similarity index 100% rename from plugins/deviceplugins/devicepluginmeisteranker/devicepluginmeisteranker.cpp rename to plugins/deviceplugins/meisteranker/devicepluginmeisteranker.cpp diff --git a/plugins/deviceplugins/devicepluginmeisteranker/devicepluginmeisteranker.h b/plugins/deviceplugins/meisteranker/devicepluginmeisteranker.h similarity index 100% rename from plugins/deviceplugins/devicepluginmeisteranker/devicepluginmeisteranker.h rename to plugins/deviceplugins/meisteranker/devicepluginmeisteranker.h diff --git a/plugins/deviceplugins/devicepluginmeisteranker/devicepluginmeisteranker.json b/plugins/deviceplugins/meisteranker/devicepluginmeisteranker.json similarity index 100% rename from plugins/deviceplugins/devicepluginmeisteranker/devicepluginmeisteranker.json rename to plugins/deviceplugins/meisteranker/devicepluginmeisteranker.json diff --git a/plugins/deviceplugins/devicepluginmeisteranker/devicepluginmeisteranker.pro b/plugins/deviceplugins/meisteranker/meisteranker.pro similarity index 100% rename from plugins/deviceplugins/devicepluginmeisteranker/devicepluginmeisteranker.pro rename to plugins/deviceplugins/meisteranker/meisteranker.pro diff --git a/plugins/deviceplugins/devicepluginwifidetector/devicepluginwifidetector.cpp b/plugins/deviceplugins/wifidetector/devicepluginwifidetector.cpp similarity index 100% rename from plugins/deviceplugins/devicepluginwifidetector/devicepluginwifidetector.cpp rename to plugins/deviceplugins/wifidetector/devicepluginwifidetector.cpp diff --git a/plugins/deviceplugins/devicepluginwifidetector/devicepluginwifidetector.h b/plugins/deviceplugins/wifidetector/devicepluginwifidetector.h similarity index 100% rename from plugins/deviceplugins/devicepluginwifidetector/devicepluginwifidetector.h rename to plugins/deviceplugins/wifidetector/devicepluginwifidetector.h diff --git a/plugins/deviceplugins/devicepluginwifidetector/devicepluginwifidetector.json b/plugins/deviceplugins/wifidetector/devicepluginwifidetector.json similarity index 100% rename from plugins/deviceplugins/devicepluginwifidetector/devicepluginwifidetector.json rename to plugins/deviceplugins/wifidetector/devicepluginwifidetector.json diff --git a/plugins/deviceplugins/devicepluginwifidetector/devicepluginwifidetector.pro b/plugins/deviceplugins/wifidetector/wifidetector.pro similarity index 100% rename from plugins/deviceplugins/devicepluginwifidetector/devicepluginwifidetector.pro rename to plugins/deviceplugins/wifidetector/wifidetector.pro diff --git a/server/server.pro b/server/server.pro index 2a00299d..3cb335d7 100644 --- a/server/server.pro +++ b/server/server.pro @@ -25,7 +25,7 @@ HEADERS += hivecore.h \ rule.h # FIXME: Drop this and link them dynamically -LIBS += -L../plugins/deviceplugins/devicepluginelro/ -lhive_devicepluginelro -LIBS += -L../plugins/deviceplugins/devicepluginintertechno/ -lhive_devicepluginintertechno -LIBS += -L../plugins/deviceplugins/devicepluginmeisteranker/ -lhive_devicepluginmeisteranker -LIBS += -L../plugins/deviceplugins/devicepluginwifidetector/ -lhive_devicepluginwifidetector +LIBS += -L../plugins/deviceplugins/elro/ -lhive_devicepluginelro +LIBS += -L../plugins/deviceplugins/intertechno/ -lhive_devicepluginintertechno +LIBS += -L../plugins/deviceplugins/meisteranker/ -lhive_devicepluginmeisteranker +LIBS += -L../plugins/deviceplugins/wifidetector/ -lhive_devicepluginwifidetector