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 /kivio/kiviopart/ui | |
| 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 'kivio/kiviopart/ui')
32 files changed, 588 insertions, 576 deletions
diff --git a/kivio/kiviopart/ui/addstencilsetdialog.cpp b/kivio/kiviopart/ui/addstencilsetdialog.cpp index a63865217..683363674 100644 --- a/kivio/kiviopart/ui/addstencilsetdialog.cpp +++ b/kivio/kiviopart/ui/addstencilsetdialog.cpp @@ -24,14 +24,14 @@ namespace Kivio { -AddStencilSetDialog::AddStencilSetDialog(QWidget *parent, const char *name) - : KDialogBase(parent, name, false, i18n("Stencil Sets"), KDialogBase::Close) +AddStencilSetDialog::AddStencilSetDialog(TQWidget *tqparent, const char *name) + : KDialogBase(tqparent, name, false, i18n("Stencil Sets"), KDialogBase::Close) { m_mainWidget = new AddStencilSetPanel(this); setMainWidget(m_mainWidget); - setInitialSize(QSize(600, 450)); + setInitialSize(TQSize(600, 450)); - connect(m_mainWidget, SIGNAL(addStencilSet(const QString&)), this, SIGNAL(addStencilSet(const QString&))); + connect(m_mainWidget, TQT_SIGNAL(addStencilSet(const TQString&)), this, TQT_SIGNAL(addStencilSet(const TQString&))); } AddStencilSetDialog::~AddStencilSetDialog() diff --git a/kivio/kiviopart/ui/addstencilsetdialog.h b/kivio/kiviopart/ui/addstencilsetdialog.h index 458b409b7..0f23d9198 100644 --- a/kivio/kiviopart/ui/addstencilsetdialog.h +++ b/kivio/kiviopart/ui/addstencilsetdialog.h @@ -28,15 +28,16 @@ class AddStencilSetPanel; class AddStencilSetDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - AddStencilSetDialog(QWidget *parent = 0, const char *name = 0); + AddStencilSetDialog(TQWidget *tqparent = 0, const char *name = 0); ~AddStencilSetDialog(); public slots: void updateList(); signals: - void addStencilSet(const QString&); + void addStencilSet(const TQString&); private: AddStencilSetPanel* m_mainWidget; diff --git a/kivio/kiviopart/ui/aligndialog.ui b/kivio/kiviopart/ui/aligndialog.ui index cb18d91c2..80041d21e 100644 --- a/kivio/kiviopart/ui/aligndialog.ui +++ b/kivio/kiviopart/ui/aligndialog.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>KivioAlignDialogWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KivioAlignDialogWidget</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -28,9 +28,9 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="layoutMargin" stdset="0"> + <property name="tqlayoutMargin" stdset="0"> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>align</cstring> </property> @@ -41,14 +41,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup" row="0" column="1"> + <widget class="TQButtonGroup" row="0" column="1"> <property name="name"> <cstring>hAlignBox</cstring> </property> <property name="title"> <string>Horizontal</string> </property> - <property name="layoutMargin" stdset="0"> + <property name="tqlayoutMargin" stdset="0"> </property> <grid> <property name="name"> @@ -60,7 +60,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>PixmapLabel3_2_2</cstring> </property> @@ -68,7 +68,7 @@ <pixmap>image0</pixmap> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>PixmapLabel2_2_2</cstring> </property> @@ -76,7 +76,7 @@ <pixmap>image1</pixmap> </property> </widget> - <widget class="QLabel" row="0" column="4"> + <widget class="TQLabel" row="0" column="4"> <property name="name"> <cstring>PixmapLabel1_2_2</cstring> </property> @@ -97,7 +97,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -114,14 +114,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="QRadioButton" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>ahleft</cstring> </property> @@ -129,7 +129,7 @@ <string>&Left</string> </property> </widget> - <widget class="QRadioButton" row="1" column="2" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="1" column="2" rowspan="1" colspan="2"> <property name="name"> <cstring>ahcenter</cstring> </property> @@ -137,7 +137,7 @@ <string>Ce&nter</string> </property> </widget> - <widget class="QRadioButton" row="2" column="2" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="2" column="2" rowspan="1" colspan="2"> <property name="name"> <cstring>ahnone</cstring> </property> @@ -158,7 +158,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>20</height> @@ -175,14 +175,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="QRadioButton" row="1" column="4" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="1" column="4" rowspan="1" colspan="2"> <property name="name"> <cstring>ahright</cstring> </property> @@ -200,7 +200,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>20</height> @@ -209,7 +209,7 @@ </spacer> </grid> </widget> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>aCenterPage</cstring> </property> @@ -217,14 +217,14 @@ <string>Center of &page</string> </property> </widget> - <widget class="QButtonGroup" row="0" column="0" rowspan="3" colspan="1"> + <widget class="TQButtonGroup" row="0" column="0" rowspan="3" colspan="1"> <property name="name"> <cstring>vAlignBox</cstring> </property> <property name="title"> <string>Vertical</string> </property> - <property name="layoutMargin" stdset="0"> + <property name="tqlayoutMargin" stdset="0"> </property> <grid> <property name="name"> @@ -236,20 +236,20 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>PixmapLabel6_2</cstring> </property> <property name="pixmap"> <pixmap>image3</pixmap> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop|AlignLeft</set> </property> <property name="vAlign" stdset="0"> </property> </widget> - <widget class="QRadioButton" row="0" column="1"> + <widget class="TQRadioButton" row="0" column="1"> <property name="name"> <cstring>avtop</cstring> </property> @@ -257,7 +257,7 @@ <string>&Top</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>PixmapLabel5_2</cstring> </property> @@ -265,7 +265,7 @@ <pixmap>image4</pixmap> </property> </widget> - <widget class="QRadioButton" row="1" column="1"> + <widget class="TQRadioButton" row="1" column="1"> <property name="name"> <cstring>avcenter</cstring> </property> @@ -273,20 +273,20 @@ <string>C&enter</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>PixmapLabel4_2</cstring> </property> <property name="pixmap"> <pixmap>image5</pixmap> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignBottom|AlignLeft</set> </property> <property name="vAlign" stdset="0"> </property> </widget> - <widget class="QRadioButton" row="3" column="1"> + <widget class="TQRadioButton" row="3" column="1"> <property name="name"> <cstring>avnone</cstring> </property> @@ -297,7 +297,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton" row="2" column="1"> + <widget class="TQRadioButton" row="2" column="1"> <property name="name"> <cstring>avbottom</cstring> </property> @@ -317,7 +317,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -326,7 +326,7 @@ </spacer> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>distribute</cstring> </property> @@ -337,7 +337,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup" row="1" column="1"> + <widget class="TQButtonGroup" row="1" column="1"> <property name="name"> <cstring>ButtonGroup9</cstring> </property> @@ -347,9 +347,9 @@ <property name="title"> <string></string> </property> - <property name="layoutMargin" stdset="0"> + <property name="tqlayoutMargin" stdset="0"> </property> - <property name="layoutSpacing" stdset="0"> + <property name="tqlayoutSpacing" stdset="0"> </property> <vbox> <property name="name"> @@ -361,7 +361,7 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>dselection</cstring> </property> @@ -372,7 +372,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>dpage</cstring> </property> @@ -382,14 +382,14 @@ </widget> </vbox> </widget> - <widget class="QButtonGroup" row="0" column="0" rowspan="2" colspan="1"> + <widget class="TQButtonGroup" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>vDistBox</cstring> </property> <property name="title"> <string>Vertical</string> </property> - <property name="layoutMargin" stdset="0"> + <property name="tqlayoutMargin" stdset="0"> </property> <grid> <property name="name"> @@ -401,7 +401,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>PixmapLabel8_2</cstring> </property> @@ -409,7 +409,7 @@ <pixmap>image6</pixmap> </property> </widget> - <widget class="QRadioButton" row="0" column="1"> + <widget class="TQRadioButton" row="0" column="1"> <property name="name"> <cstring>dvtop</cstring> </property> @@ -417,7 +417,7 @@ <string>&Top</string> </property> </widget> - <widget class="QRadioButton" row="1" column="1"> + <widget class="TQRadioButton" row="1" column="1"> <property name="name"> <cstring>dvcenter</cstring> </property> @@ -425,7 +425,7 @@ <string>C&enter</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>PixmapLabel8_3</cstring> </property> @@ -433,7 +433,7 @@ <pixmap>image7</pixmap> </property> </widget> - <widget class="QRadioButton" row="4" column="1"> + <widget class="TQRadioButton" row="4" column="1"> <property name="name"> <cstring>dvnone</cstring> </property> @@ -444,7 +444,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton" row="2" column="1"> + <widget class="TQRadioButton" row="2" column="1"> <property name="name"> <cstring>dvspacing</cstring> </property> @@ -452,7 +452,7 @@ <string>&Spacing</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>PixmapLabel8_4</cstring> </property> @@ -460,7 +460,7 @@ <pixmap>image8</pixmap> </property> </widget> - <widget class="QRadioButton" row="3" column="1"> + <widget class="TQRadioButton" row="3" column="1"> <property name="name"> <cstring>dvbottom</cstring> </property> @@ -468,7 +468,7 @@ <string>&Bottom</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>PixmapLabel8_5</cstring> </property> @@ -478,14 +478,14 @@ </widget> </grid> </widget> - <widget class="QButtonGroup" row="0" column="1"> + <widget class="TQButtonGroup" row="0" column="1"> <property name="name"> <cstring>hDistBox</cstring> </property> <property name="title"> <string>Horizontal</string> </property> - <property name="layoutMargin" stdset="0"> + <property name="tqlayoutMargin" stdset="0"> </property> <grid> <property name="name"> @@ -497,7 +497,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>PixmapLabel10_2</cstring> </property> @@ -505,7 +505,7 @@ <pixmap>image10</pixmap> </property> </widget> - <widget class="QLabel" row="0" column="3"> + <widget class="TQLabel" row="0" column="3"> <property name="name"> <cstring>PixmapLabel7_2</cstring> </property> @@ -513,7 +513,7 @@ <pixmap>image11</pixmap> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>PixmapLabel9_2</cstring> </property> @@ -521,7 +521,7 @@ <pixmap>image12</pixmap> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>PixmapLabel8_6</cstring> </property> @@ -529,7 +529,7 @@ <pixmap>image13</pixmap> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>dhleft</cstring> </property> @@ -537,7 +537,7 @@ <string>&Left</string> </property> </widget> - <widget class="QRadioButton" row="1" column="2"> + <widget class="TQRadioButton" row="1" column="2"> <property name="name"> <cstring>dhspacing</cstring> </property> @@ -545,7 +545,7 @@ <string>S&pacing</string> </property> </widget> - <widget class="QRadioButton" row="1" column="3"> + <widget class="TQRadioButton" row="1" column="3"> <property name="name"> <cstring>dhright</cstring> </property> @@ -553,7 +553,7 @@ <string>&Right</string> </property> </widget> - <widget class="QRadioButton" row="1" column="1"> + <widget class="TQRadioButton" row="1" column="1"> <property name="name"> <cstring>dhcenter</cstring> </property> @@ -561,7 +561,7 @@ <string>Ce&nter</string> </property> </widget> - <widget class="QRadioButton" row="2" column="1" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="2" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>dhnone</cstring> </property> @@ -627,6 +627,6 @@ <include location="global" impldecl="in implementation">kdialog.h</include> </includes> - <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/kivio/kiviopart/ui/export_page_dialog.cpp b/kivio/kiviopart/ui/export_page_dialog.cpp index 941bd87a9..94feb1421 100644 --- a/kivio/kiviopart/ui/export_page_dialog.cpp +++ b/kivio/kiviopart/ui/export_page_dialog.cpp @@ -1,16 +1,16 @@ #include "export_page_dialog.h" -#include <qcheckbox.h> -#include <qradiobutton.h> -#include <qspinbox.h> +#include <tqcheckbox.h> +#include <tqradiobutton.h> +#include <tqspinbox.h> #include <klocale.h> #include "export_page_dialog_base.h" #include "kivio_config.h" -ExportPageDialog::ExportPageDialog( QWidget *parent, const char *name ) - : KDialogBase(parent, name, true, i18n("Export Page"), Ok|Cancel, Ok) +ExportPageDialog::ExportPageDialog( TQWidget *tqparent, const char *name ) + : KDialogBase(tqparent, name, true, i18n("Export Page"), Ok|Cancel, Ok) { m_view = new ExportPageDialogBase(this); setMainWidget(m_view); diff --git a/kivio/kiviopart/ui/export_page_dialog.h b/kivio/kiviopart/ui/export_page_dialog.h index 9584950ec..0384b0ba4 100644 --- a/kivio/kiviopart/ui/export_page_dialog.h +++ b/kivio/kiviopart/ui/export_page_dialog.h @@ -8,8 +8,9 @@ class ExportPageDialogBase; class ExportPageDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ExportPageDialog(QWidget* parent=0, const char* name=0); + ExportPageDialog(TQWidget* tqparent=0, const char* name=0); int quality(); int border(); diff --git a/kivio/kiviopart/ui/export_page_dialog_base.ui b/kivio/kiviopart/ui/export_page_dialog_base.ui index da964922c..0935d1bfa 100644 --- a/kivio/kiviopart/ui/export_page_dialog_base.ui +++ b/kivio/kiviopart/ui/export_page_dialog_base.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>ExportPageDialogBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ExportPageDialogBase</cstring> </property> @@ -16,7 +16,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>ButtonGroup1</cstring> </property> @@ -31,7 +31,7 @@ <property name="title"> <string>Export</string> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_radioSelectedStencils</cstring> </property> @@ -54,7 +54,7 @@ Export only the selected stencils to file.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_radioFullPage</cstring> </property> @@ -83,7 +83,7 @@ Export only the selected stencils to file.</string> This will cause the entire page to be exported to the file. This means that <i>all</i> stencils will be exported.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkCrop</cstring> </property> @@ -106,11 +106,11 @@ This will cause the entire page to be exported to the file. This means that < </property> <property name="whatsThis" stdset="0"> <string><b>Crop picture to edges</b><br> -This will eliminate all blank portions of the drawing. The picture will only be as large as the stencils it contains. If your stencils are located in the upper right corner of the page, then only the upper right corner will be exported.</string> +This will eliminate all blank portions of the drawing. The picture will only be as large as the stencils it tqcontains. If your stencils are located in the upper right corner of the page, then only the upper right corner will be exported.</string> </property> </widget> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -121,7 +121,7 @@ This will eliminate all blank portions of the drawing. The picture will only be <cstring>m_spinQuality</cstring> </property> </widget> - <widget class="QSpinBox" row="1" column="1"> + <widget class="TQSpinBox" row="1" column="1"> <property name="name"> <cstring>m_spinQuality</cstring> </property> @@ -139,7 +139,7 @@ This will eliminate all blank portions of the drawing. The picture will only be Not all file formats use this. But for those that do, this affects the quality of the image that gets exported. 100 is the maximum quality. The higher the number, the better the picture looks. The downside is the higher the number, the larger the filesize.</string> </property> </widget> - <widget class="QSpinBox" row="2" column="1"> + <widget class="TQSpinBox" row="2" column="1"> <property name="name"> <cstring>m_spinBorder</cstring> </property> @@ -154,7 +154,7 @@ Not all file formats use this. But for those that do, this affects the quality o Places a blank border around the edges of the image. This can be used if for one reason or another, the stencils don't fit into the export page with a 0-pixel border (default).</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -170,6 +170,6 @@ Places a blank border around the edges of the image. This can be used if for one <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<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/kivio/kiviopart/ui/kivio_birdeye_panel.cpp b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp index 6d8b83556..55b88d82e 100644 --- a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp +++ b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp @@ -18,32 +18,32 @@ #include <kiconloader.h> #include <kapplication.h> -#include <qpixmap.h> -#include <qslider.h> -#include <qspinbox.h> -#include <qframe.h> -#include <qcursor.h> -#include <qtoolbutton.h> +#include <tqpixmap.h> +#include <tqslider.h> +#include <tqspinbox.h> +#include <tqframe.h> +#include <tqcursor.h> +#include <tqtoolbutton.h> #define TOGGLE_ACTION(X) ((KToggleAction*)child(X)) -KivioBirdEyePanel::KivioBirdEyePanel(KivioView* view, QWidget* parent, const char* name) -: KivioBirdEyePanelBase(parent, name), m_pView(view), m_pCanvas(view->canvasWidget()), m_pDoc(view->doc()) +KivioBirdEyePanel::KivioBirdEyePanel(KivioView* view, TQWidget* tqparent, const char* name) +: KivioBirdEyePanelBase(tqparent, name), m_pView(view), m_pCanvas(view->canvasWidget()), m_pDoc(view->doc()) { handlePress = false; - m_buffer = new QPixmap(); + m_buffer = new TQPixmap(); canvas->installEventFilter(this); m_zoomHandler = new KoZoomHandler; - connect( m_pDoc, SIGNAL( sig_updateView(KivioPage*)), SLOT(slotUpdateView(KivioPage*)) ); - connect( m_pView, SIGNAL(zoomChanged(int)), SLOT(canvasZoomChanged(int))); - connect( m_pCanvas, SIGNAL(visibleAreaChanged()), SLOT(updateView())); + connect( m_pDoc, TQT_SIGNAL( sig_updateView(KivioPage*)), TQT_SLOT(slotUpdateView(KivioPage*)) ); + connect( m_pView, TQT_SIGNAL(zoomChanged(int)), TQT_SLOT(canvasZoomChanged(int))); + connect( m_pCanvas, TQT_SIGNAL(visibleAreaChanged()), TQT_SLOT(updateView())); m_zoomOutButton->setIconSet(SmallIconSet("viewmag-", 16)); m_zoomInButton->setIconSet(SmallIconSet("viewmag+", 16)); - connect(m_zoomOutButton, SIGNAL(clicked()), this, SLOT(zoomMinus())); - connect(m_zoomInButton, SIGNAL(clicked()), this, SLOT(zoomPlus())); - connect(m_zoomSlider, SIGNAL(valueChanged(int)), m_pView, SLOT(viewZoom(int))); + connect(m_zoomOutButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(zoomMinus())); + connect(m_zoomInButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(zoomPlus())); + connect(m_zoomSlider, TQT_SIGNAL(valueChanged(int)), m_pView, TQT_SLOT(viewZoom(int))); canvasZoomChanged(m_pView->zoomHandler()->zoom()); } @@ -56,12 +56,12 @@ KivioBirdEyePanel::~KivioBirdEyePanel() void KivioBirdEyePanel::zoomMinus() { - m_pCanvas->zoomOut(QPoint(m_pCanvas->width() / 2, m_pCanvas->height() / 2)); + m_pCanvas->zoomOut(TQPoint(m_pCanvas->width() / 2, m_pCanvas->height() / 2)); } void KivioBirdEyePanel::zoomPlus() { - m_pCanvas->zoomIn(QPoint(m_pCanvas->width() / 2, m_pCanvas->height() / 2)); + m_pCanvas->zoomIn(TQPoint(m_pCanvas->width() / 2, m_pCanvas->height() / 2)); } void KivioBirdEyePanel::canvasZoomChanged(int zoom) @@ -82,25 +82,25 @@ void KivioBirdEyePanel::slotUpdateView(KivioPage* page) updateView(); } -bool KivioBirdEyePanel::eventFilter(QObject* o, QEvent* ev) +bool KivioBirdEyePanel::eventFilter(TQObject* o, TQEvent* ev) { - if (o == canvas && ev->type() == QEvent::Show) { + if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(canvas) && ev->type() == TQEvent::Show) { updateView(); } - if (o == canvas && ev->type() == QEvent::Resize) { + if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(canvas) && ev->type() == TQEvent::Resize) { m_buffer->resize(canvas->size()); slotUpdateView(m_pView->activePage()); } - if (o == canvas && ev->type() == QEvent::Paint) { + if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(canvas) && ev->type() == TQEvent::Paint) { updateView(); return true; } - if (o == canvas && ev->type() == QEvent::MouseMove) { - QMouseEvent* me = (QMouseEvent*)ev; - if (me->state() == LeftButton) + if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(canvas) && ev->type() == TQEvent::MouseMove) { + TQMouseEvent* me = TQT_TQMOUSEEVENT(ev); + if (me->state() == Qt::LeftButton) handleMouseMoveAction(me->pos()); else handleMouseMove(me->pos()); @@ -109,9 +109,9 @@ bool KivioBirdEyePanel::eventFilter(QObject* o, QEvent* ev) return true; } - if (o == canvas && ev->type() == QEvent::MouseButtonPress) { - QMouseEvent* me = (QMouseEvent*)ev; - if (me->button() == LeftButton) + if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(canvas) && ev->type() == TQEvent::MouseButtonPress) { + TQMouseEvent* me = TQT_TQMOUSEEVENT(ev); + if (me->button() == Qt::LeftButton) handleMousePress(me->pos()); return true; @@ -130,14 +130,14 @@ void KivioBirdEyePanel::updateView() int pw = m_zoomHandler->zoomItX(pl.ptWidth); int ph = m_zoomHandler->zoomItY(pl.ptHeight); - QSize s2 = QSize(pw,ph); - QSize s1 = canvas->size(); + TQSize s2 = TQSize(pw,ph); + TQSize s1 = canvas->size(); double zx = (double)s1.width()/(double)s2.width(); double zy = (double)s1.height()/(double)s2.height(); - double zxy = QMIN(zx,zy); + double zxy = TQMIN(zx,zy); - m_zoomHandler->setZoomAndResolution(qRound(zxy * 100), KoGlobal::dpiX(), + m_zoomHandler->setZoomAndResolution(tqRound(zxy * 100), KoGlobal::dpiX(), KoGlobal::dpiY()); pw = m_zoomHandler->zoomItX(pl.ptWidth); @@ -145,13 +145,13 @@ void KivioBirdEyePanel::updateView() int px0 = (s1.width()-pw)/2; int py0 = (s1.height()-ph)/2; - QPoint p0 = QPoint(px0,py0); + TQPoint p0 = TQPoint(px0,py0); - QRect rect(QPoint(0,0),s1); + TQRect rect(TQPoint(0,0),s1); KivioScreenPainter kpainter; - kpainter.start(m_buffer); - kpainter.painter()->fillRect(rect, KApplication::palette().active().brush(QColorGroup::Mid)); + kpainter.start(TQT_TQPAINTDEVICE(m_buffer)); + kpainter.painter()->fillRect(rect, KApplication::tqpalette().active().brush(TQColorGroup::Mid)); kpainter.painter()->fillRect(px0, py0, pw, ph, white); @@ -176,39 +176,39 @@ void KivioBirdEyePanel::updateView() bitBlt(canvas,0,0,m_buffer); } -void KivioBirdEyePanel::handleMouseMove(QPoint p) +void KivioBirdEyePanel::handleMouseMove(TQPoint p) { handlePress = true; - QRect r1 = QRect(varea.x()-1, varea.y()-1, 3, varea.height()+2); - if (r1.contains(p)) { + TQRect r1 = TQRect(varea.x()-1, varea.y()-1, 3, varea.height()+2); + if (r1.tqcontains(p)) { canvas->setCursor(sizeHorCursor); apos = AlignLeft; return; } r1.moveBy(varea.width(),0); - if (r1.contains(p)) { + if (r1.tqcontains(p)) { canvas->setCursor(sizeHorCursor); apos = AlignRight; return; } - QRect r2 = QRect(varea.x()-1, varea.y()-1, varea.width()+2, 3); - if (r2.contains(p)) { + TQRect r2 = TQRect(varea.x()-1, varea.y()-1, varea.width()+2, 3); + if (r2.tqcontains(p)) { canvas->setCursor(sizeVerCursor); apos = AlignTop; return; } r2.moveBy(0, varea.height()); - if (r2.contains(p)) { + if (r2.tqcontains(p)) { canvas->setCursor(sizeVerCursor); apos = AlignBottom; return; } - if (varea.contains(p)) { + if (varea.tqcontains(p)) { canvas->setCursor(sizeAllCursor); apos = AlignCenter; return; @@ -218,7 +218,7 @@ void KivioBirdEyePanel::handleMouseMove(QPoint p) handlePress = false; } -void KivioBirdEyePanel::handleMouseMoveAction(QPoint p) +void KivioBirdEyePanel::handleMouseMoveAction(TQPoint p) { if (!handlePress) return; @@ -240,31 +240,31 @@ void KivioBirdEyePanel::handleMouseMoveAction(QPoint p) KoRect vr = m_pCanvas->visibleArea(); if (apos == AlignRight) { - vr.setWidth(QMAX(10.0, vr.width() + dx)); + vr.setWidth(TQMAX(10.0, vr.width() + dx)); m_pCanvas->setVisibleAreaByWidth(vr); } else if (apos == AlignLeft) { vr.setX(vr.x() + dx); - vr.setWidth(QMAX(10.0, vr.width() - dx)); + vr.setWidth(TQMAX(10.0, vr.width() - dx)); m_pCanvas->setVisibleAreaByWidth(vr); } else if (apos == AlignTop) { vr.setY(vr.y() + dy); - vr.setHeight(QMAX(10.0 ,vr.height() - dy)); + vr.setHeight(TQMAX(10.0 ,vr.height() - dy)); m_pCanvas->setVisibleAreaByHeight(vr); } else if (apos == AlignBottom) { - vr.setHeight(QMAX(10.0 ,vr.height() + dy)); + vr.setHeight(TQMAX(10.0 ,vr.height() + dy)); m_pCanvas->setVisibleAreaByHeight(vr); } } -void KivioBirdEyePanel::handleMousePress(QPoint p) +void KivioBirdEyePanel::handleMousePress(TQPoint p) { if (handlePress) return; - QSize s1 = canvas->size(); + TQSize s1 = canvas->size(); KoPageLayout pl = m_pView->activePage()->paperLayout(); int pw = m_zoomHandler->zoomItX(pl.ptWidth); int ph = m_zoomHandler->zoomItY(pl.ptHeight); diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel.h b/kivio/kiviopart/ui/kivio_birdeye_panel.h index 6a17fd853..1138663c0 100644 --- a/kivio/kiviopart/ui/kivio_birdeye_panel.h +++ b/kivio/kiviopart/ui/kivio_birdeye_panel.h @@ -21,7 +21,7 @@ #define KIVIOBIRDEYEPANEL_H #include "kivio_birdeye_panel_base.h" -class QPixmap; +class TQPixmap; class KivioView; class KivioCanvas; @@ -32,11 +32,12 @@ class KoZoomHandler; class KivioBirdEyePanel : public KivioBirdEyePanelBase { Q_OBJECT + TQ_OBJECT public: - KivioBirdEyePanel(KivioView* view, QWidget* parent=0, const char* name=0); + KivioBirdEyePanel(KivioView* view, TQWidget* tqparent=0, const char* name=0); ~KivioBirdEyePanel(); - bool eventFilter(QObject*, QEvent*); + bool eventFilter(TQObject*, TQEvent*); public slots: void zoomMinus(); @@ -48,9 +49,9 @@ protected slots: void slotUpdateView(KivioPage*); protected: - void handleMouseMove(QPoint); - void handleMouseMoveAction(QPoint); - void handleMousePress(QPoint); + void handleMouseMove(TQPoint); + void handleMouseMoveAction(TQPoint); + void handleMousePress(TQPoint); private: KivioView* m_pView; @@ -59,12 +60,12 @@ private: KAction* zoomIn; KAction* zoomOut; - QPixmap* m_buffer; + TQPixmap* m_buffer; - QRect varea; + TQRect varea; AlignmentFlags apos; bool handlePress; - QPoint lastPos; + TQPoint lastPos; KoZoomHandler* m_zoomHandler; }; diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel_base.ui b/kivio/kiviopart/ui/kivio_birdeye_panel_base.ui index e3e227727..5ede38452 100644 --- a/kivio/kiviopart/ui/kivio_birdeye_panel_base.ui +++ b/kivio/kiviopart/ui/kivio_birdeye_panel_base.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KivioBirdEyePanelBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KivioBirdEyePanelBase</cstring> </property> @@ -20,9 +20,9 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="layoutMargin" stdset="0"> + <property name="tqlayoutMargin" stdset="0"> </property> - <property name="layoutSpacing" stdset="0"> + <property name="tqlayoutSpacing" stdset="0"> </property> <grid> <property name="name"> @@ -34,7 +34,7 @@ <property name="spacing"> <number>3</number> </property> - <widget class="QFrame" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQFrame" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>canvas</cstring> </property> @@ -48,7 +48,7 @@ <enum>Raised</enum> </property> </widget> - <widget class="QToolButton" row="1" column="2"> + <widget class="TQToolButton" row="1" column="2"> <property name="name"> <cstring>m_zoomInButton</cstring> </property> @@ -59,7 +59,7 @@ <string>Zoom In 25%</string> </property> </widget> - <widget class="QToolButton" row="1" column="0"> + <widget class="TQToolButton" row="1" column="0"> <property name="name"> <cstring>m_zoomOutButton</cstring> </property> @@ -70,7 +70,7 @@ <string>Zoom Out 25%</string> </property> </widget> - <widget class="QSlider" row="1" column="1"> + <widget class="TQSlider" row="1" column="1"> <property name="name"> <cstring>m_zoomSlider</cstring> </property> @@ -98,11 +98,11 @@ <includes> <include location="local" impldecl="in declaration">kiconloader.h</include> </includes> -<slots> +<Q_SLOTS> <slot>zoomChanged(int)</slot> <slot>zoomMinus()</slot> <slot>zoomPlus()</slot> -</slots> +</Q_SLOTS> <pixmapfunction>BarIcon</pixmapfunction> -<layoutdefaults spacing="2" margin="0"/> +<tqlayoutdefaults spacing="2" margin="0"/> </UI> diff --git a/kivio/kiviopart/ui/kivio_layer_panel.cpp b/kivio/kiviopart/ui/kivio_layer_panel.cpp index 481a5644f..92161ba3f 100644 --- a/kivio/kiviopart/ui/kivio_layer_panel.cpp +++ b/kivio/kiviopart/ui/kivio_layer_panel.cpp @@ -26,8 +26,8 @@ #include "kivio_command.h" #include "layerlisttooltip.h" -#include <qheader.h> -#include <qlayout.h> +#include <tqheader.h> +#include <tqlayout.h> #include <ktoolbar.h> #include <klocale.h> @@ -35,11 +35,11 @@ #include <kiconloader.h> #include <kinputdialog.h> -KivioLayerItem::KivioLayerItem(QListView* parent, KivioLayer* d, int id) -: QListViewItem(parent), data(d) +KivioLayerItem::KivioLayerItem(TQListView* tqparent, KivioLayer* d, int id) +: TQListViewItem(tqparent), data(d) { - QString ids; - QString space; + TQString ids; + TQString space; ids.setNum(id); space.fill(' ',10-ids.length()); ids.prepend(space); @@ -63,8 +63,8 @@ void KivioLayerItem::update() /*********************************************************/ -KivioLayerPanel::KivioLayerPanel(KivioView* view, QWidget* parent, const char* name) -: KivioLayerPanelBase(parent, name), m_pView(view) +KivioLayerPanel::KivioLayerPanel(KivioView* view, TQWidget* tqparent, const char* name) +: KivioLayerPanelBase(tqparent, name), m_pView(view) { list->header()->hide(); list->addColumn(i18n("View"),15); @@ -75,11 +75,11 @@ KivioLayerPanel::KivioLayerPanel(KivioView* view, QWidget* parent, const char* n list->setSorting(5, false); list->installEventFilter(this); - actNew = new KAction( i18n("New Layer"), BarIcon("layer_add",KivioFactory::global()), 0, this, SLOT(addItem()), this); - actDel = new KAction( i18n("Remove Layer"), BarIcon("layer_remove",KivioFactory::global()), 0, this, SLOT(removeItem()), this); - actRename = new KAction( i18n("Rename Layer"), BarIcon("item_rename",KivioFactory::global()), 0, this, SLOT(renameItem()), this); - actUp = new KAction( i18n("Move Layer Up"), "up", 0, this, SLOT(upItem()), this); - actDown = new KAction( i18n("Move Layer Down"), "down", 0, this, SLOT(downItem()), this); + actNew = new KAction( i18n("New Layer"), BarIcon("layer_add",KivioFactory::global()), 0, TQT_TQOBJECT(this), TQT_SLOT(addItem()), TQT_TQOBJECT(this)); + actDel = new KAction( i18n("Remove Layer"), BarIcon("layer_remove",KivioFactory::global()), 0, TQT_TQOBJECT(this), TQT_SLOT(removeItem()), TQT_TQOBJECT(this)); + actRename = new KAction( i18n("Rename Layer"), BarIcon("item_rename",KivioFactory::global()), 0, TQT_TQOBJECT(this), TQT_SLOT(renameItem()), TQT_TQOBJECT(this)); + actUp = new KAction( i18n("Move Layer Up"), "up", 0, TQT_TQOBJECT(this), TQT_SLOT(upItem()), TQT_TQOBJECT(this)); + actDown = new KAction( i18n("Move Layer Down"), "down", 0, TQT_TQOBJECT(this), TQT_SLOT(downItem()), TQT_TQOBJECT(this)); actNew->plug(bar); actDel->plug(bar); @@ -96,9 +96,9 @@ KivioLayerPanel::~KivioLayerPanel() { } -bool KivioLayerPanel::eventFilter(QObject* o, QEvent* ev) +bool KivioLayerPanel::eventFilter(TQObject* o, TQEvent* ev) { - if (o == list && (ev->type() == QEvent::LayoutHint || ev->type() == QEvent::Resize)) { + if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(list) && (ev->type() == TQEvent::LayoutHint || ev->type() == TQEvent::Resize)) { int s = list->width() - 2*(list->margin() + list->lineWidth()); s -= list->header()->sectionSize(0); s -= list->header()->sectionSize(1); @@ -108,7 +108,7 @@ bool KivioLayerPanel::eventFilter(QObject* o, QEvent* ev) list->triggerUpdate(); } - return QWidget::eventFilter(o, ev); + return TQWidget::eventFilter(o, ev); } void KivioLayerPanel::addItem() @@ -118,7 +118,7 @@ void KivioLayerPanel::addItem() // Set the layer name to something a bit different. This isn't // guaranteed to be unique, but it's better than "Untitled" - layer->setName(i18n("Layer %1").arg(id)); + layer->setName(i18n("Layer %1").tqarg(id)); page->addLayer(layer); page->setCurLayer(layer); @@ -153,10 +153,10 @@ void KivioLayerPanel::renameItem() return; KivioLayer* layer = i->data; - QString oldText = layer->name(); + TQString oldText = layer->name(); bool ok=false; - QString newName = KInputDialog::getText(i18n("Rename Layer"), + TQString newName = KInputDialog::getText(i18n("Rename Layer"), i18n("Layer name:"), oldText, &ok, this); if (ok) { @@ -174,14 +174,14 @@ void KivioLayerPanel::upItem() if (!item) return; - QListViewItem* above = item->itemAbove(); + TQListViewItem* above = item->itemAbove(); if (!above) return; KivioPage* page = m_pView->activePage(); KivioLayer* layer = item->data; - int pos = page->layers()->find(layer); + int pos = page->layers()->tqfind(layer); // It's already the top layer... return if(pos == (static_cast<int>(page->layers()->count()) - 1)) return; @@ -192,7 +192,7 @@ void KivioLayerPanel::upItem() page->layers()->insert(pos + 1, layer); - QString t = above->text(5); + TQString t = above->text(5); above->setText(5,item->text(5)); item->setText(5,t); @@ -210,14 +210,14 @@ void KivioLayerPanel::downItem() if (!item) return; - QListViewItem* below = item->itemBelow(); + TQListViewItem* below = item->itemBelow(); if (!below) return; KivioPage* page = m_pView->activePage(); KivioLayer* layer = item->data; - int pos = page->layers()->find(layer); + int pos = page->layers()->tqfind(layer); // It's already the bottom layer... return if (pos == 0) return; @@ -228,7 +228,7 @@ void KivioLayerPanel::downItem() page->layers()->insert(pos - 1, layer); - QString t = below->text(5); + TQString t = below->text(5); below->setText(5,item->text(5)); item->setText(5,t); @@ -240,7 +240,7 @@ void KivioLayerPanel::downItem() m_pView->doc()->updateView(page); } -void KivioLayerPanel::updateButtons(QListViewItem* i) +void KivioLayerPanel::updateButtons(TQListViewItem* i) { if (!i) { actDel->setEnabled(false); @@ -260,7 +260,7 @@ void KivioLayerPanel::updateButtons(QListViewItem* i) } } -void KivioLayerPanel::itemClicked(QListViewItem* i, const QPoint&, int c) +void KivioLayerPanel::itemClicked(TQListViewItem* i, const TQPoint&, int c) { if(!i) { return; @@ -291,7 +291,7 @@ void KivioLayerPanel::itemClicked(QListViewItem* i, const QPoint&, int c) m_pView->doc()->updateView(m_pView->activePage()); } -void KivioLayerPanel::itemActivated(QListViewItem* i) +void KivioLayerPanel::itemActivated(TQListViewItem* i) { if (!i) return; @@ -320,7 +320,7 @@ void KivioLayerPanel::reset() KivioPage* page = m_pView->activePage(); KivioLayer* layer = page->firstLayer(); - QListViewItem* ci = 0; + TQListViewItem* ci = 0; while (layer) { KivioLayerItem* i = new KivioLayerItem(list, layer, id++); diff --git a/kivio/kiviopart/ui/kivio_layer_panel.h b/kivio/kiviopart/ui/kivio_layer_panel.h index 4f781313f..55a908c21 100644 --- a/kivio/kiviopart/ui/kivio_layer_panel.h +++ b/kivio/kiviopart/ui/kivio_layer_panel.h @@ -24,15 +24,15 @@ class KAction; class KivioView; class KivioLayer; -#include <qlistview.h> +#include <tqlistview.h> #include "kivio_layer_panel_base.h" -class KivioLayerItem: public QListViewItem +class KivioLayerItem: public TQListViewItem { friend class KivioLayerPanel; public: - KivioLayerItem(QListView* parent, KivioLayer*, int id); + KivioLayerItem(TQListView* tqparent, KivioLayer*, int id); ~KivioLayerItem(); KivioLayer* layer() const { return data; } @@ -49,11 +49,12 @@ class KivioLayerItem: public QListViewItem class KivioLayerPanel : public KivioLayerPanelBase { Q_OBJECT + TQ_OBJECT public: - KivioLayerPanel(KivioView* view, QWidget* parent=0, const char* name=0); + KivioLayerPanel(KivioView* view, TQWidget* tqparent=0, const char* name=0); ~KivioLayerPanel(); - bool eventFilter(QObject*, QEvent*); + bool eventFilter(TQObject*, TQEvent*); public slots: void reset(); @@ -65,9 +66,9 @@ class KivioLayerPanel : public KivioLayerPanelBase void upItem(); void downItem(); - void itemClicked(QListViewItem*, const QPoint&, int); - void itemActivated(QListViewItem*); - void updateButtons(QListViewItem*); + void itemClicked(TQListViewItem*, const TQPoint&, int); + void itemActivated(TQListViewItem*); + void updateButtons(TQListViewItem*); private: KivioView* m_pView; diff --git a/kivio/kiviopart/ui/kivio_layer_panel_base.ui b/kivio/kiviopart/ui/kivio_layer_panel_base.ui index 86733819b..f6e73ae83 100644 --- a/kivio/kiviopart/ui/kivio_layer_panel_base.ui +++ b/kivio/kiviopart/ui/kivio_layer_panel_base.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KivioLayerPanelBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KivioLayerPanelBase</cstring> </property> @@ -12,9 +12,9 @@ <height>268</height> </rect> </property> - <property name="layoutMargin" stdset="0"> + <property name="tqlayoutMargin" stdset="0"> </property> - <property name="layoutSpacing" stdset="0"> + <property name="tqlayoutSpacing" stdset="0"> </property> <vbox> <property name="name"> @@ -31,7 +31,7 @@ <cstring>bar</cstring> </property> </widget> - <widget class="QListView"> + <widget class="TQListView"> <property name="name"> <cstring>list</cstring> </property> @@ -70,29 +70,29 @@ <connections> <connection> <sender>list</sender> - <signal>currentChanged(QListViewItem*)</signal> + <signal>currentChanged(TQListViewItem*)</signal> <receiver>KivioLayerPanelBase</receiver> - <slot>updateButtons(QListViewItem*)</slot> + <slot>updateButtons(TQListViewItem*)</slot> </connection> <connection> <sender>list</sender> - <signal>currentChanged(QListViewItem*)</signal> + <signal>currentChanged(TQListViewItem*)</signal> <receiver>KivioLayerPanelBase</receiver> - <slot>itemActivated(QListViewItem*)</slot> + <slot>itemActivated(TQListViewItem*)</slot> </connection> <connection> <sender>list</sender> - <signal>clicked(QListViewItem*,const QPoint&,int)</signal> + <signal>clicked(TQListViewItem*,const QPoint&,int)</signal> <receiver>KivioLayerPanelBase</receiver> - <slot>itemClicked(QListViewItem*,const QPoint&,int)</slot> + <slot>itemClicked(TQListViewItem*,const QPoint&,int)</slot> </connection> </connections> -<slots> - <slot access="protected">itemActivated(QListViewItem*)</slot> - <slot access="protected">itemClicked(QListViewItem*,const QPoint&,int)</slot> - <slot access="protected">updateButtons(QListViewItem*)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +<Q_SLOTS> + <slot access="protected">itemActivated(TQListViewItem*)</slot> + <slot access="protected">itemClicked(TQListViewItem*,const QPoint&,int)</slot> + <slot access="protected">updateButtons(TQListViewItem*)</slot> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>ktoolbar.h</includehint> </includehints> diff --git a/kivio/kiviopart/ui/kivio_protection_panel.cpp b/kivio/kiviopart/ui/kivio_protection_panel.cpp index 29ac57946..f95211517 100644 --- a/kivio/kiviopart/ui/kivio_protection_panel.cpp +++ b/kivio/kiviopart/ui/kivio_protection_panel.cpp @@ -26,21 +26,21 @@ #include "kivio_view.h" #include "kivio_command.h" -#include <qbitarray.h> -#include <qcheckbox.h> +#include <tqbitarray.h> +#include <tqcheckbox.h> #include <kaction.h> #include <kdebug.h> #include <klocale.h> -KivioProtectionPanel::KivioProtectionPanel( KivioView *view, QWidget *parent, const char *name ) - : KivioProtectionPanelBase(parent, name), m_pView(view) +KivioProtectionPanel::KivioProtectionPanel( KivioView *view, TQWidget *tqparent, const char *name ) + : KivioProtectionPanelBase(tqparent, name), m_pView(view) { - QObject::connect( m_checkWidth, SIGNAL(toggled(bool)), this, SLOT(togWidth(bool)) ); - QObject::connect( m_checkHeight, SIGNAL(toggled(bool)), this, SLOT(togHeight(bool)) ); - QObject::connect( m_checkAspect, SIGNAL(toggled(bool)), this, SLOT(togAspect(bool)) ); - QObject::connect( m_checkDeletion, SIGNAL(toggled(bool)), this, SLOT(togDelete(bool)) ); - QObject::connect( m_checkXPosition, SIGNAL(toggled(bool)), this, SLOT(togX(bool)) ); - QObject::connect( m_checkYPosition, SIGNAL(toggled(bool)), this, SLOT(togY(bool)) ); + TQObject::connect( m_checkWidth, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togWidth(bool)) ); + TQObject::connect( m_checkHeight, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togHeight(bool)) ); + TQObject::connect( m_checkAspect, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togAspect(bool)) ); + TQObject::connect( m_checkDeletion, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togDelete(bool)) ); + TQObject::connect( m_checkXPosition, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togX(bool)) ); + TQObject::connect( m_checkYPosition, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togY(bool)) ); } KivioProtectionPanel::~KivioProtectionPanel() @@ -233,7 +233,7 @@ void KivioProtectionPanel::updateCheckBoxes() return; } - QBitArray bits( NUM_PROTECTIONS ); + TQBitArray bits( NUM_PROTECTIONS ); int i; // Assume all protections are valid by default @@ -257,12 +257,12 @@ void KivioProtectionPanel::updateCheckBoxes() pStencil = m_pView->activePage()->selectedStencils()->next(); } - QObject::disconnect(m_checkWidth, SIGNAL(toggled(bool)), this, SLOT(togWidth(bool))); - QObject::disconnect(m_checkHeight, SIGNAL(toggled(bool)), this, SLOT(togHeight(bool))); - QObject::disconnect(m_checkAspect, SIGNAL(toggled(bool)), this, SLOT(togAspect(bool))); - QObject::disconnect(m_checkDeletion, SIGNAL(toggled(bool)), this, SLOT(togDelete(bool))); - QObject::disconnect(m_checkXPosition, SIGNAL(toggled(bool)), this, SLOT(togX(bool))); - QObject::disconnect(m_checkYPosition, SIGNAL(toggled(bool)), this, SLOT(togY(bool))); + TQObject::disconnect(m_checkWidth, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togWidth(bool))); + TQObject::disconnect(m_checkHeight, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togHeight(bool))); + TQObject::disconnect(m_checkAspect, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togAspect(bool))); + TQObject::disconnect(m_checkDeletion, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togDelete(bool))); + TQObject::disconnect(m_checkXPosition, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togX(bool))); + TQObject::disconnect(m_checkYPosition, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togY(bool))); // Enable and disable the check boxes based on what protections are available for(i = 0; i < NUM_PROTECTIONS; i++) { @@ -319,10 +319,10 @@ void KivioProtectionPanel::updateCheckBoxes() m_checkHeight->setChecked( pStencil->protection()->at(kpHeight) ); } - QObject::connect(m_checkWidth, SIGNAL(toggled(bool)), this, SLOT(togWidth(bool))); - QObject::connect(m_checkHeight, SIGNAL(toggled(bool)), this, SLOT(togHeight(bool))); - QObject::connect(m_checkAspect, SIGNAL(toggled(bool)), this, SLOT(togAspect(bool))); - QObject::connect(m_checkDeletion, SIGNAL(toggled(bool)), this, SLOT(togDelete(bool))); - QObject::connect(m_checkXPosition, SIGNAL(toggled(bool)), this, SLOT(togX(bool))); - QObject::connect(m_checkYPosition, SIGNAL(toggled(bool)), this, SLOT(togY(bool))); + TQObject::connect(m_checkWidth, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togWidth(bool))); + TQObject::connect(m_checkHeight, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togHeight(bool))); + TQObject::connect(m_checkAspect, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togAspect(bool))); + TQObject::connect(m_checkDeletion, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togDelete(bool))); + TQObject::connect(m_checkXPosition, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togX(bool))); + TQObject::connect(m_checkYPosition, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(togY(bool))); } diff --git a/kivio/kiviopart/ui/kivio_protection_panel.h b/kivio/kiviopart/ui/kivio_protection_panel.h index b8ea9d007..3fd806951 100644 --- a/kivio/kiviopart/ui/kivio_protection_panel.h +++ b/kivio/kiviopart/ui/kivio_protection_panel.h @@ -28,9 +28,10 @@ class KivioLayer; class KivioProtectionPanel : public KivioProtectionPanelBase { Q_OBJECT + TQ_OBJECT public: - KivioProtectionPanel( KivioView *view, QWidget *parent=0, const char *name=0 ); + KivioProtectionPanel( KivioView *view, TQWidget *tqparent=0, const char *name=0 ); virtual ~KivioProtectionPanel(); public slots: diff --git a/kivio/kiviopart/ui/kivio_protection_panel_base.ui b/kivio/kiviopart/ui/kivio_protection_panel_base.ui index 6d15aa7e6..19bd2a6e4 100644 --- a/kivio/kiviopart/ui/kivio_protection_panel_base.ui +++ b/kivio/kiviopart/ui/kivio_protection_panel_base.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KivioProtectionPanelBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KivioProtectionPanelBase</cstring> </property> @@ -12,13 +12,13 @@ <height>147</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -31,7 +31,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkWidth</cstring> </property> @@ -42,7 +42,7 @@ <string>Toggles the ability to change the width of the selected stencils</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkHeight</cstring> </property> @@ -53,7 +53,7 @@ <string>Toggles the ability to change the height of the selected stencils</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkAspect</cstring> </property> @@ -64,7 +64,7 @@ <string>Toggles the ability to change the aspect ratio of the selected stencils</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkXPosition</cstring> </property> @@ -75,7 +75,7 @@ <string>Toggles the ability to protect the x position of the selected stencils</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkYPosition</cstring> </property> @@ -86,7 +86,7 @@ <string>Toggles the ability to protect the y position of the selected stencils</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_checkDeletion</cstring> </property> @@ -107,7 +107,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>281</height> @@ -124,5 +124,5 @@ <tabstop>m_checkYPosition</tabstop> <tabstop>m_checkDeletion</tabstop> </tabstops> -<layoutdefaults spacing="2" margin="0"/> +<tqlayoutdefaults spacing="2" margin="0"/> </UI> diff --git a/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp index da7e6685d..acc2e63a2 100644 --- a/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp +++ b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp @@ -18,14 +18,14 @@ */ #include "kivioaddstencilsetpanel.h" -#include <qfile.h> -#include <qdir.h> -#include <qstringlist.h> -#include <qiconview.h> -#include <qgroupbox.h> -#include <qpushbutton.h> -#include <qtextbrowser.h> -#include <qsplitter.h> +#include <tqfile.h> +#include <tqdir.h> +#include <tqstringlist.h> +#include <tqiconview.h> +#include <tqgroupbox.h> +#include <tqpushbutton.h> +#include <tqtextbrowser.h> +#include <tqsplitter.h> #include <kstandarddirs.h> #include <kglobal.h> @@ -38,19 +38,19 @@ #include "kivioglobal.h" namespace Kivio { - AddStencilSetPanel::AddStencilSetPanel(QWidget *parent, const char *name) - : KivioStencilSetWidget(parent, name) + AddStencilSetPanel::AddStencilSetPanel(TQWidget *tqparent, const char *name) + : KivioStencilSetWidget(tqparent, name) { int height = m_stencilsetGBox->height() / 2; - QValueList<int> sizes; + TQValueList<int> sizes; sizes << height << height; m_stencilSetSplitter->setSizes(sizes); updateList(); - connect(m_stencilSetLView, SIGNAL(selectionChanged(QListViewItem*)), this, SLOT(changeStencilSet(QListViewItem*))); - connect(m_addToDocBtn, SIGNAL(clicked()), this, SLOT(addToDocument())); + connect(m_stencilSetLView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(changeStencilSet(TQListViewItem*))); + connect(m_addToDocBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(addToDocument())); - QListViewItem* tmp = m_stencilSetLView->firstChild(); + TQListViewItem* tmp = m_stencilSetLView->firstChild(); if(tmp) { tmp = tmp->firstChild(); @@ -73,35 +73,35 @@ namespace Kivio { void AddStencilSetPanel::updateList() { KStandardDirs *dirs = KGlobal::dirs(); - QStringList dirList = dirs->findDirs("data", "kivio/stencils"); + TQStringList dirList = dirs->findDirs("data", "kivio/stencils"); dirList.sort(); m_stencilSetLView->clear(); - for(QStringList::Iterator it = dirList.begin(); it != dirList.end(); ++it) + for(TQStringList::Iterator it = dirList.begin(); it != dirList.end(); ++it) { - QString dir = (*it); + TQString dir = (*it); loadCollections(dir); } } - void AddStencilSetPanel::loadCollections(const QString& dir) + void AddStencilSetPanel::loadCollections(const TQString& dir) { - QDir rootDir( dir ); + TQDir rootDir( dir ); - rootDir.setFilter( QDir::Dirs ); - rootDir.setSorting( QDir::Name ); + rootDir.setFilter( TQDir::Dirs ); + rootDir.setSorting( TQDir::Name ); - const QFileInfoList *colList = rootDir.entryInfoList(); - QFileInfoListIterator colIt( *colList ); - QFileInfo *colFInfo; - QString cId; + const TQFileInfoList *colList = rootDir.entryInfoList(); + TQFileInfoListIterator colIt( *colList ); + TQFileInfo *colFInfo; + TQString cId; while((colFInfo = colIt.current())) { if((colFInfo->fileName() != "..") && (colFInfo->fileName() != ".")) { cId = KivioStencilSpawnerSet::readId(colFInfo->absFilePath()); - QListViewItem* li = m_stencilSetLView->firstChild(); + TQListViewItem* li = m_stencilSetLView->firstChild(); while(li) { if(li->text(1) == cId) { @@ -125,16 +125,16 @@ namespace Kivio { } } - void AddStencilSetPanel::loadStencilSet(QListViewItem* li, const QString& dir) + void AddStencilSetPanel::loadStencilSet(TQListViewItem* li, const TQString& dir) { - QDir rootDir( dir ); + TQDir rootDir( dir ); - rootDir.setFilter( QDir::Dirs ); - rootDir.setSorting( QDir::Name ); + rootDir.setFilter( TQDir::Dirs ); + rootDir.setSorting( TQDir::Name ); - const QFileInfoList *setList = rootDir.entryInfoList(); - QFileInfoListIterator setIt( *setList ); - QFileInfo *setFInfo; + const TQFileInfoList *setList = rootDir.entryInfoList(); + TQFileInfoListIterator setIt( *setList ); + TQFileInfo *setFInfo; while( (setFInfo = setIt.current()) ) { @@ -154,24 +154,24 @@ namespace Kivio { } } - QPixmap AddStencilSetPanel::loadIcon(const QString& name, const QString& dir) + TQPixmap AddStencilSetPanel::loadIcon(const TQString& name, const TQString& dir) { - QString fs; + TQString fs; - if( QFile::exists(dir + "/" + name + ".xpm") ) { + if( TQFile::exists(dir + "/" + name + ".xpm") ) { fs = dir + "/" + name + ".xpm"; - } else if( QFile::exists(dir + "/" + name + ".png") ) { + } else if( TQFile::exists(dir + "/" + name + ".png") ) { fs = dir + "/" + name + ".png"; } else { - return QPixmap(); + return TQPixmap(); } - return QPixmap( fs ); + return TQPixmap( fs ); } - void AddStencilSetPanel::changeStencilSet(QListViewItem* li) + void AddStencilSetPanel::changeStencilSet(TQListViewItem* li) { - if(!li || !li->parent()) { + if(!li || !li->tqparent()) { return; } @@ -181,7 +181,7 @@ namespace Kivio { // Load the stencil icons m_currentDir = li->text(1); spawnerSet->loadDir(m_currentDir); - QStringList files = spawnerSet->files(); + TQStringList files = spawnerSet->files(); // Remove the old icons m_stencilIView->clear(); @@ -189,7 +189,7 @@ namespace Kivio { KivioStencil* stencil = 0; int count = 0; - for(QStringList::Iterator it = files.begin(); it != files.end(); ++it) + for(TQStringList::Iterator it = files.begin(); it != files.end(); ++it) { spawner = spawnerSet->loadFile(m_currentDir + "/" + (*it)); @@ -197,7 +197,7 @@ namespace Kivio { stencil = spawner->newStencil(); if(stencil) { - (void) new QIconViewItem(m_stencilIView, spawner->info()->title(), Kivio::generatePixmapFromStencil(32, 32, stencil)); + (void) new TQIconViewItem(m_stencilIView, spawner->info()->title(), Kivio::generatePixmapFromStencil(32, 32, stencil)); delete stencil; count++; } diff --git a/kivio/kiviopart/ui/kivioaddstencilsetpanel.h b/kivio/kiviopart/ui/kivioaddstencilsetpanel.h index c4e1cf10f..802c54da1 100644 --- a/kivio/kiviopart/ui/kivioaddstencilsetpanel.h +++ b/kivio/kiviopart/ui/kivioaddstencilsetpanel.h @@ -21,35 +21,36 @@ #include "kiviostencilsetwidget.h" -#include <qpixmap.h> +#include <tqpixmap.h> -class QListViewItem; +class TQListViewItem; namespace Kivio { class AddStencilSetPanel : public KivioStencilSetWidget { Q_OBJECT + TQ_OBJECT public: - AddStencilSetPanel(QWidget *parent = 0, const char *name = 0); + AddStencilSetPanel(TQWidget *tqparent = 0, const char *name = 0); ~AddStencilSetPanel(); public slots: void updateList(); signals: - void addStencilSet(const QString&); + void addStencilSet(const TQString&); protected slots: - void changeStencilSet(QListViewItem* li); + void changeStencilSet(TQListViewItem* li); void addToDocument(); protected: - void loadCollections(const QString& dir); - void loadStencilSet(QListViewItem* li, const QString& dir); - QPixmap loadIcon(const QString& name, const QString& dir); + void loadCollections(const TQString& dir); + void loadStencilSet(TQListViewItem* li, const TQString& dir); + TQPixmap loadIcon(const TQString& name, const TQString& dir); private: - QString m_currentDir; + TQString m_currentDir; }; } diff --git a/kivio/kiviopart/ui/kivioaligndialog.cpp b/kivio/kiviopart/ui/kivioaligndialog.cpp index f72240747..03f0ac3ab 100644 --- a/kivio/kiviopart/ui/kivioaligndialog.cpp +++ b/kivio/kiviopart/ui/kivioaligndialog.cpp @@ -20,16 +20,16 @@ #include "kivioaligndialog.h" #include "kivioaligndialog.moc" -#include <qradiobutton.h> -#include <qcheckbox.h> +#include <tqradiobutton.h> +#include <tqcheckbox.h> #include <klocale.h> #include "kivio_page.h" #include "aligndialog.h" -KivioAlignDialog::KivioAlignDialog(QWidget* parent, const char* name) - : KDialogBase(parent, name, true, i18n("Align & Distribute"), Ok|Cancel, Ok) +KivioAlignDialog::KivioAlignDialog(TQWidget* tqparent, const char* name) + : KDialogBase(tqparent, name, true, i18n("Align & Distribute"), Ok|Cancel, Ok) { m_view = new KivioAlignDialogWidget(this); setMainWidget(m_view); diff --git a/kivio/kiviopart/ui/kivioaligndialog.h b/kivio/kiviopart/ui/kivioaligndialog.h index f15a017e6..18808b2c8 100644 --- a/kivio/kiviopart/ui/kivioaligndialog.h +++ b/kivio/kiviopart/ui/kivioaligndialog.h @@ -29,8 +29,9 @@ struct DistributeData; class KivioAlignDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KivioAlignDialog(QWidget* parent = 0, const char* name = 0); + KivioAlignDialog(TQWidget* tqparent = 0, const char* name = 0); AlignData align(); diff --git a/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp b/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp index 044295876..69312faf2 100644 --- a/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp +++ b/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp @@ -19,13 +19,13 @@ #include "kivioarrowheadformatdlg.h" -#include <qlabel.h> -#include <qgroupbox.h> -#include <qlayout.h> -#include <qbitmap.h> -#include <qpixmap.h> -#include <qpainter.h> -#include <qframe.h> +#include <tqlabel.h> +#include <tqgroupbox.h> +#include <tqlayout.h> +#include <tqbitmap.h> +#include <tqpixmap.h> +#include <tqpainter.h> +#include <tqframe.h> #include <kcombobox.h> #include <klocale.h> @@ -36,8 +36,8 @@ #include "kivio_view.h" #include "kivioglobal.h" -KivioArrowHeadFormatDlg::KivioArrowHeadFormatDlg(KivioView* parent, const char* name) - : KDialogBase(parent, name, true, i18n("Arrowhead Format"), Ok|Cancel|Default, Ok) +KivioArrowHeadFormatDlg::KivioArrowHeadFormatDlg(KivioView* tqparent, const char* name) + : KDialogBase(tqparent, name, true, i18n("Arrowhead Format"), Ok|Cancel|Default, Ok) { m_unit = KoUnit::U_PT; init(); @@ -45,42 +45,42 @@ KivioArrowHeadFormatDlg::KivioArrowHeadFormatDlg(KivioView* parent, const char* void KivioArrowHeadFormatDlg::init() { - QWidget* mainWidget = new QWidget(this); + TQWidget* mainWidget = new TQWidget(this); setMainWidget(mainWidget); - QGridLayout* gl = new QGridLayout(mainWidget, 2, 1, 0, KDialog::spacingHint()); + TQGridLayout* gl = new TQGridLayout(mainWidget, 2, 1, 0, KDialog::spacingHint()); - QLabel* startAHHeaderIcon = new QLabel(mainWidget); + TQLabel* startAHHeaderIcon = new TQLabel(mainWidget); startAHHeaderIcon->setPixmap(SmallIcon("start_arrowhead", 16)); startAHHeaderIcon->setFixedSize(16, 16); - QLabel* startAHHeaderLabel = new QLabel(i18n("<b>Arrowhead at Origin</b>"), mainWidget); - QFont font = startAHHeaderLabel->font(); - QFrame* startAHHeaderLine = new QFrame(mainWidget); - startAHHeaderLine->setFrameStyle(QFrame::HLine|QFrame::Plain); - QLabel* startAHTypeLbl = new QLabel(i18n("&Type:"), mainWidget); + TQLabel* startAHHeaderLabel = new TQLabel(i18n("<b>Arrowhead at Origin</b>"), mainWidget); + TQFont font = startAHHeaderLabel->font(); + TQFrame* startAHHeaderLine = new TQFrame(mainWidget); + startAHHeaderLine->setFrameStyle(TQFrame::HLine|TQFrame::Plain); + TQLabel* startAHTypeLbl = new TQLabel(i18n("&Type:"), mainWidget); m_startAHTypeCBox = new KComboBox(mainWidget); loadArrowHeads(m_startAHTypeCBox); startAHTypeLbl->setBuddy(m_startAHTypeCBox); - QLabel* startAHWidthLbl = new QLabel(i18n("&Width:"), mainWidget); + TQLabel* startAHWidthLbl = new TQLabel(i18n("&Width:"), mainWidget); m_startAHWidthUSBox = new KoUnitDoubleSpinBox(mainWidget, 0.0, 1000.0, 0.1, 1.0, m_unit, 2); startAHWidthLbl->setBuddy(m_startAHWidthUSBox); - QLabel* startAHHeightLbl = new QLabel(i18n("&Length:"), mainWidget); + TQLabel* startAHHeightLbl = new TQLabel(i18n("&Length:"), mainWidget); m_startAHHeightUSBox = new KoUnitDoubleSpinBox(mainWidget, 0.0, 1000.0, 0.1, 1.0, m_unit, 2); startAHHeightLbl->setBuddy(m_startAHHeightUSBox); - QLabel* endAHHeaderIcon = new QLabel(mainWidget); + TQLabel* endAHHeaderIcon = new TQLabel(mainWidget); endAHHeaderIcon->setPixmap(SmallIcon("end_arrowhead", 16)); endAHHeaderIcon->setFixedSize(16, 16); - QLabel* endAHHeaderLabel = new QLabel(i18n("<b>Arrowhead at End</b>"), mainWidget); - QFrame* endAHHeaderLine = new QFrame(mainWidget); - endAHHeaderLine->setFrameStyle(QFrame::HLine|QFrame::Plain); - QLabel* endAHTypeLbl = new QLabel(i18n("T&ype:"), mainWidget); + TQLabel* endAHHeaderLabel = new TQLabel(i18n("<b>Arrowhead at End</b>"), mainWidget); + TQFrame* endAHHeaderLine = new TQFrame(mainWidget); + endAHHeaderLine->setFrameStyle(TQFrame::HLine|TQFrame::Plain); + TQLabel* endAHTypeLbl = new TQLabel(i18n("T&ype:"), mainWidget); m_endAHTypeCBox = new KComboBox(mainWidget); loadArrowHeads(m_endAHTypeCBox); endAHTypeLbl->setBuddy(m_endAHTypeCBox); - QLabel* endAHWidthLbl = new QLabel(i18n("W&idth:"), mainWidget); + TQLabel* endAHWidthLbl = new TQLabel(i18n("W&idth:"), mainWidget); m_endAHWidthUSBox = new KoUnitDoubleSpinBox(mainWidget, 0.0, 1000.0, 0.1, 1.0, m_unit, 2); endAHWidthLbl->setBuddy(m_endAHWidthUSBox); - QLabel* endAHHeightLbl = new QLabel(i18n("L&ength:"), mainWidget); + TQLabel* endAHHeightLbl = new TQLabel(i18n("L&ength:"), mainWidget); m_endAHHeightUSBox = new KoUnitDoubleSpinBox(mainWidget, 0.0, 1000.0, 0.1, 1.0, m_unit, 2); endAHHeightLbl->setBuddy(m_endAHHeightUSBox); @@ -94,8 +94,8 @@ void KivioArrowHeadFormatDlg::init() gl->addMultiCellWidget(startAHHeightLbl, 4, 4, 0, 1); gl->addWidget(m_startAHHeightUSBox, 4, 2); - gl->addMultiCell(new QSpacerItem(KDialog::marginHint(), KDialog::marginHint(), - QSizePolicy::Minimum, QSizePolicy::Fixed), 5, 5, 0, 2); + gl->addMultiCell(new TQSpacerItem(KDialog::marginHint(), KDialog::marginHint(), + TQSizePolicy::Minimum, TQSizePolicy::Fixed), 5, 5, 0, 2); gl->addWidget(endAHHeaderIcon, 6, 0); gl->addMultiCellWidget(endAHHeaderLabel, 6, 6, 1, 2); @@ -111,10 +111,10 @@ void KivioArrowHeadFormatDlg::init() void KivioArrowHeadFormatDlg::loadArrowHeads(KComboBox* combo) { - QBitmap mask; - QPixmap pixAll = Kivio::arrowHeadPixmap(); - QPixmap pix(pixAll.width(), 17); - QPainter p(&pix, combo); + TQBitmap tqmask; + TQPixmap pixAll = Kivio::arrowHeadPixmap(); + TQPixmap pix(pixAll.width(), 17); + TQPainter p(&pix, combo); int cindex = 0; // insert item "None" diff --git a/kivio/kiviopart/ui/kivioarrowheadformatdlg.h b/kivio/kiviopart/ui/kivioarrowheadformatdlg.h index 6105b14c9..499127982 100644 --- a/kivio/kiviopart/ui/kivioarrowheadformatdlg.h +++ b/kivio/kiviopart/ui/kivioarrowheadformatdlg.h @@ -31,8 +31,9 @@ class KivioView; class KivioArrowHeadFormatDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KivioArrowHeadFormatDlg(KivioView* parent, const char* name = 0); + KivioArrowHeadFormatDlg(KivioView* tqparent, const char* name = 0); int startAHType(); double startAHWidth(); diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.cpp b/kivio/kiviopart/ui/kiviooptionsdialog.cpp index d19dce6d8..f6950f132 100644 --- a/kivio/kiviopart/ui/kiviooptionsdialog.cpp +++ b/kivio/kiviopart/ui/kiviooptionsdialog.cpp @@ -39,21 +39,21 @@ #include <kdebug.h> #include <kfontdialog.h> -#include <qlabel.h> -#include <qbuttongroup.h> -#include <qgroupbox.h> -#include <qcombobox.h> -#include <qcheckbox.h> -#include <qradiobutton.h> -#include <qlayout.h> -#include <qtabwidget.h> - -// GuidesListViewItem::GuidesListViewItem(QListView* parent, KivioGuideLineData *gd, KoUnit::Unit u) -// : KListViewItem(parent), m_data(gd) +#include <tqlabel.h> +#include <tqbuttongroup.h> +#include <tqgroupbox.h> +#include <tqcombobox.h> +#include <tqcheckbox.h> +#include <tqradiobutton.h> +#include <tqlayout.h> +#include <tqtabwidget.h> + +// GuidesListViewItem::GuidesListViewItem(TQListView* tqparent, KivioGuideLineData *gd, KoUnit::Unit u) +// : KListViewItem(tqparent), m_data(gd) // { // setPixmap(0, BarIcon(m_data->orientation() == Qt::Vertical ? // "guides_vertical":"guides_horizontal")); -// QString s = KGlobal::_locale->formatNumber(KoUnit::toUserValue(m_data->position(), u), 2); +// TQString s = KGlobal::_locale->formatNumber(KoUnit::toUserValue(m_data->position(), u), 2); // s += " " + KoUnit::unitName(u); // setText(1, s); // } @@ -65,7 +65,7 @@ // // void GuidesListViewItem::setUnit(KoUnit::Unit u) // { -// QString s = KGlobal::_locale->formatNumber(KoUnit::toUserValue(m_data->position(), u), 2); +// TQString s = KGlobal::_locale->formatNumber(KoUnit::toUserValue(m_data->position(), u), 2); // s += " " + KoUnit::unitName(u); // setText(1, s); // } @@ -73,7 +73,7 @@ // void GuidesListViewItem::setPosition(double p, KoUnit::Unit u) // { // m_data->setPosition(KoUnit::fromUserValue(p, u)); -// QString s = KGlobal::_locale->formatNumber(p, 2); +// TQString s = KGlobal::_locale->formatNumber(p, 2); // s += " " + KoUnit::unitName(u); // setText(1, s); // } @@ -87,79 +87,79 @@ /*****************************************************************************/ -KivioOptionsDialog::KivioOptionsDialog(KivioView* parent, const char* name) - : KDialogBase(IconList, i18n("Settings"), Ok|Cancel|Apply|Default, Ok, parent, name) +KivioOptionsDialog::KivioOptionsDialog(KivioView* tqparent, const char* name) + : KDialogBase(IconList, i18n("Settings"), Ok|Cancel|Apply|Default, Ok, tqparent, name) { initPage(); initGrid(); - unitChanged(parent->doc()->unit()); + unitChanged(tqparent->doc()->unit()); } void KivioOptionsDialog::initPage() { - QFrame* page = addPage(i18n("Page"), i18n("Page Settings"), + TQFrame* page = addPage(i18n("Page"), i18n("Page Settings"), kapp->iconLoader()->loadIcon("empty", KIcon::Toolbar, 32)); m_pageIndex = pageIndex(page); - KivioView* view = static_cast<KivioView*>(parent()); + KivioView* view = static_cast<KivioView*>(TQT_TQWIDGET(tqparent())); KoUnit::Unit unit = KoUnit::unit(Kivio::Config::unit()); m_layout = Kivio::Config::defaultPageLayout(); m_font = Kivio::Config::font(); - QLabel* unitLbl = new QLabel(i18n("Default &units:"), page); - m_unitCombo = new QComboBox(page); + TQLabel* unitLbl = new TQLabel(i18n("Default &units:"), page); + m_unitCombo = new TQComboBox(page); m_unitCombo->insertStringList(KoUnit::listOfUnitName()); m_unitCombo->setCurrentItem(unit); unitLbl->setBuddy(m_unitCombo); - QLabel* layoutLbl = new QLabel(i18n("Default layout:"), page); - m_layoutTxtLbl = new QLabel(page); - m_layoutTxtLbl->setFrameStyle(QFrame::LineEditPanel | QFrame::Sunken); - m_layoutTxtLbl->setSizePolicy(QSizePolicy( - QSizePolicy::Minimum, QSizePolicy::Fixed)); + TQLabel* tqlayoutLbl = new TQLabel(i18n("Default tqlayout:"), page); + m_layoutTxtLbl = new TQLabel(page); + m_layoutTxtLbl->setFrameStyle(TQFrame::LineEditPanel | TQFrame::Sunken); + m_layoutTxtLbl->tqsetSizePolicy(TQSizePolicy( + TQSizePolicy::Minimum, TQSizePolicy::Fixed)); setLayoutText(m_layout); - KPushButton* layoutBtn = new KPushButton(i18n("Change..."), page); - layoutBtn->setSizePolicy(QSizePolicy( - QSizePolicy::Fixed, QSizePolicy::Fixed)); - QLabel* fontLbl = new QLabel(i18n("Default font:"), page); - m_fontTxtLbl = new QLabel(page); - m_fontTxtLbl->setFrameStyle(QFrame::LineEditPanel | QFrame::Sunken); - m_fontTxtLbl->setSizePolicy(QSizePolicy( - QSizePolicy::Minimum, QSizePolicy::Fixed)); + KPushButton* tqlayoutBtn = new KPushButton(i18n("Change..."), page); + tqlayoutBtn->tqsetSizePolicy(TQSizePolicy( + TQSizePolicy::Fixed, TQSizePolicy::Fixed)); + TQLabel* fontLbl = new TQLabel(i18n("Default font:"), page); + m_fontTxtLbl = new TQLabel(page); + m_fontTxtLbl->setFrameStyle(TQFrame::LineEditPanel | TQFrame::Sunken); + m_fontTxtLbl->tqsetSizePolicy(TQSizePolicy( + TQSizePolicy::Minimum, TQSizePolicy::Fixed)); setFontText(m_font); KPushButton* fontBtn = new KPushButton(i18n("Change..."), page); - layoutBtn->setSizePolicy(QSizePolicy( - QSizePolicy::Fixed, QSizePolicy::Fixed)); - m_marginsChBox = new QCheckBox(i18n("Show page &margins"), page); + tqlayoutBtn->tqsetSizePolicy(TQSizePolicy( + TQSizePolicy::Fixed, TQSizePolicy::Fixed)); + m_marginsChBox = new TQCheckBox(i18n("Show page &margins"), page); m_marginsChBox->setChecked(view->isShowPageMargins()); - m_rulersChBox = new QCheckBox(i18n("Show page &rulers"), page); + m_rulersChBox = new TQCheckBox(i18n("Show page &rulers"), page); m_rulersChBox->setChecked(view->isShowRulers()); - QGridLayout* gl = new QGridLayout(page); + TQGridLayout* gl = new TQGridLayout(page); gl->setSpacing(KDialog::spacingHint()); gl->addWidget(unitLbl, 0, 0); gl->addMultiCellWidget(m_unitCombo, 0, 0, 1, 2); - gl->addWidget(layoutLbl, 1, 0); + gl->addWidget(tqlayoutLbl, 1, 0); gl->addWidget(m_layoutTxtLbl, 1, 1); - gl->addWidget(layoutBtn, 1, 2); + gl->addWidget(tqlayoutBtn, 1, 2); gl->addWidget(fontLbl, 2, 0); gl->addWidget(m_fontTxtLbl, 2, 1); gl->addWidget(fontBtn, 2, 2); gl->addMultiCellWidget(m_marginsChBox, 3, 3, 0, 2); gl->addMultiCellWidget(m_rulersChBox, 4, 4, 0, 2); - gl->addMultiCell(new QSpacerItem(0, 0), 5, 5, 0, 2); + gl->addMultiCell(new TQSpacerItem(0, 0), 5, 5, 0, 2); - connect(layoutBtn, SIGNAL(clicked()), SLOT(pageLayoutDlg())); - connect(fontBtn, SIGNAL(clicked()), SLOT(fontDlg())); - connect(m_unitCombo, SIGNAL(activated(int)), SLOT(unitChanged(int))); + connect(tqlayoutBtn, TQT_SIGNAL(clicked()), TQT_SLOT(pageLayoutDlg())); + connect(fontBtn, TQT_SIGNAL(clicked()), TQT_SLOT(fontDlg())); + connect(m_unitCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(unitChanged(int))); } void KivioOptionsDialog::initGrid() { - QFrame* page = addPage(i18n("Grid"), i18n("Grid Settings"), BarIcon( "grid", KIcon::SizeMedium )); + TQFrame* page = addPage(i18n("Grid"), i18n("Grid Settings"), BarIcon( "grid", KIcon::SizeMedium )); m_gridIndex = pageIndex(page); - KoUnit::Unit unit = static_cast<KivioView*>(parent())->doc()->unit(); - KivioGridData d = static_cast<KivioView*>(parent())->doc()->grid(); + KoUnit::Unit unit = static_cast<KivioView*>(TQT_TQWIDGET(tqparent()))->doc()->unit(); + KivioGridData d = static_cast<KivioView*>(TQT_TQWIDGET(tqparent()))->doc()->grid(); double pgw = m_layout.ptWidth; double pgh = m_layout.ptHeight; double fw = Kivio::Config::gridXSpacing(); @@ -167,50 +167,50 @@ void KivioOptionsDialog::initGrid() double sw = Kivio::Config::gridXSnap(); double sh = Kivio::Config::gridYSnap(); - m_gridChBox = new QCheckBox(i18n("Show &grid"), page); + m_gridChBox = new TQCheckBox(i18n("Show &grid"), page); m_gridChBox->setChecked(Kivio::Config::showGrid()); - m_snapChBox = new QCheckBox(i18n("Snap to g&rid"), page); + m_snapChBox = new TQCheckBox(i18n("Snap to g&rid"), page); m_snapChBox->setChecked(Kivio::Config::snapGrid()); - QLabel* gridColorLbl = new QLabel(i18n("Grid &color:"), page); + TQLabel* gridColorLbl = new TQLabel(i18n("Grid &color:"), page); m_gridColorBtn = new KColorButton(Kivio::Config::gridColor(), page); gridColorLbl->setBuddy(m_gridColorBtn); - QGroupBox* spacingGrp = new QGroupBox(2, Qt::Horizontal, i18n("Spacing"), page); - QLabel* spaceHorizLbl = new QLabel(i18n("&Horizontal:"), spacingGrp); + TQGroupBox* spacingGrp = new TQGroupBox(2, Qt::Horizontal, i18n("Spacing"), page); + TQLabel* spaceHorizLbl = new TQLabel(i18n("&Horizontal:"), spacingGrp); m_spaceHorizUSpin = new KoUnitDoubleSpinBox(spacingGrp, 0.0, pgw, 0.1, fw, unit); spaceHorizLbl->setBuddy(m_spaceHorizUSpin); - QLabel* spaceVertLbl = new QLabel(i18n("&Vertical:"), spacingGrp); + TQLabel* spaceVertLbl = new TQLabel(i18n("&Vertical:"), spacingGrp); m_spaceVertUSpin = new KoUnitDoubleSpinBox(spacingGrp, 0.0, pgh, 0.1, fh, unit); spaceVertLbl->setBuddy(m_spaceVertUSpin); - QGroupBox* snapGrp = new QGroupBox(2, Qt::Horizontal, i18n("Snap Distance"), page); - QLabel* snapHorizLbl = new QLabel(i18n("H&orizontal:"), snapGrp); + TQGroupBox* snapGrp = new TQGroupBox(2, Qt::Horizontal, i18n("Snap Distance"), page); + TQLabel* snapHorizLbl = new TQLabel(i18n("H&orizontal:"), snapGrp); m_snapHorizUSpin = new KoUnitDoubleSpinBox(snapGrp, 0.0, fw, 0.1, sw, unit); snapHorizLbl->setBuddy(m_snapHorizUSpin); - QLabel* snapVertLbl = new QLabel(i18n("V&ertical:"), snapGrp); + TQLabel* snapVertLbl = new TQLabel(i18n("V&ertical:"), snapGrp); m_snapVertUSpin = new KoUnitDoubleSpinBox(snapGrp, 0.0, fh, 0.1, sh, unit); snapVertLbl->setBuddy(m_snapVertUSpin); - QGridLayout* gl = new QGridLayout(page); + TQGridLayout* gl = new TQGridLayout(page); gl->setSpacing(KDialog::spacingHint()); gl->addMultiCellWidget(m_gridChBox, 0, 0, 0, 2); gl->addMultiCellWidget(m_snapChBox, 1, 1, 0, 2); gl->addWidget(gridColorLbl, 2, 0); gl->addWidget(m_gridColorBtn, 2, 1); - gl->addItem(new QSpacerItem(0, 0), 2, 2); + gl->addItem(new TQSpacerItem(0, 0), 2, 2); gl->addMultiCellWidget(spacingGrp, 3, 3, 0, 2); gl->addMultiCellWidget(snapGrp, 4, 4, 0, 2); - gl->addMultiCell(new QSpacerItem(0, 0), 5, 5, 0, 2); + gl->addMultiCell(new TQSpacerItem(0, 0), 5, 5, 0, 2); - connect(m_spaceHorizUSpin, SIGNAL(valueChanged(double)), SLOT(setMaxHorizSnap(double))); - connect(m_spaceVertUSpin, SIGNAL(valueChanged(double)), SLOT(setMaxVertSnap(double))); + connect(m_spaceHorizUSpin, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(setMaxHorizSnap(double))); + connect(m_spaceVertUSpin, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(setMaxVertSnap(double))); } void KivioOptionsDialog::applyPage() { - KivioView* view = static_cast<KivioView*>(parent()); + KivioView* view = static_cast<KivioView*>(TQT_TQWIDGET(tqparent())); view->doc()->setUnit(static_cast<KoUnit::Unit>(m_unitCombo->currentItem())); Kivio::Config::setUnit(KoUnit::unitName(view->doc()->unit())); Kivio::Config::setDefaultPageLayout(m_layout); @@ -230,7 +230,7 @@ void KivioOptionsDialog::applyGrid() Kivio::Config::setShowGrid(m_gridChBox->isChecked()); Kivio::Config::setSnapGrid(m_snapChBox->isChecked()); Kivio::Config::setGridColor(m_gridColorBtn->color()); - KivioView* view = static_cast<KivioView*>(parent()); + KivioView* view = static_cast<KivioView*>(TQT_TQWIDGET(tqparent())); view->doc()->updateView(0); } @@ -260,9 +260,9 @@ void KivioOptionsDialog::defaultGrid() void KivioOptionsDialog::setLayoutText(const KoPageLayout& l) { KoUnit::Unit unit = static_cast<KoUnit::Unit>(m_unitCombo->currentItem()); - QString txt = i18n("Format: %1, Width: %2 %4, Height: %3 %5").arg( - KoPageFormat::formatString(l.format)).arg(KoUnit::toUserValue(l.ptWidth, unit)) - .arg(KoUnit::toUserValue(l.ptHeight, unit)).arg(KoUnit::unitName(unit)).arg( + TQString txt = i18n("Format: %1, Width: %2 %4, Height: %3 %5").tqarg( + KoPageFormat::formatString(l.format)).tqarg(KoUnit::toUserValue(l.ptWidth, unit)) + .tqarg(KoUnit::toUserValue(l.ptHeight, unit)).tqarg(KoUnit::unitName(unit)).tqarg( KoUnit::unitName(unit)); m_layoutTxtLbl->setText(txt); } @@ -322,15 +322,15 @@ void KivioOptionsDialog::setMaxVertSnap(double v) m_snapVertUSpin->setMaxValue(KoUnit::fromUserValue(v, unit)); } -void KivioOptionsDialog::setFontText(const QFont& f) +void KivioOptionsDialog::setFontText(const TQFont& f) { - QString txt = f.family() + " " + QString::number(f.pointSize()); + TQString txt = f.family() + " " + TQString::number(f.pointSize()); m_fontTxtLbl->setText(txt); } void KivioOptionsDialog::fontDlg() { - if(KFontDialog::getFont(m_font, false, this) == QDialog::Accepted) { + if(KFontDialog::getFont(m_font, false, this) == TQDialog::Accepted) { setFontText(m_font); } } diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.h b/kivio/kiviopart/ui/kiviooptionsdialog.h index 1fbb209f9..c15167480 100644 --- a/kivio/kiviopart/ui/kiviooptionsdialog.h +++ b/kivio/kiviopart/ui/kiviooptionsdialog.h @@ -26,21 +26,21 @@ #include <klistview.h> class KivioView; -class QComboBox; -class QCheckBox; -class QLabel; -class QRadioButton; +class TQComboBox; +class TQCheckBox; +class TQLabel; +class TQRadioButton; class KColorButton; class KURLRequester; class KoUnitDoubleSpinBox; class KivioGuideLineData; -class QGroupBox; -class QFont; +class TQGroupBox; +class TQFont; // class GuidesListViewItem : public KListViewItem // { // public: -// GuidesListViewItem(QListView* parent, KivioGuideLineData *gd, KoUnit::Unit u); +// GuidesListViewItem(TQListView* tqparent, KivioGuideLineData *gd, KoUnit::Unit u); // ~GuidesListViewItem(); // // void setUnit(KoUnit::Unit u); @@ -57,8 +57,9 @@ class QFont; class KivioOptionsDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KivioOptionsDialog(KivioView* parent, const char* name = 0); + KivioOptionsDialog(KivioView* tqparent, const char* name = 0); protected: void initPage(); @@ -71,7 +72,7 @@ class KivioOptionsDialog : public KDialogBase void defaultGrid(); void setLayoutText(const KoPageLayout& l); - void setFontText(const QFont& f); + void setFontText(const TQFont& f); protected slots: void pageLayoutDlg(); @@ -88,19 +89,19 @@ class KivioOptionsDialog : public KDialogBase int m_pageIndex; int m_gridIndex; - QComboBox* m_unitCombo; - QCheckBox* m_marginsChBox; - QCheckBox* m_rulersChBox; - QLabel* m_layoutTxtLbl; + TQComboBox* m_unitCombo; + TQCheckBox* m_marginsChBox; + TQCheckBox* m_rulersChBox; + TQLabel* m_layoutTxtLbl; KoPageLayout m_layout; - QLabel* m_fontTxtLbl; - QFont m_font; + TQLabel* m_fontTxtLbl; + TQFont m_font; KoUnitDoubleSpinBox* m_spaceHorizUSpin; KoUnitDoubleSpinBox* m_spaceVertUSpin; KoUnitDoubleSpinBox* m_snapHorizUSpin; KoUnitDoubleSpinBox* m_snapVertUSpin; - QCheckBox* m_gridChBox; - QCheckBox* m_snapChBox; + TQCheckBox* m_gridChBox; + TQCheckBox* m_snapChBox; KColorButton* m_gridColorBtn; }; diff --git a/kivio/kiviopart/ui/kiviostencilformatdlg.cpp b/kivio/kiviopart/ui/kiviostencilformatdlg.cpp index c51e3e000..359381de1 100644 --- a/kivio/kiviopart/ui/kiviostencilformatdlg.cpp +++ b/kivio/kiviopart/ui/kiviostencilformatdlg.cpp @@ -19,11 +19,11 @@ #include "kiviostencilformatdlg.h" -#include <qlabel.h> -#include <qlayout.h> -#include <qbitmap.h> -#include <qpixmap.h> -#include <qpainter.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqbitmap.h> +#include <tqpixmap.h> +#include <tqpainter.h> #include <kcolorbutton.h> #include <klocale.h> @@ -32,8 +32,8 @@ #include "kivio_view.h" -KivioStencilFormatDlg::KivioStencilFormatDlg(KivioView* parent, const char* name) - : KDialogBase(parent, name, true, i18n("Stencil & Connector Format"), Ok|Cancel|Default, Ok) +KivioStencilFormatDlg::KivioStencilFormatDlg(KivioView* tqparent, const char* name) + : KDialogBase(tqparent, name, true, i18n("Stencil & Connector Format"), Ok|Cancel|Default, Ok) { m_unit = KoUnit::U_PT; init(); @@ -41,28 +41,28 @@ KivioStencilFormatDlg::KivioStencilFormatDlg(KivioView* parent, const char* name void KivioStencilFormatDlg::init() { - QWidget* mainWidget = new QWidget(this); + TQWidget* mainWidget = new TQWidget(this); setMainWidget(mainWidget); - QGridLayout* gl = new QGridLayout(mainWidget, 3, 2, KDialog::marginHint(), KDialog::spacingHint()); + TQGridLayout* gl = new TQGridLayout(mainWidget, 3, 2, KDialog::marginHint(), KDialog::spacingHint()); - QLabel* lineWidthLbl = new QLabel(i18n("Line &width:"), mainWidget); + TQLabel* lineWidthLbl = new TQLabel(i18n("Line &width:"), mainWidget); m_lineWidthUSBox = new KoUnitDoubleSpinBox(mainWidget, 0.0, 1000.0, 0.1, 1.0, m_unit, 2); lineWidthLbl->setBuddy(m_lineWidthUSBox); - QLabel* lineColorLbl = new QLabel(i18n("Line &color:"), mainWidget); + TQLabel* lineColorLbl = new TQLabel(i18n("Line &color:"), mainWidget); m_lineCBtn = new KColorButton(mainWidget); lineColorLbl->setBuddy(m_lineCBtn); - QLabel* patternLbl = new QLabel(i18n("Line &style:"), mainWidget); + TQLabel* patternLbl = new TQLabel(i18n("Line &style:"), mainWidget); m_patternCBox = new KComboBox(mainWidget); patternLbl->setBuddy(m_patternCBox); initLinePatterns(); - QLabel* lineEndStyleLbl = new QLabel(i18n("Line &end style:"), mainWidget); + TQLabel* lineEndStyleLbl = new TQLabel(i18n("Line &end style:"), mainWidget); m_lineEndStyleCBox = new KComboBox(mainWidget); lineEndStyleLbl->setBuddy(m_lineEndStyleCBox); initLineEndStyles(); - QLabel* fillColorLbl = new QLabel(i18n("&Fill color:"), mainWidget); + TQLabel* fillColorLbl = new TQLabel(i18n("&Fill color:"), mainWidget); m_fillCBtn = new KColorButton(mainWidget); fillColorLbl->setBuddy(m_fillCBtn); - QLabel* fillPatternLbl = new QLabel(i18n("F&ill style:"), mainWidget); + TQLabel* fillPatternLbl = new TQLabel(i18n("F&ill style:"), mainWidget); m_fillPatternCBox = new KComboBox(mainWidget); fillPatternLbl->setBuddy(m_fillPatternCBox); initFillPatterns(); @@ -83,21 +83,21 @@ void KivioStencilFormatDlg::init() void KivioStencilFormatDlg::initLinePatterns() { - QBitmap mask; - QPixmap pix(m_patternCBox->width(), 17); - QPainter p(&pix, m_patternCBox); - QPen pen; - pen.setColor(QColor(0, 0, 0)); + TQBitmap tqmask; + TQPixmap pix(m_patternCBox->width(), 17); + TQPainter p(&pix, m_patternCBox); + TQPen pen; + pen.setColor(TQColor(0, 0, 0)); pen.setWidth(3); for (int i = NoPen; i <= DashDotDotLine ; i++ ) { pix.fill(white); - pen.setStyle(static_cast<PenStyle>(i)); + pen.setStyle(static_cast<Qt::PenStyle>(i)); p.setPen(pen); p.drawLine(0, 8, pix.width(), 8); - mask = pix; - pix.setMask(mask); + tqmask = pix; + pix.setMask(tqmask); m_patternCBox->insertItem(pix, i); } @@ -106,15 +106,15 @@ void KivioStencilFormatDlg::initLinePatterns() void KivioStencilFormatDlg::initFillPatterns() { - QBitmap mask; - QPixmap pix(m_fillPatternCBox->width(), m_fillPatternCBox->fontMetrics().height() + 4); - QPainter p(&pix, m_fillPatternCBox); - QBrush brush; - brush.setColor(QColor(0, 0, 0)); + TQBitmap tqmask; + TQPixmap pix(m_fillPatternCBox->width(), m_fillPatternCBox->fontMetrics().height() + 4); + TQPainter p(&pix, m_fillPatternCBox); + TQBrush brush; + brush.setColor(TQColor(0, 0, 0)); for (int i = NoBrush; i <= DiagCrossPattern; i++ ) { pix.fill(white); - brush.setStyle(static_cast<BrushStyle>(i)); + brush.setStyle(static_cast<Qt::BrushStyle>(i)); p.setBrush(brush); p.fillRect(0, 0, pix.width(), pix.height(), brush); @@ -126,24 +126,24 @@ void KivioStencilFormatDlg::initFillPatterns() void KivioStencilFormatDlg::initLineEndStyles() { - QBitmap mask; - QPixmap pix(m_lineEndStyleCBox->width(), 17); - QPainter p(&pix, m_lineEndStyleCBox); - QPen pen; - pen.setColor(QColor(0, 0, 0)); + TQBitmap tqmask; + TQPixmap pix(m_lineEndStyleCBox->width(), 17); + TQPainter p(&pix, m_lineEndStyleCBox); + TQPen pen; + pen.setColor(TQColor(0, 0, 0)); pen.setWidth(4); - pen.setStyle(SolidLine); - pen.setJoinStyle(RoundJoin); + pen.setStyle(Qt::SolidLine); + pen.setJoinStyle(Qt::RoundJoin); p.setBrush(white); for (int i = 0; i < 3; i++) { pix.fill(white); - pen.setCapStyle(static_cast<PenCapStyle>(i * 0x10)); + pen.setCapStyle(static_cast<Qt::PenCapStyle>(i * 0x10)); p.setPen(pen); p.drawLine(6, 8, pix.width() - 12, 8); - mask = pix; - pix.setMask(mask); + tqmask = pix; + pix.setMask(tqmask); m_lineEndStyleCBox->insertItem(pix, i); } @@ -155,7 +155,7 @@ double KivioStencilFormatDlg::lineWidth() return m_lineWidthUSBox->value(); } -QColor KivioStencilFormatDlg::lineColor() +TQColor KivioStencilFormatDlg::lineColor() { return m_lineCBtn->color(); } @@ -165,7 +165,7 @@ int KivioStencilFormatDlg::linePattern() return m_patternCBox->currentItem(); } -QColor KivioStencilFormatDlg::fillColor() +TQColor KivioStencilFormatDlg::fillColor() { return m_fillCBtn->color(); } @@ -187,7 +187,7 @@ void KivioStencilFormatDlg::setLineWidth(double w, KoUnit::Unit u) m_lineWidthUSBox->setValue(KoUnit::toUserValue(w, u)); } -void KivioStencilFormatDlg::setLineColor(QColor c) +void KivioStencilFormatDlg::setLineColor(TQColor c) { m_lineCBtn->setColor(c); } @@ -197,7 +197,7 @@ void KivioStencilFormatDlg::setLinePattern(int p) m_patternCBox->setCurrentItem(p); } -void KivioStencilFormatDlg::setFillColor(QColor c) +void KivioStencilFormatDlg::setFillColor(TQColor c) { m_fillCBtn->setColor(c); } @@ -215,9 +215,9 @@ void KivioStencilFormatDlg::setLineEndStyle(int s) void KivioStencilFormatDlg::slotDefault() { setLineWidth(1.0, m_unit); - setLineColor(QColor(0, 0, 0)); + setLineColor(TQColor(0, 0, 0)); setLinePattern(1); - setFillColor(QColor(255, 255, 255)); + setFillColor(TQColor(255, 255, 255)); setFillPattern(1); } diff --git a/kivio/kiviopart/ui/kiviostencilformatdlg.h b/kivio/kiviopart/ui/kiviostencilformatdlg.h index 940bdf098..6d45d4e23 100644 --- a/kivio/kiviopart/ui/kiviostencilformatdlg.h +++ b/kivio/kiviopart/ui/kiviostencilformatdlg.h @@ -28,26 +28,27 @@ class KoUnitDoubleSpinBox; class KColorButton; class KComboBox; class KivioView; -class QColor; +class TQColor; class KivioStencilFormatDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KivioStencilFormatDlg(KivioView* parent, const char* name = 0); + KivioStencilFormatDlg(KivioView* tqparent, const char* name = 0); double lineWidth(); - QColor lineColor(); + TQColor lineColor(); int linePattern(); - QColor fillColor(); + TQColor fillColor(); int fillPattern(); int lineEndStyle(); public slots: void setLineWidth(double w, KoUnit::Unit u); - void setLineColor(QColor c); + void setLineColor(TQColor c); void setLinePattern(int p); - void setFillColor(QColor c); + void setFillColor(TQColor c); void setFillPattern(int p); void setLineEndStyle(int s); diff --git a/kivio/kiviopart/ui/kiviostencilsetwidget.ui b/kivio/kiviopart/ui/kiviostencilsetwidget.ui index fb7a79b38..634677980 100644 --- a/kivio/kiviopart/ui/kiviostencilsetwidget.ui +++ b/kivio/kiviopart/ui/kiviostencilsetwidget.ui @@ -15,7 +15,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </comment> <author>(C) 2004-2005 Peter Simonsson</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KivioStencilSetWidget</cstring> </property> @@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <property name="margin"> <number>0</number> </property> - <widget class="QSplitter" row="0" column="0"> + <widget class="TQSplitter" row="0" column="0"> <property name="name"> <cstring>splitter1</cstring> </property> @@ -75,7 +75,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <bool>false</bool> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_stencilsetGBox</cstring> </property> @@ -86,14 +86,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSplitter" row="0" column="0"> + <widget class="TQSplitter" row="0" column="0"> <property name="name"> <cstring>m_stencilSetSplitter</cstring> </property> <property name="orientation"> <enum>Vertical</enum> </property> - <widget class="QIconView"> + <widget class="TQIconView"> <property name="name"> <cstring>m_stencilIView</cstring> </property> @@ -122,7 +122,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <string>This is a preview of the stencils contained in the set</string> </property> </widget> - <widget class="QTextBrowser"> + <widget class="TQTextBrowser"> <property name="name"> <cstring>m_descriptionBrowser</cstring> </property> @@ -136,7 +136,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </property> </widget> </widget> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>m_addToDocBtn</cstring> </property> @@ -157,8 +157,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <includes> <include location="global" impldecl="in implementation">kdialog.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/kivio/kiviopart/ui/kiviotextformatdlg.cpp b/kivio/kiviopart/ui/kiviotextformatdlg.cpp index 7d02f6437..43f783e10 100644 --- a/kivio/kiviopart/ui/kiviotextformatdlg.cpp +++ b/kivio/kiviopart/ui/kiviotextformatdlg.cpp @@ -19,10 +19,10 @@ #include "kiviotextformatdlg.h" -#include <qlabel.h> -#include <qlayout.h> -#include <qbuttongroup.h> -#include <qradiobutton.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqbuttongroup.h> +#include <tqradiobutton.h> #include <kfontdialog.h> #include <kcolorbutton.h> @@ -31,22 +31,22 @@ #include "kivio_view.h" #include "kivio_doc.h" -KivioTextFormatDlg::KivioTextFormatDlg(KivioView* parent, const char* name) - : KDialogBase(Tabbed, i18n("Text Format"), Ok|Cancel|Default, Ok, parent, name) +KivioTextFormatDlg::KivioTextFormatDlg(KivioView* tqparent, const char* name) + : KDialogBase(Tabbed, i18n("Text Format"), Ok|Cancel|Default, Ok, tqparent, name) { - m_valign = Qt::AlignVCenter; - m_halign = Qt::AlignHCenter; + m_valign = TQt::AlignVCenter; + m_halign = TQt::AlignHCenter; initFontTab(); initPositionTab(); } void KivioTextFormatDlg::initFontTab() { - QFrame* tab = addPage(i18n("Font")); + TQFrame* tab = addPage(i18n("Font")); m_fontChooser = new KFontChooser(tab); - QLabel* textColorLbl = new QLabel(i18n("Text color:"), tab); + TQLabel* textColorLbl = new TQLabel(i18n("Text color:"), tab); m_textCBtn = new KColorButton(tab); - QGridLayout* gl = new QGridLayout(tab); + TQGridLayout* gl = new TQGridLayout(tab); gl->setSpacing(KDialog::spacingHint()); gl->addMultiCellWidget(m_fontChooser, 0, 0, 0, 1); gl->addWidget(textColorLbl, 1, 0); @@ -55,21 +55,21 @@ void KivioTextFormatDlg::initFontTab() void KivioTextFormatDlg::initPositionTab() { - QFrame* tab = addPage(i18n("Position")); - m_valignBGrp = new QButtonGroup(1, Qt::Horizontal, i18n("Vertical"), tab); - (void) new QRadioButton(i18n("&Top"), m_valignBGrp); - (void) new QRadioButton(i18n("&Center"), m_valignBGrp); - (void) new QRadioButton(i18n("&Bottom"), m_valignBGrp); + TQFrame* tab = addPage(i18n("Position")); + m_valignBGrp = new TQButtonGroup(1, Qt::Horizontal, i18n("Vertical"), tab); + (void) new TQRadioButton(i18n("&Top"), m_valignBGrp); + (void) new TQRadioButton(i18n("&Center"), m_valignBGrp); + (void) new TQRadioButton(i18n("&Bottom"), m_valignBGrp); m_valignBGrp->setButton(1); - m_halignBGrp = new QButtonGroup(1, Qt::Vertical, i18n("Horizontal"), tab); - (void) new QRadioButton(i18n("&Left"), m_halignBGrp); - (void) new QRadioButton(i18n("C&enter"), m_halignBGrp); - (void) new QRadioButton(i18n("&Right"), m_halignBGrp); + m_halignBGrp = new TQButtonGroup(1, Qt::Vertical, i18n("Horizontal"), tab); + (void) new TQRadioButton(i18n("&Left"), m_halignBGrp); + (void) new TQRadioButton(i18n("C&enter"), m_halignBGrp); + (void) new TQRadioButton(i18n("&Right"), m_halignBGrp); m_halignBGrp->setButton(1); - m_preview = new QLabel(i18n("Preview"), tab); - m_preview->setFrameStyle(QFrame::Box | QFrame::Sunken); - m_preview->setAlignment(m_valign | m_halign); - QGridLayout* gl = new QGridLayout(tab); + m_preview = new TQLabel(i18n("Preview"), tab); + m_preview->setFrameStyle(TQFrame::Box | TQFrame::Sunken); + m_preview->tqsetAlignment(m_valign | m_halign); + TQGridLayout* gl = new TQGridLayout(tab); gl->setSpacing(KDialog::spacingHint()); gl->setRowStretch(0, 10); gl->setColStretch(1, 10); @@ -77,42 +77,42 @@ void KivioTextFormatDlg::initPositionTab() gl->addWidget(m_preview, 0, 1); gl->addWidget(m_halignBGrp, 1, 1); - connect(m_valignBGrp, SIGNAL(clicked(int)), SLOT(updateVAlign(int))); - connect(m_halignBGrp, SIGNAL(clicked(int)), SLOT(updateHAlign(int))); + connect(m_valignBGrp, TQT_SIGNAL(clicked(int)), TQT_SLOT(updateVAlign(int))); + connect(m_halignBGrp, TQT_SIGNAL(clicked(int)), TQT_SLOT(updateHAlign(int))); } void KivioTextFormatDlg::updateVAlign(int i) { switch(i) { case 0: - m_valign = Qt::AlignTop; + m_valign = TQt::AlignTop; break; case 1: - m_valign = Qt::AlignVCenter; + m_valign = TQt::AlignVCenter; break; case 2: - m_valign = Qt::AlignBottom; + m_valign = TQt::AlignBottom; break; } - m_preview->setAlignment(m_valign | m_halign); + m_preview->tqsetAlignment(m_valign | m_halign); } void KivioTextFormatDlg::updateHAlign(int i) { switch(i) { case 0: - m_halign = Qt::AlignLeft; + m_halign = TQt::AlignLeft; break; case 1: - m_halign = Qt::AlignHCenter; + m_halign = TQt::AlignHCenter; break; case 2: - m_halign = Qt::AlignRight; + m_halign = TQt::AlignRight; break; } - m_preview->setAlignment(m_valign | m_halign); + m_preview->tqsetAlignment(m_valign | m_halign); } int KivioTextFormatDlg::valign() @@ -125,12 +125,12 @@ int KivioTextFormatDlg::halign() return m_halign; } -QFont KivioTextFormatDlg::font() +TQFont KivioTextFormatDlg::font() { return m_fontChooser->font(); } -QColor KivioTextFormatDlg::textColor() +TQColor KivioTextFormatDlg::textColor() { return m_textCBtn->color(); } @@ -138,55 +138,55 @@ QColor KivioTextFormatDlg::textColor() void KivioTextFormatDlg::setVAlign(int i) { switch(i) { - case Qt::AlignTop: + case TQt::AlignTop: m_valignBGrp->setButton(0); break; - case Qt::AlignVCenter: + case TQt::AlignVCenter: m_valignBGrp->setButton(1); break; - case Qt::AlignBottom: + case TQt::AlignBottom: m_valignBGrp->setButton(2); break; } - m_valign = static_cast<Qt::AlignmentFlags>(i); - m_preview->setAlignment(m_valign | m_halign); + m_valign = static_cast<TQt::AlignmentFlags>(i); + m_preview->tqsetAlignment(m_valign | m_halign); } void KivioTextFormatDlg::setHAlign(int i) { switch(i) { - case Qt::AlignLeft: + case TQt::AlignLeft: m_halignBGrp->setButton(0); break; - case Qt::AlignHCenter: + case TQt::AlignHCenter: m_halignBGrp->setButton(1); break; - case Qt::AlignRight: + case TQt::AlignRight: m_halignBGrp->setButton(2); break; } - m_halign = static_cast<Qt::AlignmentFlags>(i); - m_preview->setAlignment(m_valign | m_halign); + m_halign = static_cast<TQt::AlignmentFlags>(i); + m_preview->tqsetAlignment(m_valign | m_halign); } -void KivioTextFormatDlg::setFont(QFont f) +void KivioTextFormatDlg::setFont(TQFont f) { m_fontChooser->setFont(f); } -void KivioTextFormatDlg::setTextColor(QColor c) +void KivioTextFormatDlg::setTextColor(TQColor c) { m_textCBtn->setColor(c); } void KivioTextFormatDlg::slotDefault() { - setFont((static_cast<KivioView*>(parent()))->doc()->defaultFont()); - setTextColor(QColor(0, 0, 0)); - setHAlign(Qt::AlignHCenter); - setVAlign(Qt::AlignVCenter); + setFont((static_cast<KivioView*>(TQT_TQWIDGET(tqparent())))->doc()->defaultFont()); + setTextColor(TQColor(0, 0, 0)); + setHAlign(TQt::AlignHCenter); + setVAlign(TQt::AlignVCenter); } #include "kiviotextformatdlg.moc" diff --git a/kivio/kiviopart/ui/kiviotextformatdlg.h b/kivio/kiviopart/ui/kiviotextformatdlg.h index 58ce2ad44..6792f3f31 100644 --- a/kivio/kiviopart/ui/kiviotextformatdlg.h +++ b/kivio/kiviopart/ui/kiviotextformatdlg.h @@ -25,27 +25,28 @@ class KivioView; class KFontChooser; class KColorButton; -class QButtonGroup; -class QLabel; -class QFont; -class QColor; +class TQButtonGroup; +class TQLabel; +class TQFont; +class TQColor; class KivioTextFormatDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KivioTextFormatDlg(KivioView* parent, const char* name = 0); + KivioTextFormatDlg(KivioView* tqparent, const char* name = 0); int valign(); int halign(); - QFont font(); - QColor textColor(); + TQFont font(); + TQColor textColor(); public slots: void setVAlign(int i); void setHAlign(int i); - void setFont(QFont f); - void setTextColor(QColor c); + void setFont(TQFont f); + void setTextColor(TQColor c); protected: void initFontTab(); @@ -59,9 +60,9 @@ class KivioTextFormatDlg : public KDialogBase protected: KFontChooser* m_fontChooser; KColorButton* m_textCBtn; - QButtonGroup* m_halignBGrp; - QButtonGroup* m_valignBGrp; - QLabel* m_preview; + TQButtonGroup* m_halignBGrp; + TQButtonGroup* m_valignBGrp; + TQLabel* m_preview; int m_valign; int m_halign; }; diff --git a/kivio/kiviopart/ui/layerlisttooltip.cpp b/kivio/kiviopart/ui/layerlisttooltip.cpp index 13ecd7704..eabc8723b 100644 --- a/kivio/kiviopart/ui/layerlisttooltip.cpp +++ b/kivio/kiviopart/ui/layerlisttooltip.cpp @@ -18,7 +18,7 @@ */ #include "layerlisttooltip.h" -#include <qheader.h> +#include <tqheader.h> #include <klocale.h> @@ -27,8 +27,8 @@ namespace Kivio { -LayerListToolTip::LayerListToolTip(QWidget* parent, QListView* listView) - : QToolTip(parent) +LayerListToolTip::LayerListToolTip(TQWidget* tqparent, TQListView* listView) + : TQToolTip(tqparent) { m_listView = listView; } @@ -37,7 +37,7 @@ LayerListToolTip::~LayerListToolTip() { } -void LayerListToolTip::maybeTip(const QPoint& pos) +void LayerListToolTip::maybeTip(const TQPoint& pos) { if(!m_listView) { return; @@ -49,13 +49,13 @@ void LayerListToolTip::maybeTip(const QPoint& pos) return; } - QRect itemRect = m_listView->itemRect(item); - QString toolTip = "<b>" + item->layer()->name() + "</b><br>"; + TQRect tqitemRect = m_listView->tqitemRect(item); + TQString toolTip = "<b>" + item->layer()->name() + "</b><br>"; toolTip += i18n("Visible: ") + (item->layer()->visible() ? i18n("Yes") : i18n("No")) + "<br>"; toolTip += i18n("Printable: ") + (item->layer()->printable() ? i18n("Yes") : i18n("No")) + "<br>"; toolTip += i18n("Editable: ") + (item->layer()->editable() ? i18n("Yes") : i18n("No")) + "<br>"; toolTip += i18n("Connectable: ") + (item->layer()->connectable() ? i18n("Yes") : i18n("No")); - tip(itemRect, toolTip); + tip(tqitemRect, toolTip); } } diff --git a/kivio/kiviopart/ui/layerlisttooltip.h b/kivio/kiviopart/ui/layerlisttooltip.h index 9f8fd41c4..29bbabe64 100644 --- a/kivio/kiviopart/ui/layerlisttooltip.h +++ b/kivio/kiviopart/ui/layerlisttooltip.h @@ -19,24 +19,24 @@ #ifndef KIVIOLAYERLISTTOOLTIP_H #define KIVIOLAYERLISTTOOLTIP_H -#include <qtooltip.h> -#include <qlistview.h> +#include <tqtooltip.h> +#include <tqlistview.h> namespace Kivio { /** * Shows the tooltips in the layer list */ -class LayerListToolTip : public QToolTip +class LayerListToolTip : public TQToolTip { public: - LayerListToolTip(QWidget* parent, QListView* listView); + LayerListToolTip(TQWidget* tqparent, TQListView* listView); ~LayerListToolTip(); - void maybeTip(const QPoint& pos); + void maybeTip(const TQPoint& pos); protected: - QListView* m_listView; + TQListView* m_listView; }; } diff --git a/kivio/kiviopart/ui/objectlistpalette.cpp b/kivio/kiviopart/ui/objectlistpalette.cpp index 721f84ca7..28793807a 100644 --- a/kivio/kiviopart/ui/objectlistpalette.cpp +++ b/kivio/kiviopart/ui/objectlistpalette.cpp @@ -18,9 +18,9 @@ */ #include "objectlistpalette.h" -#include <qlayout.h> -#include <qheader.h> -#include <qptrlist.h> +#include <tqlayout.h> +#include <tqheader.h> +#include <tqptrlist.h> #include <klistview.h> #include <kdebug.h> @@ -40,14 +40,14 @@ namespace Kivio { class ObjectListItem : public KListViewItem { public: - ObjectListItem(KListView* parent, KivioStencil* _stencil) - : KListViewItem(parent, "") + ObjectListItem(KListView* tqparent, KivioStencil* _stencil) + : KListViewItem(tqparent, "") { m_stencil = _stencil; setPixmap(0, Kivio::generatePixmapFromStencil(22, 22, m_stencil)); - QString type; - QString name; + TQString type; + TQString name; switch(m_stencil->type()) { case kstGroup: @@ -80,24 +80,24 @@ class ObjectListItem : public KListViewItem KivioStencil* m_stencil; }; -ObjectListPalette::ObjectListPalette(KivioView* parent, const char* name) - : QWidget(parent, name), m_view(parent) +ObjectListPalette::ObjectListPalette(KivioView* tqparent, const char* name) + : TQWidget(tqparent, name), m_view(tqparent) { m_blockUpdate = false; - QVBoxLayout* layout = new QVBoxLayout(this, 0, 2); + TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 0, 2); m_objectList = new KListView(this); m_objectList->setFullWidth(true); m_objectList->setAllColumnsShowFocus(true); m_objectList->setSorting(-1); - m_objectList->setSelectionMode(QListView::Extended); + m_objectList->setSelectionMode(TQListView::Extended); m_objectList->addColumn(i18n("Name")); m_objectList->addColumn(i18n("Type")); - layout->addWidget(m_objectList); + tqlayout->addWidget(m_objectList); - connect(m_objectList, SIGNAL(selectionChanged()), this, SLOT(updateSelection())); + connect(m_objectList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(updateSelection())); } ObjectListPalette::~ObjectListPalette() @@ -118,7 +118,7 @@ void ObjectListPalette::updateObjectList() m_objectList->clear(); - QPtrList<KivioLayer>* layers = page->layers(); + TQPtrList<KivioLayer>* layers = page->layers(); KivioLayer* layer = layers->first(); KivioStencil* stencil; @@ -147,8 +147,8 @@ void ObjectListPalette::updateSelection() page->unselectAllStencils(); - QPtrList<QListViewItem> selectedItems = m_objectList->selectedItems(); - QPtrListIterator<QListViewItem> it(selectedItems); + TQPtrList<TQListViewItem> selectedItems = m_objectList->selectedItems(); + TQPtrListIterator<TQListViewItem> it(selectedItems); ObjectListItem* item = 0; while((item = static_cast<ObjectListItem*>(it.current())) != 0) { diff --git a/kivio/kiviopart/ui/objectlistpalette.h b/kivio/kiviopart/ui/objectlistpalette.h index 027154c35..17fbd0f40 100644 --- a/kivio/kiviopart/ui/objectlistpalette.h +++ b/kivio/kiviopart/ui/objectlistpalette.h @@ -19,7 +19,7 @@ #ifndef KIVIOOBJECTLISTPALETTE_H #define KIVIOOBJECTLISTPALETTE_H -#include <qwidget.h> +#include <tqwidget.h> class KListView; class KivioView; @@ -29,11 +29,12 @@ namespace Kivio { /** * Palette showing a list of all objects on the page */ -class ObjectListPalette : public QWidget +class ObjectListPalette : public TQWidget { Q_OBJECT + TQ_OBJECT public: - ObjectListPalette(KivioView* parent = 0, const char* name = 0); + ObjectListPalette(KivioView* tqparent = 0, const char* name = 0); ~ObjectListPalette(); void updateObjectList(); |