kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-20 08:51:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix use of QWidget in non-gui unittest. This KIO::del is always local-only, no need for progress info.

Browse source 
svn path=/trunk/KDE/kdebase/apps/; revision=1040224
This commit is contained in:
David Faure 2009-10-25 21:20:58 +00:00
parent 05a19561ed
commit 31fc97c436
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
konqueror/sidebar/module_manager.cpp
View file

@ -20,7 +20,7 @@
#include "module_manager.h"
#include <kdesktopfile.h>
#include <kio/netaccess.h>
#include <kio/deletejob.h>
#include <kconfig.h>
#include <kconfiggroup.h>
#include <kdebug.h>
@ -103,7 +103,7 @@ QString ModuleManager::moduleFullPath(const QString& fileName) const
return KGlobal::dirs()->locate("data", moduleDataPath(fileName));
}
void ModuleManager::rollbackToDefault(QWidget* parent)
void ModuleManager::rollbackToDefault()
{
const QString loc = KGlobal::dirs()->saveLocation("data", "konqsidebartng/");
QDir dir(loc);
@ -111,7 +111,8 @@ void ModuleManager::rollbackToDefault(QWidget* parent)
Q_FOREACH(const QString& subdir, dirEntries) {
if (subdir != "add") {
kDebug() << "Deleting" << (loc+subdir);
KIO::NetAccess::del(KUrl(loc+subdir), parent);
KIO::Job* job = KIO::del(KUrl(loc+subdir), KIO::HideProgressInfo);
job->exec();
}
}
m_config->writeEntry("DeletedModules", QStringList());

2
konqueror/sidebar/module_manager.h
View file

@ -51,7 +51,7 @@ public:
/// Returns the full path for a given module. TEMP HACK, TO BE REMOVED
QString moduleFullPath(const QString& fileName) const;
void rollbackToDefault(QWidget* parent);
void rollbackToDefault();
void setModuleName(const QString& fileName, const QString& moduleName);
void setModuleUrl(const QString& fileName, const KUrl& url);

2
konqueror/sidebar/sidebar_widget.cpp
View file

@ -215,7 +215,7 @@ void Sidebar_Widget::slotRollback()
{
if (KMessageBox::warningContinueCancel(this, i18n("<qt>This removes all your entries from the sidebar and adds the system default ones.<br /><b>This procedure is irreversible</b><br />Do you want to proceed?</qt>"))==KMessageBox::Continue)
{
m_moduleManager.rollbackToDefault(this);
m_moduleManager.rollbackToDefault();
QTimer::singleShot(0, this, SLOT(updateButtons()));
}
}

2
konqueror/sidebar/test/modulemanagertest.cpp
View file

@ -195,7 +195,7 @@ void ModuleManagerTest::testReAddGlobalModule()
void ModuleManagerTest::testRollback()
{
m_moduleManager->rollbackToDefault(0);
m_moduleManager->rollbackToDefault();
testListModules();
}