diff options
Diffstat (limited to 'src/misc')
-rw-r--r-- | src/misc/Debug.cpp | 46 | ||||
-rw-r--r-- | src/misc/Debug.h | 26 | ||||
-rw-r--r-- | src/misc/Strings.cpp | 18 | ||||
-rw-r--r-- | src/misc/Strings.h | 14 | ||||
-rw-r--r-- | src/misc/stableheaders.h | 204 |
5 files changed, 154 insertions, 154 deletions
diff --git a/src/misc/Debug.cpp b/src/misc/Debug.cpp index 33d5464..751c3ce 100644 --- a/src/misc/Debug.cpp +++ b/src/misc/Debug.cpp @@ -24,14 +24,14 @@ #include "Debug.h" #if KDE_VERSION < KDE_MAKE_VERSION(3,2,0) -#include <qdatetime.h> -#include <qpoint.h> -#include <qrect.h> -#include <qregion.h> -#include <qstringlist.h> -#include <qpen.h> -#include <qbrush.h> -#include <qsize.h> +#include <tqdatetime.h> +#include <tqpoint.h> +#include <tqrect.h> +#include <tqregion.h> +#include <tqstringlist.h> +#include <tqpen.h> +#include <tqbrush.h> +#include <tqsize.h> #include <kurl.h> #endif @@ -194,7 +194,7 @@ kdbgostreamAdapter::operator<<(unsigned long i) } ostream& -kdbgostreamAdapter::operator<<(const QString& string) +kdbgostreamAdapter::operator<<(const TQString& string) { m_kdbgStream << string; return *this; @@ -208,7 +208,7 @@ kdbgostreamAdapter::operator<<(const char *string) } ostream& -kdbgostreamAdapter::operator<<(const QCString& string) +kdbgostreamAdapter::operator<<(const TQCString& string) { m_kdbgStream << string; return *this; @@ -258,42 +258,42 @@ kdbgostreamAdapter::operator<<(double d) #if KDE_VERSION < KDE_MAKE_VERSION(3,2,0) kdbgstream& -operator<<(kdbgstream &dbg, const QDateTime& time) +operator<<(kdbgstream &dbg, const TQDateTime& time) { dbg << time.toString(); return dbg; } kdbgstream& -operator<<(kdbgstream &dbg, const QDate& date) +operator<<(kdbgstream &dbg, const TQDate& date) { dbg << date.toString(); return dbg; } kdbgstream& -operator<<(kdbgstream &dbg, const QTime& time ) +operator<<(kdbgstream &dbg, const TQTime& time ) { dbg << time.toString(); return dbg; } kdbgstream& -operator<<(kdbgstream &dbg, const QPoint& p ) +operator<<(kdbgstream &dbg, const TQPoint& p ) { dbg << "(" << p.x() << ", " << p.y() << ")"; return dbg; } kdbgstream& -operator<<(kdbgstream &dbg, const QSize& s ) +operator<<(kdbgstream &dbg, const TQSize& s ) { dbg << "[" << s.width() << "x" << s.height() << "]"; return dbg; } kdbgstream& -operator<<(kdbgstream &dbg, const QRect& r ) +operator<<(kdbgstream &dbg, const TQRect& r ) { dbg << "[" << r.x() << "," << r.y() << " - " << r.width() << "x" << r.height() << "]"; @@ -301,13 +301,13 @@ operator<<(kdbgstream &dbg, const QRect& r ) } kdbgstream& -operator<<(kdbgstream &dbg, const QRegion& reg ) +operator<<(kdbgstream &dbg, const TQRegion& reg ) { dbg << "[ "; - QMemArray<QRect>rs = reg.rects(); + TQMemArray<TQRect>rs = reg.rects(); for (uint i = 0;i < rs.size();++i) - dbg << QString("[%1,%2 - %3x%4] ").arg(rs[i].x()).arg(rs[i].y()) + dbg << TQString("[%1,%2 - %3x%4] ").arg(rs[i].x()).arg(rs[i].y()) .arg(rs[i].width()).arg(rs[i].height() ) ; dbg << "]"; @@ -322,7 +322,7 @@ operator<<(kdbgstream &dbg, const KURL& u ) } kdbgstream& -operator<<(kdbgstream &dbg, const QStringList& l ) +operator<<(kdbgstream &dbg, const TQStringList& l ) { dbg << "("; dbg << l.join(","); @@ -332,7 +332,7 @@ operator<<(kdbgstream &dbg, const QStringList& l ) } kdbgstream& -operator<<(kdbgstream &dbg, const QColor& c ) +operator<<(kdbgstream &dbg, const TQColor& c ) { if ( c.isValid() ) dbg << c.name(); @@ -342,7 +342,7 @@ operator<<(kdbgstream &dbg, const QColor& c ) } kdbgstream& -operator<<(kdbgstream &dbg, const QPen& p ) +operator<<(kdbgstream &dbg, const TQPen& p ) { static const char* const s_penStyles[] = { "NoPen", "SolidLine", "DashLine", "DotLine", "DashDotLine", @@ -369,7 +369,7 @@ operator<<(kdbgstream &dbg, const QPen& p ) } kdbgstream& -operator<<(kdbgstream &dbg, const QBrush& b) +operator<<(kdbgstream &dbg, const TQBrush& b) { static const char* const s_brushStyles[] = { "NoBrush", "SolidPattern", "Dense1Pattern", "Dense2Pattern", "Dense3Pattern", diff --git a/src/misc/Debug.h b/src/misc/Debug.h index 8f8f4dd..598dd6c 100644 --- a/src/misc/Debug.h +++ b/src/misc/Debug.h @@ -28,18 +28,18 @@ #include <kdeversion.h> #if KDE_VERSION < KDE_MAKE_VERSION(3,2,0) -class QDateTime; -class QDate; -class QTime; -class QPoint; -class QSize; -class QRect; -class QRegion; +class TQDateTime; +class TQDate; +class TQTime; +class TQPoint; +class TQSize; +class TQRect; +class TQRegion; class KURL; -class QStringList; -class QColor; -class QPen; -class QBrush; +class TQStringList; +class TQColor; +class TQPen; +class TQBrush; #endif namespace Rosegarden { class Event; class Segment; class RealTime; class Colour; namespace Guitar { class Chord; } } @@ -143,9 +143,9 @@ public: std::ostream& operator<<(unsigned int i); std::ostream& operator<<(long i); std::ostream& operator<<(unsigned long i); - std::ostream& operator<<(const QString& str); + std::ostream& operator<<(const TQString& str); std::ostream& operator<<(const char *str); - std::ostream& operator<<(const QCString& str); + std::ostream& operator<<(const TQCString& str); std::ostream& operator<<(void * p); std::ostream& operator<<(KDBGFUNC f); std::ostream& operator<<(double d); diff --git a/src/misc/Strings.cpp b/src/misc/Strings.cpp index 3c139dc..57dc4d3 100644 --- a/src/misc/Strings.cpp +++ b/src/misc/Strings.cpp @@ -25,27 +25,27 @@ #include "base/Segment.h" #include "base/Event.h" -#include <qtextcodec.h> +#include <tqtextcodec.h> -QString strtoqstr(const std::string &str) +TQString strtoqstr(const std::string &str) { - return QString::fromUtf8(str.c_str()); + return TQString::fromUtf8(str.c_str()); } -QString strtoqstr(const Rosegarden::PropertyName &p) +TQString strtoqstr(const Rosegarden::PropertyName &p) { - return QString::fromUtf8(p.c_str()); + return TQString::fromUtf8(p.c_str()); } -std::string qstrtostr(const QString &qstr) +std::string qstrtostr(const TQString &qstr) { return std::string(qstr.utf8().data()); } /** - * Unlike strtod(3) or QString::toDouble(), this is locale-independent + * Unlike strtod(3) or TQString::toDouble(), this is locale-independent * and always uses '.' as a decimal point. We use it when reading * things like configuration values from XML files where we want to * guarantee the same value is used regardless of surrounding locale. @@ -94,13 +94,13 @@ double strtodouble(const std::string &s) return result * sign; } -double qstrtodouble(const QString &s) +double qstrtodouble(const TQString &s) { return strtodouble(qstrtostr(s)); } std::string -convertFromCodec(std::string text, QTextCodec *codec) +convertFromCodec(std::string text, TQTextCodec *codec) { if (codec) return qstrtostr(codec->toUnicode(text.c_str(), text.length())); diff --git a/src/misc/Strings.h b/src/misc/Strings.h index 898a775..d96b61d 100644 --- a/src/misc/Strings.h +++ b/src/misc/Strings.h @@ -22,17 +22,17 @@ #define _ROSE_STRINGS_H_ #include <string> -#include <qstring.h> +#include <tqstring.h> #include "PropertyName.h" #include "Exception.h" -extern QString strtoqstr(const std::string &); -extern QString strtoqstr(const Rosegarden::PropertyName &); -extern std::string qstrtostr(const QString &); +extern TQString strtoqstr(const std::string &); +extern TQString strtoqstr(const Rosegarden::PropertyName &); +extern std::string qstrtostr(const TQString &); extern double strtodouble(const std::string &); -extern double qstrtodouble(const QString &); +extern double qstrtodouble(const TQString &); -class QTextCodec; -extern std::string convertFromCodec(std::string, QTextCodec *); +class TQTextCodec; +extern std::string convertFromCodec(std::string, TQTextCodec *); #endif diff --git a/src/misc/stableheaders.h b/src/misc/stableheaders.h index db6b86e..ddc3f5d 100644 --- a/src/misc/stableheaders.h +++ b/src/misc/stableheaders.h @@ -30,112 +30,112 @@ // QT3 headers // Common headers, or used by sources generated by moc -#include <qmap.h> -#include <qglobal.h> +#include <tqmap.h> +#include <tqglobal.h> #include <private/qucomextra_p.h> -#include <qmetaobject.h> +#include <tqmetaobject.h> #include <qobjectdefs.h> -#include <qsignalslotimp.h> -#include <qstyle.h> +#include <tqsignalslotimp.h> +#include <tqstyle.h> // Headers used by Rosegarden or KDE3 -#include <qaccel.h> -#include <qapplication.h> -#include <qbitmap.h> -#include <qbrush.h> -#include <qbuffer.h> -#include <qbuttongroup.h> -#include <qbutton.h> -#include <qcanvas.h> -#include <qcheckbox.h> -#include <qcolor.h> -#include <qcombobox.h> -#include <qcstring.h> -#include <qcursor.h> -#include <qdatastream.h> -#include <qdatetime.h> -#include <qdialog.h> -#include <qdict.h> -#include <qdir.h> -#include <qdom.h> -#include <qdragobject.h> -#include <qdrawutil.h> -#include <qevent.h> -#include <qeventloop.h> -#include <qfile.h> -#include <qfileinfo.h> -#include <qfont.h> -#include <qfontinfo.h> -#include <qfontmetrics.h> -#include <qframe.h> -#include <qgarray.h> -#include <qgrid.h> -#include <qgroupbox.h> -#include <qguardedptr.h> -#include <qhbox.h> -#include <qheader.h> -#include <qiconset.h> -#include <qimage.h> -#include <qinputdialog.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qlineedit.h> -#include <qlistbox.h> -#include <qlistview.h> -#include <qmemarray.h> -#include <qmutex.h> -#include <qobject.h> -#include <qobjectlist.h> -#include <qpaintdevicemetrics.h> -#include <qpainter.h> -#include <qpalette.h> -#include <qpen.h> -#include <qpixmap.h> -#include <qpointarray.h> -#include <qpoint.h> -#include <qpopupmenu.h> -#include <qprinter.h> -#include <qprogressdialog.h> -#include <qptrdict.h> -#include <qptrlist.h> -#include <qpushbutton.h> -#include <qradiobutton.h> -#include <qrect.h> -#include <qregexp.h> -#include <qregion.h> -#include <qscrollbar.h> -#include <qscrollview.h> -#include <qsessionmanager.h> -#include <qsignalmapper.h> -#include <qsize.h> -#include <qsizepolicy.h> -#include <qslider.h> -#include <qsocketnotifier.h> -#include <qspinbox.h> -#include <qsplitter.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qstrlist.h> -#include <qtable.h> -#include <qtabwidget.h> -#include <qtextcodec.h> -#include <qtextedit.h> -#include <qtextstream.h> -#include <qthread.h> -#include <qtimer.h> -#include <qtoolbutton.h> -#include <qtooltip.h> -#include <qvalidator.h> -#include <qvaluelist.h> -#include <qvaluevector.h> -#include <qvariant.h> -#include <qvbox.h> -#include <qvgroupbox.h> -#include <qwhatsthis.h> -#include <qwidget.h> -#include <qwidgetstack.h> -#include <qwmatrix.h> -#include <qxml.h> +#include <tqaccel.h> +#include <tqapplication.h> +#include <tqbitmap.h> +#include <tqbrush.h> +#include <tqbuffer.h> +#include <tqbuttongroup.h> +#include <tqbutton.h> +#include <tqcanvas.h> +#include <tqcheckbox.h> +#include <tqcolor.h> +#include <tqcombobox.h> +#include <tqcstring.h> +#include <tqcursor.h> +#include <tqdatastream.h> +#include <tqdatetime.h> +#include <tqdialog.h> +#include <tqdict.h> +#include <tqdir.h> +#include <tqdom.h> +#include <tqdragobject.h> +#include <tqdrawutil.h> +#include <tqevent.h> +#include <tqeventloop.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqfont.h> +#include <tqfontinfo.h> +#include <tqfontmetrics.h> +#include <tqframe.h> +#include <tqgarray.h> +#include <tqgrid.h> +#include <tqgroupbox.h> +#include <tqguardedptr.h> +#include <tqhbox.h> +#include <tqheader.h> +#include <tqiconset.h> +#include <tqimage.h> +#include <tqinputdialog.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqlineedit.h> +#include <tqlistbox.h> +#include <tqlistview.h> +#include <tqmemarray.h> +#include <tqmutex.h> +#include <tqobject.h> +#include <tqobjectlist.h> +#include <tqpaintdevicemetrics.h> +#include <tqpainter.h> +#include <tqpalette.h> +#include <tqpen.h> +#include <tqpixmap.h> +#include <tqpointarray.h> +#include <tqpoint.h> +#include <tqpopupmenu.h> +#include <tqprinter.h> +#include <tqprogressdialog.h> +#include <tqptrdict.h> +#include <tqptrlist.h> +#include <tqpushbutton.h> +#include <tqradiobutton.h> +#include <tqrect.h> +#include <tqregexp.h> +#include <tqregion.h> +#include <tqscrollbar.h> +#include <tqscrollview.h> +#include <tqsessionmanager.h> +#include <tqsignalmapper.h> +#include <tqsize.h> +#include <tqsizepolicy.h> +#include <tqslider.h> +#include <tqsocketnotifier.h> +#include <tqspinbox.h> +#include <tqsplitter.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqstrlist.h> +#include <tqtable.h> +#include <tqtabwidget.h> +#include <tqtextcodec.h> +#include <tqtextedit.h> +#include <tqtextstream.h> +#include <tqthread.h> +#include <tqtimer.h> +#include <tqtoolbutton.h> +#include <tqtooltip.h> +#include <tqvalidator.h> +#include <tqvaluelist.h> +#include <tqvaluevector.h> +#include <tqvariant.h> +#include <tqvbox.h> +#include <tqvgroupbox.h> +#include <tqwhatsthis.h> +#include <tqwidget.h> +#include <tqwidgetstack.h> +#include <tqwmatrix.h> +#include <tqxml.h> // KDE3 headers #include <dcopclient.h> |