diff options
Diffstat (limited to 'kivio/kiviopart/ui')
-rw-r--r-- | kivio/kiviopart/ui/aligndialog.ui | 16 | ||||
-rw-r--r-- | kivio/kiviopart/ui/kivio_birdeye_panel.cpp | 2 | ||||
-rw-r--r-- | kivio/kiviopart/ui/kivio_layer_panel.cpp | 4 | ||||
-rw-r--r-- | kivio/kiviopart/ui/kivio_protection_panel_base.ui | 6 | ||||
-rw-r--r-- | kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp | 2 | ||||
-rw-r--r-- | kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp | 2 | ||||
-rw-r--r-- | kivio/kiviopart/ui/kiviooptionsdialog.cpp | 18 | ||||
-rw-r--r-- | kivio/kiviopart/ui/kiviostencilformatdlg.cpp | 2 | ||||
-rw-r--r-- | kivio/kiviopart/ui/kiviotextformatdlg.cpp | 12 | ||||
-rw-r--r-- | kivio/kiviopart/ui/layerlisttooltip.cpp | 4 | ||||
-rw-r--r-- | kivio/kiviopart/ui/objectlistpalette.cpp | 6 |
11 files changed, 37 insertions, 37 deletions
diff --git a/kivio/kiviopart/ui/aligndialog.ui b/kivio/kiviopart/ui/aligndialog.ui index 27f8c3b3..1b1b607d 100644 --- a/kivio/kiviopart/ui/aligndialog.ui +++ b/kivio/kiviopart/ui/aligndialog.ui @@ -97,7 +97,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -114,7 +114,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -158,7 +158,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -175,7 +175,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -200,7 +200,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> @@ -243,7 +243,7 @@ <property name="pixmap"> <pixmap>image3</pixmap> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignLeft</set> </property> <property name="vAlign" stdset="0"> @@ -280,7 +280,7 @@ <property name="pixmap"> <pixmap>image5</pixmap> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignBottom|AlignLeft</set> </property> <property name="vAlign" stdset="0"> @@ -317,7 +317,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp index 8969ea82..30cf7f1f 100644 --- a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp +++ b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp @@ -151,7 +151,7 @@ void KivioBirdEyePanel::updateView() KivioScreenPainter kpainter; kpainter.start(TQT_TQPAINTDEVICE(m_buffer)); - kpainter.painter()->fillRect(rect, KApplication::tqpalette().active().brush(TQColorGroup::Mid)); + kpainter.painter()->fillRect(rect, KApplication::palette().active().brush(TQColorGroup::Mid)); kpainter.painter()->fillRect(px0, py0, pw, ph, white); diff --git a/kivio/kiviopart/ui/kivio_layer_panel.cpp b/kivio/kiviopart/ui/kivio_layer_panel.cpp index fadba0e3..8070cca5 100644 --- a/kivio/kiviopart/ui/kivio_layer_panel.cpp +++ b/kivio/kiviopart/ui/kivio_layer_panel.cpp @@ -27,7 +27,7 @@ #include "layerlisttooltip.h" #include <tqheader.h> -#include <tqlayout.h> +#include <layout.h> #include <ktoolbar.h> #include <klocale.h> @@ -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").tqarg(id)); + layer->setName(i18n("Layer %1").arg(id)); page->addLayer(layer); page->setCurLayer(layer); diff --git a/kivio/kiviopart/ui/kivio_protection_panel_base.ui b/kivio/kiviopart/ui/kivio_protection_panel_base.ui index 55fe9888..e1774900 100644 --- a/kivio/kiviopart/ui/kivio_protection_panel_base.ui +++ b/kivio/kiviopart/ui/kivio_protection_panel_base.ui @@ -12,13 +12,13 @@ <height>147</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -107,7 +107,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>281</height> diff --git a/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp index 11c2cc28..d6ef9318 100644 --- a/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp +++ b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp @@ -24,7 +24,7 @@ #include <tqiconview.h> #include <tqgroupbox.h> #include <tqpushbutton.h> -#include <tqtextbrowser.h> +#include <textbrowser.h> #include <tqsplitter.h> #include <kstandarddirs.h> diff --git a/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp b/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp index 9237333e..d3a9a8d6 100644 --- a/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp +++ b/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp @@ -21,7 +21,7 @@ #include <tqlabel.h> #include <tqgroupbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqbitmap.h> #include <tqpixmap.h> #include <tqpainter.h> diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.cpp b/kivio/kiviopart/ui/kiviooptionsdialog.cpp index 23900894..4bd6fd62 100644 --- a/kivio/kiviopart/ui/kiviooptionsdialog.cpp +++ b/kivio/kiviopart/ui/kiviooptionsdialog.cpp @@ -45,7 +45,7 @@ #include <tqcombobox.h> #include <tqcheckbox.h> #include <tqradiobutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtabwidget.h> // GuidesListViewItem::GuidesListViewItem(TQListView* parent, KivioGuideLineData *gd, KoUnit::Unit u) @@ -111,23 +111,23 @@ void KivioOptionsDialog::initPage() m_unitCombo->insertStringList(KoUnit::listOfUnitName()); m_unitCombo->setCurrentItem(unit); unitLbl->setBuddy(m_unitCombo); - TQLabel* layoutLbl = new TQLabel(i18n("Default tqlayout:"), page); + TQLabel* layoutLbl = new TQLabel(i18n("Default layout:"), page); m_layoutTxtLbl = new TQLabel(page); m_layoutTxtLbl->setFrameStyle(TQFrame::LineEditPanel | TQFrame::Sunken); - m_layoutTxtLbl->tqsetSizePolicy(TQSizePolicy( + m_layoutTxtLbl->setSizePolicy(TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed)); setLayoutText(m_layout); KPushButton* layoutBtn = new KPushButton(i18n("Change..."), page); - layoutBtn->tqsetSizePolicy(TQSizePolicy( + layoutBtn->setSizePolicy(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( + m_fontTxtLbl->setSizePolicy(TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed)); setFontText(m_font); KPushButton* fontBtn = new KPushButton(i18n("Change..."), page); - layoutBtn->tqsetSizePolicy(TQSizePolicy( + layoutBtn->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed)); m_marginsChBox = new TQCheckBox(i18n("Show page &margins"), page); m_marginsChBox->setChecked(view->isShowPageMargins()); @@ -260,9 +260,9 @@ void KivioOptionsDialog::defaultGrid() void KivioOptionsDialog::setLayoutText(const KoPageLayout& l) { KoUnit::Unit unit = static_cast<KoUnit::Unit>(m_unitCombo->currentItem()); - 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( + TQString 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( KoUnit::unitName(unit)); m_layoutTxtLbl->setText(txt); } diff --git a/kivio/kiviopart/ui/kiviostencilformatdlg.cpp b/kivio/kiviopart/ui/kiviostencilformatdlg.cpp index 3361ad23..e682b7fd 100644 --- a/kivio/kiviopart/ui/kiviostencilformatdlg.cpp +++ b/kivio/kiviopart/ui/kiviostencilformatdlg.cpp @@ -20,7 +20,7 @@ #include "kiviostencilformatdlg.h" #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqbitmap.h> #include <tqpixmap.h> #include <tqpainter.h> diff --git a/kivio/kiviopart/ui/kiviotextformatdlg.cpp b/kivio/kiviopart/ui/kiviotextformatdlg.cpp index 94dd995d..051bb90d 100644 --- a/kivio/kiviopart/ui/kiviotextformatdlg.cpp +++ b/kivio/kiviopart/ui/kiviotextformatdlg.cpp @@ -20,7 +20,7 @@ #include "kiviotextformatdlg.h" #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqbuttongroup.h> #include <tqradiobutton.h> @@ -68,7 +68,7 @@ void KivioTextFormatDlg::initPositionTab() m_halignBGrp->setButton(1); m_preview = new TQLabel(i18n("Preview"), tab); m_preview->setFrameStyle(TQFrame::Box | TQFrame::Sunken); - m_preview->tqsetAlignment(m_valign | m_halign); + m_preview->setAlignment(m_valign | m_halign); TQGridLayout* gl = new TQGridLayout(tab); gl->setSpacing(KDialog::spacingHint()); gl->setRowStretch(0, 10); @@ -95,7 +95,7 @@ void KivioTextFormatDlg::updateVAlign(int i) break; } - m_preview->tqsetAlignment(m_valign | m_halign); + m_preview->setAlignment(m_valign | m_halign); } void KivioTextFormatDlg::updateHAlign(int i) @@ -112,7 +112,7 @@ void KivioTextFormatDlg::updateHAlign(int i) break; } - m_preview->tqsetAlignment(m_valign | m_halign); + m_preview->setAlignment(m_valign | m_halign); } int KivioTextFormatDlg::valign() @@ -150,7 +150,7 @@ void KivioTextFormatDlg::setVAlign(int i) } m_valign = static_cast<TQt::AlignmentFlags>(i); - m_preview->tqsetAlignment(m_valign | m_halign); + m_preview->setAlignment(m_valign | m_halign); } void KivioTextFormatDlg::setHAlign(int i) @@ -168,7 +168,7 @@ void KivioTextFormatDlg::setHAlign(int i) } m_halign = static_cast<TQt::AlignmentFlags>(i); - m_preview->tqsetAlignment(m_valign | m_halign); + m_preview->setAlignment(m_valign | m_halign); } void KivioTextFormatDlg::setFont(TQFont f) diff --git a/kivio/kiviopart/ui/layerlisttooltip.cpp b/kivio/kiviopart/ui/layerlisttooltip.cpp index ed32c284..4a2d1fb5 100644 --- a/kivio/kiviopart/ui/layerlisttooltip.cpp +++ b/kivio/kiviopart/ui/layerlisttooltip.cpp @@ -49,13 +49,13 @@ void LayerListToolTip::maybeTip(const TQPoint& pos) return; } - TQRect tqitemRect = m_listView->tqitemRect(item); + TQRect itemRect = m_listView->itemRect(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(tqitemRect, toolTip); + tip(itemRect, toolTip); } } diff --git a/kivio/kiviopart/ui/objectlistpalette.cpp b/kivio/kiviopart/ui/objectlistpalette.cpp index 7483e98d..bd2d4392 100644 --- a/kivio/kiviopart/ui/objectlistpalette.cpp +++ b/kivio/kiviopart/ui/objectlistpalette.cpp @@ -18,7 +18,7 @@ */ #include "objectlistpalette.h" -#include <tqlayout.h> +#include <layout.h> #include <tqheader.h> #include <tqptrlist.h> @@ -85,7 +85,7 @@ ObjectListPalette::ObjectListPalette(KivioView* parent, const char* name) { m_blockUpdate = false; - TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 0, 2); + TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 2); m_objectList = new KListView(this); m_objectList->setFullWidth(true); @@ -95,7 +95,7 @@ ObjectListPalette::ObjectListPalette(KivioView* parent, const char* name) m_objectList->addColumn(i18n("Name")); m_objectList->addColumn(i18n("Type")); - tqlayout->addWidget(m_objectList); + layout->addWidget(m_objectList); connect(m_objectList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(updateSelection())); } |