summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 06:08:18 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 06:08:18 +0000
commit80ee419f074dc252449791628d4584b5c0ea0c9b (patch)
treefba229106f296da317a8f925f32d76841386c026
parentbb426283a6b45a18f99a8be445438e8f4deeea55 (diff)
downloadrosegarden-80ee419f074dc252449791628d4584b5c0ea0c9b.tar.gz
rosegarden-80ee419f074dc252449791628d4584b5c0ea0c9b.zip
rename the following methods:
tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/rosegarden@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--src/base/Clipboard.h2
-rw-r--r--src/base/ColourMap.h2
-rw-r--r--src/base/Composition.cpp12
-rw-r--r--src/base/Composition.h6
-rw-r--r--src/base/Event.cpp12
-rw-r--r--src/base/Event.h18
-rw-r--r--src/base/Instrument.h2
-rw-r--r--src/base/SegmentNotationHelper.cpp4
-rw-r--r--src/base/Selection.cpp14
-rw-r--r--src/base/Selection.h4
-rw-r--r--src/base/Sets.h6
-rw-r--r--src/commands/edit/CopyCommand.cpp2
-rw-r--r--src/commands/edit/PasteEventsCommand.h2
-rw-r--r--src/commands/edit/SetLyricsCommand.cpp4
-rw-r--r--src/commands/notation/AddFingeringMarkCommand.cpp4
-rw-r--r--src/commands/notation/InterpretCommand.cpp2
-rw-r--r--src/commands/notation/TieNotesCommand.cpp2
-rw-r--r--src/document/MultiViewCommandHistory.cpp8
-rw-r--r--src/document/RoseXmlHandler.cpp2
-rw-r--r--src/document/RosegardenGUIDoc.cpp2
-rw-r--r--src/document/io/LilyPondExporter.cpp34
-rw-r--r--src/document/io/LilyPondExporter.h2
-rw-r--r--src/gui/application/RosegardenGUIApp.cpp14
-rw-r--r--src/gui/application/RosegardenGUIApp.cpp.orig14
-rw-r--r--src/gui/application/main.cpp4
-rw-r--r--src/gui/configuration/HeadersConfigurationPage.cpp2
-rw-r--r--src/gui/dialogs/AudioManagerDialog.cpp2
-rw-r--r--src/gui/dialogs/AudioPluginDialog.cpp2
-rw-r--r--src/gui/dialogs/BeatsBarsDialog.cpp2
-rw-r--r--src/gui/dialogs/KeySignatureDialog.cpp2
-rw-r--r--src/gui/dialogs/LyricEditDialog.cpp2
-rw-r--r--src/gui/editors/eventlist/EventView.cpp2
-rw-r--r--src/gui/editors/guitar/Chord.h2
-rw-r--r--src/gui/editors/guitar/GuitarChordEditorDialog.cpp4
-rw-r--r--src/gui/editors/guitar/GuitarChordSelectorDialog.cpp8
-rw-r--r--src/gui/editors/matrix/MatrixCanvasView.cpp4
-rw-r--r--src/gui/editors/matrix/MatrixMover.cpp4
-rw-r--r--src/gui/editors/matrix/MatrixResizer.cpp2
-rw-r--r--src/gui/editors/matrix/MatrixSelector.cpp2
-rw-r--r--src/gui/editors/matrix/MatrixStaff.cpp2
-rw-r--r--src/gui/editors/matrix/MatrixView.cpp6
-rw-r--r--src/gui/editors/notation/NotationGroup.cpp2
-rw-r--r--src/gui/editors/notation/NotationGroup.h2
-rw-r--r--src/gui/editors/notation/NotationHLayout.cpp2
-rw-r--r--src/gui/editors/notation/NotationSelector.cpp14
-rw-r--r--src/gui/editors/notation/NotationStaff.cpp2
-rw-r--r--src/gui/editors/notation/NotationStrings.cpp2
-rw-r--r--src/gui/editors/notation/NotationView.cpp22
-rw-r--r--src/gui/editors/notation/NoteFontMap.cpp2
-rw-r--r--src/gui/editors/notation/NoteInserter.cpp4
-rw-r--r--src/gui/editors/notation/NotePixmapFactory.cpp4
-rw-r--r--src/gui/editors/notation/RestInserter.cpp4
-rw-r--r--src/gui/editors/notation/SystemFont.cpp2
-rw-r--r--src/gui/editors/parameters/InstrumentParameterBox.cpp6
-rw-r--r--src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp2
-rw-r--r--src/gui/editors/parameters/TrackParameterBox.cpp4
-rw-r--r--src/gui/editors/segment/segmentcanvas/CompositionModelImpl.cpp6
-rw-r--r--src/gui/editors/segment/segmentcanvas/CompositionView.cpp4
-rw-r--r--src/gui/editors/tempo/TempoView.cpp2
-rw-r--r--src/gui/general/PresetGroup.cpp2
-rw-r--r--src/gui/kdeext/KStartupLogo.cpp2
-rw-r--r--src/gui/kdeext/klearlook.cpp46
-rw-r--r--src/gui/rulers/ControlRuler.cpp2
-rw-r--r--src/gui/rulers/PropertyControlRuler.cpp4
-rw-r--r--src/gui/seqmanager/MidiFilterDialog.cpp28
-rw-r--r--src/gui/studio/ChangeRecordDeviceCommand.cpp4
-rw-r--r--src/sequencer/MmappedSegment.cpp2
-rw-r--r--src/sound/AlsaDriver.cpp12
-rw-r--r--src/sound/LADSPAPluginFactory.cpp4
-rw-r--r--src/sound/MidiFile.cpp2
70 files changed, 210 insertions, 210 deletions
diff --git a/src/base/Clipboard.h b/src/base/Clipboard.h
index 9400698..e205e33 100644
--- a/src/base/Clipboard.h
+++ b/src/base/Clipboard.h
@@ -35,7 +35,7 @@ class EventSelection;
* editing operations. Conceptually it has two "modes",
* single-segment and multiple-segment, although there's no particular
* distinction behind the scenes. The Clipboard owns all the segments
- * it tqcontains -- they should always be deep copies, not aliases.
+ * it contains -- they should always be deep copies, not aliases.
*/
class Clipboard
diff --git a/src/base/ColourMap.h b/src/base/ColourMap.h
index 1cb54dc..973c1e0 100644
--- a/src/base/ColourMap.h
+++ b/src/base/ColourMap.h
@@ -111,7 +111,7 @@ public:
*/
bool swapItems(unsigned int item_1, unsigned int item_2);
-// void tqreplace(ColourMap &input);
+// void replace(ColourMap &input);
/**
* This returns a const iterator pointing to m_map.begin()
diff --git a/src/base/Composition.cpp b/src/base/Composition.cpp
index 7c808e1..cde3a8b 100644
--- a/src/base/Composition.cpp
+++ b/src/base/Composition.cpp
@@ -102,7 +102,7 @@ Composition::ReferenceSegment::getDuration() const
}
Composition::ReferenceSegment::iterator
-Composition::ReferenceSegment::tqfind(Event *e)
+Composition::ReferenceSegment::find(Event *e)
{
return std::lower_bound
(begin(), end(), e, ReferenceSegmentEventCmp());
@@ -116,7 +116,7 @@ Composition::ReferenceSegment::insert(Event *e)
m_eventType, e->getType(), __FILE__, __LINE__);
}
- iterator i = tqfind(e);
+ iterator i = find(e);
if (i != end() && (*i)->getAbsoluteTime() == e->getAbsoluteTime()) {
@@ -133,7 +133,7 @@ Composition::ReferenceSegment::insert(Event *e)
void
Composition::ReferenceSegment::erase(Event *e)
{
- iterator i = tqfind(e);
+ iterator i = find(e);
if (i != end()) Impl::erase(i);
}
@@ -141,7 +141,7 @@ Composition::ReferenceSegment::iterator
Composition::ReferenceSegment::findTime(timeT t)
{
Event dummy("dummy", t, 0, MIN_SUBORDERING);
- return tqfind(&dummy);
+ return find(&dummy);
}
Composition::ReferenceSegment::iterator
@@ -150,7 +150,7 @@ Composition::ReferenceSegment::findRealTime(RealTime t)
Event dummy("dummy", 0, 0, MIN_SUBORDERING);
dummy.set<Bool>(NoAbsoluteTimeProperty, true);
setTempoTimestamp(&dummy, t);
- return tqfind(&dummy);
+ return find(&dummy);
}
Composition::ReferenceSegment::iterator
@@ -298,7 +298,7 @@ Composition::weakDetachSegment(Segment *segment)
}
bool
-Composition::tqcontains(const Segment *s)
+Composition::contains(const Segment *s)
{
iterator i = findSegment(s);
return (i != end());
diff --git a/src/base/Composition.h b/src/base/Composition.h
index 5a1b0ac..b2f80a3 100644
--- a/src/base/Composition.h
+++ b/src/base/Composition.h
@@ -254,7 +254,7 @@ public:
/**
* Test whether a Segment exists in this Composition.
*/
- bool tqcontains(const Segment *);
+ bool contains(const Segment *);
/**
* Return an iterator pointing at the given Segment, or end()
@@ -437,7 +437,7 @@ public:
}
/**
- * Return the starting and ending times of the bar that tqcontains
+ * Return the starting and ending times of the bar that contains
* time t.
*
* Will happily return theoretical timings for bars before the
@@ -906,7 +906,7 @@ protected:
std::string getEventType() const { return m_eventType; }
private:
- iterator tqfind(Event *e);
+ iterator find(Event *e);
std::string m_eventType;
};
diff --git a/src/base/Event.cpp b/src/base/Event.cpp
index c5608b7..e63e51b 100644
--- a/src/base/Event.cpp
+++ b/src/base/Event.cpp
@@ -118,7 +118,7 @@ Event::EventData::setTime(const PropertyName &name, timeT t, timeT deft)
}
PropertyMap *
-Event::tqfind(const PropertyName &name, PropertyMap::iterator &i)
+Event::find(const PropertyName &name, PropertyMap::iterator &i)
{
PropertyMap *map = m_data->m_properties;
@@ -142,7 +142,7 @@ Event::has(const PropertyName &name) const
#endif
PropertyMap::const_iterator i;
- const PropertyMap *map = tqfind(name, i);
+ const PropertyMap *map = find(name, i);
if (map) return true;
else return false;
}
@@ -156,7 +156,7 @@ Event::unset(const PropertyName &name)
unshare();
PropertyMap::iterator i;
- PropertyMap *map = tqfind(name, i);
+ PropertyMap *map = find(name, i);
if (map) {
delete i->second;
map->erase(i);
@@ -169,7 +169,7 @@ Event::getPropertyType(const PropertyName &name) const
// throw (NoData)
{
PropertyMap::const_iterator i;
- const PropertyMap *map = tqfind(name, i);
+ const PropertyMap *map = find(name, i);
if (map) {
return i->second->getType();
} else {
@@ -183,7 +183,7 @@ Event::getPropertyTypeAsString(const PropertyName &name) const
// throw (NoData)
{
PropertyMap::const_iterator i;
- const PropertyMap *map = tqfind(name, i);
+ const PropertyMap *map = find(name, i);
if (map) {
return i->second->getTypeName();
} else {
@@ -197,7 +197,7 @@ Event::getAsString(const PropertyName &name) const
// throw (NoData)
{
PropertyMap::const_iterator i;
- const PropertyMap *map = tqfind(name, i);
+ const PropertyMap *map = find(name, i);
if (map) {
return i->second->unparse();
} else {
diff --git a/src/base/Event.h b/src/base/Event.h
index 987929c..f236681 100644
--- a/src/base/Event.h
+++ b/src/base/Event.h
@@ -363,12 +363,12 @@ private:
}
// returned iterator (in i) only valid if return map value is non-zero
- PropertyMap *tqfind(const PropertyName &name, PropertyMap::iterator &i);
+ PropertyMap *find(const PropertyName &name, PropertyMap::iterator &i);
- const PropertyMap *tqfind(const PropertyName &name,
+ const PropertyMap *find(const PropertyName &name,
PropertyMap::const_iterator &i) const {
PropertyMap::iterator j;
- PropertyMap *map = const_cast<Event *>(this)->tqfind(name, j);
+ PropertyMap *map = const_cast<Event *>(this)->find(name, j);
i = j;
return map;
}
@@ -400,7 +400,7 @@ Event::get(const PropertyName &name, typename PropertyDefn<P>::basic_type &val)
#endif
PropertyMap::const_iterator i;
- const PropertyMap *map = tqfind(name, i);
+ const PropertyMap *map = find(name, i);
if (map) {
@@ -434,7 +434,7 @@ Event::get(const PropertyName &name) const
#endif
PropertyMap::const_iterator i;
- const PropertyMap *map = tqfind(name, i);
+ const PropertyMap *map = find(name, i);
if (map) {
@@ -464,7 +464,7 @@ Event::isPersistent(const PropertyName &name) const
// throw (NoData)
{
PropertyMap::const_iterator i;
- const PropertyMap *map = tqfind(name, i);
+ const PropertyMap *map = find(name, i);
if (map) {
return (map == m_data->m_properties);
@@ -481,7 +481,7 @@ Event::setPersistence(const PropertyName &name, bool persistent)
{
unshare();
PropertyMap::iterator i;
- PropertyMap *map = tqfind(name, i);
+ PropertyMap *map = find(name, i);
if (map) {
insert(*i, persistent);
@@ -506,7 +506,7 @@ Event::set(const PropertyName &name, typename PropertyDefn<P>::basic_type value,
unshare();
PropertyMap::iterator i;
- PropertyMap *map = tqfind(name, i);
+ PropertyMap *map = find(name, i);
if (map) {
bool persistentBefore = (map == m_data->m_properties);
@@ -547,7 +547,7 @@ Event::setMaybe(const PropertyName &name, typename PropertyDefn<P>::basic_type v
unshare();
PropertyMap::iterator i;
- PropertyMap *map = tqfind(name, i);
+ PropertyMap *map = find(name, i);
if (map) {
if (map == m_data->m_properties) return; // persistent, so ignore it
diff --git a/src/base/Instrument.h b/src/base/Instrument.h
index 4665486..fe1bc98 100644
--- a/src/base/Instrument.h
+++ b/src/base/Instrument.h
@@ -28,7 +28,7 @@
#include "XmlExportable.h"
#include "MidiProgram.h"
-// An Instrument connects a Track (which itself tqcontains
+// An Instrument connects a Track (which itself contains
// a list of Segments) to a device that can play that
// Track.
//
diff --git a/src/base/SegmentNotationHelper.cpp b/src/base/SegmentNotationHelper.cpp
index c942cf4..33dfe70 100644
--- a/src/base/SegmentNotationHelper.cpp
+++ b/src/base/SegmentNotationHelper.cpp
@@ -953,7 +953,7 @@ SegmentNotationHelper::insertSomething(iterator i, int duration,
if (needToSplit) {
//!!! This is not quite right for rests. Because they
- //tqreplace (rather than chording with) any events already
+ //replace (rather than chording with) any events already
//present, they don't need to be split in the case where
//their duration spans several note-events. Worry about
//that later, I guess. We're actually getting enough
@@ -1125,7 +1125,7 @@ SegmentNotationHelper::deleteNote(Event *e, bool collapseRest)
// or start after this one starts but before it ends, then we go
// for the delete-event-and-normalize-rests option. Otherwise
// (the notationally simpler case) we go for the
- // tqreplace-note-by-rest option. We still lose in the case where
+ // replace-note-by-rest option. We still lose in the case where
// another note starts before this one, overlaps it, but then also
// ends before it does -- but I think we can live with that.
diff --git a/src/base/Selection.cpp b/src/base/Selection.cpp
index 3402915..6e5ca2f 100644
--- a/src/base/Selection.cpp
+++ b/src/base/Selection.cpp
@@ -99,7 +99,7 @@ void EventSelection::addEvent(Event *e)
timeT eventDuration = e->getDuration();
if (eventDuration == 0) eventDuration = 1;
- if (tqcontains(e)) return;
+ if (contains(e)) return;
if (e->getAbsoluteTime() < m_beginTime || !m_haveRealStartTime) {
m_beginTime = e->getAbsoluteTime();
@@ -115,7 +115,7 @@ void EventSelection::addFromSelection(EventSelection *sel)
{
for (eventcontainer::iterator i = sel->getSegmentEvents().begin();
i != sel->getSegmentEvents().end(); ++i) {
- if (!tqcontains(*i)) addEvent(*i);
+ if (!contains(*i)) addEvent(*i);
}
}
@@ -134,7 +134,7 @@ void EventSelection::removeEvent(Event *e)
}
}
-bool EventSelection::tqcontains(Event *e) const
+bool EventSelection::contains(Event *e) const
{
std::pair<eventcontainer::const_iterator, eventcontainer::const_iterator>
interval = m_segmentEvents.equal_range(e);
@@ -148,7 +148,7 @@ bool EventSelection::tqcontains(Event *e) const
return false;
}
-bool EventSelection::tqcontains(const std::string &type) const
+bool EventSelection::contains(const std::string &type) const
{
for (eventcontainer::const_iterator i = m_segmentEvents.begin();
i != m_segmentEvents.end(); ++i) {
@@ -173,13 +173,13 @@ EventSelection::getRanges() const
while (j != k) {
- for (j = i; j != k && tqcontains(*j); ++j);
+ for (j = i; j != k && contains(*j); ++j);
if (j != i) {
ranges.push_back(RangeList::value_type(i, j));
}
- for (i = j; i != k && !tqcontains(*i); ++i);
+ for (i = j; i != k && !contains(*i); ++i);
j = i;
}
@@ -210,7 +210,7 @@ EventSelection::getRangeTimes() const
void
EventSelection::eventRemoved(const Segment *s, Event *e)
{
- if (s == &m_originalSegment /*&& tqcontains(e)*/) {
+ if (s == &m_originalSegment /*&& contains(e)*/) {
removeEvent(e);
}
}
diff --git a/src/base/Selection.h b/src/base/Selection.h
index c0a3c7b..93ce4b4 100644
--- a/src/base/Selection.h
+++ b/src/base/Selection.h
@@ -82,13 +82,13 @@ public:
* Test whether a given Event (in the Segment) is part of
* this selection.
*/
- bool tqcontains(Event *e) const;
+ bool contains(Event *e) const;
/**
* Return true if there are any events of the given type in
* this selection. Slow.
*/
- bool tqcontains(const std::string &eventType) const;
+ bool contains(const std::string &eventType) const;
/**
* Return the time at which the first Event in the selection
diff --git a/src/base/Sets.h b/src/base/Sets.h
index 9884207..4fe14d1 100644
--- a/src/base/Sets.h
+++ b/src/base/Sets.h
@@ -103,7 +103,7 @@ public:
Iterator getHighestNote() const { return m_highest; }
Iterator getLowestNote() const { return m_lowest; }
- virtual bool tqcontains(const Iterator &) const = 0;
+ virtual bool contains(const Iterator &) const = 0;
/// Return the pointed-to element, in Event form (public to work around gcc-2.95 bug)
static Event *getAsEvent(const Iterator &i);
@@ -175,7 +175,7 @@ public:
virtual int getMarkCountForChord() const;
virtual std::vector<Mark> getMarksForChord() const;
virtual std::vector<int> getPitches() const;
- virtual bool tqcontains(const Iterator &) const;
+ virtual bool contains(const Iterator &) const;
/**
* Return an iterator pointing to the previous note before this
@@ -622,7 +622,7 @@ GenericChord<Element, Container, singleStaff>::getPitches() const
template <class Element, class Container, bool singleStaff>
bool
-GenericChord<Element, Container, singleStaff>::tqcontains(const Iterator &itr) const
+GenericChord<Element, Container, singleStaff>::contains(const Iterator &itr) const
{
for (typename std::vector<typename Container::iterator>::const_iterator
i = std::vector<typename Container::iterator>::begin();
diff --git a/src/commands/edit/CopyCommand.cpp b/src/commands/edit/CopyCommand.cpp
index 34534db..3214e03 100644
--- a/src/commands/edit/CopyCommand.cpp
+++ b/src/commands/edit/CopyCommand.cpp
@@ -57,7 +57,7 @@ CopyCommand::CopyCommand(SegmentSelection &selection,
for (SegmentSelection::iterator i = selection.begin();
i != selection.end(); ++i) {
TQString newLabel = strtoqstr((*i)->getLabel());
- if (newLabel.tqcontains(i18n("(copied)"))) {
+ if (newLabel.contains(i18n("(copied)"))) {
m_sourceClipboard->newSegment(*i);
} else {
m_sourceClipboard->newSegment(*i)->
diff --git a/src/commands/edit/PasteEventsCommand.h b/src/commands/edit/PasteEventsCommand.h
index 090298b..66aea6d 100644
--- a/src/commands/edit/PasteEventsCommand.h
+++ b/src/commands/edit/PasteEventsCommand.h
@@ -60,7 +60,7 @@ public:
static PasteTypeMap getPasteTypes(); // type, descrip
/**
- * Construct a Paste command from a clipboard that already tqcontains
+ * Construct a Paste command from a clipboard that already contains
* the events to be pasted.
*/
PasteEventsCommand(Segment &segment,
diff --git a/src/commands/edit/SetLyricsCommand.cpp b/src/commands/edit/SetLyricsCommand.cpp
index f10d746..cfee2bf 100644
--- a/src/commands/edit/SetLyricsCommand.cpp
+++ b/src/commands/edit/SetLyricsCommand.cpp
@@ -106,7 +106,7 @@ SetLyricsCommand::execute()
std::pair<timeT, timeT> barRange = comp->getBarRange(barNo++);
TQString syllables = *bsi;
- syllables.tqreplace(TQRegExp("\\[\\d+\\] "), " ");
+ syllables.replace(TQRegExp("\\[\\d+\\] "), " ");
TQStringList syllableList = TQStringList::split(" ", syllables); // no empties
i = m_segment->findTime(barRange.first);
@@ -131,7 +131,7 @@ SetLyricsCommand::execute()
}
TQString syllable = *ssi;
- syllable.tqreplace(TQRegExp("~"), " ");
+ syllable.replace(TQRegExp("~"), " ");
syllable = syllable.simplifyWhiteSpace();
if (syllable == "")
continue;
diff --git a/src/commands/notation/AddFingeringMarkCommand.cpp b/src/commands/notation/AddFingeringMarkCommand.cpp
index 49ec03c..4715951 100644
--- a/src/commands/notation/AddFingeringMarkCommand.cpp
+++ b/src/commands/notation/AddFingeringMarkCommand.cpp
@@ -84,7 +84,7 @@ AddFingeringMarkCommand::modifySegment()
for (Chord::iterator ci = chord.begin();
ci != chord.end(); ++ci) {
- if (!m_selection->tqcontains(**ci))
+ if (!m_selection->contains(**ci))
continue;
if (attempt < 2 &&
@@ -104,7 +104,7 @@ AddFingeringMarkCommand::modifySegment()
break;
for (Chord::iterator ci = chord.begin();
ci != chord.end(); ++ci) {
- if (m_selection->tqcontains(**ci)) {
+ if (m_selection->contains(**ci)) {
Marks::removeMark
(***ci,
Marks::getFingeringMark(***ci));
diff --git a/src/commands/notation/InterpretCommand.cpp b/src/commands/notation/InterpretCommand.cpp
index 1652b2f..6d1b18b 100644
--- a/src/commands/notation/InterpretCommand.cpp
+++ b/src/commands/notation/InterpretCommand.cpp
@@ -154,7 +154,7 @@ InterpretCommand::applyTextDynamics()
}
if (t >= startTime &&
- (*i)->isa(Note::EventType) && m_selection->tqcontains(*i)) {
+ (*i)->isa(Note::EventType) && m_selection->contains(*i)) {
(*i)->set
<Int>(VELOCITY, velocity);
}
diff --git a/src/commands/notation/TieNotesCommand.cpp b/src/commands/notation/TieNotesCommand.cpp
index e65865d..ff7f3ab 100644
--- a/src/commands/notation/TieNotesCommand.cpp
+++ b/src/commands/notation/TieNotesCommand.cpp
@@ -59,7 +59,7 @@ TieNotesCommand::modifySegment()
Segment::iterator sj;
while ((sj = helper.getNextAdjacentNote(si, true, false)) !=
segment.end()) {
- if (!m_selection->tqcontains(*sj))
+ if (!m_selection->contains(*sj))
break;
(*si)->set<Bool>(TIED_FORWARD, true);
(*si)->unset(TIE_IS_ABOVE);
diff --git a/src/document/MultiViewCommandHistory.cpp b/src/document/MultiViewCommandHistory.cpp
index 04f1aa4..0cc94b2 100644
--- a/src/document/MultiViewCommandHistory.cpp
+++ b/src/document/MultiViewCommandHistory.cpp
@@ -322,8 +322,8 @@ MultiViewCommandHistory::updateButton(bool undo,
} else {
action->setEnabled(true);
TQString commandName = stack.top()->name();
- commandName.tqreplace(TQRegExp("&"), "");
- commandName.tqreplace(TQRegExp("\\.\\.\\.$"), "");
+ commandName.replace(TQRegExp("&"), "");
+ commandName.replace(TQRegExp("\\.\\.\\.$"), "");
if (undo)
text = i18n("Und&o %1").tqarg(commandName);
else
@@ -364,8 +364,8 @@ MultiViewCommandHistory::updateMenu(bool undo,
stack.pop();
TQString commandName = command->name();
- commandName.tqreplace(TQRegExp("&"), "");
- commandName.tqreplace(TQRegExp("\\.\\.\\.$"), "");
+ commandName.replace(TQRegExp("&"), "");
+ commandName.replace(TQRegExp("\\.\\.\\.$"), "");
TQString text;
if (undo)
diff --git a/src/document/RoseXmlHandler.cpp b/src/document/RoseXmlHandler.cpp
index fe99128..c378687 100644
--- a/src/document/RoseXmlHandler.cpp
+++ b/src/document/RoseXmlHandler.cpp
@@ -148,7 +148,7 @@ bool ConfigurationXmlSubHandler::characters(const TQString& chars)
if (m_propertyType == "RealTime") {
Rosegarden::RealTime rt;
- int sepIdx = ch.tqfind(',');
+ int sepIdx = ch.find(',');
rt.sec = ch.left(sepIdx).toInt();
rt.nsec = ch.mid(sepIdx + 1).toInt();
diff --git a/src/document/RosegardenGUIDoc.cpp b/src/document/RosegardenGUIDoc.cpp
index 88ce346..71c3c2a 100644
--- a/src/document/RosegardenGUIDoc.cpp
+++ b/src/document/RosegardenGUIDoc.cpp
@@ -1834,7 +1834,7 @@ RosegardenGUIDoc::insertRecordedMidi(const MappedComposition &mC)
// it's a note-off
- //NoteOnMap::iterator mi = m_noteOnEvents.tqfind((*i)->getPitch());
+ //NoteOnMap::iterator mi = m_noteOnEvents.find((*i)->getPitch());
PitchMap *pm = &m_noteOnEvents[device][channel];
PitchMap::iterator mi = pm->find(pitch);
diff --git a/src/document/io/LilyPondExporter.cpp b/src/document/io/LilyPondExporter.cpp
index f5e5ff9..b445a41 100644
--- a/src/document/io/LilyPondExporter.cpp
+++ b/src/document/io/LilyPondExporter.cpp
@@ -351,15 +351,15 @@ LilyPondExporter::protectIllegalChars(std::string inStr)
TQString tmpStr = strtoqstr(inStr);
- tmpStr.tqreplace(TQRegExp("&"), "\\&");
- tmpStr.tqreplace(TQRegExp("\\^"), "\\^");
- tmpStr.tqreplace(TQRegExp("%"), "\\%");
- tmpStr.tqreplace(TQRegExp("<"), "\\<");
- tmpStr.tqreplace(TQRegExp(">"), "\\>");
- tmpStr.tqreplace(TQRegExp("\\["), "");
- tmpStr.tqreplace(TQRegExp("\\]"), "");
- tmpStr.tqreplace(TQRegExp("\\{"), "");
- tmpStr.tqreplace(TQRegExp("\\}"), "");
+ tmpStr.replace(TQRegExp("&"), "\\&");
+ tmpStr.replace(TQRegExp("\\^"), "\\^");
+ tmpStr.replace(TQRegExp("%"), "\\%");
+ tmpStr.replace(TQRegExp("<"), "\\<");
+ tmpStr.replace(TQRegExp(">"), "\\>");
+ tmpStr.replace(TQRegExp("\\["), "");
+ tmpStr.replace(TQRegExp("\\]"), "");
+ tmpStr.replace(TQRegExp("\\{"), "");
+ tmpStr.replace(TQRegExp("\\}"), "");
//
// LilyPond uses utf8 encoding.
@@ -389,11 +389,11 @@ LilyPondExporter::write()
TQString baseName = nfo.fileName();
// sed LilyPond-choking chars out of the filename proper
- bool illegalFilename = (baseName.tqcontains(' ') || baseName.tqcontains("\\"));
- baseName.tqreplace(TQRegExp(" "), "");
- baseName.tqreplace(TQRegExp("\\\\"), "");
- baseName.tqreplace(TQRegExp("'"), "");
- baseName.tqreplace(TQRegExp("\""), "");
+ bool illegalFilename = (baseName.contains(' ') || baseName.contains("\\"));
+ baseName.replace(TQRegExp(" "), "");
+ baseName.replace(TQRegExp("\\\\"), "");
+ baseName.replace(TQRegExp("'"), "");
+ baseName.replace(TQRegExp("\""), "");
// cat back together
tmpName = dirName + '/' + baseName;
@@ -1181,7 +1181,7 @@ LilyPondExporter::write()
text += " ";
TQString syllable(strtoqstr(ssyllable));
- syllable.tqreplace(TQRegExp("\\s+"), "");
+ syllable.replace(TQRegExp("\\s+"), "");
text += "\"" + syllable + "\"";
haveLyric = true;
} else if (verse > lastVerse) {
@@ -1190,8 +1190,8 @@ LilyPondExporter::write()
}
}
- text.tqreplace( TQRegExp(" _+([^ ])") , " \\1" );
- text.tqreplace( "\"_\"" , " " );
+ text.replace( TQRegExp(" _+([^ ])") , " \\1" );
+ text.replace( "\"_\"" , " " );
// Do not create empty context for lyrics.
// Does this save some vertical space, as was written
diff --git a/src/document/io/LilyPondExporter.h b/src/document/io/LilyPondExporter.h
index a106243..5656f77 100644
--- a/src/document/io/LilyPondExporter.h
+++ b/src/document/io/LilyPondExporter.h
@@ -129,7 +129,7 @@ protected:
// compose an appropriate LilyPond representation for various Marks
std::string composeLilyMark(std::string eventMark, bool stemUp);
- // tqfind/protect illegal characters in user-supplied strings
+ // find/protect illegal characters in user-supplied strings
std::string protectIllegalChars(std::string inStr);
// return a string full of column tabs
diff --git a/src/gui/application/RosegardenGUIApp.cpp b/src/gui/application/RosegardenGUIApp.cpp
index 69cf83b..520d363 100644
--- a/src/gui/application/RosegardenGUIApp.cpp
+++ b/src/gui/application/RosegardenGUIApp.cpp
@@ -2288,7 +2288,7 @@ RosegardenGUIApp::getValidWriteFile(TQString descriptiveExtension,
// extract first extension listed in descriptiveExtension, for instance,
// ".rg" from "*.rg|Rosegarden files", or ".mid" from "*.mid *.midi|MIDI Files"
//
- TQString extension = descriptiveExtension.left(descriptiveExtension.tqfind('|')).mid(1).section(' ', 0, 0);
+ TQString extension = descriptiveExtension.left(descriptiveExtension.find('|')).mid(1).section(' ', 0, 0);
RG_DEBUG << "RosegardenGUIApp::getValidWriteFile() : extension = " << extension << endl;
@@ -2299,7 +2299,7 @@ RosegardenGUIApp::getValidWriteFile(TQString descriptiveExtension,
if (m_doc) {
TQString saveFileName = m_doc->getAbsFilePath();
// Show filename without the old extension
- int dotLoc = saveFileName.tqfindRev('.');
+ int dotLoc = saveFileName.findRev('.');
if (dotLoc >= int(saveFileName.length() - 4)) {
saveFileName = saveFileName.left(dotLoc);
}
@@ -3134,7 +3134,7 @@ void RosegardenGUIApp::slotTempoToSegmentLength(TQWidget* tqparent)
int beats = 0;
- // Get user to tell us how many beats or bars the segment tqcontains
+ // Get user to tell us how many beats or bars the segment contains
BeatsBarsDialog dialog(tqparent);
if (dialog.exec() == TQDialog::Accepted) {
beats = dialog.getQuantity(); // beats (or bars)
@@ -3723,8 +3723,8 @@ void RosegardenGUIApp::importProject(TQString filePath)
delete proc;
TQString rgFile = filePath;
- rgFile.tqreplace(TQRegExp(".rg.rgp$"), ".rg");
- rgFile.tqreplace(TQRegExp(".rgp$"), ".rg");
+ rgFile.replace(TQRegExp(".rg.rgp$"), ".rg");
+ rgFile.replace(TQRegExp(".rgp$"), ".rg");
openURL(rgFile);
}
@@ -4864,8 +4864,8 @@ void RosegardenGUIApp::slotExportProject()
return ;
TQString rgFile = fileName;
- rgFile.tqreplace(TQRegExp(".rg.rgp$"), ".rg");
- rgFile.tqreplace(TQRegExp(".rgp$"), ".rg");
+ rgFile.replace(TQRegExp(".rg.rgp$"), ".rg");
+ rgFile.replace(TQRegExp(".rgp$"), ".rg");
CurrentProgressDialog::freeze();
diff --git a/src/gui/application/RosegardenGUIApp.cpp.orig b/src/gui/application/RosegardenGUIApp.cpp.orig
index 26ee1ed..a5bf4bb 100644
--- a/src/gui/application/RosegardenGUIApp.cpp.orig
+++ b/src/gui/application/RosegardenGUIApp.cpp.orig
@@ -2288,7 +2288,7 @@ RosegardenGUIApp::getValidWriteFile(TQString descriptiveExtension,
// extract first extension listed in descriptiveExtension, for instance,
// ".rg" from "*.rg|Rosegarden files", or ".mid" from "*.mid *.midi|MIDI Files"
//
- TQString extension = descriptiveExtension.left(descriptiveExtension.tqfind('|')).mid(1).section(' ', 0, 0);
+ TQString extension = descriptiveExtension.left(descriptiveExtension.find('|')).mid(1).section(' ', 0, 0);
RG_DEBUG << "RosegardenGUIApp::getValidWriteFile() : extension = " << extension << endl;
@@ -2299,7 +2299,7 @@ RosegardenGUIApp::getValidWriteFile(TQString descriptiveExtension,
if (m_doc) {
TQString saveFileName = m_doc->getAbsFilePath();
// Show filename without the old extension
- int dotLoc = saveFileName.tqfindRev('.');
+ int dotLoc = saveFileName.findRev('.');
if (dotLoc >= int(saveFileName.length() - 4)) {
saveFileName = saveFileName.left(dotLoc);
}
@@ -3134,7 +3134,7 @@ void RosegardenGUIApp::slotTempoToSegmentLength(TQWidget* tqparent)
int beats = 0;
- // Get user to tell us how many beats or bars the segment tqcontains
+ // Get user to tell us how many beats or bars the segment contains
BeatsBarsDialog dialog(tqparent);
if (dialog.exec() == TQDialog::Accepted) {
beats = dialog.getQuantity(); // beats (or bars)
@@ -3723,8 +3723,8 @@ void RosegardenGUIApp::importProject(TQString filePath)
delete proc;
TQString rgFile = filePath;
- rgFile.tqreplace(TQRegExp(".rg.rgp$"), ".rg");
- rgFile.tqreplace(TQRegExp(".rgp$"), ".rg");
+ rgFile.replace(TQRegExp(".rg.rgp$"), ".rg");
+ rgFile.replace(TQRegExp(".rgp$"), ".rg");
openURL(rgFile);
}
@@ -4864,8 +4864,8 @@ void RosegardenGUIApp::slotExportProject()
return ;
TQString rgFile = fileName;
- rgFile.tqreplace(TQRegExp(".rg.rgp$"), ".rg");
- rgFile.tqreplace(TQRegExp(".rgp$"), ".rg");
+ rgFile.replace(TQRegExp(".rg.rgp$"), ".rg");
+ rgFile.replace(TQRegExp(".rgp$"), ".rg");
CurrentProgressDialog::freeze();
diff --git a/src/gui/application/main.cpp b/src/gui/application/main.cpp
index 8c5a5a9..c9ade00 100644
--- a/src/gui/application/main.cpp
+++ b/src/gui/application/main.cpp
@@ -98,7 +98,7 @@ disastrous side-effects.
automatically ordered by their absolute time. It's the usual
container for Events. A Segment has a starting time that can be
changed, and a duration that is based solely on the end time of
- the last Event it tqcontains. Note that in order to facilitate
+ the last Event it contains. Note that in order to facilitate
musical notation editing, we explicitly store silences as series
of rest Events; thus a Segment really should contain no gaps
between its Events. (This isn't checked anywhere and nothing will
@@ -153,7 +153,7 @@ The base directory also contains various music-related helper classes:
The NotationTypes classes also define important constants for the
names of common properties in Events. For example, the Note class
contains Note::EventType, which is the type of a note Event, and
- Note::EventRestType, the type of a rest Event; and Key tqcontains
+ Note::EventRestType, the type of a rest Event; and Key contains
Key::EventType, the type of a key change Event, KeyPropertyName,
the name of the property that defines the key change, and a set
of the valid strings for key changes.
diff --git a/src/gui/configuration/HeadersConfigurationPage.cpp b/src/gui/configuration/HeadersConfigurationPage.cpp
index d1e278e..4c550b6 100644
--- a/src/gui/configuration/HeadersConfigurationPage.cpp
+++ b/src/gui/configuration/HeadersConfigurationPage.cpp
@@ -235,7 +235,7 @@ HeadersConfigurationPage::slotAddNewProperty()
propertyName =
(i > 0 ? i18n("{new property %1}").tqarg(i) : i18n("{new property}"));
if (!m_doc->getComposition().getMetadata().has(qstrtostr(propertyName)) &&
- m_metadata->tqfindItem(propertyName,0) == 0)
+ m_metadata->findItem(propertyName,0) == 0)
break;
++i;
}
diff --git a/src/gui/dialogs/AudioManagerDialog.cpp b/src/gui/dialogs/AudioManagerDialog.cpp
index e283126..229f405 100644
--- a/src/gui/dialogs/AudioManagerDialog.cpp
+++ b/src/gui/dialogs/AudioManagerDialog.cpp
@@ -493,7 +493,7 @@ AudioManagerDialog::slotExportAudio()
// Check for a dot extension and append ".wav" if not found
//
- if (saveFile.tqcontains(".") == 0)
+ if (saveFile.contains(".") == 0)
saveFile += ".wav";
ProgressDialog progressDlg(i18n("Exporting audio file..."),
diff --git a/src/gui/dialogs/AudioPluginDialog.cpp b/src/gui/dialogs/AudioPluginDialog.cpp
index d6d7fce..9e07fd4 100644
--- a/src/gui/dialogs/AudioPluginDialog.cpp
+++ b/src/gui/dialogs/AudioPluginDialog.cpp
@@ -494,7 +494,7 @@ AudioPluginDialog::slotPluginSelected(int i)
m_insOuts->setText(i18n("%1 in, %2 out").tqarg(ins).tqarg(outs));
TQString shortName(plugin->getName());
- int parenIdx = shortName.tqfind(" (");
+ int parenIdx = shortName.find(" (");
if (parenIdx > 0) {
shortName = shortName.left(parenIdx);
if (shortName == "Null")
diff --git a/src/gui/dialogs/BeatsBarsDialog.cpp b/src/gui/dialogs/BeatsBarsDialog.cpp
index 6495682..0b22d6c 100644
--- a/src/gui/dialogs/BeatsBarsDialog.cpp
+++ b/src/gui/dialogs/BeatsBarsDialog.cpp
@@ -47,7 +47,7 @@ BeatsBarsDialog::BeatsBarsDialog(TQWidget* tqparent) :
TQHBox *hbox = makeHBoxMainWidget();
TQGroupBox *gbox = new TQGroupBox(1, Qt::Horizontal,
- i18n("The selected audio segment tqcontains:"), hbox);
+ i18n("The selected audio segment contains:"), hbox);
TQFrame *frame = new TQFrame(gbox);
TQGridLayout *tqlayout = new TQGridLayout(frame, 1, 2, 5, 5);
diff --git a/src/gui/dialogs/KeySignatureDialog.cpp b/src/gui/dialogs/KeySignatureDialog.cpp
index a649cc8..0d5335e 100644
--- a/src/gui/dialogs/KeySignatureDialog.cpp
+++ b/src/gui/dialogs/KeySignatureDialog.cpp
@@ -290,7 +290,7 @@ KeySignatureDialog::regenerateKeyCombo()
i != keys.end(); ++i) {
TQString name(strtoqstr(i->getName()));
- int space = name.tqfind(' ');
+ int space = name.find(' ');
if (space > 0)
name = name.left(space);
diff --git a/src/gui/dialogs/LyricEditDialog.cpp b/src/gui/dialogs/LyricEditDialog.cpp
index faae635..cdbf02e 100644
--- a/src/gui/dialogs/LyricEditDialog.cpp
+++ b/src/gui/dialogs/LyricEditDialog.cpp
@@ -219,7 +219,7 @@ LyricEditDialog::unparse()
(*i)->get<Int>(Text::LyricVersePropertyName, verse);
TQString syllable(strtoqstr(ssyllable));
- syllable.tqreplace(TQRegExp("\\s+"), "~");
+ syllable.replace(TQRegExp("\\s+"), "~");
m_texts[verse] += " " + syllable;
haveLyric[verse] = true;
diff --git a/src/gui/editors/eventlist/EventView.cpp b/src/gui/editors/eventlist/EventView.cpp
index 0d9b9c5..8e251ac 100644
--- a/src/gui/editors/eventlist/EventView.cpp
+++ b/src/gui/editors/eventlist/EventView.cpp
@@ -1271,7 +1271,7 @@ EventView::getCurrentSegment()
void
EventView::slotModifyFilter(int button)
{
- TQCheckBox *checkBox = dynamic_cast<TQCheckBox*>(m_filterGroup->tqfind(button));
+ TQCheckBox *checkBox = dynamic_cast<TQCheckBox*>(m_filterGroup->find(button));
if (checkBox == 0)
return ;
diff --git a/src/gui/editors/guitar/Chord.h b/src/gui/editors/guitar/Chord.h
index 0b6bc59..bd5bbaf 100644
--- a/src/gui/editors/guitar/Chord.h
+++ b/src/gui/editors/guitar/Chord.h
@@ -70,7 +70,7 @@ public:
TQString getExt() const { return m_ext; }
void setExt(TQString r) { m_ext = r.isEmpty() ? TQString() : r; }
- bool hasAltBass() const { return m_ext.tqcontains(ALT_BASS_REGEXP); }
+ bool hasAltBass() const { return m_ext.contains(ALT_BASS_REGEXP); }
Fingering getFingering() const { return m_fingering; }
void setFingering(Fingering f) { m_fingering = f; }
diff --git a/src/gui/editors/guitar/GuitarChordEditorDialog.cpp b/src/gui/editors/guitar/GuitarChordEditorDialog.cpp
index 57df4d6..58ec54d 100644
--- a/src/gui/editors/guitar/GuitarChordEditorDialog.cpp
+++ b/src/gui/editors/guitar/GuitarChordEditorDialog.cpp
@@ -75,13 +75,13 @@ GuitarChordEditorDialog::GuitarChordEditorDialog(Guitar::Chord& chord, const Gui
TQStringList rootList = m_chordMap.getRootList();
if (rootList.count() > 0) {
m_rootNotesList->insertStringList(rootList);
- m_rootNotesList->setCurrentItem(rootList.tqfindIndex(m_chord.getRoot()));
+ m_rootNotesList->setCurrentItem(rootList.findIndex(m_chord.getRoot()));
}
TQStringList extList = m_chordMap.getExtList(m_chord.getRoot());
if (extList.count() > 0) {
m_ext->insertStringList(extList);
- m_ext->setCurrentItem(extList.tqfindIndex(m_chord.getExt()));
+ m_ext->setCurrentItem(extList.findIndex(m_chord.getExt()));
}
}
diff --git a/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp b/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp
index 0f9ea8d..f564fdb 100644
--- a/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp
+++ b/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp
@@ -214,12 +214,12 @@ GuitarChordSelectorDialog::slotNewFingering()
m_chordMap.insert(newChord);
// populate lists
//
- if (!m_rootNotesList->tqfindItem(newChord.getRoot(), TQt::ExactMatch)) {
+ if (!m_rootNotesList->findItem(newChord.getRoot(), TQt::ExactMatch)) {
m_rootNotesList->insertItem(newChord.getRoot());
m_rootNotesList->sort();
}
- if (!m_chordExtList->tqfindItem(newChord.getExt(), TQt::ExactMatch)) {
+ if (!m_chordExtList->findItem(newChord.getExt(), TQt::ExactMatch)) {
m_chordExtList->insertItem(newChord.getExt());
m_chordExtList->sort();
}
@@ -280,7 +280,7 @@ GuitarChordSelectorDialog::setChord(const Guitar::Chord& chord)
// select the chord's root
//
m_rootNotesList->setCurrentItem(0);
- TQListBoxItem* correspondingRoot = m_rootNotesList->tqfindItem(chord.getRoot(), TQt::ExactMatch);
+ TQListBoxItem* correspondingRoot = m_rootNotesList->findItem(chord.getRoot(), TQt::ExactMatch);
if (correspondingRoot)
m_rootNotesList->setSelected(correspondingRoot, true);
@@ -303,7 +303,7 @@ GuitarChordSelectorDialog::setChord(const Guitar::Chord& chord)
chordExt = "";
m_chordExtList->setSelected(0, true);
} else {
- TQListBoxItem* correspondingExt = m_chordExtList->tqfindItem(chordExt, TQt::ExactMatch);
+ TQListBoxItem* correspondingExt = m_chordExtList->findItem(chordExt, TQt::ExactMatch);
if (correspondingExt)
m_chordExtList->setSelected(correspondingExt, true);
}
diff --git a/src/gui/editors/matrix/MatrixCanvasView.cpp b/src/gui/editors/matrix/MatrixCanvasView.cpp
index 5782164..ee0bab2 100644
--- a/src/gui/editors/matrix/MatrixCanvasView.cpp
+++ b/src/gui/editors/matrix/MatrixCanvasView.cpp
@@ -130,7 +130,7 @@ void MatrixCanvasView::contentsMousePressEvent(TQMouseEvent* e)
// TQCanvas::collisions() can be a bit optimistic and report
// items which are close to the point but not actually under it.
// So a little sanity check helps.
- if (!rect.tqcontains(p, true)) continue;
+ if (!rect.contains(p, true)) continue;
mel = &(mRect->getMatrixElement());
// std::cerr << "MatrixCanvasView::contentsMousePressEvent: collision with an existing matrix element" << std::endl;
@@ -198,7 +198,7 @@ void MatrixCanvasView::contentsMouseMoveEvent(TQMouseEvent* e)
QCanvasMatrixRectangle *mRect = 0;
if ((mRect = dynamic_cast<QCanvasMatrixRectangle*>(item))) {
- if (!mRect->rect().tqcontains(p, true))
+ if (!mRect->rect().contains(p, true))
continue;
mel = &(mRect->getMatrixElement());
MATRIX_DEBUG << "have element" << endl;
diff --git a/src/gui/editors/matrix/MatrixMover.cpp b/src/gui/editors/matrix/MatrixMover.cpp
index c482a3c..b525b4b 100644
--- a/src/gui/editors/matrix/MatrixMover.cpp
+++ b/src/gui/editors/matrix/MatrixMover.cpp
@@ -124,14 +124,14 @@ void MatrixMover::handleLeftButtonPress(timeT time,
EventSelection *newSelection;
if ((e->state() & TQt::ShiftButton) ||
- selection->tqcontains(m_currentElement->event()))
+ selection->contains(m_currentElement->event()))
newSelection = new EventSelection(*selection);
else
newSelection = new EventSelection(m_currentStaff->getSegment());
// if the selection already contains the event, remove it from the
// selection if shift is pressed
- if (selection->tqcontains(m_currentElement->event())){
+ if (selection->contains(m_currentElement->event())){
if (e->state() & TQt::ShiftButton)
newSelection->removeEvent(m_currentElement->event());
} else {
diff --git a/src/gui/editors/matrix/MatrixResizer.cpp b/src/gui/editors/matrix/MatrixResizer.cpp
index 75f5dbe..817b4c3 100644
--- a/src/gui/editors/matrix/MatrixResizer.cpp
+++ b/src/gui/editors/matrix/MatrixResizer.cpp
@@ -111,7 +111,7 @@ void MatrixResizer::handleLeftButtonPress(timeT,
EventSelection *newSelection;
if ((e->state() & TQt::ShiftButton) ||
- selection->tqcontains(m_currentElement->event()))
+ selection->contains(m_currentElement->event()))
newSelection = new EventSelection(*selection);
else
newSelection = new EventSelection(m_currentStaff->getSegment());
diff --git a/src/gui/editors/matrix/MatrixSelector.cpp b/src/gui/editors/matrix/MatrixSelector.cpp
index 14d6a0c..8d0f586 100644
--- a/src/gui/editors/matrix/MatrixSelector.cpp
+++ b/src/gui/editors/matrix/MatrixSelector.cpp
@@ -576,7 +576,7 @@ void MatrixSelector::setContextHelpFor(TQPoint p, bool ctrlPressed)
}
if ((mRect = dynamic_cast<QCanvasMatrixRectangle*>(item))) {
- if (! mRect->rect().tqcontains(p, true)) continue;
+ if (! mRect->rect().contains(p, true)) continue;
mel = &(mRect->getMatrixElement());
break;
}
diff --git a/src/gui/editors/matrix/MatrixStaff.cpp b/src/gui/editors/matrix/MatrixStaff.cpp
index 847c6f9..c7b1cfd 100644
--- a/src/gui/editors/matrix/MatrixStaff.cpp
+++ b/src/gui/editors/matrix/MatrixStaff.cpp
@@ -166,7 +166,7 @@ void MatrixStaff::positionElement(ViewElement* vel)
//
EventSelection *selection = m_view->getCurrentSelection();
- if (selection && selection->tqcontains(el->event()))
+ if (selection && selection->contains(el->event()))
el->setColour(GUIPalette::getColour(GUIPalette::SelectedElement));
else if (el->event()->has(BaseProperties::TRIGGER_SEGMENT_ID))
el->setColour(TQt::gray);
diff --git a/src/gui/editors/matrix/MatrixView.cpp b/src/gui/editors/matrix/MatrixView.cpp
index 680a31e..22db8a6 100644
--- a/src/gui/editors/matrix/MatrixView.cpp
+++ b/src/gui/editors/matrix/MatrixView.cpp
@@ -1156,7 +1156,7 @@ void MatrixView::setCurrentSelection(EventSelection* s, bool preview,
i != s->getSegmentEvents().end(); ++i) {
if (oldSelection && oldSelection->getSegment() == s->getSegment()
- && oldSelection->tqcontains(*i))
+ && oldSelection->contains(*i))
continue;
foundNewEvent = true;
@@ -1254,11 +1254,11 @@ void MatrixView::setCurrentSelection(EventSelection* s, bool preview,
if (s) {
stateChanged("have_selection", KXMLGUIClient::StateNoReverse);
- if (s->tqcontains(Note::EventType)) {
+ if (s->contains(Note::EventType)) {
stateChanged("have_notes_in_selection",
KXMLGUIClient::StateNoReverse);
}
- if (s->tqcontains(Note::EventRestType)) {
+ if (s->contains(Note::EventRestType)) {
stateChanged("have_rests_in_selection",
KXMLGUIClient::StateNoReverse);
}
diff --git a/src/gui/editors/notation/NotationGroup.cpp b/src/gui/editors/notation/NotationGroup.cpp
index caa7256..78525d9 100644
--- a/src/gui/editors/notation/NotationGroup.cpp
+++ b/src/gui/editors/notation/NotationGroup.cpp
@@ -185,7 +185,7 @@ NotationGroup::sample(const NELIterator &i, bool goingForwards)
}
bool
-NotationGroup::tqcontains(const NELIterator &i) const
+NotationGroup::contains(const NELIterator &i) const
{
NELIterator j(getInitialElement()),
k( getFinalElement());
diff --git a/src/gui/editors/notation/NotationGroup.h b/src/gui/editors/notation/NotationGroup.h
index ed1b7c2..9906747 100644
--- a/src/gui/editors/notation/NotationGroup.h
+++ b/src/gui/editors/notation/NotationGroup.h
@@ -92,7 +92,7 @@ public:
*/
void applyTuplingLine(NotationStaff &);
- virtual bool tqcontains(const NELIterator &) const;
+ virtual bool contains(const NELIterator &) const;
virtual bool sample(const NELIterator &i, bool goingForwards);
diff --git a/src/gui/editors/notation/NotationHLayout.cpp b/src/gui/editors/notation/NotationHLayout.cpp
index e00928c..be40dca 100644
--- a/src/gui/editors/notation/NotationHLayout.cpp
+++ b/src/gui/editors/notation/NotationHLayout.cpp
@@ -1653,7 +1653,7 @@ NotationHLayout::getSpacingDuration(Staff &staff,
if (d > 0 && (*i)->event()->getDuration() == 0) return d; // grace note
NotationElementList::iterator j(i), e(staff.getViewElementList()->end());
- while (j != e && (chord.tqcontains(j) || (*j)->getViewDuration() == 0))
+ while (j != e && (chord.contains(j) || (*j)->getViewDuration() == 0))
++j;
if (j != e) {
diff --git a/src/gui/editors/notation/NotationSelector.cpp b/src/gui/editors/notation/NotationSelector.cpp
index acd5604..6c6b04f 100644
--- a/src/gui/editors/notation/NotationSelector.cpp
+++ b/src/gui/editors/notation/NotationSelector.cpp
@@ -375,7 +375,7 @@ void NotationSelector::handleMouseRelease(timeT, int, TQMouseEvent *e)
// if the event was already part of the selection, we want to
// remove it
- if (m_selectionToMerge->tqcontains(m_clickedElement->event())) {
+ if (m_selectionToMerge->contains(m_clickedElement->event())) {
m_selectionToMerge->removeEvent(m_clickedElement->event());
} else {
m_selectionToMerge->addEvent(m_clickedElement->event());
@@ -431,7 +431,7 @@ void NotationSelector::drag(int x, int y, bool final)
return ;
EventSelection *selection = m_nParentView->getCurrentSelection();
- if (!selection || !selection->tqcontains(m_clickedElement->event())) {
+ if (!selection || !selection->contains(m_clickedElement->event())) {
selection = new EventSelection(m_selectedStaff->getSegment());
selection->addEvent(m_clickedElement->event());
}
@@ -614,7 +614,7 @@ void NotationSelector::dragFine(int x, int y, bool final)
EventSelection *selection = m_nParentView->getCurrentSelection();
if (!selection)
selection = new EventSelection(m_selectedStaff->getSegment());
- if (!selection->tqcontains(m_clickedElement->event()))
+ if (!selection->contains(m_clickedElement->event()))
selection->addEvent(m_clickedElement->event());
m_nParentView->setCurrentSelection(selection);
@@ -870,11 +870,11 @@ EventSelection* NotationSelector::getSelection()
x += nbw;
}
- if (!rect.tqcontains(x, int((*it)->y()), true)) {
+ if (!rect.contains(x, int((*it)->y()), true)) {
// #988217 (Notation: Special column of pixels
// prevents sweep selection) -- for notes, test
// again with centred x-coord
- if (!el.isNote() || !rect.tqcontains(x + nbw/2, int((*it)->y()), true)) {
+ if (!el.isNote() || !rect.contains(x + nbw/2, int((*it)->y()), true)) {
continue;
}
}
@@ -925,11 +925,11 @@ EventSelection* NotationSelector::getSelection()
// check if the element's rect
// is actually included in the selection rect.
//
- if (!rect.tqcontains(x, int((*it)->y()), true)) {
+ if (!rect.contains(x, int((*it)->y()), true)) {
// #988217 (Notation: Special column of pixels
// prevents sweep selection) -- for notes, test again
// with centred x-coord
- if (!el.isNote() || !rect.tqcontains(x + nbw/2, int((*it)->y()), true)) {
+ if (!el.isNote() || !rect.contains(x + nbw/2, int((*it)->y()), true)) {
continue;
}
}
diff --git a/src/gui/editors/notation/NotationStaff.cpp b/src/gui/editors/notation/NotationStaff.cpp
index 6d68063..729eddb 100644
--- a/src/gui/editors/notation/NotationStaff.cpp
+++ b/src/gui/editors/notation/NotationStaff.cpp
@@ -1819,7 +1819,7 @@ NotationStaff::isSelected(NotationElementList::iterator it)
{
const EventSelection *selection =
m_notationView->getCurrentSelection();
- return selection && selection->tqcontains((*it)->event());
+ return selection && selection->contains((*it)->event());
}
void
diff --git a/src/gui/editors/notation/NotationStrings.cpp b/src/gui/editors/notation/NotationStrings.cpp
index 0c73bbc..e4cae98 100644
--- a/src/gui/editors/notation/NotationStrings.cpp
+++ b/src/gui/editors/notation/NotationStrings.cpp
@@ -182,7 +182,7 @@ Note
NotationStrings::getNoteForName(TQString name)
{
std::string origName(qstrtostr(name));
- int pos = name.tqfind('-');
+ int pos = name.find('-');
int dots = 0;
if (pos > 0 && pos < 6 && pos < int(name.length()) - 1) {
diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp
index 64b49ec..707e85c 100644
--- a/src/gui/editors/notation/NotationView.cpp
+++ b/src/gui/editors/notation/NotationView.cpp
@@ -3147,7 +3147,7 @@ void NotationView::setCurrentSelection(EventSelection* s, bool preview,
i != s->getSegmentEvents().end(); ++i) {
if (oldSelection && oldSelection->getSegment() == s->getSegment()
- && oldSelection->tqcontains(*i))
+ && oldSelection->contains(*i))
continue;
foundNewEvent = true;
@@ -3829,12 +3829,12 @@ void NotationView::setMenuStates()
NOTATION_DEBUG << "NotationView::setMenuStates: Have selection; it's " << m_currentEventSelection << " covering range from " << m_currentEventSelection->getStartTime() << " to " << m_currentEventSelection->getEndTime() << " (" << m_currentEventSelection->getSegmentEvents().size() << " events)" << endl;
stateChanged("have_selection", KXMLGUIClient::StateNoReverse);
- if (m_currentEventSelection->tqcontains
+ if (m_currentEventSelection->contains
(Note::EventType)) {
stateChanged("have_notes_in_selection",
KXMLGUIClient::StateNoReverse);
}
- if (m_currentEventSelection->tqcontains
+ if (m_currentEventSelection->contains
(Note::EventRestType)) {
stateChanged("have_rests_in_selection",
KXMLGUIClient::StateNoReverse);
@@ -3955,7 +3955,7 @@ void NotationView::slotNoteAction()
const TQObject* sigSender = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender()));
NoteActionDataMap::Iterator noteAct =
- m_noteActionDataMap->tqfind(sigSender->name());
+ m_noteActionDataMap->find(sigSender->name());
if (noteAct != m_noteActionDataMap->end()) {
m_lastNoteAction = sigSender->name();
@@ -3987,7 +3987,7 @@ void NotationView::slotAddMark()
if (!m_currentEventSelection)
return ;
- MarkActionDataMap::Iterator i = m_markActionDataMap->tqfind(s->name());
+ MarkActionDataMap::Iterator i = m_markActionDataMap->find(s->name());
if (i != m_markActionDataMap->end()) {
addCommandToHistory(new AddMarkCommand
@@ -4000,7 +4000,7 @@ void NotationView::slotNoteChangeAction()
const TQObject* sigSender = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender()));
NoteChangeActionDataMap::Iterator noteAct =
- m_noteChangeActionDataMap->tqfind(sigSender->name());
+ m_noteChangeActionDataMap->find(sigSender->name());
if (noteAct != m_noteChangeActionDataMap->end()) {
slotSetNoteDurations((**noteAct).noteType, (**noteAct).notationOnly);
@@ -4032,7 +4032,7 @@ void NotationView::initActionDataMaps()
(NotationStrings::getReferenceName(Note(type, dots), rest == 1));
TQString shortName(refName);
- shortName.tqreplace(TQRegExp("-"), "_");
+ shortName.replace(TQRegExp("-"), "_");
TQString titleName
(NotationStrings::getNoteName(Note(type, dots)));
@@ -4041,7 +4041,7 @@ void NotationView::initActionDataMaps()
titleName.right(titleName.length() - 1);
if (rest) {
- titleName.tqreplace(TQRegExp(i18n("note")), i18n("rest"));
+ titleName.replace(TQRegExp(i18n("note")), i18n("rest"));
}
int keycode = keys[type - Note::Shortest];
@@ -4068,7 +4068,7 @@ void NotationView::initActionDataMaps()
TQString shortName(TQString("change_%1%2")
.tqarg(notationOnly ? "notation_" : "").tqarg(refName));
- shortName.tqreplace(TQRegExp("-"), "_");
+ shortName.replace(TQRegExp("-"), "_");
TQString titleName
(NotationStrings::getNoteName(Note(type, 0)));
@@ -5658,7 +5658,7 @@ void NotationView::slotSwitchFromRestToNote()
Note note(restInserter->getCurrentNote());
TQString actionName = NotationStrings::getReferenceName(note, false);
- actionName = actionName.tqreplace("-", "_");
+ actionName = actionName.replace("-", "_");
KRadioAction *action = dynamic_cast<KRadioAction *>
(actionCollection()->action(actionName));
@@ -5693,7 +5693,7 @@ void NotationView::slotSwitchFromNoteToRest()
Note note(noteInserter->getCurrentNote());
TQString actionName = NotationStrings::getReferenceName(note, true);
- actionName = actionName.tqreplace("-", "_");
+ actionName = actionName.replace("-", "_");
KRadioAction *action = dynamic_cast<KRadioAction *>
(actionCollection()->action(actionName));
diff --git a/src/gui/editors/notation/NoteFontMap.cpp b/src/gui/editors/notation/NoteFontMap.cpp
index 3a77411..9036f20 100644
--- a/src/gui/editors/notation/NoteFontMap.cpp
+++ b/src/gui/editors/notation/NoteFontMap.cpp
@@ -65,7 +65,7 @@ NoteFontMap::NoteFontMap(std::string name) :
if (!mapFileMixedInfo.isReadable()) {
TQString lowerName = strtoqstr(name).lower();
- lowerName.tqreplace(TQRegExp(" "), "_");
+ lowerName.replace(TQRegExp(" "), "_");
TQString mapFileLowerName = TQString("%1/mappings/%2.xml")
.tqarg(m_fontDirectory)
.tqarg(lowerName);
diff --git a/src/gui/editors/notation/NoteInserter.cpp b/src/gui/editors/notation/NoteInserter.cpp
index 3179534..2939f89 100644
--- a/src/gui/editors/notation/NoteInserter.cpp
+++ b/src/gui/editors/notation/NoteInserter.cpp
@@ -661,7 +661,7 @@ void NoteInserter::slotToggleDot()
m_noteDots = (m_noteDots) ? 0 : 1;
Note note(m_noteType, m_noteDots);
TQString actionName(NotationStrings::getReferenceName(note));
- actionName.tqreplace(TQRegExp("-"), "_");
+ actionName.replace(TQRegExp("-"), "_");
KAction *action = m_parentView->actionCollection()->action(actionName);
if (!action) {
std::cerr << "WARNING: No such action as " << actionName << std::endl;
@@ -689,7 +689,7 @@ void NoteInserter::slotRestsSelected()
{
Note note(m_noteType, m_noteDots);
TQString actionName(NotationStrings::getReferenceName(note, true));
- actionName.tqreplace(TQRegExp("-"), "_");
+ actionName.replace(TQRegExp("-"), "_");
KAction *action = m_parentView->actionCollection()->action(actionName);
if (!action) {
std::cerr << "WARNING: No such action as " << actionName << std::endl;
diff --git a/src/gui/editors/notation/NotePixmapFactory.cpp b/src/gui/editors/notation/NotePixmapFactory.cpp
index 365478a..e5f306b 100644
--- a/src/gui/editors/notation/NotePixmapFactory.cpp
+++ b/src/gui/editors/notation/NotePixmapFactory.cpp
@@ -2300,7 +2300,7 @@ NotePixmapFactory::makeTrackHeaderPixmap(
if (!text.isEmpty()) {
// String too long : cut it and replace last character by dots
int len = textLine.length();
- if (len > 1) textLine.tqreplace(len - 1, 1, i18n("..."));
+ if (len > 1) textLine.replace(len - 1, 1, i18n("..."));
}
} else {
textLine = getOneLine(text, width - charWidth / 2);
@@ -2344,7 +2344,7 @@ NotePixmapFactory::makeTrackHeaderPixmap(
if ((l == numberOfTextLines) && !text.isEmpty()) {
// String too long : cut it and replace last character by dots
int len = textLine.length();
- if (len > 1) textLine.tqreplace(len - 1, 1, i18n("..."));
+ if (len > 1) textLine.replace(len - 1, 1, i18n("..."));
}
m_p->drawText(charWidth / 4, lowerTextY, textLine);
diff --git a/src/gui/editors/notation/RestInserter.cpp b/src/gui/editors/notation/RestInserter.cpp
index 448b40a..9889253 100644
--- a/src/gui/editors/notation/RestInserter.cpp
+++ b/src/gui/editors/notation/RestInserter.cpp
@@ -127,7 +127,7 @@ void RestInserter::slotToggleDot()
m_noteDots = (m_noteDots) ? 0 : 1;
Note note(m_noteType, m_noteDots);
TQString actionName(NotationStrings::getReferenceName(note, true));
- actionName.tqreplace(TQRegExp("-"), "_");
+ actionName.replace(TQRegExp("-"), "_");
KAction *action = m_parentView->actionCollection()->action(actionName);
if (!action) {
std::cerr << "WARNING: No such action as " << actionName << std::endl;
@@ -140,7 +140,7 @@ void RestInserter::slotNotesSelected()
{
Note note(m_noteType, m_noteDots);
TQString actionName(NotationStrings::getReferenceName(note));
- actionName.tqreplace(TQRegExp(" "), "_");
+ actionName.replace(TQRegExp(" "), "_");
m_parentView->actionCollection()->action(actionName)->activate();
}
diff --git a/src/gui/editors/notation/SystemFont.cpp b/src/gui/editors/notation/SystemFont.cpp
index 77d3341..bf98e58 100644
--- a/src/gui/editors/notation/SystemFont.cpp
+++ b/src/gui/editors/notation/SystemFont.cpp
@@ -152,7 +152,7 @@ qfont:
if (family == name.lower())
return new SystemFontQt(qfont);
else {
- int bracket = family.tqfind(" [");
+ int bracket = family.find(" [");
if (bracket > 1)
family = family.left(bracket);
if (family == name.lower())
diff --git a/src/gui/editors/parameters/InstrumentParameterBox.cpp b/src/gui/editors/parameters/InstrumentParameterBox.cpp
index 610f9ed..f31c474 100644
--- a/src/gui/editors/parameters/InstrumentParameterBox.cpp
+++ b/src/gui/editors/parameters/InstrumentParameterBox.cpp
@@ -66,16 +66,16 @@ InstrumentParameterBox::InstrumentParameterBox(RosegardenGUIDoc *doc,
m_midiInstrumentParameters->setFont(m_font);
m_audioInstrumentParameters->setFont(m_font);
- bool tqcontains = false;
+ bool contains = false;
std::vector<InstrumentParameterBox*>::iterator it =
instrumentParamBoxes.begin();
for (; it != instrumentParamBoxes.end(); it++)
if ((*it) == this)
- tqcontains = true;
+ contains = true;
- if (!tqcontains)
+ if (!contains)
instrumentParamBoxes.push_back(this);
m_widgetStack->addWidget(m_midiInstrumentParameters);
diff --git a/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp b/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp
index 8186b07..3f0e543 100644
--- a/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp
+++ b/src/gui/editors/parameters/MIDIInstrumentParameterPanel.cpp
@@ -216,7 +216,7 @@ MIDIInstrumentParameterPanel::setupForInstrument(Instrument *instrument)
} else {
// remove trailing "(duplex)", "(read only)", "(write only)" etc
- connection.tqreplace(TQRegExp("\\s*\\([^)0-9]+\\)\\s*$"), "");
+ connection.replace(TQRegExp("\\s*\\([^)0-9]+\\)\\s*$"), "");
TQString text = i18n("[ %1 ]").tqarg(connection);
/*TQString origText(text);
diff --git a/src/gui/editors/parameters/TrackParameterBox.cpp b/src/gui/editors/parameters/TrackParameterBox.cpp
index b481a71..b9bdcdd 100644
--- a/src/gui/editors/parameters/TrackParameterBox.cpp
+++ b/src/gui/editors/parameters/TrackParameterBox.cpp
@@ -453,7 +453,7 @@ TrackParameterBox::populatePlaybackDeviceList()
DeviceId devId = device->getId();
if ((*it)->getType() == Instrument::SoftSynth) {
- iname.tqreplace("Synth plugin ", "");
+ iname.replace("Synth plugin ", "");
pname = "";
AudioPluginInstance *plugin = (*it)->getPlugin
(Instrument::SYNTH_PLUGIN_POSITION);
@@ -547,7 +547,7 @@ TrackParameterBox::populateRecordingDeviceList()
&& dev->isRecording()) {
TQString connection = strtoqstr(dev->getConnection());
// remove trailing "(duplex)", "(read only)", "(write only)" etc
- connection.tqreplace(TQRegExp("\\s*\\([^)0-9]+\\)\\s*$"), "");
+ connection.replace(TQRegExp("\\s*\\([^)0-9]+\\)\\s*$"), "");
m_recDevice->insertItem(connection);
m_recDeviceIds.push_back(dev->getId());
}
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.cpp b/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.cpp
index 388a4c1..eb79e45 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.cpp
+++ b/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.cpp
@@ -476,7 +476,7 @@ void CompositionModelImpl::slotAudioPreviewComplete(AudioPreviewUpdater* apu)
TQRect updateRect;
if (apData) {
- RG_DEBUG << "CompositionModelImpl::slotAudioPreviewComplete(" << apu << "): apData tqcontains " << apData->getValues().size() << " values already" << endl;
+ RG_DEBUG << "CompositionModelImpl::slotAudioPreviewComplete(" << apu << "): apData contains " << apData->getValues().size() << " values already" << endl;
unsigned int channels = 0;
const std::vector<float> &values = apu->getComputedValues(channels);
if (channels > 0) {
@@ -796,7 +796,7 @@ CompositionModel::itemcontainer CompositionModelImpl::getItemsAt(const TQPoint&
Segment* s = *i;
CompositionRect sr = computeSegmentRect(*s);
- if (sr.tqcontains(point)) {
+ if (sr.contains(point)) {
// RG_DEBUG << "CompositionModelImpl::getItemsAt() adding " << sr << " for segment " << s << endl;
CompositionItem item(new CompositionItemImpl(*s, sr));
unsigned int z = computeZForSegment(s);
@@ -1124,7 +1124,7 @@ CompositionRect CompositionModelImpl::computeSegmentRect(const Segment& s, bool
if (s.getType() == Segment::Audio) {
static TQRegExp re1("( *\\([^)]*\\))*$"); // (inserted) (copied) (etc)
static TQRegExp re2("\\.[^.]+$"); // filename suffix
- label.tqreplace(re1, "").tqreplace(re2, "");
+ label.replace(re1, "").replace(re2, "");
}
cr.setLabel(label);
diff --git a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
index 6faf230..d4e7909 100644
--- a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
+++ b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp
@@ -929,7 +929,7 @@ void CompositionView::drawAreaArtifacts(TQPainter * p, const TQRect& clipRect)
//
// Split line
//
- if (m_splitLinePos.x() > 0 && clipRect.tqcontains(m_splitLinePos)) {
+ if (m_splitLinePos.x() > 0 && clipRect.contains(m_splitLinePos)) {
p->save();
p->setPen(m_guideColor);
p->drawLine(m_splitLinePos.x(), m_splitLinePos.y(),
@@ -1128,7 +1128,7 @@ void CompositionView::drawRect(const TQRect& r, TQPainter *p, const TQRect& clip
// Paint using the small coordinates...
TQRect intersection = rect.intersect(clipRect);
- if (clipRect.tqcontains(rect)) {
+ if (clipRect.contains(rect)) {
p->drawRect(rect);
} else {
// draw only what's necessary
diff --git a/src/gui/editors/tempo/TempoView.cpp b/src/gui/editors/tempo/TempoView.cpp
index 1184ac3..f8b680d 100644
--- a/src/gui/editors/tempo/TempoView.cpp
+++ b/src/gui/editors/tempo/TempoView.cpp
@@ -692,7 +692,7 @@ TempoView::slotSaveOptions()
void
TempoView::slotModifyFilter(int button)
{
- TQCheckBox *checkBox = dynamic_cast<TQCheckBox*>(m_filterGroup->tqfind(button));
+ TQCheckBox *checkBox = dynamic_cast<TQCheckBox*>(m_filterGroup->find(button));
if (checkBox == 0)
return ;
diff --git a/src/gui/general/PresetGroup.cpp b/src/gui/general/PresetGroup.cpp
index 050c487..729671d 100644
--- a/src/gui/general/PresetGroup.cpp
+++ b/src/gui/general/PresetGroup.cpp
@@ -76,7 +76,7 @@ PresetGroup::PresetGroup() :
RG_DEBUG << "Failed to open " << presetFileName << endl;
- language.tqreplace(TQRegExp("_.*$"), "");
+ language.replace(TQRegExp("_.*$"), "");
presetFileName = TQString("%1/presets-%2.xml")
.tqarg(m_presetDirectory).tqarg(language);
diff --git a/src/gui/kdeext/KStartupLogo.cpp b/src/gui/kdeext/KStartupLogo.cpp
index e3edd9d..689c657 100644
--- a/src/gui/kdeext/KStartupLogo.cpp
+++ b/src/gui/kdeext/KStartupLogo.cpp
@@ -90,7 +90,7 @@ void KStartupLogo::paintEvent(TQPaintEvent*)
paint.setBrush(TQt::white);
//TQString version(VERSION);
- //int sepIdx = version.tqfind("-");
+ //int sepIdx = version.find("-");
TQString versionLabel(VERSION);
//TQString("R%1 v%2").tqarg(version.left(sepIdx)).tqarg(version.mid(sepIdx + 1));
int versionWidth = metrics.width(versionLabel);
diff --git a/src/gui/kdeext/klearlook.cpp b/src/gui/kdeext/klearlook.cpp
index cdf8904..17d37ad 100644
--- a/src/gui/kdeext/klearlook.cpp
+++ b/src/gui/kdeext/klearlook.cpp
@@ -135,14 +135,14 @@ static bool kickerIsTrans() {
line = stream.readLine();
if ( inGen ) {
- if ( 0 == line.tqfind( "Transparent=" ) ) // Found it!
+ if ( 0 == line.find( "Transparent=" ) ) // Found it!
{
- if ( -1 != line.tqfind( "true" ) )
+ if ( -1 != line.find( "true" ) )
trans = true;
stop = true;
} else if ( line[ 0 ] == TQChar( '[' ) ) // Then wasn't in General section...
stop = true;
- } else if ( 0 == line.tqfind( "[General]" ) )
+ } else if ( 0 == line.find( "[General]" ) )
inGen = true;
}
cfgFile.close();
@@ -2718,7 +2718,7 @@ void KlearlookStyle::tqdrawControl(
TQString text = mi->text();
if ( !text.isNull() ) {
- int t = text.tqfind( '\t' );
+ int t = text.find( '\t' );
// draw accelerator/tab-text
if ( t >= 0 ) {
@@ -3522,7 +3522,7 @@ TQSize KlearlookStyle::tqsizeFromContents( ContentsType t,
}
}
- if ( !mi->text().isNull() && ( mi->text().tqfind( '\t' ) >= 0 ) ) {
+ if ( !mi->text().isNull() && ( mi->text().find( '\t' ) >= 0 ) ) {
w += itemHMargin + itemFrame * 2 + 7;
} else if ( mi->popup() ) {
w += 2 * arrowHMargin;
@@ -3898,9 +3898,9 @@ bool KlearlookStyle::redrawHoverWidget() {
tqvisualRect( subRect( SR_RadioButtonFocusRect, rb ), rb ).width() +
tqpixelMetric( PM_ExclusiveIndicatorWidth ) + 4, hoverWidget->height() );
- hover = rect.tqcontains( cursor ) ? HOVER_RADIO : HOVER_NONE;
- return ( HOVER_NONE != hover && !rect.tqcontains( oldCursor ) ) ||
- ( HOVER_NONE == hover && rect.tqcontains( oldCursor ) );
+ hover = rect.contains( cursor ) ? HOVER_RADIO : HOVER_NONE;
+ return ( HOVER_NONE != hover && !rect.contains( oldCursor ) ) ||
+ ( HOVER_NONE == hover && rect.contains( oldCursor ) );
} else {
TQCheckBox *cb = dynamic_cast<TQCheckBox *>( hoverWidget );
@@ -3909,9 +3909,9 @@ bool KlearlookStyle::redrawHoverWidget() {
tqvisualRect( subRect( SR_CheckBoxFocusRect, cb ), cb ).width() +
tqpixelMetric( PM_IndicatorWidth ) + 4, hoverWidget->height() );
- hover = rect.tqcontains( cursor ) ? HOVER_CHECK : HOVER_NONE;
- return ( HOVER_NONE != hover && !rect.tqcontains( oldCursor ) ) ||
- ( HOVER_NONE == hover && rect.tqcontains( oldCursor ) );
+ hover = rect.contains( cursor ) ? HOVER_CHECK : HOVER_NONE;
+ return ( HOVER_NONE != hover && !rect.contains( oldCursor ) ) ||
+ ( HOVER_NONE == hover && rect.contains( oldCursor ) );
} else {
TQScrollBar *sb = dynamic_cast<TQScrollBar *>( hoverWidget );
@@ -3928,21 +3928,21 @@ bool KlearlookStyle::redrawHoverWidget() {
slider.moveLeft( slider.x() + widgetZero.x() );
slider.moveTop( slider.y() + widgetZero.y() );
- if ( slider.tqcontains( cursor ) )
+ if ( slider.contains( cursor ) )
hover = HOVER_SB_SLIDER;
- else if ( subline.tqcontains( cursor ) )
+ else if ( subline.contains( cursor ) )
hover = HOVER_SB_SUB;
- else if ( addline.tqcontains( cursor ) )
+ else if ( addline.contains( cursor ) )
hover = HOVER_SB_ADD;
else
hover = HOVER_NONE;
- return ( HOVER_SB_SLIDER == hover && !slider.tqcontains( oldCursor ) ) ||
- ( HOVER_SB_SLIDER != hover && slider.tqcontains( oldCursor ) ) ||
- ( HOVER_SB_SUB == hover && !subline.tqcontains( oldCursor ) ) ||
- ( HOVER_SB_SUB != hover && subline.tqcontains( oldCursor ) ) ||
- ( HOVER_SB_ADD == hover && !addline.tqcontains( oldCursor ) ) ||
- ( HOVER_SB_ADD != hover && addline.tqcontains( oldCursor ) );
+ return ( HOVER_SB_SLIDER == hover && !slider.contains( oldCursor ) ) ||
+ ( HOVER_SB_SLIDER != hover && slider.contains( oldCursor ) ) ||
+ ( HOVER_SB_SUB == hover && !subline.contains( oldCursor ) ) ||
+ ( HOVER_SB_SUB != hover && subline.contains( oldCursor ) ) ||
+ ( HOVER_SB_ADD == hover && !addline.contains( oldCursor ) ) ||
+ ( HOVER_SB_ADD != hover && addline.contains( oldCursor ) );
} else {
#if KDE_VERSION >= 0x30400
TQToolButton *tb = dynamic_cast<TQToolButton *>( hoverWidget );
@@ -3968,7 +3968,7 @@ bool KlearlookStyle::redrawHoverWidget() {
int s = 0;
bool redraw = false;
- hover = rect.tqcontains( cursor ) ? HOVER_HEADER : HOVER_NONE;
+ hover = rect.contains( cursor ) ? HOVER_HEADER : HOVER_NONE;
hoverSect = TQTC_NO_SECT;
for ( s = 0; s < hd->count() && ( TQTC_NO_SECT == hoverSect || !redraw ); ++s ) {
@@ -3977,13 +3977,13 @@ bool KlearlookStyle::redrawHoverWidget() {
r.moveLeft( r.x() + widgetZero.x() );
r.moveTop( r.y() + widgetZero.y() );
- bool hasNew = r.tqcontains( cursor );
+ bool hasNew = r.contains( cursor );
if ( hasNew )
hoverSect = s;
if ( !redraw ) {
- bool hasOld = r.tqcontains( oldCursor );
+ bool hasOld = r.contains( oldCursor );
if ( ( hasNew && !hasOld ) || ( !hasNew && hasOld ) )
redraw = true;
diff --git a/src/gui/rulers/ControlRuler.cpp b/src/gui/rulers/ControlRuler.cpp
index ef61c50..469bf1b 100644
--- a/src/gui/rulers/ControlRuler.cpp
+++ b/src/gui/rulers/ControlRuler.cpp
@@ -231,7 +231,7 @@ void ControlRuler::contentsMousePressEvent(TQMouseEvent* e)
}
}
- if (topItem && !m_selectedItems.tqcontains(topItem)) { // select the top item
+ if (topItem && !m_selectedItems.contains(topItem)) { // select the top item
m_selectedItems << topItem;
topItem->setSelected(true);
topItem->handleMouseButtonPress(e);
diff --git a/src/gui/rulers/PropertyControlRuler.cpp b/src/gui/rulers/PropertyControlRuler.cpp
index d91a515..e832907 100644
--- a/src/gui/rulers/PropertyControlRuler.cpp
+++ b/src/gui/rulers/PropertyControlRuler.cpp
@@ -380,7 +380,7 @@ PropertyControlRuler::drawPropertyLine(timeT startTime,
EventSelection selection(*m_segment, startTime, endTime, true);
PropertyPattern pattern = DecrescendoPattern;
- bool haveNotes = selection.tqcontains(Note::EventType);
+ bool haveNotes = selection.contains(Note::EventType);
if (haveNotes) {
@@ -408,7 +408,7 @@ PropertyControlRuler::selectAllProperties()
/*
for(Segment::iterator i = m_segment.begin();
i != m_segment.end(); ++i)
- if (!m_eventSelection->tqcontains(*i)) m_eventSelection->addEvent(*i);
+ if (!m_eventSelection->contains(*i)) m_eventSelection->addEvent(*i);
*/
clearSelectedItems();
diff --git a/src/gui/seqmanager/MidiFilterDialog.cpp b/src/gui/seqmanager/MidiFilterDialog.cpp
index dfd2017..3a8eec0 100644
--- a/src/gui/seqmanager/MidiFilterDialog.cpp
+++ b/src/gui/seqmanager/MidiFilterDialog.cpp
@@ -141,46 +141,46 @@ MidiFilterDialog::slotApply()
MidiFilter thruFilter = 0,
recordFilter = 0;
- if (dynamic_cast<TQCheckBox*>(m_thruBox->tqfind(0))->isChecked())
+ if (dynamic_cast<TQCheckBox*>(m_thruBox->find(0))->isChecked())
thruFilter |= MappedEvent::MidiNote;
- if (dynamic_cast<TQCheckBox*>(m_thruBox->tqfind(1))->isChecked())
+ if (dynamic_cast<TQCheckBox*>(m_thruBox->find(1))->isChecked())
thruFilter |= MappedEvent::MidiProgramChange;
- if (dynamic_cast<TQCheckBox*>(m_thruBox->tqfind(2))->isChecked())
+ if (dynamic_cast<TQCheckBox*>(m_thruBox->find(2))->isChecked())
thruFilter |= MappedEvent::MidiKeyPressure;
- if (dynamic_cast<TQCheckBox*>(m_thruBox->tqfind(3))->isChecked())
+ if (dynamic_cast<TQCheckBox*>(m_thruBox->find(3))->isChecked())
thruFilter |= MappedEvent::MidiChannelPressure;
- if (dynamic_cast<TQCheckBox*>(m_thruBox->tqfind(4))->isChecked())
+ if (dynamic_cast<TQCheckBox*>(m_thruBox->find(4))->isChecked())
thruFilter |= MappedEvent::MidiPitchBend;
- if (dynamic_cast<TQCheckBox*>(m_thruBox->tqfind(5))->isChecked())
+ if (dynamic_cast<TQCheckBox*>(m_thruBox->find(5))->isChecked())
thruFilter |= MappedEvent::MidiController;
- if (dynamic_cast<TQCheckBox*>(m_thruBox->tqfind(6))->isChecked())
+ if (dynamic_cast<TQCheckBox*>(m_thruBox->find(6))->isChecked())
thruFilter |= MappedEvent::MidiSystemMessage;
- if (dynamic_cast<TQCheckBox*>(m_recordBox->tqfind(0))->isChecked())
+ if (dynamic_cast<TQCheckBox*>(m_recordBox->find(0))->isChecked())
recordFilter |= MappedEvent::MidiNote;
- if (dynamic_cast<TQCheckBox*>(m_recordBox->tqfind(1))->isChecked())
+ if (dynamic_cast<TQCheckBox*>(m_recordBox->find(1))->isChecked())
recordFilter |= MappedEvent::MidiProgramChange;
- if (dynamic_cast<TQCheckBox*>(m_recordBox->tqfind(2))->isChecked())
+ if (dynamic_cast<TQCheckBox*>(m_recordBox->find(2))->isChecked())
recordFilter |= MappedEvent::MidiKeyPressure;
- if (dynamic_cast<TQCheckBox*>(m_recordBox->tqfind(3))->isChecked())
+ if (dynamic_cast<TQCheckBox*>(m_recordBox->find(3))->isChecked())
recordFilter |= MappedEvent::MidiChannelPressure;
- if (dynamic_cast<TQCheckBox*>(m_recordBox->tqfind(4))->isChecked())
+ if (dynamic_cast<TQCheckBox*>(m_recordBox->find(4))->isChecked())
recordFilter |= MappedEvent::MidiPitchBend;
- if (dynamic_cast<TQCheckBox*>(m_recordBox->tqfind(5))->isChecked())
+ if (dynamic_cast<TQCheckBox*>(m_recordBox->find(5))->isChecked())
recordFilter |= MappedEvent::MidiController;
- if (dynamic_cast<TQCheckBox*>(m_recordBox->tqfind(6))->isChecked())
+ if (dynamic_cast<TQCheckBox*>(m_recordBox->find(6))->isChecked())
recordFilter |= MappedEvent::MidiSystemMessage;
diff --git a/src/gui/studio/ChangeRecordDeviceCommand.cpp b/src/gui/studio/ChangeRecordDeviceCommand.cpp
index f596f1c..5f46eff 100644
--- a/src/gui/studio/ChangeRecordDeviceCommand.cpp
+++ b/src/gui/studio/ChangeRecordDeviceCommand.cpp
@@ -42,12 +42,12 @@ ChangeRecordDeviceCommand::swap()
TQString sdevice = TQString::number(m_deviceId);
if (m_action)
{
- if(!devList.tqcontains(sdevice))
+ if(!devList.contains(sdevice))
devList.append(sdevice);
}
else
{
- if(devList.tqcontains(sdevice))
+ if(devList.contains(sdevice))
devList.remove(sdevice);
}
config->writeEntry("midirecorddevice", devList);
diff --git a/src/sequencer/MmappedSegment.cpp b/src/sequencer/MmappedSegment.cpp
index 2cdffe0..eab5d4a 100644
--- a/src/sequencer/MmappedSegment.cpp
+++ b/src/sequencer/MmappedSegment.cpp
@@ -49,7 +49,7 @@ MmappedSegment::MmappedSegment(const TQString filename)
bool MmappedSegment::isMetronome()
{
- return (getFileName().tqcontains("metronome", false) > 0);
+ return (getFileName().contains("metronome", false) > 0);
}
diff --git a/src/sound/AlsaDriver.cpp b/src/sound/AlsaDriver.cpp
index f49e4a5..f486ac7 100644
--- a/src/sound/AlsaDriver.cpp
+++ b/src/sound/AlsaDriver.cpp
@@ -1154,7 +1154,7 @@ AlsaDriver::renameDevice(DeviceId id, TQString name)
snd_seq_get_port_info(m_midiHandle, i->second, pinfo);
TQString oldName = snd_seq_port_info_get_name(pinfo);
- int sep = oldName.tqfind(" - ");
+ int sep = oldName.find(" - ");
TQString newName;
@@ -1383,20 +1383,20 @@ AlsaDriver::setPlausibleConnection(DeviceId id, TQString idealConnection)
// of the requested string.
int client = -1;
- int colon = idealConnection.tqfind(":");
+ int colon = idealConnection.find(":");
if (colon >= 0)
client = idealConnection.left(colon).toInt();
int portNo = -1;
if (client > 0) {
TQString remainder = idealConnection.mid(colon + 1);
- int space = remainder.tqfind(" ");
+ int space = remainder.find(" ");
if (space >= 0)
portNo = remainder.left(space).toInt();
}
- int firstSpace = idealConnection.tqfind(" ");
- int endOfText = idealConnection.tqfind(TQRegExp("[^\\w ]"), firstSpace);
+ int firstSpace = idealConnection.find(" ");
+ int endOfText = idealConnection.find(TQRegExp("[^\\w ]"), firstSpace);
TQString text;
if (endOfText < 2) {
@@ -1448,7 +1448,7 @@ AlsaDriver::setPlausibleConnection(DeviceId id, TQString idealConnection)
}
if (testName && text != "" &&
- !TQString(port->m_name.c_str()).tqcontains(text))
+ !TQString(port->m_name.c_str()).contains(text))
continue;
if (testUsed) {
diff --git a/src/sound/LADSPAPluginFactory.cpp b/src/sound/LADSPAPluginFactory.cpp
index 9daa431..204f05e 100644
--- a/src/sound/LADSPAPluginFactory.cpp
+++ b/src/sound/LADSPAPluginFactory.cpp
@@ -770,9 +770,9 @@ LADSPAPluginFactory::generateFallbackCategories()
std::vector<TQString> path;
for (size_t i = 0; i < pluginPath.size(); ++i) {
- if (pluginPath[i].tqcontains("/lib/")) {
+ if (pluginPath[i].contains("/lib/")) {
TQString p(pluginPath[i]);
- p.tqreplace("/lib/", "/share/");
+ p.replace("/lib/", "/share/");
path.push_back(p);
// std::cerr << "LADSPAPluginFactory::generateFallbackCategories: path element " << p << std::endl;
}
diff --git a/src/sound/MidiFile.cpp b/src/sound/MidiFile.cpp
index 4e97455..509b3d3 100644
--- a/src/sound/MidiFile.cpp
+++ b/src/sound/MidiFile.cpp
@@ -503,7 +503,7 @@ MidiFile::parseTrack(ifstream* midiFile, TrackId &lastTrackNum)
unsigned long accumulatedTime = 0;
// The trackNum passed in to this method is the default track for
- // all events provided they're all on the same channel. If we tqfind
+ // all events provided they're all on the same channel. If we find
// events on more than one channel, we increment trackNum and record
// the mapping from channel to trackNum in this channelTrackMap.
// We then return the new trackNum by reference so the calling