diff options
author | Timothy Pearson <[email protected]> | 2011-12-16 09:57:35 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2011-12-16 09:57:35 -0600 |
commit | 6ca08e7a881c0c97f338e0085f75af04ec08ad04 (patch) | |
tree | 5462bef0f060df1c19e3fcb98250e5cfa24edc11 /src/misc | |
parent | 4faf11eccc5f08d2aa0540157d6eff80b7cdb02a (diff) | |
download | rosegarden-6ca08e7a881c0c97f338e0085f75af04ec08ad04.tar.gz rosegarden-6ca08e7a881c0c97f338e0085f75af04ec08ad04.zip |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 4faf11eccc5f08d2aa0540157d6eff80b7cdb02a.
Diffstat (limited to 'src/misc')
-rw-r--r-- | src/misc/Debug.cpp | 6 | ||||
-rw-r--r-- | src/misc/Strings.cpp | 2 | ||||
-rw-r--r-- | src/misc/stableheaders.h | 14 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/misc/Debug.cpp b/src/misc/Debug.cpp index 7218226..502b68d 100644 --- a/src/misc/Debug.cpp +++ b/src/misc/Debug.cpp @@ -30,7 +30,7 @@ #include <tqregion.h> #include <tqstringlist.h> #include <tqpen.h> -#include <brush.h> +#include <tqbrush.h> #include <tqsize.h> #include <kurl.h> #endif @@ -307,8 +307,8 @@ operator<<(kdbgstream &dbg, const TQRegion& reg ) TQMemArray<TQRect>rs = reg.rects(); for (uint i = 0;i < rs.size();++i) - dbg << TQString("[%1,%2 - %3x%4] ").arg(rs[i].x()).arg(rs[i].y()) - .arg(rs[i].width()).arg(rs[i].height() ) ; + dbg << TQString("[%1,%2 - %3x%4] ").tqarg(rs[i].x()).tqarg(rs[i].y()) + .tqarg(rs[i].width()).tqarg(rs[i].height() ) ; dbg << "]"; return dbg; diff --git a/src/misc/Strings.cpp b/src/misc/Strings.cpp index 192044d..57dc4d3 100644 --- a/src/misc/Strings.cpp +++ b/src/misc/Strings.cpp @@ -25,7 +25,7 @@ #include "base/Segment.h" #include "base/Event.h" -#include <textcodec.h> +#include <tqtextcodec.h> diff --git a/src/misc/stableheaders.h b/src/misc/stableheaders.h index 2bdbfa9..6e2d55a 100644 --- a/src/misc/stableheaders.h +++ b/src/misc/stableheaders.h @@ -35,14 +35,14 @@ #include <private/tqucomextra_p.h> #include <tqmetaobject.h> #include <tqobjectdefs.h> -#include <signalslotimp.h> +#include <tqsignalslotimp.h> #include <tqstyle.h> // Headers used by Rosegarden or KDE3 #include <tqaccel.h> #include <tqapplication.h> #include <tqbitmap.h> -#include <brush.h> +#include <tqbrush.h> #include <tqbuffer.h> #include <tqbuttongroup.h> #include <tqbutton.h> @@ -78,7 +78,7 @@ #include <tqimage.h> #include <tqinputdialog.h> #include <tqlabel.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlineedit.h> #include <tqlistbox.h> #include <tqlistview.h> @@ -88,7 +88,7 @@ #include <tqobjectlist.h> #include <tqpaintdevicemetrics.h> #include <tqpainter.h> -#include <palette.h> +#include <tqpalette.h> #include <tqpen.h> #include <tqpixmap.h> #include <tqpointarray.h> @@ -118,9 +118,9 @@ #include <tqstrlist.h> #include <tqtable.h> #include <tqtabwidget.h> -#include <textcodec.h> -#include <textedit.h> -#include <textstream.h> +#include <tqtextcodec.h> +#include <tqtextedit.h> +#include <tqtextstream.h> #include <tqthread.h> #include <tqtimer.h> #include <tqtoolbutton.h> |