diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-25 05:28:35 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-25 05:28:35 +0000 |
commit | f008adb5a77e094eaf6abf3fc0f36958e66896a5 (patch) | |
tree | 8e9244c4d4957c36be81e15b566b4aa5ea26c982 /krita/plugins/viewplugins | |
parent | 1210f27b660efb7b37ff43ec68763e85a403471f (diff) | |
download | koffice-f008adb5a77e094eaf6abf3fc0f36958e66896a5.tar.gz koffice-f008adb5a77e094eaf6abf3fc0f36958e66896a5.zip |
TQt4 port koffice
This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1238284 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'krita/plugins/viewplugins')
130 files changed, 1735 insertions, 1691 deletions
diff --git a/krita/plugins/viewplugins/colorrange/colorrange.cc b/krita/plugins/viewplugins/colorrange/colorrange.cc index 9c52e027..cc9bf95c 100644 --- a/krita/plugins/viewplugins/colorrange/colorrange.cc +++ b/krita/plugins/viewplugins/colorrange/colorrange.cc @@ -23,8 +23,8 @@ #include <stdlib.h> -#include <qslider.h> -#include <qpoint.h> +#include <tqslider.h> +#include <tqpoint.h> #include <klocale.h> #include <kiconloader.h> @@ -50,15 +50,15 @@ typedef KGenericFactory<ColorRange> ColorRangeFactory; K_EXPORT_COMPONENT_FACTORY( kritacolorrange, ColorRangeFactory( "krita" ) ) -ColorRange::ColorRange(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +ColorRange::ColorRange(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { - if (parent->inherits("KisView")) { + if (tqparent->inherits("KisView")) { setInstance(ColorRangeFactory::instance()); setXMLFile(locate("data","kritaplugins/colorrange.rc"), true); - m_view = dynamic_cast<KisView*>(parent); - m_view->canvasSubject()->selectionManager()->addSelectionAction( new KAction(i18n("&Color Range..."), 0, 0, this, SLOT(slotActivated()), actionCollection(), "colorrange") ); + m_view = dynamic_cast<KisView*>(tqparent); + m_view->canvasSubject()->selectionManager()->addSelectionAction( new KAction(i18n("&Color Range..."), 0, 0, this, TQT_SLOT(slotActivated()), actionCollection(), "colorrange") ); } } diff --git a/krita/plugins/viewplugins/colorrange/colorrange.h b/krita/plugins/viewplugins/colorrange/colorrange.h index 1cc10cef..322f5bc4 100644 --- a/krita/plugins/viewplugins/colorrange/colorrange.h +++ b/krita/plugins/viewplugins/colorrange/colorrange.h @@ -28,8 +28,9 @@ class KisView; class ColorRange : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - ColorRange(QObject *parent, const char *name, const QStringList &); + ColorRange(TQObject *tqparent, const char *name, const TQStringList &); virtual ~ColorRange(); private slots: diff --git a/krita/plugins/viewplugins/colorrange/dlg_colorrange.cc b/krita/plugins/viewplugins/colorrange/dlg_colorrange.cc index 1cd115c1..acec9b17 100644 --- a/krita/plugins/viewplugins/colorrange/dlg_colorrange.cc +++ b/krita/plugins/viewplugins/colorrange/dlg_colorrange.cc @@ -17,16 +17,16 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qapplication.h> -#include <qpushbutton.h> -#include <qcheckbox.h> -#include <qslider.h> -#include <qcombobox.h> -#include <qpixmap.h> -#include <qimage.h> -#include <qlabel.h> -#include <qcolor.h> -#include <qradiobutton.h> +#include <tqapplication.h> +#include <tqpushbutton.h> +#include <tqcheckbox.h> +#include <tqslider.h> +#include <tqcombobox.h> +#include <tqpixmap.h> +#include <tqimage.h> +#include <tqlabel.h> +#include <tqcolor.h> +#include <tqradiobutton.h> #include <knuminput.h> #include <klocale.h> @@ -103,7 +103,7 @@ namespace { } -Q_UINT32 matchColors(const QColor & c, enumAction action) +TQ_UINT32 matchColors(const TQColor & c, enumAction action) { int r = c.red(); int g = c.green(); @@ -174,8 +174,8 @@ Q_UINT32 matchColors(const QColor & c, enumAction action) -DlgColorRange::DlgColorRange( KisView * view, KisPaintDeviceSP dev, QWidget * parent, const char * name) - : super (parent, name, true, i18n("Color Range"), Ok | Cancel, Ok) +DlgColorRange::DlgColorRange( KisView * view, KisPaintDeviceSP dev, TQWidget * tqparent, const char * name) + : super (tqparent, name, true, i18n("Color Range"), Ok | Cancel, Ok) { m_dev = dev; m_view = view; @@ -187,7 +187,7 @@ DlgColorRange::DlgColorRange( KisView * view, KisPaintDeviceSP dev, QWidget * p setCaption(i18n("Color Range")); setMainWidget(m_page); - resize(m_page->sizeHint()); + resize(m_page->tqsizeHint()); if (m_dev->image()->undo()) m_transaction = new KisSelectedTransaction(i18n("Select by Color Range"), m_dev); @@ -201,29 +201,29 @@ DlgColorRange::DlgColorRange( KisView * view, KisPaintDeviceSP dev, QWidget * p m_mode = SELECTION_ADD; m_currentAction = REDS; - connect(this, SIGNAL(okClicked()), - this, SLOT(okClicked())); + connect(this, TQT_SIGNAL(okClicked()), + this, TQT_SLOT(okClicked())); - connect(this, SIGNAL(cancelClicked()), - this, SLOT(cancelClicked())); + connect(this, TQT_SIGNAL(cancelClicked()), + this, TQT_SLOT(cancelClicked())); - connect(m_page->chkInvert, SIGNAL(clicked()), - this, SLOT(slotInvertClicked())); + connect(m_page->chkInvert, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotInvertClicked())); - connect(m_page->cmbSelect, SIGNAL(activated(int)), - this, SLOT(slotSelectionTypeChanged(int))); + connect(m_page->cmbSelect, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(slotSelectionTypeChanged(int))); - connect (m_page->radioAdd, SIGNAL(toggled(bool)), - this, SLOT(slotAdd(bool))); + connect (m_page->radioAdd, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotAdd(bool))); - connect (m_page->radioSubtract, SIGNAL(toggled(bool)), - this, SLOT(slotSubtract(bool))); + connect (m_page->radioSubtract, TQT_SIGNAL(toggled(bool)), + this, TQT_SLOT(slotSubtract(bool))); - connect (m_page->bnSelect, SIGNAL(clicked()), - this, SLOT(slotSelectClicked())); + connect (m_page->bnSelect, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotSelectClicked())); - connect (m_page->bnDeselect, SIGNAL(clicked()), - this, SLOT(slotDeselectClicked())); + connect (m_page->bnDeselect, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotDeselectClicked())); } @@ -237,9 +237,9 @@ void DlgColorRange::updatePreview() { if (!m_selection) return; - Q_INT32 x, y, w, h; + TQ_INT32 x, y, w, h; m_dev->exactBounds(x, y, w, h); - QPixmap pix = QPixmap(m_selection->maskImage().smoothScale(350, 350, QImage::ScaleMin)); + TQPixmap pix = TQPixmap(m_selection->tqmaskImage().smoothScale(350, 350, TQ_ScaleMin)); m_subject->canvasController()->updateCanvas(); m_page->pixSelection->setPixmap(pix); } @@ -284,22 +284,22 @@ void DlgColorRange::slotAdd(bool on) void DlgColorRange::slotSelectClicked() { - QApplication::setOverrideCursor(KisCursor::waitCursor()); + TQApplication::setOverrideCursor(KisCursor::waitCursor()); // XXX: Multithread this! - Q_INT32 x, y, w, h; + TQ_INT32 x, y, w, h; m_dev->exactBounds(x, y, w, h); KisColorSpace * cs = m_dev->colorSpace(); - Q_UINT8 opacity; + TQ_UINT8 opacity; for (int y2 = y; y2 < h - y; ++y2) { KisHLineIterator hiter = m_dev->createHLineIterator(x, y2, w, false); KisHLineIterator selIter = m_selection ->createHLineIterator(x, y2, w, true); while (!hiter.isDone()) { - QColor c; + TQColor c; - cs->toQColor(hiter.rawData(), &c, &opacity); + cs->toTQColor(hiter.rawData(), &c, &opacity); // Don't try to select transparent pixels. if (opacity > OPACITY_TRANSPARENT) { - Q_UINT8 match = matchColors(c, m_currentAction); + TQ_UINT8 match = matchColors(c, m_currentAction); if (match) { // Personally, I think the invert option a bit silly. But it's possible I don't quite understand it. BSAR. @@ -308,7 +308,7 @@ void DlgColorRange::slotSelectClicked() *(selIter.rawData()) = match; } else if (m_mode == SELECTION_SUBTRACT) { - Q_UINT8 selectedness = *(selIter.rawData()); + TQ_UINT8 selectedness = *(selIter.rawData()); if (match < selectedness) { *(selIter.rawData()) = selectedness - match; } @@ -319,7 +319,7 @@ void DlgColorRange::slotSelectClicked() } else { if (m_mode == SELECTION_ADD) { - Q_UINT8 selectedness = *(selIter.rawData()); + TQ_UINT8 selectedness = *(selIter.rawData()); if (match < selectedness) { *(selIter.rawData()) = selectedness - match; } @@ -338,7 +338,7 @@ void DlgColorRange::slotSelectClicked() } } updatePreview(); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); } void DlgColorRange::slotDeselectClicked() diff --git a/krita/plugins/viewplugins/colorrange/dlg_colorrange.h b/krita/plugins/viewplugins/colorrange/dlg_colorrange.h index 5a792abd..474a8b5e 100644 --- a/krita/plugins/viewplugins/colorrange/dlg_colorrange.h +++ b/krita/plugins/viewplugins/colorrange/dlg_colorrange.h @@ -20,7 +20,7 @@ #ifndef DLG_COLORRANGE #define DLG_COLORRANGE -#include <qcursor.h> +#include <tqcursor.h> #include <kdialogbase.h> @@ -51,18 +51,19 @@ enum enumAction { /** - * This dialog allows the user to create a selection mask based + * This dialog allows the user to create a selection tqmask based * on a (range of) colors. */ class DlgColorRange: public KDialogBase { typedef KDialogBase super; Q_OBJECT + TQ_OBJECT public: - DlgColorRange(KisView * view, KisPaintDeviceSP layer, QWidget * parent = 0, const char* name = 0); + DlgColorRange(KisView * view, KisPaintDeviceSP layer, TQWidget * tqparent = 0, const char* name = 0); ~DlgColorRange(); private slots: @@ -79,7 +80,7 @@ private slots: void slotDeselectClicked(); private: - QImage createMask(KisSelectionSP selection, KisPaintDeviceSP layer); + TQImage createMask(KisSelectionSP selection, KisPaintDeviceSP layer); private: @@ -89,7 +90,7 @@ private: KisView * m_view; KisCanvasSubject * m_subject; enumSelectionMode m_mode; - QCursor m_oldCursor; + TQCursor m_oldCursor; KisSelectedTransaction *m_transaction; enumAction m_currentAction; bool m_invert; diff --git a/krita/plugins/viewplugins/colorrange/wdg_colorrange.ui b/krita/plugins/viewplugins/colorrange/wdg_colorrange.ui index e9ed74f5..3eafd180 100644 --- a/krita/plugins/viewplugins/colorrange/wdg_colorrange.ui +++ b/krita/plugins/viewplugins/colorrange/wdg_colorrange.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgColorRange</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgColorRange</cstring> </property> @@ -19,31 +19,31 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>Reds</string> @@ -98,7 +98,7 @@ <cstring>cmbSelect</cstring> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>chkInvert</cstring> </property> @@ -108,7 +108,7 @@ </widget> </hbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>grpSelection</cstring> </property> @@ -119,7 +119,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioAdd</cstring> </property> @@ -130,7 +130,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioSubtract</cstring> </property> @@ -142,15 +142,15 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>bnSelect</cstring> </property> @@ -158,7 +158,7 @@ <string>&Select</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>bnDeselect</cstring> </property> @@ -176,7 +176,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -187,7 +187,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>grpPreview</cstring> </property> @@ -209,7 +209,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>pixSelection</cstring> </property> @@ -233,7 +233,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -248,5 +248,5 @@ </images> <tabstops> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/krita/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc b/krita/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc index 62528a0c..3ffc80fb 100644 --- a/krita/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc +++ b/krita/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc @@ -19,13 +19,13 @@ */ #include <stdlib.h> -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qlabel.h> -#include <qcombobox.h> -#include <qbuttongroup.h> -#include <qapplication.h> -#include <qcursor.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqcombobox.h> +#include <tqbuttongroup.h> +#include <tqapplication.h> +#include <tqcursor.h> #include <klocale.h> #include <kiconloader.h> @@ -58,19 +58,19 @@ typedef KGenericFactory<ColorSpaceConversion> ColorSpaceConversionFactory; K_EXPORT_COMPONENT_FACTORY( kritacolorspaceconversion, ColorSpaceConversionFactory( "krita" ) ) -ColorSpaceConversion::ColorSpaceConversion(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +ColorSpaceConversion::ColorSpaceConversion(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { - if ( parent->inherits("KisView") ) + if ( tqparent->inherits("KisView") ) { - m_view = (KisView*) parent; + m_view = (KisView*) tqparent; setInstance(ColorSpaceConversionFactory::instance()); setXMLFile(locate("data","kritaplugins/colorspaceconversion.rc"), true); - (void) new KAction(i18n("&Convert Image Type..."), 0, 0, this, SLOT(slotImgColorSpaceConversion()), actionCollection(), "imgcolorspaceconversion"); - (void) new KAction(i18n("&Convert Layer Type..."), 0, 0, this, SLOT(slotLayerColorSpaceConversion()), actionCollection(), "layercolorspaceconversion"); + (void) new KAction(i18n("&Convert Image Type..."), 0, 0, this, TQT_SLOT(slotImgColorSpaceConversion()), actionCollection(), "imgcolorspaceconversion"); + (void) new KAction(i18n("&Convert Layer Type..."), 0, 0, this, TQT_SLOT(slotLayerColorSpaceConversion()), actionCollection(), "layercolorspaceconversion"); } } @@ -91,7 +91,7 @@ void ColorSpaceConversion::slotImgColorSpaceConversion() if (KMessageBox::warningContinueCancel(m_view, i18n("This conversion will convert your %1 image through 16-bit L*a*b* and back.\n" "Watercolor and openEXR colorspaces will even be converted through 8-bit RGB.\n") - .arg(image->colorSpace()->id().name()), + .tqarg(image->colorSpace()->id().name()), i18n("Colorspace Conversion"), KGuiItem(i18n("Continue")), "lab16degradation") != KMessageBox::Continue) return; @@ -103,14 +103,14 @@ void ColorSpaceConversion::slotImgColorSpaceConversion() dlgColorSpaceConversion->setCaption(i18n("Convert All Layers From ") + image->colorSpace()->id().name()); - if (dlgColorSpaceConversion->exec() == QDialog::Accepted) { + if (dlgColorSpaceConversion->exec() == TQDialog::Accepted) { // XXX: Do the rest of the stuff KisID cspace = dlgColorSpaceConversion->m_page->cmbColorSpaces->currentItem(); KisColorSpace * cs = KisMetaRegistry::instance()->csRegistry()->getColorSpace(cspace, dlgColorSpaceConversion->m_page->cmbDestProfile->currentText()); - QApplication::setOverrideCursor(KisCursor::waitCursor()); + TQApplication::setOverrideCursor(KisCursor::waitCursor()); image->convertTo(cs, dlgColorSpaceConversion->m_page->grpIntent->selectedId()); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); } delete dlgColorSpaceConversion; } @@ -128,7 +128,7 @@ void ColorSpaceConversion::slotLayerColorSpaceConversion() if (KMessageBox::warningContinueCancel(m_view, i18n("This conversion will convert your %1 layer through 16-bit L*a*b* and back.\n" "Watercolor and openEXR colorspaces will even be converted through 8-bit RGB.\n") - .arg(dev->colorSpace()->id().name()), + .tqarg(dev->colorSpace()->id().name()), i18n("Colorspace Conversion"), KGuiItem(i18n("Continue")), "lab16degradation") != KMessageBox::Continue) return; @@ -140,14 +140,14 @@ void ColorSpaceConversion::slotLayerColorSpaceConversion() dlgColorSpaceConversion->setCaption(i18n("Convert Current Layer From") + dev->colorSpace()->id().name()); - if (dlgColorSpaceConversion->exec() == QDialog::Accepted) { + if (dlgColorSpaceConversion->exec() == TQDialog::Accepted) { KisID cspace = dlgColorSpaceConversion->m_page->cmbColorSpaces->currentItem(); KisColorSpace * cs = KisMetaRegistry::instance()->csRegistry() -> getColorSpace(cspace, dlgColorSpaceConversion->m_page->cmbDestProfile->currentText()); - QApplication::setOverrideCursor(KisCursor::waitCursor()); + TQApplication::setOverrideCursor(KisCursor::waitCursor()); dev->convertTo(cs, dlgColorSpaceConversion->m_page->grpIntent->selectedId()); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); } delete dlgColorSpaceConversion; } diff --git a/krita/plugins/viewplugins/colorspaceconversion/colorspaceconversion.h b/krita/plugins/viewplugins/colorspaceconversion/colorspaceconversion.h index 3bf85530..402fde65 100644 --- a/krita/plugins/viewplugins/colorspaceconversion/colorspaceconversion.h +++ b/krita/plugins/viewplugins/colorspaceconversion/colorspaceconversion.h @@ -31,8 +31,9 @@ class KisView; class ColorSpaceConversion : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - ColorSpaceConversion(QObject *parent, const char *name, const QStringList &); + ColorSpaceConversion(TQObject *tqparent, const char *name, const TQStringList &); virtual ~ColorSpaceConversion(); private slots: diff --git a/krita/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc b/krita/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc index b59fb546..b296ca2f 100644 --- a/krita/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc +++ b/krita/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc @@ -18,11 +18,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qlabel.h> -#include <qcombobox.h> -#include <qptrlist.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqcombobox.h> +#include <tqptrlist.h> #include <klocale.h> #include <knuminput.h> @@ -39,26 +39,26 @@ #include "wdgconvertcolorspace.h" #include "dlg_colorspaceconversion.h" -DlgColorSpaceConversion::DlgColorSpaceConversion( QWidget * parent, +DlgColorSpaceConversion::DlgColorSpaceConversion( TQWidget * tqparent, const char * name) - : super (parent, name, true, i18n("Image Size"), Ok | Cancel, Ok) + : super (tqparent, name, true, i18n("Image Size"), Ok | Cancel, Ok) { m_page = new WdgConvertColorSpace(this, "colorspace_conversion"); Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->sizeHint()); + resize(m_page->tqsizeHint()); m_page->cmbColorSpaces->setIDList(KisMetaRegistry::instance()->csRegistry()->listKeys()); fillCmbDestProfile(m_page->cmbColorSpaces->currentItem()); - connect(m_page->cmbColorSpaces, SIGNAL(activated(const KisID &)), - this, SLOT(fillCmbDestProfile(const KisID &))); + connect(m_page->cmbColorSpaces, TQT_SIGNAL(activated(const KisID &)), + this, TQT_SLOT(fillCmbDestProfile(const KisID &))); - connect(this, SIGNAL(okClicked()), - this, SLOT(okClicked())); + connect(this, TQT_SIGNAL(okClicked()), + this, TQT_SLOT(okClicked())); } @@ -79,8 +79,8 @@ void DlgColorSpaceConversion::fillCmbDestProfile(const KisID & s) { m_page->cmbDestProfile->clear(); - QValueVector<KisProfile *> profileList = KisMetaRegistry::instance()->csRegistry()->profilesFor(s); - QValueVector<KisProfile *> ::iterator it; + TQValueVector<KisProfile *> profileList = KisMetaRegistry::instance()->csRegistry()->profilesFor(s); + TQValueVector<KisProfile *> ::iterator it; for ( it = profileList.begin(); it != profileList.end(); ++it ) { m_page->cmbDestProfile->insertItem((*it)->productName()); diff --git a/krita/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.h b/krita/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.h index ed086a8d..48ef3efe 100644 --- a/krita/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.h +++ b/krita/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.h @@ -32,10 +32,11 @@ class WdgConvertColorSpace; class DlgColorSpaceConversion: public KDialogBase { typedef KDialogBase super; Q_OBJECT + TQ_OBJECT public: - DlgColorSpaceConversion(QWidget * parent = 0, const char* name = 0); + DlgColorSpaceConversion(TQWidget * tqparent = 0, const char* name = 0); ~DlgColorSpaceConversion(); WdgConvertColorSpace * m_page; diff --git a/krita/plugins/viewplugins/colorspaceconversion/wdgconvertcolorspace.ui b/krita/plugins/viewplugins/colorspaceconversion/wdgconvertcolorspace.ui index 31f29be5..ae183206 100644 --- a/krita/plugins/viewplugins/colorspaceconversion/wdgconvertcolorspace.ui +++ b/krita/plugins/viewplugins/colorspaceconversion/wdgconvertcolorspace.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgConvertColorSpace</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgConvertColorSpace</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblConvert</cstring> </property> @@ -53,7 +53,7 @@ <cstring>cmbDestProfile</cstring> </property> </widget> - <widget class="QButtonGroup" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQButtonGroup" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>grpIntent</cstring> </property> @@ -67,7 +67,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>radioPerceptual</cstring> </property> @@ -90,7 +90,7 @@ the perceived color. White point changed to result in neutral grays. Intended for images.</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>radioRelativeColorimetric</cstring> </property> @@ -110,7 +110,7 @@ then, it is used. Else reverts to perceptual intent.</string> </property> </widget> - <widget class="QRadioButton" row="2" column="0"> + <widget class="TQRadioButton" row="2" column="0"> <property name="name"> <cstring>radioSaturation</cstring> </property> @@ -135,7 +135,7 @@ then, it is used. Else reverts to perceptual intent.</string> </property> </widget> - <widget class="QRadioButton" row="3" column="0"> + <widget class="TQRadioButton" row="3" column="0"> <property name="name"> <cstring>radioAbsoluteColorimetric</cstring> </property> @@ -159,7 +159,7 @@ colors (Pantone, TruMatch, logo colors, ...)</string> </widget> </grid> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblDestICMProfile</cstring> </property> @@ -214,5 +214,5 @@ colors (Pantone, TruMatch, logo colors, ...)</string> <data format="PNG" length="1003">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b249444154388db5944d4c5c5518869f73ce9db9cc40f929cc30300e18129a50685268a28291982e1a2175212eaab1c49d3f8971e7aec6aedb54a32b435dd8685cb8c0c4b8b0feb421b7bd8186a069d23209144b18cb0c02f3732ff3c3ccbdd705a571941213f1dd9d93739ef37e6fbeef08d334d9d5d0d090c701c8344d2176c1a6697a5d5d5dd8b64d2a95c2b2ac7f05b12c8b783c8e6118d8b6fd685fdb753a39394928e2a7c55724d693a7e214104220242805520a84d8b9e4790f0b1302c7751958f1e30534be9fa41a0c60db362dbe227f64af91b6e7719c2dfc0117a71c603da591de2882a7d3d4ec27122b10acad50aeb88044d542b84de3af7ab44aa55274f4e449dbf354bc347aa096fbf37e7efa2ecbad1b36907d78b289de8120232f37726250c3f52cf0a026a0f6065b9645d929e038167aa096d91b307171059034b5f8e9e9eb44fa052b4b25eeccd9dc99cb71f6ad082fbea2e351c075bdbdc13b9109fc01b83fef63e2e232e03076b68393231a0dcd024daf502c1e66e67a89cb971ef0e5a74bb4b61e6378248094b92ab0ac024b70ca017ef8360394187b2dc6d8b89ffa500e4d4f93d9083275d5e6f9913ade3dd70ee87c7d25c95646a25415aadab152b09ed4f8c5cc130a853839eac3951b684a61e70ef3f9c739668c24eba912afbfddc6d4d506e6a6d7b8b7d082aa8eb8dab19482cdcd220e36dd3dc19df23545de0a71f952861923493456cfd3cf36123c54a0b7bf0e8064621b21f7712c040857071ca4eea0f40a99f510573ec971cb48030e811a1faded3e94be85f2fb00703d1ff26f96ab9f011a5b04d0c4f26fdb948a754c1b25668c2491483d5d5d611617d6b8f0fe32cb779b492ce65168b4c774a4701eefd8f3a02d56e6e8f13aeefe9a63fa5a89d1970e91d908f3d46003e1480d173e28b37827c9b977348ab92ce16890237d1ec907ee3e8e3d8f60d0e1f4583d009f7d9860662acff89bad1c1faad0717493f7ce7713ed8cb0995c255f2a317a26427b67198f6a70f51c0a41b902279ed1187f23cc17130b7c74de65eac77a7a8f05517e41e2deefa4930576db60fa7a8ee1535134df3e93e7b82e0817476439fd6a9070a49f6fbe4a3077739db99b15c001146dd13a46cf1cc1f83943c62e51de76b0738fc9381e8f3390f0236b252e124999e11724fd833196164bacadb87848224fe874f779b43fe9f2dca928956d505a96dbb3f9bdc18661e00534c26d1a7a40e13912a11c9454280da41048a9915c75585df500074d53d816dc9edd229528ef0db66dbbea3ffdaffa471f1f28d8344df1bf800f1a6e9aa6f813c39885bc050f269c0000000049454e44ae426082</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/krita/plugins/viewplugins/dropshadow/dlg_dropshadow.cc b/krita/plugins/viewplugins/dropshadow/dlg_dropshadow.cc index 545f886f..b61f4a9d 100644 --- a/krita/plugins/viewplugins/dropshadow/dlg_dropshadow.cc +++ b/krita/plugins/viewplugins/dropshadow/dlg_dropshadow.cc @@ -19,14 +19,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qbutton.h> -#include <qbuttongroup.h> -#include <qcheckbox.h> -#include <qcolor.h> -#include <qcombobox.h> -#include <qlabel.h> -#include <qradiobutton.h> -#include <qslider.h> +#include <tqbutton.h> +#include <tqbuttongroup.h> +#include <tqcheckbox.h> +#include <tqcolor.h> +#include <tqcombobox.h> +#include <tqlabel.h> +#include <tqradiobutton.h> +#include <tqslider.h> #include <kcolorbutton.h> #include <kconfig.h> @@ -37,29 +37,29 @@ #include "dlg_dropshadow.h" #include "wdg_dropshadow.h" -DlgDropshadow::DlgDropshadow( const QString & /*imageCS*/, - const QString & /*layerCS*/, - QWidget * parent, +DlgDropshadow::DlgDropshadow( const TQString & /*imageCS*/, + const TQString & /*layerCS*/, + TQWidget * tqparent, const char * name) - : super (parent, name, true, i18n("Drop Shadow"), Ok | Cancel, Ok) + : super (tqparent, name, true, i18n("Drop Shadow"), Ok | Cancel, Ok) { m_page = new WdgDropshadow(this, "dropshadow"); Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->sizeHint()); + resize(m_page->tqsizeHint()); KConfig * cfg = KGlobal::config(); m_page->xOffsetSpinBox->setValue( cfg->readNumEntry("dropshadow_x", 8) ); m_page->yOffsetSpinBox->setValue( cfg->readNumEntry("dropshadow_y", 8) ); m_page->blurRadiusSpinBox->setValue( cfg->readNumEntry("dropshadow_blurRadius", 5) ); - QColor black(0,0,0); + TQColor black(0,0,0); m_page->shadowColorButton->setColor( cfg->readColorEntry("dropshadow_color", &black) ); m_page->opacitySlider->setValue( cfg->readNumEntry("dropshadow_opacity", 80 ) ); m_page->opacitySpinBox->setValue( cfg->readNumEntry("dropshadow_opacity", 80 ) ); m_page->allowResizingCheckBox->setChecked( cfg->readBoolEntry("dropshadow_resizing", true ) ); - connect(this, SIGNAL(okClicked()), - this, SLOT(okClicked())); + connect(this, TQT_SIGNAL(okClicked()), + this, TQT_SLOT(okClicked())); } DlgDropshadow::~DlgDropshadow() @@ -67,29 +67,29 @@ DlgDropshadow::~DlgDropshadow() delete m_page; } -Q_INT32 DlgDropshadow::getXOffset() +TQ_INT32 DlgDropshadow::getXOffset() { return m_page->xOffsetSpinBox->value(); } -Q_INT32 DlgDropshadow::getYOffset() +TQ_INT32 DlgDropshadow::getYOffset() { return m_page->yOffsetSpinBox->value(); } -Q_INT32 DlgDropshadow::getBlurRadius() +TQ_INT32 DlgDropshadow::getBlurRadius() { return m_page->blurRadiusSpinBox->value(); } -Q_UINT8 DlgDropshadow::getShadowOpacity() +TQ_UINT8 DlgDropshadow::getShadowOpacity() { double opacity = (double)m_page->opacitySpinBox->value(); //convert percent to a 8 bit opacity value - return (Q_UINT8)(opacity / 100 * 255); + return (TQ_UINT8)(opacity / 100 * 255); } -QColor DlgDropshadow::getShadowColor() +TQColor DlgDropshadow::getShadowColor() { return m_page->shadowColorButton->color(); } diff --git a/krita/plugins/viewplugins/dropshadow/dlg_dropshadow.h b/krita/plugins/viewplugins/dropshadow/dlg_dropshadow.h index 8e514658..9261e723 100644 --- a/krita/plugins/viewplugins/dropshadow/dlg_dropshadow.h +++ b/krita/plugins/viewplugins/dropshadow/dlg_dropshadow.h @@ -24,7 +24,7 @@ #include <kis_dropshadow.h> class WdgDropshadow; -class QColor; +class TQColor; /** * This dialog allows the user to configure the decomposition of an image @@ -33,20 +33,21 @@ class QColor; class DlgDropshadow: public KDialogBase { typedef KDialogBase super; Q_OBJECT + TQ_OBJECT public: - DlgDropshadow(const QString & imageCS, const QString & layerCS, QWidget * parent = 0, + DlgDropshadow(const TQString & imageCS, const TQString & layerCS, TQWidget * tqparent = 0, const char* name = 0); ~DlgDropshadow(); public: - Q_INT32 getXOffset(); - Q_INT32 getYOffset(); - Q_INT32 getBlurRadius(); - Q_UINT8 getShadowOpacity(); - QColor getShadowColor(); + TQ_INT32 getXOffset(); + TQ_INT32 getYOffset(); + TQ_INT32 getBlurRadius(); + TQ_UINT8 getShadowOpacity(); + TQColor getShadowColor(); bool allowResizingChecked(); private slots: void okClicked(); diff --git a/krita/plugins/viewplugins/dropshadow/kis_dropshadow.cc b/krita/plugins/viewplugins/dropshadow/kis_dropshadow.cc index 7881f568..e8818760 100644 --- a/krita/plugins/viewplugins/dropshadow/kis_dropshadow.cc +++ b/krita/plugins/viewplugins/dropshadow/kis_dropshadow.cc @@ -25,7 +25,7 @@ #include <stdlib.h> #include <vector> -#include <qcolor.h> +#include <tqcolor.h> #include <klocale.h> #include <kiconloader.h> @@ -68,7 +68,7 @@ KisDropshadow::KisDropshadow(KisView * view) { } -void KisDropshadow::dropshadow(KisProgressDisplayInterface * progress, Q_INT32 xoffset, Q_INT32 yoffset, Q_INT32 blurradius, QColor color, Q_UINT8 opacity, bool allowResize) +void KisDropshadow::dropshadow(KisProgressDisplayInterface * progress, TQ_INT32 xoffset, TQ_INT32 yoffset, TQ_INT32 blurradius, TQColor color, TQ_UINT8 opacity, bool allowResize) { KisImageSP image = m_view->canvasSubject()->currentImg(); if (!image) return; @@ -92,9 +92,9 @@ void KisDropshadow::dropshadow(KisProgressDisplayInterface * progress, Q_INT32 x KisPaintDeviceSP bShadowDev; KisRgbColorSpace *rgb8cs = static_cast<KisRgbColorSpace *>(shadowDev->colorSpace()); - QRect rect = dev->exactBounds(); + TQRect rect = dev->exactBounds(); - for (Q_INT32 row = 0; row < rect.height(); ++row) + for (TQ_INT32 row = 0; row < rect.height(); ++row) { KisHLineIteratorPixel srcIt = dev->createHLineIterator(rect.x(), rect.y() + row, rect.width(), false); KisHLineIteratorPixel dstIt = shadowDev->createHLineIterator(rect.x(), rect.y() + row, rect.width(), true); @@ -103,7 +103,7 @@ void KisDropshadow::dropshadow(KisProgressDisplayInterface * progress, Q_INT32 x if (srcIt.isSelected()) { //set the shadow color - Q_UINT8 alpha = dev->colorSpace()->getAlpha(srcIt.rawData()); + TQ_UINT8 alpha = dev->colorSpace()->getAlpha(srcIt.rawData()); rgb8cs->setPixel(dstIt.rawData(), color.red(), color.green(), color.blue(), alpha); } ++srcIt; @@ -122,26 +122,26 @@ void KisDropshadow::dropshadow(KisProgressDisplayInterface * progress, Q_INT32 x if (!m_cancelRequested) { shadowDev->move (xoffset,yoffset); - KisGroupLayerSP parent = image->rootLayer(); + KisGroupLayerSP tqparent = image->rootLayer(); if (image->activeLayer()) - parent = image->activeLayer()->parent().data(); + tqparent = image->activeLayer()->tqparent().data(); KisPaintLayerSP l = new KisPaintLayer(image, i18n("Drop Shadow"), opacity, shadowDev); - image->addLayer( l.data(), parent, src->siblingBelow() ); + image->addLayer( l.data(), tqparent, src->siblingBelow() ); if (allowResize) { - QRect shadowBounds = shadowDev->exactBounds(); + TQRect shadowBounds = shadowDev->exactBounds(); - if (!image->bounds().contains(shadowBounds)) { + if (!image->bounds().tqcontains(shadowBounds)) { - QRect newImageSize = image->bounds() | shadowBounds; + TQRect newImageSize = image->bounds() | shadowBounds; image->resize(newImageSize.width(), newImageSize.height()); if (shadowBounds.left() < 0 || shadowBounds.top() < 0) { - Q_INT32 newRootX = image->rootLayer()->x(); - Q_INT32 newRootY = image->rootLayer()->y(); + TQ_INT32 newRootX = image->rootLayer()->x(); + TQ_INT32 newRootY = image->rootLayer()->y(); if (shadowBounds.left() < 0) { newRootX += -shadowBounds.left(); @@ -150,8 +150,8 @@ void KisDropshadow::dropshadow(KisProgressDisplayInterface * progress, Q_INT32 x newRootY += -shadowBounds.top(); } - KCommand *moveCommand = image->rootLayer()->moveCommand(QPoint(image->rootLayer()->x(), image->rootLayer()->y()), - QPoint(newRootX, newRootY)); + KCommand *moveCommand = image->rootLayer()->moveCommand(TQPoint(image->rootLayer()->x(), image->rootLayer()->y()), + TQPoint(newRootX, newRootY)); Q_ASSERT(moveCommand != 0); if (moveCommand) { @@ -175,41 +175,41 @@ void KisDropshadow::dropshadow(KisProgressDisplayInterface * progress, Q_INT32 x emit notifyProgressDone(); } -void KisDropshadow::gaussianblur (KisPaintDeviceSP srcDev, KisPaintDeviceSP dstDev, QRect& rect, double horz, double vert, BlurMethod method, KisProgressDisplayInterface *) +void KisDropshadow::gaussianblur (KisPaintDeviceSP srcDev, KisPaintDeviceSP dstDev, TQRect& rect, double horz, double vert, BlurMethod method, KisProgressDisplayInterface *) { - Q_INT32 width, height; - Q_INT32 bytes; - Q_UINT8 *dest, *dp; - Q_UINT8 *src, *sp, *sp_p, *sp_m; - Q_INT32 *buf = NULL; - Q_INT32 *bb; + TQ_INT32 width, height; + TQ_INT32 bytes; + TQ_UINT8 *dest, *dp; + TQ_UINT8 *src, *sp, *sp_p, *sp_m; + TQ_INT32 *buf = NULL; + TQ_INT32 *bb; double n_p[5], n_m[5]; double d_p[5], d_m[5]; double bd_p[5], bd_m[5]; double *val_p = NULL; double *val_m = NULL; double *vp, *vm; - Q_INT32 x1, y1, x2, y2; - Q_INT32 i, j; - Q_INT32 row, col, b; - Q_INT32 terms; + TQ_INT32 x1, y1, x2, y2; + TQ_INT32 i, j; + TQ_INT32 row, col, b; + TQ_INT32 terms; double progress, max_progress; - Q_INT32 initial_p[4]; - Q_INT32 initial_m[4]; + TQ_INT32 initial_p[4]; + TQ_INT32 initial_m[4]; double std_dev; - Q_INT32 pixels; - Q_INT32 total = 1; - Q_INT32 start, end; - Q_INT32 *curve; - Q_INT32 *sum = NULL; - Q_INT32 val; - Q_INT32 length; - Q_INT32 initial_pp, initial_mm; - - x1 = (Q_INT32)(rect.x() - horz); - y1 = (Q_INT32)(rect.y() - vert); - width = (Q_INT32)(rect.width() + 2 * horz); - height = (Q_INT32)(rect.height() + 2 * vert); + TQ_INT32 pixels; + TQ_INT32 total = 1; + TQ_INT32 start, end; + TQ_INT32 *curve; + TQ_INT32 *sum = NULL; + TQ_INT32 val; + TQ_INT32 length; + TQ_INT32 initial_pp, initial_mm; + + x1 = (TQ_INT32)(rect.x() - horz); + y1 = (TQ_INT32)(rect.y() - vert); + width = (TQ_INT32)(rect.width() + 2 * horz); + height = (TQ_INT32)(rect.height() + 2 * vert); x2 = x1 + width; y2 = y1 + height; @@ -227,12 +227,12 @@ void KisDropshadow::gaussianblur (KisPaintDeviceSP srcDev, KisPaintDeviceSP dstD break; case BLUR_RLE: - buf = new Q_INT32[MAX (width, height) * 2]; + buf = new TQ_INT32[MAX (width, height) * 2]; break; } - src = new Q_UINT8[MAX (width, height) * bytes]; - dest = new Q_UINT8[MAX (width, height) * bytes]; + src = new TQ_UINT8[MAX (width, height) * bytes]; + dest = new TQ_UINT8[MAX (width, height) * bytes]; progress = 0.0; max_progress = (horz <= 0.0 ) ? 0 : width * height * horz; @@ -256,7 +256,7 @@ void KisDropshadow::gaussianblur (KisPaintDeviceSP srcDev, KisPaintDeviceSP dstD case BLUR_RLE: curve = make_curve (std_dev, &length); - sum = new Q_INT32[2 * length + 1]; + sum = new TQ_INT32[2 * length + 1]; sum[0] = 0; @@ -382,7 +382,7 @@ void KisDropshadow::gaussianblur (KisPaintDeviceSP srcDev, KisPaintDeviceSP dstD dstDev->writeBytes(dest, col + x1, y1, 1, height); progress += height * vert; - if ((col % 5) == 0) emit notifyProgress( (Q_UINT32)((progress * 100) / max_progress)); + if ((col % 5) == 0) emit notifyProgress( (TQ_UINT32)((progress * 100) / max_progress)); } } @@ -406,7 +406,7 @@ void KisDropshadow::gaussianblur (KisPaintDeviceSP srcDev, KisPaintDeviceSP dstD case BLUR_RLE: curve = make_curve (std_dev, &length); - sum = new Q_INT32[2 * length + 1]; + sum = new TQ_INT32[2 * length + 1]; sum[0] = 0; @@ -535,7 +535,7 @@ void KisDropshadow::gaussianblur (KisPaintDeviceSP srcDev, KisPaintDeviceSP dstD progress += width * horz; //if ((row % 5) == 0) gimp_progress_update (progress / max_progress); - if ((row % 5) == 0) emit notifyProgress( (Q_UINT32)((progress * 100) / max_progress )); + if ((row % 5) == 0) emit notifyProgress( (TQ_UINT32)((progress * 100) / max_progress )); } } @@ -558,7 +558,7 @@ void KisDropshadow::gaussianblur (KisPaintDeviceSP srcDev, KisPaintDeviceSP dstD void KisDropshadow::find_constants (double n_p[], double n_m[], double d_p[], double d_m[], double bd_p[], double bd_m[], double std_dev) { - Q_INT32 i; + TQ_INT32 i; double constants [8]; double div; @@ -637,10 +637,10 @@ void KisDropshadow::find_constants (double n_p[], double n_m[], double d_p[], do } -void KisDropshadow::transfer_pixels (double *src1, double *src2, Q_UINT8 *dest, Q_INT32 bytes, Q_INT32 width) +void KisDropshadow::transfer_pixels (double *src1, double *src2, TQ_UINT8 *dest, TQ_INT32 bytes, TQ_INT32 width) { - Q_INT32 b; - Q_INT32 bend = bytes * width; + TQ_INT32 b; + TQ_INT32 bend = bytes * width; double sum; for(b = 0; b < bend; b++) @@ -649,12 +649,12 @@ void KisDropshadow::transfer_pixels (double *src1, double *src2, Q_UINT8 *dest, if (sum > 255) sum = 255; else if(sum < 0) sum = 0; - *dest++ = (Q_UINT8) sum; + *dest++ = (TQ_UINT8) sum; } } //The equations: g(r) = exp (- r^2 / (2 * sigma^2)), r = sqrt (x^2 + y ^2) -Q_INT32 * KisDropshadow::make_curve(double sigma, Q_INT32 *length) +TQ_INT32 * KisDropshadow::make_curve(double sigma, TQ_INT32 *length) { int *curve; double sigma2; @@ -669,7 +669,7 @@ Q_INT32 * KisDropshadow::make_curve(double sigma, Q_INT32 *length) if ((n % 2) == 0) n += 1; - curve = new Q_INT32[n]; + curve = new TQ_INT32[n]; *length = n / 2; curve += *length; @@ -677,7 +677,7 @@ Q_INT32 * KisDropshadow::make_curve(double sigma, Q_INT32 *length) for (i = 1; i <= *length; i++) { - temp = (Q_INT32) (exp (- (i * i) / sigma2) * 255); + temp = (TQ_INT32) (exp (- (i * i) / sigma2) * 255); curve[-i] = temp; curve[i] = temp; } @@ -685,12 +685,12 @@ Q_INT32 * KisDropshadow::make_curve(double sigma, Q_INT32 *length) return curve; } -void KisDropshadow::run_length_encode (Q_UINT8 *src, Q_INT32 *dest, Q_INT32 bytes, Q_INT32 width) +void KisDropshadow::run_length_encode (TQ_UINT8 *src, TQ_INT32 *dest, TQ_INT32 bytes, TQ_INT32 width) { - Q_INT32 start; - Q_INT32 i; - Q_INT32 j; - Q_UINT8 last; + TQ_INT32 start; + TQ_INT32 i; + TQ_INT32 j; + TQ_UINT8 last; last = *src; src += bytes; @@ -718,9 +718,9 @@ void KisDropshadow::run_length_encode (Q_UINT8 *src, Q_INT32 *dest, Q_INT32 byte } } -void KisDropshadow::multiply_alpha (Q_UINT8 *buf, Q_INT32 width, Q_INT32 bytes) +void KisDropshadow::multiply_alpha (TQ_UINT8 *buf, TQ_INT32 width, TQ_INT32 bytes) { - Q_INT32 i, j; + TQ_INT32 i, j; double alpha; for (i = 0; i < width * bytes; i += bytes) @@ -728,17 +728,17 @@ void KisDropshadow::multiply_alpha (Q_UINT8 *buf, Q_INT32 width, Q_INT32 bytes) alpha = buf[i + bytes - 1] * (1.0 / 255.0); for (j = 0; j < bytes - 1; j++) { double a = (double)(buf[i + j]) * alpha; - buf[i + j] = (Q_UINT8)a; + buf[i + j] = (TQ_UINT8)a; } } } -void KisDropshadow::separate_alpha (Q_UINT8 *buf, Q_INT32 width, Q_INT32 bytes) +void KisDropshadow::separate_alpha (TQ_UINT8 *buf, TQ_INT32 width, TQ_INT32 bytes) { - Q_INT32 i, j; - Q_UINT8 alpha; + TQ_INT32 i, j; + TQ_UINT8 alpha; double recip_alpha; - Q_UINT32 new_val; + TQ_UINT32 new_val; for (i = 0; i < width * bytes; i += bytes) { @@ -748,7 +748,7 @@ void KisDropshadow::separate_alpha (Q_UINT8 *buf, Q_INT32 width, Q_INT32 bytes) recip_alpha = 255.0 / alpha; for (j = 0; j < bytes - 1; j++) { - new_val = (Q_UINT32)(buf[i + j] * recip_alpha); + new_val = (TQ_UINT32)(buf[i + j] * recip_alpha); buf[i + j] = MIN (255, new_val); } } diff --git a/krita/plugins/viewplugins/dropshadow/kis_dropshadow.h b/krita/plugins/viewplugins/dropshadow/kis_dropshadow.h index 3aca424f..94c6decc 100644 --- a/krita/plugins/viewplugins/dropshadow/kis_dropshadow.h +++ b/krita/plugins/viewplugins/dropshadow/kis_dropshadow.h @@ -31,36 +31,37 @@ typedef enum } BlurMethod; -class QColor; +class TQColor; class KisView; class KisProgressDisplayInterface; class KisDropshadow : public KisProgressSubject { Q_OBJECT + TQ_OBJECT public: KisDropshadow(KisView * view); virtual ~KisDropshadow() {}; - void dropshadow(KisProgressDisplayInterface * progress, Q_INT32 xoffset, Q_INT32 yoffset, Q_INT32 blurradius, QColor color, Q_UINT8 opacity, bool allowResize); + void dropshadow(KisProgressDisplayInterface * progress, TQ_INT32 xoffset, TQ_INT32 yoffset, TQ_INT32 blurradius, TQColor color, TQ_UINT8 opacity, bool allowResize); public: // Implement KisProgressSubject virtual void cancel() { m_cancelRequested = true; } private: void gaussianblur (KisPaintDeviceSP src, KisPaintDeviceSP dst, - QRect& rect, double horz, double vert, + TQRect& rect, double horz, double vert, BlurMethod method, KisProgressDisplayInterface * progressDisplay); //gaussian blur helper functions void find_constants(double n_p[], double n_m[], double d_p[], double d_m[], double bd_p[], double bd_m[], double std_dev); - void transfer_pixels(double *src1, double *src2, Q_UINT8 *dest, Q_INT32 bytes, Q_INT32 width); - Q_INT32* make_curve(double sigma, Q_INT32 *length); - void run_length_encode (Q_UINT8 *src, Q_INT32 *dest, Q_INT32 bytes, Q_INT32 width); - void multiply_alpha (Q_UINT8 *buf, Q_INT32 width, Q_INT32 bytes); - void separate_alpha (Q_UINT8 *buf, Q_INT32 width, Q_INT32 bytes); + void transfer_pixels(double *src1, double *src2, TQ_UINT8 *dest, TQ_INT32 bytes, TQ_INT32 width); + TQ_INT32* make_curve(double sigma, TQ_INT32 *length); + void run_length_encode (TQ_UINT8 *src, TQ_INT32 *dest, TQ_INT32 bytes, TQ_INT32 width); + void multiply_alpha (TQ_UINT8 *buf, TQ_INT32 width, TQ_INT32 bytes); + void separate_alpha (TQ_UINT8 *buf, TQ_INT32 width, TQ_INT32 bytes); private: KisView * m_view; diff --git a/krita/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cc b/krita/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cc index efe01a95..eabbe0f1 100644 --- a/krita/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cc +++ b/krita/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cc @@ -39,16 +39,16 @@ K_EXPORT_COMPONENT_FACTORY( kritadropshadow, KGenericFactory<KisDropshadowPlugin>( "krita" ) ) -KisDropshadowPlugin::KisDropshadowPlugin(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +KisDropshadowPlugin::KisDropshadowPlugin(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { - if ( parent->inherits("KisView") ) { + if ( tqparent->inherits("KisView") ) { setInstance(KGenericFactory<KisDropshadowPlugin>::instance()); setXMLFile(locate("data","kritaplugins/dropshadow.rc"), true); - m_view = (KisView*) parent; - (void) new KAction(i18n("Add Drop Shadow..."), 0, 0, this, SLOT(slotDropshadow()), actionCollection(), "dropshadow"); + m_view = (KisView*) tqparent; + (void) new KAction(i18n("Add Drop Shadow..."), 0, 0, this, TQT_SLOT(slotDropshadow()), actionCollection(), "dropshadow"); } } @@ -71,7 +71,7 @@ void KisDropshadowPlugin::slotDropshadow() dlgDropshadow->setCaption(i18n("Drop Shadow")); - if (dlgDropshadow->exec() == QDialog::Accepted) { + if (dlgDropshadow->exec() == TQDialog::Accepted) { KisDropshadow dropshadow(m_view); dropshadow.dropshadow(m_view->canvasSubject()->progressDisplay(), diff --git a/krita/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.h b/krita/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.h index fd64acdb..fc888dfb 100644 --- a/krita/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.h +++ b/krita/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.h @@ -29,8 +29,9 @@ class KisView; class KisDropshadowPlugin : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - KisDropshadowPlugin(QObject *parent, const char *name, const QStringList &); + KisDropshadowPlugin(TQObject *tqparent, const char *name, const TQStringList &); virtual ~KisDropshadowPlugin(); private slots: diff --git a/krita/plugins/viewplugins/dropshadow/wdg_dropshadow.ui b/krita/plugins/viewplugins/dropshadow/wdg_dropshadow.ui index d78999c8..4bd2f38c 100644 --- a/krita/plugins/viewplugins/dropshadow/wdg_dropshadow.ui +++ b/krita/plugins/viewplugins/dropshadow/wdg_dropshadow.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgDropshadow</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgDropshadow</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -24,7 +24,7 @@ <string>Offset X:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -32,7 +32,7 @@ <string>Offset Y:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -40,7 +40,7 @@ <string>Blur radius:</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -48,7 +48,7 @@ <string>Color:</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -56,7 +56,7 @@ <string>Opacity:</string> </property> </widget> - <widget class="QSlider" row="4" column="1" rowspan="1" colspan="2"> + <widget class="TQSlider" row="4" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>opacitySlider</cstring> </property> @@ -70,7 +70,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QSpinBox" row="4" column="3"> + <widget class="TQSpinBox" row="4" column="3"> <property name="name"> <cstring>opacitySpinBox</cstring> </property> @@ -84,7 +84,7 @@ <number>80</number> </property> </widget> - <widget class="QCheckBox" row="5" column="0" rowspan="1" colspan="4"> + <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>allowResizingCheckBox</cstring> </property> @@ -95,7 +95,7 @@ <bool>true</bool> </property> </widget> - <widget class="QSpinBox" row="0" column="1"> + <widget class="TQSpinBox" row="0" column="1"> <property name="name"> <cstring>xOffsetSpinBox</cstring> </property> @@ -116,14 +116,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>200</width> <height>20</height> </size> </property> </spacer> - <widget class="QSpinBox" row="1" column="1"> + <widget class="TQSpinBox" row="1" column="1"> <property name="name"> <cstring>yOffsetSpinBox</cstring> </property> @@ -144,14 +144,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>200</width> <height>20</height> </size> </property> </spacer> - <widget class="QSpinBox" row="2" column="1"> + <widget class="TQSpinBox" row="2" column="1"> <property name="name"> <cstring>blurRadiusSpinBox</cstring> </property> @@ -169,7 +169,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>190</width> <height>20</height> @@ -194,7 +194,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>120</width> <height>31</height> @@ -228,7 +228,7 @@ <tabstop>opacitySpinBox</tabstop> <tabstop>allowResizingCheckBox</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> </includehints> diff --git a/krita/plugins/viewplugins/filtersgallery/filters_gallery.cc b/krita/plugins/viewplugins/filtersgallery/filters_gallery.cc index f0849807..a6d2d6d9 100644 --- a/krita/plugins/viewplugins/filtersgallery/filters_gallery.cc +++ b/krita/plugins/viewplugins/filtersgallery/filters_gallery.cc @@ -21,7 +21,7 @@ #include "filters_gallery.h" -#include <qapplication.h> +#include <tqapplication.h> #include <kdebug.h> #include <kgenericfactory.h> @@ -48,25 +48,25 @@ namespace FiltersGallery { typedef KGenericFactory<KritaFiltersGallery> KritaFiltersGalleryFactory; K_EXPORT_COMPONENT_FACTORY( kritafiltersgallery, KritaFiltersGalleryFactory( "krita" ) ) -KritaFiltersGallery::KritaFiltersGallery(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +KritaFiltersGallery::KritaFiltersGallery(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { - if ( parent->inherits("KisView") ) + if ( tqparent->inherits("KisView") ) { setInstance(KritaFiltersGallery::instance()); setXMLFile(locate("data","kritaplugins/kritafiltersgallery.rc"), true); - m_view = (KisView*) parent; + m_view = (KisView*) tqparent; - (void) new KAction(i18n("&Filters Gallery"), 0, 0, this, SLOT(showFiltersGalleryDialog()), actionCollection(), "krita_filters_gallery"); + (void) new KAction(i18n("&Filters Gallery"), 0, 0, this, TQT_SLOT(showFiltersGalleryDialog()), actionCollection(), "krita_filters_gallery"); // Add a docker with the list of filters -// QImage img; +// TQImage img; // if(img.load(locate("data","krita/images/previewfilter.png"))) // { // KisPaintDeviceSP preview = new KisPaintDevice(KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID("RGBA",""),"")); -// preview->convertFromQImage(img,""); +// preview->convertFromTQImage(img,""); // m_view->canvasSubject()->paletteManager()->addWidget(new KisFiltersListView(preview,m_view),"filterslist",krita::EFFECTSBOX, 0); // } @@ -84,7 +84,7 @@ void KritaFiltersGallery::showFiltersGalleryDialog() KisDlgFiltersGallery dlg(m_view, m_view); if (dlg.exec()) { - QApplication::setOverrideCursor( Qt::waitCursor ); + TQApplication::setOverrideCursor( TQt::waitCursor ); KisFilter* filter = dlg.currentFilter(); if(filter ) @@ -94,13 +94,13 @@ void KritaFiltersGallery::showFiltersGalleryDialog() KisPaintDeviceSP dev = img->activeDevice(); if (!dev) return; - QRect r1 = dev->exactBounds(); - QRect r2 = img->bounds(); + TQRect r1 = dev->exactBounds(); + TQRect r2 = img->bounds(); - QRect rect = r1.intersect(r2); + TQRect rect = r1.intersect(r2); if (dev->hasSelection()) { - QRect r3 = dev->selection()->selectedExactRect(); + TQRect r3 = dev->selection()->selectedExactRect(); rect = rect.intersect(r3); } KisFilterConfiguration* config = filter->configuration( dlg.currentConfigWidget()); @@ -125,7 +125,7 @@ void KritaFiltersGallery::showFiltersGalleryDialog() delete cmd; } filter->disableProgress(); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); } } diff --git a/krita/plugins/viewplugins/filtersgallery/filters_gallery.h b/krita/plugins/viewplugins/filtersgallery/filters_gallery.h index 0e45e582..6be60d94 100644 --- a/krita/plugins/viewplugins/filtersgallery/filters_gallery.h +++ b/krita/plugins/viewplugins/filtersgallery/filters_gallery.h @@ -32,8 +32,9 @@ namespace FiltersGallery { class KritaFiltersGallery : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - KritaFiltersGallery(QObject *parent, const char *name, const QStringList &); + KritaFiltersGallery(TQObject *tqparent, const char *name, const TQStringList &); virtual ~KritaFiltersGallery(); public slots: void showFiltersGalleryDialog(); diff --git a/krita/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc b/krita/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc index bb7c20ee..8269ee57 100644 --- a/krita/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc +++ b/krita/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc @@ -21,10 +21,10 @@ */ #include "kis_dlg_filtersgallery.h" -#include <qgroupbox.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qdatetime.h> +#include <tqgroupbox.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqdatetime.h> #include <kis_filter.h> #include <kis_filter_config_widget.h> @@ -43,8 +43,8 @@ namespace Plugins { namespace FiltersGallery { -KisDlgFiltersGallery::KisDlgFiltersGallery(KisView* view, QWidget* parent,const char *name) - : KDialogBase(parent,name, true,i18n("Filters Gallery"), Ok | Cancel), m_view(view),m_currentConfigWidget(0), m_currentFilter(0) +KisDlgFiltersGallery::KisDlgFiltersGallery(KisView* view, TQWidget* tqparent,const char *name) + : KDialogBase(tqparent,name, true,i18n("Filters Gallery"), Ok | Cancel), m_view(view),m_currentConfigWidget(0), m_currentFilter(0) { // Initialize main widget m_widget = new KisWdgFiltersGallery(this); @@ -53,21 +53,21 @@ KisDlgFiltersGallery::KisDlgFiltersGallery(KisView* view, QWidget* parent,const setMainWidget(m_widget); // Initialize filters list - connect(m_widget->filtersList , SIGNAL(selectionChanged(QIconViewItem*)), this, SLOT(selectionHasChanged(QIconViewItem* ))); + connect(m_widget->filtersList , TQT_SIGNAL(selectionChanged(TQIconViewItem*)), this, TQT_SLOT(selectionHasChanged(TQIconViewItem* ))); // Initialize configWidgetHolder m_widget->configWidgetHolder->setColumnLayout ( 0, Qt::Horizontal ); - //m_widget->configWidgetHolder->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum); + //m_widget->configWidgetHolder->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum); // Initialize preview widget if (m_view->canvasSubject()->currentImg() && m_view->canvasSubject()->currentImg()->activeDevice()) { m_widget->previewWidget->slotSetDevice( m_view->canvasSubject()->currentImg()->activeDevice().data() ); } - connect( m_widget->previewWidget, SIGNAL(updated()), this, SLOT(refreshPreview())); - resize( minimumSizeHint()); - m_widget->previewWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::MinimumExpanding); - m_labelNoCW = new QLabel(i18n("No configuration options are available for this filter."), m_widget->configWidgetHolder); - m_widget->configWidgetHolder->layout()->add(m_labelNoCW); + connect( m_widget->previewWidget, TQT_SIGNAL(updated()), this, TQT_SLOT(refreshPreview())); + resize( tqminimumSizeHint()); + m_widget->previewWidget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::MinimumExpanding); + m_labelNoCW = new TQLabel(i18n("No configuration options are available for this filter."), m_widget->configWidgetHolder); + m_widget->configWidgetHolder->tqlayout()->add(m_labelNoCW); m_labelNoCW->hide(); } @@ -75,13 +75,13 @@ KisDlgFiltersGallery::~KisDlgFiltersGallery() { } -void KisDlgFiltersGallery::selectionHasChanged ( QIconViewItem * item ) +void KisDlgFiltersGallery::selectionHasChanged ( TQIconViewItem * item ) { KisFiltersIconViewItem* kisitem = (KisFiltersIconViewItem*) item; m_currentFilter = kisitem->filter(); if(m_currentConfigWidget != 0) { - m_widget->configWidgetHolder->layout()->remove(m_currentConfigWidget); + m_widget->configWidgetHolder->tqlayout()->remove(m_currentConfigWidget); delete m_currentConfigWidget; m_currentConfigWidget = 0; } else { @@ -94,10 +94,10 @@ void KisDlgFiltersGallery::selectionHasChanged ( QIconViewItem * item ) m_currentConfigWidget = m_currentFilter->createConfigurationWidget(m_widget->configWidgetHolder, activeLayer->paintDevice()); if(m_currentConfigWidget != 0) { - //m_currentConfigWidget->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); - m_widget->configWidgetHolder->layout()->add(m_currentConfigWidget); + //m_currentConfigWidget->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); + m_widget->configWidgetHolder->tqlayout()->add(m_currentConfigWidget); m_currentConfigWidget->show(); - connect(m_currentConfigWidget, SIGNAL(sigPleaseUpdatePreview()), this, SLOT(slotConfigChanged())); + connect(m_currentConfigWidget, TQT_SIGNAL(sigPleaseUpdatePreview()), this, TQT_SLOT(slotConfigChanged())); } else { m_labelNoCW->show(); diff --git a/krita/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.h b/krita/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.h index a6a216ca..258311c0 100644 --- a/krita/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.h +++ b/krita/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.h @@ -26,9 +26,9 @@ class KisView; class KisFilter; -class QIconViewItem; -class QLabel; -class QHBoxLayout; +class TQIconViewItem; +class TQLabel; +class TQHBoxLayout; class KisPreviewWidget; class KisWdgFiltersGallery; class KisFiltersListView; @@ -43,22 +43,23 @@ namespace FiltersGallery { class KisDlgFiltersGallery : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KisDlgFiltersGallery(KisView* view, QWidget* parent,const char *name = ""); + KisDlgFiltersGallery(KisView* view, TQWidget* tqparent,const char *name = ""); ~KisDlgFiltersGallery(); public: inline KisFilter* currentFilter() { return m_currentFilter; }; - inline QWidget* currentConfigWidget() { return m_currentConfigWidget; } + inline TQWidget* currentConfigWidget() { return m_currentConfigWidget; } private slots: void slotConfigChanged(); void refreshPreview(); - void selectionHasChanged ( QIconViewItem * item ); + void selectionHasChanged ( TQIconViewItem * item ); private: KisWdgFiltersGallery* m_widget; KisView* m_view; - QWidget* m_currentConfigWidget; + TQWidget* m_currentConfigWidget; KisFilter* m_currentFilter; - QLabel* m_labelNoCW; + TQLabel* m_labelNoCW; }; } diff --git a/krita/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui b/krita/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui index 35553294..488c9564 100644 --- a/krita/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui +++ b/krita/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KisWdgFiltersGallery</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KisWdgFiltersGallery</cstring> </property> @@ -37,7 +37,7 @@ <cstring>filtersList</cstring> </property> </widget> - <widget class="QGroupBox" row="0" column="2"> + <widget class="TQGroupBox" row="0" column="2"> <property name="name"> <cstring>configWidgetHolder</cstring> </property> @@ -49,7 +49,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -115,7 +115,7 @@ <data format="PNG" length="1122">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042949444154388db5954d6c545514c77ff7de37eff1a6a550da994e5ba798868f948fc847a2a2911816c436b0a02ed0083161a1981877ee10d90aa94656063491882c5cd4c4b8103f20cd806909a98604da8482341de80cb69de9bcd799799d79efba980f1da3a80b4f727273939bdff99f9b93f3175a6b6a21849080020c4002a29a8f0a5dcd002803bed63a1035f0d0d0504b6f6fef51d7758fa4d3e98d8ee3fc03af128ee3303939399548242eb8aefb09300f78464de9f0f0f0d148cc7caf3d5424de97a7ec17104220242805520a44557bbd4b21f083801d33e63a6d1bc7bf19c6064e0319a35a58b9ae7ba43d54e4d7c54b64dc097c7f09d30ef04b36736983cc7c11b4456b9b492c5e20dc54a6540e00896a8268a7017010f8bcae1830d2e9f4c69ebe3c197782b2ce60d94ddc9b30f9feeb45ae5d7181c5ead35636ef08d3ffe26a76ee3208b4031a56d80aa00768fda362e9380e25bf80ef3b587613d7afc099533380a4b5dda46fcb5aa42998b9eb7173dce5e6788e434763ec7fc942532008ea436003660d2caa7f8d69c3bd8910674e4d033e83877ad8d36fb0aa4d6058658ac5358c5df6383bf480f31fdda5a3632bbbfb6da4ccd5c00a10b2012cc12fd97cfb5516f0187c25cee0619396480ec3ca909d0f3372d1e5f9fe66de3ad605587c712ec55256a2540d5519d19ae24a29057329839f7ecc138944d833102290f3184ae1e6d6f0e98739c61229e6d21eafbed1c9c8c5558c8f3ee4ceed76946a1c43d97091828585223e2eebfbc295f60d45de89707628cb58224577bc85a79e5d4d786581cddb9b0148259711b20145836221400416e0232d1f6595c9ce4538773ac7b54406f0b15784e8e80aa1ac2594190220d021e49f2437960156b70ba095e95f96f18acd8c263cc6122962b1167a7ba34cdd7ec8c977a699bed546722a8fc2a02b6e2185fff78ab586ce78894ddb9ab9f5738ed14b1e030756929d8ff2e4ae5544632b38f96e89a99b298ebd6950cc2d12ed0eb3618b26f520788462ad09877df60db600f0f1fb49c646f21c7ebd836dcf94e9d9b4c0db27d6d3bd36c6426a96bce731703046d7da129a4670836284a054869d4f1b1c7e2dca67676ef3c1898091ef5ad8bc358c3205c93bf7c9a40ad4c660f4728edd7bbb3142ea2fc1da711cfc200011e08b45f6bd1c261adbce9717928c5f9d63fc6a19f0014567773303073790f8214bd6f5282dfbb8b9fa1f6b40d7c1939393533b92e63ad9240990484aec7e41b27d579cbb531e0f67023492d86316ebb768ba1e0f786e6f37e56550c62237aee7011e54abd7c1412291b8a06de378b4d3c0b215da9708e5a3a442192085404a83d4accfecac067c0c43e13a70e3fa12e96409e0325000966bbb354465339d04a6f9dd15fe6dde07ce030780278088d05ad72cc9a6b2f2daaaa74d75a1f0e8d0d5f60b40868a8364ead6248430000b0857a126ffcdf396abf03ce089ffcb4c7f033046c6b4a995e7a00000000049454e44ae426082</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kis_previewwidget.h</includehint> <includehint>kis_filters_listview.h</includehint> diff --git a/krita/plugins/viewplugins/histogram/dlg_histogram.cc b/krita/plugins/viewplugins/histogram/dlg_histogram.cc index 0440c9db..fe27b257 100644 --- a/krita/plugins/viewplugins/histogram/dlg_histogram.cc +++ b/krita/plugins/viewplugins/histogram/dlg_histogram.cc @@ -17,14 +17,14 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qbuttongroup.h> -#include <qpushbutton.h> -#include <qcheckbox.h> -#include <qslider.h> -#include <qcombobox.h> -#include <qpixmap.h> -#include <qimage.h> -#include <qlabel.h> +#include <tqbuttongroup.h> +#include <tqpushbutton.h> +#include <tqcheckbox.h> +#include <tqslider.h> +#include <tqcombobox.h> +#include <tqpixmap.h> +#include <tqimage.h> +#include <tqlabel.h> #include <knuminput.h> #include <klocale.h> @@ -39,15 +39,15 @@ #include "kis_histogram_widget.h" -DlgHistogram::DlgHistogram( QWidget * parent, const char * name) - : super (parent, name, true, i18n("Histogram"), Ok | Cancel, Ok) +DlgHistogram::DlgHistogram( TQWidget * tqparent, const char * name) + : super (tqparent, name, true, i18n("Histogram"), Ok | Cancel, Ok) { m_page = new KisHistogramWidget(this, "histogram"); Q_CHECK_PTR(m_page); setCaption(i18n("Histogram")); setMainWidget(m_page); - resize(m_page->sizeHint()); + resize(m_page->tqsizeHint()); } DlgHistogram::~DlgHistogram() diff --git a/krita/plugins/viewplugins/histogram/dlg_histogram.h b/krita/plugins/viewplugins/histogram/dlg_histogram.h index 790e77ef..8e3fda00 100644 --- a/krita/plugins/viewplugins/histogram/dlg_histogram.h +++ b/krita/plugins/viewplugins/histogram/dlg_histogram.h @@ -35,10 +35,11 @@ class KisHistogramWidget; class DlgHistogram: public KDialogBase { typedef KDialogBase super; Q_OBJECT + TQ_OBJECT public: - DlgHistogram(QWidget * parent = 0, + DlgHistogram(TQWidget * tqparent = 0, const char* name = 0); ~DlgHistogram(); diff --git a/krita/plugins/viewplugins/histogram/histogram.cc b/krita/plugins/viewplugins/histogram/histogram.cc index 7db92dee..59ea0fff 100644 --- a/krita/plugins/viewplugins/histogram/histogram.cc +++ b/krita/plugins/viewplugins/histogram/histogram.cc @@ -23,8 +23,8 @@ #include <stdlib.h> -#include <qslider.h> -#include <qpoint.h> +#include <tqslider.h> +#include <tqpoint.h> #include <klocale.h> #include <kiconloader.h> @@ -52,27 +52,27 @@ typedef KGenericFactory<Histogram> HistogramFactory; K_EXPORT_COMPONENT_FACTORY( kritahistogram, HistogramFactory( "krita" ) ) -Histogram::Histogram(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +Histogram::Histogram(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { - if ( parent->inherits("KisView") ) { + if ( tqparent->inherits("KisView") ) { setInstance(HistogramFactory::instance()); setXMLFile(locate("data","kritaplugins/histogram.rc"), true); - m_action = new KAction(i18n("&Histogram"), 0, 0, this, SLOT(slotActivated()), actionCollection(), "histogram"); + m_action = new KAction(i18n("&Histogram"), 0, 0, this, TQT_SLOT(slotActivated()), actionCollection(), "histogram"); - m_view = (KisView*) parent; + m_view = (KisView*) tqparent; if (KisImageSP img = m_view->canvasSubject()->currentImg()) { - connect(img, SIGNAL(sigLayersChanged(KisGroupLayerSP)), this, SLOT(slotLayersChanged())); - connect(img, SIGNAL(sigLayerAdded(KisLayerSP)), this, SLOT(slotLayersChanged())); - connect(img, SIGNAL(sigLayerActivated(KisLayerSP)), this, SLOT(slotLayersChanged())); - connect(img, SIGNAL(sigLayerPropertiesChanged(KisLayerSP)), this, SLOT(slotLayersChanged())); - connect(img, SIGNAL(sigLayerRemoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)), - this, SLOT(slotLayersChanged())); - connect(img, SIGNAL(sigLayerMoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)), - this, SLOT(slotLayersChanged())); + connect(img, TQT_SIGNAL(sigLayersChanged(KisGroupLayerSP)), this, TQT_SLOT(slotLayersChanged())); + connect(img, TQT_SIGNAL(sigLayerAdded(KisLayerSP)), this, TQT_SLOT(slotLayersChanged())); + connect(img, TQT_SIGNAL(sigLayerActivated(KisLayerSP)), this, TQT_SLOT(slotLayersChanged())); + connect(img, TQT_SIGNAL(sigLayerPropertiesChanged(KisLayerSP)), this, TQT_SLOT(slotLayersChanged())); + connect(img, TQT_SIGNAL(sigLayerRemoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)), + this, TQT_SLOT(slotLayersChanged())); + connect(img, TQT_SIGNAL(sigLayerMoved(KisLayerSP, KisGroupLayerSP, KisLayerSP)), + this, TQT_SLOT(slotLayersChanged())); m_img = img; } } @@ -95,7 +95,7 @@ void Histogram::slotActivated() if (dev) dlgHistogram->setPaintDevice(dev); - if (dlgHistogram->exec() == QDialog::Accepted) { + if (dlgHistogram->exec() == TQDialog::Accepted) { // Do nothing; this is an informational dialog } delete dlgHistogram; diff --git a/krita/plugins/viewplugins/histogram/histogram.h b/krita/plugins/viewplugins/histogram/histogram.h index adaa6bfd..9cce8359 100644 --- a/krita/plugins/viewplugins/histogram/histogram.h +++ b/krita/plugins/viewplugins/histogram/histogram.h @@ -30,8 +30,9 @@ class KisImage; class Histogram : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - Histogram(QObject *parent, const char *name, const QStringList &); + Histogram(TQObject *tqparent, const char *name, const TQStringList &); virtual ~Histogram(); private slots: diff --git a/krita/plugins/viewplugins/histogram/kis_histogram_widget.cc b/krita/plugins/viewplugins/histogram/kis_histogram_widget.cc index 0e738435..12005e05 100644 --- a/krita/plugins/viewplugins/histogram/kis_histogram_widget.cc +++ b/krita/plugins/viewplugins/histogram/kis_histogram_widget.cc @@ -17,14 +17,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qpainter.h> -#include <qpixmap.h> -#include <qlabel.h> -#include <qcombobox.h> -#include <qbuttongroup.h> -#include <qpushbutton.h> -#include <qscrollbar.h> -#include <qtooltip.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqlabel.h> +#include <tqcombobox.h> +#include <tqbuttongroup.h> +#include <tqpushbutton.h> +#include <tqscrollbar.h> +#include <tqtooltip.h> #include <kdebug.h> @@ -39,8 +39,8 @@ #include "kis_colorspace.h" -KisHistogramWidget::KisHistogramWidget(QWidget *parent, const char *name) - : super(parent, name) +KisHistogramWidget::KisHistogramWidget(TQWidget *tqparent, const char *name) + : super(tqparent, name) { m_from = 0.0; m_width = 0.0; @@ -72,11 +72,11 @@ void KisHistogramWidget::setPaintDevice(KisPaintDeviceSP dev) m_from = m_histogramView->currentProducer()->viewFrom(); m_width = m_histogramView->currentProducer()->viewWidth(); - connect(grpType, SIGNAL(clicked(int)), this, SLOT(slotTypeSwitched(int))); - connect(cmbChannel, SIGNAL(activated(int)), this, SLOT(setActiveChannel(int))); - connect(zoomIn, SIGNAL(clicked()), this, SLOT(slotZoomIn())); - connect(zoomOut, SIGNAL(clicked()), this, SLOT(slotZoomOut())); - connect(currentView, SIGNAL(valueChanged(int)), this, SLOT(slide(int))); + connect(grpType, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotTypeSwitched(int))); + connect(cmbChannel, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setActiveChannel(int))); + connect(zoomIn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotZoomIn())); + connect(zoomOut, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotZoomOut())); + connect(currentView, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slide(int))); } void KisHistogramWidget::setActiveChannel(int channel) diff --git a/krita/plugins/viewplugins/histogram/kis_histogram_widget.h b/krita/plugins/viewplugins/histogram/kis_histogram_widget.h index 84b551d8..f83394e7 100644 --- a/krita/plugins/viewplugins/histogram/kis_histogram_widget.h +++ b/krita/plugins/viewplugins/histogram/kis_histogram_widget.h @@ -30,9 +30,10 @@ class KisColorSpace; class KisHistogramWidget : public WdgHistogram { typedef WdgHistogram super; Q_OBJECT + TQ_OBJECT public: - KisHistogramWidget(QWidget *parent, const char *name); + KisHistogramWidget(TQWidget *tqparent, const char *name); virtual ~KisHistogramWidget(); void setPaintDevice(KisPaintDeviceSP dev); diff --git a/krita/plugins/viewplugins/histogram/wdghistogram.ui b/krita/plugins/viewplugins/histogram/wdghistogram.ui index e538adae..77c418ed 100644 --- a/krita/plugins/viewplugins/histogram/wdghistogram.ui +++ b/krita/plugins/viewplugins/histogram/wdghistogram.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgHistogram</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgHistogram</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>grpType</cstring> </property> @@ -27,7 +27,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="2"> + <widget class="TQRadioButton" row="0" column="2"> <property name="name"> <cstring>radioLinear</cstring> </property> @@ -38,7 +38,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton" row="1" column="2" rowspan="2" colspan="1"> + <widget class="TQRadioButton" row="1" column="2" rowspan="2" colspan="1"> <property name="name"> <cstring>radioLog</cstring> </property> @@ -56,14 +56,14 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QComboBox" row="0" column="1" rowspan="2" colspan="1"> + <widget class="TQComboBox" row="0" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>cmbChannel</cstring> </property> @@ -75,14 +75,14 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>200</width> <height>0</height> </size> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="2" colspan="1"> + <widget class="TQLabel" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>lblChannel</cstring> </property> @@ -103,7 +103,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> @@ -124,22 +124,22 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>256</width> <height>150</height> </size> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -147,7 +147,7 @@ <string>View:</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>zoomIn</cstring> </property> @@ -163,7 +163,7 @@ <string>+</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>zoomOut</cstring> </property> @@ -179,7 +179,7 @@ <string>-</string> </property> </widget> - <widget class="QScrollBar"> + <widget class="TQScrollBar"> <property name="name"> <cstring>currentView</cstring> </property> @@ -222,7 +222,7 @@ <data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e0582c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44ae426082</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kis_histogram_view.h</includehint> </includehints> diff --git a/krita/plugins/viewplugins/histogram_docker/histogramdocker.cc b/krita/plugins/viewplugins/histogram_docker/histogramdocker.cc index 93d77bfb..2b458de4 100644 --- a/krita/plugins/viewplugins/histogram_docker/histogramdocker.cc +++ b/krita/plugins/viewplugins/histogram_docker/histogramdocker.cc @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qtooltip.h> +#include <tqtooltip.h> #include <klocale.h> #include <kiconloader.h> @@ -46,12 +46,12 @@ typedef KGenericFactory<KritaHistogramDocker> KritaHistogramDockerFactory; K_EXPORT_COMPONENT_FACTORY( kritahistogramdocker, KritaHistogramDockerFactory( "krita" ) ) -KritaHistogramDocker::KritaHistogramDocker(QObject *parent, const char *name, const QStringList&) - : KParts::Plugin(parent, name) +KritaHistogramDocker::KritaHistogramDocker(TQObject *tqparent, const char *name, const TQStringList&) + : KParts::Plugin(tqparent, name) { - if ( parent->inherits("KisView") ) { - m_view = dynamic_cast<KisView*>(parent); + if ( tqparent->inherits("KisView") ) { + m_view = dynamic_cast<KisView*>(tqparent); setInstance(KritaHistogramDockerFactory::instance()); setXMLFile(locate("data","kritaplugins/kritahistogramdocker.rc"), true); @@ -68,7 +68,7 @@ KritaHistogramDocker::KritaHistogramDocker(QObject *parent, const char *name, co m_hview = new KisHistogramView(m_view); - QToolTip::add(m_hview, i18n("Right-click to select histogram type")); + TQToolTip::add(m_hview, i18n("Right-click to select histogram type")); m_hview->setHistogram(m_histogram); m_hview->setColor(true); m_hview->setCurrentChannels(m_producer, m_producer->channels()); @@ -76,14 +76,14 @@ KritaHistogramDocker::KritaHistogramDocker(QObject *parent, const char *name, co m_hview->setCaption(i18n("Histogram")); - connect(m_hview, SIGNAL(rightClicked(const QPoint&)), - this, SLOT(popupMenu(const QPoint&))); - connect(m_cache, SIGNAL(cacheUpdated()), - new HistogramDockerUpdater(this, m_histogram, m_hview, m_producer), SLOT(updated())); - connect(&m_popup, SIGNAL(activated(int)), - this, SLOT(producerChanged(int))); - connect(img, SIGNAL(sigColorSpaceChanged(KisColorSpace*)), - this, SLOT(colorSpaceChanged(KisColorSpace*))); // No need to force updates here + connect(m_hview, TQT_SIGNAL(rightClicked(const TQPoint&)), + this, TQT_SLOT(popupMenu(const TQPoint&))); + connect(m_cache, TQT_SIGNAL(cacheUpdated()), + new HistogramDockerUpdater(this, m_histogram, m_hview, m_producer), TQT_SLOT(updated())); + connect(&m_popup, TQT_SIGNAL(activated(int)), + this, TQT_SLOT(producerChanged(int))); + connect(img, TQT_SIGNAL(sigColorSpaceChanged(KisColorSpace*)), + this, TQT_SLOT(colorSpaceChanged(KisColorSpace*))); // No need to force updates here // Add it to the control palette m_view->canvasSubject()->paletteManager()->addWidget( @@ -143,12 +143,12 @@ void KritaHistogramDocker::producerChanged(int pos) m_hview->setColor(true); m_hview->setCurrentChannels(m_producer, m_producer->channels()); - connect(m_cache, SIGNAL(cacheUpdated()), - new HistogramDockerUpdater(this, m_histogram, m_hview, m_producer), SLOT(updated())); + connect(m_cache, TQT_SIGNAL(cacheUpdated()), + new HistogramDockerUpdater(this, m_histogram, m_hview, m_producer), TQT_SLOT(updated())); } } -void KritaHistogramDocker::popupMenu(const QPoint& pos) +void KritaHistogramDocker::popupMenu(const TQPoint& pos) { m_popup.popup(pos, m_currentProducerPos); } @@ -171,11 +171,11 @@ void KritaHistogramDocker::colorSpaceChanged(KisColorSpace* cs) producerChanged(0); } -HistogramDockerUpdater::HistogramDockerUpdater(QObject* /*parent*/, KisHistogramSP h, KisHistogramView* v, +HistogramDockerUpdater::HistogramDockerUpdater(TQObject* /*tqparent*/, KisHistogramSP h, KisHistogramView* v, KisAccumulatingHistogramProducer* p) : m_histogram(h), m_view(v), m_producer(p) { - connect(p, SIGNAL(completed()), this, SLOT(completed())); + connect(p, TQT_SIGNAL(completed()), this, TQT_SLOT(completed())); } void HistogramDockerUpdater::updated() { diff --git a/krita/plugins/viewplugins/histogram_docker/histogramdocker.h b/krita/plugins/viewplugins/histogram_docker/histogramdocker.h index 5cc57e18..bc023a89 100644 --- a/krita/plugins/viewplugins/histogram_docker/histogramdocker.h +++ b/krita/plugins/viewplugins/histogram_docker/histogramdocker.h @@ -21,8 +21,8 @@ #ifndef _HISTOGRAMDOCKER_H_ #define _HISTOGRAMDOCKER_H_ -#include <qobject.h> -#include <qpopupmenu.h> +#include <tqobject.h> +#include <tqpopupmenu.h> #include <kparts/plugin.h> #include <kis_histogram_view.h> @@ -39,12 +39,13 @@ class KisColorSpace; class KritaHistogramDocker : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - KritaHistogramDocker(QObject *parent, const char *name, const QStringList &); + KritaHistogramDocker(TQObject *tqparent, const char *name, const TQStringList &); virtual ~KritaHistogramDocker(); private slots: void producerChanged(int pos); - void popupMenu(const QPoint & pos); + void popupMenu(const TQPoint & pos); void colorSpaceChanged(KisColorSpace* cs); private: KisHistogramProducerFactory* m_factory; @@ -54,17 +55,18 @@ private: KisView* m_view; KisHistogramView* m_hview; KisImageRasteredCache* m_cache; - QPopupMenu m_popup; + TQPopupMenu m_popup; KisHistogramSP m_histogram; uint m_currentProducerPos; }; class KisGenericRGBHistogramProducerFactory; -class HistogramDockerUpdater : public QObject { +class HistogramDockerUpdater : public TQObject { Q_OBJECT + TQ_OBJECT public: - HistogramDockerUpdater(QObject* parent, KisHistogramSP h, KisHistogramView* v, + HistogramDockerUpdater(TQObject* tqparent, KisHistogramSP h, KisHistogramView* v, KisAccumulatingHistogramProducer* p); public slots: void updated(); diff --git a/krita/plugins/viewplugins/histogram_docker/kis_accumulating_producer.cc b/krita/plugins/viewplugins/histogram_docker/kis_accumulating_producer.cc index f899f2af..dd315549 100644 --- a/krita/plugins/viewplugins/histogram_docker/kis_accumulating_producer.cc +++ b/krita/plugins/viewplugins/histogram_docker/kis_accumulating_producer.cc @@ -18,20 +18,20 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qthread.h> -#include <qapplication.h> -#include <qevent.h> +#include <tqthread.h> +#include <tqapplication.h> +#include <tqevent.h> #include "kis_accumulating_producer.h" -static const int EmitCompletedType = QEvent::User + 1; +static const int EmitCompletedType = TQEvent::User + 1; /** * The threaded producer definition in c++ file because this is really an internal affair. * Note that since we _know_ that we'll only have a single instance of it running, at most, * we don't care too much about locking and synchronization **/ -class KisAccumulatingHistogramProducer::ThreadedProducer : public QThread { +class KisAccumulatingHistogramProducer::ThreadedProducer : public TQThread { KisAccumulatingHistogramProducer* m_source; bool m_stop; protected: @@ -71,7 +71,7 @@ void KisAccumulatingHistogramProducer::ThreadedProducer::run() { uint count = m_source->m_source->count(); // Talk about bad naming schemes... KisCachedHistogramObserver::Producers* source = m_source->m_source; - QValueVector<vBins>& bins = m_source->m_bins; + TQValueVector<vBins>& bins = m_source->m_bins; int channels = m_source->m_channels; int nrOfBins = m_source->m_nrOfBins; @@ -88,11 +88,11 @@ void KisAccumulatingHistogramProducer::ThreadedProducer::run() { if (!m_stop) { // This function is thread-safe; and it takes ownership of the event - QApplication::postEvent(m_source, new QCustomEvent(EmitCompletedType)); + TQApplication::postEvent(m_source, new TQCustomEvent(EmitCompletedType)); } } -void KisAccumulatingHistogramProducer::customEvent(QCustomEvent* e) { +void KisAccumulatingHistogramProducer::customEvent(TQCustomEvent* e) { if (e->type() == EmitCompletedType) { emit completed(); } diff --git a/krita/plugins/viewplugins/histogram_docker/kis_accumulating_producer.h b/krita/plugins/viewplugins/histogram_docker/kis_accumulating_producer.h index 4ef9f02a..46a0717d 100644 --- a/krita/plugins/viewplugins/histogram_docker/kis_accumulating_producer.h +++ b/krita/plugins/viewplugins/histogram_docker/kis_accumulating_producer.h @@ -21,7 +21,7 @@ #ifndef _KIS_ACCUMULATING_PRODUCER_H_ #define _KIS_ACCUMULATING_PRODUCER_H_ -#include <qobject.h> +#include <tqobject.h> #include <kis_basic_histogram_producers.h> #include "kis_cachedhistogram.h" @@ -34,23 +34,24 @@ * of HistogramProducers if you'd take addRegionsToBinAsync = addRegionToBin, but since that is * already violated with the asynchronousity of it that is not really an issue anymore, I think) **/ -class KisAccumulatingHistogramProducer : public QObject, public KisBasicHistogramProducer { +class KisAccumulatingHistogramProducer : public TQObject, public KisBasicHistogramProducer { Q_OBJECT + TQ_OBJECT public: KisAccumulatingHistogramProducer(KisCachedHistogramObserver::Producers* source); ~KisAccumulatingHistogramProducer(); /// Does _nothing_, use addRegionsToBinAsync - virtual void addRegionToBin(Q_UINT8 *, Q_UINT8*, Q_UINT32, KisColorSpace *) {} + virtual void addRegionToBin(TQ_UINT8 *, TQ_UINT8*, TQ_UINT32, KisColorSpace *) {} virtual void addRegionsToBinAsync(); - virtual QString positionToString(double pos) const + virtual TQString positionToString(double pos) const { return m_source->at(0)->positionToString(pos); } virtual void setView(double, double) {} // No view support virtual double maximalZoom() const { return 1.0; } - virtual Q_INT32 numberOfBins() { return m_source->at(0)->numberOfBins(); } + virtual TQ_INT32 numberOfBins() { return m_source->at(0)->numberOfBins(); } - virtual QValueVector<KisChannelInfo *> channels() { return m_source->at(0)->channels(); } + virtual TQValueVector<KisChannelInfo *> channels() { return m_source->at(0)->channels(); } /// Call this when the 'source' list has changed colorspace virtual void changedSourceProducer() { @@ -63,7 +64,7 @@ signals: void completed(); protected: - virtual void customEvent(QCustomEvent* e); + virtual void customEvent(TQCustomEvent* e); /// source already converts external to internal virtual int externalToInternal(int ext) { return ext; } KisCachedHistogramObserver::Producers* m_source; diff --git a/krita/plugins/viewplugins/histogram_docker/kis_cachedhistogram.h b/krita/plugins/viewplugins/histogram_docker/kis_cachedhistogram.h index dfe7a05e..a9b38a4a 100644 --- a/krita/plugins/viewplugins/histogram_docker/kis_cachedhistogram.h +++ b/krita/plugins/viewplugins/histogram_docker/kis_cachedhistogram.h @@ -21,14 +21,14 @@ #ifndef _CACHED_HISTOGRAM_H_ #define _CACHED_HISTOGRAM_H_ -#include <qvaluevector.h> +#include <tqvaluevector.h> #include <kis_histogram_producer.h> #include "kis_imagerasteredcache.h" class KisCachedHistogramObserver : public KisImageRasteredCache::Observer { public: - typedef QValueVector<KisHistogramProducer*> Producers; + typedef TQValueVector<KisHistogramProducer*> Producers; KisCachedHistogramObserver(Producers* p, KisHistogramProducerFactory* f, int x, int y, int w, int h, bool add = true) : m_producers(p), m_factory(f), m_x(x), m_y(y), m_w(w), m_h(h) diff --git a/krita/plugins/viewplugins/histogram_docker/kis_imagerasteredcache.cc b/krita/plugins/viewplugins/histogram_docker/kis_imagerasteredcache.cc index 2c6562df..19599cd9 100644 --- a/krita/plugins/viewplugins/histogram_docker/kis_imagerasteredcache.cc +++ b/krita/plugins/viewplugins/histogram_docker/kis_imagerasteredcache.cc @@ -20,7 +20,7 @@ #include <cmath> -#include <qapplication.h> +#include <tqapplication.h> #include <kdebug.h> @@ -47,21 +47,21 @@ KisImageRasteredCache::KisImageRasteredCache(KisView* view, Observer* o) imageSizeChanged(img->width(), img->height()); - connect(img, SIGNAL(sigImageUpdated(QRect)), - this, SLOT(imageUpdated(QRect))); - connect(img, SIGNAL(sigSizeChanged(Q_INT32, Q_INT32)), - this, SLOT(imageSizeChanged(Q_INT32, Q_INT32))); - connect(&m_timer, SIGNAL(timeout()), this, SLOT(timeOut())); + connect(img, TQT_SIGNAL(sigImageUpdated(TQRect)), + this, TQT_SLOT(imageUpdated(TQRect))); + connect(img, TQT_SIGNAL(sigSizeChanged(TQ_INT32, TQ_INT32)), + this, TQT_SLOT(imageSizeChanged(TQ_INT32, TQ_INT32))); + connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeOut())); } KisImageRasteredCache::~KisImageRasteredCache() { cleanUpElements(); } -void KisImageRasteredCache::imageUpdated(QRect rc) { +void KisImageRasteredCache::imageUpdated(TQRect rc) { if (rc.isValid()) { - QRect r(0, 0, m_width * m_rasterSize, m_height * m_rasterSize); + TQRect r(0, 0, m_width * m_rasterSize, m_height * m_rasterSize); r &= rc; uint x = static_cast<int>(r.x() / m_rasterSize); @@ -93,7 +93,7 @@ void KisImageRasteredCache::imageUpdated(QRect rc) { } } -void KisImageRasteredCache::imageSizeChanged(Q_INT32 w, Q_INT32 h) { +void KisImageRasteredCache::imageSizeChanged(TQ_INT32 w, TQ_INT32 h) { KisImageSP image = m_view->canvasSubject()->currentImg(); @@ -120,7 +120,7 @@ void KisImageRasteredCache::imageSizeChanged(Q_INT32 w, Q_INT32 h) { rasterX++; } - imageUpdated(QRect(0,0, image->width(), image->height())); + imageUpdated(TQRect(0,0, image->width(), image->height())); } void KisImageRasteredCache::timeOut() { @@ -140,7 +140,7 @@ void KisImageRasteredCache::timeOut() { // If there are still elements, we need to be called again (this emulates processEvents) if (!m_queue.isEmpty()) { - QTimer::singleShot(0, this, SLOT(timeOut())); + TQTimer::singleShot(0, this, TQT_SLOT(timeOut())); } else { emit cacheUpdated(); m_imageProjection = 0; diff --git a/krita/plugins/viewplugins/histogram_docker/kis_imagerasteredcache.h b/krita/plugins/viewplugins/histogram_docker/kis_imagerasteredcache.h index 6335eadb..7df7df8f 100644 --- a/krita/plugins/viewplugins/histogram_docker/kis_imagerasteredcache.h +++ b/krita/plugins/viewplugins/histogram_docker/kis_imagerasteredcache.h @@ -21,17 +21,18 @@ #ifndef _KIS_IMAGE_RASTERED_CACHE_H_ #define _KIS_IMAGE_RASTERED_CACHE_H_ -#include <qobject.h> -#include <qvaluevector.h> -#include <qvaluelist.h> -#include <qtimer.h> +#include <tqobject.h> +#include <tqvaluevector.h> +#include <tqvaluelist.h> +#include <tqtimer.h> #include <kis_paint_device.h> class KisView; -class KisImageRasteredCache : public QObject { +class KisImageRasteredCache : public TQObject { Q_OBJECT + TQ_OBJECT public: class Observer { @@ -48,8 +49,8 @@ signals: void cacheUpdated(); private slots: - void imageUpdated(QRect rc); - void imageSizeChanged(Q_INT32 w, Q_INT32 h); + void imageUpdated(TQRect rc); + void imageSizeChanged(TQ_INT32 w, TQ_INT32 h); void timeOut(); private: @@ -59,15 +60,15 @@ private: Observer* observer; bool valid; }; - typedef QValueVector< QValueVector<Element*> > Raster; - typedef QValueList<Element*> Queue; + typedef TQValueVector< TQValueVector<Element*> > Raster; + typedef TQValueList<Element*> Queue; void cleanUpElements(); Observer* m_observer; Raster m_raster; Queue m_queue; - QTimer m_timer; + TQTimer m_timer; int m_timeOutMSec; int m_rasterSize; int m_width, m_height; diff --git a/krita/plugins/viewplugins/history_docker/historydocker.cc b/krita/plugins/viewplugins/history_docker/historydocker.cc index 20b1d013..69b952ea 100644 --- a/krita/plugins/viewplugins/history_docker/historydocker.cc +++ b/krita/plugins/viewplugins/history_docker/historydocker.cc @@ -37,13 +37,13 @@ typedef KGenericFactory<KritaHistoryDocker> KritaHistoryDockerFactory; K_EXPORT_COMPONENT_FACTORY( kritahistorydocker, KritaHistoryDockerFactory( "krita" ) ) -KritaHistoryDocker::KritaHistoryDocker(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +KritaHistoryDocker::KritaHistoryDocker(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { - if ( parent->inherits("KisView") ) + if ( tqparent->inherits("KisView") ) { setInstance(KritaHistoryDockerFactory::instance()); // Create history docker diff --git a/krita/plugins/viewplugins/history_docker/historydocker.h b/krita/plugins/viewplugins/history_docker/historydocker.h index 8556d37c..922bb52e 100644 --- a/krita/plugins/viewplugins/history_docker/historydocker.h +++ b/krita/plugins/viewplugins/history_docker/historydocker.h @@ -26,7 +26,7 @@ class KritaHistoryDocker : public KParts::Plugin { public: - KritaHistoryDocker(QObject *parent, const char *name, const QStringList &); + KritaHistoryDocker(TQObject *tqparent, const char *name, const TQStringList &); virtual ~KritaHistoryDocker(); }; diff --git a/krita/plugins/viewplugins/imagesize/dlg_imagesize.cc b/krita/plugins/viewplugins/imagesize/dlg_imagesize.cc index 9a641b94..ac3a1b11 100644 --- a/krita/plugins/viewplugins/imagesize/dlg_imagesize.cc +++ b/krita/plugins/viewplugins/imagesize/dlg_imagesize.cc @@ -26,11 +26,11 @@ using namespace std; -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qbuttongroup.h> -#include <qlabel.h> -#include <qcombobox.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqbuttongroup.h> +#include <tqlabel.h> +#include <tqcombobox.h> #include <klocale.h> #include <knuminput.h> @@ -45,9 +45,9 @@ using namespace std; // XXX: I'm really real bad at arithmetic, let alone math. Here // be rounding errors. (Boudewijn) -DlgImageSize::DlgImageSize( QWidget * parent, +DlgImageSize::DlgImageSize( TQWidget * tqparent, const char * name) - : super (parent, name, true, i18n("Image Size"), Ok | Cancel, Ok) + : super (tqparent, name, true, i18n("Image Size"), Ok | Cancel, Ok) { m_lock = false; @@ -58,13 +58,13 @@ DlgImageSize::DlgImageSize( QWidget * parent, m_page->cmbFilterType->setCurrentText("Mitchell"); setMainWidget(m_page); - resize(m_page->sizeHint()); + resize(m_page->tqsizeHint()); unblockAll(); - connect(this, SIGNAL(okClicked()), - this, SLOT(okClicked())); + connect(this, TQT_SIGNAL(okClicked()), + this, TQT_SLOT(okClicked())); } @@ -78,7 +78,7 @@ void DlgImageSize::hideScaleBox() m_page->grpResizeScale->hide(); } -void DlgImageSize::setWidth(Q_UINT32 w) +void DlgImageSize::setWidth(TQ_UINT32 w) { blockAll(); @@ -90,7 +90,7 @@ void DlgImageSize::setWidth(Q_UINT32 w) unblockAll(); } -void DlgImageSize::setWidthPercent(Q_UINT32 w) +void DlgImageSize::setWidthPercent(TQ_UINT32 w) { blockAll(); @@ -101,19 +101,19 @@ void DlgImageSize::setWidthPercent(Q_UINT32 w) } -void DlgImageSize::setMaximumWidth(Q_UINT32 w) +void DlgImageSize::setMaximumWidth(TQ_UINT32 w) { m_page->intWidth->setMaxValue(w); m_maxW = w; } -Q_INT32 DlgImageSize::width() +TQ_INT32 DlgImageSize::width() { - //return (Q_INT32)qRound(m_oldW); - return (Q_INT32)qRound(m_page->intWidth->value()); + //return (TQ_INT32)tqRound(m_oldW); + return (TQ_INT32)tqRound(m_page->intWidth->value()); } -void DlgImageSize::setHeight(Q_UINT32 h) +void DlgImageSize::setHeight(TQ_UINT32 h) { blockAll(); @@ -126,7 +126,7 @@ void DlgImageSize::setHeight(Q_UINT32 h) } -void DlgImageSize::setHeightPercent(Q_UINT32 h) +void DlgImageSize::setHeightPercent(TQ_UINT32 h) { blockAll(); @@ -138,17 +138,17 @@ void DlgImageSize::setHeightPercent(Q_UINT32 h) -void DlgImageSize::setMaximumHeight(Q_UINT32 h) +void DlgImageSize::setMaximumHeight(TQ_UINT32 h) { m_page->intHeight->setMaxValue(h); m_maxH = h; } -Q_INT32 DlgImageSize::height() +TQ_INT32 DlgImageSize::height() { - //return (Q_INT32)qRound(m_oldH); - return (Q_INT32)qRound(m_page->intHeight->value()); + //return (TQ_INT32)tqRound(m_oldH); + return (TQ_INT32)tqRound(m_page->intHeight->value()); } bool DlgImageSize::scale() @@ -181,14 +181,14 @@ void DlgImageSize::slotWidthPixelsChanged(int w) double wPercent = double(w) * 100 / double(m_origW); - m_page->intWidthPercent->setValue(qRound(wPercent)); + m_page->intWidthPercent->setValue(tqRound(wPercent)); // Set height in pixels and percent of necessary if (m_page->chkConstrain->isChecked()) { - m_page->intHeightPercent->setValue(qRound(wPercent)); + m_page->intHeightPercent->setValue(tqRound(wPercent)); - m_oldH = qRound(m_origH * wPercent / 100); - m_page->intHeight->setValue(qRound(m_oldH)); + m_oldH = tqRound(m_origH * wPercent / 100); + m_page->intHeight->setValue(tqRound(m_oldH)); } m_oldW = w; @@ -202,14 +202,14 @@ void DlgImageSize::slotHeightPixelsChanged(int h) double hPercent = double(h) * 100 / double(m_origH); - m_page->intHeightPercent->setValue(qRound(hPercent)); + m_page->intHeightPercent->setValue(tqRound(hPercent)); // Set width in pixels and percent of necessary if (m_page->chkConstrain->isChecked()) { - m_page->intWidthPercent->setValue(qRound(hPercent)); + m_page->intWidthPercent->setValue(tqRound(hPercent)); - m_oldW = qRound(m_origW * hPercent / 100); - m_page->intWidth->setValue(qRound(m_oldW)); + m_oldW = tqRound(m_origW * hPercent / 100); + m_page->intWidth->setValue(tqRound(m_oldW)); } m_oldH = h; @@ -221,11 +221,11 @@ void DlgImageSize::slotWidthPercentChanged(int w) { blockAll(); - m_page->intWidth->setValue(qRound(w * m_origW / 100)); + m_page->intWidth->setValue(tqRound(w * m_origW / 100)); if (m_page->chkConstrain->isChecked()) { m_page->intHeightPercent->setValue(w); - m_page->intHeight->setValue(qRound( w * m_origH / 100)); + m_page->intHeight->setValue(tqRound( w * m_origH / 100)); } unblockAll(); @@ -235,10 +235,10 @@ void DlgImageSize::slotHeightPercentChanged(int h) { blockAll(); - m_page->intHeight->setValue(qRound(h * m_origH / 100)); + m_page->intHeight->setValue(tqRound(h * m_origH / 100)); if (m_page->chkConstrain->isChecked()) { m_page->intWidthPercent->setValue(h); - m_page->intWidth->setValue(qRound( h * m_origW / 100)); + m_page->intWidth->setValue(tqRound( h * m_origW / 100)); } unblockAll(); @@ -259,17 +259,17 @@ void DlgImageSize::blockAll() void DlgImageSize::unblockAll() { // XXX: more efficient to use blockSignals? - connect (m_page->intWidth, SIGNAL(valueChanged(int)), - this, SLOT(slotWidthPixelsChanged(int))); + connect (m_page->intWidth, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotWidthPixelsChanged(int))); - connect (m_page->intHeight, SIGNAL(valueChanged(int)), - this, SLOT(slotHeightPixelsChanged(int))); + connect (m_page->intHeight, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotHeightPixelsChanged(int))); - connect (m_page->intWidthPercent, SIGNAL(valueChanged(int)), - this, SLOT(slotWidthPercentChanged(int))); + connect (m_page->intWidthPercent, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotWidthPercentChanged(int))); - connect (m_page->intHeightPercent, SIGNAL(valueChanged(int)), - this, SLOT(slotHeightPercentChanged(int))); + connect (m_page->intHeightPercent, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotHeightPercentChanged(int))); } diff --git a/krita/plugins/viewplugins/imagesize/dlg_imagesize.h b/krita/plugins/viewplugins/imagesize/dlg_imagesize.h index 169d8cbd..589f1ad6 100644 --- a/krita/plugins/viewplugins/imagesize/dlg_imagesize.h +++ b/krita/plugins/viewplugins/imagesize/dlg_imagesize.h @@ -26,30 +26,31 @@ class KisFilterStrategy; class WdgImageSize; /** - * This dialog allows the user to create a selection mask based + * This dialog allows the user to create a selection tqmask based * on a (range of) colors. */ class DlgImageSize: public KDialogBase { typedef KDialogBase super; Q_OBJECT + TQ_OBJECT public: - DlgImageSize(QWidget * parent = 0, + DlgImageSize(TQWidget * tqparent = 0, const char* name = 0); ~DlgImageSize(); void hideScaleBox(); - void setWidth(Q_UINT32 w); - void setWidthPercent(Q_UINT32 w); - void setMaximumWidth(Q_UINT32 w); - Q_INT32 width(); + void setWidth(TQ_UINT32 w); + void setWidthPercent(TQ_UINT32 w); + void setMaximumWidth(TQ_UINT32 w); + TQ_INT32 width(); - void setHeight(Q_UINT32 h); - void setHeightPercent(Q_UINT32 h); - void setMaximumHeight(Q_UINT32 h); - Q_INT32 height(); + void setHeight(TQ_UINT32 h); + void setHeightPercent(TQ_UINT32 h); + void setMaximumHeight(TQ_UINT32 h); + TQ_INT32 height(); bool scale(); bool cropLayers(); diff --git a/krita/plugins/viewplugins/imagesize/dlg_layersize.cc b/krita/plugins/viewplugins/imagesize/dlg_layersize.cc index ba942eca..faf64c00 100644 --- a/krita/plugins/viewplugins/imagesize/dlg_layersize.cc +++ b/krita/plugins/viewplugins/imagesize/dlg_layersize.cc @@ -27,11 +27,11 @@ using namespace std; -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qbuttongroup.h> -#include <qlabel.h> -#include <qcombobox.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqbuttongroup.h> +#include <tqlabel.h> +#include <tqcombobox.h> #include <klocale.h> #include <knuminput.h> @@ -46,9 +46,9 @@ using namespace std; // XXX: I'm really real bad at arithmetic, let alone math. Here // be rounding errors. (Boudewijn) -DlgLayerSize::DlgLayerSize( QWidget * parent, +DlgLayerSize::DlgLayerSize( TQWidget * tqparent, const char * name) - : super (parent, name, true, i18n("Scale Layer"), Ok | Cancel, Ok) + : super (tqparent, name, true, i18n("Scale Layer"), Ok | Cancel, Ok) { m_lock = false; @@ -59,13 +59,13 @@ DlgLayerSize::DlgLayerSize( QWidget * parent, m_page->cmbFilterType->setCurrentText("Mitchell"); setMainWidget(m_page); - resize(m_page->sizeHint()); + resize(m_page->tqsizeHint()); unblockAll(); - connect(this, SIGNAL(okClicked()), - this, SLOT(okClicked())); + connect(this, TQT_SIGNAL(okClicked()), + this, TQT_SLOT(okClicked())); } @@ -74,7 +74,7 @@ DlgLayerSize::~DlgLayerSize() delete m_page; } -void DlgLayerSize::setWidth(Q_UINT32 w) +void DlgLayerSize::setWidth(TQ_UINT32 w) { blockAll(); @@ -86,7 +86,7 @@ void DlgLayerSize::setWidth(Q_UINT32 w) unblockAll(); } -void DlgLayerSize::setWidthPercent(Q_UINT32 w) +void DlgLayerSize::setWidthPercent(TQ_UINT32 w) { blockAll(); @@ -97,19 +97,19 @@ void DlgLayerSize::setWidthPercent(Q_UINT32 w) } -void DlgLayerSize::setMaximumWidth(Q_UINT32 w) +void DlgLayerSize::setMaximumWidth(TQ_UINT32 w) { m_page->intWidth->setMaxValue(w); m_maxW = w; } -Q_INT32 DlgLayerSize::width() +TQ_INT32 DlgLayerSize::width() { - //return (Q_INT32)qRound(m_oldW); - return (Q_INT32)qRound(m_page->intWidth->value()); + //return (TQ_INT32)tqRound(m_oldW); + return (TQ_INT32)tqRound(m_page->intWidth->value()); } -void DlgLayerSize::setHeight(Q_UINT32 h) +void DlgLayerSize::setHeight(TQ_UINT32 h) { blockAll(); @@ -122,7 +122,7 @@ void DlgLayerSize::setHeight(Q_UINT32 h) } -void DlgLayerSize::setHeightPercent(Q_UINT32 h) +void DlgLayerSize::setHeightPercent(TQ_UINT32 h) { blockAll(); @@ -132,16 +132,16 @@ void DlgLayerSize::setHeightPercent(Q_UINT32 h) unblockAll(); } -void DlgLayerSize::setMaximumHeight(Q_UINT32 h) +void DlgLayerSize::setMaximumHeight(TQ_UINT32 h) { m_page->intHeight->setMaxValue(h); m_maxH = h; } -Q_INT32 DlgLayerSize::height() +TQ_INT32 DlgLayerSize::height() { - //return (Q_INT32)qRound(m_oldH); - return (Q_INT32)qRound(m_page->intHeight->value()); + //return (TQ_INT32)tqRound(m_oldH); + return (TQ_INT32)tqRound(m_page->intHeight->value()); } KisFilterStrategy *DlgLayerSize::filterType() @@ -165,14 +165,14 @@ void DlgLayerSize::slotWidthPixelsChanged(int w) double wPercent = double(w) * 100 / double(m_origW); - m_page->intWidthPercent->setValue(qRound(wPercent)); + m_page->intWidthPercent->setValue(tqRound(wPercent)); // Set height in pixels and percent of necessary if (m_page->chkConstrain->isChecked()) { - m_page->intHeightPercent->setValue(qRound(wPercent)); + m_page->intHeightPercent->setValue(tqRound(wPercent)); - m_oldH = qRound(m_origH * wPercent / 100); - m_page->intHeight->setValue(qRound(m_oldH)); + m_oldH = tqRound(m_origH * wPercent / 100); + m_page->intHeight->setValue(tqRound(m_oldH)); } m_oldW = w; @@ -186,14 +186,14 @@ void DlgLayerSize::slotHeightPixelsChanged(int h) double hPercent = double(h) * 100 / double(m_origH); - m_page->intHeightPercent->setValue(qRound(hPercent)); + m_page->intHeightPercent->setValue(tqRound(hPercent)); // Set width in pixels and percent of necessary if (m_page->chkConstrain->isChecked()) { - m_page->intWidthPercent->setValue(qRound(hPercent)); + m_page->intWidthPercent->setValue(tqRound(hPercent)); - m_oldW = qRound(m_origW * hPercent / 100); - m_page->intWidth->setValue(qRound(m_oldW)); + m_oldW = tqRound(m_origW * hPercent / 100); + m_page->intWidth->setValue(tqRound(m_oldW)); } m_oldH = h; @@ -205,11 +205,11 @@ void DlgLayerSize::slotWidthPercentChanged(int w) { blockAll(); - m_page->intWidth->setValue(qRound(w * m_origW / 100)); + m_page->intWidth->setValue(tqRound(w * m_origW / 100)); if (m_page->chkConstrain->isChecked()) { m_page->intHeightPercent->setValue(w); - m_page->intHeight->setValue(qRound( w * m_origH / 100)); + m_page->intHeight->setValue(tqRound( w * m_origH / 100)); } unblockAll(); @@ -219,10 +219,10 @@ void DlgLayerSize::slotHeightPercentChanged(int h) { blockAll(); - m_page->intHeight->setValue(qRound(h * m_origH / 100)); + m_page->intHeight->setValue(tqRound(h * m_origH / 100)); if (m_page->chkConstrain->isChecked()) { m_page->intWidthPercent->setValue(h); - m_page->intWidth->setValue(qRound( h * m_origW / 100)); + m_page->intWidth->setValue(tqRound( h * m_origW / 100)); } unblockAll(); @@ -243,17 +243,17 @@ void DlgLayerSize::blockAll() void DlgLayerSize::unblockAll() { // XXX: more efficient to use blockSignals? - connect (m_page->intWidth, SIGNAL(valueChanged(int)), - this, SLOT(slotWidthPixelsChanged(int))); + connect (m_page->intWidth, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotWidthPixelsChanged(int))); - connect (m_page->intHeight, SIGNAL(valueChanged(int)), - this, SLOT(slotHeightPixelsChanged(int))); + connect (m_page->intHeight, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotHeightPixelsChanged(int))); - connect (m_page->intWidthPercent, SIGNAL(valueChanged(int)), - this, SLOT(slotWidthPercentChanged(int))); + connect (m_page->intWidthPercent, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotWidthPercentChanged(int))); - connect (m_page->intHeightPercent, SIGNAL(valueChanged(int)), - this, SLOT(slotHeightPercentChanged(int))); + connect (m_page->intHeightPercent, TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotHeightPercentChanged(int))); } diff --git a/krita/plugins/viewplugins/imagesize/dlg_layersize.h b/krita/plugins/viewplugins/imagesize/dlg_layersize.h index fa27b732..d44e7a93 100644 --- a/krita/plugins/viewplugins/imagesize/dlg_layersize.h +++ b/krita/plugins/viewplugins/imagesize/dlg_layersize.h @@ -29,22 +29,23 @@ class KisFilterStrategy; class DlgLayerSize: public KDialogBase { typedef KDialogBase super; Q_OBJECT + TQ_OBJECT public: - DlgLayerSize(QWidget * parent = 0, + DlgLayerSize(TQWidget * tqparent = 0, const char* name = 0); ~DlgLayerSize(); - void setWidth(Q_UINT32 w); - void setWidthPercent(Q_UINT32 w); - void setMaximumWidth(Q_UINT32 w); - Q_INT32 width(); + void setWidth(TQ_UINT32 w); + void setWidthPercent(TQ_UINT32 w); + void setMaximumWidth(TQ_UINT32 w); + TQ_INT32 width(); - void setHeight(Q_UINT32 h); - void setHeightPercent(Q_UINT32 h); - void setMaximumHeight(Q_UINT32 h); - Q_INT32 height(); + void setHeight(TQ_UINT32 h); + void setHeightPercent(TQ_UINT32 h); + void setMaximumHeight(TQ_UINT32 h); + TQ_INT32 height(); KisFilterStrategy *filterType(); private slots: diff --git a/krita/plugins/viewplugins/imagesize/imagesize.cc b/krita/plugins/viewplugins/imagesize/imagesize.cc index df400b5a..fff6cc27 100644 --- a/krita/plugins/viewplugins/imagesize/imagesize.cc +++ b/krita/plugins/viewplugins/imagesize/imagesize.cc @@ -23,9 +23,9 @@ #include <stdlib.h> -#include <qslider.h> -#include <qrect.h> -#include <qpoint.h> +#include <tqslider.h> +#include <tqrect.h> +#include <tqpoint.h> #include <klocale.h> #include <kiconloader.h> @@ -58,21 +58,21 @@ typedef KGenericFactory<ImageSize> ImageSizeFactory; K_EXPORT_COMPONENT_FACTORY( kritaimagesize, ImageSizeFactory( "krita" ) ) -ImageSize::ImageSize(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +ImageSize::ImageSize(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { - if ( parent->inherits("KisView") ) + if ( tqparent->inherits("KisView") ) { setInstance(ImageSizeFactory::instance()); setXMLFile(locate("data","kritaplugins/imagesize.rc"), true); - (void) new KAction(i18n("Change &Image Size..."), 0, "Shift-s", this, SLOT(slotImageSize()), actionCollection(), "imagesize"); - (void) new KAction(i18n("&Scale Layer..."), 0, 0, this, SLOT(slotLayerSize()), actionCollection(), "layerscale"); + (void) new KAction(i18n("Change &Image Size..."), 0, "Shift-s", this, TQT_SLOT(slotImageSize()), actionCollection(), "imagesize"); + (void) new KAction(i18n("&Scale Layer..."), 0, 0, this, TQT_SLOT(slotLayerSize()), actionCollection(), "layerscale"); - m_view = (KisView*) parent; + m_view = (KisView*) tqparent; // Selection manager takes ownership? - KAction * a = new KAction(i18n("&Scale Selection..."), 0, 0, this, SLOT(slotSelectionScale()), actionCollection(), "selectionscale"); + KAction * a = new KAction(i18n("&Scale Selection..."), 0, 0, this, TQT_SLOT(slotSelectionScale()), actionCollection(), "selectionscale"); Q_CHECK_PTR(a); m_view ->canvasSubject()-> selectionManager()->addSelectionAction(a); } @@ -99,9 +99,9 @@ void ImageSize::slotImageSize() dlgImageSize->setWidth(image->width()); dlgImageSize->setHeight(image->height()); - if (dlgImageSize->exec() == QDialog::Accepted) { - Q_INT32 w = dlgImageSize->width(); - Q_INT32 h = dlgImageSize->height(); + if (dlgImageSize->exec() == TQDialog::Accepted) { + TQ_INT32 w = dlgImageSize->width(); + TQ_INT32 h = dlgImageSize->height(); if (dlgImageSize->scale()) { m_view->scaleCurrentImage((double)w / ((double)(image->width())), @@ -130,14 +130,14 @@ void ImageSize::slotLayerSize() KisConfig cfg; KisPaintDeviceSP dev = image->activeDevice(); - QRect rc = dev->exactBounds(); + TQRect rc = dev->exactBounds(); dlgLayerSize->setWidth(rc.width()); dlgLayerSize->setHeight(rc.height()); - if (dlgLayerSize->exec() == QDialog::Accepted) { - Q_INT32 w = dlgLayerSize->width(); - Q_INT32 h = dlgLayerSize->height(); + if (dlgLayerSize->exec() == TQDialog::Accepted) { + TQ_INT32 w = dlgLayerSize->width(); + TQ_INT32 h = dlgLayerSize->height(); m_view->scaleLayer((double)w / ((double)(rc.width())), (double)h / ((double)(rc.height())), @@ -165,14 +165,14 @@ void ImageSize::slotSelectionScale() dlgLayerSize->setCaption(i18n("Scale Selection")); KisConfig cfg; - QRect rc = layer->selection()->selectedRect(); + TQRect rc = layer->selection()->selectedRect(); dlgLayerSize->setWidth(rc.width()); dlgLayerSize->setHeight(rc.height()); - if (dlgLayerSize->exec() == QDialog::Accepted) { - Q_INT32 w = dlgLayerSize->width(); - Q_INT32 h = dlgLayerSize->height(); + if (dlgLayerSize->exec() == TQDialog::Accepted) { + TQ_INT32 w = dlgLayerSize->width(); + TQ_INT32 h = dlgLayerSize->height(); KisScaleWorker worker (layer->selection().data(), (double)w / ((double)(rc.width())), diff --git a/krita/plugins/viewplugins/imagesize/imagesize.h b/krita/plugins/viewplugins/imagesize/imagesize.h index ce8f0f41..e83f3f7a 100644 --- a/krita/plugins/viewplugins/imagesize/imagesize.h +++ b/krita/plugins/viewplugins/imagesize/imagesize.h @@ -28,8 +28,9 @@ class KisPainter; class ImageSize : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - ImageSize(QObject *parent, const char *name, const QStringList &); + ImageSize(TQObject *tqparent, const char *name, const TQStringList &); virtual ~ImageSize(); private slots: diff --git a/krita/plugins/viewplugins/imagesize/wdg_imagesize.ui b/krita/plugins/viewplugins/imagesize/wdg_imagesize.ui index 896bbb05..4cdd5c95 100644 --- a/krita/plugins/viewplugins/imagesize/wdg_imagesize.ui +++ b/krita/plugins/viewplugins/imagesize/wdg_imagesize.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgImageSize</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgImageSize</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQButtonGroup" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>grpResizeScale</cstring> </property> @@ -30,7 +30,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>pixmapLabel1_2</cstring> </property> @@ -51,7 +51,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>65</width> <height>20</height> @@ -68,14 +68,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>65</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="0" column="3"> + <widget class="TQLabel" row="0" column="3"> <property name="name"> <cstring>pixmapLabel2_2</cstring> </property> @@ -94,7 +94,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>radioResize</cstring> </property> @@ -102,7 +102,7 @@ <string>&Resize</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>chkCrop</cstring> </property> @@ -123,14 +123,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>121</width> <height>20</height> </size> </property> </spacer> - <widget class="QRadioButton" row="1" column="3"> + <widget class="TQRadioButton" row="1" column="3"> <property name="name"> <cstring>radioScale</cstring> </property> @@ -143,7 +143,7 @@ </widget> </grid> </widget> - <widget class="QButtonGroup" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQButtonGroup" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>grpPixelDimensions</cstring> </property> @@ -154,7 +154,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>lblWidth</cstring> </property> @@ -173,7 +173,7 @@ <number>0</number> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -184,7 +184,7 @@ <cstring>intHeight</cstring> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>lblWidthOriginal</cstring> </property> @@ -197,11 +197,11 @@ <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>lblHeightOriginal</cstring> </property> @@ -214,11 +214,11 @@ <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblOrignal</cstring> </property> @@ -226,7 +226,7 @@ <string>Original:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lblNew</cstring> </property> @@ -276,7 +276,7 @@ <string>%</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>lblPercent</cstring> </property> @@ -287,7 +287,7 @@ <cstring>intWidthPercent</cstring> </property> </widget> - <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>chkConstrain</cstring> </property> @@ -300,14 +300,14 @@ </widget> </grid> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lblFilterType</cstring> </property> <property name="text"> <string>Filter:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -358,7 +358,7 @@ <tabstop>chkConstrain</tabstop> <tabstop>radioScale</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> </includehints> diff --git a/krita/plugins/viewplugins/imagesize/wdg_layersize.ui b/krita/plugins/viewplugins/imagesize/wdg_layersize.ui index 1b642fd8..fb7547d2 100644 --- a/krita/plugins/viewplugins/imagesize/wdg_layersize.ui +++ b/krita/plugins/viewplugins/imagesize/wdg_layersize.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgLayerSize</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgLayerSize</cstring> </property> @@ -22,7 +22,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QButtonGroup" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQButtonGroup" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>grpPixelDimensions</cstring> </property> @@ -33,7 +33,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>lblWidth</cstring> </property> @@ -52,7 +52,7 @@ <number>0</number> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -63,7 +63,7 @@ <cstring>intHeight</cstring> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>lblWidthOriginal</cstring> </property> @@ -76,11 +76,11 @@ <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>lblHeightOriginal</cstring> </property> @@ -93,11 +93,11 @@ <property name="text"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblOrignal</cstring> </property> @@ -105,7 +105,7 @@ <string>Original:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lblNew</cstring> </property> @@ -155,7 +155,7 @@ <string>%</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>lblPercent</cstring> </property> @@ -166,7 +166,7 @@ <cstring>intWidthPercent</cstring> </property> </widget> - <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>chkConstrain</cstring> </property> @@ -179,7 +179,7 @@ </widget> </grid> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblFilterType</cstring> </property> @@ -227,7 +227,7 @@ <tabstop>intHeightPercent</tabstop> <tabstop>chkConstrain</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> </includehints> diff --git a/krita/plugins/viewplugins/imagesize/wdg_resolution.ui b/krita/plugins/viewplugins/imagesize/wdg_resolution.ui index ead01819..df0e010d 100644 --- a/krita/plugins/viewplugins/imagesize/wdg_resolution.ui +++ b/krita/plugins/viewplugins/imagesize/wdg_resolution.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgResolution</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgResolution</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>grpSize</cstring> </property> @@ -30,7 +30,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblHeight</cstring> </property> @@ -38,7 +38,7 @@ <string>Height:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblWidth</cstring> </property> @@ -64,7 +64,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>grpResolution</cstring> </property> @@ -75,7 +75,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblScreen</cstring> </property> @@ -83,7 +83,7 @@ <string>Screen resolution:</string> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>lblScreenResolution</cstring> </property> @@ -96,11 +96,11 @@ <property name="text"> <string>100</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lblYResolution</cstring> </property> @@ -108,7 +108,7 @@ <string>Image Y resolution:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblImageXRes</cstring> </property> @@ -138,7 +138,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/krita/plugins/viewplugins/modify_selection/dlg_border_selection.cc b/krita/plugins/viewplugins/modify_selection/dlg_border_selection.cc index 748c5b9b..134610d6 100644 --- a/krita/plugins/viewplugins/modify_selection/dlg_border_selection.cc +++ b/krita/plugins/viewplugins/modify_selection/dlg_border_selection.cc @@ -26,11 +26,11 @@ using namespace std; -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qbuttongroup.h> -#include <qlabel.h> -#include <qcombobox.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqbuttongroup.h> +#include <tqlabel.h> +#include <tqcombobox.h> #include <klocale.h> #include <knuminput.h> @@ -39,15 +39,15 @@ using namespace std; #include "dlg_border_selection.h" #include "wdg_border_selection.h" -DlgBorderSelection::DlgBorderSelection( QWidget * parent, const char * name) : super (parent, name, true, i18n("Border Selection"), Ok | Cancel, Ok) +DlgBorderSelection::DlgBorderSelection( TQWidget * tqparent, const char * name) : super (tqparent, name, true, i18n("Border Selection"), Ok | Cancel, Ok) { m_page = new WdgBorderSelection(this, "border_selection"); Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->sizeHint()); + resize(m_page->tqsizeHint()); - connect(this, SIGNAL(okClicked()), this, SLOT(okClicked())); + connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked())); } DlgBorderSelection::~DlgBorderSelection() @@ -55,12 +55,12 @@ DlgBorderSelection::~DlgBorderSelection() delete m_page; } -Q_INT32 DlgBorderSelection::xradius() +TQ_INT32 DlgBorderSelection::xradius() { return m_page->radiusSpinBox->value(); } -Q_INT32 DlgBorderSelection::yradius() +TQ_INT32 DlgBorderSelection::yradius() { return m_page->radiusSpinBox->value(); } diff --git a/krita/plugins/viewplugins/modify_selection/dlg_border_selection.h b/krita/plugins/viewplugins/modify_selection/dlg_border_selection.h index baf716d4..b3d5a94d 100644 --- a/krita/plugins/viewplugins/modify_selection/dlg_border_selection.h +++ b/krita/plugins/viewplugins/modify_selection/dlg_border_selection.h @@ -27,14 +27,15 @@ class WdgBorderSelection; class DlgBorderSelection: public KDialogBase { typedef KDialogBase super; Q_OBJECT + TQ_OBJECT public: - DlgBorderSelection(QWidget * parent = 0, const char* name = 0); + DlgBorderSelection(TQWidget * tqparent = 0, const char* name = 0); ~DlgBorderSelection(); - Q_INT32 xradius(); - Q_INT32 yradius(); + TQ_INT32 xradius(); + TQ_INT32 yradius(); private slots: diff --git a/krita/plugins/viewplugins/modify_selection/dlg_grow_selection.cc b/krita/plugins/viewplugins/modify_selection/dlg_grow_selection.cc index 82055aeb..b73acc69 100644 --- a/krita/plugins/viewplugins/modify_selection/dlg_grow_selection.cc +++ b/krita/plugins/viewplugins/modify_selection/dlg_grow_selection.cc @@ -26,11 +26,11 @@ using namespace std; -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qbuttongroup.h> -#include <qlabel.h> -#include <qcombobox.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqbuttongroup.h> +#include <tqlabel.h> +#include <tqcombobox.h> #include <klocale.h> #include <knuminput.h> @@ -39,15 +39,15 @@ using namespace std; #include "dlg_grow_selection.h" #include "wdg_grow_selection.h" -DlgGrowSelection::DlgGrowSelection( QWidget * parent, const char * name) : super (parent, name, true, i18n("Grow Selection"), Ok | Cancel, Ok) +DlgGrowSelection::DlgGrowSelection( TQWidget * tqparent, const char * name) : super (tqparent, name, true, i18n("Grow Selection"), Ok | Cancel, Ok) { m_page = new WdgGrowSelection(this, "grow_selection"); Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->sizeHint()); + resize(m_page->tqsizeHint()); - connect(this, SIGNAL(okClicked()), this, SLOT(okClicked())); + connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked())); } DlgGrowSelection::~DlgGrowSelection() @@ -55,12 +55,12 @@ DlgGrowSelection::~DlgGrowSelection() delete m_page; } -Q_INT32 DlgGrowSelection::xradius() +TQ_INT32 DlgGrowSelection::xradius() { return m_page->radiusSpinBox->value(); } -Q_INT32 DlgGrowSelection::yradius() +TQ_INT32 DlgGrowSelection::yradius() { return m_page->radiusSpinBox->value(); } diff --git a/krita/plugins/viewplugins/modify_selection/dlg_grow_selection.h b/krita/plugins/viewplugins/modify_selection/dlg_grow_selection.h index f5cd36ff..bb2a8ab0 100644 --- a/krita/plugins/viewplugins/modify_selection/dlg_grow_selection.h +++ b/krita/plugins/viewplugins/modify_selection/dlg_grow_selection.h @@ -27,14 +27,15 @@ class WdgGrowSelection; class DlgGrowSelection: public KDialogBase { typedef KDialogBase super; Q_OBJECT + TQ_OBJECT public: - DlgGrowSelection(QWidget * parent = 0, const char* name = 0); + DlgGrowSelection(TQWidget * tqparent = 0, const char* name = 0); ~DlgGrowSelection(); - Q_INT32 xradius(); - Q_INT32 yradius(); + TQ_INT32 xradius(); + TQ_INT32 yradius(); private slots: diff --git a/krita/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc b/krita/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc index 69e31d1d..2a952816 100644 --- a/krita/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc +++ b/krita/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc @@ -26,11 +26,11 @@ using namespace std; -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qbuttongroup.h> -#include <qlabel.h> -#include <qcombobox.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqbuttongroup.h> +#include <tqlabel.h> +#include <tqcombobox.h> #include <klocale.h> #include <knuminput.h> @@ -39,15 +39,15 @@ using namespace std; #include "dlg_shrink_selection.h" #include "wdg_shrink_selection.h" -DlgShrinkSelection::DlgShrinkSelection( QWidget * parent, const char * name) : super (parent, name, true, i18n("Shrink Selection"), Ok | Cancel, Ok) +DlgShrinkSelection::DlgShrinkSelection( TQWidget * tqparent, const char * name) : super (tqparent, name, true, i18n("Shrink Selection"), Ok | Cancel, Ok) { m_page = new WdgShrinkSelection(this, "shrink_selection"); Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->sizeHint()); + resize(m_page->tqsizeHint()); - connect(this, SIGNAL(okClicked()), this, SLOT(okClicked())); + connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked())); } DlgShrinkSelection::~DlgShrinkSelection() @@ -55,12 +55,12 @@ DlgShrinkSelection::~DlgShrinkSelection() delete m_page; } -Q_INT32 DlgShrinkSelection::xradius() +TQ_INT32 DlgShrinkSelection::xradius() { return m_page->radiusSpinBox->value(); } -Q_INT32 DlgShrinkSelection::yradius() +TQ_INT32 DlgShrinkSelection::yradius() { return m_page->radiusSpinBox->value(); } diff --git a/krita/plugins/viewplugins/modify_selection/dlg_shrink_selection.h b/krita/plugins/viewplugins/modify_selection/dlg_shrink_selection.h index e8e32f43..385d623a 100644 --- a/krita/plugins/viewplugins/modify_selection/dlg_shrink_selection.h +++ b/krita/plugins/viewplugins/modify_selection/dlg_shrink_selection.h @@ -27,14 +27,15 @@ class WdgShrinkSelection; class DlgShrinkSelection: public KDialogBase { typedef KDialogBase super; Q_OBJECT + TQ_OBJECT public: - DlgShrinkSelection(QWidget * parent = 0, const char* name = 0); + DlgShrinkSelection(TQWidget * tqparent = 0, const char* name = 0); ~DlgShrinkSelection(); - Q_INT32 xradius(); - Q_INT32 yradius(); + TQ_INT32 xradius(); + TQ_INT32 yradius(); bool shrinkFromImageBorder(); private slots: diff --git a/krita/plugins/viewplugins/modify_selection/modify_selection.cc b/krita/plugins/viewplugins/modify_selection/modify_selection.cc index 6f2d0511..9ed5ba18 100644 --- a/krita/plugins/viewplugins/modify_selection/modify_selection.cc +++ b/krita/plugins/viewplugins/modify_selection/modify_selection.cc @@ -23,8 +23,8 @@ #include <stdlib.h> -#include <qslider.h> -#include <qpoint.h> +#include <tqslider.h> +#include <tqpoint.h> #include <klocale.h> #include <kiconloader.h> @@ -55,20 +55,20 @@ typedef KGenericFactory<ModifySelection> ModifySelectionFactory; K_EXPORT_COMPONENT_FACTORY( kritamodifyselection, ModifySelectionFactory( "krita" ) ) -ModifySelection::ModifySelection(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +ModifySelection::ModifySelection(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { - if ( parent->inherits("KisView") ) + if ( tqparent->inherits("KisView") ) { setInstance(ModifySelectionFactory::instance()); setXMLFile(locate("data","kritaplugins/modify_selection.rc"), true); - m_view = (KisView*) parent; + m_view = (KisView*) tqparent; // Selection manager takes ownership? - KAction* a = new KAction(i18n("Grow Selection..."), 0, 0, this, SLOT(slotGrowSelection()), actionCollection(), "growselection"); - KAction* b = new KAction(i18n("Shrink Selection..."), 0, 0, this, SLOT(slotShrinkSelection()), actionCollection(), "shrinkselection"); - KAction* c = new KAction(i18n("Border Selection..."), 0, 0, this, SLOT(slotBorderSelection()), actionCollection(), "borderselection"); + KAction* a = new KAction(i18n("Grow Selection..."), 0, 0, this, TQT_SLOT(slotGrowSelection()), actionCollection(), "growselection"); + KAction* b = new KAction(i18n("Shrink Selection..."), 0, 0, this, TQT_SLOT(slotShrinkSelection()), actionCollection(), "shrinkselection"); + KAction* c = new KAction(i18n("Border Selection..."), 0, 0, this, TQT_SLOT(slotBorderSelection()), actionCollection(), "borderselection"); Q_CHECK_PTR(a); Q_CHECK_PTR(b); @@ -98,9 +98,9 @@ void ModifySelection::slotGrowSelection() KisConfig cfg; - if (dlgGrowSelection->exec() == QDialog::Accepted) { - Q_INT32 xradius = dlgGrowSelection->xradius(); - Q_INT32 yradius = dlgGrowSelection->yradius(); + if (dlgGrowSelection->exec() == TQDialog::Accepted) { + TQ_INT32 xradius = dlgGrowSelection->xradius(); + TQ_INT32 yradius = dlgGrowSelection->yradius(); m_view ->canvasSubject()-> selectionManager()->grow(xradius, yradius); } @@ -121,9 +121,9 @@ void ModifySelection::slotShrinkSelection() KisConfig cfg; - if (dlgShrinkSelection->exec() == QDialog::Accepted) { - Q_INT32 xradius = dlgShrinkSelection->xradius(); - Q_INT32 yradius = dlgShrinkSelection->yradius(); + if (dlgShrinkSelection->exec() == TQDialog::Accepted) { + TQ_INT32 xradius = dlgShrinkSelection->xradius(); + TQ_INT32 yradius = dlgShrinkSelection->yradius(); bool shrinkFromImageBorder = dlgShrinkSelection->shrinkFromImageBorder(); m_view ->canvasSubject()-> selectionManager()->shrink(xradius, yradius, shrinkFromImageBorder); @@ -145,9 +145,9 @@ void ModifySelection::slotBorderSelection() KisConfig cfg; - if (dlgBorderSelection->exec() == QDialog::Accepted) { - Q_INT32 xradius = dlgBorderSelection->xradius(); - Q_INT32 yradius = dlgBorderSelection->yradius(); + if (dlgBorderSelection->exec() == TQDialog::Accepted) { + TQ_INT32 xradius = dlgBorderSelection->xradius(); + TQ_INT32 yradius = dlgBorderSelection->yradius(); m_view ->canvasSubject()-> selectionManager()->border(xradius, yradius); } diff --git a/krita/plugins/viewplugins/modify_selection/modify_selection.h b/krita/plugins/viewplugins/modify_selection/modify_selection.h index d3677088..173ca400 100644 --- a/krita/plugins/viewplugins/modify_selection/modify_selection.h +++ b/krita/plugins/viewplugins/modify_selection/modify_selection.h @@ -27,8 +27,9 @@ class KisView; class ModifySelection : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - ModifySelection(QObject *parent, const char *name, const QStringList &); + ModifySelection(TQObject *tqparent, const char *name, const TQStringList &); virtual ~ModifySelection(); private slots: diff --git a/krita/plugins/viewplugins/modify_selection/wdg_border_selection.ui b/krita/plugins/viewplugins/modify_selection/wdg_border_selection.ui index 621685da..06d01e9f 100644 --- a/krita/plugins/viewplugins/modify_selection/wdg_border_selection.ui +++ b/krita/plugins/viewplugins/modify_selection/wdg_border_selection.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgBorderSelection</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgBorderSelection</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -24,7 +24,7 @@ <string>Border selection by</string> </property> </widget> - <widget class="QSpinBox" row="1" column="0"> + <widget class="TQSpinBox" row="1" column="0"> <property name="name"> <cstring>radiusSpinBox</cstring> </property> @@ -38,7 +38,7 @@ <number>1</number> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <item> <property name="text"> <string>pixels</string> @@ -53,5 +53,5 @@ <tabstops> <tabstop>radiusSpinBox</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/krita/plugins/viewplugins/modify_selection/wdg_grow_selection.ui b/krita/plugins/viewplugins/modify_selection/wdg_grow_selection.ui index d2eb12aa..d1180803 100644 --- a/krita/plugins/viewplugins/modify_selection/wdg_grow_selection.ui +++ b/krita/plugins/viewplugins/modify_selection/wdg_grow_selection.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgGrowSelection</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgGrowSelection</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -24,7 +24,7 @@ <string>Grow selection by</string> </property> </widget> - <widget class="QSpinBox" row="1" column="0"> + <widget class="TQSpinBox" row="1" column="0"> <property name="name"> <cstring>radiusSpinBox</cstring> </property> @@ -38,7 +38,7 @@ <number>1</number> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <item> <property name="text"> <string>pixels</string> @@ -53,5 +53,5 @@ <tabstops> <tabstop>radiusSpinBox</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/krita/plugins/viewplugins/modify_selection/wdg_shrink_selection.ui b/krita/plugins/viewplugins/modify_selection/wdg_shrink_selection.ui index 2896325f..28429d72 100644 --- a/krita/plugins/viewplugins/modify_selection/wdg_shrink_selection.ui +++ b/krita/plugins/viewplugins/modify_selection/wdg_shrink_selection.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgShrinkSelection</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgShrinkSelection</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -24,7 +24,7 @@ <string>Shrink selection by</string> </property> </widget> - <widget class="QSpinBox" row="1" column="0"> + <widget class="TQSpinBox" row="1" column="0"> <property name="name"> <cstring>radiusSpinBox</cstring> </property> @@ -38,7 +38,7 @@ <number>1</number> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <item> <property name="text"> <string>pixels</string> @@ -48,7 +48,7 @@ <cstring>comboBox1</cstring> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>shrinkFromImageBorderCheckBox</cstring> </property> @@ -64,5 +64,5 @@ <tabstops> <tabstop>radiusSpinBox</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/krita/plugins/viewplugins/performancetest/dlg_perftest.cc b/krita/plugins/viewplugins/performancetest/dlg_perftest.cc index 1d9a045e..f65507b6 100644 --- a/krita/plugins/viewplugins/performancetest/dlg_perftest.cc +++ b/krita/plugins/viewplugins/performancetest/dlg_perftest.cc @@ -26,10 +26,10 @@ using namespace std; -#include <qradiobutton.h> -#include <qpushbutton.h> -#include <qcheckbox.h> -#include <qlabel.h> +#include <tqradiobutton.h> +#include <tqpushbutton.h> +#include <tqcheckbox.h> +#include <tqlabel.h> #include <klocale.h> #include <knuminput.h> @@ -39,9 +39,9 @@ using namespace std; #include "wdg_perftest.h" -DlgPerfTest::DlgPerfTest( QWidget * parent, +DlgPerfTest::DlgPerfTest( TQWidget * tqparent, const char * name) - : super (parent, name, true, i18n("Performance Test"), Ok | Cancel, Ok) + : super (tqparent, name, true, i18n("Performance Test"), Ok | Cancel, Ok) { m_lock = false; @@ -49,13 +49,13 @@ DlgPerfTest::DlgPerfTest( QWidget * parent, Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->sizeHint()); + resize(m_page->tqsizeHint()); - connect(this, SIGNAL(okClicked()), - this, SLOT(okClicked())); + connect(this, TQT_SIGNAL(okClicked()), + this, TQT_SLOT(okClicked())); - connect(m_page->btnSelectAll, SIGNAL(clicked()), this, SLOT(selectAllClicked())); - connect(m_page->btnDeselectAll, SIGNAL(clicked()), this, SLOT(deselectAllClicked())); + connect(m_page->btnSelectAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectAllClicked())); + connect(m_page->btnDeselectAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(deselectAllClicked())); } DlgPerfTest::~DlgPerfTest() diff --git a/krita/plugins/viewplugins/performancetest/dlg_perftest.h b/krita/plugins/viewplugins/performancetest/dlg_perftest.h index 7cb4f159..39f5cb41 100644 --- a/krita/plugins/viewplugins/performancetest/dlg_perftest.h +++ b/krita/plugins/viewplugins/performancetest/dlg_perftest.h @@ -27,10 +27,11 @@ class WdgPerfTest; class DlgPerfTest: public KDialogBase { typedef KDialogBase super; Q_OBJECT + TQ_OBJECT public: - DlgPerfTest(QWidget * parent = 0, + DlgPerfTest(TQWidget * tqparent = 0, const char* name = 0); ~DlgPerfTest(); diff --git a/krita/plugins/viewplugins/performancetest/perftest.cc b/krita/plugins/viewplugins/performancetest/perftest.cc index 1c5ede34..2380037a 100644 --- a/krita/plugins/viewplugins/performancetest/perftest.cc +++ b/krita/plugins/viewplugins/performancetest/perftest.cc @@ -22,13 +22,13 @@ #include <stdlib.h> -#include <qslider.h> -#include <qpoint.h> -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qlabel.h> -#include <qtextedit.h> -#include <qdatetime.h> +#include <tqslider.h> +#include <tqpoint.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqtextedit.h> +#include <tqdatetime.h> #include <klocale.h> #include <kiconloader.h> @@ -41,7 +41,7 @@ #include <kgenericfactory.h> #include <knuminput.h> -#include <qcolor.h> +#include <tqcolor.h> #include "kis_meta_registry.h" #include <kis_resourceserver.h> @@ -78,17 +78,17 @@ typedef KGenericFactory<PerfTest> PerfTestFactory; K_EXPORT_COMPONENT_FACTORY( kritaperftest, PerfTestFactory( "krita" ) ) -PerfTest::PerfTest(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +PerfTest::PerfTest(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { - if ( parent->inherits("KisView") ) + if ( tqparent->inherits("KisView") ) { setInstance(PerfTestFactory::instance()); setXMLFile(locate("data","kritaplugins/perftest.rc"), true); - (void) new KAction(i18n("&Performance Test..."), 0, 0, this, SLOT(slotPerfTest()), actionCollection(), "perf_test"); + (void) new KAction(i18n("&Performance Test..."), 0, 0, this, TQT_SLOT(slotPerfTest()), actionCollection(), "perf_test"); - m_view = (KisView*) parent; + m_view = (KisView*) tqparent; } } @@ -108,111 +108,111 @@ void PerfTest::slotPerfTest() dlgPerfTest->setCaption(i18n("Performance Test")); - QString report = QString(""); + TQString report = TQString(""); - if (dlgPerfTest->exec() == QDialog::Accepted) { + if (dlgPerfTest->exec() == TQDialog::Accepted) { - Q_INT32 testCount = (Q_INT32)qRound(dlgPerfTest->page()->intTestCount->value()); + TQ_INT32 testCount = (TQ_INT32)tqRound(dlgPerfTest->page()->intTestCount->value()); if (dlgPerfTest->page()->chkBitBlt->isChecked()) { kdDebug() << "bltTest:\n"; - QString s = bltTest(testCount); + TQString s = bltTest(testCount); report = report.append(s); kdDebug() << s << "\n"; } if (dlgPerfTest->page()->chkFill->isChecked()) { kdDebug() << "Filltest\n"; - QString s= fillTest(testCount); + TQString s= fillTest(testCount); report = report.append(s); kdDebug() << s << "\n"; } if (dlgPerfTest->page()->chkGradient->isChecked()) { kdDebug() << "Gradienttest\n"; - QString s = gradientTest(testCount); + TQString s = gradientTest(testCount); report = report.append(s); kdDebug() << s << "\n"; } if (dlgPerfTest->page()->chkPixel->isChecked()) { kdDebug() << "Pixeltest\n"; - QString s = pixelTest(testCount); + TQString s = pixelTest(testCount); report = report.append(s); kdDebug() << s << "\n"; } if (dlgPerfTest->page()->chkShape->isChecked()) { kdDebug() << "Shapetest\n"; - QString s = shapeTest(testCount); + TQString s = tqshapeTest(testCount); report = report.append(s); kdDebug() << s << "\n"; } if (dlgPerfTest->page()->chkLayer->isChecked()) { kdDebug() << "LayerTest\n"; - QString s = layerTest(testCount); + TQString s = layerTest(testCount); report = report.append(s); kdDebug() << s << "\n"; } if (dlgPerfTest->page()->chkScale->isChecked()) { kdDebug() << "Scaletest\n"; - QString s = scaleTest(testCount); + TQString s = scaleTest(testCount); report = report.append(s); kdDebug() << s << "\n"; } if (dlgPerfTest->page()->chkRotate->isChecked()) { kdDebug() << "Rotatetest\n"; - QString s = rotateTest(testCount); + TQString s = rotateTest(testCount); report = report.append(s); kdDebug() << s << "\n"; } if (dlgPerfTest->page()->chkRender->isChecked()) { kdDebug() << "Rendertest\n"; - QString s = renderTest(testCount); + TQString s = renderTest(testCount); report = report.append(s); kdDebug() << s << "\n"; } if (dlgPerfTest->page()->chkSelection->isChecked()) { kdDebug() << "Selectiontest\n"; - QString s = selectionTest(testCount); + TQString s = selectionTest(testCount); report = report.append(s); kdDebug() << s << "\n"; } if (dlgPerfTest->page()->chkColorConversion->isChecked()) { kdDebug() << "Colorconversiontest\n"; - QString s = colorConversionTest(testCount); + TQString s = colorConversionTest(testCount); report = report.append(s); kdDebug() << s << "\n"; } if (dlgPerfTest->page()->chkFilter-> isChecked()) { kdDebug() << "filtertest\n"; - QString s = filterTest(testCount); + TQString s = filterTest(testCount); report = report.append(s); kdDebug() << s << "\n"; } if (dlgPerfTest->page()->chkReadBytes->isChecked()) { kdDebug() << "Readbytes test\n"; - QString s = readBytesTest(testCount); + TQString s = readBytesTest(testCount); report = report.append(s); kdDebug() << s << "\n"; } if (dlgPerfTest->page()->chkWriteBytes-> isChecked()) { kdDebug() << "Writebytes test\n"; - QString s = writeBytesTest(testCount); + TQString s = writeBytesTest(testCount); report = report.append(s); kdDebug() << s << "\n"; } if (dlgPerfTest->page()->chkIterators->isChecked()) { kdDebug() << "Iterators test\n"; - QString s = iteratorTest(testCount); + TQString s = iteratorTest(testCount); report = report.append(s); kdDebug() << s << "\n"; } if (dlgPerfTest->page()->chkPaintView->isChecked()) { kdDebug() << "paintview test\n"; - QString s = paintViewTest(testCount); + TQString s = paintViewTest(testCount); report = report.append(s); kdDebug() << s << "\n"; } if (dlgPerfTest->page()->chkPaintViewFPS->isChecked()) { kdDebug() << "paint current view (fps) test\n"; - QString s = paintViewFPSTest(); + TQString s = paintViewFPSTest(); report = report.append(s); kdDebug() << s << "\n"; } @@ -220,7 +220,7 @@ void PerfTest::slotPerfTest() Q_CHECK_PTR(d); d->setCaption("Performance test results"); - QTextEdit * e = new QTextEdit(d); + TQTextEdit * e = new TQTextEdit(d); Q_CHECK_PTR(e); d->setMainWidget(e); e->setText(report); @@ -233,9 +233,9 @@ void PerfTest::slotPerfTest() delete dlgPerfTest; } -QString PerfTest::bltTest(Q_UINT32 testCount) +TQString PerfTest::bltTest(TQ_UINT32 testCount) { - QString report = QString("* bitBlt test\n"); + TQString report = TQString("* bitBlt test\n"); KisDoc * doc = m_view->canvasSubject()->document(); KisIDList l = KisMetaRegistry::instance()->csRegistry()->listKeys(); @@ -265,15 +265,15 @@ QString PerfTest::bltTest(Q_UINT32 testCount) } -QString PerfTest::doBlit(const KisCompositeOp& op, +TQString PerfTest::doBlit(const KisCompositeOp& op, KisID cspace, - Q_UINT8 opacity, - Q_UINT32 testCount, + TQ_UINT8 opacity, + TQ_UINT32 testCount, KisImageSP img) { - QTime t; - QString report; + TQTime t; + TQString report; // ------------------------------------------------------------------------------ // Small @@ -282,21 +282,21 @@ QString PerfTest::doBlit(const KisCompositeOp& op, Q_CHECK_PTR(small); KisFillPainter pf(small.data()) ; - pf.fillRect(0, 0, 32, 32, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + pf.fillRect(0, 0, 32, 32, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); pf.end(); t.restart(); KisPainter p(img->activeDevice()); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { p.bitBlt(0, 0, op, small.data(),0,0,32, 32); } p.end(); - report = report.append(QString(" %1 blits of rectangles < tilesize with opacity %2 and composite op %3: %4ms\n") - .arg(testCount) - .arg(opacity) - .arg(op.id().name()) - .arg(t.elapsed())); + report = report.append(TQString(" %1 blits of rectangles < tilesize with opacity %2 and composite op %3: %4ms\n") + .tqarg(testCount) + .tqarg(opacity) + .tqarg(op.id().name()) + .tqarg(t.elapsed())); // ------------------------------------------------------------------------------ @@ -305,21 +305,21 @@ QString PerfTest::doBlit(const KisCompositeOp& op, Q_CHECK_PTR(medium); pf.begin(medium.data()) ; - pf.fillRect(0, 0, 64 * 3, 64 * 3, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + pf.fillRect(0, 0, 64 * 3, 64 * 3, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); pf.end(); t.restart(); p.begin(img->activeDevice().data()); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { p.bitBlt(0, 0, op, medium.data(),0,0,96, 96); } p.end(); - report = report.append(QString(" %1 blits of rectangles 3 * tilesize with opacity %2 and composite op %3: %4ms\n") - .arg(testCount) - .arg(opacity) - .arg(op.id().name()) - .arg(t.elapsed())); + report = report.append(TQString(" %1 blits of rectangles 3 * tilesize with opacity %2 and composite op %3: %4ms\n") + .tqarg(testCount) + .tqarg(opacity) + .tqarg(op.id().name()) + .tqarg(t.elapsed())); // ------------------------------------------------------------------------------ @@ -328,21 +328,21 @@ QString PerfTest::doBlit(const KisCompositeOp& op, Q_CHECK_PTR(big); pf.begin(big.data()) ; - pf.fillRect(0, 0, 800, 800, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + pf.fillRect(0, 0, 800, 800, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); pf.end(); t.restart(); p.begin(img->activeDevice().data()); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { p.bitBlt(0, 0, op, big.data(),0,0,800,800); } p.end(); - report = report.append(QString(" %1 blits of rectangles 800 x 800 with opacity %2 and composite op %3: %4ms\n") - .arg(testCount) - .arg(opacity) - .arg(op.id().name()) - .arg(t.elapsed())); + report = report.append(TQString(" %1 blits of rectangles 800 x 800 with opacity %2 and composite op %3: %4ms\n") + .tqarg(testCount) + .tqarg(opacity) + .tqarg(op.id().name()) + .tqarg(t.elapsed())); // ------------------------------------------------------------------------------ @@ -351,21 +351,21 @@ QString PerfTest::doBlit(const KisCompositeOp& op, KisPaintDeviceSP outside = new KisPaintDevice(KisMetaRegistry::instance()->csRegistry()->getColorSpace(cspace,""), "outside blit"); Q_CHECK_PTR(outside); pf.begin(outside.data()) ; - pf.fillRect(0, 0, 500, 500, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + pf.fillRect(0, 0, 500, 500, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); pf.end(); t.restart(); p.begin(img->activeDevice().data()); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { p.bitBlt(600, 600, op, outside.data(),0,0,500,500); } p.end(); - report = report.append(QString(" %1 blits of rectangles 500 x 500 at 600,600 with opacity %2 and composite op %3: %4ms\n") - .arg(testCount) - .arg(opacity) - .arg(op.id().name()) - .arg(t.elapsed())); + report = report.append(TQString(" %1 blits of rectangles 500 x 500 at 600,600 with opacity %2 and composite op %3: %4ms\n") + .tqarg(testCount) + .tqarg(opacity) + .tqarg(op.id().name()) + .tqarg(t.elapsed())); // ------------------------------------------------------------------------------ // Small with varied source opacity @@ -374,31 +374,31 @@ QString PerfTest::doBlit(const KisCompositeOp& op, Q_CHECK_PTR(small_with_alpha); pf.begin(small_with_alpha.data()) ; - pf.fillRect(0, 0, 32, 32, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_TRANSPARENT); - pf.fillRect(4, 4, 24, 24, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_OPAQUE / 2); - pf.fillRect(8, 8, 16, 16, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_OPAQUE); + pf.fillRect(0, 0, 32, 32, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_TRANSPARENT); + pf.fillRect(4, 4, 24, 24, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_OPAQUE / 2); + pf.fillRect(8, 8, 16, 16, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_OPAQUE); pf.end(); t.restart(); p.begin(img->activeDevice().data()); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { p.bitBlt(0, 0, op, small_with_alpha.data(), 0, 0, 32, 32); } p.end(); - report = report.append(QString(" %1 blits of rectangles < tilesize with source alpha, with opacity %2 and composite op %3: %4ms\n") - .arg(testCount) - .arg(opacity) - .arg(op.id().name()) - .arg(t.elapsed())); + report = report.append(TQString(" %1 blits of rectangles < tilesize with source alpha, with opacity %2 and composite op %3: %4ms\n") + .tqarg(testCount) + .tqarg(opacity) + .tqarg(op.id().name()) + .tqarg(t.elapsed())); return report; } -QString PerfTest::fillTest(Q_UINT32 testCount) +TQString PerfTest::fillTest(TQ_UINT32 testCount) { - QString report = QString("* Fill test\n"); + TQString report = TQString("* Fill test\n"); KisDoc * doc = m_view->canvasSubject()->document(); KisIDList l = KisMetaRegistry::instance()->csRegistry()->listKeys(); @@ -413,91 +413,91 @@ QString PerfTest::fillTest(Q_UINT32 testCount) // Rect fill KisFillPainter p(l.data()); - QTime t; + TQTime t; t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { p.eraseRect(0, 0, 1000, 1000); } - report = report.append(QString(" Erased 1000 x 1000 layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" Erased 1000 x 1000 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { p.eraseRect(50, 50, 500, 500); } - report = report.append(QString(" Erased 500 x 500 layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" Erased 500 x 500 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { p.eraseRect(-50, -50, 1100, 1100); } - report = report.append(QString(" Erased rect bigger than layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" Erased rect bigger than layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); // Opaque Rect fill t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { - p.fillRect(0, 0, 1000, 1000, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + for (TQ_UINT32 i = 0; i < testCount; ++i) { + p.fillRect(0, 0, 1000, 1000, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); } - report = report.append(QString(" Opaque fill 1000 x 1000 layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" Opaque fill 1000 x 1000 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { - p.fillRect(50, 50, 500, 500, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + for (TQ_UINT32 i = 0; i < testCount; ++i) { + p.fillRect(50, 50, 500, 500, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); } - report = report.append(QString(" Opaque fill 500 x 500 layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" Opaque fill 500 x 500 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { - p.fillRect(-50, -50, 1100, 1100, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + for (TQ_UINT32 i = 0; i < testCount; ++i) { + p.fillRect(-50, -50, 1100, 1100, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); } - report = report.append(QString(" Opaque fill rect bigger than layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" Opaque fill rect bigger than layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); // Transparent rect fill t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { - p.fillRect(0, 0, 1000, 1000, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_OPAQUE / 2); + for (TQ_UINT32 i = 0; i < testCount; ++i) { + p.fillRect(0, 0, 1000, 1000, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_OPAQUE / 2); } - report = report.append(QString(" Opaque fill 1000 x 1000 layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" Opaque fill 1000 x 1000 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { - p.fillRect(50, 50, 500, 500, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_OPAQUE / 2); + for (TQ_UINT32 i = 0; i < testCount; ++i) { + p.fillRect(50, 50, 500, 500, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_OPAQUE / 2); } - report = report.append(QString(" Opaque fill 500 x 500 layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" Opaque fill 500 x 500 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { - p.fillRect(-50, -50, 1100, 1100, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_OPAQUE / 2); + for (TQ_UINT32 i = 0; i < testCount; ++i) { + p.fillRect(-50, -50, 1100, 1100, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_OPAQUE / 2); } - report = report.append(QString(" Opaque fill rect bigger than layer %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" Opaque fill rect bigger than layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); // Colour fill t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { p.eraseRect(0, 0, 1000, 1000); // p.paintEllipse(500, 1000, 100, 0, 0); - p.setPaintColor(KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + p.setPaintColor(KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); p.setFillThreshold(15); p.setCompositeOp(COMPOSITE_OVER); p.fillColor(0,0); } - report = report.append(QString(" Opaque floodfill of whole circle (incl. erase and painting of circle) %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" Opaque floodfill of whole circle (incl. erase and painting of circle) %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); // Pattern fill t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { p.eraseRect(0, 0, 1000, 1000); // p.paintEllipse(500, 1000, 100, 0, 0); - p.setPaintColor(KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + p.setPaintColor(KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); KisResourceServerBase* r = KisResourceServerRegistry::instance()->get("PatternServer"); Q_CHECK_PTR(r); p.setPattern((KisPattern*)r->resources().first()); @@ -505,7 +505,7 @@ QString PerfTest::fillTest(Q_UINT32 testCount) p.setCompositeOp(COMPOSITE_OVER); p.fillPattern(0,0); } - report = report.append(QString(" Opaque patternfill of whole circle (incl. erase and painting of circle) %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" Opaque patternfill of whole circle (incl. erase and painting of circle) %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); @@ -517,14 +517,14 @@ QString PerfTest::fillTest(Q_UINT32 testCount) } -QString PerfTest::gradientTest(Q_UINT32 testCount) +TQString PerfTest::gradientTest(TQ_UINT32 testCount) { - return QString("Gradient test\n"); + return TQString("Gradient test\n"); } -QString PerfTest::pixelTest(Q_UINT32 testCount) +TQString PerfTest::pixelTest(TQ_UINT32 testCount) { - QString report = QString("* pixel/setpixel test\n"); + TQString report = TQString("* pixel/setpixel test\n"); KisDoc * doc = m_view->canvasSubject()->document(); KisIDList l = KisMetaRegistry::instance()->csRegistry()->listKeys(); @@ -537,30 +537,30 @@ QString PerfTest::pixelTest(Q_UINT32 testCount) KisPaintDeviceSP l = img->activeDevice(); - QTime t; + TQTime t; t.restart(); - QColor c = Qt::black; - Q_UINT8 opacity = OPACITY_OPAQUE; - for (Q_UINT32 i = 0; i < testCount; ++i) { - for (Q_UINT32 x = 0; x < 1000; ++x) { - for (Q_UINT32 y = 0; y < 1000; ++y) { + TQColor c = TQt::black; + TQ_UINT8 opacity = OPACITY_OPAQUE; + for (TQ_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 x = 0; x < 1000; ++x) { + for (TQ_UINT32 y = 0; y < 1000; ++y) { l->pixel(x, y, &c, &opacity); } } } - report = report.append(QString(" read 1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" read 1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); - c= Qt::black; + c= TQt::black; t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { - for (Q_UINT32 x = 0; x < 1000; ++x) { - for (Q_UINT32 y = 0; y < 1000; ++y) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 x = 0; x < 1000; ++x) { + for (TQ_UINT32 y = 0; y < 1000; ++y) { l->setPixel(x, y, c, 128); } } } - report = report.append(QString(" written 1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" written 1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); } @@ -571,31 +571,31 @@ QString PerfTest::pixelTest(Q_UINT32 testCount) } -QString PerfTest::shapeTest(Q_UINT32 testCount) +TQString PerfTest::tqshapeTest(TQ_UINT32 testCount) { - return QString("Shape test\n"); + return TQString("Shape test\n"); } -QString PerfTest::layerTest(Q_UINT32 testCount) +TQString PerfTest::layerTest(TQ_UINT32 testCount) { - return QString("Layer test\n"); + return TQString("Layer test\n"); } -QString PerfTest::scaleTest(Q_UINT32 testCount) +TQString PerfTest::scaleTest(TQ_UINT32 testCount) { - return QString("Scale test\n"); + return TQString("Scale test\n"); } -QString PerfTest::rotateTest(Q_UINT32 testCount) +TQString PerfTest::rotateTest(TQ_UINT32 testCount) { - QString report = QString("* Rotate test\n"); + TQString report = TQString("* Rotate test\n"); KisDoc * doc = m_view->canvasSubject()->document(); KisIDList l = KisMetaRegistry::instance()->csRegistry()->listKeys(); for (KisIDList::Iterator it = l.begin(); it != l.end(); ++it) { doc->undoAdapter()->setUndo( false ); - QTime t; + TQTime t; for (uint i = 0; i < testCount; ++i) { for (double angle = 0; angle < 360; ++angle) { @@ -606,24 +606,24 @@ QString PerfTest::rotateTest(Q_UINT32 testCount) delete img; } } - report = report.append(QString(" rotated 1000 x 1000 pixels over 360 degrees, degree by degree, %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" rotated 1000 x 1000 pixels over 360 degrees, degree by degree, %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); } return report; } -QString PerfTest::renderTest(Q_UINT32 restCount) +TQString PerfTest::renderTest(TQ_UINT32 restCount) { - return QString("Render test\n"); + return TQString("Render test\n"); } -QString PerfTest::selectionTest(Q_UINT32 testCount) +TQString PerfTest::selectionTest(TQ_UINT32 testCount) { - return QString("Selection test\n"); + return TQString("Selection test\n"); } -QString PerfTest::colorConversionTest(Q_UINT32 testCount) +TQString PerfTest::colorConversionTest(TQ_UINT32 testCount) { - QString report = QString("* Colorspace conversion test\n"); + TQString report = TQString("* Colorspace conversion test\n"); KisDoc * doc = m_view->canvasSubject()->document(); KisIDList l = KisMetaRegistry::instance()->csRegistry()->listKeys(); @@ -631,7 +631,7 @@ QString PerfTest::colorConversionTest(Q_UINT32 testCount) KisImage * img = doc->newImage("cs-" + (*it).name(), 1000, 1000, KisMetaRegistry::instance()->csRegistry()->getColorSpace(*it,"")); - QTime t; + TQTime t; KisIDList l2 = KisMetaRegistry::instance()->csRegistry()->listKeys(); for (KisIDList::Iterator it2 = l2.begin(); it2 != l2.end(); ++it2) { @@ -643,7 +643,7 @@ QString PerfTest::colorConversionTest(Q_UINT32 testCount) img2->convertTo(KisMetaRegistry::instance()->csRegistry()->getColorSpace(*it2,"")); delete img2; } - report = report.append(QString(" converted from " + (*it).name() + " to " + (*it2).name() + " 1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" converted from " + (*it).name() + " to " + (*it2).name() + " 1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); } @@ -654,10 +654,10 @@ QString PerfTest::colorConversionTest(Q_UINT32 testCount) } -QString PerfTest::filterTest(Q_UINT32 testCount) +TQString PerfTest::filterTest(TQ_UINT32 testCount) { - QString report = QString("* Filter test\n"); + TQString report = TQString("* Filter test\n"); KisIDList filters = KisFilterRegistry::instance()->listKeys(); KisDoc * doc = m_view->canvasSubject()->document(); @@ -669,19 +669,19 @@ QString PerfTest::filterTest(Q_UINT32 testCount) KisImageSP img = doc->newImage("filter-" + (*it).name(), 1000, 1000, KisMetaRegistry::instance()->csRegistry()->getColorSpace(*it,"")); KisPaintDeviceSP l = img->activeDevice(); - QTime t; + TQTime t; for (KisIDList::Iterator it = filters.begin(); it != filters.end(); ++it) { KisFilterSP f = KisFilterRegistry::instance()->get(*it); t.restart(); kdDebug() << "test filter " << f->id().name() << " on " << img->colorSpace()->id().name() << endl; - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { f->enableProgress(); - f->process(l.data(), l.data(), f->configuration(f->createConfigurationWidget(m_view, l.data())), QRect(0, 0, 1000, 1000)); + f->process(l.data(), l.data(), f->configuration(f->createConfigurationWidget(m_view, l.data())), TQRect(0, 0, 1000, 1000)); f->disableProgress(); } - report = report.append(QString(" filtered " + (*it).name() + "1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" filtered " + (*it).name() + "1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); } @@ -690,72 +690,72 @@ QString PerfTest::filterTest(Q_UINT32 testCount) } -QString PerfTest::readBytesTest(Q_UINT32 testCount) +TQString PerfTest::readBytesTest(TQ_UINT32 testCount) { - QString report = QString("* Read bytes test\n\n"); + TQString report = TQString("* Read bytes test\n\n"); // On default tiles KisDoc * doc = m_view->canvasSubject()->document(); KisImageSP img = doc->newImage("Readbytes ", 1000, 1000, KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID("RGBA",""),"")); KisPaintDeviceSP l = img->activeDevice(); - QTime t; + TQTime t; t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { - Q_UINT8 * newData = new Q_UINT8[1000 * 1000 * l->pixelSize()]; + for (TQ_UINT32 i = 0; i < testCount; ++i) { + TQ_UINT8 * newData = new TQ_UINT8[1000 * 1000 * l->pixelSize()]; Q_CHECK_PTR(newData); l->readBytes(newData, 0, 0, 1000, 1000); delete[] newData; } - report = report.append(QString(" read 1000 x 1000 pixels %1 times from empty image: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" read 1000 x 1000 pixels %1 times from empty image: %2\n").tqarg(testCount).tqarg(t.elapsed())); // On tiles with data KisFillPainter p(l.data()); - p.fillRect(0, 0, 1000, 1000, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + p.fillRect(0, 0, 1000, 1000, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); p.end(); t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { - Q_UINT8 * newData = new Q_UINT8[1000 * 1000 * l->pixelSize()]; + for (TQ_UINT32 i = 0; i < testCount; ++i) { + TQ_UINT8 * newData = new TQ_UINT8[1000 * 1000 * l->pixelSize()]; Q_CHECK_PTR(newData); l->readBytes(newData, 0, 0, 1000, 1000); delete[] newData; } - report = report.append(QString(" read 1000 x 1000 pixels %1 times from filled image: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" read 1000 x 1000 pixels %1 times from filled image: %2\n").tqarg(testCount).tqarg(t.elapsed())); return report; } -QString PerfTest::writeBytesTest(Q_UINT32 testCount) +TQString PerfTest::writeBytesTest(TQ_UINT32 testCount) { - QString report = QString("* Write bytes test"); + TQString report = TQString("* Write bytes test"); // On default tiles KisDoc * doc = m_view->canvasSubject()->document(); KisImageSP img = doc->newImage("Writebytes ", 1000, 1000, KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID("RGBA", ""),"")); KisPaintDeviceSP l = img->activeDevice(); KisFillPainter p(l.data()); - p.fillRect(0, 0, 1000, 1000, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + p.fillRect(0, 0, 1000, 1000, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); p.end(); - Q_UINT8 * data = new Q_UINT8[1000 * 1000 * l->pixelSize()]; + TQ_UINT8 * data = new TQ_UINT8[1000 * 1000 * l->pixelSize()]; Q_CHECK_PTR(data); l->readBytes(data, 0, 0, 1000, 1000); - QTime t; + TQTime t; t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { l->writeBytes(data, 0, 0, 1000, 1000); } delete[] data; - report = report.append(QString(" written 1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" written 1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed())); return report; @@ -764,19 +764,19 @@ QString PerfTest::writeBytesTest(Q_UINT32 testCount) /////// Iterator tests -QString hlineRODefault(KisDoc * doc, Q_UINT32 testCount) +TQString hlineRODefault(KisDoc * doc, TQ_UINT32 testCount) { KisImageSP img = doc->newImage("", 1000, 1000, KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID("RGBA", ""),"")); KisPaintDeviceSP l = img->activeDevice(); - QTime t; + TQTime t; t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { int adv; - for(Q_INT32 y2 = 0; y2 < 0 + 1000; y2++) + for(TQ_INT32 y2 = 0; y2 < 0 + 1000; y2++) { KisHLineIterator hiter = l->createHLineIterator(0, y2, 1000, false); while(! hiter.isDone()) @@ -788,27 +788,27 @@ QString hlineRODefault(KisDoc * doc, Q_UINT32 testCount) } - return QString(" hline iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed()); + return TQString(" hline iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); } -QString hlineRO(KisDoc * doc, Q_UINT32 testCount) +TQString hlineRO(KisDoc * doc, TQ_UINT32 testCount) { KisImageSP img = doc->newImage("", 1000, 1000, KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID("RGBA", ""),"")); KisPaintDeviceSP l = img->activeDevice(); KisFillPainter p(l.data()); - p.fillRect(0, 0, 1000, 1000, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + p.fillRect(0, 0, 1000, 1000, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); p.end(); - QTime t; + TQTime t; t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { int adv; - for(Q_INT32 y2 = 0; y2 < 0 + 1000; y2++) + for(TQ_INT32 y2 = 0; y2 < 0 + 1000; y2++) { KisHLineIterator hiter = l->createHLineIterator(0, y2, 1000, false); while(! hiter.isDone()) @@ -820,22 +820,22 @@ QString hlineRO(KisDoc * doc, Q_UINT32 testCount) } - return QString(" hline iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed()); + return TQString(" hline iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); } -QString hlineWRDefault(KisDoc * doc, Q_UINT32 testCount) +TQString hlineWRDefault(KisDoc * doc, TQ_UINT32 testCount) { KisImageSP img = doc->newImage("", 1000, 1000, KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID("RGBA", ""),"")); KisPaintDeviceSP l = img->activeDevice(); - QTime t; + TQTime t; t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { int adv; - for(Q_INT32 y2 = 0; y2 < 0 + 1000; y2++) + for(TQ_INT32 y2 = 0; y2 < 0 + 1000; y2++) { KisHLineIterator hiter = l->createHLineIterator(0, y2, 1000, true); while(! hiter.isDone()) @@ -847,26 +847,26 @@ QString hlineWRDefault(KisDoc * doc, Q_UINT32 testCount) } - return QString(" hline iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed()); + return TQString(" hline iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); } -QString hlineWR(KisDoc * doc, Q_UINT32 testCount) +TQString hlineWR(KisDoc * doc, TQ_UINT32 testCount) { KisImageSP img = doc->newImage("", 1000, 1000, KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID("RGBA", ""),"")); KisPaintDeviceSP l = img->activeDevice(); KisFillPainter p(l.data()); - p.fillRect(0, 0, 1000, 1000, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + p.fillRect(0, 0, 1000, 1000, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); p.end(); - QTime t; + TQTime t; t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { int adv; - for(Q_INT32 y2 = 0; y2 < 0 + 1000; y2++) + for(TQ_INT32 y2 = 0; y2 < 0 + 1000; y2++) { KisHLineIterator hiter = l->createHLineIterator(0, y2, 1000, true); while(! hiter.isDone()) @@ -878,21 +878,21 @@ QString hlineWR(KisDoc * doc, Q_UINT32 testCount) } - return QString(" hline iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed()); + return TQString(" hline iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); } -QString vlineRODefault(KisDoc * doc, Q_UINT32 testCount) +TQString vlineRODefault(KisDoc * doc, TQ_UINT32 testCount) { KisImageSP img = doc->newImage("", 1000, 1000, KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID("RGBA", ""),"")); KisPaintDeviceSP l = img->activeDevice(); - QTime t; + TQTime t; t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { - for(Q_INT32 y2 = 0; y2 < 0 + 1000; y2++) + for (TQ_UINT32 i = 0; i < testCount; ++i) { + for(TQ_INT32 y2 = 0; y2 < 0 + 1000; y2++) { KisVLineIterator hiter = l->createVLineIterator(y2, 0, 1000, true); while(! hiter.isDone()) @@ -903,25 +903,25 @@ QString vlineRODefault(KisDoc * doc, Q_UINT32 testCount) } - return QString(" vline iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed()); + return TQString(" vline iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); } -QString vlineRO(KisDoc * doc, Q_UINT32 testCount) +TQString vlineRO(KisDoc * doc, TQ_UINT32 testCount) { KisImageSP img = doc->newImage("", 1000, 1000, KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID("RGBA", ""),"")); KisPaintDeviceSP l = img->activeDevice(); KisFillPainter p(l.data()); - p.fillRect(0, 0, 1000, 1000, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + p.fillRect(0, 0, 1000, 1000, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); p.end(); - QTime t; + TQTime t; t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { - for(Q_INT32 y2 = 0; y2 < 0 + 1000; y2++) + for (TQ_UINT32 i = 0; i < testCount; ++i) { + for(TQ_INT32 y2 = 0; y2 < 0 + 1000; y2++) { KisVLineIterator hiter = l->createVLineIterator(y2, 0, 1000, true); while(! hiter.isDone()) @@ -932,21 +932,21 @@ QString vlineRO(KisDoc * doc, Q_UINT32 testCount) } - return QString(" vline iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed()); + return TQString(" vline iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); } -QString vlineWRDefault(KisDoc * doc, Q_UINT32 testCount) +TQString vlineWRDefault(KisDoc * doc, TQ_UINT32 testCount) { KisImageSP img = doc->newImage("", 1000, 1000, KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID("RGBA", ""),"")); KisPaintDeviceSP l = img->activeDevice(); - QTime t; + TQTime t; t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { - for(Q_INT32 y2 = 0; y2 < 0 + 1000; y2++) + for(TQ_INT32 y2 = 0; y2 < 0 + 1000; y2++) { KisVLineIterator hiter = l->createVLineIterator(y2, 0, 1000, true); while(! hiter.isDone()) @@ -957,24 +957,24 @@ QString vlineWRDefault(KisDoc * doc, Q_UINT32 testCount) } - return QString(" vline iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed()); + return TQString(" vline iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); } -QString vlineWR(KisDoc * doc, Q_UINT32 testCount) +TQString vlineWR(KisDoc * doc, TQ_UINT32 testCount) { KisImageSP img = doc->newImage("", 1000, 1000, KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID("RGBA", ""),"")); KisPaintDeviceSP l = img->activeDevice(); KisFillPainter p(l.data()); - p.fillRect(0, 0, 1000, 1000, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + p.fillRect(0, 0, 1000, 1000, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); p.end(); - QTime t; + TQTime t; t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { - for(Q_INT32 y2 = 0; y2 < 0 + 1000; y2++) + for (TQ_UINT32 i = 0; i < testCount; ++i) { + for(TQ_INT32 y2 = 0; y2 < 0 + 1000; y2++) { KisHLineIterator hiter = l->createHLineIterator(y2, 0, 1000, true); while(! hiter.isDone()) @@ -985,19 +985,19 @@ QString vlineWR(KisDoc * doc, Q_UINT32 testCount) } - return QString(" vline iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed()); + return TQString(" vline iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); } -QString rectRODefault(KisDoc * doc, Q_UINT32 testCount) +TQString rectRODefault(KisDoc * doc, TQ_UINT32 testCount) { KisImageSP img = doc->newImage("", 1000, 1000, KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID("RGBA", ""),"")); KisPaintDeviceSP l = img->activeDevice(); ; - QTime t; + TQTime t; t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { KisRectIterator r = l->createRectIterator(0, 0, 1000, 1000, false); while(! r.isDone()) { @@ -1005,24 +1005,24 @@ QString rectRODefault(KisDoc * doc, Q_UINT32 testCount) } } - return QString(" rect iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed()); + return TQString(" rect iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); } -QString rectRO(KisDoc * doc, Q_UINT32 testCount) +TQString rectRO(KisDoc * doc, TQ_UINT32 testCount) { KisImageSP img = doc->newImage("", 1000, 1000, KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID("RGBA", ""),"")); KisPaintDeviceSP l = img->activeDevice(); KisFillPainter p(l.data()); - p.fillRect(0, 0, 1000, 1000, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + p.fillRect(0, 0, 1000, 1000, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); p.end(); - QTime t; + TQTime t; t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { KisRectIterator r = l->createRectIterator(0, 0, 1000, 1000, false); while(! r.isDone()) { @@ -1030,21 +1030,21 @@ QString rectRO(KisDoc * doc, Q_UINT32 testCount) } } - return QString(" rect iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed()); + return TQString(" rect iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); } -QString rectWRDefault(KisDoc * doc, Q_UINT32 testCount) +TQString rectWRDefault(KisDoc * doc, TQ_UINT32 testCount) { KisImageSP img = doc->newImage("", 1000, 1000, KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID("RGBA", ""),"")); KisPaintDeviceSP l = img->activeDevice(); - QTime t; + TQTime t; t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { KisRectIterator r = l->createRectIterator(0, 0, 1000, 1000, true); while(! r.isDone()) { @@ -1052,25 +1052,25 @@ QString rectWRDefault(KisDoc * doc, Q_UINT32 testCount) } } - return QString(" rect iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed()); + return TQString(" rect iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); } -QString rectWR(KisDoc * doc, Q_UINT32 testCount) +TQString rectWR(KisDoc * doc, TQ_UINT32 testCount) { KisImageSP img = doc->newImage("", 1000, 1000, KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID("RGBA", ""),"")); KisPaintDeviceSP l = img->activeDevice(); KisFillPainter p(l.data()); - p.fillRect(0, 0, 1000, 1000, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + p.fillRect(0, 0, 1000, 1000, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); p.end(); - QTime t; + TQTime t; t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { + for (TQ_UINT32 i = 0; i < testCount; ++i) { KisRectIterator r = l->createRectIterator(0, 0, 1000, 1000, true); while(! r.isDone()) { @@ -1079,13 +1079,13 @@ QString rectWR(KisDoc * doc, Q_UINT32 testCount) } - return QString(" rect iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed()); + return TQString(" rect iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed()); } -QString PerfTest::iteratorTest(Q_UINT32 testCount) +TQString PerfTest::iteratorTest(TQ_UINT32 testCount) { - QString report = "Iterator test"; + TQString report = "Iterator test"; KisDoc * doc = m_view->canvasSubject()->document(); @@ -1109,9 +1109,9 @@ QString PerfTest::iteratorTest(Q_UINT32 testCount) } -QString PerfTest::paintViewTest(Q_UINT32 testCount) +TQString PerfTest::paintViewTest(TQ_UINT32 testCount) { - QString report = QString("* paintView test\n\n"); + TQString report = TQString("* paintView test\n\n"); KisDoc * doc = m_view->canvasSubject()->document(); @@ -1122,56 +1122,56 @@ QString PerfTest::paintViewTest(Q_UINT32 testCount) KisPaintDeviceSP l = img->activeDevice(); KisFillPainter p(l.data()); - p.fillRect(0, 0, 512, 512, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + p.fillRect(0, 0, 512, 512, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); p.end(); - QTime t; + TQTime t; t.restart(); #if USE_CALLGRIND CALLGRIND_ZERO_STATS(); #endif - for (Q_UINT32 i = 0; i < testCount; ++i) { - m_view->getCanvasController()->updateCanvas(QRect(0, 0, 512, 512)); + for (TQ_UINT32 i = 0; i < testCount; ++i) { + m_view->getCanvasController()->updateCanvas(TQRect(0, 0, 512, 512)); } #if USE_CALLGRIND CALLGRIND_DUMP_STATS(); #endif - report = report.append(QString(" painted a 512 x 512 image %1 times: %2 ms\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" painted a 512 x 512 image %1 times: %2 ms\n").tqarg(testCount).tqarg(t.elapsed())); img->newLayer("layer 2", OPACITY_OPAQUE); l = img->activeDevice(); p.begin(l.data()); - p.fillRect(0, 0, 512, 512, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + p.fillRect(0, 0, 512, 512, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); p.end(); img->newLayer("layer 3", OPACITY_OPAQUE); l = img->activeDevice(); p.begin(l.data()); - p.fillRect(0, 0, 512, 512, KisColor(Qt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); + p.fillRect(0, 0, 512, 512, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8())); p.end(); t.restart(); - for (Q_UINT32 i = 0; i < testCount; ++i) { - m_view->getCanvasController()->updateCanvas(QRect(0, 0, 512, 512)); + for (TQ_UINT32 i = 0; i < testCount; ++i) { + m_view->getCanvasController()->updateCanvas(TQRect(0, 0, 512, 512)); } - report = report.append(QString(" painted a 512 x 512 image with 3 layers %1 times: %2 ms\n").arg(testCount).arg(t.elapsed())); + report = report.append(TQString(" painted a 512 x 512 image with 3 layers %1 times: %2 ms\n").tqarg(testCount).tqarg(t.elapsed())); return report; } -QString PerfTest::paintViewFPSTest() +TQString PerfTest::paintViewFPSTest() { - QString report = QString("* paintView (fps) test\n\n"); + TQString report = TQString("* paintView (fps) test\n\n"); - QTime t; + TQTime t; t.restart(); #if USE_CALLGRIND @@ -1190,7 +1190,7 @@ QString PerfTest::paintViewFPSTest() CALLGRIND_DUMP_STATS(); #endif - report = report.append(QString(" painted current view at %1 frames per second\n").arg(numViewsPainted)); + report = report.append(TQString(" painted current view at %1 frames per second\n").tqarg(numViewsPainted)); return report; } diff --git a/krita/plugins/viewplugins/performancetest/perftest.h b/krita/plugins/viewplugins/performancetest/perftest.h index 6a3365c5..807c0aee 100644 --- a/krita/plugins/viewplugins/performancetest/perftest.h +++ b/krita/plugins/viewplugins/performancetest/perftest.h @@ -31,8 +31,9 @@ class KisID; class PerfTest : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - PerfTest(QObject *parent, const char *name, const QStringList &); + PerfTest(TQObject *tqparent, const char *name, const TQStringList &); virtual ~PerfTest(); private slots: @@ -41,28 +42,28 @@ private slots: private: - QString bltTest(Q_UINT32 testCount); - QString fillTest(Q_UINT32 testCount); - QString gradientTest(Q_UINT32 testCount); - QString pixelTest(Q_UINT32 testCount); - QString shapeTest(Q_UINT32 testCount); - QString layerTest(Q_UINT32 testCount); - QString scaleTest(Q_UINT32 testCount); - QString rotateTest(Q_UINT32 testCount); - QString renderTest(Q_UINT32 restCount); - QString selectionTest(Q_UINT32 testCount); - QString colorConversionTest(Q_UINT32 testCount); - QString filterTest(Q_UINT32 testCount); - QString readBytesTest(Q_UINT32 testCount); - QString writeBytesTest(Q_UINT32 testCount); - QString iteratorTest(Q_UINT32 testCount); - QString paintViewTest(Q_UINT32 testCount); - QString paintViewFPSTest(); + TQString bltTest(TQ_UINT32 testCount); + TQString fillTest(TQ_UINT32 testCount); + TQString gradientTest(TQ_UINT32 testCount); + TQString pixelTest(TQ_UINT32 testCount); + TQString tqshapeTest(TQ_UINT32 testCount); + TQString layerTest(TQ_UINT32 testCount); + TQString scaleTest(TQ_UINT32 testCount); + TQString rotateTest(TQ_UINT32 testCount); + TQString renderTest(TQ_UINT32 restCount); + TQString selectionTest(TQ_UINT32 testCount); + TQString colorConversionTest(TQ_UINT32 testCount); + TQString filterTest(TQ_UINT32 testCount); + TQString readBytesTest(TQ_UINT32 testCount); + TQString writeBytesTest(TQ_UINT32 testCount); + TQString iteratorTest(TQ_UINT32 testCount); + TQString paintViewTest(TQ_UINT32 testCount); + TQString paintViewFPSTest(); - QString doBlit(const KisCompositeOp& op, + TQString doBlit(const KisCompositeOp& op, KisID cspace, - Q_UINT8 opacity, - Q_UINT32 testCount, + TQ_UINT8 opacity, + TQ_UINT32 testCount, KisImageSP img); private: diff --git a/krita/plugins/viewplugins/performancetest/wdg_perftest.ui b/krita/plugins/viewplugins/performancetest/wdg_perftest.ui index 4f9ca4a0..7dc14f17 100644 --- a/krita/plugins/viewplugins/performancetest/wdg_perftest.ui +++ b/krita/plugins/viewplugins/performancetest/wdg_perftest.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>WdgPerfTest</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgPerfTest</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup" row="0" column="0"> + <widget class="TQButtonGroup" row="0" column="0"> <property name="name"> <cstring>grpPerfTest</cstring> </property> @@ -30,7 +30,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblTests</cstring> </property> @@ -41,7 +41,7 @@ <cstring>intWidth</cstring> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>chkBitBlt</cstring> </property> @@ -52,7 +52,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>chkFill</cstring> </property> @@ -63,7 +63,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>chkGradient</cstring> </property> @@ -74,7 +74,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>chkPixel</cstring> </property> @@ -85,7 +85,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="5" column="0"> + <widget class="TQCheckBox" row="5" column="0"> <property name="name"> <cstring>chkShape</cstring> </property> @@ -96,7 +96,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="6" column="0"> + <widget class="TQCheckBox" row="6" column="0"> <property name="name"> <cstring>chkLayer</cstring> </property> @@ -107,7 +107,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="7" column="0"> + <widget class="TQCheckBox" row="7" column="0"> <property name="name"> <cstring>chkScale</cstring> </property> @@ -118,7 +118,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="8" column="0"> + <widget class="TQCheckBox" row="8" column="0"> <property name="name"> <cstring>chkRotate</cstring> </property> @@ -129,7 +129,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="9" column="0"> + <widget class="TQCheckBox" row="9" column="0"> <property name="name"> <cstring>chkRender</cstring> </property> @@ -140,7 +140,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="10" column="0"> + <widget class="TQCheckBox" row="10" column="0"> <property name="name"> <cstring>chkSelection</cstring> </property> @@ -151,7 +151,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="11" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="11" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>chkColorConversion</cstring> </property> @@ -162,7 +162,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="12" column="0"> + <widget class="TQCheckBox" row="12" column="0"> <property name="name"> <cstring>chkFilter</cstring> </property> @@ -187,7 +187,7 @@ <number>1000000</number> </property> </widget> - <widget class="QCheckBox" row="13" column="0"> + <widget class="TQCheckBox" row="13" column="0"> <property name="name"> <cstring>chkReadBytes</cstring> </property> @@ -198,7 +198,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="14" column="0"> + <widget class="TQCheckBox" row="14" column="0"> <property name="name"> <cstring>chkWriteBytes</cstring> </property> @@ -209,7 +209,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="15" column="0"> + <widget class="TQCheckBox" row="15" column="0"> <property name="name"> <cstring>chkIterators</cstring> </property> @@ -220,7 +220,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="16" column="0"> + <widget class="TQCheckBox" row="16" column="0"> <property name="name"> <cstring>chkPaintView</cstring> </property> @@ -231,15 +231,15 @@ <bool>true</bool> </property> </widget> - <widget class="QLayoutWidget" row="18" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="18" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnSelectAll</cstring> </property> @@ -247,7 +247,7 @@ <string>&Select All</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>btnDeselectAll</cstring> </property> @@ -257,7 +257,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox" row="17" column="0"> + <widget class="TQCheckBox" row="17" column="0"> <property name="name"> <cstring>chkPaintViewFPS</cstring> </property> @@ -275,7 +275,7 @@ <tabstops> <tabstop>intTestCount</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/krita/plugins/viewplugins/rotateimage/dlg_rotateimage.cc b/krita/plugins/viewplugins/rotateimage/dlg_rotateimage.cc index 9bf20fec..28d60154 100644 --- a/krita/plugins/viewplugins/rotateimage/dlg_rotateimage.cc +++ b/krita/plugins/viewplugins/rotateimage/dlg_rotateimage.cc @@ -26,10 +26,10 @@ using namespace std; -#include <qgroupbox.h> -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qlabel.h> +#include <tqgroupbox.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqlabel.h> #include <klocale.h> #include <knuminput.h> @@ -39,9 +39,9 @@ using namespace std; #include "wdg_rotateimage.h" -DlgRotateImage::DlgRotateImage( QWidget * parent, +DlgRotateImage::DlgRotateImage( TQWidget * tqparent, const char * name) - : super (parent, name, true, i18n("Rotate Image"), Ok | Cancel, Ok) + : super (tqparent, name, true, i18n("Rotate Image"), Ok | Cancel, Ok) { m_lock = false; @@ -49,12 +49,12 @@ DlgRotateImage::DlgRotateImage( QWidget * parent, Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->sizeHint()); + resize(m_page->tqsizeHint()); - connect(this, SIGNAL(okClicked()), - this, SLOT(okClicked())); - connect( m_page->doubleCustom, SIGNAL( valueChanged ( double ) ), - this, SLOT( slotAngleValueChanged( double ) ) ); + connect(this, TQT_SIGNAL(okClicked()), + this, TQT_SLOT(okClicked())); + connect( m_page->doubleCustom, TQT_SIGNAL( valueChanged ( double ) ), + this, TQT_SLOT( slotAngleValueChanged( double ) ) ); } @@ -104,7 +104,7 @@ double DlgRotateImage::angle() angle = 270; } else { - angle = qRound(m_page->doubleCustom->value()); + angle = tqRound(m_page->doubleCustom->value()); } if (m_page->radioCW->isChecked()) { return angle; diff --git a/krita/plugins/viewplugins/rotateimage/dlg_rotateimage.h b/krita/plugins/viewplugins/rotateimage/dlg_rotateimage.h index c6eef135..8c00df81 100644 --- a/krita/plugins/viewplugins/rotateimage/dlg_rotateimage.h +++ b/krita/plugins/viewplugins/rotateimage/dlg_rotateimage.h @@ -35,10 +35,11 @@ enum enumRotationDirection { class DlgRotateImage: public KDialogBase { typedef KDialogBase super; Q_OBJECT + TQ_OBJECT public: - DlgRotateImage(QWidget * parent = 0, + DlgRotateImage(TQWidget * tqparent = 0, const char* name = 0); ~DlgRotateImage(); diff --git a/krita/plugins/viewplugins/rotateimage/rotateimage.cc b/krita/plugins/viewplugins/rotateimage/rotateimage.cc index 8b85ef3a..0b1b1a8c 100644 --- a/krita/plugins/viewplugins/rotateimage/rotateimage.cc +++ b/krita/plugins/viewplugins/rotateimage/rotateimage.cc @@ -23,8 +23,8 @@ #include <stdlib.h> -#include <qslider.h> -#include <qpoint.h> +#include <tqslider.h> +#include <tqpoint.h> #include <klocale.h> #include <kiconloader.h> @@ -51,24 +51,24 @@ typedef KGenericFactory<RotateImage> RotateImageFactory; K_EXPORT_COMPONENT_FACTORY( kritarotateimage, RotateImageFactory( "krita" ) ) // XXX: this plugin could also provide layer scaling/resizing -RotateImage::RotateImage(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +RotateImage::RotateImage(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { - if ( parent->inherits("KisView") ) { + if ( tqparent->inherits("KisView") ) { setInstance(RotateImageFactory::instance()); setXMLFile(locate("data","kritaplugins/rotateimage.rc"), true); - m_view = (KisView*) parent; - (void) new KAction(i18n("&Rotate Image..."), 0, 0, this, SLOT(slotRotateImage()), actionCollection(), "rotateimage"); - (void) new KAction(i18n("Rotate Image CW"), "rotate_cw", 0, this, SLOT(slotRotateImage90()), actionCollection(), "rotateImageCW90"); - (void) new KAction(i18n("Rotate Image 1&80"), 0, 0, this, SLOT(slotRotateImage180()), actionCollection(), "rotateImage180"); - (void) new KAction(i18n("Rotate Image CCW"), "rotate_ccw", 0, this, SLOT(slotRotateImage270()), actionCollection(), "rotateImageCCW90"); + m_view = (KisView*) tqparent; + (void) new KAction(i18n("&Rotate Image..."), 0, 0, this, TQT_SLOT(slotRotateImage()), actionCollection(), "rotateimage"); + (void) new KAction(i18n("Rotate Image CW"), "rotate_cw", 0, this, TQT_SLOT(slotRotateImage90()), actionCollection(), "rotateImageCW90"); + (void) new KAction(i18n("Rotate Image 1&80"), 0, 0, this, TQT_SLOT(slotRotateImage180()), actionCollection(), "rotateImage180"); + (void) new KAction(i18n("Rotate Image CCW"), "rotate_ccw", 0, this, TQT_SLOT(slotRotateImage270()), actionCollection(), "rotateImageCCW90"); - (void) new KAction(i18n("&Rotate Layer..."), 0, 0, this, SLOT(slotRotateLayer()), actionCollection(), "rotatelayer"); + (void) new KAction(i18n("&Rotate Layer..."), 0, 0, this, TQT_SLOT(slotRotateLayer()), actionCollection(), "rotatelayer"); - (void)new KAction(i18n("Rotate 1&80"), 0, m_view, SLOT(rotateLayer180()), actionCollection(), "rotateLayer180"); - (void)new KAction(i18n("Rotate CCW"), "rotate_ccw", 0, m_view, SLOT(rotateLayerLeft90()), actionCollection(), "rotateLayerCCW90"); - (void)new KAction(i18n("Rotate CW"), "rotate_cw", 0, m_view, SLOT(rotateLayerRight90()), actionCollection(), "rotateLayerCW90"); + (void)new KAction(i18n("Rotate 1&80"), 0, m_view, TQT_SLOT(rotateLayer180()), actionCollection(), "rotateLayer180"); + (void)new KAction(i18n("Rotate CCW"), "rotate_ccw", 0, m_view, TQT_SLOT(rotateLayerLeft90()), actionCollection(), "rotateLayerCCW90"); + (void)new KAction(i18n("Rotate CW"), "rotate_cw", 0, m_view, TQT_SLOT(rotateLayerRight90()), actionCollection(), "rotateLayerCW90"); } } @@ -88,7 +88,7 @@ void RotateImage::slotRotateImage() dlgRotateImage->setCaption(i18n("Rotate Image")); - if (dlgRotateImage->exec() == QDialog::Accepted) { + if (dlgRotateImage->exec() == TQDialog::Accepted) { double angle = dlgRotateImage->angle(); angle *= M_PI/180; m_view->rotateCurrentImage(angle); @@ -123,7 +123,7 @@ void RotateImage::slotRotateLayer() dlgRotateImage->setCaption(i18n("Rotate Layer")); - if (dlgRotateImage->exec() == QDialog::Accepted) { + if (dlgRotateImage->exec() == TQDialog::Accepted) { double angle = dlgRotateImage->angle(); angle *= M_PI/180; m_view->rotateLayer(angle); diff --git a/krita/plugins/viewplugins/rotateimage/rotateimage.h b/krita/plugins/viewplugins/rotateimage/rotateimage.h index 7c09179c..71223282 100644 --- a/krita/plugins/viewplugins/rotateimage/rotateimage.h +++ b/krita/plugins/viewplugins/rotateimage/rotateimage.h @@ -27,8 +27,9 @@ class KisView; class RotateImage : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - RotateImage(QObject *parent, const char *name, const QStringList &); + RotateImage(TQObject *tqparent, const char *name, const TQStringList &); virtual ~RotateImage(); private slots: diff --git a/krita/plugins/viewplugins/rotateimage/wdg_rotateimage.ui b/krita/plugins/viewplugins/rotateimage/wdg_rotateimage.ui index f672db7f..d58c458d 100644 --- a/krita/plugins/viewplugins/rotateimage/wdg_rotateimage.ui +++ b/krita/plugins/viewplugins/rotateimage/wdg_rotateimage.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgRotateImage</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgRotateImage</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup" row="0" column="0"> + <widget class="TQButtonGroup" row="0" column="0"> <property name="name"> <cstring>grpDirection</cstring> </property> @@ -30,9 +30,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> @@ -48,14 +48,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>pixmapLabel1</cstring> </property> @@ -65,7 +65,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -79,14 +79,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>pixmapLabel2</cstring> </property> @@ -96,7 +96,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -110,7 +110,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>20</height> @@ -119,7 +119,7 @@ </spacer> </hbox> </widget> - <widget class="QRadioButton" row="1" column="1"> + <widget class="TQRadioButton" row="1" column="1"> <property name="name"> <cstring>radioCW</cstring> </property> @@ -130,7 +130,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>radioCCW</cstring> </property> @@ -140,7 +140,7 @@ </widget> </grid> </widget> - <widget class="QButtonGroup" row="1" column="0"> + <widget class="TQButtonGroup" row="1" column="0"> <property name="name"> <cstring>grpAngle</cstring> </property> @@ -151,7 +151,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radio90</cstring> </property> @@ -159,7 +159,7 @@ <string>90 &degrees</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radio180</cstring> </property> @@ -167,7 +167,7 @@ <string>180 d&egrees</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radio270</cstring> </property> @@ -175,15 +175,15 @@ <string>270 de&grees</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioCustom</cstring> </property> @@ -219,7 +219,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>91</height> @@ -238,7 +238,7 @@ <data format="PNG" length="363">89504e470d0a1a0a0000000d494844520000002c0000002e0806000000534cfb0a00000132494441545885ed994b12032108449b54ee7f65b3cd5440f92a56a5f7326f5a11451a63608b8806c6a0689857068b5a446177f6020361e8fdc04008fa0c30e086a6b4a4f3ba664cc418704212013041fb80b340bfa5847e9b825680022687f549d70016d03aac815d7d988be1a87c6be015acb7dc3ac7cd8167b091734160acbc861bc2029e4a77101690f661c9dd840f46a577b8012cc00157edb749d239dcc45de0e4f1d2a927705235aad4e50e5fa03f70b56c0778ab227bba90ec7d1d167eb62f30c0423f81b9696856aa7b3bcc487fa7f3543ccb18e54cfe3adca914332ce7aff9c6d83cb0e47205b4f176634fba4c68472c1978b69633a09db7f2753330bb91128ca7eb5e56b5aaac316069b756573ce54cf5b8e65fd3d0769870e6c920305bfb1e659296541ef0265d77bcbc0ef803779f9c39421cd9b50000000049454e44ae426082</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> </includehints> diff --git a/krita/plugins/viewplugins/screenshot/ksnapshot.cpp b/krita/plugins/viewplugins/screenshot/ksnapshot.cpp index 77b4da4b..09bdca48 100644 --- a/krita/plugins/viewplugins/screenshot/ksnapshot.cpp +++ b/krita/plugins/viewplugins/screenshot/ksnapshot.cpp @@ -22,11 +22,11 @@ #include <ksavefile.h> #include <ktempfile.h> -#include <qbitmap.h> -#include <qdragobject.h> -#include <qimage.h> -#include <qclipboard.h> -#include <qvbox.h> +#include <tqbitmap.h> +#include <tqdragobject.h> +#include <tqimage.h> +#include <tqclipboard.h> +#include <tqvbox.h> #include <kaccel.h> #include <knotifyclient.h> @@ -35,11 +35,11 @@ #include <kpushbutton.h> #include <kstartupinfo.h> -#include <qcursor.h> -#include <qregexp.h> -#include <qpainter.h> -#include <qpaintdevicemetrics.h> -#include <qwhatsthis.h> +#include <tqcursor.h> +#include <tqregexp.h> +#include <tqpainter.h> +#include <tqpaintdevicemetrics.h> +#include <tqwhatsthis.h> #include <stdlib.h> @@ -58,10 +58,10 @@ #include <kglobal.h> -KSnapshot::KSnapshot(QWidget *parent, const char *name) - : super(parent, name, false, QString::null, Ok|Cancel) +KSnapshot::KSnapshot(TQWidget *tqparent, const char *name) + : super(tqparent, name, false, TQString(), Ok|Cancel) { - grabber = new QWidget( 0, 0, WStyle_Customize | WX11BypassWM ); + grabber = new TQWidget( 0, 0, WStyle_Customize | WX11BypassWM ); Q_CHECK_PTR(grabber); grabber->move( -1000, -1000 ); grabber->installEventFilter( this ); @@ -72,21 +72,21 @@ KSnapshot::KSnapshot(QWidget *parent, const char *name) haveXShape = XShapeQueryExtension( qt_xdisplay(), &tmp1, &tmp2 ); #endif - QVBox *vbox = makeVBoxMainWidget(); + TQVBox *vbox = makeVBoxMainWidget(); mainWidget = new KSnapshotWidget( vbox, "mainWidget" ); Q_CHECK_PTR(mainWidget); mainWidget->btnSave->hide(); mainWidget->btnPrint->hide(); - connect(mainWidget, SIGNAL(startImageDrag()), SLOT(slotDragSnapshot())); + connect(mainWidget, TQT_SIGNAL(startImageDrag()), TQT_SLOT(slotDragSnapshot())); - connect( mainWidget, SIGNAL( newClicked() ), SLOT( slotGrab() ) ); - connect( mainWidget, SIGNAL( printClicked() ), SLOT( slotPrint() ) ); + connect( mainWidget, TQT_SIGNAL( newClicked() ), TQT_SLOT( slotGrab() ) ); + connect( mainWidget, TQT_SIGNAL( printClicked() ), TQT_SLOT( slotPrint() ) ); grabber->show(); grabber->grabMouse( waitCursor ); - snapshot = QPixmap::grabWindow( qt_xrootwin() ); + snapshot = TQPixmap::grabWindow( qt_xrootwin() ); updatePreview(); grabber->releaseMouse(); grabber->hide(); @@ -97,16 +97,16 @@ KSnapshot::KSnapshot(QWidget *parent, const char *name) mainWidget->setMode( conf->readNumEntry( "mode", 0 ) ); mainWidget->setIncludeDecorations(conf->readBoolEntry("includeDecorations",true)); - connect( &grabTimer, SIGNAL( timeout() ), this, SLOT( grabTimerDone() ) ); + connect( &grabTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( grabTimerDone() ) ); KAccel* accel = new KAccel(this); Q_CHECK_PTR(accel); - accel->insert(KStdAccel::Print, this, SLOT(slotPrint())); - accel->insert(KStdAccel::New, this, SLOT(slotGrab())); + accel->insert(KStdAccel::Print, this, TQT_SLOT(slotPrint())); + accel->insert(KStdAccel::New, this, TQT_SLOT(slotGrab())); - accel->insert( "Print2", Qt::Key_P, this, SLOT(slotPrint())); - accel->insert( "New2", Qt::Key_N, this, SLOT(slotGrab())); - accel->insert( "New3", Qt::Key_Space, this, SLOT(slotGrab())); + accel->insert( "Print2", TQt::Key_P, this, TQT_SLOT(slotPrint())); + accel->insert( "New2", TQt::Key_N, this, TQT_SLOT(slotGrab())); + accel->insert( "New3", TQt::Key_Space, this, TQT_SLOT(slotGrab())); mainWidget->btnNew->setFocus(); @@ -116,14 +116,14 @@ KSnapshot::~KSnapshot() { } -bool KSnapshot::save( const QString &filename ) +bool KSnapshot::save( const TQString &filename ) { return save( KURL::fromPathOrURL( filename )); } bool KSnapshot::save( const KURL& url ) { - QString type( KImageIO::type(url.path()) ); + TQString type( KImageIO::type(url.path()) ); if ( type.isNull() ) type = "PNG"; @@ -147,13 +147,13 @@ bool KSnapshot::save( const KURL& url ) } } - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); if ( !ok ) { kdWarning() << "KSnapshot was unable to save the snapshot" << endl; - QString caption = i18n("Unable to Save Image"); - QString text = i18n("KSnapshot was unable to save the image to\n%1.") - .arg(url.prettyURL()); + TQString caption = i18n("Unable to Save Image"); + TQString text = i18n("KSnapshot was unable to save the image to\n%1.") + .tqarg(url.prettyURL()); KMessageBox::error(this, text, caption); } @@ -162,13 +162,13 @@ bool KSnapshot::save( const KURL& url ) void KSnapshot::slotCopy() { - QClipboard *cb = QApplication::clipboard(); + TQClipboard *cb = TQApplication::tqclipboard(); cb->setPixmap( snapshot ); } void KSnapshot::slotDragSnapshot() { - QDragObject *drobj = new QImageDrag(snapshot.convertToImage(), this); + TQDragObject *drobj = new TQImageDrag(snapshot.convertToImage(), this); Q_CHECK_PTR(drobj); drobj->setPixmap(mainWidget->preview()); drobj->dragCopy(); @@ -181,8 +181,8 @@ void KSnapshot::slotGrab() { rgnGrab = new RegionGrabber(); Q_CHECK_PTR(rgnGrab); - connect( rgnGrab, SIGNAL( regionGrabbed( const QPixmap & ) ), - SLOT( slotRegionGrabbed( const QPixmap & ) ) ); + connect( rgnGrab, TQT_SIGNAL( regionGrabbed( const TQPixmap & ) ), + TQT_SLOT( slotRegionGrabbed( const TQPixmap & ) ) ); } else { @@ -203,14 +203,14 @@ void KSnapshot::slotPrint() else printer.setOrientation(KPrinter::Portrait); - qApp->processEvents(); + tqApp->processEvents(); if (printer.setup(this, i18n("Print Screenshot"))) { - qApp->processEvents(); + tqApp->processEvents(); - QPainter painter(&printer); - QPaintDeviceMetrics metrics(painter.device()); + TQPainter painter(&printer); + TQPaintDeviceMetrics metrics(painter.device()); float w = snapshot.width(); float dw = w - metrics.width(); @@ -223,8 +223,8 @@ void KSnapshot::slotPrint() if ( scale ) { - QImage img = snapshot.convertToImage(); - qApp->processEvents(); + TQImage img = snapshot.convertToImage(); + tqApp->processEvents(); float newh, neww; if ( dw > dh ) { @@ -236,8 +236,8 @@ void KSnapshot::slotPrint() neww = newh/h*w; } - img = img.smoothScale( int(neww), int(newh), QImage::ScaleMin ); - qApp->processEvents(); + img = img.smoothScale( int(neww), int(newh), TQ_ScaleMin ); + tqApp->processEvents(); int x = (metrics.width()-img.width())/2; int y = (metrics.height()-img.height())/2; @@ -251,10 +251,10 @@ void KSnapshot::slotPrint() } } - qApp->processEvents(); + tqApp->processEvents(); } -void KSnapshot::slotRegionGrabbed( const QPixmap &pix ) +void KSnapshot::slotRegionGrabbed( const TQPixmap &pix ) { if ( !pix.isNull() ) { @@ -264,15 +264,15 @@ void KSnapshot::slotRegionGrabbed( const QPixmap &pix ) } delete rgnGrab; - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); show(); } -bool KSnapshot::eventFilter( QObject* o, QEvent* e) +bool KSnapshot::eventFilter( TQObject* o, TQEvent* e) { - if ( o == grabber && e->type() == QEvent::MouseButtonPress ) { - QMouseEvent* me = (QMouseEvent*) e; - if ( QWidget::mouseGrabber() != grabber ) + if ( o == grabber && e->type() == TQEvent::MouseButtonPress ) { + TQMouseEvent* me = (TQMouseEvent*) e; + if ( TQWidget::mouseGrabber() != grabber ) return false; if ( me->button() == LeftButton ) performGrab(); @@ -282,7 +282,7 @@ bool KSnapshot::eventFilter( QObject* o, QEvent* e) void KSnapshot::updatePreview() { - QImage img = snapshot.convertToImage(); + TQImage img = snapshot.convertToImage(); double r1 = ((double) snapshot.height() ) / snapshot.width(); if ( r1 * mainWidget->previewWidth() < mainWidget->previewHeight() ) img = img.smoothScale( mainWidget->previewWidth(), @@ -291,7 +291,7 @@ void KSnapshot::updatePreview() img = img.smoothScale( (int) (((double)mainWidget->previewHeight()) / r1), (mainWidget->previewHeight() ) ); - QPixmap pm; + TQPixmap pm; pm.convertFromImage( img ); mainWidget->setPreview( pm ); } @@ -319,17 +319,17 @@ Window findRealWindow( Window w, int depth = 0 ) if( type != None ) return w; } - Window root, parent; - Window* children; - unsigned int nchildren; + Window root, tqparent; + Window* tqchildren; + unsigned int ntqchildren; Window ret = None; - if( XQueryTree( qt_xdisplay(), w, &root, &parent, &children, &nchildren ) != 0 ) { + if( XQueryTree( qt_xdisplay(), w, &root, &tqparent, &tqchildren, &ntqchildren ) != 0 ) { for( unsigned int i = 0; - i < nchildren && ret == None; + i < ntqchildren && ret == None; ++i ) - ret = findRealWindow( children[ i ], depth + 1 ); - if( children != NULL ) - XFree( children ); + ret = findRealWindow( tqchildren[ i ], depth + 1 ); + if( tqchildren != NULL ) + XFree( tqchildren ); } return ret; } @@ -343,11 +343,11 @@ void KSnapshot::performGrab() if ( mainWidget->mode() == WindowUnderCursor ) { Window root; Window child; - uint mask; + uint tqmask; int rootX, rootY, winX, winY; XQueryPointer( qt_xdisplay(), qt_xrootwin(), &root, &child, &rootX, &rootY, &winX, &winY, - &mask); + &tqmask); if( child == None ) child = qt_xrootwin(); if( !mainWidget->includeDecorations()) { @@ -364,77 +364,77 @@ void KSnapshot::performGrab() w += 2 * border; h += 2 * border; - Window parent; - Window* children; - unsigned int nchildren; - if( XQueryTree( qt_xdisplay(), child, &root, &parent, - &children, &nchildren ) != 0 ) { - if( children != NULL ) - XFree( children ); + Window tqparent; + Window* tqchildren; + unsigned int ntqchildren; + if( XQueryTree( qt_xdisplay(), child, &root, &tqparent, + &tqchildren, &ntqchildren ) != 0 ) { + if( tqchildren != NULL ) + XFree( tqchildren ); int newx, newy; Window dummy; - if( XTranslateCoordinates( qt_xdisplay(), parent, qt_xrootwin(), + if( XTranslateCoordinates( qt_xdisplay(), tqparent, qt_xrootwin(), x, y, &newx, &newy, &dummy )) { x = newx; y = newy; } } - snapshot = QPixmap::grabWindow( qt_xrootwin(), x, y, w, h ); + snapshot = TQPixmap::grabWindow( qt_xrootwin(), x, y, w, h ); #ifdef HAVE_X11_EXTENSIONS_SHAPE_H //No XShape - no work. if (haveXShape) { - QBitmap mask(w, h); - //As the first step, get the mask from XShape. + TQBitmap tqmask(w, h); + //As the first step, get the tqmask from XShape. int count, order; XRectangle* rects = XShapeGetRectangles( qt_xdisplay(), child, ShapeBounding, &count, &order); - //The ShapeBounding region is the outermost shape of the window; + //The ShapeBounding region is the outermost tqshape of the window; //ShapeBounding - ShapeClipping is defined to be the border. //Since the border area is part of the window, we use bounding // to limit our work region if (rects) { - //Create a QRegion from the rectangles describing the bounding mask. - QRegion contents; + //Create a TQRegion from the rectangles describing the bounding tqmask. + TQRegion contents; for (int pos = 0; pos < count; pos++) - contents += QRegion(rects[pos].x, rects[pos].y, + contents += TQRegion(rects[pos].x, rects[pos].y, rects[pos].width, rects[pos].height); XFree(rects); //Create the bounding box. - QRegion bbox(0, 0, snapshot.width(), snapshot.height()); + TQRegion bbox(0, 0, snapshot.width(), snapshot.height()); if( border > 0 ) { contents.translate( border, border ); - contents += QRegion( 0, 0, border, h ); - contents += QRegion( 0, 0, w, border ); - contents += QRegion( 0, h - border, w, border ); - contents += QRegion( w - border, 0, border, h ); + contents += TQRegion( 0, 0, border, h ); + contents += TQRegion( 0, 0, w, border ); + contents += TQRegion( 0, h - border, w, border ); + contents += TQRegion( w - border, 0, border, h ); } - //Get the masked away area. - QRegion maskedAway = bbox - contents; - QMemArray<QRect> maskedAwayRects = maskedAway.rects(); - - //Construct a bitmap mask from the rectangles - QPainter p(&mask); - p.fillRect(0, 0, w, h, Qt::color1); - for (uint pos = 0; pos < maskedAwayRects.count(); pos++) - p.fillRect(maskedAwayRects[pos], Qt::color0); + //Get the tqmasked away area. + TQRegion tqmaskedAway = bbox - contents; + TQMemArray<TQRect> tqmaskedAwayRects = tqmaskedAway.rects(); + + //Construct a bitmap tqmask from the rectangles + TQPainter p(&tqmask); + p.fillRect(0, 0, w, h, TQt::color1); + for (uint pos = 0; pos < tqmaskedAwayRects.count(); pos++) + p.fillRect(tqmaskedAwayRects[pos], TQt::color0); p.end(); - snapshot.setMask(mask); + snapshot.setMask(tqmask); } } #endif } else { - snapshot = QPixmap::grabWindow( qt_xrootwin() ); + snapshot = TQPixmap::grabWindow( qt_xrootwin() ); } XUngrabServer( qt_xdisplay()); updatePreview(); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); modified = true; // show(); slotOk(); @@ -445,7 +445,7 @@ void KSnapshot::setTime(int newTime) mainWidget->setDelay(newTime); } -void KSnapshot::setURL( const QString &url ) +void KSnapshot::setURL( const TQString &url ) { KURL newURL = KURL::fromPathOrURL( url ); if ( newURL == filename ) @@ -461,7 +461,7 @@ void KSnapshot::setGrabMode( int m ) void KSnapshot::slotMovePointer(int x, int y) { - QCursor::setPos( x, y ); + TQCursor::setPos( x, y ); } void KSnapshot::exit() @@ -473,7 +473,7 @@ void KSnapshot::exit() conf->writeEntry("mode",mainWidget->mode()); conf->writeEntry("includeDecorations",mainWidget->includeDecorations()); KURL url = filename; - url.setPass( QString::null ); + url.setPass( TQString() ); conf->writePathEntry("filename",url.url()); reject(); @@ -488,7 +488,7 @@ void KSnapshot::slotOk() conf->writeEntry("mode",mainWidget->mode()); conf->writeEntry("includeDecorations",mainWidget->includeDecorations()); KURL url = filename; - url.setPass( QString::null ); + url.setPass( TQString() ); conf->writePathEntry("filename",url.url()); emit screenGrabbed(); diff --git a/krita/plugins/viewplugins/screenshot/ksnapshot.h b/krita/plugins/viewplugins/screenshot/ksnapshot.h index 7eeccb62..030cad12 100644 --- a/krita/plugins/viewplugins/screenshot/ksnapshot.h +++ b/krita/plugins/viewplugins/screenshot/ksnapshot.h @@ -23,9 +23,9 @@ #ifndef KSNAPSHOT_H #define KSNAPSHOT_H -#include <qlabel.h> -#include <qpixmap.h> -#include <qtimer.h> +#include <tqlabel.h> +#include <tqpixmap.h> +#include <tqtimer.h> #include <dcopclient.h> #include <kglobalsettings.h> @@ -35,15 +35,16 @@ class RegionGrabber; class KSnapshotWidget; -class KSnapshotThumb : public QLabel +class KSnapshotThumb : public TQLabel { Q_OBJECT + TQ_OBJECT public: - KSnapshotThumb(QWidget *parent, const char *name = 0) - : QLabel(parent, name) + KSnapshotThumb(TQWidget *tqparent, const char *name = 0) + : TQLabel(tqparent, name) { - setAlignment(AlignHCenter | AlignVCenter); + tqsetAlignment(AlignHCenter | AlignVCenter); } virtual ~KSnapshotThumb() {} @@ -51,44 +52,45 @@ signals: void startDrag(); protected: - void mousePressEvent(QMouseEvent * e) + void mousePressEvent(TQMouseEvent * e) { mClickPt = e->pos(); } - void mouseMoveEvent(QMouseEvent * e) + void mouseMoveEvent(TQMouseEvent * e) { - if (mClickPt != QPoint(0, 0) && + if (mClickPt != TQPoint(0, 0) && (e->pos() - mClickPt).manhattanLength() > KGlobalSettings::dndEventDelay()) { - mClickPt = QPoint(0, 0); + mClickPt = TQPoint(0, 0); emit startDrag(); } } - void mouseReleaseEvent(QMouseEvent * /*e*/) + void mouseReleaseEvent(TQMouseEvent * /*e*/) { - mClickPt = QPoint(0, 0); + mClickPt = TQPoint(0, 0); } - QPoint mClickPt; + TQPoint mClickPt; }; class KSnapshot : public KDialogBase { typedef KDialogBase super; Q_OBJECT + TQ_OBJECT public: - KSnapshot(QWidget *parent= 0, const char *name= 0); + KSnapshot(TQWidget *tqparent= 0, const char *name= 0); ~KSnapshot(); enum CaptureMode { FullScreen=0, WindowUnderCursor=1, Region=2 }; - bool save( const QString &filename ); + bool save( const TQString &filename ); bool save( const KURL& url ); - QString url() const { return filename.url(); } + TQString url() const { return filename.url(); } signals: void screenGrabbed(); @@ -100,7 +102,7 @@ protected slots: void slotMovePointer( int x, int y ); void setTime(int newTime); - void setURL(const QString &newURL); + void setURL(const TQString &newURL); void setGrabMode( int m ); void exit(); @@ -109,21 +111,21 @@ protected slots: protected: void reject() { close(); } - bool eventFilter( QObject*, QEvent* ); + bool eventFilter( TQObject*, TQEvent* ); private slots: void grabTimerDone(); void slotDragSnapshot(); - void slotRegionGrabbed( const QPixmap & ); + void slotRegionGrabbed( const TQPixmap & ); private: void updatePreview(); void performGrab(); void autoincFilename(); - QPixmap snapshot; - QTimer grabTimer; - QWidget* grabber; + TQPixmap snapshot; + TQTimer grabTimer; + TQWidget* grabber; KURL filename; KSnapshotWidget *mainWidget; RegionGrabber *rgnGrab; diff --git a/krita/plugins/viewplugins/screenshot/ksnapshotwidget.ui b/krita/plugins/viewplugins/screenshot/ksnapshotwidget.ui index bd24e6ef..33b64e81 100644 --- a/krita/plugins/viewplugins/screenshot/ksnapshotwidget.ui +++ b/krita/plugins/viewplugins/screenshot/ksnapshotwidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KSnapshotWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KSnapshotWidget</cstring> </property> @@ -23,7 +23,7 @@ <property name="name"> <cstring>lblImage</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>200</width> <height>130</height> @@ -76,7 +76,7 @@ The image can be dragged to another application or document to copy the full scr <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>16</height> @@ -111,7 +111,7 @@ The image can be dragged to another application or document to copy the full scr <enum>Horizontal</enum> </property> </widget> - <widget class="QSpinBox" row="6" column="1"> + <widget class="TQSpinBox" row="6" column="1"> <property name="name"> <cstring>spinDelay</cstring> </property> @@ -135,7 +135,7 @@ If <i>no delay</i> is set, the program will wait for a mouse click b </qt></string> </property> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>lblDelay</cstring> </property> @@ -146,7 +146,7 @@ If <i>no delay</i> is set, the program will wait for a mouse click b <cstring>spinDelay</cstring> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -167,14 +167,14 @@ If <i>no delay</i> is set, the program will wait for a mouse click b <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>156</width> <height>16</height> </size> </property> </spacer> - <widget class="QCheckBox" row="7" column="0" rowspan="1" colspan="4"> + <widget class="TQCheckBox" row="7" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>cbIncludeDecorations</cstring> </property> @@ -188,7 +188,7 @@ If <i>no delay</i> is set, the program will wait for a mouse click b <string>When enabled, snapshot of a window will also include the window decorations</string> </property> </widget> - <widget class="QComboBox" row="5" column="1" rowspan="1" colspan="3"> + <widget class="TQComboBox" row="5" column="1" rowspan="1" colspan="3"> <item> <property name="text"> <string>Full Screen</string> @@ -225,7 +225,7 @@ If <i>no delay</i> is set, the program will wait for a mouse click b <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>31</height> @@ -304,13 +304,13 @@ If <i>no delay</i> is set, the program will wait for a mouse click b <include location="global" impldecl="in implementation">kglobalsettings.h</include> <include location="local" impldecl="in implementation">ksnapshotwidget.ui.h</include> </includes> -<signals> +<Q_SIGNALS> <signal>newClicked()</signal> <signal>saveClicked()</signal> <signal>printClicked()</signal> <signal>startImageDrag()</signal> -</signals> -<slots> +</Q_SIGNALS> +<Q_SLOTS> <slot access="protected" specifier="non virtual">slotModeChanged( int mode )</slot> <slot access="protected" specifier="non virtual">slotNewClicked()</slot> <slot access="protected" specifier="non virtual">slotSaveClicked()</slot> @@ -318,7 +318,7 @@ If <i>no delay</i> is set, the program will wait for a mouse click b <slot access="protected" specifier="non virtual">slotStartDrag()</slot> <slot specifier="non virtual" returnType="int">previewWidth()</slot> <slot specifier="non virtual" returnType="int">previewHeight()</slot> -</slots> +</Q_SLOTS> <functions> <function specifier="non virtual">setPreview( const QPixmap & pm )</function> <function specifier="non virtual">setDelay( int i )</function> @@ -327,9 +327,9 @@ If <i>no delay</i> is set, the program will wait for a mouse click b <function specifier="non virtual" returnType="int">delay()</function> <function specifier="non virtual" returnType="bool">includeDecorations()</function> <function specifier="non virtual" returnType="int">mode()</function> - <function specifier="non virtual" returnType="QPixmap">preview()</function> + <function specifier="non virtual" returnType="TQPixmap">preview()</function> </functions> <pixmapfunction>SmallIconSet</pixmapfunction> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/krita/plugins/viewplugins/screenshot/ksnapshotwidget.ui.h b/krita/plugins/viewplugins/screenshot/ksnapshotwidget.ui.h index e61b0c6e..3c552868 100644 --- a/krita/plugins/viewplugins/screenshot/ksnapshotwidget.ui.h +++ b/krita/plugins/viewplugins/screenshot/ksnapshotwidget.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ @@ -32,7 +32,7 @@ void KSnapshotWidget::slotModeChanged( int mode ) } -void KSnapshotWidget::setPreview( const QPixmap &pm ) +void KSnapshotWidget::setPreview( const TQPixmap &pm ) { lblImage->setPixmap(pm); } @@ -99,7 +99,7 @@ void KSnapshotWidget::slotStartDrag() } -QPixmap KSnapshotWidget::preview() +TQPixmap KSnapshotWidget::preview() { return *lblImage->pixmap(); } diff --git a/krita/plugins/viewplugins/screenshot/regiongrabber.cpp b/krita/plugins/viewplugins/screenshot/regiongrabber.cpp index f42f6b94..570c9e3f 100644 --- a/krita/plugins/viewplugins/screenshot/regiongrabber.cpp +++ b/krita/plugins/viewplugins/screenshot/regiongrabber.cpp @@ -20,29 +20,29 @@ #include "regiongrabber.h" -#include <qpainter.h> -#include <qpalette.h> -#include <qstyle.h> -#include <qtimer.h> -#include <qtooltip.h> +#include <tqpainter.h> +#include <tqpalette.h> +#include <tqstyle.h> +#include <tqtimer.h> +#include <tqtooltip.h> #include <kglobalsettings.h> -SizeTip::SizeTip( QWidget *parent, const char *name ) - : QLabel( parent, name, WStyle_Customize | WX11BypassWM | +SizeTip::SizeTip( TQWidget *tqparent, const char *name ) + : TQLabel( tqparent, name, WStyle_Customize | WX11BypassWM | WStyle_StaysOnTop | WStyle_NoBorder | WStyle_Tool ) { setMargin( 2 ); setIndent( 0 ); - setFrameStyle( QFrame::Plain | QFrame::Box ); + setFrameStyle( TQFrame::Plain | TQFrame::Box ); - setPalette( QToolTip::palette() ); + setPalette( TQToolTip::palette() ); } -void SizeTip::setTip( const QRect &rect ) +void SizeTip::setTip( const TQRect &rect ) { - QString tip = QString( "%1x%2" ).arg( rect.width() ) - .arg( rect.height() ); + TQString tip = TQString( "%1x%2" ).tqarg( rect.width() ) + .tqarg( rect.height() ); setText( tip ); adjustSize(); @@ -50,34 +50,34 @@ void SizeTip::setTip( const QRect &rect ) positionTip( rect ); } -void SizeTip::positionTip( const QRect &rect ) +void SizeTip::positionTip( const TQRect &rect ) { - QRect tipRect = geometry(); - tipRect.moveTopLeft( QPoint( 0, 0 ) ); + TQRect tipRect = tqgeometry(); + tipRect.moveTopLeft( TQPoint( 0, 0 ) ); if ( rect.intersects( tipRect ) ) { - QRect deskR = KGlobalSettings::desktopGeometry( QPoint( 0, 0 ) ); + TQRect deskR = KGlobalSettings::desktopGeometry( TQPoint( 0, 0 ) ); - tipRect.moveCenter( QPoint( deskR.width()/2, deskR.height()/2 ) ); - if ( !rect.contains( tipRect, true ) && rect.intersects( tipRect ) ) - tipRect.moveBottomRight( geometry().bottomRight() ); + tipRect.moveCenter( TQPoint( deskR.width()/2, deskR.height()/2 ) ); + if ( !rect.tqcontains( tipRect, true ) && rect.intersects( tipRect ) ) + tipRect.moveBottomRight( tqgeometry().bottomRight() ); } move( tipRect.topLeft() ); } RegionGrabber::RegionGrabber() - : QWidget( 0, 0 ), + : TQWidget( 0, 0 ), mouseDown( false ), sizeTip( 0L ) { - sizeTip = new SizeTip( ( QWidget * )0L ); + sizeTip = new SizeTip( ( TQWidget * )0L ); - tipTimer = new QTimer( this ); + tipTimer = new TQTimer( this ); Q_CHECK_PTR(tipTimer); - connect( tipTimer, SIGNAL( timeout() ), SLOT( updateSizeTip() ) ); + connect( tipTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( updateSizeTip() ) ); - QTimer::singleShot( 200, this, SLOT( initGrabber() ) ); + TQTimer::singleShot( 200, this, TQT_SLOT( initGrabber() ) ); } RegionGrabber::~RegionGrabber() @@ -87,7 +87,7 @@ RegionGrabber::~RegionGrabber() void RegionGrabber::initGrabber() { - pixmap = QPixmap::grabWindow( qt_xrootwin() ); + pixmap = TQPixmap::grabWindow( qt_xrootwin() ); setPaletteBackgroundPixmap( pixmap ); showFullScreen(); @@ -95,16 +95,16 @@ void RegionGrabber::initGrabber() grabMouse( crossCursor ); } -void RegionGrabber::mousePressEvent( QMouseEvent *e ) +void RegionGrabber::mousePressEvent( TQMouseEvent *e ) { if ( e->button() == LeftButton ) { mouseDown = true; - grabRect = QRect( e->pos(), e->pos() ); + grabRect = TQRect( e->pos(), e->pos() ); } } -void RegionGrabber::mouseMoveEvent( QMouseEvent *e ) +void RegionGrabber::mouseMoveEvent( TQMouseEvent *e ) { if ( mouseDown ) { @@ -117,7 +117,7 @@ void RegionGrabber::mouseMoveEvent( QMouseEvent *e ) } } -void RegionGrabber::mouseReleaseEvent( QMouseEvent *e ) +void RegionGrabber::mouseReleaseEvent( TQMouseEvent *e ) { mouseDown = false; drawRubber(); @@ -126,7 +126,7 @@ void RegionGrabber::mouseReleaseEvent( QMouseEvent *e ) grabRect.setBottomRight( e->pos() ); grabRect = grabRect.normalize(); - QPixmap region = QPixmap::grabWindow( winId(), grabRect.x(), grabRect.y(), + TQPixmap region = TQPixmap::grabWindow( winId(), grabRect.x(), grabRect.y(), grabRect.width(), grabRect.height() ); releaseMouse(); @@ -134,12 +134,12 @@ void RegionGrabber::mouseReleaseEvent( QMouseEvent *e ) emit regionGrabbed( region ); } -void RegionGrabber::keyPressEvent( QKeyEvent *e ) +void RegionGrabber::keyPressEvent( TQKeyEvent *e ) { - if ( e->key() == Qt::Key_Escape ) + if ( e->key() == TQt::Key_Escape ) { releaseMouse(); - emit regionGrabbed( QPixmap() ); + emit regionGrabbed( TQPixmap() ); } else e->ignore(); @@ -147,7 +147,7 @@ void RegionGrabber::keyPressEvent( QKeyEvent *e ) void RegionGrabber::updateSizeTip() { - QRect rect = grabRect.normalize(); + TQRect rect = grabRect.normalize(); sizeTip->setTip( rect ); sizeTip->show(); @@ -155,14 +155,14 @@ void RegionGrabber::updateSizeTip() void RegionGrabber::drawRubber() { - QPainter p; + TQPainter p; p.begin( this ); p.setRasterOp( NotROP ); - p.setPen( QPen( color0, 1 ) ); + p.setPen( TQPen( color0, 1 ) ); p.setBrush( NoBrush ); - style().drawPrimitive( QStyle::PE_FocusRect, &p, grabRect, colorGroup(), - QStyle::Style_Default, QStyleOption( colorGroup().base() ) ); + style().drawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, tqcolorGroup(), + TQStyle::Style_Default, TQStyleOption( tqcolorGroup().base() ) ); p.end(); } diff --git a/krita/plugins/viewplugins/screenshot/regiongrabber.h b/krita/plugins/viewplugins/screenshot/regiongrabber.h index 74bf78c9..b1da1049 100644 --- a/krita/plugins/viewplugins/screenshot/regiongrabber.h +++ b/krita/plugins/viewplugins/screenshot/regiongrabber.h @@ -21,24 +21,25 @@ #ifndef REGIONGRABBER_H #define REGIONGRABBER_H -#include <qlabel.h> -#include <qpixmap.h> +#include <tqlabel.h> +#include <tqpixmap.h> -class QTimer; +class TQTimer; -class SizeTip : public QLabel +class SizeTip : public TQLabel { public: - SizeTip( QWidget *parent, const char *name=0 ); + SizeTip( TQWidget *tqparent, const char *name=0 ); ~SizeTip() {} - void setTip( const QRect &rect ); - void positionTip( const QRect &rect ); + void setTip( const TQRect &rect ); + void positionTip( const TQRect &rect ); }; -class RegionGrabber : public QWidget +class RegionGrabber : public TQWidget { Q_OBJECT + TQ_OBJECT public: RegionGrabber(); @@ -49,22 +50,22 @@ protected slots: void updateSizeTip(); signals: - void regionGrabbed( const QPixmap & ); + void regionGrabbed( const TQPixmap & ); protected: - void mousePressEvent( QMouseEvent *e ); - void mouseReleaseEvent( QMouseEvent *e ); - void mouseMoveEvent( QMouseEvent *e ); - void keyPressEvent( QKeyEvent *e ); + void mousePressEvent( TQMouseEvent *e ); + void mouseReleaseEvent( TQMouseEvent *e ); + void mouseMoveEvent( TQMouseEvent *e ); + void keyPressEvent( TQKeyEvent *e ); void drawRubber(); bool mouseDown; - QRect grabRect; - QPixmap pixmap; + TQRect grabRect; + TQPixmap pixmap; SizeTip *sizeTip; - QTimer *tipTimer; + TQTimer *tipTimer; }; #endif // REGIONGRABBER_H diff --git a/krita/plugins/viewplugins/screenshot/screenshot.cpp b/krita/plugins/viewplugins/screenshot/screenshot.cpp index c7508ae9..9133b002 100644 --- a/krita/plugins/viewplugins/screenshot/screenshot.cpp +++ b/krita/plugins/viewplugins/screenshot/screenshot.cpp @@ -41,8 +41,8 @@ K_EXPORT_COMPONENT_FACTORY( kritascreenshot, KGenericFactory<Screenshot>( "krita" ) ) -Screenshot::Screenshot(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +Screenshot::Screenshot(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { KGlobal::locale()->insertCatalogue("kscreenshot_plugin"); setInstance(KGenericFactory<Screenshot>::instance()); @@ -51,9 +51,9 @@ Screenshot::Screenshot(QObject *parent, const char *name, const QStringList &) snapshot = new KSnapshot(); Q_CHECK_PTR(snapshot); - connect( snapshot, SIGNAL( screenGrabbed() ), SLOT( slotScreenGrabbed() ) ); + connect( snapshot, TQT_SIGNAL( screenGrabbed() ), TQT_SLOT( slotScreenGrabbed() ) ); - (void) new KAction(i18n("&Screenshot..."), SmallIcon("tool_screenshot"), 0, this, SLOT(slotScreenshot()), actionCollection(), "screenshot"); + (void) new KAction(i18n("&Screenshot..."), SmallIcon("tool_screenshot"), 0, this, TQT_SLOT(slotScreenshot()), actionCollection(), "screenshot"); } @@ -72,7 +72,7 @@ void Screenshot::slotScreenGrabbed() KTempFile temp(locateLocal("tmp", "screenshot"), ".png"); snapshot->save(temp.name()); - KisView *view = dynamic_cast<KisView *>(parent()); + KisView *view = dynamic_cast<KisView *>(tqparent()); if(view) view->importImage(temp.name()); } diff --git a/krita/plugins/viewplugins/screenshot/screenshot.h b/krita/plugins/viewplugins/screenshot/screenshot.h index 5e4c7c5d..d1100836 100644 --- a/krita/plugins/viewplugins/screenshot/screenshot.h +++ b/krita/plugins/viewplugins/screenshot/screenshot.h @@ -27,8 +27,9 @@ class KSnapshot; class Screenshot : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - Screenshot(QObject *parent, const char *name, const QStringList &); + Screenshot(TQObject *tqparent, const char *name, const TQStringList &); virtual ~Screenshot(); private slots: diff --git a/krita/plugins/viewplugins/scripting/kritacore/kritacoremodule.cpp b/krita/plugins/viewplugins/scripting/kritacore/kritacoremodule.cpp index 899291ce..d4eea16f 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/kritacoremodule.cpp +++ b/krita/plugins/viewplugins/scripting/kritacore/kritacoremodule.cpp @@ -21,7 +21,7 @@ #include <kdebug.h> //#include <api/variant.h> -#include <api/qtobject.h> +#include <api/tqtobject.h> #include <main/manager.h> #include <kis_autobrush_resource.h> @@ -60,7 +60,7 @@ extern "C" using namespace Kross::KritaCore; -KritaCoreFactory::KritaCoreFactory(QString packagePath) : Kross::Api::Event<KritaCoreFactory>("KritaCoreFactory"), m_packagePath(packagePath) +KritaCoreFactory::KritaCoreFactory(TQString packagePath) : Kross::Api::Event<KritaCoreFactory>("KritaCoreFactory"), m_packagePath(packagePath) { addFunction("newRGBColor", &KritaCoreFactory::newRGBColor); addFunction("newHSVColor", &KritaCoreFactory::newHSVColor); @@ -77,22 +77,22 @@ KritaCoreFactory::KritaCoreFactory(QString packagePath) : Kross::Api::Event<Krit Kross::Api::Object::Ptr KritaCoreFactory::newRGBColor(Kross::Api::List::Ptr args) { - Color* c = new Color(Kross::Api::Variant::toUInt(args->item(0)), Kross::Api::Variant::toUInt(args->item(1)), Kross::Api::Variant::toUInt(args->item(2)), QColor::Rgb); + Color* c = new Color(Kross::Api::Variant::toUInt(args->item(0)), Kross::Api::Variant::toUInt(args->item(1)), Kross::Api::Variant::toUInt(args->item(2)), TQColor::Rgb); return c; } Kross::Api::Object::Ptr KritaCoreFactory::newHSVColor(Kross::Api::List::Ptr args) { - return new Color(Kross::Api::Variant::toUInt(args->item(0)), Kross::Api::Variant::toUInt(args->item(1)), Kross::Api::Variant::toUInt(args->item(2)), QColor::Hsv); + return new Color(Kross::Api::Variant::toUInt(args->item(0)), Kross::Api::Variant::toUInt(args->item(1)), Kross::Api::Variant::toUInt(args->item(2)), TQColor::Hsv); } Kross::Api::Object::Ptr KritaCoreFactory::getPattern(Kross::Api::List::Ptr args) { KisResourceServerBase* rServer = KisResourceServerRegistry::instance()->get("PatternServer"); - QValueList<KisResource*> resources = rServer->resources(); + TQValueList<KisResource*> resources = rServer->resources(); - QString name = Kross::Api::Variant::toString(args->item(0)); + TQString name = Kross::Api::Variant::toString(args->item(0)); - for (QValueList<KisResource*>::iterator it = resources.begin(); it != resources.end(); ++it ) + for (TQValueList<KisResource*>::iterator it = resources.begin(); it != resources.end(); ++it ) { if((*it)->name() == name) { @@ -106,7 +106,7 @@ Kross::Api::Object::Ptr KritaCoreFactory::getPattern(Kross::Api::List::Ptr args) Kross::Api::Object::Ptr KritaCoreFactory::loadPattern(Kross::Api::List::Ptr args) { - QString filename = Kross::Api::Variant::toString(args->item(0)); + TQString filename = Kross::Api::Variant::toString(args->item(0)); KisPattern* pattern = new KisPattern(filename); if(pattern->load()) { @@ -121,11 +121,11 @@ Kross::Api::Object::Ptr KritaCoreFactory::loadPattern(Kross::Api::List::Ptr args Kross::Api::Object::Ptr KritaCoreFactory::getBrush(Kross::Api::List::Ptr args) { KisResourceServerBase* rServer = KisResourceServerRegistry::instance()->get("BrushServer"); - QValueList<KisResource*> resources = rServer->resources(); + TQValueList<KisResource*> resources = rServer->resources(); - QString name = Kross::Api::Variant::toString(args->item(0)); + TQString name = Kross::Api::Variant::toString(args->item(0)); - for (QValueList<KisResource*>::iterator it = resources.begin(); it != resources.end(); ++it ) + for (TQValueList<KisResource*>::iterator it = resources.begin(); it != resources.end(); ++it ) { if((*it)->name() == name) { @@ -138,7 +138,7 @@ Kross::Api::Object::Ptr KritaCoreFactory::getBrush(Kross::Api::List::Ptr args) Kross::Api::Object::Ptr KritaCoreFactory::loadBrush(Kross::Api::List::Ptr args) { - QString filename = Kross::Api::Variant::toString(args->item(0)); + TQString filename = Kross::Api::Variant::toString(args->item(0)); KisBrush* brush = new KisBrush(filename); if(brush->load()) { @@ -152,7 +152,7 @@ Kross::Api::Object::Ptr KritaCoreFactory::loadBrush(Kross::Api::List::Ptr args) Kross::Api::Object::Ptr KritaCoreFactory::getFilter(Kross::Api::List::Ptr args) { - QString name = Kross::Api::Variant::toString(args->item(0)); + TQString name = Kross::Api::Variant::toString(args->item(0)); KisFilter* filter = KisFilterRegistry::instance()->get(name); if(filter) { @@ -164,8 +164,8 @@ Kross::Api::Object::Ptr KritaCoreFactory::getFilter(Kross::Api::List::Ptr args) Kross::Api::Object::Ptr KritaCoreFactory::newCircleBrush(Kross::Api::List::Ptr args) { - uint w = QMAX(1, Kross::Api::Variant::toUInt(args->item(0))); - uint h = QMAX(1, Kross::Api::Variant::toUInt(args->item(1))); + uint w = TQMAX(1, Kross::Api::Variant::toUInt(args->item(0))); + uint h = TQMAX(1, Kross::Api::Variant::toUInt(args->item(1))); uint hf = 0; uint vf = 0; if( args.count() > 2) @@ -174,14 +174,14 @@ Kross::Api::Object::Ptr KritaCoreFactory::newCircleBrush(Kross::Api::List::Ptr a vf = Kross::Api::Variant::toUInt(args->item(3)); } KisAutobrushShape* kas = new KisAutobrushCircleShape(w, h, hf, vf); - QImage* brsh = new QImage(); + TQImage* brsh = new TQImage(); kas->createBrush(brsh); return new Brush(new KisAutobrushResource(*brsh), false); } Kross::Api::Object::Ptr KritaCoreFactory::newRectBrush(Kross::Api::List::Ptr args) { - uint w = QMAX(1, Kross::Api::Variant::toUInt(args->item(0))); - uint h = QMAX(1, Kross::Api::Variant::toUInt(args->item(1))); + uint w = TQMAX(1, Kross::Api::Variant::toUInt(args->item(0))); + uint h = TQMAX(1, Kross::Api::Variant::toUInt(args->item(1))); uint hf = 0; uint vf = 0; if( args.count() > 2) @@ -190,7 +190,7 @@ Kross::Api::Object::Ptr KritaCoreFactory::newRectBrush(Kross::Api::List::Ptr arg vf = Kross::Api::Variant::toUInt(args->item(3)); } KisAutobrushShape* kas = new KisAutobrushRectShape(w, h, hf, vf); - QImage* brsh = new QImage(); + TQImage* brsh = new TQImage(); kas->createBrush(brsh); return new Brush(new KisAutobrushResource(*brsh), false);; } @@ -199,8 +199,8 @@ Kross::Api::Object::Ptr KritaCoreFactory::newImage(Kross::Api::List::Ptr args) { int w = Kross::Api::Variant::toInt(args->item(0)); int h = Kross::Api::Variant::toInt(args->item(1)); - QString csname = Kross::Api::Variant::toString(args->item(2)); - QString name = Kross::Api::Variant::toString(args->item(3)); + TQString csname = Kross::Api::Variant::toString(args->item(2)); + TQString name = Kross::Api::Variant::toString(args->item(3)); if( w < 0 || h < 0) { throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("Invalid image size") ) ); @@ -209,7 +209,7 @@ Kross::Api::Object::Ptr KritaCoreFactory::newImage(Kross::Api::List::Ptr args) KisColorSpace * cs = KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID(csname, ""), ""); if(!cs) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("Colorspace %0 is not available, please check your installation.").arg(csname ) ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("Colorspace %0 is not available, please check your installation.").tqarg(csname ) ) ); return 0; } @@ -225,9 +225,9 @@ KritaCoreModule::KritaCoreModule(Kross::Api::Manager* manager) : Kross::Api::Module("kritacore") , m_manager(manager), m_factory(0) { - QMap<QString, Object::Ptr> children = manager->getChildren(); - kdDebug(41011) << " there are " << children.size() << endl; - for(QMap<QString, Object::Ptr>::const_iterator it = children.begin(); it != children.end(); it++) + TQMap<TQString, Object::Ptr> tqchildren = manager->getChildren(); + kdDebug(41011) << " there are " << tqchildren.size() << endl; + for(TQMap<TQString, Object::Ptr>::const_iterator it = tqchildren.begin(); it != tqchildren.end(); it++) { kdDebug(41011) << it.key() << " " << it.data() << endl; } @@ -235,7 +235,7 @@ KritaCoreModule::KritaCoreModule(Kross::Api::Manager* manager) // Wrap doc Kross::Api::Object::Ptr kritadocument = manager->getChild("KritaDocument"); if(kritadocument) { - Kross::Api::QtObject* kritadocumentqt = (Kross::Api::QtObject*)( kritadocument.data() ); + Kross::Api::TQtObject* kritadocumentqt = (Kross::Api::TQtObject*)( kritadocument.data() ); if(kritadocumentqt) { ::KisDoc* document = (::KisDoc*)( kritadocumentqt->getObject() ); if(document) { @@ -246,10 +246,10 @@ KritaCoreModule::KritaCoreModule(Kross::Api::Manager* manager) } } // Wrap KritaScriptProgress - QString packagePath; + TQString packagePath; Kross::Api::Object::Ptr kritascriptprogress = manager->getChild("KritaScriptProgress"); if(kritadocument) { - Kross::Api::QtObject* kritascriptprogressqt = (Kross::Api::QtObject*)( kritascriptprogress.data() ); + Kross::Api::TQtObject* kritascriptprogressqt = (Kross::Api::TQtObject*)( kritascriptprogress.data() ); if(kritascriptprogressqt) { ::KisScriptProgress* scriptprogress = (::KisScriptProgress*)( kritascriptprogressqt->getObject() ); scriptprogress->activateAsSubject(); @@ -271,12 +271,12 @@ KritaCoreModule::~KritaCoreModule() } -const QString KritaCoreModule::getClassName() const +const TQString KritaCoreModule::getClassName() const { return "Kross::KritaCore::KritaCoreModule"; } -Kross::Api::Object::Ptr KritaCoreModule::call(const QString& name, Kross::Api::List::Ptr arguments) +Kross::Api::Object::Ptr KritaCoreModule::call(const TQString& name, Kross::Api::List::Ptr arguments) { kdDebug(41011) << "KritaCoreModule::call = " << name << endl; if( m_factory->isAFunction(name)) diff --git a/krita/plugins/viewplugins/scripting/kritacore/kritacoremodule.h b/krita/plugins/viewplugins/scripting/kritacore/kritacoremodule.h index 97abc8b9..f3cc28c9 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/kritacoremodule.h +++ b/krita/plugins/viewplugins/scripting/kritacore/kritacoremodule.h @@ -19,8 +19,8 @@ #ifndef KRITA_KROSS_KRITACOREMODULE_H #define KRITA_KROSS_KRITACOREMODULE_H -#include <qstring.h> -#include <qvariant.h> +#include <tqstring.h> +#include <tqvariant.h> #define KROSS_MAIN_EXPORT KDE_EXPORT @@ -38,7 +38,7 @@ namespace Kross { namespace KritaCore { class KritaCoreFactory : public Kross::Api::Event<KritaCoreFactory> { public: - KritaCoreFactory(QString packagePath); + KritaCoreFactory(TQString packagePath); private: /** * This function return a new Image. @@ -108,7 +108,7 @@ namespace Kross { namespace KritaCore { */ Kross::Api::Object::Ptr getBrush(Kross::Api::List::Ptr); /** - * This function return a Brush with a circular shape + * This function return a Brush with a circular tqshape * It takes at least two arguments : * - width * - height @@ -127,7 +127,7 @@ namespace Kross { namespace KritaCore { */ Kross::Api::Object::Ptr newCircleBrush(Kross::Api::List::Ptr); /** - * This function return a Brush with a rectangular shape + * This function return a Brush with a rectangular tqshape * It takes at least two arguments : * - width * - height @@ -172,7 +172,7 @@ namespace Kross { namespace KritaCore { */ Kross::Api::Object::Ptr getPackagePath(Kross::Api::List::Ptr); private: - QString m_packagePath; + TQString m_packagePath; }; /** * @@ -191,8 +191,8 @@ namespace Kross { namespace KritaCore { virtual ~KritaCoreModule(); /// \see Kross::Api::Object::getClassName - virtual const QString getClassName() const; - virtual Kross::Api::Object::Ptr call(const QString& name, Kross::Api::List::Ptr arguments); + virtual const TQString getClassName() const; + virtual Kross::Api::Object::Ptr call(const TQString& name, Kross::Api::List::Ptr arguments); private: Kross::Api::Manager* m_manager; KritaCoreFactory* m_factory; diff --git a/krita/plugins/viewplugins/scripting/kritacore/krs_color.cpp b/krita/plugins/viewplugins/scripting/kritacore/krs_color.cpp index e459b1cd..cbea1890 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/krs_color.cpp +++ b/krita/plugins/viewplugins/scripting/kritacore/krs_color.cpp @@ -22,7 +22,7 @@ namespace Kross { namespace KritaCore { -Color::Color ( int x, int y, int z, QColor::Spec colorSpec ) +Color::Color ( int x, int y, int z, TQColor::Spec colorSpec ) : Kross::Api::Class<Color>("KritaColor"), m_color(x,y,z,colorSpec) { } diff --git a/krita/plugins/viewplugins/scripting/kritacore/krs_color.h b/krita/plugins/viewplugins/scripting/kritacore/krs_color.h index 8d46760b..4c6283ee 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/krs_color.h +++ b/krita/plugins/viewplugins/scripting/kritacore/krs_color.h @@ -19,7 +19,7 @@ #ifndef KROSS_APIKRS_COLOR_H #define KROSS_APIKRS_COLOR_H -#include <qcolor.h> +#include <tqcolor.h> #include <api/class.h> @@ -30,16 +30,16 @@ namespace KritaCore { class Color : public Kross::Api::Class<Color> { public: - Color ( int x, int y, int z, QColor::Spec colorSpec ); + Color ( int x, int y, int z, TQColor::Spec colorSpec ); Color (); ~Color(); public: - inline const QString getClassName() const + inline const TQString getClassName() const { return "Kross::Krita::Color"; }; - inline QColor toQColor() { return m_color; }; + inline TQColor toTQColor() { return m_color; }; private: - QColor m_color; + TQColor m_color; }; } diff --git a/krita/plugins/viewplugins/scripting/kritacore/krs_doc.cpp b/krita/plugins/viewplugins/scripting/kritacore/krs_doc.cpp index 23dffabb..4c4d029b 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/krs_doc.cpp +++ b/krita/plugins/viewplugins/scripting/kritacore/krs_doc.cpp @@ -33,7 +33,7 @@ Doc::~Doc() { } -const QString Doc::getClassName() const { +const TQString Doc::getClassName() const { return "Kross::KritaCore::Doc"; } diff --git a/krita/plugins/viewplugins/scripting/kritacore/krs_doc.h b/krita/plugins/viewplugins/scripting/kritacore/krs_doc.h index 16336f94..4ac72d3d 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/krs_doc.h +++ b/krita/plugins/viewplugins/scripting/kritacore/krs_doc.h @@ -30,7 +30,7 @@ class Doc : public Kross::Api::Class<Doc> public: explicit Doc(::KisDoc* doc); virtual ~Doc(); - virtual const QString getClassName() const; + virtual const TQString getClassName() const; private: /** * This function return the Image associated with this Doc. diff --git a/krita/plugins/viewplugins/scripting/kritacore/krs_filter.cpp b/krita/plugins/viewplugins/scripting/kritacore/krs_filter.cpp index ee11d35d..4b382b65 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/krs_filter.cpp +++ b/krita/plugins/viewplugins/scripting/kritacore/krs_filter.cpp @@ -39,7 +39,7 @@ Filter::~Filter() { } -const QString Filter::getClassName() const { +const TQString Filter::getClassName() const { return "Kross::KritaCore::Filter"; } @@ -53,19 +53,19 @@ Kross::Api::Object::Ptr Filter::process(Kross::Api::List::Ptr args) PaintLayer* src = (PaintLayer*)args->item(0).data(); if(!m_filter->workWith( src->paintLayer()->paintDevice()->colorSpace())) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("process") ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("process") ) ); } - QRect rect; + TQRect rect; if( args->count() >1) { uint x = Kross::Api::Variant::toVariant(args->item(1)).toUInt(); uint y = Kross::Api::Variant::toVariant(args->item(2)).toUInt(); uint w = Kross::Api::Variant::toVariant(args->item(3)).toUInt(); uint h = Kross::Api::Variant::toVariant(args->item(4)).toUInt(); - rect = QRect(x, y, w, h); + rect = TQRect(x, y, w, h); } else { - QRect r1 = src->paintLayer()->paintDevice()->extent(); - QRect r2 = src->paintLayer()->image()->bounds(); + TQRect r1 = src->paintLayer()->paintDevice()->extent(); + TQRect r2 = src->paintLayer()->image()->bounds(); rect = r1.intersect(r2); } m_filter->process( src->paintLayer()->paintDevice(), src->paintLayer()->paintDevice(), m_config->filterConfiguration(), rect ); diff --git a/krita/plugins/viewplugins/scripting/kritacore/krs_filter.h b/krita/plugins/viewplugins/scripting/kritacore/krs_filter.h index 62554ef9..0788edbd 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/krs_filter.h +++ b/krita/plugins/viewplugins/scripting/kritacore/krs_filter.h @@ -64,7 +64,7 @@ class Filter : public Kross::Api::Class<Filter> */ Kross::Api::Object::Ptr process(Kross::Api::List::Ptr args); public: - virtual const QString getClassName() const; + virtual const TQString getClassName() const; private: KisFilter* m_filter; FilterConfiguration* m_config; diff --git a/krita/plugins/viewplugins/scripting/kritacore/krs_filter_configuration.cpp b/krita/plugins/viewplugins/scripting/kritacore/krs_filter_configuration.cpp index 3479cf38..eaecb0bf 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/krs_filter_configuration.cpp +++ b/krita/plugins/viewplugins/scripting/kritacore/krs_filter_configuration.cpp @@ -37,22 +37,22 @@ FilterConfiguration::~FilterConfiguration() { } -const QString FilterConfiguration::getClassName() const { +const TQString FilterConfiguration::getClassName() const { return "Kross::KritaCore::FilterConfiguration"; } Kross::Api::Object::Ptr FilterConfiguration::setProperty(Kross::Api::List::Ptr args) { - QString name = Kross::Api::Variant::toString(args->item(0)); - QVariant value = Kross::Api::Variant::toVariant(args->item(1)); + TQString name = Kross::Api::Variant::toString(args->item(0)); + TQVariant value = Kross::Api::Variant::toVariant(args->item(1)); m_fConfig->setProperty(name, value); return 0; } Kross::Api::Object::Ptr FilterConfiguration::getProperty(Kross::Api::List::Ptr args) { - QString name = Kross::Api::Variant::toString(args->item(0)); - QVariant value; + TQString name = Kross::Api::Variant::toString(args->item(0)); + TQVariant value; if(m_fConfig->getProperty( name, value)) { return new Kross::Api::Variant(value); @@ -63,7 +63,7 @@ Kross::Api::Object::Ptr FilterConfiguration::getProperty(Kross::Api::List::Ptr a Kross::Api::Object::Ptr FilterConfiguration::fromXML(Kross::Api::List::Ptr args) { - QString xml = Kross::Api::Variant::toString(args->item(0)); + TQString xml = Kross::Api::Variant::toString(args->item(0)); m_fConfig->fromXML( xml ); return 0; } diff --git a/krita/plugins/viewplugins/scripting/kritacore/krs_filter_configuration.h b/krita/plugins/viewplugins/scripting/kritacore/krs_filter_configuration.h index 7c8c3020..466c91dc 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/krs_filter_configuration.h +++ b/krita/plugins/viewplugins/scripting/kritacore/krs_filter_configuration.h @@ -35,7 +35,7 @@ class FilterConfiguration : public Kross::Api::Class<FilterConfiguration> FilterConfiguration(KisFilterConfiguration*); ~FilterConfiguration(); public: - virtual const QString getClassName() const; + virtual const TQString getClassName() const; inline KisFilterConfiguration* filterConfiguration() { return m_fConfig; }; private: /** diff --git a/krita/plugins/viewplugins/scripting/kritacore/krs_histogram.cpp b/krita/plugins/viewplugins/scripting/kritacore/krs_histogram.cpp index 953eb868..83342070 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/krs_histogram.cpp +++ b/krita/plugins/viewplugins/scripting/kritacore/krs_histogram.cpp @@ -47,7 +47,7 @@ Histogram::~Histogram() { } -const QString Histogram::getClassName() const { +const TQString Histogram::getClassName() const { return "Kross::KritaCore::Histogram"; } diff --git a/krita/plugins/viewplugins/scripting/kritacore/krs_histogram.h b/krita/plugins/viewplugins/scripting/kritacore/krs_histogram.h index b238c5db..bb8af6fa 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/krs_histogram.h +++ b/krita/plugins/viewplugins/scripting/kritacore/krs_histogram.h @@ -50,7 +50,7 @@ class Histogram : public Kross::Api::Class<Histogram> public: Histogram(KisPaintLayerSP layer, KisHistogramProducerSP producer, const enumHistogramType type); ~Histogram(); - virtual const QString getClassName() const; + virtual const TQString getClassName() const; private: /** * This function return the maximum bound of the histogram diff --git a/krita/plugins/viewplugins/scripting/kritacore/krs_image.cpp b/krita/plugins/viewplugins/scripting/kritacore/krs_image.cpp index b274ad33..bf1c281f 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/krs_image.cpp +++ b/krita/plugins/viewplugins/scripting/kritacore/krs_image.cpp @@ -52,7 +52,7 @@ Image::~Image() { } -const QString Image::getClassName() const { +const TQString Image::getClassName() const { return "Kross::KritaCore::Image"; } @@ -80,7 +80,7 @@ Kross::Api::Object::Ptr Image::convertToColorspace(Kross::Api::List::Ptr args) KisColorSpace * dstCS = KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID(Kross::Api::Variant::toString(args->item(0)), ""), ""); if(!dstCS) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("Colorspace %0 is not available, please check your installation.").arg(Kross::Api::Variant::toString(args->item(0))) ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("Colorspace %0 is not available, please check your installation.").tqarg(Kross::Api::Variant::toString(args->item(0))) ) ); return 0; } m_image->convertTo(dstCS); @@ -95,10 +95,10 @@ Kross::Api::Object::Ptr Image::colorSpaceId(Kross::Api::List::Ptr ) Kross::Api::Object::Ptr Image::createPaintLayer(Kross::Api::List::Ptr args) { - QString name = Kross::Api::Variant::toString(args->item(0)); + TQString name = Kross::Api::Variant::toString(args->item(0)); int opacity = Kross::Api::Variant::toInt(args->item(1)); opacity = CLAMP(opacity, 0, 255); - QString csname; + TQString csname; if(args->count() > 2) { csname = Kross::Api::Variant::toString(args->item(2)); diff --git a/krita/plugins/viewplugins/scripting/kritacore/krs_image.h b/krita/plugins/viewplugins/scripting/kritacore/krs_image.h index 0be2e46f..19e9ba6b 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/krs_image.h +++ b/krita/plugins/viewplugins/scripting/kritacore/krs_image.h @@ -34,7 +34,7 @@ class Image : public Kross::Api::Class<Image> public: Image(KisImageSP image, KisDoc* doc = 0); ~Image(); - virtual const QString getClassName() const; + virtual const TQString getClassName() const; private: /** * Return the active PaintLayer, if any. diff --git a/krita/plugins/viewplugins/scripting/kritacore/krs_iterator.h b/krita/plugins/viewplugins/scripting/kritacore/krs_iterator.h index 9493f49a..acd9b061 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/krs_iterator.h +++ b/krita/plugins/viewplugins/scripting/kritacore/krs_iterator.h @@ -19,7 +19,7 @@ #ifndef KROSS_KRITACOREKRS_ITERATOR_H #define KROSS_KRITACOREKRS_ITERATOR_H -#include <qobject.h> +#include <tqobject.h> #include <api/class.h> //#include <api/proxy.h> //#include <api/variant.h> @@ -36,25 +36,26 @@ namespace Kross { namespace KritaCore { -//<beurk> stupid Qt which doesn't support templated QObject +//<beurk> stupid TQt which doesn't support templated TQObject class IteratorMemoryManaged { public: - virtual void invalidateIterator() = 0; + virtual void tqinvalidateIterator() = 0; }; -class IteratorMemoryManager : public QObject { +class IteratorMemoryManager : public TQObject { Q_OBJECT + TQ_OBJECT public: IteratorMemoryManager(IteratorMemoryManaged* it) : m_it(it) { // Connect the Monitor to know when the invalidating of iterator is needed - connect(KisScriptMonitor::instance(), SIGNAL(executionFinished(const Kross::Api::ScriptAction* )), this, SLOT(invalidateIterator())); + connect(KisScriptMonitor::instance(), TQT_SIGNAL(executionFinished(const Kross::Api::ScriptAction* )), this, TQT_SLOT(tqinvalidateIterator())); } public slots: - void invalidateIterator() + void tqinvalidateIterator() { - m_it->invalidateIterator(); + m_it->tqinvalidateIterator(); } private: IteratorMemoryManaged* m_it; @@ -97,9 +98,9 @@ class Iterator : public Kross::Api::Class<Iterator<_T_It> >, private IteratorMem >(this, &Iterator<_T_It>::isDone)); // get/set value - QValueVector<KisChannelInfo *> channels = layer->paintDevice()->colorSpace()->channels(); - QString initiales = ""; - for(QValueVector<KisChannelInfo *>::iterator itC = channels.begin(); itC != channels.end(); itC++) + TQValueVector<KisChannelInfo *> channels = layer->paintDevice()->colorSpace()->channels(); + TQString initiales = ""; + for(TQValueVector<KisChannelInfo *>::iterator itC = channels.begin(); itC != channels.end(); itC++) { KisChannelInfo * ci = *itC; initiales += ci->name().left(1); @@ -146,10 +147,10 @@ class Iterator : public Kross::Api::Class<Iterator<_T_It> >, private IteratorMem ~Iterator() { - invalidateIterator(); + tqinvalidateIterator(); delete m_itmm; } - virtual const QString getClassName() const { + virtual const TQString getClassName() const { return "Kross::KritaCore::KrsDoc"; }; private: @@ -163,7 +164,7 @@ class Iterator : public Kross::Api::Class<Iterator<_T_It> >, private IteratorMem */ Kross::Api::Object::Ptr darken(Kross::Api::List::Ptr args) { - Q_INT32 shade = Kross::Api::Variant::toUInt( args->item(0) ); + TQ_INT32 shade = Kross::Api::Variant::toUInt( args->item(0) ); bool compensate = (args->count() == 2); double compensation = compensate ? Kross::Api::Variant::toDouble( args->item(2) ) : 0.; m_layer->paintDevice()->colorSpace()->darken(m_it->rawData(), m_it->rawData(), shade, compensate, compensation, 1); @@ -194,23 +195,23 @@ class Iterator : public Kross::Api::Class<Iterator<_T_It> >, private IteratorMem } Kross::Api::Object::Ptr getChannelUINT8(Kross::Api::List::Ptr, uint channelpos) { - Q_UINT8* data = (Q_UINT8*)(m_it->rawData() + channelpos); + TQ_UINT8* data = (TQ_UINT8*)(m_it->rawData() + channelpos); return new Kross::Api::Variant( * data); } Kross::Api::Object::Ptr setChannelUINT8(Kross::Api::List::Ptr args, uint channelpos) { - Q_UINT8* data = (Q_UINT8*)(m_it->rawData() + channelpos); //*(uint*)channelpos); + TQ_UINT8* data = (TQ_UINT8*)(m_it->rawData() + channelpos); //*(uint*)channelpos); *data = Kross::Api::Variant::toUInt( args->item(0) ); return 0; } Kross::Api::Object::Ptr getChannelUINT16(Kross::Api::List::Ptr, uint channelpos) { - Q_UINT16* data = (Q_UINT16*)(m_it->rawData() + channelpos); + TQ_UINT16* data = (TQ_UINT16*)(m_it->rawData() + channelpos); return new Kross::Api::Variant( * data); } Kross::Api::Object::Ptr setChannelUINT16(Kross::Api::List::Ptr args, uint channelpos) { - Q_UINT16* data = (Q_UINT16*)(m_it->rawData() + channelpos); + TQ_UINT16* data = (TQ_UINT16*)(m_it->rawData() + channelpos); *data = Kross::Api::Variant::toUInt( args->item(0) ); return 0; } @@ -227,25 +228,25 @@ class Iterator : public Kross::Api::Class<Iterator<_T_It> >, private IteratorMem } Kross::Api::Object::Ptr getPixel(Kross::Api::List::Ptr) { - QValueVector<KisChannelInfo *> channels = m_layer->paintDevice()->colorSpace()->channels(); - QValueList<QVariant> pixel; - for(QValueVector<KisChannelInfo *>::iterator itC = channels.begin(); itC != channels.end(); itC++) + TQValueVector<KisChannelInfo *> channels = m_layer->paintDevice()->colorSpace()->channels(); + TQValueList<TQVariant> pixel; + for(TQValueVector<KisChannelInfo *>::iterator itC = channels.begin(); itC != channels.end(); itC++) { KisChannelInfo * ci = *itC; - Q_UINT8* data = (Q_UINT8*)(m_it->rawData() + ci->pos()); + TQ_UINT8* data = (TQ_UINT8*)(m_it->rawData() + ci->pos()); switch(ci->channelValueType()) { case KisChannelInfo::UINT8: pixel.push_back( *data); break; case KisChannelInfo::UINT16: - pixel.push_back( *((Q_UINT16*) data) ); + pixel.push_back( *((TQ_UINT16*) data) ); break; case KisChannelInfo::FLOAT32: pixel.push_back( *((float*) data) ); break; default: - kdDebug(41011) << i18n("An error has occurred in %1").arg("getPixel") << endl; + kdDebug(41011) << i18n("An error has occurred in %1").tqarg("getPixel") << endl; kdDebug(41011) << i18n("unsupported data format in scripts") << endl; break; } @@ -254,26 +255,26 @@ class Iterator : public Kross::Api::Class<Iterator<_T_It> >, private IteratorMem } Kross::Api::Object::Ptr setPixel(Kross::Api::List::Ptr args) { - QValueList<QVariant> pixel = Kross::Api::Variant::toList( args->item(0) ); - QValueVector<KisChannelInfo *> channels = m_layer->paintDevice()->colorSpace()->channels(); + TQValueList<TQVariant> pixel = Kross::Api::Variant::toList( args->item(0) ); + TQValueVector<KisChannelInfo *> channels = m_layer->paintDevice()->colorSpace()->channels(); uint i = 0; - for(QValueVector<KisChannelInfo *>::iterator itC = channels.begin(); itC != channels.end(); itC++, i++) + for(TQValueVector<KisChannelInfo *>::iterator itC = channels.begin(); itC != channels.end(); itC++, i++) { KisChannelInfo * ci = *itC; - Q_UINT8* data = (Q_UINT8*)(m_it->rawData() + ci->pos()); + TQ_UINT8* data = (TQ_UINT8*)(m_it->rawData() + ci->pos()); switch(ci->channelValueType()) { case KisChannelInfo::UINT8: *data = pixel[i].toUInt(); break; case KisChannelInfo::UINT16: - *((Q_UINT16*) data) = pixel[i].toUInt(); + *((TQ_UINT16*) data) = pixel[i].toUInt(); break; case KisChannelInfo::FLOAT32: *((float*) data) = pixel[i].toDouble(); break; default: - kdDebug(41011) << i18n("An error has occurred in %1").arg("setPixel") << endl; + kdDebug(41011) << i18n("An error has occurred in %1").tqarg("setPixel") << endl; kdDebug(41011) << i18n("unsupported data format in scripts") << endl; break; } @@ -281,7 +282,7 @@ class Iterator : public Kross::Api::Class<Iterator<_T_It> >, private IteratorMem return 0; } private: - virtual void invalidateIterator() + virtual void tqinvalidateIterator() { kdDebug(41011) << "invalidating iterator" << endl; if(m_it) diff --git a/krita/plugins/viewplugins/scripting/kritacore/krs_paint_layer.cpp b/krita/plugins/viewplugins/scripting/kritacore/krs_paint_layer.cpp index 1f79b22c..519a63d9 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/krs_paint_layer.cpp +++ b/krita/plugins/viewplugins/scripting/kritacore/krs_paint_layer.cpp @@ -60,7 +60,7 @@ PaintLayer::~PaintLayer() { } -const QString PaintLayer::getClassName() const { +const TQString PaintLayer::getClassName() const { return "Kross::KritaCore::PaintLayer"; } @@ -91,22 +91,22 @@ Kross::Api::Object::Ptr PaintLayer::createVLineIterator(Kross::Api::List::Ptr ar } Kross::Api::Object::Ptr PaintLayer::getWidth(Kross::Api::List::Ptr) { - QRect r1 = paintLayer()->extent(); - QRect r2 = paintLayer()->image()->bounds(); - QRect rect = r1.intersect(r2); + TQRect r1 = paintLayer()->extent(); + TQRect r2 = paintLayer()->image()->bounds(); + TQRect rect = r1.intersect(r2); return new Kross::Api::Variant(rect.width()); } Kross::Api::Object::Ptr PaintLayer::getHeight(Kross::Api::List::Ptr) { - QRect r1 = paintLayer()->extent(); - QRect r2 = paintLayer()->image()->bounds(); - QRect rect = r1.intersect(r2); + TQRect r1 = paintLayer()->extent(); + TQRect r2 = paintLayer()->image()->bounds(); + TQRect rect = r1.intersect(r2); return new Kross::Api::Variant(rect.height()); } Kross::Api::Object::Ptr PaintLayer::createHistogram(Kross::Api::List::Ptr args) { - QString histoname = Kross::Api::Variant::toString(args->item(0)); + TQString histoname = Kross::Api::Variant::toString(args->item(0)); KisHistogramProducerFactory* factory = KisHistogramProducerFactoryRegistry::instance()->get(histoname); /* KisIDList listID = KisHistogramProducerFactoryRegistry::instance()->listKeys(); @@ -130,7 +130,7 @@ Kross::Api::Object::Ptr PaintLayer::createHistogram(Kross::Api::List::Ptr args) { return new Histogram( paintLayer().data(), factory->generate() , type); } else { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("createHistogram") + "\n" + i18n("The histogram %1 is not available").arg(histoname) ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("createHistogram") + "\n" + i18n("The histogram %1 is not available").tqarg(histoname) ) ); } return 0; } @@ -142,7 +142,7 @@ Kross::Api::Object::Ptr PaintLayer::createPainter(Kross::Api::List::Ptr ) Kross::Api::Object::Ptr PaintLayer::beginPainting(Kross::Api::List::Ptr args) { - QString name = Kross::Api::Variant::toString(args->item(0)); + TQString name = Kross::Api::Variant::toString(args->item(0)); if(m_cmd != 0) { delete m_cmd; @@ -172,7 +172,7 @@ Kross::Api::Object::Ptr PaintLayer::convertToColorspace(Kross::Api::List::Ptr ar if(!dstCS) { // FIXME: inform user - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("convertToColorspace") + "\n" + i18n("Colorspace %1 is not available, please check your installation.").arg(Kross::Api::Variant::toString(args->item(0))) ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("convertToColorspace") + "\n" + i18n("Colorspace %1 is not available, please check your installation.").tqarg(Kross::Api::Variant::toString(args->item(0))) ) ); return 0; } paintLayer()->paintDevice()->convertTo(dstCS); @@ -188,7 +188,7 @@ Kross::Api::Object::Ptr PaintLayer::colorSpaceId(Kross::Api::List::Ptr ) Kross::Api::Object::Ptr PaintLayer::fastWaveletTransformation(Kross::Api::List::Ptr ) { KisMathToolbox* mathToolbox = KisMetaRegistry::instance()->mtRegistry()->get( paintLayer()->paintDevice()->colorSpace()->mathToolboxID() ); - QRect rect = paintLayer()->exactBounds(); + TQRect rect = paintLayer()->exactBounds(); KisMathToolbox::KisWavelet* wav = mathToolbox->fastWaveletTransformation(paintLayer()->paintDevice(), rect); return new Wavelet(wav); } @@ -196,7 +196,7 @@ Kross::Api::Object::Ptr PaintLayer::fastWaveletUntransformation(Kross::Api::List { Wavelet* wav = (Wavelet*)args->item(0).data(); KisMathToolbox* mathToolbox = KisMetaRegistry::instance()->mtRegistry()->get( paintLayer()->paintDevice()->colorSpace()->mathToolboxID() ); - QRect rect = paintLayer()->exactBounds(); + TQRect rect = paintLayer()->exactBounds(); mathToolbox->fastWaveletUntransformation( paintLayer()->paintDevice(), rect, wav->wavelet() ); return 0; } diff --git a/krita/plugins/viewplugins/scripting/kritacore/krs_paint_layer.h b/krita/plugins/viewplugins/scripting/kritacore/krs_paint_layer.h index 4ddfd4bd..9e00bf91 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/krs_paint_layer.h +++ b/krita/plugins/viewplugins/scripting/kritacore/krs_paint_layer.h @@ -39,7 +39,7 @@ class PaintLayer : public Kross::Api::Class<PaintLayer> public: explicit PaintLayer(KisPaintLayerSP layer, KisDoc* doc = 0); virtual ~PaintLayer(); - virtual const QString getClassName() const; + virtual const TQString getClassName() const; private: /** * Create an iterator over a layer, it will iterate on a rectangle area. diff --git a/krita/plugins/viewplugins/scripting/kritacore/krs_painter.cpp b/krita/plugins/viewplugins/scripting/kritacore/krs_painter.cpp index 621a173d..370f78c5 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/krs_painter.cpp +++ b/krita/plugins/viewplugins/scripting/kritacore/krs_painter.cpp @@ -77,7 +77,7 @@ Painter::~Painter() Kross::Api::Object::Ptr Painter::convolve(Kross::Api::List::Ptr args) { KisConvolutionPainter* cp = new KisConvolutionPainter(m_painter->device()); - QRect rect; + TQRect rect; KisKernel kernel; kernel.factor = Kross::Api::Variant::toInt(args->item(1)); kernel.offset = Kross::Api::Variant::toInt(args->item(2)); @@ -98,43 +98,43 @@ Kross::Api::Object::Ptr Painter::convolve(Kross::Api::List::Ptr args) uint y = Kross::Api::Variant::toUInt(args->item(6)); uint w = Kross::Api::Variant::toUInt(args->item(7)); uint h = Kross::Api::Variant::toUInt(args->item(8)); - rect = QRect(x,y,w,h); + rect = TQRect(x,y,w,h); } else { - QRect r1 = paintLayer()->paintDevice()->extent(); - QRect r2 = paintLayer()->image()->bounds(); + TQRect r1 = paintLayer()->paintDevice()->extent(); + TQRect r2 = paintLayer()->image()->bounds(); rect = r1.intersect(r2); } - QValueList<QVariant> kernelH = Kross::Api::Variant::toList( args->item(0) ); + TQValueList<TQVariant> kernelH = Kross::Api::Variant::toList( args->item(0) ); - QVariant firstlineVariant = *kernelH.begin(); - if(firstlineVariant.type() != QVariant::List) + TQVariant firstlineVariant = *kernelH.begin(); + if(firstlineVariant.type() != TQVariant::List) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").arg("applyConvolution")) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").tqarg("applyConvolution")) ); } - QValueList<QVariant> firstline = firstlineVariant.toList(); + TQValueList<TQVariant> firstline = firstlineVariant.toList(); kernel.height = kernelH.size(); kernel.width = firstline.size(); - kernel.data = new Q_INT32[kernel.height * kernel.width]; + kernel.data = new TQ_INT32[kernel.height * kernel.width]; uint i = 0; - for(QValueList<QVariant>::iterator itK = kernelH.begin(); itK != kernelH.end(); itK++, i ++ ) + for(TQValueList<TQVariant>::iterator itK = kernelH.begin(); itK != kernelH.end(); itK++, i ++ ) { - QVariant lineVariant = *kernelH.begin(); - if(lineVariant.type() != QVariant::List) + TQVariant lineVariant = *kernelH.begin(); + if(lineVariant.type() != TQVariant::List) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").arg("applyConvolution")) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").tqarg("applyConvolution")) ); } - QValueList<QVariant> line = firstlineVariant.toList(); + TQValueList<TQVariant> line = firstlineVariant.toList(); if(line.size() != kernel.width) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").arg("applyConvolution")) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").tqarg("applyConvolution")) ); } uint j = 0; - for(QValueList<QVariant>::iterator itLine = line.begin(); itLine != line.end(); itLine++, j ++ ) + for(TQValueList<TQVariant>::iterator itLine = line.begin(); itLine != line.end(); itLine++, j ++ ) { kernel.data[ j + i * kernel.width ] = (*itLine).toInt(); } @@ -221,7 +221,7 @@ Kross::Api::Object::Ptr Painter::setFillStyle(Kross::Api::List::Ptr args) Kross::Api::Object::Ptr Painter::setOpacity(Kross::Api::List::Ptr args) { - Q_UINT8 opacity = Kross::Api::Variant::toVariant(args->item(0)).toUInt(); + TQ_UINT8 opacity = Kross::Api::Variant::toVariant(args->item(0)).toUInt(); m_painter->setOpacity(opacity); return 0; } @@ -236,8 +236,8 @@ Kross::Api::Object::Ptr Painter::setDuplicateOffset(Kross::Api::List::Ptr args) Kross::Api::Object::Ptr Painter::paintPolyline(Kross::Api::List::Ptr args) { - QValueList<QVariant> pointsX = Kross::Api::Variant::toList( args->item(0) ); - QValueList<QVariant> pointsY = Kross::Api::Variant::toList( args->item(1) ); + TQValueList<TQVariant> pointsX = Kross::Api::Variant::toList( args->item(0) ); + TQValueList<TQVariant> pointsY = Kross::Api::Variant::toList( args->item(1) ); if(pointsX.size() != pointsY.size()) { throw Kross::Api::Exception::Ptr( new Kross::Api::Exception("the two lists should have the same size.") ); @@ -287,8 +287,8 @@ Kross::Api::Object::Ptr Painter::paintEllipse(Kross::Api::List::Ptr args) Kross::Api::Object::Ptr Painter::paintPolygon(Kross::Api::List::Ptr args) { - QValueList<QVariant> pointsX = Kross::Api::Variant::toList( args->item(0) ); - QValueList<QVariant> pointsY = Kross::Api::Variant::toList( args->item(1) ); + TQValueList<TQVariant> pointsX = Kross::Api::Variant::toList( args->item(0) ); + TQValueList<TQVariant> pointsY = Kross::Api::Variant::toList( args->item(1) ); if(pointsX.size() != pointsY.size()) { throw Kross::Api::Exception::Ptr( new Kross::Api::Exception("the two lists should have the same size.") ); @@ -320,14 +320,14 @@ Kross::Api::Object::Ptr Painter::paintAt(Kross::Api::List::Ptr args) Kross::Api::Object::Ptr Painter::setBackgroundColor(Kross::Api::List::Ptr args) { Color* c = (Color*)args->item(0).data(); - m_painter->setBackgroundColor( KisColor(c->toQColor(), paintLayer()->paintDevice()->colorSpace() )); + m_painter->setBackgroundColor( KisColor(c->toTQColor(), paintLayer()->paintDevice()->colorSpace() )); return 0; } Kross::Api::Object::Ptr Painter::setPaintColor(Kross::Api::List::Ptr args) { Color* c = (Color*)args->item(0).data(); - m_painter->setPaintColor( KisColor(c->toQColor(), paintLayer()->paintDevice()->colorSpace() )); + m_painter->setPaintColor( KisColor(c->toTQColor(), paintLayer()->paintDevice()->colorSpace() )); return 0; } @@ -347,7 +347,7 @@ Kross::Api::Object::Ptr Painter::setBrush(Kross::Api::List::Ptr args) } Kross::Api::Object::Ptr Painter::setPaintOp(Kross::Api::List::Ptr args) { - QString id = Kross::Api::Variant::toString(args->item(0)); + TQString id = Kross::Api::Variant::toString(args->item(0)); KisPaintOp* op = KisPaintOpRegistry::instance()->paintOp( id, 0, m_painter ); m_painter->setPaintOp( op ); return 0; diff --git a/krita/plugins/viewplugins/scripting/kritacore/krs_painter.h b/krita/plugins/viewplugins/scripting/kritacore/krs_painter.h index 37ae7993..64cf6940 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/krs_painter.h +++ b/krita/plugins/viewplugins/scripting/kritacore/krs_painter.h @@ -217,11 +217,11 @@ class Painter : public Kross::Api::Class<Painter> protected: inline KisPaintLayerSP paintLayer() { return m_layer; } private: - inline vKisPoint createPointsVector( QValueList<QVariant> xs, QValueList<QVariant> ys) + inline vKisPoint createPointsVector( TQValueList<TQVariant> xs, TQValueList<TQVariant> ys) { vKisPoint a; - QValueList<QVariant>::iterator itx = xs.begin(); - QValueList<QVariant>::iterator ity = ys.begin(); + TQValueList<TQVariant>::iterator itx = xs.begin(); + TQValueList<TQVariant>::iterator ity = ys.begin(); for(; itx != xs.end(); ++itx, ++ity) { a.push_back(KisPoint( (*itx).toDouble(), (*ity).toDouble())); diff --git a/krita/plugins/viewplugins/scripting/kritacore/krs_wavelet.cpp b/krita/plugins/viewplugins/scripting/kritacore/krs_wavelet.cpp index d2786780..9c652a07 100644 --- a/krita/plugins/viewplugins/scripting/kritacore/krs_wavelet.cpp +++ b/krita/plugins/viewplugins/scripting/kritacore/krs_wavelet.cpp @@ -49,21 +49,21 @@ Wavelet::~Wavelet() Kross::Api::Object::Ptr Wavelet::getNCoeff(Kross::Api::List::Ptr args) { - Q_UINT32 n = Kross::Api::Variant::toUInt(args->item(0)); + TQ_UINT32 n = Kross::Api::Variant::toUInt(args->item(0)); if( n > m_numCoeff) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("getNCoeff") + "\n" + i18n("Index out of bound") ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("getNCoeff") + "\n" + i18n("Index out of bound") ) ); } return new Kross::Api::Variant(*(m_wavelet->coeffs + n )); } Kross::Api::Object::Ptr Wavelet::setNCoeff(Kross::Api::List::Ptr args) { - Q_UINT32 n = Kross::Api::Variant::toUInt(args->item(0)); + TQ_UINT32 n = Kross::Api::Variant::toUInt(args->item(0)); double v = Kross::Api::Variant::toDouble(args->item(1)); if( n > m_numCoeff) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("setNCoeff") + "\n" + i18n("Index out of bound") ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("setNCoeff") + "\n" + i18n("Index out of bound") ) ); } *(m_wavelet->coeffs + n ) = v; return 0; @@ -71,23 +71,23 @@ Kross::Api::Object::Ptr Wavelet::setNCoeff(Kross::Api::List::Ptr args) Kross::Api::Object::Ptr Wavelet::getXYCoeff(Kross::Api::List::Ptr args) { - Q_UINT32 x = Kross::Api::Variant::toUInt(args->item(0)); - Q_UINT32 y = Kross::Api::Variant::toUInt(args->item(1)); + TQ_UINT32 x = Kross::Api::Variant::toUInt(args->item(0)); + TQ_UINT32 y = Kross::Api::Variant::toUInt(args->item(1)); if( x > m_wavelet->size && y > m_wavelet->size) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("getXYCoeff") + "\n" + i18n("Index out of bound") ) ); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("getXYCoeff") + "\n" + i18n("Index out of bound") ) ); } return new Kross::Api::Variant(*(m_wavelet->coeffs + (x + y * m_wavelet->size ) * m_wavelet->depth )); } Kross::Api::Object::Ptr Wavelet::setXYCoeff(Kross::Api::List::Ptr args) { - Q_UINT32 x = Kross::Api::Variant::toUInt(args->item(0)); - Q_UINT32 y = Kross::Api::Variant::toUInt(args->item(1)); + TQ_UINT32 x = Kross::Api::Variant::toUInt(args->item(0)); + TQ_UINT32 y = Kross::Api::Variant::toUInt(args->item(1)); double v = Kross::Api::Variant::toDouble(args->item(2)); if( x > m_wavelet->size && y > m_wavelet->size) { - throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("setXYCoeff") + "\n" + i18n("Index out of bound") )); + throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("setXYCoeff") + "\n" + i18n("Index out of bound") )); } *(m_wavelet->coeffs + (x + y * m_wavelet->size ) * m_wavelet->depth ) = v; return 0; diff --git a/krita/plugins/viewplugins/scripting/kritascripting/kis_script_monitor.cpp b/krita/plugins/viewplugins/scripting/kritascripting/kis_script_monitor.cpp index 8bb12596..3967ffe7 100644 --- a/krita/plugins/viewplugins/scripting/kritascripting/kis_script_monitor.cpp +++ b/krita/plugins/viewplugins/scripting/kritascripting/kis_script_monitor.cpp @@ -34,8 +34,8 @@ KisScriptMonitor::~KisScriptMonitor() void KisScriptMonitor::monitor(Kross::Api::ScriptGUIClient* guiClient) { - connect(guiClient, SIGNAL(executionFinished( const Kross::Api::ScriptAction* )), SIGNAL(executionFinished( const Kross::Api::ScriptAction* ))); - connect(guiClient, SIGNAL(executionStarted( const Kross::Api::ScriptAction* )), SIGNAL(executionStarted( const Kross::Api::ScriptAction* ))); + connect(guiClient, TQT_SIGNAL(executionFinished( const Kross::Api::ScriptAction* )), TQT_SIGNAL(executionFinished( const Kross::Api::ScriptAction* ))); + connect(guiClient, TQT_SIGNAL(executionStarted( const Kross::Api::ScriptAction* )), TQT_SIGNAL(executionStarted( const Kross::Api::ScriptAction* ))); } KisScriptMonitor* KisScriptMonitor::s_instance = 0; diff --git a/krita/plugins/viewplugins/scripting/kritascripting/kis_script_monitor.h b/krita/plugins/viewplugins/scripting/kritascripting/kis_script_monitor.h index de1e0380..c1ee64c0 100644 --- a/krita/plugins/viewplugins/scripting/kritascripting/kis_script_monitor.h +++ b/krita/plugins/viewplugins/scripting/kritascripting/kis_script_monitor.h @@ -19,7 +19,7 @@ #ifndef KIS_SCRIPT_MONITOR_H #define KIS_SCRIPT_MONITOR_H -#include <qobject.h> +#include <tqobject.h> namespace Kross { namespace Api { @@ -31,8 +31,9 @@ namespace Kross { /** @author Cyrille Berger <cberger@cberger.net> */ -class KisScriptMonitor : public QObject { +class KisScriptMonitor : public TQObject { Q_OBJECT + TQ_OBJECT private: KisScriptMonitor(); ~KisScriptMonitor(); diff --git a/krita/plugins/viewplugins/scripting/kritascripting/kis_script_progress.cpp b/krita/plugins/viewplugins/scripting/kritascripting/kis_script_progress.cpp index c3629304..d7af4eb4 100644 --- a/krita/plugins/viewplugins/scripting/kritascripting/kis_script_progress.cpp +++ b/krita/plugins/viewplugins/scripting/kritascripting/kis_script_progress.cpp @@ -26,7 +26,7 @@ void KisScriptProgress::activateAsSubject() m_view->canvasSubject()->progressDisplay()->setSubject( this, true, false /* TODO: how to cancel a script ? */ ); } -void KisScriptProgress::setProgressTotalSteps(Q_INT32 totalSteps) +void KisScriptProgress::setProgressTotalSteps(TQ_INT32 totalSteps) { m_progressTotalSteps = totalSteps; m_progressSteps = 0; @@ -34,10 +34,10 @@ void KisScriptProgress::setProgressTotalSteps(Q_INT32 totalSteps) emit notifyProgress(0); } -void KisScriptProgress::setProgress(Q_INT32 progress) +void KisScriptProgress::setProgress(TQ_INT32 progress) { m_progressSteps = progress; - Q_INT32 progressPerCent = (m_progressSteps * 100) / (m_progressTotalSteps > 0 ? m_progressTotalSteps : 1); + TQ_INT32 progressPerCent = (m_progressSteps * 100) / (m_progressTotalSteps > 0 ? m_progressTotalSteps : 1); if (progressPerCent != m_lastProgressPerCent) { @@ -51,9 +51,9 @@ void KisScriptProgress::incProgress() setProgress( ++m_progressSteps ); } -void KisScriptProgress::setProgressStage(const QString& stage, Q_INT32 progress) +void KisScriptProgress::setProgressStage(const TQString& stage, TQ_INT32 progress) { - Q_INT32 progressPerCent = (progress * 100) / (m_progressTotalSteps > 0 ? m_progressTotalSteps : 1); + TQ_INT32 progressPerCent = (progress * 100) / (m_progressTotalSteps > 0 ? m_progressTotalSteps : 1); m_lastProgressPerCent = progress; emit notifyProgressStage( stage, progressPerCent); } diff --git a/krita/plugins/viewplugins/scripting/kritascripting/kis_script_progress.h b/krita/plugins/viewplugins/scripting/kritascripting/kis_script_progress.h index 864a6760..48af433c 100644 --- a/krita/plugins/viewplugins/scripting/kritascripting/kis_script_progress.h +++ b/krita/plugins/viewplugins/scripting/kritascripting/kis_script_progress.h @@ -38,17 +38,17 @@ class KisScriptProgress : public KisProgressSubject void activateAsSubject(); virtual void cancel() {}; public: - void setProgressTotalSteps(Q_INT32 totalSteps); - void setProgress(Q_INT32 progress); + void setProgressTotalSteps(TQ_INT32 totalSteps); + void setProgress(TQ_INT32 progress); void incProgress(); - void setProgressStage(const QString& stage, Q_INT32 progress); + void setProgressStage(const TQString& stage, TQ_INT32 progress); void progressDone(); - inline void setPackagePath(QString path) { m_packagePath = path; }; - inline QString packagePath() { return m_packagePath; } + inline void setPackagePath(TQString path) { m_packagePath = path; }; + inline TQString packagePath() { return m_packagePath; } private: - Q_INT32 m_progressSteps, m_progressTotalSteps, m_lastProgressPerCent; + TQ_INT32 m_progressSteps, m_progressTotalSteps, m_lastProgressPerCent; KisView * m_view; - QString m_packagePath; + TQString m_packagePath; }; #endif diff --git a/krita/plugins/viewplugins/scripting/samples/python/reshapehisto.py b/krita/plugins/viewplugins/scripting/samples/python/reshapehisto.py index 4a79e68c..02371826 100644 --- a/krita/plugins/viewplugins/scripting/samples/python/reshapehisto.py +++ b/krita/plugins/viewplugins/scripting/samples/python/reshapehisto.py @@ -18,7 +18,7 @@ import math -# it's an experimental script to try to reshape histogram, while the results are far to be convincing yet +# it's an experimental script to try to reshape.histogram, while the results are far to be convincing yet # it is still an example on how to use histogram in a script def sign(a): diff --git a/krita/plugins/viewplugins/scripting/samples/ruby/randompaint.rb b/krita/plugins/viewplugins/scripting/samples/ruby/randompaint.rb index 9e2f504f..ab5f6205 100644 --- a/krita/plugins/viewplugins/scripting/samples/ruby/randompaint.rb +++ b/krita/plugins/viewplugins/scripting/samples/ruby/randompaint.rb @@ -60,11 +60,11 @@ for i in 1..100 painter.setBrush( Krosskritacore::newCircleBrush(rand*20,rand*20,rand*10,rand*10) ) end # paint a point - shape = rand * 7 + tqshape = rand * 7 painter.setStrokeStyle(1) - if( shape < 1 ) + if( tqshape < 1 ) painter.paintAt(rand * width , rand * height,1.1) - elsif(shape < 2 ) + elsif(tqshape < 2 ) xs = Array.new ys = Array.new for i in 0..6 @@ -72,14 +72,14 @@ for i in 1..100 ys[i] = rand*height end painter.paintPolyline(xs,ys) - elsif(shape < 3) + elsif(tqshape < 3) painter.paintLine(rand * width, rand * height, 1.1, rand * width, rand * height,1.1) - elsif(shape < 4) + elsif(tqshape < 4) painter.paintBezierCurve(rand * width, rand * height, 1.1, rand * width, rand * height, rand * width , rand * height, rand * width, rand * height, 1.1) - elsif(shape < 5) + elsif(tqshape < 5) randomizeStyle(painter) painter.paintEllipse(rand * width, rand * height, rand * width, rand * height, 1.1) - elsif(shape < 6) + elsif(tqshape < 6) xs = Array.new ys = Array.new for i in 0..6 @@ -88,7 +88,7 @@ for i in 1..100 end randomizeStyle(painter) painter.paintPolygon(xs, ys) - elsif(shape < 7) + elsif(tqshape < 7) randomizeStyle(painter) painter.paintRect(rand * width, rand * height, rand * width, rand * height, 1.1) end diff --git a/krita/plugins/viewplugins/scripting/samples/ruby/torture-painting.rb b/krita/plugins/viewplugins/scripting/samples/ruby/torture-painting.rb index 67042de2..47216761 100644 --- a/krita/plugins/viewplugins/scripting/samples/ruby/torture-painting.rb +++ b/krita/plugins/viewplugins/scripting/samples/ruby/torture-painting.rb @@ -91,11 +91,11 @@ class TorturePainting painter.setBrush( Krosskritacore::newCircleBrush(rand*20,rand*20,rand*10,rand*10) ) end # paint a point - shape = rand * 7 + tqshape = rand * 7 painter.setStrokeStyle(1) - if( shape < 1 ) + if( tqshape < 1 ) painter.paintAt(rand * @width , rand * @height,1.1) - elsif(shape < 2 ) + elsif(tqshape < 2 ) xs = Array.new ys = Array.new for i in 0..6 @@ -103,14 +103,14 @@ class TorturePainting ys[i] = rand*@height end painter.paintPolyline(xs,ys) - elsif(shape < 3) + elsif(tqshape < 3) painter.paintLine(rand * @width, rand * @height, 1.1, rand * @width, rand * @height,1.1) - elsif(shape < 4) + elsif(tqshape < 4) painter.paintBezierCurve(rand * @width, rand * @height, 1.1, rand * @width, rand * @height, rand * @width , rand * @height, rand * @width, rand * @height, 1.1) - elsif(shape < 5) + elsif(tqshape < 5) randomizeStyle(painter) painter.paintEllipse(rand * @width, rand * @height, rand * @width, rand * @height, 1.1) - elsif(shape < 6) + elsif(tqshape < 6) xs = Array.new ys = Array.new for i in 0..6 @@ -119,7 +119,7 @@ class TorturePainting end randomizeStyle(painter) painter.paintPolygon(xs, ys) - elsif(shape < 7) + elsif(tqshape < 7) randomizeStyle(painter) painter.paintRect(rand * @width, rand * @height, rand * @width, rand * @height, 1.1) end diff --git a/krita/plugins/viewplugins/scripting/scripting.cc b/krita/plugins/viewplugins/scripting/scripting.cc index d7f5fde7..210b8eff 100644 --- a/krita/plugins/viewplugins/scripting/scripting.cc +++ b/krita/plugins/viewplugins/scripting/scripting.cc @@ -21,8 +21,8 @@ #include <stdlib.h> #include <vector> -#include <qapplication.h> -#include <qpoint.h> +#include <tqapplication.h> +#include <tqpoint.h> #include <kdebug.h> #include <kfiledialog.h> @@ -54,36 +54,36 @@ typedef KGenericFactory<Scripting> KritaScriptingFactory; K_EXPORT_COMPONENT_FACTORY( kritascripting, KritaScriptingFactory( "krita" ) ) -Scripting::Scripting(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +Scripting::Scripting(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { setInstance(KritaScriptingFactory::instance()); - if ( parent->inherits("KisView") ) + if ( tqparent->inherits("KisView") ) { setInstance(Scripting::instance()); - m_view = (KisView*) parent; + m_view = (KisView*) tqparent; m_scriptguiclient = new Kross::Api::ScriptGUIClient( m_view, m_view ); // m_scriptguiclient ->setXMLFile(locate("data","kritaplugins/scripting.rc"), true); //BEGIN TODO: understand why the ScriptGUIClient doesn't "link" its actions to the menu setXMLFile(locate("data","kritaplugins/scripting.rc"), true); - new KAction(i18n("Execute Script File..."), 0, 0, m_scriptguiclient, SLOT(executeScriptFile()), actionCollection(), "executescriptfile"); - new KAction(i18n("Script Manager..."), 0, 0, m_scriptguiclient, SLOT(showScriptManager()), actionCollection(), "configurescripts"); + new KAction(i18n("Execute Script File..."), 0, 0, m_scriptguiclient, TQT_SLOT(executeScriptFile()), actionCollection(), "executescriptfile"); + new KAction(i18n("Script Manager..."), 0, 0, m_scriptguiclient, TQT_SLOT(showScriptManager()), actionCollection(), "configurescripts"); //END TODO - QWidget * w = new Kross::Api::WdgScriptsManager(m_scriptguiclient, m_view); + TQWidget * w = new Kross::Api::WdgScriptsManager(m_scriptguiclient, m_view); m_view->canvasSubject()->paletteManager()->addWidget(w, "Scripts Manager", krita::LAYERBOX, 10, PALETTE_DOCKER, false); - connect(m_scriptguiclient, SIGNAL(executionFinished( const Kross::Api::ScriptAction* )), this, SLOT(executionFinished(const Kross::Api::ScriptAction*))); - connect(m_scriptguiclient, SIGNAL(executionStarted( const Kross::Api::ScriptAction* )), this, SLOT(executionStarted(const Kross::Api::ScriptAction*))); + connect(m_scriptguiclient, TQT_SIGNAL(executionFinished( const Kross::Api::ScriptAction* )), this, TQT_SLOT(executionFinished(const Kross::Api::ScriptAction*))); + connect(m_scriptguiclient, TQT_SIGNAL(executionStarted( const Kross::Api::ScriptAction* )), this, TQT_SLOT(executionStarted(const Kross::Api::ScriptAction*))); KisScriptMonitor::instance()->monitor( m_scriptguiclient ); - Kross::Api::Manager::scriptManager()->addQObject(m_view->canvasSubject()->document(), "KritaDocument"); - Kross::Api::Manager::scriptManager()->addQObject(m_view, "KritaView"); + Kross::Api::Manager::scriptManager()->addTQObject(m_view->canvasSubject()->document(), "KritaDocument"); + Kross::Api::Manager::scriptManager()->addTQObject(m_view, "KritaView"); m_scriptProgress = new KisScriptProgress(m_view); - Kross::Api::Manager::scriptManager()->addQObject(m_scriptProgress, "KritaScriptProgress"); + Kross::Api::Manager::scriptManager()->addTQObject(m_scriptProgress, "KritaScriptProgress"); } @@ -98,7 +98,7 @@ void Scripting::executionFinished(const Kross::Api::ScriptAction*) m_view->canvasSubject()->document()->setModified(true); m_view->canvasSubject()->document()->currentImage()->activeLayer()->setDirty(); m_scriptProgress->progressDone(); - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); } void Scripting::executionStarted(const Kross::Api::ScriptAction* act) diff --git a/krita/plugins/viewplugins/scripting/scripting.h b/krita/plugins/viewplugins/scripting/scripting.h index 238483c8..20675043 100644 --- a/krita/plugins/viewplugins/scripting/scripting.h +++ b/krita/plugins/viewplugins/scripting/scripting.h @@ -37,8 +37,9 @@ namespace Kross { class Scripting : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - Scripting(QObject *parent, const char *name, const QStringList &); + Scripting(TQObject *tqparent, const char *name, const TQStringList &); virtual ~Scripting(); private slots: void executionFinished(const Kross::Api::ScriptAction*); diff --git a/krita/plugins/viewplugins/selectopaque/selectopaque.cc b/krita/plugins/viewplugins/selectopaque/selectopaque.cc index cfbcb4e7..c83250ee 100644 --- a/krita/plugins/viewplugins/selectopaque/selectopaque.cc +++ b/krita/plugins/viewplugins/selectopaque/selectopaque.cc @@ -23,8 +23,8 @@ #include <stdlib.h> -#include <qcursor.h> -#include <qapplication.h> +#include <tqcursor.h> +#include <tqapplication.h> #include <klocale.h> #include <kiconloader.h> @@ -53,15 +53,15 @@ typedef KGenericFactory<SelectOpaque> SelectOpaqueFactory; K_EXPORT_COMPONENT_FACTORY( kritaselectopaque, SelectOpaqueFactory( "krita" ) ) -SelectOpaque::SelectOpaque(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +SelectOpaque::SelectOpaque(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { - if (parent->inherits("KisView")) { + if (tqparent->inherits("KisView")) { setInstance(SelectOpaqueFactory::instance()); setXMLFile(locate("data","kritaplugins/selectopaque.rc"), true); - m_view = dynamic_cast<KisView*>(parent); - m_view->canvasSubject()->selectionManager()->addSelectionAction( new KAction(i18n("&Select All Opaque Pixels..."), 0, 0, this, SLOT(slotActivated()), actionCollection(), "selectopaque") ); + m_view = dynamic_cast<KisView*>(tqparent); + m_view->canvasSubject()->selectionManager()->addSelectionAction( new KAction(i18n("&Select All Opaque Pixels..."), 0, 0, this, TQT_SLOT(slotActivated()), actionCollection(), "selectopaque") ); } } @@ -76,11 +76,11 @@ void SelectOpaque::slotActivated() KisPaintDeviceSP layer = m_view->canvasSubject()->currentImg()->activeDevice(); if (!layer) return; - QApplication::setOverrideCursor(KisCursor::waitCursor()); + TQApplication::setOverrideCursor(KisCursor::waitCursor()); if (layer->image()->undo()) transaction = new KisSelectedTransaction(i18n("Select Opaque Pixels"), layer); // XXX: Multithread this! - Q_INT32 x, y, w, h; + TQ_INT32 x, y, w, h; layer->exactBounds(x, y, w, h); KisColorSpace * cs = layer->colorSpace(); @@ -104,7 +104,7 @@ void SelectOpaque::slotActivated() hiter.nextRow(); selIter.nextRow(); } - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); layer->setDirty(); layer->emitSelectionChanged(); diff --git a/krita/plugins/viewplugins/selectopaque/selectopaque.h b/krita/plugins/viewplugins/selectopaque/selectopaque.h index 5215ecfe..86c66945 100644 --- a/krita/plugins/viewplugins/selectopaque/selectopaque.h +++ b/krita/plugins/viewplugins/selectopaque/selectopaque.h @@ -28,8 +28,9 @@ class KisView; class SelectOpaque : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - SelectOpaque(QObject *parent, const char *name, const QStringList &); + SelectOpaque(TQObject *tqparent, const char *name, const TQStringList &); virtual ~SelectOpaque(); private slots: diff --git a/krita/plugins/viewplugins/separate_channels/dlg_separate.cc b/krita/plugins/viewplugins/separate_channels/dlg_separate.cc index 760786ec..cb1d8322 100644 --- a/krita/plugins/viewplugins/separate_channels/dlg_separate.cc +++ b/krita/plugins/viewplugins/separate_channels/dlg_separate.cc @@ -18,12 +18,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qbuttongroup.h> -#include <qlabel.h> -#include <qcombobox.h> -#include <qbutton.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqbuttongroup.h> +#include <tqlabel.h> +#include <tqcombobox.h> +#include <tqbutton.h> #include <klocale.h> #include <knuminput.h> @@ -32,26 +32,26 @@ #include "dlg_separate.h" #include "wdg_separations.h" -DlgSeparate::DlgSeparate( const QString & imageCS, - const QString & layerCS, - QWidget * parent, +DlgSeparate::DlgSeparate( const TQString & imageCS, + const TQString & layerCS, + TQWidget * tqparent, const char * name) - : super (parent, name, true, i18n("Separate Image"), Ok | Cancel, Ok), + : super (tqparent, name, true, i18n("Separate Image"), Ok | Cancel, Ok), m_imageCS(imageCS), m_layerCS(layerCS) { m_page = new WdgSeparations(this, "separate_image"); Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->sizeHint()); + resize(m_page->tqsizeHint()); m_page->lblColormodel->setText(layerCS); m_page->grpOutput->hide(); - connect(m_page->grpSource, SIGNAL(clicked(int)), this, SLOT(slotSetColorSpaceLabel(int))); - connect(m_page->chkColors, SIGNAL(toggled(bool)), m_page->chkDownscale, SLOT(setDisabled(bool))); + connect(m_page->grpSource, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotSetColorSpaceLabel(int))); + connect(m_page->chkColors, TQT_SIGNAL(toggled(bool)), m_page->chkDownscale, TQT_SLOT(setDisabled(bool))); - connect(this, SIGNAL(okClicked()), - this, SLOT(okClicked())); + connect(this, TQT_SIGNAL(okClicked()), + this, TQT_SLOT(okClicked())); } DlgSeparate::~DlgSeparate() diff --git a/krita/plugins/viewplugins/separate_channels/dlg_separate.h b/krita/plugins/viewplugins/separate_channels/dlg_separate.h index 08432014..cf871566 100644 --- a/krita/plugins/viewplugins/separate_channels/dlg_separate.h +++ b/krita/plugins/viewplugins/separate_channels/dlg_separate.h @@ -32,10 +32,11 @@ class WdgSeparations; class DlgSeparate: public KDialogBase { typedef KDialogBase super; Q_OBJECT + TQ_OBJECT public: - DlgSeparate(const QString & imageCS, const QString & layerCS, QWidget * parent = 0, + DlgSeparate(const TQString & imageCS, const TQString & layerCS, TQWidget * tqparent = 0, const char* name = 0); ~DlgSeparate(); @@ -59,8 +60,8 @@ private slots: private: WdgSeparations * m_page; - QString m_imageCS; - QString m_layerCS; + TQString m_imageCS; + TQString m_layerCS; }; diff --git a/krita/plugins/viewplugins/separate_channels/kis_channel_separator.cc b/krita/plugins/viewplugins/separate_channels/kis_channel_separator.cc index 75622312..3747f485 100644 --- a/krita/plugins/viewplugins/separate_channels/kis_channel_separator.cc +++ b/krita/plugins/viewplugins/separate_channels/kis_channel_separator.cc @@ -83,9 +83,9 @@ void KisChannelSeparator::separate(KisProgressDisplayInterface * progress, enumS KisColorSpace * dstCs = 0; - Q_UINT32 numberOfChannels = src->nChannels(); + TQ_UINT32 numberOfChannels = src->nChannels(); KisColorSpace * srcCs = src->colorSpace(); - QValueVector<KisChannelInfo *> channels = srcCs->channels(); + TQValueVector<KisChannelInfo *> channels = srcCs->channels(); // Use the flattened image, if required switch(sourceOps) { @@ -99,15 +99,15 @@ void KisChannelSeparator::separate(KisProgressDisplayInterface * progress, enumS vKisPaintDeviceSP layers; - QValueVector<KisChannelInfo *>::const_iterator begin = channels.begin(); - QValueVector<KisChannelInfo *>::const_iterator end = channels.end(); + TQValueVector<KisChannelInfo *>::const_iterator begin = channels.begin(); + TQValueVector<KisChannelInfo *>::const_iterator end = channels.end(); - QRect rect = src->exactBounds(); + TQRect rect = src->exactBounds(); int i = 0; - Q_UINT32 channelIndex = 0; - for (QValueVector<KisChannelInfo *>::const_iterator it = begin; it != end; ++it, ++channelIndex) + TQ_UINT32 channelIndex = 0; + for (TQValueVector<KisChannelInfo *>::const_iterator it = begin; it != end; ++it, ++channelIndex) { KisChannelInfo * ch = (*it); @@ -116,9 +116,9 @@ void KisChannelSeparator::separate(KisProgressDisplayInterface * progress, enumS continue; } - Q_INT32 channelSize = ch->size(); - Q_INT32 channelPos = ch->pos(); - Q_INT32 destSize = 1; + TQ_INT32 channelSize = ch->size(); + TQ_INT32 channelPos = ch->pos(); + TQ_INT32 destSize = 1; KisPaintDeviceSP dev; if (toColor) { @@ -139,7 +139,7 @@ void KisChannelSeparator::separate(KisProgressDisplayInterface * progress, enumS layers.push_back(dev); - for (Q_INT32 row = 0; row < rect.height(); ++row) { + for (TQ_INT32 row = 0; row < rect.height(); ++row) { KisHLineIteratorPixel srcIt = src->createHLineIterator(rect.x(), rect.y() + row, rect.width(), false); KisHLineIteratorPixel dstIt = dev->createHLineIterator(rect.x(), rect.y() + row, rect.width(), true); @@ -238,7 +238,7 @@ void KisChannelSeparator::separate(KisProgressDisplayInterface * progress, enumS break; } - for (QValueVector<KisChannelInfo *>::const_iterator it = begin; it != end; ++it) + for (TQValueVector<KisChannelInfo *>::const_iterator it = begin; it != end; ++it) { KisChannelInfo * ch = (*it); @@ -253,10 +253,10 @@ void KisChannelSeparator::separate(KisProgressDisplayInterface * progress, enumS image->addLayer( dynamic_cast<KisLayer*>(l.data()), image->rootLayer(), 0); } else { - QStringList listMimeFilter = KoFilterManager::mimeFilter("application/x-krita", KoFilterManager::Export); - QString mimelist = listMimeFilter.join(" "); + TQStringList listMimeFilter = KoFilterManager::mimeFilter("application/x-krita", KoFilterManager::Export); + TQString mimelist = listMimeFilter.join(" "); - KFileDialog fd (QString::null, mimelist, m_view, "Export Layer", true); + KFileDialog fd (TQString(), mimelist, m_view, "Export Layer", true); fd.setCaption(i18n("Export Layer") + "(" + ch->name() + ")"); fd.setMimeFilter(listMimeFilter); fd.setOperationMode(KFileDialog::Saving); @@ -264,13 +264,13 @@ void KisChannelSeparator::separate(KisProgressDisplayInterface * progress, enumS if (!fd.exec()) return; KURL url = fd.selectedURL(); - QString mimefilter = fd.currentMimeFilter(); + TQString mimefilter = fd.currentMimeFilter(); if (url.isEmpty()) return; KisPaintLayerSP l = new KisPaintLayer( image, ch->name(), OPACITY_OPAQUE, *deviceIt); - QRect r = l->exactBounds(); + TQRect r = l->exactBounds(); KisDoc d; d.prepareForImport(); diff --git a/krita/plugins/viewplugins/separate_channels/kis_channel_separator.h b/krita/plugins/viewplugins/separate_channels/kis_channel_separator.h index 0c0d80c9..d8bf777e 100644 --- a/krita/plugins/viewplugins/separate_channels/kis_channel_separator.h +++ b/krita/plugins/viewplugins/separate_channels/kis_channel_separator.h @@ -48,6 +48,7 @@ enum enumSepOutput { class KisChannelSeparator : public KisProgressSubject { Q_OBJECT + TQ_OBJECT public: diff --git a/krita/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cc b/krita/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cc index 4f7134f8..2edc9b36 100644 --- a/krita/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cc +++ b/krita/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cc @@ -39,15 +39,15 @@ K_EXPORT_COMPONENT_FACTORY( kritaseparatechannels, KGenericFactory<KisSeparateChannelsPlugin>( "krita" ) ) -KisSeparateChannelsPlugin::KisSeparateChannelsPlugin(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +KisSeparateChannelsPlugin::KisSeparateChannelsPlugin(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { - if ( parent->inherits("KisView") ) { + if ( tqparent->inherits("KisView") ) { setInstance(KGenericFactory<KisSeparateChannelsPlugin>::instance()); setXMLFile(locate("data","kritaplugins/imageseparate.rc"), true); - m_view = (KisView*) parent; - (void) new KAction(i18n("Separate Image..."), 0, 0, this, SLOT(slotSeparate()), actionCollection(), "separate"); + m_view = (KisView*) tqparent; + (void) new KAction(i18n("Separate Image..."), 0, 0, this, TQT_SLOT(slotSeparate()), actionCollection(), "separate"); } } @@ -77,7 +77,7 @@ void KisSeparateChannelsPlugin::slotSeparate() dlgSeparate->enableDownscale(false); } - if (dlgSeparate->exec() == QDialog::Accepted) { + if (dlgSeparate->exec() == TQDialog::Accepted) { KisChannelSeparator separator(m_view); separator.separate(m_view->canvasSubject()->progressDisplay(), diff --git a/krita/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.h b/krita/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.h index a4a4fd61..0c62dcaf 100644 --- a/krita/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.h +++ b/krita/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.h @@ -29,8 +29,9 @@ class KisView; class KisSeparateChannelsPlugin : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - KisSeparateChannelsPlugin(QObject *parent, const char *name, const QStringList &); + KisSeparateChannelsPlugin(TQObject *tqparent, const char *name, const TQStringList &); virtual ~KisSeparateChannelsPlugin(); private slots: diff --git a/krita/plugins/viewplugins/separate_channels/wdg_separations.ui b/krita/plugins/viewplugins/separate_channels/wdg_separations.ui index 6c7a8cf7..0593258b 100644 --- a/krita/plugins/viewplugins/separate_channels/wdg_separations.ui +++ b/krita/plugins/viewplugins/separate_channels/wdg_separations.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgSeparations</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgSeparations</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>chkColors</cstring> </property> @@ -24,7 +24,7 @@ <string>Output to color, not grayscale</string> </property> </widget> - <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>chkDownscale</cstring> </property> @@ -32,7 +32,7 @@ <string>Downscale to 8-bit before separating</string> </property> </widget> - <widget class="QButtonGroup" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQButtonGroup" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>grpAlpha</cstring> </property> @@ -43,7 +43,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioCopyAlpha</cstring> </property> @@ -51,7 +51,7 @@ <string>Copy alpha channel to each separated channel as an alpha channel</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioDiscardAlpha</cstring> </property> @@ -62,7 +62,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioSeparateAlpha</cstring> </property> @@ -82,14 +82,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QButtonGroup" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQButtonGroup" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>grpSource</cstring> </property> @@ -100,7 +100,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>radioCurrentLayer</cstring> </property> @@ -111,7 +111,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>radioAllLayers</cstring> </property> @@ -121,7 +121,7 @@ </widget> </grid> </widget> - <widget class="QButtonGroup" row="1" column="2"> + <widget class="TQButtonGroup" row="1" column="2"> <property name="name"> <cstring>grpOutput</cstring> </property> @@ -132,7 +132,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioLayers</cstring> </property> @@ -143,7 +143,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioImages</cstring> </property> @@ -153,7 +153,7 @@ </widget> </vbox> </widget> - <widget class="QLabel" row="0" column="1" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>lblColormodel</cstring> </property> @@ -161,7 +161,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -178,5 +178,5 @@ <tabstop>chkDownscale</tabstop> <tabstop>chkColors</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/krita/plugins/viewplugins/shearimage/dlg_shearimage.cc b/krita/plugins/viewplugins/shearimage/dlg_shearimage.cc index 9a6a2f66..896a947a 100644 --- a/krita/plugins/viewplugins/shearimage/dlg_shearimage.cc +++ b/krita/plugins/viewplugins/shearimage/dlg_shearimage.cc @@ -26,10 +26,10 @@ using namespace std; -#include <qradiobutton.h> -#include <qcheckbox.h> -#include <qlabel.h> -#include <qlayout.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> +#include <tqlabel.h> +#include <tqlayout.h> #include <klocale.h> #include <knuminput.h> @@ -39,21 +39,21 @@ using namespace std; #include "wdg_shearimage.h" -DlgShearImage::DlgShearImage( QWidget * parent, +DlgShearImage::DlgShearImage( TQWidget * tqparent, const char * name) - : super (parent, name, true, i18n("Shear Image"), Ok | Cancel, Ok) + : super (tqparent, name, true, i18n("Shear Image"), Ok | Cancel, Ok) { m_lock = false; m_page = new WdgShearImage(this, "shear_image"); - m_page->layout()->setMargin(0); + m_page->tqlayout()->setMargin(0); Q_CHECK_PTR(m_page); setMainWidget(m_page); - resize(m_page->sizeHint()); + resize(m_page->tqsizeHint()); - connect(this, SIGNAL(okClicked()), - this, SLOT(okClicked())); + connect(this, TQT_SIGNAL(okClicked()), + this, TQT_SLOT(okClicked())); } @@ -62,28 +62,28 @@ DlgShearImage::~DlgShearImage() delete m_page; } -void DlgShearImage::setAngleX(Q_UINT32 angle) +void DlgShearImage::setAngleX(TQ_UINT32 angle) { m_page->shearAngleX->setValue(angle); m_oldAngle = angle; } -void DlgShearImage::setAngleY(Q_UINT32 angle) +void DlgShearImage::setAngleY(TQ_UINT32 angle) { m_page->shearAngleY->setValue(angle); m_oldAngle = angle; } -Q_INT32 DlgShearImage::angleX() +TQ_INT32 DlgShearImage::angleX() { - return (Q_INT32)qRound(m_page->shearAngleX->value()); + return (TQ_INT32)tqRound(m_page->shearAngleX->value()); } -Q_INT32 DlgShearImage::angleY() +TQ_INT32 DlgShearImage::angleY() { - return (Q_INT32)qRound(m_page->shearAngleY->value()); + return (TQ_INT32)tqRound(m_page->shearAngleY->value()); } // SLOTS diff --git a/krita/plugins/viewplugins/shearimage/dlg_shearimage.h b/krita/plugins/viewplugins/shearimage/dlg_shearimage.h index 183f166a..b5ed0e7f 100644 --- a/krita/plugins/viewplugins/shearimage/dlg_shearimage.h +++ b/krita/plugins/viewplugins/shearimage/dlg_shearimage.h @@ -27,17 +27,18 @@ class WdgShearImage; class DlgShearImage: public KDialogBase { typedef KDialogBase super; Q_OBJECT + TQ_OBJECT public: - DlgShearImage(QWidget * parent = 0, + DlgShearImage(TQWidget * tqparent = 0, const char* name = 0); ~DlgShearImage(); - void setAngleX(Q_UINT32 w); - void setAngleY(Q_UINT32 w); - Q_INT32 angleX(); - Q_INT32 angleY(); + void setAngleX(TQ_UINT32 w); + void setAngleY(TQ_UINT32 w); + TQ_INT32 angleX(); + TQ_INT32 angleY(); private slots: diff --git a/krita/plugins/viewplugins/shearimage/shearimage.cc b/krita/plugins/viewplugins/shearimage/shearimage.cc index d8c839ce..83792762 100644 --- a/krita/plugins/viewplugins/shearimage/shearimage.cc +++ b/krita/plugins/viewplugins/shearimage/shearimage.cc @@ -23,8 +23,8 @@ #include <stdlib.h> -#include <qslider.h> -#include <qpoint.h> +#include <tqslider.h> +#include <tqpoint.h> #include <klocale.h> #include <kiconloader.h> @@ -51,18 +51,18 @@ typedef KGenericFactory<ShearImage> ShearImageFactory; K_EXPORT_COMPONENT_FACTORY( kritashearimage, ShearImageFactory( "krita" ) ) // XXX: this plugin could also provide layer scaling/resizing -ShearImage::ShearImage(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +ShearImage::ShearImage(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { - if ( parent->inherits("KisView") ) + if ( tqparent->inherits("KisView") ) { setInstance(ShearImageFactory::instance()); setXMLFile(locate("data","kritaplugins/shearimage.rc"), true); - (void) new KAction(i18n("&Shear Image..."), 0, 0, this, SLOT(slotShearImage()), actionCollection(), "shearimage"); - (void) new KAction(i18n("&Shear Layer..."), 0, 0, this, SLOT(slotShearLayer()), actionCollection(), "shearlayer"); + (void) new KAction(i18n("&Shear Image..."), 0, 0, this, TQT_SLOT(slotShearImage()), actionCollection(), "shearimage"); + (void) new KAction(i18n("&Shear Layer..."), 0, 0, this, TQT_SLOT(slotShearLayer()), actionCollection(), "shearlayer"); - m_view = (KisView*) parent; + m_view = (KisView*) tqparent; } } @@ -82,9 +82,9 @@ void ShearImage::slotShearImage() dlgShearImage->setCaption(i18n("Shear Image")); - if (dlgShearImage->exec() == QDialog::Accepted) { - Q_INT32 angleX = dlgShearImage->angleX(); - Q_INT32 angleY = dlgShearImage->angleY(); + if (dlgShearImage->exec() == TQDialog::Accepted) { + TQ_INT32 angleX = dlgShearImage->angleX(); + TQ_INT32 angleY = dlgShearImage->angleY(); m_view->shearCurrentImage(angleX, angleY); } delete dlgShearImage; @@ -101,9 +101,9 @@ void ShearImage::slotShearLayer() dlgShearImage->setCaption(i18n("Shear Layer")); - if (dlgShearImage->exec() == QDialog::Accepted) { - Q_INT32 angleX = dlgShearImage->angleX(); - Q_INT32 angleY = dlgShearImage->angleY(); + if (dlgShearImage->exec() == TQDialog::Accepted) { + TQ_INT32 angleX = dlgShearImage->angleX(); + TQ_INT32 angleY = dlgShearImage->angleY(); m_view->shearLayer(angleX, angleY); } diff --git a/krita/plugins/viewplugins/shearimage/shearimage.h b/krita/plugins/viewplugins/shearimage/shearimage.h index bfff2ac2..73ee8908 100644 --- a/krita/plugins/viewplugins/shearimage/shearimage.h +++ b/krita/plugins/viewplugins/shearimage/shearimage.h @@ -27,8 +27,9 @@ class KisView; class ShearImage : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - ShearImage(QObject *parent, const char *name, const QStringList &); + ShearImage(TQObject *tqparent, const char *name, const TQStringList &); virtual ~ShearImage(); private slots: diff --git a/krita/plugins/viewplugins/shearimage/wdg_shearimage.ui b/krita/plugins/viewplugins/shearimage/wdg_shearimage.ui index 20de0b6b..d63b58f5 100644 --- a/krita/plugins/viewplugins/shearimage/wdg_shearimage.ui +++ b/krita/plugins/viewplugins/shearimage/wdg_shearimage.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgShearImage</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgShearImage</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup" row="0" column="0"> + <widget class="TQButtonGroup" row="0" column="0"> <property name="name"> <cstring>grpPixelDimensions</cstring> </property> @@ -44,7 +44,7 @@ <string>°</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblShearAngelY</cstring> </property> @@ -56,7 +56,7 @@ <property name="name"> <cstring>shearAngleY</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>100</height> @@ -72,7 +72,7 @@ <string>°</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblShearAngleX</cstring> </property> @@ -92,7 +92,7 @@ <tabstops> <tabstop>shearAngleX</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/krita/plugins/viewplugins/substrate/dlg_substrate.cc b/krita/plugins/viewplugins/substrate/dlg_substrate.cc index d1bbe38f..51de887d 100644 --- a/krita/plugins/viewplugins/substrate/dlg_substrate.cc +++ b/krita/plugins/viewplugins/substrate/dlg_substrate.cc @@ -24,19 +24,19 @@ #include "wdgsubstrate.h" -DlgSubstrate::DlgSubstrate( QWidget * parent, +DlgSubstrate::DlgSubstrate( TQWidget * tqparent, const char * name) - : super (parent, name, true, i18n("Color Range"), Ok | Cancel, Ok) + : super (tqparent, name, true, i18n("Color Range"), Ok | Cancel, Ok) { - m_previewPix = QPixmap(); + m_previewPix = TQPixmap(); m_page = new WdgSubstrate(this, "substrate"); Q_CHECK_PTR(m_page); setCaption(i18n("Substrate")); setMainWidget(m_page); resize(m_page -> size()); - connect(this, SIGNAL(okClicked()), - this, SLOT(okClicked())); + connect(this, TQT_SIGNAL(okClicked()), + this, TQT_SLOT(okClicked())); } DlgSubstrate::~DlgSubstrate() @@ -44,7 +44,7 @@ DlgSubstrate::~DlgSubstrate() delete m_page; } -void DlgSubstrate::setPixmap(QPixmap pix) +void DlgSubstrate::setPixmap(TQPixmap pix) { m_previewPix = pix; m_previewPix.detach(); diff --git a/krita/plugins/viewplugins/substrate/dlg_substrate.h b/krita/plugins/viewplugins/substrate/dlg_substrate.h index 0a566b11..869eaafa 100644 --- a/krita/plugins/viewplugins/substrate/dlg_substrate.h +++ b/krita/plugins/viewplugins/substrate/dlg_substrate.h @@ -20,7 +20,7 @@ #ifndef DLG_SUBSTRATE #define DLG_SUBSTRATE -#include <qpixmap.h> +#include <tqpixmap.h> #include <kdialogbase.h> @@ -36,17 +36,18 @@ class DlgSubstrate: public KDialogBase { typedef KDialogBase super; Q_OBJECT + TQ_OBJECT public: - DlgSubstrate(QWidget * parent = 0, + DlgSubstrate(TQWidget * tqparent = 0, const char* name = 0); ~DlgSubstrate(); /** * Set the initial preview pixmap */ - void setPixmap(QPixmap pix); + void setPixmap(TQPixmap pix); private slots: @@ -55,7 +56,7 @@ private slots: private: WdgSubstrate * m_page; - QPixmap m_previewPix; + TQPixmap m_previewPix; }; #endif // DLG_SUBSTRATE diff --git a/krita/plugins/viewplugins/substrate/kis_repeating_substrate.h b/krita/plugins/viewplugins/substrate/kis_repeating_substrate.h index 9dc512d1..1a229dc1 100644 --- a/krita/plugins/viewplugins/substrate/kis_repeating_substrate.h +++ b/krita/plugins/viewplugins/substrate/kis_repeating_substrate.h @@ -18,7 +18,7 @@ #ifndef KIS_SUBSTRATE_H #define KIS_SUBSTRATE_H -#include <qrect.h> +#include <tqrect.h> #include <ksharedptr.h> class KisImage; @@ -55,7 +55,7 @@ public: * Copy the pixel values in the specified rect into an array of Substrate. * Make sure the array is big enough! */ - virtual void getPixels(KisSubstratePixel * /*substrate*/, const QRect & /*rc*/) = 0; + virtual void getPixels(KisSubstratePixel * /*substrate*/, const TQRect & /*rc*/) = 0; /** * Return a pointer to the substrate at the specified position. Note that diff --git a/krita/plugins/viewplugins/substrate/substrate.cc b/krita/plugins/viewplugins/substrate/substrate.cc index aac9ef94..996516e1 100644 --- a/krita/plugins/viewplugins/substrate/substrate.cc +++ b/krita/plugins/viewplugins/substrate/substrate.cc @@ -19,8 +19,8 @@ #include <stdlib.h> -#include <qslider.h> -#include <qpoint.h> +#include <tqslider.h> +#include <tqpoint.h> #include <klocale.h> #include <kiconloader.h> @@ -44,18 +44,18 @@ typedef KGenericFactory<SubstratePlugin> SubstrateFactory; K_EXPORT_COMPONENT_FACTORY( kritasubstrate, SubstrateFactory( "krita" ) ) -SubstratePlugin::SubstratePlugin(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +SubstratePlugin::SubstratePlugin(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { - if ( parent->inherits("KisView") ) + if ( tqparent->inherits("KisView") ) { setInstance(SubstrateFactory::instance()); setXMLFile(locate("data","kritaplugins/substrate.rc"), true); - (void) new KAction(i18n("&Substrate..."), 0, 0, this, SLOT(slotSubstrateActivated()), actionCollection(), "substrate"); + (void) new KAction(i18n("&Substrate..."), 0, 0, this, TQT_SLOT(slotSubstrateActivated()), actionCollection(), "substrate"); - m_view = (KisView*) parent; + m_view = (KisView*) tqparent; } } @@ -67,7 +67,7 @@ void SubstratePlugin::slotSubstrateActivated() { DlgSubstrate * dlgSubstrate = new DlgSubstrate(m_view, "Substrate"); Q_CHECK_PTR(dlgSubstrate); - if (dlgSubstrate -> exec() == QDialog::Accepted) { + if (dlgSubstrate -> exec() == TQDialog::Accepted) { // Retrieve changes made by dialog // Apply changes to layer (selection) } diff --git a/krita/plugins/viewplugins/substrate/substrate.h b/krita/plugins/viewplugins/substrate/substrate.h index ebb9e48e..2d00e234 100644 --- a/krita/plugins/viewplugins/substrate/substrate.h +++ b/krita/plugins/viewplugins/substrate/substrate.h @@ -28,8 +28,9 @@ class KisView; class SubstratePlugin : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - SubstratePlugin(QObject *parent, const char *name, const QStringList &); + SubstratePlugin(TQObject *tqparent, const char *name, const TQStringList &); virtual ~SubstratePlugin(); private slots: diff --git a/krita/plugins/viewplugins/substrate/wdgsubstrate.ui b/krita/plugins/viewplugins/substrate/wdgsubstrate.ui index 846b43a7..be0713ed 100644 --- a/krita/plugins/viewplugins/substrate/wdgsubstrate.ui +++ b/krita/plugins/viewplugins/substrate/wdgsubstrate.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>WdgSubstrate</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup" row="0" column="0"> + <widget class="TQButtonGroup" row="0" column="0"> <property name="name"> <cstring>grpCustom</cstring> </property> @@ -27,15 +27,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox" row="0" column="1" rowspan="1" colspan="2"> + <widget class="TQComboBox" row="0" column="1" rowspan="1" colspan="2"> <item> <property name="text"> <string>Custom</string> @@ -53,7 +53,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -61,7 +61,7 @@ <string>Save custom substrate as:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblPredefined</cstring> </property> @@ -72,7 +72,7 @@ <cstring>cmbPredefinedCanvases</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>lblColor</cstring> </property> @@ -83,22 +83,22 @@ <cstring>bnBackground</cstring> </property> </widget> - <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="1" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>lineEdit1</cstring> </property> </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSlider" row="3" column="1"> + <widget class="TQSlider" row="3" column="1"> <property name="name"> <cstring>slAbsorbency</cstring> </property> @@ -106,7 +106,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QSlider" row="2" column="1"> + <widget class="TQSlider" row="2" column="1"> <property name="name"> <cstring>slFiber</cstring> </property> @@ -114,7 +114,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>textLabel9</cstring> </property> @@ -122,7 +122,7 @@ <string>Grainy</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblSmoothness</cstring> </property> @@ -133,7 +133,7 @@ <cstring>slSlippery</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>lblAbsorbency</cstring> </property> @@ -144,7 +144,7 @@ <cstring>slAbsorbency</cstring> </property> </widget> - <widget class="QSlider" row="0" column="1"> + <widget class="TQSlider" row="0" column="1"> <property name="name"> <cstring>slSlippery</cstring> </property> @@ -152,7 +152,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblHeight</cstring> </property> @@ -163,7 +163,7 @@ <cstring>slHeight</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lblFiber</cstring> </property> @@ -174,7 +174,7 @@ <cstring>slFiber</cstring> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>lblRough</cstring> </property> @@ -182,7 +182,7 @@ <string>Rough</string> </property> </widget> - <widget class="QSlider" row="1" column="1"> + <widget class="TQSlider" row="1" column="1"> <property name="name"> <cstring>slHeight</cstring> </property> @@ -190,7 +190,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel" row="3" column="2"> + <widget class="TQLabel" row="3" column="2"> <property name="name"> <cstring>textLabel11</cstring> </property> @@ -198,7 +198,7 @@ <string>Absorbent</string> </property> </widget> - <widget class="QLabel" row="2" column="2"> + <widget class="TQLabel" row="2" column="2"> <property name="name"> <cstring>textLabel10</cstring> </property> @@ -214,7 +214,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> </includehints> diff --git a/krita/plugins/viewplugins/variations/dlg_variations.cc b/krita/plugins/viewplugins/variations/dlg_variations.cc index 7d81b078..c4c27275 100644 --- a/krita/plugins/viewplugins/variations/dlg_variations.cc +++ b/krita/plugins/viewplugins/variations/dlg_variations.cc @@ -24,19 +24,19 @@ #include "wdg_variations.h" -DlgVariations::DlgVariations( QWidget * parent, +DlgVariations::DlgVariations( TQWidget * tqparent, const char * name) - : super (parent, name, true, i18n("Color Range"), Ok | Cancel, Ok) + : super (tqparent, name, true, i18n("Color Range"), Ok | Cancel, Ok) { - m_previewPix = QPixmap(); + m_previewPix = TQPixmap(); m_page = new WdgVariations(this, "variations"); Q_CHECK_PTR(m_page); setCaption(i18n("Variations")); setMainWidget(m_page); resize(m_page -> size()); - connect(this, SIGNAL(okClicked()), - this, SLOT(okClicked())); + connect(this, TQT_SIGNAL(okClicked()), + this, TQT_SLOT(okClicked())); } DlgVariations::~DlgVariations() @@ -44,7 +44,7 @@ DlgVariations::~DlgVariations() delete m_page; } -void DlgVariations::setPixmap(QPixmap pix) +void DlgVariations::setPixmap(TQPixmap pix) { m_previewPix = pix; m_previewPix.detach(); diff --git a/krita/plugins/viewplugins/variations/dlg_variations.h b/krita/plugins/viewplugins/variations/dlg_variations.h index 48538687..b3844dfd 100644 --- a/krita/plugins/viewplugins/variations/dlg_variations.h +++ b/krita/plugins/viewplugins/variations/dlg_variations.h @@ -20,7 +20,7 @@ #ifndef DLG_VARIATIONS #define DLG_VARIATIONS -#include <qpixmap.h> +#include <tqpixmap.h> #include <kdialogbase.h> @@ -36,17 +36,18 @@ class DlgVariations: public KDialogBase { typedef KDialogBase super; Q_OBJECT + TQ_OBJECT public: - DlgVariations(QWidget * parent = 0, + DlgVariations(TQWidget * tqparent = 0, const char* name = 0); ~DlgVariations(); /** * Set the initial preview pixmap */ - void setPixmap(QPixmap pix); + void setPixmap(TQPixmap pix); private slots: @@ -55,7 +56,7 @@ private slots: private: WdgVariations * m_page; - QPixmap m_previewPix; + TQPixmap m_previewPix; }; #endif // DLG_VARIATIONS diff --git a/krita/plugins/viewplugins/variations/variations.cc b/krita/plugins/viewplugins/variations/variations.cc index eef4d6e5..6f9fbf6f 100644 --- a/krita/plugins/viewplugins/variations/variations.cc +++ b/krita/plugins/viewplugins/variations/variations.cc @@ -23,8 +23,8 @@ #include <stdlib.h> -#include <qslider.h> -#include <qpoint.h> +#include <tqslider.h> +#include <tqpoint.h> #include <klocale.h> #include <kiconloader.h> @@ -48,18 +48,18 @@ typedef KGenericFactory<Variations> VariationsFactory; K_EXPORT_COMPONENT_FACTORY( kritavariations, VariationsFactory( "krita" ) ) -Variations::Variations(QObject *parent, const char *name, const QStringList &) - : KParts::Plugin(parent, name) +Variations::Variations(TQObject *tqparent, const char *name, const TQStringList &) + : KParts::Plugin(tqparent, name) { - if ( parent->inherits("KisView") ) + if ( tqparent->inherits("KisView") ) { setInstance(VariationsFactory::instance()); setXMLFile(locate("data","kritaplugins/variations.rc"), true); - (void) new KAction(i18n("&Variations..."), 0, 0, this, SLOT(slotVariationsActivated()), actionCollection(), "variations"); + (void) new KAction(i18n("&Variations..."), 0, 0, this, TQT_SLOT(slotVariationsActivated()), actionCollection(), "variations"); - m_view = (KisView*) parent; + m_view = (KisView*) tqparent; } } @@ -71,13 +71,13 @@ void Variations::slotVariationsActivated() { DlgVariations * dlgVariations = new DlgVariations(m_view, "Variations"); Q_CHECK_PTR(dlgVariations); - // Render layer to a QIMage -- keep in mind possibility of selection + // Render layer to a TQIMage -- keep in mind possibility of selection - // Scale QImage + // Scale TQImage - // Set original QImage in dialog + // Set original TQImage in dialog - if (dlgVariations -> exec() == QDialog::Accepted) { + if (dlgVariations -> exec() == TQDialog::Accepted) { // Retrieve changes made by dialog // Apply changes to layer (selection) } diff --git a/krita/plugins/viewplugins/variations/variations.h b/krita/plugins/viewplugins/variations/variations.h index 7aa40daf..d5ddc684 100644 --- a/krita/plugins/viewplugins/variations/variations.h +++ b/krita/plugins/viewplugins/variations/variations.h @@ -28,8 +28,9 @@ class KisView; class Variations : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - Variations(QObject *parent, const char *name, const QStringList &); + Variations(TQObject *tqparent, const char *name, const TQStringList &); virtual ~Variations(); private slots: diff --git a/krita/plugins/viewplugins/variations/wdg_variations.ui b/krita/plugins/viewplugins/variations/wdg_variations.ui index e6d8336d..191b84bb 100644 --- a/krita/plugins/viewplugins/variations/wdg_variations.ui +++ b/krita/plugins/viewplugins/variations/wdg_variations.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>WdgVariations</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WdgVariations</cstring> </property> @@ -23,7 +23,7 @@ <property name="caption"> <string>Variations</string> </property> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>framePreview</cstring> </property> @@ -52,7 +52,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblOriginal</cstring> </property> @@ -64,13 +64,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>150</height> @@ -83,7 +83,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>lblCurrentPick</cstring> </property> @@ -95,13 +95,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>150</height> @@ -114,31 +114,31 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>textLabel4</cstring> </property> <property name="text"> <string>Current Pick</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> <property name="text"> <string>Original</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>grpOptions</cstring> </property> @@ -157,7 +157,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>radioShadows</cstring> </property> @@ -165,7 +165,7 @@ <string>&Shadows</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>radioMidtones</cstring> </property> @@ -176,7 +176,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>radioHighlights</cstring> </property> @@ -184,7 +184,7 @@ <string>&Highlights</string> </property> </widget> - <widget class="QRadioButton" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>radioSaturation</cstring> </property> @@ -192,7 +192,7 @@ <string>&Saturation</string> </property> </widget> - <widget class="QCheckBox" row="6" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="6" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>chkClipping</cstring> </property> @@ -200,7 +200,7 @@ <string>Show &clipping</string> </property> </widget> - <widget class="QSlider" row="5" column="0" rowspan="1" colspan="2"> + <widget class="TQSlider" row="5" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>slider1</cstring> </property> @@ -208,7 +208,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>lblFine</cstring> </property> @@ -216,7 +216,7 @@ <string>Fine</string> </property> </widget> - <widget class="QLabel" row="4" column="1"> + <widget class="TQLabel" row="4" column="1"> <property name="name"> <cstring>lblCoars</cstring> </property> @@ -226,9 +226,9 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <property name="geometry"> <rect> @@ -242,7 +242,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>bnLoad</cstring> </property> @@ -250,7 +250,7 @@ <string>&Load...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>bnSave</cstring> </property> @@ -268,14 +268,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>187</height> </size> </property> </spacer> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frameLight</cstring> </property> @@ -287,7 +287,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>556</height> @@ -310,7 +310,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblLighter</cstring> </property> @@ -322,13 +322,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>150</height> @@ -341,18 +341,18 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel12</cstring> </property> <property name="text"> <string>Lighter</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lblCurrentPick3</cstring> </property> @@ -364,13 +364,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>150</height> @@ -383,18 +383,18 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel13</cstring> </property> <property name="text"> <string>Current Pick</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>lblDarker</cstring> </property> @@ -406,13 +406,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>150</height> @@ -425,14 +425,14 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel14</cstring> </property> <property name="text"> <string>Darker</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -440,7 +440,7 @@ </widget> </vbox> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frameColor</cstring> </property> @@ -460,13 +460,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>540</width> <height>556</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>540</width> <height>556</height> @@ -485,7 +485,7 @@ <property name="frameShadow"> <enum>Plain</enum> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblMoreCyan</cstring> </property> @@ -497,13 +497,13 @@ <height>150</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>150</height> @@ -516,7 +516,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel9</cstring> </property> @@ -531,11 +531,11 @@ <property name="text"> <string>More Red</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel7</cstring> </property> @@ -550,11 +550,11 @@ <property name="text"> <string>More Cyan</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblMoreBlue</cstring> </property> @@ -574,13 +574,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>150</height> @@ -593,7 +593,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -608,11 +608,11 @@ <property name="text"> <string>More Green</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblMoreRed</cstring> </property> @@ -632,13 +632,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>150</height> @@ -651,7 +651,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblMoreYellow</cstring> </property> @@ -671,13 +671,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>150</height> @@ -690,7 +690,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblMoreMagenta</cstring> </property> @@ -710,13 +710,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>150</height> @@ -729,7 +729,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel8</cstring> </property> @@ -744,11 +744,11 @@ <property name="text"> <string>Current Pick</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -763,11 +763,11 @@ <property name="text"> <string>More Yellow</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblCurrentPick2</cstring> </property> @@ -787,13 +787,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>150</height> @@ -809,7 +809,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>lblMoreGreen</cstring> </property> @@ -829,13 +829,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>150</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>150</width> <height>150</height> @@ -848,7 +848,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel11</cstring> </property> @@ -863,11 +863,11 @@ <property name="text"> <string>More Magenta</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel10</cstring> </property> @@ -882,7 +882,7 @@ <property name="text"> <string>More Blue</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -893,5 +893,5 @@ <data format="XPM.GZ" length="55092">789cccbd47b7eb38b2ef397f9fa2d6e5ecae5e7cf266d0035266cb6da7ed77af1ed07b2f1aa9bf7c83883f704c56d5cd7c75bb5f95d6c9ca5f8a22114044202200f0fccffffcdbe7d3fddffef37ffe8fea625c02eb6f966f947ffb4fbb4e92ebfff57fff9fffcffff88fe160f0b7fecf68389bfe6df41fffc7fff80febf96fd6df9401ff5fcff64232ffde36244f7a762ac953fefd56f29cf35cf2a267f3072ff9f733c906e7836493f35eb2c59fd74ab6797b1f243bfcfb46b2cb7fef0a1e72799c5af2907f7f94cce5732cc963fefd483297cf3a8387d43f992999ffde0c25f3dfb79a64de5f662099dfcfe924cf386f24f3fe4a44ff0fd17e5b327f9e772799dfcfb8078fa87d662499cbebbb9249de6fc9bcbd9d2f99dab795ccc7b31a48e6e3b71a4ae6e315ed25f3f1b04f82a93f0dc1636a9ff32999daf32599f757a54ae6fde17e48e6fae23892b97e78a2bd63ea1f438cef849e97e892f9f7652b99b76f3d91cce53763f0947e6f08fd9c1137b664de5e43c83fc7f53bf0022cf475499c8be719c4f113d824de5cc01671fd0eb6895dbaff50d8ab174ae6f2ad3ac9a47f63c924df4832d73f732a99f777f324998fb73993ccfb5f7f96ccc7df3a49e6e3514592b9bd3aa664ae1fd6bd646eaf9a2b98f4ddf52573fdb58e60d89f6d49e6df9b13c97c3c1d45326fbf634826ffb2934cfee40086fdf88164de7ff65232d9eb9b646e1fa607867e9bbe641a8f816092cf14f2423f4d070c7d8b9f25f3e7bbaf60e89fb791ccfb3b15df43ffe22f30f42f13f240ffea1b18fab716bf877ee967b043dc92bf1f0ea16fdd9af3a8f740bc3dbe64f2f70bc9bcbfcd2fc9bcbfbd4432f90b4730f5cff55e3297bfc9c0187f732899f4772099c6e35b321f7f6b0fc6f8daa6649aff7692f9f3724d32d7f7cb4932ef6ffb4e32e9b302c6f86723c9dcdefc50326f9ff32e99f7975382a10fd75c32d7e795906742fdd3bd49e6df67a2bdd09ff20886beb89164fefcd54932ef9ffa2c98fca72bda0b7d6a9f25f3feb0c4f842bf9a07b0d02fd13fd0afe2090cffd6c660e85b24ae87be05a40f63e1df8277c9bc7debab643e5e575732efef6e2799cb1bfcf89ecbdbed2573fd5cfd781e1fcf952d98fa3b91cf277f74cd24f3fe0f3ec08807ba8d64ae9fc54232e98f27993faff9f13df787ae680ff4d57995cce57103c95c7fac3bc97c7c7c5f308d67b8028bf9f72299cbd3dc49e6f2981f92797fd69664de5f7e2499dbb33b92ccdb6f2dc1d067772099fca72e99b7ff6a49a6f946f437f4b9bd48267934b0d0ef77c9bc7dad68df9cee9fee25f3fe69447fcc31df88f1843eaf6e92f9f3da89649a0fee25f3f1cb85be41ff0331bed07f5f8ca7f0a7d43f13a1df9d2a99f777f32899dfffea80111faeae92b93cee41f090f7effa0c463ce77f48a6f9ee51321fafeb4930f547bb01433fecb164fe7cff5b321f2f2f92ccfb3f93d793bd745b30f421ae2593bfd94be6fd1b2692b93cde4e32b79fda164ced8ddec1d017e74332f9dbb564de5e772899e299140c7dcaa692b93db8df92797fe61d18fe3117e303fd59b792e979b164de3f8918ff05f5cf46f40ff4c715e301fdb9bd80e13f57f792797fad4a30fce906bf17f3f51ae331c4fc19a13d43f89780e693a9f0a7ed028cebfd4e321fafe6198c7cc00b2473f9bc77c95cdf4a4ff0908fc75a5c8f78bfb52553fcf02999ebbfdf08a6f10e5ec1c2bfdc49a6f97c2b99e6ff27c9642f3fbee7fab416f2407fc299643efe912f99ec692099cbd3b492b9bc9ab8ff94c63711fd0bfdb2a792c93e2ac9140f689229df5125f3feed5660e85ffd2a99fce34432efdfee00867e5e14c9941f8ec0d0bfcc904cf9572a99b7a76e25f3fe73c760a1afaa646ebf99e85fe86f2ec61bfaea0b79e11f0ba12f2eda8bfb4b7d267b98897c64dd81a1cfeb503297afbd934cf1d45e30fc93f81ef363b896ccefbf3a4a26793dc1149fae7d30f247ff2a99ea1d3fbee7fed68b05a31eb1924cf9c2083ca5f6076bc9542fd948e6fa900e2473fdbbbc09463d630246be1a6692f9f84481643edef95532b73f5df01cfd7993ccdb7be92453beb5924cf3c14432efbf5cfc7e01fffa2999e6bfb1646e5f9b022ce2cba364de3e37114cfec132c0d047f74d32f9e37b30f26b2f05431f5763c9bc7f42c1d04797e6cf99d0c71be41fc21fa52a18fe24207d9f0bfd5a1d04d3f8570fe009d573dca3642e7fbb054f697ca237c1246f3a944cf53a5b32c5a72f60f81bd796ccaf4f2bc994af2d2593be6f2453bea682e7345eed4e32d5ff14c9bcbf2f57c95cff7dd15ef8a35097ccdb93cd25537e2bfa6b3124fffd055ec2bfcc24537c548045fe518331decda7647ebd2eda6ba37fc478c01f6d44ffb8d43e1ded17e3af3960cc97f5022cf481e257a6dd149fd96bf08cc6ffe64aa6f92604c35eec4032b7efab2799e2375b30e94b2aae5f50ff58aa642e6fe148a67ce1065e927fb80d2553bd2494cc9fdf3e49a6fc45c863c07e1dc97cfcd3a3606a5f7d05633e887682497faf4bb08df8e2030cfb2bc9de17a2ff4bf49f886762f4cf10f666bd80618f3e8dff92f5177f5e914be6ed2f36e005c91b5f24533cf22598ecafeec04be467ae64f28757b041bfaf5f040f29fe68c0268d9726da63917e14a2bdd0c7f424998f5f44fdb314fd91bf83a18f8105467fdc4660e86783e789fee94a30e215e3118c78a3a0f9dc60fd45fa34072f491fc329d8a0f685a964aae7dfc0265d5f2f05537f568f60d86bb091ccfbe36248e6fad988dfbba85f8e24533e48f66f88fe892b30fa67634ba6f97508467f6d1cb0a827435ed11f35fa6388f9c9a7f8c814f157fd065e92fe5f6e6083e42f5cb0897ac417d8227dca3fc036f55fb305431fba77c1747f3b02bba4df3ad9ab29e42f669229df46fb647fe460d8d3aa0243fecd2758d4bbefc0a21eb403a33f2a8a772c263f6fff35055ba827d1f85aa2bf2f1a58f4f70a8cfb252a18febdf1c0f02701f58f2dda7f5d48a6fe9b8071fff21d2cfc83603caf51c1b87fb106433f4b1a1f87fd17eebf1b17ec903efbd43e46b0f71a0c79cb2d58c4e72d18cf2f1bb078be0dc6f3339abf5cd11f8906c6f5de1a8cf846e3f6c1cbe724df068cf6548964ae3f1b130c7f9096608c7f7603a3bde90e8ce7bb2f60b4d77e00c39f075c9f98f639e47fa34832d7e7f84c2c9eb7ba80216ffb08c6f3cc042cd64f1a30e42f9760d88fe382d19e1ced19c11e42aebf0cf17cd306435ecb04a33d610e16f20b16f1470a16ed3981457cf9443c82bdae2660e19f79bc341c8be7d70e18cfd71ec022df8ac178feaa05e379d72bf108e3df70ff369cc8fe1d8345bc9c81d1fe60452cfaeb7a03c3be74ba7e2adbd382f1fbcb3b18e3910dc1689f4df24e657fd4603cafb2c168bffb0cc6f32b1ebf0c67e2fe01e9d34cdcef1283e12faa6f30ee67f860e1ffe660a1efdc7f0ee7e2fed58c58b6e70cc6ef8d002cd6173db0a83f2dc0d0b78edbf77021e5bd078bf6aec1f87d41fabd14f2155bb0f8fd108cdfeb2330da93de83f1fc8ac6d310f2ac1a309ed772ff3734c5fdb48d64ee0fb72e58d4e75ec0f87d7202a33f0d713df4a5237bb7e4782a60b11ee681d15eed112cee1782a1cf158f4f86b6b8bf6581c5fa2af5a733823f762d30eed7d2efdd11f2efcd1d18d76bdc5e468311f2a3c007e379f5082cea75f760e8fbfa8d782cf49dfba3d150fcbebc030b7bdc83a17f099faf472371ffe64c2ceed73460e883cefb6b3416f7ab4fc463e10f2c30e46b8927e279b94b2cee6f6cc1d087ec092cec4930c6f342f24f85fc46442caef75660e8cf85fb93d18cfd9ec783f1162ceaa37cfe19cdc5fd3ceabfb990d79d80d13eeb152cd64fe9fa85f8de7c05a33df9188cf66cbec0d0c7f50d0c7df3b8ff1f2d85bcce002ce227078ceb1d0f2cfca54e3c41fb6f74bd21ef5780f17c5d058bf53beeaf46e618ebd77a2299c77f5bba9f25c6b7f4c1c2bfbd80d19eeb07f104fda1933cb678de2603e37eba01c6ef6f57b0a8ff71ff3d72c6a8b7e8d47faee88fb507c6effd188cdf3bdc1ec67d38c739e2e3c5a63393e21723269e60fde4f22c99d677b93e307577285eb7b8fd8f27ecfe9cf50e0c7d8a79ff8ca7ec7bfefb6b412cc627db81c57e823730ead9eb1158d43fb8bce399b8fe7a0716eb5d7330c663c3fb733c67eda1fa484d2cc6c39a83a11fed193ca57a651282b13e16f3f96ebc9860bdc8d880c5fe810c2cf21bae8fe3e544d4cb23c93c5ed30a30ea071b170cff92d0f81813d443d71730eaed9a07c6f53eb7b7b1c9bee7fa117c49a6f5024b30c5b3760cb6b19ec9e3adb13331e8face93ccfbaf3883f13c23013ba8a72e05d3fd0d1b8c7c734df23b53d8df86facf9da03e7e1b80f1fc82f7e76430813e6d63e229fa3be5e333194e4cd40b52b04ded31b8fe4e4653110ff2fa0a73a736f28d9a788afd67fa180cfd6a1db0588fe3fe7f32610accfb77c3f59721f2c77c493cc5fe0aaf00e37eb731788afa4e059ed1f8361f60d48f6dde1f93d914ebc7460a46bd2fe4fd37994fc7940f6cbec1e89f98cf5f93a578def5013c433d86da6f4c51bf09b9bd4dcce982f2b39cebcbc49a22fff6b83e4dec29ea15d95932adb704c433acffebf43c776ad1fd039d7886f5d315bf3f5356f09acf77d3d1d4a5fa65734f3cc3fe035d134cf7372c30ec355b824dc413dc3fb0e9906574dcdf79c4e2f74501c6fa5b74104cdfb73c3e9d4ea6d6887f7fdb10b3e791bef1f9940ddf1ceb078fe005f5b7c5e7e3e96c86f58f8d0246fd3a76c1f311f9b377b043e31bf07c693a9fa1de19df816dec07f804bb584fa3fe5accc47a86069e517b82002cd6f775b043f39bc6e3dde9923d8eeb7332035bd47f3705ec60ff824d3cc7fecf84ebefd498c19e2faf609bfa2be6f9f0d49c2d51cff5c016e5fb2b176c8f78fb8b15d8a5fa99c9e7d7a93543fdab1b831dfafde6287844f5d10e8cf1af49bfac39c63bff024f499e98ee6fb3fb937f7d023bd4fed407bb435aafb124d37e2d5d30b53f03cf87d43eeb0d8cf5dd7803c67cb7e1f63d75587f707df1e9fece7c30a2fd5d7b30f6b3469f9269fdc792cce5594dc1587fba52ffb84c1edebecd5e326f7f41faebceb19f2cda8271bfa6133ca2e727e0118d4fb2164cfa9c2892f978af4c30eca1f1c19321d7bf2bff7e3660e34ff5e53bb043cfaf5dc174bf6c0076a97fdb929805acfcfb6d0446bdbee4ed9f0d857eddd660f89b6e2298da5f05c4ac3f687e6bc0c311ad87e07a263f9f0fda77f094da537f8067245fc5f569369a1963d29f2b31eb5fdabfe20ba6e7a777e0d188ff3eb9815906c29fa78227d04f053ca3f6b65c3f6663260fd553a93d2cfca4fec91bc95cfeea041e517f5fb8fece2662fcdd023c86ff33c1d31167cd06cf21cf5c308d679d8017d41f0df72fb3e9cc1ef3ebab14ec8c69bfc05432ed47d38885fe5d4cc9b4fe37028fc8fecb37c9649f25784cf6ebbf82e7f47dbc042fe87e05f5cf4ce8936b82e7f4fb36113ca6f17a002fe8f986b8de80fe8bef4dd28fc292cce52fa68269fc4d1effb0db2f49decd0c0c7fdc92fe2ce6131a3f6d2d98fcb7bf02cf49bf370330d68fea5a30fdde38831dfabea3fe59b2fea178b0009bd41e4f03db23aeff37713decb5f00593fc2df5a7c1ee47eb6f2330eadd17156c8ea87ff7609bfc45590b267f78d5c02e714bfa6ab2f1207ff80136c87ef22918f34dfe06c67cd186c48b018dafcee3cd99c5ee47faa48217647f99609bf4c7a0f1b2160392afa3f6da6cfc68bcd69279ff949f6093daef4ec1f067f5817831a4e76de8f70ebb9ece177c806d6abfb3235ec0dfba2bc9b4df9bc6d7ed1376ae5f5c3fe703263f6f4f520a1e53fc99102f66d4be8cf7cf7cc8e4e3d7673e784c7cdd82a7d4de5a03c3fe751e9f3265c2fca09be009d94fc2e397394b87c99f186bf08cfa4fe3fd3b9fb0e7717dacc792e97c0b8f5f58f8bb20d6793d613e5f2cc7b49fc5005bd49e35b56fb1c4fcecf1fe9e2fd9f7743dfdde582ca83f8267b049ed59f3f9686eb2eb69fd782699d62fa83de67244f67de1fa3eb79643b237ef2698f4ab9e8347d4feb0008fc99e1c6a8fbd70d05f4762261e6f9f46e3e730a6f3160618fdbbe6f9c6dc5d0ea8bd0df5bf6b88f89aebdfa25f00a5f8ff4e32edd749c0636aff66019ee17939780e7de2f92a73f643e8bb031e537b7c133c237bf5dec073ba7f44f71f1a225ea3e78f447f79dfe011ddcfe3f22dc68c29feff06e379ba0e9ed2ef0b1effb1747d44f3b1fd0d5ed2f78d0236c65cdf367c7e5fb0009858bf07cfd15f7bf082f4a3492473f96f19d8257b6df8f82e66cb05f55fbe223630ff6f797cbc98b3f67079527afe82319d17e1f6b7581a03fafdc693ccc7d7a0fb194b97da7bbb111b63f2af1bae9f0bd31810eb7cbd61612d1dd2bf94da671943c8cfe7af856d8c69be6e0563be594f2573fdd7b8bd2c1c763ded0f53c01392c7bb4ae6fdd3717d5db8c684fa4bbb134cdfa767f094e28180fba3e5c080fff15fc0b309f5ef9764d24ff13dfc43cae7a3e5d0807d6cf8782d47acbdfcfeed0b783ea1fad50ebca0ef6f3ed82079a32f30f2c5644f6c627f5acce7df655fd0e1e3930460a662dc3f1cc14beaaf40133ca178a8069bf47cdf90ccc74ff3c10e8de78dfa676c8afd09b564daff5982b1ff36a6f64c58ffd2fed40b7836a1fac504bc9c50fd6101c6fc97abc426e2b3700fc67911f3018cf33ac99d643e1edd198cf3176e07463da4fa0063bf8826be47bd53e7fe773965e345fded806db217eb1d8c78f29612b3f6923ea9603cbffb0663bf4949d7b38083c663b3022f68fceb7bb043f6118682a9ff8c02ec92bfcbe9fe7dba49f5c30d18fb636c9e2f2ce7ecf7144f2a6097e4bbe5c4ecf7140fcdc0b0b734018bfde03a784af3c53504cfb15f47dc0ffb0bbb8160ecbffc002fa95e58edc1d8bf1a4dc1163d2f36c1a8575495609c5f1a4aa6f3a134febd83e2ed2f376093faafa3e72fcc01f1f50b3c217ddd5660ac37ad63f00cfe5407cf69beef5230ea35c6026c60bfe55532e55b39d8a4eb6f73b0d8df20ee6f637fe04a32cdff03b043fd757b904cf9d9168c7ae7ed2299ce7b3692697fc898d8c2f99ddb128cf3b317f49f85fa6348f75f1a06d9afb604c37ff817b04dfa1c0ec10ee9bb4ef22ecd015d7fdd8047345eb5079e907e598e60d2d7b40363ffe3762598e2d5750e16e703d692297ffc128cf35768af897afb36108cfaee5c32d56b0f9269fe2e24f3f61731d880ff5125d37ed80558ac974c25d37ec09d64de7fe64132f73fea27d8a2f15732c9b4bea008a6f655a23fb1dfb28c24d3fe470d8c7ae1ed5132e95b2099cf8fa6e82fd4e3c32fc9b4bee3125b38ef7723ff641816d99b7d03dbe48fc22bd8a1f9f95a825d9adf4af28706eb1ede5eaf060fe97aaf133ca1fc5605237e6d8ee009e5bbd5198cf58b4efc1efb6fb71730f67bae66e025c5df8a09c6fecae020998fafd248a6f3ba909fd93b6f4f71025bb0af52329ddf9849e6cf533fc036e993924ba6f96726993f2fcec00ef57ff12e99e2c34a32ed7f0cc1f017d5bb649aef7cc9bc3f22f13c97fa4fc3f859388f5a6d25f3f69443c1d86f3b06e37c4be54ae6edd354c9bc7dd791643aefdc4aa67acf2b18e7f134f13dced325a4ef26d3379affc95f9826e2cb952a99c6f7153ca57835fd0463ff691108267fb579028b78c2001b34dee14532bf7f62814df88b4832d52f2ab085f59d0118eba3752899ecff2699eae307c9b43fb405431f9454329d2fbb97ccdb938cc02ee95b2adaebd2f8b590dfc279e448974ce3f12998e67b4d30ce074713c934ff403e0be72d2dba9fc5e607defeca014fc85f5413f094e2313b954cfea0114cfe467901233fd41792a99e6a49a6f527c198afd71bc9549fb9822dea8fba944cf9502799dad782b17e6d7592c9be6782495fea42321fdff8c7f77cbcb477b043fa1deb9229ff4904e37cc697641a7f0decd27828aa647abfc45032ade7b982495f13b25fcbc2fb0c944032d9cb93606abf5949a6f314cf60bc4fc00a24f3f6b79960d29f5a914cf11dfa53d87bf82999d6df303e16ceb755a4cf369b3fc8ff7660ec3f57de04933ff0f760ac5f665bc114df2b67c1a44f57156c507f5f1cc9b49ff3198cfdc69bab60aac7ac4f601be7fd22c1781fc95132ddaf95ccdbabd492b93e794f60e883229e87fd9ef959326fbf3a964cf9e00318fe5d9d4be6fda192fed916ce83a92f92a93dbe64ca8fd11f229e4c6f92f9f3938164ca1f4f82b1fe994ae6df871f60acf79a6bc9bc7f62f49785f3b1b75230d95775914cf30bfacfc279b22df90f47c413a621995f9f7be011f99b6d2b98e2136d021e4f683d63059e4cb83e7ae2fa19dd4f3b83e734df943118f581f22099cba33c8397549f592dc026d69b8f9279fb6f9f60e453d6156c537f5a63c9644f8160aa47695330fc8dee0aa6e7c5b964f28791648a6fe692297e580aa6fa6628da8bf8c3bc974cf9642118fa38954cf58f89649acf1692e93c27e9936361ffbdd149e6df2b9e609c1f7d96ccf549ad24d37974e887d0676721998f8fba924cf1fa9364b247713df687754f92e9fc672399ea45a23d581f35af92f9f7b9f81eef13885ac1181f4b32d5dfa10f16f6a3044bc974dee9158cfd3f892399fcbb2d993fff26fa6786fd3ba23f711ef146d7bbcc7e283f7b944ce7995ec0639aafab25784af671db0a9e52feb200cfc9fe320f2cec650f5e52beae7d49a6f319e2fe4bd457766083f453bf80b11fa878154cf6b2adc1585f37c4fde0af235530f251717fc45b9e90d7c17ca848a67add5530ad1f74a160aa8f76e279c8e7c34630f97f3b174cf2379a645abf247fe35a781f90ff2818f3c1443297571d49a67cfd4930cd87da1b58e8ff5630ece74b32cd1fa564aaef7982697dc87900633f73694ae6faa0be4aa6fd789a648aa724637fd25a32ed3f79924ceb3d3330f6f325ad64de1fd98364927f2598facbd42553fd3594ccafcf311e16cecbdf22c95c5e652a99de7f267e8ff3c9e1bb641a6f4732bf3efb008bfd812f92297eb32473794b31bec87fa30a2ccea3ee0493ff30f79269bfe23718f53e6b2099ea0377609c7f34be2453fc7b914cf91c1f2f63c0e6478a0fb6e019d58be207c1538aff8fe039e503712b99e6eb5c3297a750c04b1afff22618fb1922c1347fc73bc9b47f4630f2f9eda360b2efab2e98fcd1ea158cfd83452598f47f6b48e6cf8feec1a8b7a40bc1f05f3bc9bcffb61918f596f85d32d5e3447fbaa48ff94030f6ffdc24737bf267c416f6a7ac3f2453fe580bc67e99122cceeb9c24533d6b2299f4ad108cfce30773fd500cc9341f7792a9fe6b0ba6f5da6b2399ce372ec1d85f1d9d25f3efd59b60f89f3bc9bc3fd4a364f22f6f60ec97543792797fa8a960d8c74d32f9932918f61ed49269ff832d99e44d24f3f61a23c1d43f96fc1ef1fe1c8cf763448e645a3f16cfc3fe3d632899e2955832cdafd01f0be7d5ad4a32ad9f3792b9fcc64030ced3d792b93e9723c9b41feb02c6fe67732b99f68b7c4aa6faa3180f9c17f6499ffa032dc46bf098ec5d8f24d3fe08133ca1f530ed049e527eb7f50593ffb83c48a6fd570a7846f7d36b30e6fff25b32d5ab73c1145f28ef82299ed1e660d473b64f92a9def92698fcdd5a3cdf46fd24914cfbcd74c9b43e21e445fda611f7437cb1fe124cf65edcc02edd3f7225d3fb001e05d3fc5ebd108b7879bb93ccfbc72f05937e66a9605abf538e92493f56e021d99f6249a6fa5b2b98fc9f72914cedc3785a789f52f12698e42943c964ef17c9e40fe792697e1849e6f2648e60ac470660bc9f243b4aa6fd3fa1647ebda20826f9d24c32ef0ff55e32d5d7447f60fe2f9f25933f5a4aa6f8e62c18f9502299f40ffa61e1fd4b4a2899f6279492495ed19e29e297028cf795048d64dedef05530e29137c9e47fe4efb19f740cc6fed152134ced0f55c9fcfb488c17dedf74b9934cf64dfa3c326754ffab0cc1643f510ac67a78ba04633e77466083ecb309c026cdffa921998f476582b19fa7ba0aa6f93e5e0ba6fca6188051bf4b447bb1bf4aff00237ff60f92e9fd41f792e9bc7d2599e6f717c1d8cf247e8f7a5d160ba6fecf23c1b4bf21a0f86264e13c72f82499f2fd57c1f06727c954bfcec098df755b30d9ef7a2e98ecdf78974cf54cb447d47b3d5330e2cb0fc9b4df47dc0ffbd12ea9647a9fec1e2cde07f92e99f60b1c05239e3e4ba6f9df974cf9d74932ed9ffff17b2e5f70014f90ef288261df8664b25f5332bd6f0ae36be1fc4ef92499f22d4b3297ff593c0fefb7525dc9e4df3c30de5fa53a9229feb12553bc2ec66f46f2565f92c97f37609ca7b4df25d37e825a32adff89fba39eaafb92293fea24f3ebb7627cb13ebbfd944cfbadbf2453fe37154cf287a664d257d15e715e80fa6fcce673f2af117846f94076075e503d2188c1d88f9a9b82c91f2457c954cf38832df2279ba9647adfe70a8cfaecf62098e2ef6e2699ce27ed04533cb2d5c0d8efaa3c09a6fa46f12199ec5d3c0feba51dcd9f63517f5dbd0886bd3f4be6d76f7f30d59b62c164afde5432d5271f2453bdf0118c7abd77124ced4f1ac914afae2553bd5edc0ff3b9f32498ec6d1308a6f66c55c9341fdd83313f9ba23da8ef46a564dabf664aa6fd21f27b8a37e291643abfe249a6f9ce174cfb13a2028cf78b25b9647a1fd4a364f20fdf92c97f0c25d37a512599d607a03f22bf375ac994ffa49229ff78944cf94a2618fe48fe1ef59e4632bd3f270163becf2ac994bf8beb71fe4b0d2453bd27964cf552d13fa807da2f9269ff612499e627d13ed40f424330b55f13d763bfc6ed4332c50f37c1f0f78a64daff3d964cfb43c578637daf7a138cfd39429f719e6745fa30314df21f590ec6fedd32134cfbb10c5d30f98bcb8b64da2f3c01dbd87fbc174cf5c92001e37c4d25eee760fff1b7605a0fc8b792e9fc81b8bf43f149740263ff68fe2a989eb722fb9c8878201849a6f75f9e25d3f37cc974fee15532bdaf752898ecdd0904d37a475080512faf7e30e9432e18e7f56e82914f5482c91e0bf13ce4ff7e2698c627fb924cebcfe2f7d8ff1b3e80719eaa934cfaee3992491e717ff80f6f2699f22ff13dcecfa753c9e4bf0e92293f394aa6fd139660b2cfc8904cf9df4230e68b4a32add78bf1c0feda740ec6fbebcab3648a8f2792c95fd492299e1848a67ccd164cf25b2d58f887ab64f2379d64de3fea4132bd6f4efc7e8e7827944cfb7f1e2553bd4f134cfa6c799269ffb6781eea8df14432b57f2718ebe591645a2f8b05231f15bfc77e0f652699e229f13cbc7faa9a4ba6f361427fb03f5013fa8cf5e2c495ccbfd73dc924af180fec0fd33e24737922f17c9c6f6cc91ea626f69b5e13f082fccfe64d32d547bfc0385f565ec0886fba1cecd07a663394ccfb237b05633d627b144cf6779949a6f75fd682c93f06349f4dc5fa433d154cfaace982697d721b4aa6f3c11918f585742299fce5bd64aa67958229be5ac560ac27ac12c178bfd79b64da0ff1e37b7adf95fc3dcef70592a95ebb174cfe3a10cf47fda01c08c67e1b5f32bdcfb0134cfde12a92493ed17f585fc81f25d378dc49a6f8e253308d57249e3f417c7a904cfbcd7e30c5d382b11e982592797f24df82b1de954ba67aa6907f4af69baec138af6c8d24533d692f99ea733bc1e4ff3c0b2cde37be944cfe712499f2b1b964b2675732c52bd0670bfb45d54832e58fba64da0fb301e3fd8d4a2499d67f857ee0fc72f82d99be5f81713e3e194aa6fd49e27e588fb89ec1884fae13c9d4ffa27fb0bff0229e67537fae481f66e612fb2d776083ec3debc026eaa53618f18a3b0323fe580f04d3f5c98b64da7f63825df217852e99ce77907c33113f6c4dc134df6f1f24d37c9982b17ee04f05537b9a77c9148f88dfa3deb07a92ccfb7f73168cf365778229be48bf25537d19f28bf501e55e309d4fc94f92c97fcec158cf2b12c1e41fbb4fc9b43e3d104cf3f7f6158cf87ebb170cffe448267942c1e47fba05187f1f455049a6f5614330f4ff0d8cf3b88ab83fde3770d94ba6fafc12bca0f6a557c1c80f6dc9644fb964aa7f1492a99eb1934cf3f718bc44fd632199f2ab67c914bfd782518f16e389f78346a23dd8bfa58c25d379ba4030c95b5f2453fc5c824deacfec2299f6eb6c25d37ae74630e2b94632ad170bf9b13fb87b964cf514713df61bd4aa643a9f0f7bb31cecbf10fa28f6e3f89269bd83e2adb9399f52bd33032fa6fcfef9086cd07e8d95f81eeb1b97a964b2bf0dd8a2f958ff02dbb41fbbbb825d9a3f2eb5608a3fe28560caafb6141fcd45fdb11a83b11e180f05d37e5c5f114cfe669d8051ef6f3dc1a40fab108cf3d9e55a30ce3b1a60d4d78bab649a5fe5f7645f978364dededbb360f247452899ea616730d6e7d6779269fdfb4330f9bbd4148cf8e7058cf5b8e44932bdffe25e30f6835c24d3f9d1b964b27f713decdd16ed9b937fd2f792a99ed2082679a247b0380f33964cf3ab18af05c52f57d1df381f5baf2453bcff0046fcacfe60daaf6a4aa6f9ed4b30ce7fce25d3fedd1918f65f8af1c37e6d4f954cf9cf5a32c927fa17fbede254326faf22aec77c1bd582a9fd971d58ecef3524d3fe5ea1bfd84f97d1f82ec47a83be124cf5c8ca07dba4efbab8de9df2dffba44f0b51afeb5cc1747d32154cf61eecc043ccf74f9269ffd3098cf7495c1e25d3f9c14a30ad9f281f92693de2001ee3bcf34430e94f71114cfe259883f17ef6b52599de2f36144cfaa23c4aa6fafd188cfa79d60a267de832c1345f1786649a3f7e30cd97a2bdc86ff55232c54fb9648a6fc4f367e44fbaa1649a5f669269ffb7f87e4ef6915f2453beaf4ba6f9443c1feb655a2c99e47b944cfb532493ff6bef25d3f86ec1e2bc532318ef1712fa82f3cdc55e32b5ff1b0c7b5acd25d3df9fa04ba67ac25e32bd0f44b4cfc0f95ad13f787f759c08c6fb8f34c9141f6e2453fee80b46fe22fac7c2fbafef24933f17fa8efdf9590dc6fb8d4a8a079626ceb3d513b04bfa5a527cb664f645eb65067848f359fd8369bfec063cc27ae45532d5e31f25f3f15c3d83315f5d12c9544f740553fe1e6592a93f3dc158bfb88127145ffb9560b2873a96cce5d75f25537ce90ba6fa62f283a95e2ae49bd2f82b0f82c93ef385645a6f17ed453d39984aa6fac04c32fdfd5607c1a42ff14a30cdb7b74232e5a76f60e483fe5132cdafb960c4fb5f60c4aba52218ebaf7b30d69fb6e27b9c1f0ceec1d82f962b92c95f1d24537da7148cf93d05239f534f92e9bc8bb81fcefb1547c9544fabc1383fe68af1c67e92f807d3fe43213ff6af7662fcb19fdaa37cc410f5ebfc5e30cd1f6b07ecd2f85a347e06332faa8f1cc0d0efdb17784cf6e91a82499ff44ff004eb318f92693fdebd649adf5f05937efa67c1347fe91618e7bb6e7782112faa60ac8736a1601a8fac00a31ee98c05e37d155bc1347ff8aa647a1fc009bca0f1f21682c99f9ae2fe0b6acf360763fd62bb168cfcb0148cf7790879f1be9ad4954cf53cd17fd8bfe49f24533db1164cfdbd7d07e33cd346fc1efb17b789643a4f300423bf303760bcdfec42f669b27885ee47f38169e1bc977e124cf18d3706e3fd11fa163c22fdda9482a7b43e7805c3ff058660ba9f2b9e87f364d14632d5fb4792e9ef37fe02e33cd926028bf364efe039c9b712f747fdd9ad24d3f58231fee58b601affdb9b648a6f7230dedfe12d25d3fa760a467d3817f218145fd99f9269bda1924cefdf93df23fe7e009b349f98623c2c1a5ffb2298ee97d8609c3f32e6609c3f8b2cc9646f0bc914cf3f4aa6786607c6fe958ee20f8bcdafb43f81e20b165e93fe5c3e25d37e30f13dea3ddd093cc27ede2d18f5983804e3fd1d9a25989ed7168269ff61fa089e223f9e8167d47f862699d6f39e25d3fe68152ce2b70318e7c9ec67c9f4fe12138cf70f252918f1932b9e67507caf08f9f1be9938069b648fc15e308dbf32108cf7df88e7637f627c150cff7a0163ff42f000c6f99c88ec9b4d37a867d1fc62b3f1a3fd3c743f5b8c5ff102463cb2da82117fb4df9269bde12498ec510f25d3fef01c8cfcb8b425d37eaa5232bd5f2506235ed85a9269bda4154ce31d89f6cef17ea8037841f76b447b17d84fb6012fa9fd6b211fea49978b608a4f0c156c423f3bc9b49f3602c31e6f7bc1d0bf4a32c50fe44f6c1bfb3be22918e7e93a6287d907adb70ec063eacfd51b784afdb3d1c0c85f8a5232cd97afe0398ddf652d99fcf75130e5879d09c67c961482c97eae7bb049f74b3ac9349e86649a4f2692b93cb978be8df749b88229be509660eca7f39f24d3f922713dd6afaedf8269bcd690c7c6f9d755001e52bc5b533ceb5a63d29fab2199ce63edc1139a9f82083c25f9f5068cf745dd2cf082c6238d25d3fb1d378229bf503ec178dfce6a0946fce9bd0aa6fe5ccf04e37d0af27aca77ac1bd8a2e747df9229fe2dc136f98ffc4530e9f34a934cf9f10fa6e78be739387f48fde9daa8f7273c3e310716f67b260f9269ffde1318efefb91e24537dcd06e3fd79f6156ca0deb1904cf6a080d1fe6a2199e67b5f303d4fbb801dd8fb0a8cf8f9a611db78ff5dac8211df745f60d413133e7e2c389be17ccc183c27ff97459279ffac4b30de27947e0826f94c4532bd7f5d032fa9fd6d2a784af58e21d8a0f9e1aa48a6f53f5b30d58ffd6730de5f94ad89ed01d9ef86eb2b0b2eb0feac6fc04b92af7525d3fbcd8f6093fccde64532d9cb4d30c57fe1128cfd33eb77c1a41feb028cf7355a1f82e9f9ee1cec62ffea9b60f227892918e785f0bd8dfdafe9b3601a4f270463fda81980f17ea59adbbf3966fd41ef472dc14bf2075b1b6c60fdec4132d50f0bc9944f1cc126c693dad7bf5e9ff2075c6f63bd6b45fd33b1e6549fb8adc0580fdc7682c97fdd5ab035a5f74309c67961e50bec523c1de2f736eaf7f11c3ca4feaba8bfa6d664467fffdc080c7f53b492a97e6f08a6f686776013fab4964cf69982717ed224ff30b5b15fe81608c6fbd3ce60c48b2d8dd78cdd8ff2eb5430c5839b5730f2dff60086be74a4af33d6ff148fdd8391ff6a74bf390b30693de808b6917f64c436ce8fdf1230f6bfb7345e0b6b3a27fbe9c0f319bdaf8bfcc782a5f7e43f0f60cc4705f99f256b3fedf71c826d92ef3625b627349f68dcdf9b2c9f9b927f237d3458ffd1fc5b8327f007241f530f1aaf6b00467cad51ffb2f8674efd41fed5b6711ed0e4fac192cf39b57733022fe97ecf977feda32abf7d8c9f3e26ffa7827fa74fcf0afb9da5daaac3fe58ff6a0be8f3df21cb2f72b9ecf3bb5c0afe9b90afff77f7df5116d62247f5d81ffad87ddba87590cbfd87bfb3f1f9779605f20899fa6be8cfffb79fff167b71e9f393743ffadc1663f4e33aa96fbdedf8eccf3f18b9ffff65e16dfbc90e6009240d1fa9bf2b3bc9439ee0df4d1661eb3f64f9313a3f24f3e4e717cbfa7791e5379fecfefa91d758f05a8e94457a8a7f2b590235542335561335553335570b364ea55aa917b5669f86e951ab76ec7365b2de544dd5d99f15ff9dc67eb1fe379365a3aed827652391a85bf6b963d2ecd43dfbec982c07464726dd91fdfb4e3da9f74cce7bf5817d0c76e53ff4daff5b6479e43dfdc446e699fddb597d515fb94ebda9efea87faa906ec9a9449f8c524f85607ea501da96375a24ed5993a67d2fc1bc9c25a7a5637ec9f91ba607f02d8fd92c9f2cafe6929aafaa4284cc7be15431d2ba662b18fad380af31a8aa7f8ff3d92fcf7cc954aa0844aa4c44aa2a44aa6e44ccf5ca63d2dfbf4b6622a059b45064aa954ca45a9954669954eb92a3745537465a5acffe8b5ff37cab251b6ca9db253cf8aa2ec95036bf1513929f7ca83f2a83c29cfca5979515e9537e55df9503e952ff6dfbf9581325446ca589928d37f23596c65a6cc9505d3b393b26413cd83f261288661b044c0b00dc7700dcff08dc0088dc8888dc4488dccc88dc2288dcab8a87746fddf23c99f9345b58ca6ff23a390df6677a3353ae36adc0ccdd08d95b13636c6d6b83376c69efd391847e364dcb3cf897d8e8c1fd8e7d178329e8db3f162bc1a6fc6bbf1c1b4b0cf02685e757f9b797f9aadfe999ff8af6561527c1a5feccfb7313086c6c818315fd4186363624c8d194b9916c6b2370ad3304dd3326de3683aa68b8fc73ebe19b04f684666c465eaa53a9a31936a6726666a66666e16666956e6c5accdc66ccdcebc9a375333757365aecdcd2f33b1f2eb1cfcd764311a736bde3169becd9db9e7b21ccc8379344fe6bdf9603e9a4fe6b379365fcc57f3cd7c373fcc4ff38b7dbecd8139c467648ed967c23e63736aceccb9b960992a3334e3de322cd3b22cdb722cd7f22cdf0aacd08aacd84aacd4caacdc2aac12b9dc2f91c5ffaa2c56655dac4b3f2e566d0cad5a3d5b8dd55a9d75b56e9666e9d6ca5a5b1bd6d3f7ccd96ead3bd6522689b5b3f61677bfd6019f2393666a9dac7beb817d1ead27ebd93ab351da592fd6abf566bd5b1fd6274b98bf5884b0601e3d61b3e9c0faeea3cf1fd1d1bfa2634cb31a8bfe82f001fff74a89aca135b2c6d6c49a5a336b6e2d7acdb196cc74fa4a9ed18f85b5b34d48f2439643bf4c614e6ddb766cd77ab03ddbb7033bb42326cfc178b4633bb1533bb37336abda766197ea935dd997de92fecce74fc932307756cdc6646055aa67d77663b776675fed9badd9ba71303fec95bdb6376c249ef9676fed9924625414662bcc5e602bf766681bf6d6beb377f6de3eb0cfde3eda27fb9e8debde7eb01fed27fbd93eb319d7b35fec57656fbfb1d1b07efffcafc9f27cb16a66274cb78cc6f8b4df992c1ff6a7fd657fdb037bc8faf3c47a7864bbe6dc1edb137b6a2db924bb7e64fab161ff9cb1f6ce85fd9b91bdb0972c485698ddcc1dc3311d662c8eed384cd2bde33a9ee33b8113b218f5dd89545df17fcdecfe155954d7183ab113333bb1edda499cd4c9ec2f27778a5e0ea7640ff0ed3d6b55653d3b17361acf4cc706cc6216dc6ed8ff3b356b6be3b44ca6b9d3998173756e8e66f7938feeac9cb5b3b1b7ecf78eb365d21c8d9d73e7ec9cbd73708ecec9b9771e7ec9107ecb7a7eb6a03f234b2f09f3c683fe7ecea3f3e43c3b67e7c58cadb33db1ced6b33d6656cc3ece2b6b5dc5dab5c0a7f765ec63cfe9e374f8bc39efbd24f6d20e9d0f66fd47e7d3f9ea7fe954ce379366dffff5f6cec8e9ff5acca933b3eb9fe4f8576599ab9db3b05f9c25fba1e21a6ce2b08c23f34accd3bab6ebb8aebd702a73e17ab66b1f5d9ff9a8931b981fccdacfaca5f76ec86c2ae673e6d18ddcd84d98bde0e3746e6a7acc73b02b594fbcd93336be67377373b7704bb7722f6e6d176e63356e6b358ae67656f3afe8987a70afaaeddeecd6d55cdd5db96b3626cfeec6dd9a43f7ceddb97b3622dbde86dd837bb4576e6031ed331df7e4debb0feea3fbe43e1b817b765fdc472195fbeabeb9efec5707f7c3f9703fdd2ff7db1db84377c474f1c0fe7dec4edca93b73e7eec25daabd2f6091b8a7aa81f70fbdda9f91c533d8f46d79b6e778ae937b9e71b2179eef055ec8e4601fdbf0222ff612e6030eb6d1eb8c977a99977b85577a9577f16aaff15aaff3aedecdd33cdd5b796b36e7c7c6c9db785befce7a70471ebb0b1b5d9dfd3ff36fde8e59cec1db7b07efe89dbc7bb5f01e58467af31ebcc71f5af5bb1ff853b23c79cfded97bf15ebd37a730637362dbde3bd32f2e099368cbe6f229b39ae7de76bd0fefd3fbf2bebd8137f446ded89b78536fe6cdbd85b76441d7a3aff8866ffa966ffb8e71f45ddfb31e7c9ff9e8ad6df8811ff663e547ee8069e4831ffb899ffa198bd6be51bffd523c9189fe75599e2f7eee177ee957fec5af0d6603e6d46f7a49fc967d3aff6acead27ffd6cf77bee6ebfeca5ffb1b7febdff93b7fef1ffca37f62f966a2bef8f78aea3ff88ffe93ffec9ffd17ffd57ff3df8da3bdf03ffc4fff8bf9f485bd30c74ee57ffb037fe88f8cbd3ff627fed49ff9737fa1382c27fd6679f70f597ea97dfc99d8d25f066aa004060b112da65f6aff97c0f7fae5b7811d38fe3570cd0fe31478811f04411844411c24411a64411e14411954c14509839a7d1afb3d68838ee59af3e06a3f07b7400bf460c5fc48ef0d9560ddeb99ad30d906f6c27a0e36ecaedbe02ed8057ba50e0e4a191c8353708f0af54f35ab3f2d8b1d3c048fc153f01c9ccdd829ad73f012bcf6da15bc05ef81137c049fccf38c83afe03b1804c360148c8309fb330d66c19c49b47016c1325443253442d3188416fbc39c71e8865ee88741188651c86cc73a8709f3cb4698f29881c50f61d6fbfc300f8bb00cabf012d661e32fd421d3b41fb2387f94e5e77af6cf63d25f1db661175ec39b19875aa8b3bbafac636f27e13a5c33795e8c7b2f0d37e136bc0b77e13e3c84c7f014de870fe163f8143e8767f52d7c095fc337ab08dfc38ff033fc62d2982c22f6d97ff90e07e1301c8563e3184ed82cb40dd6e1943d63e6ee99fd7c9b53f6dfe7e1225c466aa428456444e68fcacdaf5a46b288ff862c28f1d4c8525fd5d7c88e1c7f19b9e673e41987c8376751c02375a61351c8e2f7cf88e524511c25511a65c62dca8347ab65f369cafe3c4645f01895aa1255d125aaa3266a5910d345d7e8166966678ccc75d4467ab48ad6d126da4677c629da452c82f0039ef778d68ecdb40bf6bc7d74888ed129ba77d2e8217aecefcdabed866af4d1eeaff6f2932c068fb043b77516ca2e7a8a9ea373f4629ea357f6a437e6750d16a79ca37773c2e6e8aad7eae823fa8cbea2ef68a0ce153f1a2aea8f2a2c7f9e1b8da27134096d2b8ca6d1cc8aa379b48896b11a2b56111b319bac629b85166eccbc3d9f73962c7f93b29843e33ef6e3200ea3fb388ae3f081f554cadbcafc5a1f25fe2c0b7ff68f7131d4f8f9e22cd4f73889d3388bf3b888cbb86277bcb0f87111d7d6dedd5b4f7c2639b959dcc46ddcc557ff515dfdb4f662cb3bbaca5875e25bacc5ba3f8b57f13adec4dbf82edec57ba5890fea323ec6a7f83e7e881fe327e3143fb3d866c9bc7380b86e689de373fc120ce2d76011bfc5effd88736b3055a38fdeff992c0ad34726cb6b9cb8adba8a3f4c23fe649db7641ec6b09ee3da665ed3fc0c33f6dcaff83b1ec4c378a456eaca7e51ee94713c862c3c1eecff9dfdb7493c55f57816cfe345bc4c54e3c17e4894c448ccc44aecc449dcc44bfc24484263efde9b3e8bd8d887e7a42c3b65f3d6d17c4da2244e92244db2a84872b1baf07765b1c886f8155b36bbb2fe65914fa2b8499194e69b71f26fd69e8dc9d9b998dff6c13ad953e39054c925a99326d6d5f7beea9db4ccca52f40d55c1d97d95bb385332bb4abae49adc12cd38252ceb4956c93ad924dbe42eba26bb641f1c9243724cd82c657a8ec272014364d94c9b4b2f4dee9387e4d158264f09b34ab146d2e722ff4c96e499f5e198e50e2bf6efe7e4257935dfad3e3f3f276f56ff8afa7df26ece8dfb709c7c249fc957f29d0c143d192a8b64c4abe3bdc7b4fbac8dc9c264b2df93713231de9269324be6c63159d8c76469c6a99a2aa9919aa995daa9e3dfa76eeaa5bef1603a2cbfe1b2f45910cb54b769601cd3308dd2384dd294cbc2d76dfa7cc4180aaff6932c96b0fe3453466e6b97cc8e9d344f8bb4343fd22a4c98f75a5afdfe8687f4621becee75daa46ddaa5d7d451f4a04b6fa996ea91c9fd3f978549c3644957e93adda4dbf42eddb15fedd3837d4c8fe9c9d8a7f7e943fa18fae953642b7a344c9fd373fa92bed2c8902c2ca7db4681719fbea5efe947fa997ef5feb197a56f7f9f5bfd2acb8f91e17a78607dbb5412ff2139a7dfce9069eb673ae86da5f7c54ee5fa696f8f553a4ac7e9249da6b3a4b50b65c3f42c5177fe23ef31361a7d0edad724d379ba4897999a29c63163f971b4efb3e3ccecb3e2649559999d39ea57ea0475e6665ee66781e9fa81a3a06ab0eb675096e1c5599845599c25ce23b3172e8b6af5b9d52fb2889a9add3f99d14efd4a064ccf952c553eb2cc74cc2fe61b077dcecbf477613d982316e37efaeb2ccf8aaccc2a61e7e45b98b34db24b56678d5dc763f53b6bb32ebb662c62f343d6df6ff6c2fd66de9c652c99661ce3a74ccf56d93adb306bd3b36d76e74efa5999c53363a603cf76bfcd8445369691edb23d93e5901db313d31d85db7491ddff268bf28b2ca67a973d3032b24743c99eb82ccc37f67d642ebcc4661146f69c9db397ec357bcbde852c1855577d4bdaec23fb8c9e93419a655fd97736c8d8e866a36cec8eb24936355da7cc66d9bcf7ebacbf17d93257734509552b377233b7723b77d8377d3d6dc29edad74398b7cedddccbfdec900779a828ff4496be024a7dabf8bd36f63edacc23c330ee982cbd97efed70c024619219f7799c27fe364ff32c3c30597eac4172bf95e779919779a556f925aff3266f8d63dee5d75eb7dc613f1ef9cdfdeeb3e25cb316f153aee7ab7cad9eed32dfe4dbfcced67396c1b09879c8729a4bafd9feb7719f29f93e3fe4c73cc88e4c9b1392c52afe812cbd0f559209d332db2ed5263f1926f32baed05ca6678eed5877ecbfbce6f7fe5dfe104cf347a3fd690d92d97afe943f671725cecff94bfe9abfe5ef7dd4937ff49909af719cddaf6cca73628dcd8871fe997fe5dff9404d9cc833f3613ecac7f1579ff1997dbc4c51b4cfee30c9a7f92cc9988e1d59a699f47e377c0bdffe200bb75792259fab7b854d65ea77be302c63cfd2fb1dd5bc481673943bf9b2500b8545f5b3e8814547b6dcabc0575793b1fa919f0ba33059b7d9ac557d2cbfe8f312ebaeb7e4c2e96b1785cb62ad53e1157e111461112923d52ee22229d22233f67d5ec365611ac6aecdd98cb92f8aa22caa3c2459faf6b398f5f597f9e5375958c6b34f6fcc62be8b0b7be4ce74a97227646177ae8ba6688b2e288a6b714bf25f7684303d53fc645268855eac8ab5710835e7b597a5d8b06cabaf6a7ef4d5be60cd243916dbe2aed815fbe2a0d8c5317b284ec57df1503c16cc3efa1a279764614e0b268f7128cec54bf15abcfd248b1aaa7f57164fcab22bde59fe742a3ed894b5efa33c5420875c9645f1597c15dfc5a01806398ba2c90bffd8555114a3625c4c8a692f4931ebd72c989ea8c5bc8f467b5b6677e03163b12cd5ecbb544287c540d7d250c2d22cadd22e9dd2354ebc22c2ae36c7f6a1f498cdc6a55f06e1ae64290dd731f7efc822d654c40cf3adb665c472b053191b2ecbef852cfb5e16f3cb3a9749999659996749745f163f564a7824669465599597b22e9b5e92b2cd34661b565f3b6371dc985bb4e10ffaaca7ecca6b79b3be4acd0a4a9d8d67c4a45995eb72536e992cbabdeda326368e5bebbecf64cabb7257ee7b591425cd7a6d28b552fb45961fd13ef773ea8dcd103b75c56439183e1bebc81c5b7d3d2cb0674e63cfcb63792aefcb87f2b17c6271ce86e527a398c594ca9d5d97cfe5b97c295fcbb7f29d79d12eef32adafee9bb3bebec13f337b5f7eb079bc2c3fcbaff2bb1c985d392c47e5b89c94d3c42d67e5bc5c944be3c45c7d156a7c4c0f665f1939564a655466d06746a7e0d4ef2ab2aadf62fedefb3059d8b7663f36c8d834bbaa2c26cbbd19b2deec97483a264b6b06c6a1b22bc79bc5e3a00996e5c4dc562e538ba86236cfa29545e5574115329fca66bb3ea736471513d73a313946fd9a4515dbdb2aa9d22aabf2aaa84a2bacaaea52d55553b5556745c1b1ba062b362e5ba7a355b57ebda3aff254b74aabf42467b21c83a36ad9f51f641151a5cf6571d488e9e246bd315559556b264bc4662c268b193269f64c96a37bf65a6fae2e2387e9eb5bb5a9b6d55db5abf6cab53a54c7ea54f575e17be6c717d681c5d5233e26a3fe2ebd3d570f4c96c7eaa97af646d5b97ab1aaead5dc556fd57bf5517d565ff128afabef5e966ac07ac2e5f5cf678bddb11a56a36a9ce4ce23c6c5339adf627e4bca6270efba60d1ee539ac5a36a524db98e912c51af654c965335f33a8f656bca3c34ccae9a87af9eaac6ac3f17d5f2a26637f7f5a25cb81fb615f38349d17f26b406c3ee7570377d7e75312fd6c5be38e1cbc5bd78179f8d897f092e6134b8449798c9d2b91fccbadefb159cde673059946a7449823e47f6d9c7fea32ca859283c96225912f549bdbfa4ec9e593fc6fdfa9c6df523d4af3d18a774e75d2fb9925e8ad0c8eefbbcfd525eaacbe5525f9a4b6b9c2edde56a6fcdd1e5165f98bd93244764f10773e445d68e5da55df4cbeab2b6c2cbe6b2bddc5d7655a7b697fde57039ba2fbd2c173633b1d8cde27fd5d684fde2fef27079e4b2a0adfd5add3f95256071f24d29c2faf27479eeb585d61bfb95a07ecd81e9d8a377f35545b3df7975c88ca6feec72bebc5c5ecdc4383afae58daf136d8235f75dbd7e8db92c7c3d96f5f196c5dd5333bebc5f3e2e9f97afcb777cbcf06a13d388e16578195dc66c869ddb6c66cd466c967db5ee7adbbf4c2ed3cb8ccba2f0bcc2fe5d16392f4096545373b5cdcf97f9657159f6eb90bdcdb2d8b85fd50accc08d8c83a7298f8a1fb4c620fca8d55a49b6b5519bc98ac9f9565bb56def1cc38bfaf99ecd8d336ef74cc7b8341e9b3146e6dcdef82cdeac9ddaadbddaaf83484b46e9ad0eeba88eeb84e5ca9fcce3796c6e9db008f4c9dd32590e755a67756e325990875bfd0aeaeff9cbcfb2287eaa2b6e5dd4a5f25557c68149c0bc0fb3dfa8978569716cc69eee2b6aa9cc422bfc8caa9a4590ec7f0d6b5beb7eb84347cdaf2c63af9cd73063f67faa22f6ebdeaff7d27875c746f9cbfc626d5cd6d7fa566bb55eafea35d36ca77c8af27a536fcdd8b9b23cdceb6318d6239bdec2eabb7a57efcb3d932515759e3fe695d8112074cc55efd44370523ae5b13e184cb3597e7f6fdbbc12cfda581f599b4ff57dfde0b6a1556d13b77eac9fea67e3549feb17a65b8bfab59f159cd728b02d1691ceeb37bfb1b7fe376fd994b220ca89acbdfb5abfd71ff56738a8bfeaef7a500fcba01e992ed3c27db17077aec3f29881cb324b63578feb493de5b2507ef20f7264f6a797a59ffb13f6ff0d9bfda7f5ac9ed70b9657b2fc8bc52e5b7b592f9d779bcdc98dda288de13f5a35f3ca1f8dd958c64363db47f6d9374e3f438693be6ed3fbb2c665ff34a2d0def09a9af1cb1ae0d074eb5be3357e1334a1f3d4444ddc244dcafae291e54977eeaec9ac2dfb158b429bbc299ab2a9b8bdd09ca8f42b763fcb42732397c5e4b364aa8cd2cc99c77a7369eaa6316377c3eefb7039352d0b8359d6e186c6aee99a6b738badd0b48a466b74fbc18c9b557aecc7c57c6fd64cdfc76c2c3efa5cbdd9345bebdcdcb9dbbe8283d53fac9c9b5ebfb3a4d935fbe6604d9a63736aee9b0726c363f3d43c3799bbeb6be64c2fe3e6dcbc34afcd9b948559c51f65a1d95ecaa2f1959bb5faa138cd7bf3c1a22ac7ff609e89d973bfa6686f9b4fe3e0dbcd57f31dbae167ad3483669828d60b7bde283359ae356bc66c961b46611f41369366dacc9ab971b296eeb6e1e3815566167d9b9ed3354b63efad5bb5555aa3355bcbe8ebd581396efb15c45d9f2b87ba71689dd66dbdd6ef63181e7719aadfaf09ff365752a5cfa4bdc2fdfa937a8bc76de03dc65d1b1afd4afdb658703fbbed6dba8d8c531bb7499b865ef5de666d9e9fdaa22ddbcad8370fed85595585fce4beaddba66ddbaebd5e5876dfded8bcf3ddd70ee4eabfefed5aaddf1de36baddeaeda755bb35f6dda6df0dede056f5ec89eb7734a63d7eedb437b6c4f52163f38fd41161bd97abff39945bc2c951e313ddbe5b9a2b7f7ed43fbc8b4f7686ffa9d05b5d53ef55adf326fdf9edb97f6d518861f4e5c44ed5bb269df59ccb3cf3b7bc9645ef5f949fbd17eb65fed773b6887eda865b3068b697aed123b19f67e906bf6b69db0acf8d44edb593b6751cb397875ed76d12e3bb59fdbeace38754a67746667c571922779af472c8e39fe4116e75759d84c99a94967770e93e6dab99d67192cd770d89cb063be56ef7c7b5b9f7d3753baa00bbba8da767197746997b1b0b8e8ca7e6dc8db75157bfea5abbbc6df756dd775d7eed6699ddeadfaac8e723b5ec95b326b687b8fe2fb4e65dce75db7ee36eeaedb76776c02d875fbe6397aef0eddb13b75f7dd43f7f8ab2cbfc563b40fdae2fbb87b59fabdb76ef7d43de7cfddb97be95e6bc738b9ae7de8ff1a4166c38eb3eddeba77964f9cba8feeb3fbeabe9d85fad80dba6137eac6d19d195b0b33f6b56ed24dbb5937ef16ddf2aa5e95ab71358d9dfbca7763f9bd1ce6d00ffa99fd6ad97bc7bada4cbe73b7bb322bb18ee1cadd5d5deffdea3109dfaffe35b886d7280fa302b66ffe1d1d13eb0b72bf196a7fdcef5de36b52b2d65d53ebe19ab119ef6c9dddcf7eb5f79ab3ff5a5ccb6bc5e29897ebe55a5bfeb5b9b6d7ee7acd27d7db55bb321d5533b30bdf8da69c5c57d7f57573dde6937efe655aa8f4750ce623a2be06c6f7638dd87c74ecfd38d515ade7de5aaa8171bcde5d77d7bdda3847b5edab2c5993353c07367f9c07f8afd7f89ca7ebe17a8cd953afa7eb3d3dddbf998b6641d1eef5e1fa787dba3e5fcfd797eb6bad3069deaeefd78febe7f5ebfa5d75d74139bc0eafa3eb987d26d7e975769d7b6bd60b8bcccccceb92dba2f5f327f2dd7d73c7fc1c27ebcc52c3a79b7263f955348c4c36f3b9aa6dbf33591cbebef31764b99937eb66df1cd6379ecb66877edf8bad140b2fb9b139d0b8f7b51b0b346f8152ddc25b748bd5db2db9a5b7ec96df8a68d025e15755df4a7377ab6e97f0e3c626c65b5bac6e9db1ef772df0fd16d6af1f5eafb0d86cc4246aee7236b3dcaeb7db4d4bc6d133cb2d44fefb87ddf3ffb52ce6e34dbfad6eeb86c5860d1b0d663515f3f8ecff6d8fc5eecc9fe593dbe6b6bdddd5a5fa62d7cae2b65386b7fdeda0d4ea58dd869f55773bde4eb7fbcbddede1f6787bba3ddfce51623f180fb71733643e7af24759983454afa4fbbfdede54f7f67efb48068a226ac97f7d7d3f2a6e9fb7afdbf76dc02b565f2cb35c58776c86d89a73162f6d6e43e3741bddc6b7c96d9abab759eadce6f1241ef77bf56f8bc80a5fa2eab6d4d4a8d394a85202f5ac199aa9599aadb1b16e5acdedade4e78fbbef3396c82759cc58f3345f0bb4508bf242d1d20ce3f287d3597fc25e1eb5584bb454cbfad981dd7b617e7a119385f624cdedad96f733a75668a5566917ad564325615ed0b65fe289b25322add15aadd3aedacdf84c1dd573979aa6e9da4a5b6b1b7ba16da99af0ebc8b03f2a8bb1ad7667dada9db653bba0b9bddbef2c7f37642dcfa1f8f22fc8926a7beda01db59376af3db008efce9cfa1f2c3bda71eb6451633568f92e43ed517bd29eb5b3f6a2bd46b935d2de8c85f61e4fb40f36269f2c216e94246ccb2767e999da97f6ad0d3436a6edeeefd98bf5dcee2c35f2b59136d6260a8bd955d72eed525db37111f562ef2fcbf2a84db59936d716da52578d7da8318f79673d9993b86e6fecb363518056b6bac26c79a71bbad92a9dab5bc64db77527327457c97596ee844e7fe622ce597e32d4033dd4233dd6133dedc7e0d74f98f5b2447e2f95bbd7333dcfebb2d20bf6fbfe0c84266b797c86ff2b3a16157aa957fa45aff5466ff5aedf11c3f2de39af8f322fa45ffb798faffbfaa6ebbe66817ed3355dd757fa5adfe85bfdcef850bff59dbe77c6d5413fe847fda4dfeb0ffaa3fe14bd07aece722db28dde4ef86e0bf3e78fe9e8e764adbfe8af4aa36ead86cdca34abf4f6eff075c43fbd8724c9f537fdbdb8ea1ffaa7fea57febcc07588affed6ed3ca56a3f7beea637afd3a561f4733895c33d687fa888dd0589fe8537da6cff585be5ca92b6565accc95e5eddd3c7ded778d38d5ca5e39b6e1eec90f0b0ff68b2cae7170dc95bbf2567e3c535f56415f310a4e2cdeea57df6a5a7bfb73b2048fab701505b355bc4a56e92a5be5ed78555807166b6efa5ccb3afe248bc9b28265dee5ceed8565b4b755b9aa5697555dcd568d3e5ab5b1c7f7c23129dcddaaeb76abab395e752c5bbbe3f66e626ef955166f7533e3b261f9d270a5b1f178e335567efeafaf2afd9571311f57fa6ab55a6bb362b8daacb6abbbcbc76ad75767d2a05f79b0b67d0ecf64796372ec983c0adfc570cff7819ef85efea3d8cf6bdcbbdf76e87ff8cd6abf3aac8ead1d7cb84edffa7e9e679aa6b63b6627bfcae2af4eab7b9643ad570fcdfbea919fce727f3a052c4f69fca971795a3dafceab176db67ad5ebd5dbea7df5b1fa8cbff26ef595f615a31fbbddf98749f7c177bc0f9d57f6795b7daf06d17e35147b2cfbbdbccd9339ee7739b58bd5a8d72e173b9358e3acdf65b1ceab717d67ec5693d574355bcd51c3b7708ec1fdf3314c92af16abe55a5d2b6b439badcdb5b5b6d7ceda5d7bc69e45cffb1f7bdefb489eaffb32097a7b62b3105fc7e3fba9f9beea7e36627e6318266b7f1dacc3c0091cbecb91452c6431bd17f85d967e7473dbd8d7efeb681dab77e20c2d9745f9b16be9cff8b1f03198af933c5d5bc1789daeb375be2ed6e5ba5a5fd6b5b5b437741601fbf7fbd5b30fbe57a25f6bb15a16fc34ceba757416dfb3e83e9ce9d77ecd807df6ebceefd6cc62bc50c8d2eeb411f366bfd90bd7d26374b7beadb53573e4b2fee5fed5793f628aba5eaf37ebedfa6ebd5befd787f5717d5adfaf1fd68feba790c5fdd69eef5ac1b8b04fbf9ef76a7e704b3e584bbedb9f5950bffba8f7e2eb7e97fcb1df83b63eaf5f02d736cc28effa73246c8e1feb193f73d2e7373edfafe4b23c69bb7e5dbf35cafa7dfdc1e617c8f2f7f78ffdf38ff3283f69566595d196e7f5e7fa6bfdbd1eac87eb11d335bea38c568b980e4db0afbf8fa6c6acc7cffc04c6b2dfadd7cbe90f7a7bea77569a43967505d5e0a69a713e6171d79d36d1f3f5b8f776eb49bfa3b61f93cb389f38de7aba9eade7eabdd8d32b674be7afc8f2d3d9621ecf798f6a11dcaf179774bdcc5f36ea46d9181bb37faead164ebf368979c230a77db5439cb4602336661ab91436d3dc39174ba1fd0a2caa7f6511e4ae0f0b36569fdfacc6cce59f8ce3c6c9271b77e36dfc4d607da94f56f35b9bfed2b8fc7eb6381a2a9ee2da55972acd26dc449b78936cd24db6c9f9aa0bcb6eac27ffdbf68bbc782effdf76ae6549552488eee733a6f615fdba7dbb6356a899203e5a6db51f3b4444f0c14b1489987f9faa8202a4bd37b457331113b9d010943a661645669d93b6d9e37b5a6207f5ce54d90a7b630ee6244ed8f3c2d4532060d9afca32ad349d280e4d481246103617866ae8b10a11c3b2b36c86248e1fe983506f36cb7bd7f59cde1344592e9dd23decc91c0e90c0115250a0014d680104cf80a691efb672cf7c667bc1191af13a6a6c8d2ed758790ea8a041fba8a546ca6681e23a2c67047dffd9b4a1130fb9e20cbad0833e2ce34747a706bc2c0e85fef98baee722bfd4f4404187dc51957668dcd0c2d0b660004318c12b8c61025378f3347fb13bb0acbe5df0f8ab3a31cdd0e01d3ee0136ee036e9c2ddb1ed7437f7e95459c13d7169c0bcfd003fe0117eb2bb700a4ff08c94def1b9eef5e9337dca1557dfc052a8ea8aefae6ed98c216b9d45ef4ffa485524aebeeaa181333471eeaa5edbb7f71bff47100423b4421517519a70a1686ff7106f632dbe471b97ebe0a027b3a4874ec8a276354cdffc603e255ca59dee228325a4b8c2354b719e8d29bbca113774bcb961e319c8f15c1f6327bd3884873ca043ee1bdcda7dce35430f7d0c30740718e10e636fed2f7ddd7f0cc2861b3aa1161991827b3cecfa8d66ec6112bce2115354f693204dfadb96d559cd6ccab25f967cd21655d61b3627a2d61336b0892d72a03dc20e53978ef868d8fa229f5faee75a7fe935c07eb745b764495b08ec7d0311d5f514356ca3bffd70224ff774bfb3f1822818bb5ad8461d3bd8c5de6e837df6fe0507fb088787258ef015c7d68bd0fa1a7cc79ef3f0a8623d21573237714a0f6bb636061dba66de58d0211dac1b76bfe293ef6039b59ad281736c393795d713791dceebf80ee712f96e3009ddd07544a5d179e13613e6e4967d435ca3ec245389a0cad56bfd58aad7bf7aee9fc122ff178e852391e3f3ba9c7d9399eff23a234758aeb7d96b869def6fe7fb0f468e60216ac18678a2378b9890bd31a42ee18c42f1d27b720dcf09969c1fb0909d7904e76ec356026184f0baafc89d66956e3da5fecbf6f6f369d67545d6b5c5d924df135a7ec542cb5e26e49a7cbfc201afa191da8093df3604f79408ae9ab0ad576031ca9ca3caca1635c83935653d22cfb448ce3bcf6adc752c32e62a9eb9443352aa19aaaae7e288acea1ab4729f2cb50e052bf5d4871cf952b02732ae47d9db635ea9689b453c57bc2062244752ad5f5e84c592fcc3e1ee4c949995795bc152fdbea830d827ffc84c20e9088f91d2fb395e4b665b520152c3422492ebf27dce3a1163b10a2cc60916c11710bad85b6ed69a7320cdc09db863ceee0a1533e20c1ccef6c814cd995eb334f9fc9ecf4b7ebda988b5c23b67b1108e04dff03d63da7fc32f8b9a5f4caeec2fc7c9c7e6f5bc5e154b795ce2e596e3679fca7dd222b624e3bc58134fe3a1e0bbcd199677fcb81c4b3d6a7ea7d6aeb0fb7e71ceb9a3f5738b7cbeda2ba7de3ba79caf57e52fff15fb1fcbbfd3fefcfbaf3ffe0193cc32fd</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> |