refactor:rename dockpackage to Latte::Package

pull/3/head
Michail Vourlakos 6 years ago
parent f74b3a4da0
commit 7a3fcc7773

@ -12,7 +12,7 @@ set(lattedock-app_SRCS
plasmathemeextended.cpp plasmathemeextended.cpp
schemecolors.cpp schemecolors.cpp
screenpool.cpp screenpool.cpp
packageplugins/shell/dockpackage.cpp packageplugins/shell/lattepackage.cpp
settings/settingsdialog.cpp settings/settingsdialog.cpp
settings/sortedactivitiesmodel.cpp settings/sortedactivitiesmodel.cpp
settings/universalsettings.cpp settings/universalsettings.cpp

@ -29,7 +29,7 @@
#include "layoutmanager.h" #include "layoutmanager.h"
#include "plasmathemeextended.h" #include "plasmathemeextended.h"
#include "screenpool.h" #include "screenpool.h"
#include "packageplugins/shell/dockpackage.h" #include "packageplugins/shell/lattepackage.h"
#include "settings/universalsettings.h" #include "settings/universalsettings.h"
#include "view/view.h" #include "view/view.h"
#include "wm/abstractwindowinterface.h" #include "wm/abstractwindowinterface.h"
@ -93,7 +93,7 @@ DockCorona::DockCorona(bool defaultLayoutOnStartup, QString layoutNameOnStartUp,
setupWaylandIntegration(); setupWaylandIntegration();
KPackage::Package package(new DockPackage(this)); KPackage::Package package(new Latte::Package(this));
m_screenPool->load(); m_screenPool->load();

@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "dockpackage.h" #include "lattepackage.h"
// Qt // Qt
#include <QDebug> #include <QDebug>
@ -29,16 +29,16 @@
namespace Latte { namespace Latte {
DockPackage::DockPackage(QObject *parent, const QVariantList &args) Package::Package(QObject *parent, const QVariantList &args)
: KPackage::PackageStructure(parent, args) : KPackage::PackageStructure(parent, args)
{ {
} }
DockPackage::~DockPackage() Package::~Package()
{ {
} }
void DockPackage::initPackage(KPackage::Package *package) void Package::initPackage(KPackage::Package *package)
{ {
auto fallback = KPackage::PackageLoader::self()->loadPackage("Plasma/Shell", "org.kde.plasma.desktop"); auto fallback = KPackage::PackageLoader::self()->loadPackage("Plasma/Shell", "org.kde.plasma.desktop");
package->setDefaultPackageRoot(QStringLiteral("plasma/shells/")); package->setDefaultPackageRoot(QStringLiteral("plasma/shells/"));
@ -70,7 +70,7 @@ void DockPackage::initPackage(KPackage::Package *package)
qDebug() << "package is valid" << package->isValid(); qDebug() << "package is valid" << package->isValid();
} }
void DockPackage::pathChanged(KPackage::Package *package) void Package::pathChanged(KPackage::Package *package)
{ {
if (!package->metadata().isValid()) if (!package->metadata().isValid())
return; return;

@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef DOCKPACKAGE_H #ifndef LATTEPACKAGE_H
#define DOCKPACKAGE_H #define LATTEPACKAGE_H
// Qt // Qt
#include <QObject> #include <QObject>
@ -28,17 +28,17 @@
#include <KPackage/PackageStructure> #include <KPackage/PackageStructure>
namespace Latte { namespace Latte {
class DockPackage : public KPackage::PackageStructure class Package : public KPackage::PackageStructure
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit DockPackage(QObject *parent = 0, const QVariantList &args = QVariantList()); explicit Package(QObject *parent = 0, const QVariantList &args = QVariantList());
~DockPackage() override; ~Package() override;
void initPackage(KPackage::Package *package) override; void initPackage(KPackage::Package *package) override;
void pathChanged(KPackage::Package *package) override; void pathChanged(KPackage::Package *package) override;
}; };
} }
#endif // DOCKPACKAGE_H #endif // LATTEPACKAGE_H
Loading…
Cancel
Save