From 59d9dbf810de71334e1173fa7dda59209c10032c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:29:36 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- src/dolphin.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/dolphin.cpp') diff --git a/src/dolphin.cpp b/src/dolphin.cpp index 2006089..cdeb847 100644 --- a/src/dolphin.cpp +++ b/src/dolphin.cpp @@ -52,7 +52,7 @@ #include #include -#include +#include #include #include "urlnavigator.h" @@ -395,7 +395,7 @@ void Dolphin::createFolder() // TODO: provide message type hint if (ok) { - statusBar->setMessage(i18n("Created folder %1.").tqarg(url.path()), + statusBar->setMessage(i18n("Created folder %1.").arg(url.path()), DolphinStatusBar::OperationCompleted); DolphinCommand command(DolphinCommand::CreateFolder, KURL::List(), url); @@ -405,11 +405,11 @@ void Dolphin::createFolder() // Creating of the folder has been failed. Check whether the creating // has been failed because a folder with the same name exists... if (KIO::NetAccess::exists(url, true, this)) { - statusBar->setMessage(i18n("A folder named %1 already exists.").tqarg(url.path()), + statusBar->setMessage(i18n("A folder named %1 already exists.").arg(url.path()), DolphinStatusBar::Error); } else { - statusBar->setMessage(i18n("Creating of folder %1 failed.").tqarg(url.path()), + statusBar->setMessage(i18n("Creating of folder %1 failed.").arg(url.path()), DolphinStatusBar::Error); } @@ -490,7 +490,7 @@ void Dolphin::createFile() const TQString destPath(viewURL.prettyURL() + "/" + KIO::encodeFileName(name)); const KURL destURL(destPath); if (KIO::NetAccess::exists(destURL, false, this)) { - statusBar->setMessage(i18n("A file named %1 already exists.").tqarg(name), + statusBar->setMessage(i18n("A file named %1 already exists.").arg(name), DolphinStatusBar::Error); return; } @@ -500,7 +500,7 @@ void Dolphin::createFile() KIO::CopyJob* job = KIO::copyAs(sourceURL, destURL); job->setDefaultPermissions(true); if (KIO::NetAccess::synchronousRun(job, this)) { - statusBar->setMessage(i18n("Created file %1.").tqarg(name), + statusBar->setMessage(i18n("Created file %1.").arg(name), DolphinStatusBar::OperationCompleted); KURL::List list; @@ -510,7 +510,7 @@ void Dolphin::createFile() } else { - statusBar->setMessage(i18n("Creating of file %1 failed.").tqarg(name), + statusBar->setMessage(i18n("Creating of file %1 failed.").arg(name), DolphinStatusBar::Error); } } @@ -539,11 +539,11 @@ void Dolphin::deleteItems() TQString text; if (itemCount > 1) { - text = i18n("Do you really want to delete the %1 selected items?").tqarg(itemCount); + text = i18n("Do you really want to delete the %1 selected items?").arg(itemCount); } else { const KURL& url = list.first(); - text = i18n("Do you really want to delete '%1'?").tqarg(url.fileName()); + text = i18n("Do you really want to delete '%1'?").arg(url.fileName()); } const bool del = KMessageBox::warningContinueCancel(this, @@ -642,7 +642,7 @@ void Dolphin::cut() m_clipboardContainsCutData = true; TQDragObject* data = new KURLDrag(m_activeView->selectedURLs(), widget()); - TQApplication::tqclipboard()->setData(data); + TQApplication::clipboard()->setData(data); } void Dolphin::copy() @@ -650,12 +650,12 @@ void Dolphin::copy() m_clipboardContainsCutData = false; TQDragObject* data = new KURLDrag(m_activeView->selectedURLs(), widget()); - TQApplication::tqclipboard()->setData(data); + TQApplication::clipboard()->setData(data); } void Dolphin::paste() { - TQClipboard* clipboard = TQApplication::tqclipboard(); + TQClipboard* clipboard = TQApplication::clipboard(); TQMimeSource* data = clipboard->data(); if (!KURLDrag::canDecode(data)) { return; @@ -703,7 +703,7 @@ void Dolphin::updatePasteAction() } TQString text(i18n("Paste")); - TQClipboard* clipboard = TQApplication::tqclipboard(); + TQClipboard* clipboard = TQApplication::clipboard(); TQMimeSource* data = clipboard->data(); if (KURLDrag::canDecode(data)) { pasteAction->setEnabled(true); @@ -715,7 +715,7 @@ void Dolphin::updatePasteAction() pasteAction->setText(i18n("Paste 1 File")); } else { - pasteAction->setText(i18n("Paste %1 Files").tqarg(count)); + pasteAction->setText(i18n("Paste %1 Files").arg(count)); } } else { @@ -1144,7 +1144,7 @@ void Dolphin::init() stateChanged("new_file"); setAutoSaveSettings(); - TQClipboard* clipboard = TQApplication::tqclipboard(); + TQClipboard* clipboard = TQApplication::clipboard(); connect(clipboard, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(updatePasteAction())); updatePasteAction(); -- cgit v1.2.1