diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
commit | 929d7ae4f69d62b8f1f6d3506adf75f017753935 (patch) | |
tree | 21652db5723e70ded94f724015e77d96e42c83b9 /kommander/editor/mainwindowactions.cpp | |
parent | a40b0e89b6b20ba9039d3f79e73afbeac6954ccb (diff) | |
download | tdewebdev-929d7ae4f69d62b8f1f6d3506adf75f017753935.tar.gz tdewebdev-929d7ae4f69d62b8f1f6d3506adf75f017753935.zip |
Remove the tq in front of these incorrectly TQt4-converted methods/data members:
tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kommander/editor/mainwindowactions.cpp')
-rw-r--r-- | kommander/editor/mainwindowactions.cpp | 80 |
1 files changed, 40 insertions, 40 deletions
diff --git a/kommander/editor/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp index f57afd72..9ed36f59 100644 --- a/kommander/editor/mainwindowactions.cpp +++ b/kommander/editor/mainwindowactions.cpp @@ -225,14 +225,14 @@ void MainWindow::setupLayoutActions() actionEditGridLayout->setWhatsThis(whatsThisFrom("Layout|Lay Out in a Grid")); actionEditGridLayout->setEnabled(false); - actionEditSplitHorizontal = new KAction(i18n("Lay OutQt::Horizontally in Splitter"), createIconSet("editvtqlayoutsplit.xpm"), + actionEditSplitHorizontal = new KAction(i18n("Lay OutQt::Horizontally in Splitter"), createIconSet("editvlayoutsplit.xpm"), KShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editLayoutHorizontalSplit()), actionCollection(), "edit_split_h"); actionEditSplitHorizontal->setToolTip(i18n("Lays out the selected widgets horizontally in a splitter")); actionEditSplitHorizontal->setWhatsThis(whatsThisFrom("Layout|Lay OutQt::Horizontally in Splitter")); actionEditSplitHorizontal->setEnabled(false); - actionEditSplitVertical = new KAction(i18n("Lay OutQt::Vertically in Splitter"), createIconSet("edithtqlayoutsplit.xpm"), + actionEditSplitVertical = new KAction(i18n("Lay OutQt::Vertically in Splitter"), createIconSet("edithlayoutsplit.xpm"), KShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editLayoutVerticalSplit()), actionCollection(), "edit_split_v"); actionEditSplitVertical->setToolTip(i18n("Lays out the selected widgets vertically in a splitter")); @@ -255,17 +255,17 @@ void MainWindow::setupLayoutActions() "or double click to keep the tool selected.").tqarg(WidgetDatabase::toolTip(id)). tqarg(WidgetDatabase::whatsThis(id)).tqarg(WidgetDatabase::toolTip(id))); - TQWhatsThis::add(tqlayoutToolBar, i18n("<b>The Layout toolbar</b>%1").tqarg(toolbarHelp)); - actionEditAdjustSize->plug(tqlayoutToolBar); - tqlayoutToolBar->addSeparator(); - actionEditHLayout->plug(tqlayoutToolBar); - actionEditVLayout->plug(tqlayoutToolBar); - actionEditGridLayout->plug(tqlayoutToolBar); - actionEditSplitHorizontal->plug(tqlayoutToolBar); - actionEditSplitVertical->plug(tqlayoutToolBar); - actionEditBreakLayout->plug(tqlayoutToolBar); - tqlayoutToolBar->addSeparator(); - a->plug(tqlayoutToolBar); + TQWhatsThis::add(layoutToolBar, i18n("<b>The Layout toolbar</b>%1").tqarg(toolbarHelp)); + actionEditAdjustSize->plug(layoutToolBar); + layoutToolBar->addSeparator(); + actionEditHLayout->plug(layoutToolBar); + actionEditVLayout->plug(layoutToolBar); + actionEditGridLayout->plug(layoutToolBar); + actionEditSplitHorizontal->plug(layoutToolBar); + actionEditSplitVertical->plug(layoutToolBar); + actionEditBreakLayout->plug(layoutToolBar); + layoutToolBar->addSeparator(); + a->plug(layoutToolBar); TQPopupMenu *menu = new TQPopupMenu(this, "Layout"); menuBar()->insertItem(i18n("&Layout"), menu); @@ -893,13 +893,13 @@ void MainWindow::editPaste() if (l.count() == 1) { w = l.first(); - if (WidgetFactory::tqlayoutType(w) != WidgetFactory::NoLayout || + if (WidgetFactory::layoutType(w) != WidgetFactory::NoLayout || (!WidgetDatabase::isContainer(WidgetDatabase::idFromClassName(WidgetFactory:: classNameOf(TQT_TQOBJECT(w)))) && w != formWindow()->mainContainer())) w = formWindow()->mainContainer(); } - if (w && WidgetFactory::tqlayoutType(w) == WidgetFactory::NoLayout) + if (w && WidgetFactory::layoutType(w) == WidgetFactory::NoLayout) { formWindow()->paste(tqApp->clipboard()->text(), WidgetFactory::containerOfWidget(w)); hierarchyView->widgetInserted(0); @@ -945,42 +945,42 @@ void MainWindow::editAdjustSize() void MainWindow::editLayoutHorizontal() { - if (tqlayoutChilds) + if (layoutChilds) editLayoutContainerHorizontal(); - else if (tqlayoutSelected && formWindow()) - formWindow()->tqlayoutHorizontal(); + else if (layoutSelected && formWindow()) + formWindow()->layoutHorizontal(); } void MainWindow::editLayoutVertical() { - if (tqlayoutChilds) + if (layoutChilds) editLayoutContainerVertical(); - else if (tqlayoutSelected && formWindow()) - formWindow()->tqlayoutVertical(); + else if (layoutSelected && formWindow()) + formWindow()->layoutVertical(); } void MainWindow::editLayoutHorizontalSplit() { - if (tqlayoutChilds) + if (layoutChilds) ; // no way to do that - else if (tqlayoutSelected && formWindow()) - formWindow()->tqlayoutHorizontalSplit(); + else if (layoutSelected && formWindow()) + formWindow()->layoutHorizontalSplit(); } void MainWindow::editLayoutVerticalSplit() { - if (tqlayoutChilds) + if (layoutChilds) ; // no way to do that - else if (tqlayoutSelected && formWindow()) - formWindow()->tqlayoutVerticalSplit(); + else if (layoutSelected && formWindow()) + formWindow()->layoutVerticalSplit(); } void MainWindow::editLayoutGrid() { - if (tqlayoutChilds) + if (layoutChilds) editLayoutContainerGrid(); - else if (tqlayoutSelected && formWindow()) - formWindow()->tqlayoutGrid(); + else if (layoutSelected && formWindow()) + formWindow()->layoutGrid(); } void MainWindow::editLayoutContainerVertical() @@ -992,7 +992,7 @@ void MainWindow::editLayoutContainerVertical() if (l.count() == 1) w = l.first(); if (w) - formWindow()->tqlayoutVerticalContainer(w); + formWindow()->layoutVerticalContainer(w); } void MainWindow::editLayoutContainerHorizontal() @@ -1004,7 +1004,7 @@ void MainWindow::editLayoutContainerHorizontal() if (l.count() == 1) w = l.first(); if (w) - formWindow()->tqlayoutHorizontalContainer(w); + formWindow()->layoutHorizontalContainer(w); } void MainWindow::editLayoutContainerGrid() @@ -1016,7 +1016,7 @@ void MainWindow::editLayoutContainerGrid() if (l.count() == 1) w = l.first(); if (w) - formWindow()->tqlayoutGridContainer(w); + formWindow()->layoutGridContainer(w); } @@ -1029,8 +1029,8 @@ void MainWindow::editBreakLayout() TQWidget *w = formWindow()->mainContainer(); if (formWindow()->currentWidget()) w = formWindow()->currentWidget(); - if (WidgetFactory::tqlayoutType(w) != WidgetFactory::NoLayout || - w->tqparentWidget() && WidgetFactory::tqlayoutType(w->tqparentWidget()) != WidgetFactory::NoLayout) + if (WidgetFactory::layoutType(w) != WidgetFactory::NoLayout || + w->parentWidget() && WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout) { formWindow()->breakLayout(w); return; @@ -1040,9 +1040,9 @@ void MainWindow::editBreakLayout() TQWidgetList widgets = formWindow()->selectedWidgets(); for (w = widgets.first(); w; w = widgets.next()) { - if (WidgetFactory::tqlayoutType(w) != WidgetFactory::NoLayout || - w->tqparentWidget() - && WidgetFactory::tqlayoutType(w->tqparentWidget()) != WidgetFactory::NoLayout) + if (WidgetFactory::layoutType(w) != WidgetFactory::NoLayout || + w->parentWidget() + && WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout) break; } if (w) @@ -1053,8 +1053,8 @@ void MainWindow::editBreakLayout() } w = formWindow()->mainContainer(); - if (WidgetFactory::tqlayoutType(w) != WidgetFactory::NoLayout || - w->tqparentWidget() && WidgetFactory::tqlayoutType(w->tqparentWidget()) != WidgetFactory::NoLayout) + if (WidgetFactory::layoutType(w) != WidgetFactory::NoLayout || + w->parentWidget() && WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout) { formWindow()->breakLayout(w); } |