summaryrefslogtreecommitdiff
path: root/src/plugins/cpaster
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/cpaster')
-rw-r--r--src/plugins/cpaster/codepasterprotocol.cpp2
-rw-r--r--src/plugins/cpaster/codepastersettings.cpp2
-rw-r--r--src/plugins/cpaster/cpasterplugin.cpp17
-rw-r--r--src/plugins/cpaster/fileshareprotocol.cpp6
-rw-r--r--src/plugins/cpaster/fileshareprotocolsettingspage.cpp2
-rw-r--r--src/plugins/cpaster/pastebindotcomsettings.cpp2
-rw-r--r--src/plugins/cpaster/pasteview.cpp4
-rw-r--r--src/plugins/cpaster/protocol.cpp6
-rw-r--r--src/plugins/cpaster/settingspage.cpp2
9 files changed, 21 insertions, 22 deletions
diff --git a/src/plugins/cpaster/codepasterprotocol.cpp b/src/plugins/cpaster/codepasterprotocol.cpp
index 35572cb82d..d3fd0cf9b7 100644
--- a/src/plugins/cpaster/codepasterprotocol.cpp
+++ b/src/plugins/cpaster/codepasterprotocol.cpp
@@ -210,7 +210,7 @@ void CodePasterProtocol::fetchFinished()
void CodePasterProtocol::listFinished()
{
if (m_listReply->error()) {
- Core::ICore::instance()->messageManager()->printToOutputPane(m_listReply->errorString(), true);
+ Core::ICore::messageManager()->printToOutputPane(m_listReply->errorString(), true);
} else {
const QByteArray data = m_listReply->readAll();
const QStringList lines = QString::fromAscii(data).split(QLatin1Char('\n'));
diff --git a/src/plugins/cpaster/codepastersettings.cpp b/src/plugins/cpaster/codepastersettings.cpp
index 1653a3ee78..2d89043058 100644
--- a/src/plugins/cpaster/codepastersettings.cpp
+++ b/src/plugins/cpaster/codepastersettings.cpp
@@ -54,7 +54,7 @@ namespace CodePaster {
CodePasterSettingsPage::CodePasterSettingsPage()
{
- m_settings = Core::ICore::instance()->settings();
+ m_settings = Core::ICore::settings();
if (m_settings) {
const QString keyRoot = QLatin1String(settingsGroupC) + QLatin1Char('/');
m_host = m_settings->value(keyRoot + QLatin1String(serverKeyC), QString()).toString();
diff --git a/src/plugins/cpaster/cpasterplugin.cpp b/src/plugins/cpaster/cpasterplugin.cpp
index 568cf1a5a2..b206e2ece2 100644
--- a/src/plugins/cpaster/cpasterplugin.cpp
+++ b/src/plugins/cpaster/cpasterplugin.cpp
@@ -129,7 +129,7 @@ bool CodepasterPlugin::initialize(const QStringList &arguments, QString *errorMe
Core::Context globalcontext(Core::Constants::C_GLOBAL);
// Create the settings Page
- m_settings->fromSettings(Core::ICore::instance()->settings());
+ m_settings->fromSettings(Core::ICore::settings());
SettingsPage *settingsPage = new SettingsPage(m_settings);
addAutoReleasedObject(settingsPage);
@@ -153,7 +153,7 @@ bool CodepasterPlugin::initialize(const QStringList &arguments, QString *errorMe
}
//register actions
- Core::ActionManager *actionManager = ICore::instance()->actionManager();
+ Core::ActionManager *actionManager = ICore::actionManager();
Core::ActionContainer *toolsContainer =
actionManager->actionContainer(Core::Constants::M_TOOLS);
@@ -264,13 +264,13 @@ void CodepasterPlugin::post(QString data, const QString &mimeType)
if (dialogResult == QDialog::Accepted
&& m_settings->protocol != view.protocol()) {
m_settings->protocol = view.protocol();
- m_settings->toSettings(Core::ICore::instance()->settings());
+ m_settings->toSettings(Core::ICore::settings());
}
}
void CodepasterPlugin::fetch()
{
- PasteSelectDialog dialog(m_protocols, ICore::instance()->mainWindow());
+ PasteSelectDialog dialog(m_protocols, ICore::mainWindow());
dialog.setProtocol(m_settings->protocol);
if (dialog.exec() != QDialog::Accepted)
@@ -278,7 +278,7 @@ void CodepasterPlugin::fetch()
// Save new protocol in case user changed it.
if (m_settings->protocol != dialog.protocol()) {
m_settings->protocol = dialog.protocol();
- m_settings->toSettings(Core::ICore::instance()->settings());
+ m_settings->toSettings(Core::ICore::settings());
}
const QString pasteID = dialog.pasteId();
@@ -293,8 +293,7 @@ void CodepasterPlugin::finishPost(const QString &link)
{
if (m_settings->copyToClipboard)
QApplication::clipboard()->setText(link);
- ICore::instance()->messageManager()->printToOutputPane(link,
- m_settings->displayOutput);
+ ICore::messageManager()->printToOutputPane(link, m_settings->displayOutput);
}
// Extract the characters that can be used for a file name from a title
@@ -334,7 +333,7 @@ void CodepasterPlugin::finishFetch(const QString &titleDescription,
const QString &content,
bool error)
{
- Core::MessageManager *messageManager = ICore::instance()->messageManager();
+ Core::MessageManager *messageManager = ICore::messageManager();
// Failure?
if (error) {
messageManager->printToOutputPane(content, true);
@@ -351,7 +350,7 @@ void CodepasterPlugin::finishFetch(const QString &titleDescription,
// Default to "txt".
QByteArray byteContent = content.toUtf8();
QString suffix;
- if (const Core::MimeType mimeType = Core::ICore::instance()->mimeDatabase()->findByData(byteContent))
+ if (const Core::MimeType mimeType = Core::ICore::mimeDatabase()->findByData(byteContent))
suffix = mimeType.preferredSuffix();
if (suffix.isEmpty())
suffix = QLatin1String("txt");
diff --git a/src/plugins/cpaster/fileshareprotocol.cpp b/src/plugins/cpaster/fileshareprotocol.cpp
index 148f24db34..0795ab1ecd 100644
--- a/src/plugins/cpaster/fileshareprotocol.cpp
+++ b/src/plugins/cpaster/fileshareprotocol.cpp
@@ -62,7 +62,7 @@ FileShareProtocol::FileShareProtocol() :
m_settings(new FileShareProtocolSettings),
m_settingsPage(new FileShareProtocolSettingsPage(m_settings))
{
- m_settings->fromSettings(Core::ICore::instance()->settings());
+ m_settings->fromSettings(Core::ICore::settings());
}
FileShareProtocol::~FileShareProtocol()
@@ -214,11 +214,11 @@ void FileShareProtocol::paste(const QString &text,
saver.setResult(&writer);
}
if (!saver.finalize()) {
- Core::ICore::instance()->messageManager()->printToOutputPanePopup(saver.errorString());
+ Core::ICore::messageManager()->printToOutputPanePopup(saver.errorString());
return;
}
const QString msg = tr("Pasted: %1").arg(saver.fileName());
- Core::ICore::instance()->messageManager()->printToOutputPanePopup(msg);
+ Core::ICore::messageManager()->printToOutputPanePopup(msg);
}
} // namespace CodePaster
diff --git a/src/plugins/cpaster/fileshareprotocolsettingspage.cpp b/src/plugins/cpaster/fileshareprotocolsettingspage.cpp
index 3a7aefdd2d..1f3c7d6d27 100644
--- a/src/plugins/cpaster/fileshareprotocolsettingspage.cpp
+++ b/src/plugins/cpaster/fileshareprotocolsettingspage.cpp
@@ -142,7 +142,7 @@ void FileShareProtocolSettingsPage::apply()
const FileShareProtocolSettings newSettings = m_widget->settings();
if (newSettings != *m_settings) {
*m_settings = newSettings;
- m_settings->toSettings(Core::ICore::instance()->settings());
+ m_settings->toSettings(Core::ICore::settings());
}
}
} // namespace CodePaster
diff --git a/src/plugins/cpaster/pastebindotcomsettings.cpp b/src/plugins/cpaster/pastebindotcomsettings.cpp
index 064fb2ae29..d890a93f8e 100644
--- a/src/plugins/cpaster/pastebindotcomsettings.cpp
+++ b/src/plugins/cpaster/pastebindotcomsettings.cpp
@@ -44,7 +44,7 @@ static const char prefixKeyC[] = "Prefix";
namespace CodePaster {
PasteBinDotComSettings::PasteBinDotComSettings()
{
- m_settings = Core::ICore::instance()->settings();
+ m_settings = Core::ICore::settings();
if (m_settings) {
const QString rootKey = QLatin1String(groupC) + QLatin1Char('/');
m_hostPrefix = m_settings->value(rootKey + QLatin1String(prefixKeyC), QString()).toString();
diff --git a/src/plugins/cpaster/pasteview.cpp b/src/plugins/cpaster/pasteview.cpp
index 454d54653a..db11091dd3 100644
--- a/src/plugins/cpaster/pasteview.cpp
+++ b/src/plugins/cpaster/pasteview.cpp
@@ -137,7 +137,7 @@ int PasteView::showDialog()
m_ui.uiDescription->selectAll();
// (Re)store dialog size
- const QSettings *settings = Core::ICore::instance()->settings();
+ const QSettings *settings = Core::ICore::settings();
const QString rootKey = QLatin1String(groupC) + QLatin1Char('/');
const int h = settings->value(rootKey + QLatin1String(heightKeyC), height()).toInt();
const int defaultWidth = m_ui.uiPatchView->columnIndicator() + 50;
@@ -198,7 +198,7 @@ void PasteView::accept()
const Protocol::ContentType ct = Protocol::contentType(m_mimeType);
protocol->paste(data, ct, user(), comment(), description());
// Store settings and close
- QSettings *settings = Core::ICore::instance()->settings();
+ QSettings *settings = Core::ICore::settings();
settings->beginGroup(QLatin1String(groupC));
settings->setValue(QLatin1String(heightKeyC), height());
settings->setValue(QLatin1String(widthKeyC), width());
diff --git a/src/plugins/cpaster/protocol.cpp b/src/plugins/cpaster/protocol.cpp
index 2edc210426..02854e144d 100644
--- a/src/plugins/cpaster/protocol.cpp
+++ b/src/plugins/cpaster/protocol.cpp
@@ -150,7 +150,7 @@ bool Protocol::showConfigurationError(const Protocol *p,
showConfig = false;
if (!parent)
- parent = Core::ICore::instance()->mainWindow();
+ parent = Core::ICore::mainWindow();
const QString title = tr("%1 - Configuration Error").arg(p->name());
QMessageBox mb(QMessageBox::Warning, title, message, QMessageBox::Cancel, parent);
QPushButton *settingsButton = 0;
@@ -159,7 +159,7 @@ bool Protocol::showConfigurationError(const Protocol *p,
mb.exec();
bool rc = false;
if (mb.clickedButton() == settingsButton)
- rc = Core::ICore::instance()->showOptionsDialog(p->settingsPage()->category(),
+ rc = Core::ICore::showOptionsDialog(p->settingsPage()->category(),
p->settingsPage()->id(),
parent);
return rc;
@@ -224,7 +224,7 @@ bool NetworkProtocol::httpStatus(QString url, QString *errorMessage)
tr("Checking connection"),
tr("Connecting to %1...").arg(url),
QMessageBox::Cancel,
- Core::ICore::instance()->mainWindow());
+ Core::ICore::mainWindow());
connect(reply.data(), SIGNAL(finished()), &box, SLOT(close()));
QApplication::setOverrideCursor(Qt::WaitCursor);
box.exec();
diff --git a/src/plugins/cpaster/settingspage.cpp b/src/plugins/cpaster/settingspage.cpp
index 4ee70cc27d..81f22bca81 100644
--- a/src/plugins/cpaster/settingspage.cpp
+++ b/src/plugins/cpaster/settingspage.cpp
@@ -129,7 +129,7 @@ void SettingsPage::apply()
const Settings newSettings = m_widget->settings();
if (newSettings != *m_settings) {
*m_settings = newSettings;
- m_settings->toSettings(Core::ICore::instance()->settings());
+ m_settings->toSettings(Core::ICore::settings());
}
}
View Lorry Controller Status