summaryrefslogtreecommitdiffstats
path: root/src/gui/editors/guitar
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/editors/guitar')
-rw-r--r--src/gui/editors/guitar/ChordMap.cpp4
-rw-r--r--src/gui/editors/guitar/ChordXmlHandler.cpp12
-rw-r--r--src/gui/editors/guitar/Fingering.cpp20
-rw-r--r--src/gui/editors/guitar/Fingering.h4
-rw-r--r--src/gui/editors/guitar/FingeringBox.cpp8
-rw-r--r--src/gui/editors/guitar/GuitarChordEditorDialog.cpp2
-rw-r--r--src/gui/editors/guitar/GuitarChordSelectorDialog.cpp6
-rw-r--r--src/gui/editors/guitar/NoteSymbols.h2
8 files changed, 29 insertions, 29 deletions
diff --git a/src/gui/editors/guitar/ChordMap.cpp b/src/gui/editors/guitar/ChordMap.cpp
index 64ea463..fad1871 100644
--- a/src/gui/editors/guitar/ChordMap.cpp
+++ b/src/gui/editors/guitar/ChordMap.cpp
@@ -26,7 +26,7 @@
#include "ChordMap.h"
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
namespace Rosegarden
{
@@ -201,7 +201,7 @@ bool ChordMap::saveDocument(const TQString& filename, bool userChordsOnly, TQStr
outStream << "</chords>\n";
outStream << "</rosegarden-chord-data>\n";
- return outStream.tqdevice()->status() == IO_Ok;
+ return outStream.device()->status() == IO_Ok;
}
int ChordMap::FILE_FORMAT_VERSION_MAJOR = 1;
diff --git a/src/gui/editors/guitar/ChordXmlHandler.cpp b/src/gui/editors/guitar/ChordXmlHandler.cpp
index d2f71b4..6802485 100644
--- a/src/gui/editors/guitar/ChordXmlHandler.cpp
+++ b/src/gui/editors/guitar/ChordXmlHandler.cpp
@@ -134,9 +134,9 @@ bool
ChordXmlHandler::error(const TQXmlParseException& exception)
{
m_errorString = TQString("%1 at line %2, column %3")
- .tqarg(exception.message())
- .tqarg(exception.lineNumber())
- .tqarg(exception.columnNumber());
+ .arg(exception.message())
+ .arg(exception.lineNumber())
+ .arg(exception.columnNumber());
return TQXmlDefaultHandler::error( exception );
}
@@ -144,9 +144,9 @@ bool
ChordXmlHandler::fatalError(const TQXmlParseException& exception)
{
m_errorString = TQString("%1 at line %2, column %3")
- .tqarg(exception.message())
- .tqarg(exception.lineNumber())
- .tqarg(exception.columnNumber());
+ .arg(exception.message())
+ .arg(exception.lineNumber())
+ .arg(exception.columnNumber());
return TQXmlDefaultHandler::fatalError( exception );
}
diff --git a/src/gui/editors/guitar/Fingering.cpp b/src/gui/editors/guitar/Fingering.cpp
index 7e5ecc4..59459e9 100644
--- a/src/gui/editors/guitar/Fingering.cpp
+++ b/src/gui/editors/guitar/Fingering.cpp
@@ -69,24 +69,24 @@ Fingering::getStartFret() const
bool
Fingering::hasBarre() const
{
- int lastStringtqStatus = m_strings[getNbStrings() - 1];
+ int lastStringStatus = m_strings[getNbStrings() - 1];
- return ((m_strings[0] > OPEN && m_strings[0] == lastStringtqStatus) ||
- (m_strings[1] > OPEN && m_strings[1] == lastStringtqStatus) ||
- (m_strings[2] > OPEN && m_strings[2] == lastStringtqStatus));
+ return ((m_strings[0] > OPEN && m_strings[0] == lastStringStatus) ||
+ (m_strings[1] > OPEN && m_strings[1] == lastStringStatus) ||
+ (m_strings[2] > OPEN && m_strings[2] == lastStringStatus));
}
Fingering::Barre
Fingering::getBarre() const
{
- int lastStringtqStatus = m_strings[getNbStrings() - 1];
+ int lastStringStatus = m_strings[getNbStrings() - 1];
Barre res;
- res.fret = lastStringtqStatus;
+ res.fret = lastStringStatus;
for(unsigned int i = 0; i < 3; ++i) {
- if (m_strings[i] > OPEN && m_strings[i] == lastStringtqStatus)
+ if (m_strings[i] > OPEN && m_strings[i] == lastStringStatus)
res.start = i;
break;
}
@@ -115,7 +115,7 @@ Fingering::parseFingering(const TQString& ch, TQString& errorString)
// NOTATION_DEBUG << "Fingering::parseFingering : '" << t << "' = MUTED\n";
fingering[idx] = MUTED;
} else {
- errorString = i18n("couldn't parse fingering '%1' in '%2'").tqarg(t).tqarg(ch);
+ errorString = i18n("couldn't parse fingering '%1' in '%2'").arg(t).arg(ch);
}
}
@@ -140,8 +140,8 @@ std::string Fingering::toString() const
bool operator<(const Fingering& a, const Fingering& b)
{
for(unsigned int i = 0; i < Fingering::DEFAULT_NB_STRINGS; ++i) {
- if (a.getStringtqStatus(i) != b.getStringtqStatus(i)) {
- return a.getStringtqStatus(i) < b.getStringtqStatus(i);
+ if (a.getStringStatus(i) != b.getStringStatus(i)) {
+ return a.getStringStatus(i) < b.getStringStatus(i);
}
}
return false;
diff --git a/src/gui/editors/guitar/Fingering.h b/src/gui/editors/guitar/Fingering.h
index b413d3b..32693dd 100644
--- a/src/gui/editors/guitar/Fingering.h
+++ b/src/gui/editors/guitar/Fingering.h
@@ -60,8 +60,8 @@ public:
* returns the fret number on which the string is pressed, or one of MUTED and OPEN
*
*/
- int getStringtqStatus(int stringNb) const { return m_strings[stringNb]; }
- void setStringtqStatus(int stringNb, int status) { m_strings[stringNb] = status; }
+ int getStringStatus(int stringNb) const { return m_strings[stringNb]; }
+ void setStringStatus(int stringNb, int status) { m_strings[stringNb] = status; }
unsigned int getStartFret() const;
unsigned int getNbStrings() const { return m_strings.size(); }
diff --git a/src/gui/editors/guitar/FingeringBox.cpp b/src/gui/editors/guitar/FingeringBox.cpp
index 6ca2c39..49058b2 100644
--- a/src/gui/editors/guitar/FingeringBox.cpp
+++ b/src/gui/editors/guitar/FingeringBox.cpp
@@ -219,16 +219,16 @@ FingeringBox::processMouseRelease(unsigned int release_string_num,
if(m_press_fret_num == 0) {
- int stringtqStatus = m_fingering.getStringtqStatus(m_press_string_num);
+ int stringStatus = m_fingering.getStringStatus(m_press_string_num);
- if (stringtqStatus == Guitar::Fingering::OPEN)
+ if (stringStatus == Guitar::Fingering::OPEN)
aVal = Guitar::Fingering::MUTED;
- else if (stringtqStatus > Guitar::Fingering::OPEN)
+ else if (stringStatus > Guitar::Fingering::OPEN)
aVal = Guitar::Fingering::OPEN;
}
- m_fingering.setStringtqStatus(m_press_string_num, aVal);
+ m_fingering.setStringStatus(m_press_string_num, aVal);
update();
}
diff --git a/src/gui/editors/guitar/GuitarChordEditorDialog.cpp b/src/gui/editors/guitar/GuitarChordEditorDialog.cpp
index 8a4fb3e..9658e5d 100644
--- a/src/gui/editors/guitar/GuitarChordEditorDialog.cpp
+++ b/src/gui/editors/guitar/GuitarChordEditorDialog.cpp
@@ -33,7 +33,7 @@
#include <klocale.h>
#include <kmessagebox.h>
#include <kstddirs.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
namespace Rosegarden
diff --git a/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp b/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp
index f401cd1..47cdf4c 100644
--- a/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp
+++ b/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp
@@ -30,7 +30,7 @@
#include "misc/Debug.h"
#include <tqlistbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcombobox.h>
#include <tqpushbutton.h>
#include <tqlabel.h>
@@ -416,7 +416,7 @@ GuitarChordSelectorDialog::parseChordFile(const TQString& chordFileName)
TQFile chordFile(chordFileName);
bool ok = chordFile.open(IO_ReadOnly);
if (!ok)
- KMessageBox::error(0, i18n("couldn't open file '%1'").tqarg(handler.errorString()));
+ KMessageBox::error(0, i18n("couldn't open file '%1'").arg(handler.errorString()));
TQXmlInputSource source(chordFile);
TQXmlSimpleReader reader;
@@ -425,7 +425,7 @@ GuitarChordSelectorDialog::parseChordFile(const TQString& chordFileName)
NOTATION_DEBUG << "GuitarChordSelectorDialog::parseChordFile() parsing " << chordFileName << endl;
reader.parse(source);
if (!ok)
- KMessageBox::error(0, i18n("couldn't parse chord dictionnary : %1").tqarg(handler.errorString()));
+ KMessageBox::error(0, i18n("couldn't parse chord dictionnary : %1").arg(handler.errorString()));
}
diff --git a/src/gui/editors/guitar/NoteSymbols.h b/src/gui/editors/guitar/NoteSymbols.h
index fa52a45..383e9c8 100644
--- a/src/gui/editors/guitar/NoteSymbols.h
+++ b/src/gui/editors/guitar/NoteSymbols.h
@@ -29,7 +29,7 @@
#include <utility>
-#include <tqbrush.h>
+#include <brush.h>
#include <tqpainter.h>
namespace Rosegarden
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-18 23:14:47 +0000