alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote branch 'origin/KDE/4.7' into origin-frameworks

Browse Source 
Conflicts:
	plasma/packagestructure.cpp (discarded the 4.7 patch)
	tier1/solid/solid/backends/wmi/wmidevice.cpp (Q_FOREACH)
This commit is contained in:
David Faure 2011-09-18 13:55:17 +02:00
commit 9cc86d27af
1 changed files with 0 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
packagestructure.cpp
View File

@ -1,59 +0,0 @@
/******************************************************************************
* Copyright 2011 by Aaron Seigo <aseigo@kde.org> *
* *
* This library is free software; you can redistribute it and/or *
* modify it under the terms of the GNU Library General Public *
* License as published by the Free Software Foundation; either *
* version 2 of the License, or (at your option) any later version. *
* *
* This library 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 *
* Library General Public License for more details. *
* *
* You should have received a copy of the GNU Library General Public License *
* along with this library; see the file COPYING.LIB. If not, write to *
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, *
* Boston, MA 02110-1301, USA. *
*******************************************************************************/
#include "packagestructure.h"
#include "private/package_p.h"
namespace Plasma
{
PackageStructure::PackageStructure(QObject *parent, const QVariantList &args)
: QObject(parent),
d(0)
{
Q_UNUSED(args)
}
PackageStructure::~PackageStructure()
{
}
void PackageStructure::initPackage(Package *package)
{
Q_UNUSED(package)
}
void PackageStructure::pathChanged(Package *package)
{
Q_UNUSED(package)
}
bool PackageStructure::installPackage(Package *package, const QString &archivePath, const QString &packageRoot)
{
return PackagePrivate::installPackage(archivePath, packageRoot, package->servicePrefix());
}
bool PackageStructure::uninstallPackage(Package *package, const QString &packageName, const QString &packageRoot)
{
return PackagePrivate::uninstallPackage(packageName, packageRoot, package->servicePrefix());
}
}