Remove various '#define' strings - part 6

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

3 files changed, 11 insertions, 11 deletions

diff --git a/kivio/kiviopart/ui/kivio_layer_panel.cpp b/kivio/kiviopart/ui/kivio_layer_panel.cpp
index f1cccd78..f7803dd6 100644
--- a/kivio/kiviopart/ui/kivio_layer_panel.cpp
+++ b/kivio/kiviopart/ui/kivio_layer_panel.cpp
@@ -75,11 +75,11 @@ KivioLayerPanel::KivioLayerPanel(KivioView* view, TQWidget* parent, const char*
   list->setSorting(5, false);
   list->installEventFilter(this);
 
-  actNew = new TDEAction( i18n("New Layer"), BarIcon("layer_add",KivioFactory::global()), 0, TQT_TQOBJECT(this), TQT_SLOT(addItem()), TQT_TQOBJECT(this));
-  actDel = new TDEAction( i18n("Remove Layer"), BarIcon("layer_remove",KivioFactory::global()), 0, TQT_TQOBJECT(this), TQT_SLOT(removeItem()), TQT_TQOBJECT(this));
-  actRename = new TDEAction( i18n("Rename Layer"), BarIcon("item_rename",KivioFactory::global()), 0, TQT_TQOBJECT(this), TQT_SLOT(renameItem()), TQT_TQOBJECT(this));
-  actUp = new TDEAction( i18n("Move Layer Up"), "go-up", 0, TQT_TQOBJECT(this), TQT_SLOT(upItem()), TQT_TQOBJECT(this));
-  actDown = new TDEAction( i18n("Move Layer Down"), "go-down", 0, TQT_TQOBJECT(this), TQT_SLOT(downItem()), TQT_TQOBJECT(this));
+  actNew = new TDEAction( i18n("New Layer"), BarIcon("layer_add",KivioFactory::global()), 0, this, TQT_SLOT(addItem()), this);
+  actDel = new TDEAction( i18n("Remove Layer"), BarIcon("layer_remove",KivioFactory::global()), 0, this, TQT_SLOT(removeItem()), this);
+  actRename = new TDEAction( i18n("Rename Layer"), BarIcon("item_rename",KivioFactory::global()), 0, this, TQT_SLOT(renameItem()), this);
+  actUp = new TDEAction( i18n("Move Layer Up"), "go-up", 0, this, TQT_SLOT(upItem()), this);
+  actDown = new TDEAction( i18n("Move Layer Down"), "go-down", 0, this, TQT_SLOT(downItem()), this);
 
   actNew->plug(bar);
   actDel->plug(bar);
diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.cpp b/kivio/kiviopart/ui/kiviooptionsdialog.cpp
index e1623d9c..cd0f2953 100644
--- a/kivio/kiviopart/ui/kiviooptionsdialog.cpp
+++ b/kivio/kiviopart/ui/kiviooptionsdialog.cpp
@@ -101,7 +101,7 @@ void KivioOptionsDialog::initPage()
     kapp->iconLoader()->loadIcon("application-x-zerosize", TDEIcon::Toolbar, 32));
   m_pageIndex = pageIndex(page);
 
-  KivioView* view = static_cast<KivioView*>(TQT_TQWIDGET(parent()));
+  KivioView* view = static_cast<KivioView*>(parent());
   KoUnit::Unit unit = KoUnit::unit(Kivio::Config::unit());
   m_layout = Kivio::Config::defaultPageLayout();
   m_font = Kivio::Config::font();
@@ -158,8 +158,8 @@ void KivioOptionsDialog::initGrid()
   TQFrame* page = addPage(i18n("Grid"), i18n("Grid Settings"), BarIcon( "grid", TDEIcon::SizeMedium ));
   m_gridIndex = pageIndex(page);
 
-  KoUnit::Unit unit = static_cast<KivioView*>(TQT_TQWIDGET(parent()))->doc()->unit();
-  KivioGridData d = static_cast<KivioView*>(TQT_TQWIDGET(parent()))->doc()->grid();
+  KoUnit::Unit unit = static_cast<KivioView*>(parent())->doc()->unit();
+  KivioGridData d = static_cast<KivioView*>(parent())->doc()->grid();
   double pgw = m_layout.ptWidth;
   double pgh = m_layout.ptHeight;
   double fw = Kivio::Config::gridXSpacing();
@@ -210,7 +210,7 @@ void KivioOptionsDialog::initGrid()
 
 void KivioOptionsDialog::applyPage()
 {
-  KivioView* view = static_cast<KivioView*>(TQT_TQWIDGET(parent()));
+  KivioView* view = static_cast<KivioView*>(parent());
   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*>(TQT_TQWIDGET(parent()));
+  KivioView* view = static_cast<KivioView*>(parent());
   view->doc()->updateView(0);
 }
 
diff --git a/kivio/kiviopart/ui/kiviotextformatdlg.cpp b/kivio/kiviopart/ui/kiviotextformatdlg.cpp
index 536ab660..8111869e 100644
--- a/kivio/kiviopart/ui/kiviotextformatdlg.cpp
+++ b/kivio/kiviopart/ui/kiviotextformatdlg.cpp
@@ -183,7 +183,7 @@ void KivioTextFormatDlg::setTextColor(TQColor c)
 
 void KivioTextFormatDlg::slotDefault()
 {
-  setFont((static_cast<KivioView*>(TQT_TQWIDGET(parent())))->doc()->defaultFont());
+  setFont((static_cast<KivioView*>(parent()))->doc()->defaultFont());
   setTextColor(TQColor(0, 0, 0));
   setHAlign(TQt::AlignHCenter);
   setVAlign(TQt::AlignVCenter);