summaryrefslogtreecommitdiffstats
path: root/src/gui/application
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/application')
-rw-r--r--src/gui/application/RosegardenGUIApp.cpp32
-rw-r--r--src/gui/application/RosegardenGUIView.cpp6
-rw-r--r--src/gui/application/StartupTester.cpp2
-rw-r--r--src/gui/application/main.cpp8
4 files changed, 24 insertions, 24 deletions
diff --git a/src/gui/application/RosegardenGUIApp.cpp b/src/gui/application/RosegardenGUIApp.cpp
index 7bfdfb1..268affe 100644
--- a/src/gui/application/RosegardenGUIApp.cpp
+++ b/src/gui/application/RosegardenGUIApp.cpp
@@ -2008,12 +2008,12 @@ void RosegardenGUIApp::saveGlobalProperties(KConfig *cfg)
TQString errMsg;
bool res = m_doc->saveDocument(tempname, errMsg);
if (!res) {
- if (errMsg)
+ if (!errMsg.isNull())
KMessageBox::error(this, i18n(TQString("Could not save document at %1\nError was : %2")
- .tqarg(tempname).tqarg(errMsg)));
+ .tqarg(tempname).tqarg(errMsg).ascii()));
else
KMessageBox::error(this, i18n(TQString("Could not save document at %1")
- .tqarg(tempname)));
+ .tqarg(tempname).ascii()));
}
}
}
@@ -2271,12 +2271,12 @@ void RosegardenGUIApp::slotFileSave()
bool res = m_doc->saveDocument(docFilePath, errMsg);
if (!res) {
- if (errMsg)
+ if (!errMsg.isNull())
KMessageBox::error(this, i18n(TQString("Could not save document at %1\nError was : %2")
- .tqarg(docFilePath).tqarg(errMsg)));
+ .tqarg(docFilePath).tqarg(errMsg).ascii()));
else
KMessageBox::error(this, i18n(TQString("Could not save document at %1")
- .tqarg(docFilePath)));
+ .tqarg(docFilePath).ascii()));
}
}
}
@@ -2294,7 +2294,7 @@ RosegardenGUIApp::getValidWriteFile(TQString descriptiveExtension,
// It's too bad there isn't this functionality within
// KFileDialog::getSaveFileName
- KFileDialog saveFileDialog(":ROSEGARDEN", descriptiveExtension,this, label, true);
+ KFileDialog saveFileDialog(TQString(":ROSEGARDEN"), descriptiveExtension, TQT_TQWIDGET(this), label.ascii(), true);
saveFileDialog.setOperationMode(KFileDialog::Saving);
if (m_doc) {
TQString saveFileName = m_doc->getAbsFilePath();
@@ -2319,7 +2319,7 @@ RosegardenGUIApp::getValidWriteFile(TQString descriptiveExtension,
//
if (!extension.isEmpty()) {
static TQRegExp rgFile("\\..{1,4}$");
- if (rgFile.match(name) == -1) {
+ if (rgFile.search(name) == -1) {
name += extension;
}
}
@@ -2374,12 +2374,12 @@ bool RosegardenGUIApp::slotFileSaveAs()
TQString errMsg;
bool res = m_doc->saveDocument(newName, errMsg);
if (!res) {
- if (errMsg)
+ if (!errMsg.isNull())
KMessageBox::error(this, i18n(TQString("Could not save document at %1\nError was : %2")
- .tqarg(newName).tqarg(errMsg)));
+ .tqarg(newName).tqarg(errMsg).ascii()));
else
KMessageBox::error(this, i18n(TQString("Could not save document at %1")
- .tqarg(newName)));
+ .tqarg(newName).ascii()));
} else {
@@ -7566,7 +7566,7 @@ RosegardenGUIApp::slotTutorial()
{
TQString exe = KStandardDirs::findExe( "x-www-browser" );
- if( exe )
+ if( !exe.isNull() )
{
KProcess *proc = new KProcess;
*proc << "x-www-browser";
@@ -7588,7 +7588,7 @@ RosegardenGUIApp::slotBugGuidelines()
{
TQString exe = KStandardDirs::findExe( "x-www-browser" );
- if( exe )
+ if( !exe.isNull() )
{
KProcess *proc = new KProcess;
*proc << "x-www-browser";
@@ -7751,12 +7751,12 @@ RosegardenGUIApp::slotSaveDefaultStudio()
TQString errMsg;
bool res = m_doc->saveDocument(autoloadFile, errMsg);
if (!res) {
- if (errMsg)
+ if (!errMsg.isNull())
KMessageBox::error(this, i18n(TQString("Could not auto-save document at %1\nError was : %2")
- .tqarg(autoloadFile).tqarg(errMsg)));
+ .tqarg(autoloadFile).tqarg(errMsg).ascii()));
else
KMessageBox::error(this, i18n(TQString("Could not auto-save document at %1")
- .tqarg(autoloadFile)));
+ .tqarg(autoloadFile).ascii()));
}
}
diff --git a/src/gui/application/RosegardenGUIView.cpp b/src/gui/application/RosegardenGUIView.cpp
index 83784f2..702e6db 100644
--- a/src/gui/application/RosegardenGUIView.cpp
+++ b/src/gui/application/RosegardenGUIView.cpp
@@ -844,7 +844,7 @@ void RosegardenGUIView::slotEditSegmentAudio(Segment *segment)
if (splitCommand.size() == 0) {
std::cerr << "RosegardenGUIView::slotEditSegmentAudio() - "
- << "external editor \"" << application.data()
+ << "external editor \"" << application.ascii()
<< "\" not found" << std::endl;
KMessageBox::sorry(this,
@@ -856,7 +856,7 @@ void RosegardenGUIView::slotEditSegmentAudio(Segment *segment)
TQFileInfo *appInfo = new TQFileInfo(splitCommand[0]);
if (appInfo->exists() == false || appInfo->isExecutable() == false) {
std::cerr << "RosegardenGUIView::slotEditSegmentAudio() - "
- << "can't execute \"" << splitCommand[0] << "\""
+ << "can't execute \"" << splitCommand[0].ascii() << "\""
<< std::endl;
return;
}
@@ -1516,7 +1516,7 @@ RosegardenGUIView::slotDroppedNewAudio(TQString audioDesc)
s >> trackId;
s >> time;
- std::cerr << "RosegardenGUIView::slotDroppedNewAudio: url " << url << ", trackId " << trackId << ", time " << time << std::endl;
+ std::cerr << "RosegardenGUIView::slotDroppedNewAudio: url " << url.ascii() << ", trackId " << trackId << ", time " << time << std::endl;
RosegardenGUIApp *app = RosegardenGUIApp::self();
AudioFileManager &aFM = getDocument()->getAudioFileManager();
diff --git a/src/gui/application/StartupTester.cpp b/src/gui/application/StartupTester.cpp
index 0c3eb90..7a7850b 100644
--- a/src/gui/application/StartupTester.cpp
+++ b/src/gui/application/StartupTester.cpp
@@ -235,7 +235,7 @@ StartupTester::slotHttpDone(bool error)
TQString latestVersion = lines[0];
std::cerr << "Comparing current version \"" << VERSION
- << "\" with latest version \"" << latestVersion << "\""
+ << "\" with latest version \"" << latestVersion.ascii() << "\""
<< std::endl;
if (isVersionNewerThan(latestVersion, VERSION)) {
emit newerVersionAvailable(latestVersion);
diff --git a/src/gui/application/main.cpp b/src/gui/application/main.cpp
index 51230e8..8d771d2 100644
--- a/src/gui/application/main.cpp
+++ b/src/gui/application/main.cpp
@@ -350,20 +350,20 @@ void testInstalledVersion()
TQString versionLocation = locate("appdata", "version.txt");
TQString installedVersion;
- if (versionLocation) {
+ if (!versionLocation.isNull()) {
TQFile versionFile(versionLocation);
if (versionFile.open(IO_ReadOnly)) {
TQTextStream text(&versionFile);
TQString s = text.readLine().stripWhiteSpace();
versionFile.close();
- if (s) {
+ if (!s.isNull()) {
if (s == VERSION) return;
installedVersion = s;
}
}
}
- if (installedVersion) {
+ if (!installedVersion.isNull()) {
KMessageBox::detailedError
(0,
@@ -724,7 +724,7 @@ int main(int argc, char *argv[])
TQLabel *image = new TQLabel(hb);
image->tqsetAlignment(TQt::AlignTop);
TQString iconFile = locate("appdata", "pixmaps/misc/welcome-icon.png");
- if (iconFile) {
+ if (!iconFile.isNull()) {
image->setPixmap(TQPixmap(iconFile));
}
TQLabel *label = new TQLabel(hb);
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-02 13:49:15 +0000