summaryrefslogtreecommitdiffstats
path: root/kommander/editor/formwindow.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kommander/editor/formwindow.cpp')
-rw-r--r--kommander/editor/formwindow.cpp32
1 files changed, 16 insertions, 16 deletions
diff --git a/kommander/editor/formwindow.cpp b/kommander/editor/formwindow.cpp
index 55c1b142..7e9a3b39 100644
--- a/kommander/editor/formwindow.cpp
+++ b/kommander/editor/formwindow.cpp
@@ -110,8 +110,8 @@ static void restoreCursors(TQWidget *start, FormWindow *fw)
event filter which is implemented in MainWindow::eventFilter().
*/
-FormWindow::FormWindow(FormFile *f, MainWindow *mw, TQWidget *tqparent, const char *name)
- : TQWidget(tqparent, name, WDestructiveClose), mainwindow(mw),
+FormWindow::FormWindow(FormFile *f, MainWindow *mw, TQWidget *parent, const char *name)
+ : TQWidget(parent, name, WDestructiveClose), mainwindow(mw),
commands(100), pixInline(true)
{
ff = f;
@@ -119,8 +119,8 @@ FormWindow::FormWindow(FormFile *f, MainWindow *mw, TQWidget *tqparent, const ch
initSlots();
}
-FormWindow::FormWindow(FormFile *f, TQWidget *tqparent, const char *name)
- : TQWidget(tqparent, name, WDestructiveClose), mainwindow(0),
+FormWindow::FormWindow(FormFile *f, TQWidget *parent, const char *name)
+ : TQWidget(parent, name, WDestructiveClose), mainwindow(0),
commands(100), pixInline(true)
{
ff = f;
@@ -213,14 +213,14 @@ void FormWindow::paintGrid(TQWidget *w, TQPaintEvent *e)
if(!TQPixmapCache::find(grid_name, grid)) {
grid = TQPixmap(350 + (350 % mainWindow()->grid().x()), 350 + (350 % mainWindow()->grid().y()));
grid.fill(tqcolorGroup().color(TQColorGroup::Foreground));
- TQBitmap tqmask(grid.width(), grid.height());
- tqmask.fill(color0);
- TQPainter p(&tqmask);
+ TQBitmap mask(grid.width(), grid.height());
+ mask.fill(color0);
+ TQPainter p(&mask);
p.setPen(color1);
for (int y = 0; y < grid.width(); y += mainWindow()->grid().y())
for (int x = 0; x < grid.height(); x += mainWindow()->grid().x())
p.drawPoint(x, y);
- grid.setMask(tqmask);
+ grid.setMask(mask);
TQPixmapCache::insert(grid_name, grid);
}
TQPainter p(w);
@@ -381,7 +381,7 @@ void FormWindow::insertWidget()
pos -= r.topLeft();
np.append(pos);
}
- MoveCommand *mv = new MoveCommand(i18n("Retqparent Widgets"), this, lst, op, np, insertParent, pw);
+ MoveCommand *mv = new MoveCommand(i18n("Reparent Widgets"), this, lst, op, np, insertParent, pw);
if (!toolFixed)
mainwindow->resetTool();
else
@@ -628,9 +628,9 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w)
if (e->button() == Qt::LeftButton)
{
insertParent = WidgetFactory::containerOfWidget(mainContainer());
- // default tqparent for new widget is the formwindow
+ // default parent for new widget is the formwindow
if (!isMainContainer(TQT_TQOBJECT(w)))
- { // press was not on formwindow, check if we can find another tqparent
+ { // press was not on formwindow, check if we can find another parent
TQWidget *wid = w;
for (;;)
{
@@ -638,7 +638,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w)
if ((WidgetDatabase::isContainer(id) || wid == mainContainer()) &&
!wid->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) && !wid->inherits(TQSPLITTER_OBJECT_NAME_STRING))
{
- insertParent = WidgetFactory::containerOfWidget(wid); // found another tqparent, store it
+ insertParent = WidgetFactory::containerOfWidget(wid); // found another parent, store it
break;
}
else
@@ -733,7 +733,7 @@ void FormWindow::handleMouseMove(TQMouseEvent *e, TQWidget *w)
checkSelectionsForMove(w);
}
// check whether we would have to reparent the selection and
- // highlight the possible new tqparent container
+ // highlight the possible new parent container
TQMapConstIterator<ulong, TQPoint> it = moving.begin();
TQWidget* wa = containerAt(e->globalPos(), ((TQWidget*)it.key()));
if (wa && !isMainContainer(TQT_TQOBJECT(wa)) && !isCentralWidget(TQT_TQOBJECT(wa)))
@@ -1553,7 +1553,7 @@ TQWidget *FormWindow::designerWidget(TQObject * o) const
return 0;
TQWidget *w = (TQWidget *) o;
while (w && !isMainContainer(TQT_TQOBJECT(w)) && !insertedWidgets[(void *) w] || isCentralWidget(TQT_TQOBJECT(w)))
- w = (TQWidget *) w->tqparent();
+ w = (TQWidget *) w->parent();
return w;
}
@@ -1872,11 +1872,11 @@ void FormWindow::raiseWidgets()
commandHistory()->addCommand(cmd);
}
-void FormWindow::paste(const TQString & cb, TQWidget * tqparent)
+void FormWindow::paste(const TQString & cb, TQWidget * parent)
{
Resource resource(mainWindow());
resource.setWidget(this);
- resource.paste(cb, tqparent);
+ resource.paste(cb, parent);
}
void FormWindow::selectAll()