Initial TQt4 port of Rosegarden

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/rosegarden@1230242 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

16 files changed, 73 insertions, 71 deletions

diff --git a/src/gui/editors/guitar/Chord.cpp b/src/gui/editors/guitar/Chord.cpp
index c697e96..33c137c 100644
--- a/src/gui/editors/guitar/Chord.cpp
+++ b/src/gui/editors/guitar/Chord.cpp
@@ -50,7 +50,7 @@ Chord::Chord(const TQString& root, const TQString& ext)
       m_isUserChord(false)
 {
     if (m_ext.isEmpty())
-        m_ext = TQString::null;
+        m_ext = TQString();
 }
 
 Chord::Chord(const Event& e)
@@ -61,19 +61,19 @@ Chord::Chord(const Event& e)
 
     ok = e.get<String>(RootPropertyName, f);
     if (ok)
-        m_root = f;
+        m_root = f.c_str();
 
     ok = e.get<String>(ExtPropertyName, f);
     if (ok) {
         if (f.length() == 0)
-            m_ext = TQString::null;
+            m_ext = TQString();
         else
-            m_ext = f;
+            m_ext = f.c_str();
     }
     
     ok = e.get<String>(FingeringPropertyName, f);
     if (ok) {
-        TQString qf(f);
+        TQString qf(f.c_str());
         TQString errString;
     
         Fingering fingering = Fingering::parseFingering(qf, errString);    
@@ -84,8 +84,8 @@ Chord::Chord(const Event& e)
 Event* Chord::getAsEvent(timeT absoluteTime) const
 {
     Event *e = new Event(EventType, absoluteTime, 0, EventSubOrdering);
-    e->set<String>(RootPropertyName, m_root);
-    e->set<String>(ExtPropertyName, m_ext);
+    e->set<String>(RootPropertyName, m_root.ascii());
+    e->set<String>(ExtPropertyName, m_ext.ascii());
     e->set<String>(FingeringPropertyName, getFingering().toString());
     return e;
 }
diff --git a/src/gui/editors/guitar/Chord.h b/src/gui/editors/guitar/Chord.h
index f519c9c..0b6bc59 100644
--- a/src/gui/editors/guitar/Chord.h
+++ b/src/gui/editors/guitar/Chord.h
@@ -53,7 +53,7 @@ public:
     static const PropertyName FingeringPropertyName;
 
 	Chord();
-    Chord(const TQString& root, const TQString& ext = TQString::null);
+    Chord(const TQString& root, const TQString& ext = TQString());
     Chord(const Event&);
 
     Event* getAsEvent(timeT absoluteTime) const;
@@ -68,9 +68,9 @@ public:
     void setRoot(TQString r) { m_root = r; } 
 
     TQString getExt() const { return m_ext; }
-    void setExt(TQString r) { m_ext = r.isEmpty() ? TQString::null : r; } 
+    void setExt(TQString r) { m_ext = r.isEmpty() ? TQString() : r; } 
     
-    bool hasAltBass() const { return m_ext.contains(ALT_BASS_REGEXP); } 
+    bool hasAltBass() const { return m_ext.tqcontains(ALT_BASS_REGEXP); } 
 
     Fingering getFingering() const { return m_fingering; }
     void setFingering(Fingering f) { m_fingering = f; }
diff --git a/src/gui/editors/guitar/ChordMap.cpp b/src/gui/editors/guitar/ChordMap.cpp
index 207a336..64ea463 100644
--- a/src/gui/editors/guitar/ChordMap.cpp
+++ b/src/gui/editors/guitar/ChordMap.cpp
@@ -71,7 +71,7 @@ ChordMap::getChords(const TQString& root, const TQString& ext) const
     return res;
 }
     
-QStringList
+TQStringList
 ChordMap::getRootList() const
 {
     static TQStringList rootNotes;
@@ -95,7 +95,7 @@ ChordMap::getRootList() const
     return rootNotes;
 }
 
-QStringList
+TQStringList
 ChordMap::getExtList(const TQString& root) const
 {
     TQStringList extList;
@@ -192,7 +192,7 @@ bool ChordMap::saveDocument(const TQString& filename, bool userChordsOnly, TQStr
             outStream << ">\n";
         }
         
-        outStream << "<fingering>" << chord.getFingering().toString() << "</fingering>\n";
+        outStream << "<fingering>" << chord.getFingering().toString().c_str() << "</fingering>\n";
     }
 
     if (!m_map.empty())
@@ -201,7 +201,7 @@ bool ChordMap::saveDocument(const TQString& filename, bool userChordsOnly, TQStr
     outStream << "</chords>\n";    
     outStream << "</rosegarden-chord-data>\n";
   
-    return outStream.device()->status() == IO_Ok;
+    return outStream.tqdevice()->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 6802485..d2f71b4 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")
-                    .arg(exception.message())
-                    .arg(exception.lineNumber())
-                    .arg(exception.columnNumber());
+                    .tqarg(exception.message())
+                    .tqarg(exception.lineNumber())
+                    .tqarg(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")
-                    .arg(exception.message())
-                    .arg(exception.lineNumber())
-                    .arg(exception.columnNumber());
+                    .tqarg(exception.message())
+                    .tqarg(exception.lineNumber())
+                    .tqarg(exception.columnNumber());
     return TQXmlDefaultHandler::fatalError( exception );
 }
 
diff --git a/src/gui/editors/guitar/ChordXmlHandler.h b/src/gui/editors/guitar/ChordXmlHandler.h
index f9c2e8b..910e9e8 100644
--- a/src/gui/editors/guitar/ChordXmlHandler.h
+++ b/src/gui/editors/guitar/ChordXmlHandler.h
@@ -36,7 +36,7 @@
 namespace Rosegarden
 {
 
-class ChordXmlHandler : public ProgressReporter, public QXmlDefaultHandler
+class ChordXmlHandler : public ProgressReporter, public TQXmlDefaultHandler
 {
 public:
 	ChordXmlHandler(Guitar::ChordMap&);
diff --git a/src/gui/editors/guitar/Fingering.cpp b/src/gui/editors/guitar/Fingering.cpp
index 59459e9..7e5ecc4 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 lastStringStatus = m_strings[getNbStrings() - 1];
+    int lastStringtqStatus = m_strings[getNbStrings() - 1];
     
-    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));
+    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));
 }
 
 Fingering::Barre
 Fingering::getBarre() const
 {
-    int lastStringStatus = m_strings[getNbStrings() - 1];
+    int lastStringtqStatus = m_strings[getNbStrings() - 1];
 
     Barre res;
     
-    res.fret = lastStringStatus;
+    res.fret = lastStringtqStatus;
     
     for(unsigned int i = 0; i < 3; ++i) {
-        if (m_strings[i] > OPEN && m_strings[i] == lastStringStatus)
+        if (m_strings[i] > OPEN && m_strings[i] == lastStringtqStatus)
             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'").arg(t).arg(ch);            
+            errorString = i18n("couldn't parse fingering '%1' in '%2'").tqarg(t).tqarg(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.getStringStatus(i) != b.getStringStatus(i)) {
-            return a.getStringStatus(i) < b.getStringStatus(i);
+        if (a.getStringtqStatus(i) != b.getStringtqStatus(i)) {
+            return a.getStringtqStatus(i) < b.getStringtqStatus(i);
         }
     }
     return false;
diff --git a/src/gui/editors/guitar/Fingering.h b/src/gui/editors/guitar/Fingering.h
index 32693dd..b413d3b 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  getStringStatus(int stringNb) const       { return m_strings[stringNb]; } 
-    void setStringStatus(int stringNb, int status) { m_strings[stringNb] = status; } 
+    int  getStringtqStatus(int stringNb) const       { return m_strings[stringNb]; } 
+    void setStringtqStatus(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 6695a66..7677b85 100644
--- a/src/gui/editors/guitar/FingeringBox.cpp
+++ b/src/gui/editors/guitar/FingeringBox.cpp
@@ -31,8 +31,8 @@
 namespace Rosegarden
 {
 
-FingeringBox::FingeringBox(unsigned int nbFrets, unsigned int nbStrings, bool editable, TQWidget *parent, const char* name)
-    : TQFrame(parent, name),
+FingeringBox::FingeringBox(unsigned int nbFrets, unsigned int nbStrings, bool editable, TQWidget *tqparent, const char* name)
+    : TQFrame(tqparent, name),
     m_nbFretsDisplayed(nbFrets),
     m_startFret(1),
     m_nbStrings(nbStrings),
@@ -44,8 +44,8 @@ FingeringBox::FingeringBox(unsigned int nbFrets, unsigned int nbStrings, bool ed
     init();    
 }
 
-FingeringBox::FingeringBox(bool editable, TQWidget *parent, const char* name)
-    : TQFrame(parent, name),
+FingeringBox::FingeringBox(bool editable, TQWidget *tqparent, const char* name)
+    : TQFrame(tqparent, name),
     m_nbFretsDisplayed(DEFAULT_NB_DISPLAYED_FRETS),
     m_startFret(1),
     m_nbStrings(Guitar::Fingering::DEFAULT_NB_STRINGS),
@@ -123,11 +123,11 @@ FingeringBox::drawContents(TQPainter* p)
     
     // DEBUG
 //    p->save();
-//    p->setPen(Qt::red);
+//    p->setPen(TQt::red);
 //    unsigned int topBorderY = m_noteSymbols.getTopBorder(maximumHeight());
 //    p->drawLine(0, topBorderY, 20, topBorderY);
 //    p->drawRect(m_r1);
-//    p->setPen(Qt::blue);
+//    p->setPen(TQt::blue);
 //    p->drawRect(m_r2);
 //    p->restore();
 }
@@ -183,7 +183,7 @@ FingeringBox::mousePressEvent(TQMouseEvent *event)
     if (!m_editable)
         return;
         
-    if((event->button() == LeftButton) && m_editable) {
+    if((event->button() == Qt::LeftButton) && m_editable) {
 
         // Find string position
         m_press_string_num = getStringNumber(event->pos());
@@ -219,16 +219,16 @@ FingeringBox::processMouseRelease(unsigned int release_string_num,
                 
                 if(m_press_fret_num == 0) {
                     
-                    int stringStatus = m_fingering.getStringStatus(m_press_string_num);
+                    int stringtqStatus = m_fingering.getStringtqStatus(m_press_string_num);
 
-                    if (stringStatus == Guitar::Fingering::OPEN)
+                    if (stringtqStatus == Guitar::Fingering::OPEN)
                         aVal = Guitar::Fingering::MUTED;
-                    else if (stringStatus > Guitar::Fingering::OPEN)
+                    else if (stringtqStatus > Guitar::Fingering::OPEN)
                         aVal = Guitar::Fingering::OPEN;
 
                 }
                 
-                m_fingering.setStringStatus(m_press_string_num, aVal);
+                m_fingering.setStringtqStatus(m_press_string_num, aVal);
                 
                 update();
             }
diff --git a/src/gui/editors/guitar/FingeringBox.h b/src/gui/editors/guitar/FingeringBox.h
index aa76e52..06b8500 100644
--- a/src/gui/editors/guitar/FingeringBox.h
+++ b/src/gui/editors/guitar/FingeringBox.h
@@ -37,14 +37,14 @@ namespace Rosegarden
 
 class Fingering;
 
-class FingeringBox : public QFrame
+class FingeringBox : public TQFrame
 {
     static const unsigned int IMG_WIDTH  = 200;
     static const unsigned int IMG_HEIGHT = 200;
     
 public:
-	FingeringBox(unsigned int nbFrets, unsigned int nbStrings, bool editable, TQWidget *parent, const char* name = 0);
-    FingeringBox(bool editable, TQWidget *parent, const char* name = 0);
+	FingeringBox(unsigned int nbFrets, unsigned int nbStrings, bool editable, TQWidget *tqparent, const char* name = 0);
+    FingeringBox(bool editable, TQWidget *tqparent, const char* name = 0);
 
     void setStartFret(unsigned int f) { m_startFret = f; update(); }
     unsigned int getStartFret() const { return m_startFret; }
diff --git a/src/gui/editors/guitar/FingeringListBoxItem.cpp b/src/gui/editors/guitar/FingeringListBoxItem.cpp
index aeb8fcd..64b7f10 100644
--- a/src/gui/editors/guitar/FingeringListBoxItem.cpp
+++ b/src/gui/editors/guitar/FingeringListBoxItem.cpp
@@ -27,8 +27,8 @@
 
 namespace Rosegarden {
     
-FingeringListBoxItem::FingeringListBoxItem(const Guitar::Chord& chord, TQListBox* parent, TQPixmap pixmap, TQString fingeringString)
-    : TQListBoxPixmap(parent, pixmap, fingeringString),
+FingeringListBoxItem::FingeringListBoxItem(const Guitar::Chord& chord, TQListBox* tqparent, TQPixmap pixmap, TQString fingeringString)
+    : TQListBoxPixmap(tqparent, pixmap, fingeringString),
       m_chord(chord)
 {
 }
diff --git a/src/gui/editors/guitar/FingeringListBoxItem.h b/src/gui/editors/guitar/FingeringListBoxItem.h
index 8b0a81a..f900056 100644
--- a/src/gui/editors/guitar/FingeringListBoxItem.h
+++ b/src/gui/editors/guitar/FingeringListBoxItem.h
@@ -31,10 +31,10 @@
 
 namespace Rosegarden {
 
-class FingeringListBoxItem : public QListBoxPixmap
+class FingeringListBoxItem : public TQListBoxPixmap
 {
 public:
-    FingeringListBoxItem(const Guitar::Chord& chord, TQListBox* parent, TQPixmap pixmap, TQString fingeringString);
+    FingeringListBoxItem(const Guitar::Chord& chord, TQListBox* tqparent, TQPixmap pixmap, TQString fingeringString);
     
     const Guitar::Chord& getChord() { return m_chord; }
 protected:
diff --git a/src/gui/editors/guitar/GuitarChordEditorDialog.cpp b/src/gui/editors/guitar/GuitarChordEditorDialog.cpp
index 8a4fb3e..57df4d6 100644
--- a/src/gui/editors/guitar/GuitarChordEditorDialog.cpp
+++ b/src/gui/editors/guitar/GuitarChordEditorDialog.cpp
@@ -39,8 +39,8 @@
 namespace Rosegarden
 {
 
-GuitarChordEditorDialog::GuitarChordEditorDialog(Guitar::Chord& chord, const Guitar::ChordMap& chordMap, TQWidget *parent)
-    : KDialogBase(parent, "GuitarChordEditor", true, i18n("Guitar Chord Editor"), Ok|Cancel),
+GuitarChordEditorDialog::GuitarChordEditorDialog(Guitar::Chord& chord, const Guitar::ChordMap& chordMap, TQWidget *tqparent)
+    : KDialogBase(tqparent, "GuitarChordEditor", true, i18n("Guitar Chord Editor"), Ok|Cancel),
       m_chord(chord),
       m_chordMap(chordMap)
 {
@@ -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.findIndex(m_chord.getRoot()));
+        m_rootNotesList->setCurrentItem(rootList.tqfindIndex(m_chord.getRoot()));
     }
     
     TQStringList extList = m_chordMap.getExtList(m_chord.getRoot());
     if (extList.count() > 0) {
         m_ext->insertStringList(extList);
-        m_ext->setCurrentItem(extList.findIndex(m_chord.getExt()));
+        m_ext->setCurrentItem(extList.tqfindIndex(m_chord.getExt()));
     }
     
 }
diff --git a/src/gui/editors/guitar/GuitarChordEditorDialog.h b/src/gui/editors/guitar/GuitarChordEditorDialog.h
index f26fcd3..2b286ee 100644
--- a/src/gui/editors/guitar/GuitarChordEditorDialog.h
+++ b/src/gui/editors/guitar/GuitarChordEditorDialog.h
@@ -42,9 +42,10 @@ class FingeringBox;
 class GuitarChordEditorDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
-	GuitarChordEditorDialog(Guitar::Chord&, const Guitar::ChordMap& chordMap, TQWidget *parent=0);
+	GuitarChordEditorDialog(Guitar::Chord&, const Guitar::ChordMap& chordMap, TQWidget *tqparent=0);
 
 protected slots:
     void slotStartFretChanged(int);
diff --git a/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp b/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp
index 5430098..0f9ea8d 100644
--- a/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp
+++ b/src/gui/editors/guitar/GuitarChordSelectorDialog.cpp
@@ -41,8 +41,8 @@
 namespace Rosegarden
 {
 
-GuitarChordSelectorDialog::GuitarChordSelectorDialog(TQWidget *parent)
-    : KDialogBase(parent, "GuitarChordSelector", true, i18n("Guitar Chord Selector"), Ok|Cancel)
+GuitarChordSelectorDialog::GuitarChordSelectorDialog(TQWidget *tqparent)
+    : KDialogBase(tqparent, "GuitarChordSelector", true, i18n("Guitar Chord Selector"), Ok|Cancel)
 {
     TQWidget *page = new TQWidget(this);
     setMainWidget(page);
@@ -214,12 +214,12 @@ GuitarChordSelectorDialog::slotNewFingering()
         m_chordMap.insert(newChord);
         // populate lists
         //
-        if (!m_rootNotesList->findItem(newChord.getRoot(), Qt::ExactMatch)) {
+        if (!m_rootNotesList->tqfindItem(newChord.getRoot(), TQt::ExactMatch)) {
             m_rootNotesList->insertItem(newChord.getRoot());
             m_rootNotesList->sort();
         }
         
-        if (!m_chordExtList->findItem(newChord.getExt(), Qt::ExactMatch)) {
+        if (!m_chordExtList->tqfindItem(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->findItem(chord.getRoot(), Qt::ExactMatch);
+    TQListBoxItem* correspondingRoot = m_rootNotesList->tqfindItem(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->findItem(chordExt, Qt::ExactMatch);
+        TQListBoxItem* correspondingExt = m_chordExtList->tqfindItem(chordExt, TQt::ExactMatch);
         if (correspondingExt)
             m_chordExtList->setSelected(correspondingExt, true);
     }
@@ -321,7 +321,7 @@ GuitarChordSelectorDialog::populateFingerings(const Guitar::ChordMap::chordarray
     
     for(Guitar::ChordMap::chordarray::const_iterator i = chords.begin(); i != chords.end(); ++i) {
         const Guitar::Chord& chord = *i; 
-        TQString fingeringString = chord.getFingering().toString();
+        TQString fingeringString = chord.getFingering().toString().c_str();
         NOTATION_DEBUG << "GuitarChordSelectorDialog::populateFingerings " << chord << endl;
         TQPixmap fingeringPixmap = getFingeringPixmap(chord.getFingering());            
         FingeringListBoxItem *item = new FingeringListBoxItem(chord, m_fingeringsList, fingeringPixmap, fingeringString);
@@ -334,7 +334,7 @@ GuitarChordSelectorDialog::populateFingerings(const Guitar::ChordMap::chordarray
 }
 
 
-QPixmap
+TQPixmap
 GuitarChordSelectorDialog::getFingeringPixmap(const Guitar::Fingering& fingering) const
 {
     TQPixmap pixmap(FINGERING_PIXMAP_WIDTH, FINGERING_PIXMAP_HEIGHT);
@@ -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'").arg(handler.errorString()));
+        KMessageBox::error(0, i18n("couldn't open file '%1'").tqarg(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").arg(handler.errorString()));
+        KMessageBox::error(0, i18n("couldn't parse chord dictionnary : %1").tqarg(handler.errorString()));
     
 }
 
diff --git a/src/gui/editors/guitar/GuitarChordSelectorDialog.h b/src/gui/editors/guitar/GuitarChordSelectorDialog.h
index 17b1eff..b6ddea1 100644
--- a/src/gui/editors/guitar/GuitarChordSelectorDialog.h
+++ b/src/gui/editors/guitar/GuitarChordSelectorDialog.h
@@ -46,11 +46,12 @@ class FingeringBox;
 class GuitarChordSelectorDialog : public KDialogBase
 {
      Q_OBJECT
+  TQ_OBJECT
     
     enum { COMPLEXITY_BEGINNER, COMPLEXITY_COMMON, COMPLEXITY_ALL };
     
 public:
-	GuitarChordSelectorDialog(TQWidget *parent=0);
+	GuitarChordSelectorDialog(TQWidget *tqparent=0);
 
     void init();
 
diff --git a/src/gui/editors/guitar/NoteSymbols.cpp b/src/gui/editors/guitar/NoteSymbols.cpp
index b7ed8f4..1d09299 100644
--- a/src/gui/editors/guitar/NoteSymbols.cpp
+++ b/src/gui/editors/guitar/NoteSymbols.cpp
@@ -101,7 +101,7 @@ NoteSymbols::drawOpenSymbol ( TQPainter* p,
     //std::cout << "NoteSymbols::drawOpenSymbol - drawing Open symbol at string #" << position
     //<< std::endl;
 
-    p->setBrush( TQBrush(p->brush().color(), Qt::NoBrush) );
+    p->setBrush( TQBrush(p->brush().color(), TQt::NoBrush) );
     p->drawEllipse( x_pos.first - ( radius / 2 ),
                     y_pos - ( radius / 2 ),
                     radius,
@@ -124,10 +124,10 @@ NoteSymbols::drawNoteSymbol ( TQPainter* p,
 
     if (transient) {
         radius =  static_cast<unsigned int>( columnWidth /* * 0.9 */ );
-        p->setBrush( TQBrush(p->brush().color(), Qt::NoBrush) );
+        p->setBrush( TQBrush(p->brush().color(), TQt::NoBrush) );
     } else {
         radius =  static_cast<unsigned int>( columnWidth * 0.7 );
-        p->setBrush( TQBrush(p->brush().color(), Qt::SolidPattern) );
+        p->setBrush( TQBrush(p->brush().color(), TQt::SolidPattern) );
     }
 
     int x = x_pos.first - ( radius / 2 ),
@@ -143,7 +143,7 @@ NoteSymbols::drawNoteSymbol ( TQPainter* p,
                     radius );
                     
 //    p->save();
-//    p->setPen(Qt::red);
+//    p->setPen(TQt::red);
 //    p->drawRect( x, y, radius, radius );
 //    p->restore();
 }