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

remove KStandardDirs

Browse Source
This commit is contained in:
Marco Martin 2014-02-26 16:03:43 +01:00
parent 777bf35984
commit 8b4c541cff
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/shell/interactiveconsole.cpp
View File

@ -28,6 +28,7 @@
#include <QSplitter> #include <QSplitter>
#include <QToolButton> #include <QToolButton>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QStandardPaths>
#include <QFileDialog> #include <QFileDialog>
#include <QAction> #include <QAction>
@ -37,7 +38,6 @@
#include <QMenu> #include <QMenu>
#include <KServiceTypeTrader> #include <KServiceTypeTrader>
#include <KStandardAction> #include <KStandardAction>
#include <KStandardDirs>
#include <KTextBrowser> #include <KTextBrowser>
#include <KTextEdit> #include <KTextEdit>
#include <KTextEditor/ConfigInterface> #include <KTextEditor/ConfigInterface>
@ -191,7 +191,7 @@ InteractiveConsole::InteractiveConsole(Plasma::Corona *corona, QWidget *parent)
connect(m_executeAction, SIGNAL(triggered()), this, SLOT(evaluateScript())); connect(m_executeAction, SIGNAL(triggered()), this, SLOT(evaluateScript()));
m_executeAction->setShortcut(Qt::CTRL + Qt::Key_E); m_executeAction->setShortcut(Qt::CTRL + Qt::Key_E);
const QString autosave = KStandardDirs::locateLocal("appdata", s_autosaveFileName); const QString autosave = QStandardPaths::writableLocation(QStandardPaths::DataLocation) + "/" + s_autosaveFileName;
if (QFile::exists(autosave)) { if (QFile::exists(autosave)) {
loadScript(autosave); loadScript(autosave);
} }
@ -271,7 +271,7 @@ void InteractiveConsole::reject()
void InteractiveConsole::onClose() void InteractiveConsole::onClose()
{ {
// need to save first! // need to save first!
const QString path = KStandardDirs::locateLocal("appdata", s_autosaveFileName); const QString path = QStandardPaths::writableLocation(QStandardPaths::DataLocation) + "/" + s_autosaveFileName;
m_closeWhenCompleted = true; m_closeWhenCompleted = true;
saveScript(QUrl::fromLocalFile(path)); saveScript(QUrl::fromLocalFile(path));
} }
@ -361,7 +361,8 @@ void InteractiveConsole::populateTemplatesMenu()
while (it.hasNext()) { while (it.hasNext()) {
it.next(); it.next();
KPluginInfo info(it.value()); KPluginInfo info(it.value());
const QString path = KStandardDirs::locate("data", package.defaultPackageRoot() + '/' + info.pluginName() + '/'); const QString path = QStandardPaths::locate(QStandardPaths::GenericDataLocation
, package.defaultPackageRoot() + '/' + info.pluginName() + '/');
if (!path.isEmpty()) { if (!path.isEmpty()) {
package.setPath(info.pluginName()); package.setPath(info.pluginName());
const QString scriptFile = package.filePath("mainscript"); const QString scriptFile = package.filePath("mainscript");
@ -378,7 +379,8 @@ void InteractiveConsole::loadTemplate(QAction *action)
Plasma::Package package = ShellPluginLoader::self()->loadPackage("Plasma/LayoutTemplate"); Plasma::Package package = ShellPluginLoader::self()->loadPackage("Plasma/LayoutTemplate");
const QString pluginName = action->data().toString(); const QString pluginName = action->data().toString();
const QString path = KStandardDirs::locate("data", package.defaultPackageRoot() + '/' + pluginName + '/'); const QString path = QStandardPaths::locate(QStandardPaths::GenericDataLocation
, package.defaultPackageRoot() + '/' + pluginName + '/');
if (!path.isEmpty()) { if (!path.isEmpty()) {
package.setPath(pluginName); package.setPath(pluginName);
const QString scriptFile = package.filePath("mainscript"); const QString scriptFile = package.filePath("mainscript");
@ -496,7 +498,7 @@ void InteractiveConsole::reenableEditor(KJob* job)
void InteractiveConsole::evaluateScript() void InteractiveConsole::evaluateScript()
{ {
//qDebug() << "evaluating" << m_editor->toPlainText(); //qDebug() << "evaluating" << m_editor->toPlainText();
const QString path = KStandardDirs::locateLocal("appdata", s_autosaveFileName); const QString path = QStandardPaths::writableLocation(QStandardPaths::DataLocation) + "/" + s_autosaveFileName;
saveScript(QUrl::fromLocalFile(path)); saveScript(QUrl::fromLocalFile(path));
m_output->moveCursor(QTextCursor::End); m_output->moveCursor(QTextCursor::End);