summaryrefslogtreecommitdiffstats
path: root/kaffeine/src/kaffeine.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kaffeine/src/kaffeine.cpp')
-rw-r--r--kaffeine/src/kaffeine.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/kaffeine/src/kaffeine.cpp b/kaffeine/src/kaffeine.cpp
index 9a83567..3c725df 100644
--- a/kaffeine/src/kaffeine.cpp
+++ b/kaffeine/src/kaffeine.cpp
@@ -59,7 +59,7 @@
#include <tdeversion.h>
#include <tqdir.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqtooltip.h>
#include <tqinputdialog.h>
#include <kurldrag.h>
@@ -154,8 +154,8 @@ Kaffeine::Kaffeine() : DCOPObject("KaffeineIface"),
//createStandardStatusBarAction();
createGUI("kaffeineui.rc");
- //statusBar()->insertItem(i18n("Entries: %1, Playtime: %2 (Total: %3, %4)").tqarg("0").tqarg("00:00:00").tqarg("0").tqarg("00:00:00"), 9, 0, true);
- //statusBar()->insertItem(i18n("Entries: %1, Playtime: %2").tqarg("0").tqarg("0:00:00"), 9, 0, true);
+ //statusBar()->insertItem(i18n("Entries: %1, Playtime: %2 (Total: %3, %4)").arg("0").arg("00:00:00").arg("0").arg("00:00:00"), 9, 0, true);
+ //statusBar()->insertItem(i18n("Entries: %1, Playtime: %2").arg("0").arg("0:00:00"), 9, 0, true);
//statusBar()->insertItem(i18n("No player"), 10, 0, true);
TQString stamp = locateLocal("appdata", "wizard_stamp_v0.7.1");
@@ -367,7 +367,7 @@ void Kaffeine::slotLoadPart(const TQString& desktopName)
KService::Ptr service = KService::serviceByDesktopName(desktopName);
if (!service)
{
- KMessageBox::detailedError(this, i18n("Loading of player part '%1' failed.").tqarg(desktopName), i18n("%1 not found in search path.").tqarg(TQString(desktopName)+ ".desktop"));
+ KMessageBox::detailedError(this, i18n("Loading of player part '%1' failed.").arg(desktopName), i18n("%1 not found in search path.").arg(TQString(desktopName)+ ".desktop"));
return;
}
@@ -387,7 +387,7 @@ void Kaffeine::slotLoadPart(const TQString& desktopName)
int error = 0;
m_mediaPart = KParts::ComponentFactory::createPartInstanceFromService<KaffeinePart>(service, m_playerContainer, service->name().ascii(), TQT_TQOBJECT(this), 0, m_engineParameters, &error);
if (error > 0) {
- KMessageBox::detailedError(this, i18n("Loading of player part '%1' failed.").tqarg(service->name()), KLibLoader::self()->lastErrorMessage());
+ KMessageBox::detailedError(this, i18n("Loading of player part '%1' failed.").arg(service->name()), KLibLoader::self()->lastErrorMessage());
}
else {
connect(m_mediaPart, TQT_SIGNAL(setWindowCaption(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeCaption(const TQString&)));
@@ -455,7 +455,7 @@ void Kaffeine::slotLoadingCanceled(const TQString& message)
delete m_mediaPart;
m_mediaPart = NULL;
}
- KMessageBox::detailedError(this, i18n("Loading of player part '%1' failed.").tqarg(name), message);
+ KMessageBox::detailedError(this, i18n("Loading of player part '%1' failed.").arg(name), message);
}
void Kaffeine::slotPlaybackFailed()
@@ -653,7 +653,7 @@ void Kaffeine::dropEvent(TQDropEvent* dev)
else
if (strcmp(dev->format(), "text/x-moz-url") == 0) // for mozilla drops
{
- TQByteArray data = dev->tqencodedData("text/plain");
+ TQByteArray data = dev->encodedData("text/plain");
TQString md(data);
load(md);
}
@@ -1087,7 +1087,7 @@ void Kaffeine::slotOpenFile()
KURL::List kurlList = KFileDialog::getOpenURLs(":kaffeine_openFile", fileFilter, 0, i18n("Open File(s)"));
for (KURL::List::Iterator it = kurlList.begin(); it != kurlList.end(); ++it)
- if ((*it).isLocalFile() && (*it).path().tqendsWith(".iso", false))
+ if ((*it).isLocalFile() && (*it).path().endsWith(".iso", false))
(*it).setProtocol("dvd");
TQStringList urlList = kurlList.toStringList();
@@ -1439,7 +1439,7 @@ TQString Kaffeine::askForOtherDevice(const TQString& type)
TQVBox* page = dialog->makeVBoxMainWidget();
page->setSpacing(5);
page->setMargin(5);
- new TQLabel(i18n("No %1 in drive, or wrong path to device.").tqarg(type), page);
+ new TQLabel(i18n("No %1 in drive, or wrong path to device.").arg(type), page);
new TQLabel(TQString("\n") + i18n("Please select correct drive:"), page);
DrivesCombo* drives = new DrivesCombo(page);
@@ -1557,7 +1557,7 @@ void Kaffeine::slotChangeStatusbar(const TQString& )
}
-void Kaffeine::slotChangePlaylisttqStatus(const TQString& )
+void Kaffeine::slotChangePlaylistStatus(const TQString& )
{
//statusBar()->changeItem(text, 9);
}
@@ -1591,7 +1591,7 @@ void Kaffeine::slotFakeKeyEvent()
}
}
-/** slots for meta to tqunicode encoding **/
+/** slots for meta to unicode encoding **/
void Kaffeine::slotUseAlternateEncoding(bool useEncoding)
{