From e985f7e545f4739493965aad69bbecb136dc9346 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 16 Jun 2011 19:02:47 +0000 Subject: TQt4 port kdewebdev This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1237029 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kommander/editor/mainwindow.cpp | 290 ++++++++++++++++++++-------------------- 1 file changed, 145 insertions(+), 145 deletions(-) (limited to 'kommander/editor/mainwindow.cpp') diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp index 069d30dd..f87b7c2c 100644 --- a/kommander/editor/mainwindow.cpp +++ b/kommander/editor/mainwindow.cpp @@ -1,5 +1,5 @@ /********************************************************************** - This file is based on Qt Designer, Copyright (C) 2000 Trolltech AS. All rights reserved. + This file is based on TQt Designer, Copyright (C) 2000 Trolltech AS. All rights reserved. This file may be distributed and/or modified under the terms of the GNU General Public License version 2 as published by the Free Software @@ -108,7 +108,7 @@ static TQString textNoAccel(const TQString& text) { TQString t = text; int i; - while ((i = t.find('&'))>= 0) { + while ((i = t.tqfind('&'))>= 0) { t.remove(i,1); } return t; @@ -118,7 +118,7 @@ static TQString textNoAccel(const TQString& text) MainWindow::MainWindow(bool asClient) : KParts::DockMainWindow(0, "mainwindow", WType_TopLevel | WDestructiveClose | WGroupLeader), grd(10, 10), sGrid(true), snGrid(true), restoreConfig(true), splashScreen(true), - docPath("$QTDIR/doc/html"), client(asClient), databaseAutoEdit(false), previewing(false) + docPath("$TQTDIR/doc/html"), client(asClient), databaseAutoEdit(false), previewing(false) { m_partManager = new KParts::PartManager(this); //connect(m_partManager, TQT_SIGNAL(activePartChanged(KParts::Part * )), this, TQT_SLOT(slotActivePartChanged(KParts::Part * ))); @@ -143,9 +143,9 @@ MainWindow::MainWindow(bool asClient) setupMDI(); setupFileActions(); setupEditActions(); - layoutToolBar = new KToolBar(this, "Layout"); - ((KToolBar *) layoutToolBar)->setFullSize(false); - addToolBar(layoutToolBar, i18n("Layout")); + tqlayoutToolBar = new KToolBar(this, "Layout"); + ((KToolBar *) tqlayoutToolBar)->setFullSize(false); + addToolBar(tqlayoutToolBar, i18n("Layout")); setupToolActions(); setupLayoutActions(); setupWorkspace(); @@ -171,8 +171,8 @@ MainWindow::MainWindow(bool asClient) connect(kapp->clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clipboardChanged())); clipboardChanged(); - layoutChilds = false; - layoutSelected = false; + tqlayoutChilds = false; + tqlayoutSelected = false; breakLayout = false; backPix = true; @@ -191,7 +191,7 @@ MainWindow::MainWindow(bool asClient) w = WidgetFactory::create(WidgetDatabase::idFromClassName(TQFRAME_OBJECT_NAME_STRING), this, 0, false); delete w; - assistant = new AssistProc(this, "Internal Assistant", assistantPath()); + assistant = new AssistProc(TQT_TQOBJECT(this), "Internal Assistant", assistantPath()); statusBar()->setSizeGripEnabled(true); SpecialInformation::registerSpecials(); @@ -237,7 +237,7 @@ void MainWindow::setupPropertyEditor() { KDockWidget *dw = createDockWidget("Property Editor", TQPixmap(), 0, i18n("Properties")); propertyEditor = new PropertyEditor(dw); - //addToolBar(dw, Qt::DockLeft); + //addToolBar(dw, TQt::DockLeft); dw->setWidget(propertyEditor); dw->manualDock(getMainDockWidget(), KDockWidget::DockLeft, 20); dw->setCaption(i18n("Property Editor")); @@ -274,7 +274,7 @@ void MainWindow::setupHierarchyView() "

The Object Explorer provides an overview of the relationships " "between the widgets in a form. You can use the clipboard functions using " "a context menu for each item in the view. It is also useful for selecting widgets " - "in forms that have complex layouts.

" + "in forms that have complex tqlayouts.

" "

The columns can be resized by dragging the separator in the list's header.

" "

The second tab shows all the form's slots, class variables, includes, etc.

")); } @@ -300,7 +300,7 @@ void MainWindow::setupActionEditor() { KDockWidget *dw = createDockWidget("Action Editor", TQPixmap(), 0, i18n("Actions")); actionEditor = new ActionEditor(dw, "ActionEditor"); - //addToolBar(dw, Qt::DockLeft); + //addToolBar(dw, TQt::DockLeft); dw->setWidget(actionEditor); dw->setCaption(i18n("Action Editor")); TQWhatsThis::add(actionEditor, i18n("The Action Editor" @@ -368,7 +368,7 @@ int MainWindow::currentTool() const { if (!actionCurrentTool) return POINTER_TOOL; - return TQString::fromLatin1(actionCurrentTool->name()).toInt(); + return TQString::tqfromLatin1(actionCurrentTool->name()).toInt(); } void MainWindow::slotCreateBackups() @@ -392,7 +392,7 @@ void MainWindow::slotCreateBackups() form->formFile()->setModified(true); if (!form->formFile()->save(false)) { - KMessageBox::error(this, i18n("Cannot create backup file %1.").arg(backupName)); + KMessageBox::error(this, i18n("Cannot create backup file %1.").tqarg(backupName)); } form->formFile()->setFileName(fileName); form->formFile()->setModified(modified); @@ -417,7 +417,7 @@ void MainWindow::runForm() while ((editor = it.current()) != 0L) { ++it; - static_cast(editor)->save(); + static_cast(TQT_TQWIDGET(editor))->save(); } delete editors; @@ -436,7 +436,7 @@ void MainWindow::runForm() ::stat(m_fileName.local8Bit(), &statbuf); if (!readOnlyFile && !KIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_backupName), statbuf.st_mode, true)) { - KMessageBox::error(this, i18n("Cannot create temporary file %1.").arg(m_backupName)); + KMessageBox::error(this, i18n("Cannot create temporary file %1.").tqarg(m_backupName)); return; } form->formFile()->setFileName(m_fileName); @@ -446,12 +446,12 @@ void MainWindow::runForm() { if (!readOnlyFile && !KIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_fileName + ".backup"), statbuf.st_mode, true)) { - KMessageBox::error(this, i18n("Cannot create backup file %1.").arg(m_fileName + ".backup")); + KMessageBox::error(this, i18n("Cannot create backup file %1.").tqarg(m_fileName + ".backup")); } ::chmod(m_fileName.local8Bit(), S_IRWXU); KProcess* process = new KProcess; process->setUseShell(true); - (*process) << "kmdr-executor" << TQString("\"%1\"").arg(form->formFile()->fileName()); + (*process) << "kmdr-executor" << TQString("\"%1\"").tqarg(form->formFile()->fileName()); connect(process, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), messageLog, TQT_SLOT(receivedStdout(KProcess*, char*, int))); connect(process, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), messageLog, @@ -481,7 +481,7 @@ void MainWindow::runForm4() while ((editor = it.current()) != 0L) { ++it; - static_cast(editor)->save(); + static_cast(TQT_TQWIDGET(editor))->save(); } delete editors; @@ -500,7 +500,7 @@ void MainWindow::runForm4() ::stat(m_fileName.local8Bit(), &statbuf); if (!readOnlyFile && !KIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_backupName), statbuf.st_mode, true)) { - KMessageBox::error(this, i18n("Cannot create temporary file %1.").arg(m_backupName)); + KMessageBox::error(this, i18n("Cannot create temporary file %1.").tqarg(m_backupName)); return; } form->formFile()->setFileName(m_fileName); @@ -510,12 +510,12 @@ void MainWindow::runForm4() { if (!readOnlyFile && !KIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_fileName + ".backup"), statbuf.st_mode, true)) { - KMessageBox::error(this, i18n("Cannot create backup file %1.").arg(m_fileName + ".backup")); + KMessageBox::error(this, i18n("Cannot create backup file %1.").tqarg(m_fileName + ".backup")); } ::chmod(m_fileName.local8Bit(), S_IRWXU); KProcess* process = new KProcess; process->setUseShell(true); - (*process) << "kommander" << TQString("\"%1\"").arg(form->formFile()->fileName()); + (*process) << "kommander" << TQString("\"%1\"").tqarg(form->formFile()->fileName()); connect(process, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), messageLog, TQT_SLOT(receivedStdout(KProcess*, char*, int))); connect(process, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), messageLog, @@ -554,9 +554,9 @@ void MainWindow::showProperties(TQObject *o) } TQWidget *w = (TQWidget*)o; setupHierarchyView(); - FormWindow *fw = (FormWindow*)isAFormWindowChild(w); + FormWindow *fw = (FormWindow*)isAFormWindowChild(TQT_TQOBJECT(w)); if (fw) { - propertyEditor->setWidget(w, fw); + propertyEditor->setWidget(TQT_TQOBJECT(w), fw); hierarchyView->setFormWindow(fw, w); } else { propertyEditor->setWidget(0, 0); @@ -596,7 +596,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) while (w) { if (w->inherits("PropertyList")) break; - w = w->parentWidget(true); + w = w->tqparentWidget(true); } if (w) { propertyEditor->propertyList()->showCurrentWhatsThis(); @@ -617,7 +617,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) } break; case TQEvent::MouseButtonPress: - if (((TQMouseEvent*)e)->button() == MidButton && dynamic_cast(o)) + if (((TQMouseEvent*)e)->button() == Qt::MidButton && dynamic_cast(o)) { AssocTextEditor *editor = new AssocTextEditor((TQWidget*)o, formWindow(), propertyEditor, m_partManager, this, "AssocTextEditor", false); //deletes itself! @@ -626,27 +626,27 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) return true; } case TQEvent::ContextMenu: - if (o->inherits("QDesignerPopupMenu")) + if (o->inherits("TQDesignerPopupMenu")) break; - if (o && currentTool() == POINTER_TOOL && (o->inherits("QDesignerMenuBar") || - o->inherits("QDesignerToolBar") || - (o->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) || o->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) || o->inherits("QDesignerToolBarSeparator")) && - o->parent() && o->parent()->inherits("QDesignerToolBar"))) { + if (o && currentTool() == POINTER_TOOL && (o->inherits("TQDesignerMenuBar") || + o->inherits("TQDesignerToolBar") || + (o->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) || o->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) || o->inherits("TQDesignerToolBarSeparator")) && + o->tqparent() && o->tqparent()->inherits("TQDesignerToolBar"))) { TQWidget *w = (TQWidget*)o; - if (w->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) || w->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) || w->inherits("QDesignerToolBarSeparator")) - w = w->parentWidget(); - TQWidget *pw = w->parentWidget(); + if (w->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) || w->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) || w->inherits("TQDesignerToolBarSeparator")) + w = w->tqparentWidget(); + TQWidget *pw = w->tqparentWidget(); while (pw) { if (pw->inherits("FormWindow")) { - ((FormWindow*)pw)->emitShowProperties(w); - if (!o->inherits("QDesignerToolBar")) + ((FormWindow*)pw)->emitShowProperties(TQT_TQOBJECT(w)); + if (!o->inherits("TQDesignerToolBar")) return !o->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) && !o->inherits(TQMENUBAR_OBJECT_NAME_STRING) && - !o->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) && !o->inherits("QDesignerToolBarSeparator"); + !o->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) && !o->inherits("TQDesignerToolBarSeparator"); } - pw = pw->parentWidget(); + pw = pw->tqparentWidget(); } } - if (o && (o->inherits("QDesignerToolBar") || o->inherits("QDockWindowHandle")) + if (o && (o->inherits("TQDesignerToolBar") || o->inherits(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING)) && e->type() == TQEvent::ContextMenu) break; if (isAToolBarChild(o) && currentTool() != CONNECT_TOOL) @@ -719,7 +719,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) case TQEvent::MouseButtonDblClick: if (!(w = isAFormWindowChild(o)) || o->inherits("SizeHandle") || o->inherits("OrderIndicator")) { if (o && o->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) && ((TQToolButton*)o)->isOn() && - o->parent() && o->parent()->inherits(TQTOOLBAR_OBJECT_NAME_STRING) && formWindow()) + o->tqparent() && o->tqparent()->inherits(TQTOOLBAR_OBJECT_NAME_STRING) && formWindow()) formWindow()->setToolFixed(); break; } @@ -740,19 +740,19 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) case TQEvent::Hide: if (!(w = isAFormWindowChild(o)) || o->inherits("SizeHandle") || o->inherits("OrderIndicator")) break; - if (((FormWindow*)w)->isWidgetSelected((TQWidget*)o)) - ((FormWindow*)w)->selectWidget((TQWidget*)o, false); + if (((FormWindow*)w)->isWidgetSelected(TQT_TQOBJECT(o))) + ((FormWindow*)w)->selectWidget(TQT_TQOBJECT(o), false); break; case TQEvent::Enter: case TQEvent::Leave: - if (!(w = isAFormWindowChild(o)) || o->inherits("SizeHandle") || o->inherits("OrderIndicator") || o->inherits("QDesignerMenuBar")) + if (!(w = isAFormWindowChild(o)) || o->inherits("SizeHandle") || o->inherits("OrderIndicator") || o->inherits("TQDesignerMenuBar")) break; return true; case TQEvent::Resize: case TQEvent::Move: if (!(w = isAFormWindowChild(o)) || o->inherits("SizeHandle") || o->inherits("OrderIndicator")) break; - if (WidgetFactory::layoutType((TQWidget*)o->parent()) != WidgetFactory::NoLayout) { + if (WidgetFactory::tqlayoutType((TQWidget*)o->tqparent()) != WidgetFactory::NoLayout) { ((FormWindow*)w)->updateSelection((TQWidget*)o); if (e->type() != TQEvent::Resize) ((FormWindow*)w)->updateChildSelections((TQWidget*)o); @@ -761,25 +761,25 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) case TQEvent::Close: break; case TQEvent::DragEnter: - if (o == qWorkspace() || o == workspace() || o == workspace()->viewport()) { + if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(qWorkspace()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(workspace()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(workspace()->viewport())) { workspace()->contentsDragEnterEvent((TQDragEnterEvent*)e); return true; } break; case TQEvent::DragMove: - if (o == qWorkspace() || o == workspace() || o == workspace()->viewport()) { + if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(qWorkspace()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(workspace()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(workspace()->viewport())) { workspace()->contentsDragMoveEvent((TQDragMoveEvent*)e); return true; } break; case TQEvent::Drop: - if (o == qWorkspace() || o == workspace() || o == workspace()->viewport()) { + if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(qWorkspace()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(workspace()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(workspace()->viewport())) { workspace()->contentsDropEvent((TQDropEvent*)e); return true; } break; case TQEvent::Show: - if (o != this) + if (TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(this)) break; if (((TQShowEvent*)e)->spontaneous()) break; @@ -808,12 +808,12 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) TQWidget *MainWindow::isAFormWindowChild(TQObject *o) const { - if (o->parent() && o->parent()->inherits(TQWIZARD_OBJECT_NAME_STRING) && !o->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING)) + if (o->tqparent() && o->tqparent()->inherits(TQWIZARD_OBJECT_NAME_STRING) && !o->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING)) return 0; while (o) { if (o->inherits("FormWindow")) return (TQWidget*)o; - o = o->parent(); + o = o->tqparent(); } return 0; } @@ -821,11 +821,11 @@ TQWidget *MainWindow::isAFormWindowChild(TQObject *o) const TQWidget *MainWindow::isAToolBarChild(TQObject *o) const { while (o) { - if (o->inherits("QDesignerToolBar")) + if (o->inherits("TQDesignerToolBar")) return (TQWidget*)o; if (o->inherits("FormWindow")) return 0; - o = o->parent(); + o = o->tqparent(); } return 0; } @@ -837,7 +837,7 @@ FormWindow *MainWindow::formWindow() if (qworkspace->activeWindow()->inherits("FormWindow")) fw = (FormWindow*)qworkspace->activeWindow(); else if (lastActiveFormWindow && - qworkspace->windowList().find(lastActiveFormWindow) != -1) + qworkspace->windowList().tqfind(lastActiveFormWindow) != -1) fw = lastActiveFormWindow; return fw; } @@ -848,7 +848,7 @@ void MainWindow::insertFormWindow(FormWindow *fw) { if (fw) TQWhatsThis::add(fw, i18n("The Form Window" - "

Use the various tools to add widgets or to change the layout " + "

Use the various tools to add widgets or to change the tqlayout " "and behavior of the components in the form. Select one or multiple " "widgets to move them or lay them out. If a single widget is chosen it can " "be resized using the resize handles.

" @@ -872,12 +872,12 @@ void MainWindow::insertFormWindow(FormWindow *fw) fw->show(); fw->currentToolChanged(); - if (fw->caption().isEmpty() && qstrlen(fw->name()) ) + if (fw->caption().isEmpty() && tqstrlen(fw->name()) ) fw->setCaption(fw->name()); fw->mainContainer()->setCaption(fw->caption()); WidgetFactory::saveDefaultProperties(fw->mainContainer(), WidgetDatabase:: - idFromClassName(WidgetFactory::classNameOf(fw->mainContainer()))); + idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(fw->mainContainer())))); activeWindowChanged(fw); emit formWindowsChanged(); } @@ -934,7 +934,7 @@ void MainWindow::activeWindowChanged(TQWidget *w) emit hasActiveForm(false); propertyEditor->clear(); hierarchyView->clear(); - updateUndoRedo(false, false, TQString::null, TQString::null); + updateUndoRedo(false, false, TQString(), TQString()); } selectionChanged(); @@ -952,11 +952,11 @@ void MainWindow::updateUndoRedo(bool undoAvailable, bool redoAvailable, actionEditUndo->setEnabled(undoAvailable); actionEditRedo->setEnabled(redoAvailable); if (!undoCmd.isEmpty()) - actionEditUndo->setText(i18n("&Undo: %1").arg(undoCmd)); + actionEditUndo->setText(i18n("&Undo: %1").tqarg(undoCmd)); else actionEditUndo->setText(i18n("&Undo: Not Available")); if (!redoCmd.isEmpty()) - actionEditRedo->setText(i18n("&Redo: %1").arg(redoCmd)); + actionEditRedo->setText(i18n("&Redo: %1").tqarg(redoCmd)); else actionEditRedo->setText(i18n("&Redo: Not Available")); @@ -1012,18 +1012,18 @@ void MainWindow::popupWidgetMenu(const TQPoint &gp, FormWindow * /*fw*/, TQWidge void MainWindow::setupRMBProperties(TQValueList &ids, TQMap &props, TQWidget *w) { - const TQMetaProperty* text = w->metaObject()->property(w->metaObject()->findProperty("text", true), true); + const TQMetaProperty* text = w->tqmetaObject()->property(w->tqmetaObject()->tqfindProperty("text", true), true); if (text && qstrcmp(text->type(), TQSTRING_OBJECT_NAME_STRING) != 0) text = 0; - const TQMetaProperty* title = w->metaObject()->property(w->metaObject()->findProperty("title", true), true); + const TQMetaProperty* title = w->tqmetaObject()->property(w->tqmetaObject()->tqfindProperty("title", true), true); if (title && qstrcmp(title->type(), TQSTRING_OBJECT_NAME_STRING) != 0) title = 0; const TQMetaProperty* pagetitle = - w->metaObject()->property(w->metaObject()->findProperty("pageTitle", true), true); + w->tqmetaObject()->property(w->tqmetaObject()->tqfindProperty("pageTitle", true), true); if (pagetitle && qstrcmp(pagetitle->type(), TQSTRING_OBJECT_NAME_STRING) != 0) pagetitle = 0; const TQMetaProperty* pixmap = - w->metaObject()->property(w->metaObject()->findProperty("pixmap", true), true); + w->tqmetaObject()->property(w->tqmetaObject()->tqfindProperty("pixmap", true), true); if (pixmap && qstrcmp(pixmap->type(), TQPIXMAP_OBJECT_NAME_STRING) != 0) pixmap = 0; @@ -1056,7 +1056,7 @@ void MainWindow::setupRMBProperties(TQValueList &ids, TQMap void MainWindow::setupRMBSpecialCommands(TQValueList &ids, TQMap &commands, TQWidget *w) { int id; - // KommanderWidget doesn't derive from QObject + // KommanderWidget doesn't derive from TQObject KommanderWidget *atw = dynamic_cast(w); if(atw) { @@ -1071,7 +1071,7 @@ void MainWindow::setupRMBSpecialCommands(TQValueList &ids, TQMapinherits(TQTABWIDGET_OBJECT_NAME_STRING)) { if (ids.isEmpty()) ids << rmbWidgets->insertSeparator(0); - if (((QDesignerTabWidget*)w)->count() > 1) { + if (((TQDesignerTabWidget*)w)->count() > 1) { ids << (id = rmbWidgets->insertItem(i18n("Delete Page"), -1, 0)); commands.insert("remove", id); } @@ -1088,7 +1088,7 @@ void MainWindow::setupRMBSpecialCommands(TQValueList &ids, TQMapinsertItem(i18n("Add Page"), -1, 0)); commands.insert("add", id); } - if (WidgetFactory::hasSpecialEditor(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)))) + if (WidgetFactory::hasSpecialEditor(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))))) { if (ids.isEmpty()) ids << rmbWidgets->insertSeparator(0); @@ -1101,7 +1101,7 @@ void MainWindow::setupRMBSpecialCommands(TQValueList &ids, TQMap(fw->mainContainer()); if(atw) { @@ -1153,49 +1153,49 @@ void MainWindow::handleRMBProperties(int id, TQMap &props, TQWidg text = KInputDialog::getText(i18n("Text"), i18n("New text:"), w->property("text").toString(), &ok, this); } if (ok) { - TQString pn(i18n("Set the 'text' of '%1'").arg(w->name())); - SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), w, propertyEditor, + TQString pn(i18n("Set the 'text' of '%1'").tqarg(w->name())); + SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, "text", w->property("text"), - text, TQString::null, TQString::null); + text, TQString(), TQString()); cmd->execute(); formWindow()->commandHistory()->addCommand(cmd); - MetaDataBase::setPropertyChanged(w, "text", true); + MetaDataBase::setPropertyChanged(TQT_TQOBJECT(w), "text", true); } } else if (id == props[ "title" ]) { bool ok = false; TQString title = KInputDialog::getText(i18n("Title"), i18n("New title:"), w->property("title").toString(), &ok, this); if (ok) { - TQString pn(i18n("Set the 'title' of '%1'").arg(w->name())); - SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), w, propertyEditor, + TQString pn(i18n("Set the 'title' of '%1'").tqarg(w->name())); + SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, "title", w->property("title"), - title, TQString::null, TQString::null); + title, TQString(), TQString()); cmd->execute(); formWindow()->commandHistory()->addCommand(cmd); - MetaDataBase::setPropertyChanged(w, "title", true); + MetaDataBase::setPropertyChanged(TQT_TQOBJECT(w), "title", true); } } else if (id == props[ "pagetitle" ]) { bool ok = false; TQString text = KInputDialog::getText(i18n("Page Title"), i18n("New page title:"), w->property("pageTitle").toString(), &ok, this); if (ok) { - TQString pn(i18n("Set the 'pageTitle' of '%1'").arg(w->name())); - SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), w, propertyEditor, + TQString pn(i18n("Set the 'pageTitle' of '%1'").tqarg(w->name())); + SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, "pageTitle", w->property("pageTitle"), - text, TQString::null, TQString::null); + text, TQString(), TQString()); cmd->execute(); formWindow()->commandHistory()->addCommand(cmd); - MetaDataBase::setPropertyChanged(w, "pageTitle", true); + MetaDataBase::setPropertyChanged(TQT_TQOBJECT(w), "pageTitle", true); } } else if (id == props[ "pixmap" ]) { - TQPixmap oldPix = w->property("pixmap").toPixmap(); + TQPixmap oldPix = TQVariant(w->property("pixmap")).toPixmap(); TQPixmap pix = qChoosePixmap(this, formWindow(), oldPix); if (!pix.isNull()) { - TQString pn(i18n("Set the 'pixmap' of '%1'").arg(w->name())); - SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), w, propertyEditor, + TQString pn(i18n("Set the 'pixmap' of '%1'").tqarg(w->name())); + SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, "pixmap", w->property("pixmap"), - pix, TQString::null, TQString::null); + pix, TQString(), TQString()); cmd->execute(); formWindow()->commandHistory()->addCommand(cmd); - MetaDataBase::setPropertyChanged(w, "pixmap", true); + MetaDataBase::setPropertyChanged(TQT_TQOBJECT(w), "pixmap", true); } } } @@ -1214,15 +1214,15 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap &commands if (w->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) { TQTabWidget *tw = (TQTabWidget*)w; if (id == commands[ "add" ]) { - AddTabPageCommand *cmd = new AddTabPageCommand(i18n("Add Page to %1").arg(tw->name()), formWindow(), + AddTabPageCommand *cmd = new AddTabPageCommand(i18n("Add Page to %1").tqarg(tw->name()), formWindow(), tw, "Tab"); formWindow()->commandHistory()->addCommand(cmd); cmd->execute(); } else if (id == commands[ "remove" ]) { if (tw->currentPage()) { - QDesignerTabWidget *dtw = (QDesignerTabWidget*)tw; + TQDesignerTabWidget *dtw = (TQDesignerTabWidget*)tw; DeleteTabPageCommand *cmd = new DeleteTabPageCommand(i18n("Delete Page %1 of %2"). - arg(dtw->pageTitle()).arg(tw->name()), + tqarg(dtw->pageTitle()).tqarg(tw->name()), formWindow(), tw, tw->currentPage()); formWindow()->commandHistory()->addCommand(cmd); cmd->execute(); @@ -1232,7 +1232,7 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap &commands if (w->inherits(TQTOOLBOX_OBJECT_NAME_STRING)) { TQToolBox *tw = (TQToolBox*)w; if (id == commands[ "add" ]) { - AddToolBoxPageCommand *cmd = new AddToolBoxPageCommand(i18n("Add Page to %1").arg(tw->name()), formWindow(), + AddToolBoxPageCommand *cmd = new AddToolBoxPageCommand(i18n("Add Page to %1").tqarg(tw->name()), formWindow(), tw, "Page"); formWindow()->commandHistory()->addCommand(cmd); cmd->execute(); @@ -1240,16 +1240,16 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap &commands if (tw->currentItem()) { EditorToolBox *dtw = (EditorToolBox*)tw; DeleteToolBoxPageCommand *cmd = new DeleteToolBoxPageCommand(i18n("Delete Page %1 of %2"). - arg(dtw->pageTitle()).arg(tw->name()), + tqarg(dtw->pageTitle()).tqarg(tw->name()), formWindow(), tw, tw->currentItem()); formWindow()->commandHistory()->addCommand(cmd); cmd->execute(); } } } - if (WidgetFactory::hasSpecialEditor(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)))) { + if (WidgetFactory::hasSpecialEditor(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))))) { if (id == commands[ "edit" ]) - WidgetFactory::editWidget(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)), this, w, formWindow()); + WidgetFactory::editWidget(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))), this, w, formWindow()); } } @@ -1267,15 +1267,15 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap &commands if (fw->mainContainer()->inherits(TQWIZARD_OBJECT_NAME_STRING)) { TQWizard *wiz = (TQWizard*)fw->mainContainer(); if (id == commands[ "add" ]) { - AddWizardPageCommand *cmd = new AddWizardPageCommand(i18n("Add Page to %1").arg(wiz->name()), formWindow(), + AddWizardPageCommand *cmd = new AddWizardPageCommand(i18n("Add Page to %1").tqarg(wiz->name()), formWindow(), wiz, "Page"); formWindow()->commandHistory()->addCommand(cmd); cmd->execute(); } else if (id == commands[ "remove" ]) { if (wiz->currentPage()) { - QDesignerWizard *dw = (QDesignerWizard*)wiz; + TQDesignerWizard *dw = (TQDesignerWizard*)wiz; DeleteWizardPageCommand *cmd = new DeleteWizardPageCommand(i18n("Delete Page %1 of %2"). - arg(dw->pageTitle()).arg(wiz->name()), + tqarg(dw->pageTitle()).tqarg(wiz->name()), formWindow(), wiz, wiz->indexOf(wiz->currentPage())); formWindow()->commandHistory()->addCommand(cmd); cmd->execute(); @@ -1287,10 +1287,10 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap &commands } else if (id == commands[ "rename" ]) { bool ok = false; - QDesignerWizard *dw = (QDesignerWizard*)wiz; + TQDesignerWizard *dw = (TQDesignerWizard*)wiz; TQString text = KInputDialog::getText(i18n("Page Title"), i18n("New page title:"), dw->pageTitle(), &ok, this); if (ok) { - TQString pn(i18n("Rename page %1 of %2").arg(dw->pageTitle()).arg(wiz->name())); + TQString pn(i18n("Rename page %1 of %2").tqarg(dw->pageTitle()).tqarg(wiz->name())); RenameWizardPageCommand *cmd = new RenameWizardPageCommand(pn, formWindow() , wiz, wiz->indexOf(wiz->currentPage()), text); formWindow()->commandHistory()->addCommand(cmd); @@ -1300,11 +1300,11 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap &commands } else if (fw->mainContainer()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) { TQMainWindow *mw = (TQMainWindow*)fw->mainContainer(); if (id == commands[ "add_toolbar" ]) { - AddToolBarCommand *cmd = new AddToolBarCommand(i18n("Add Toolbar to '%1'").arg(formWindow()->name()), formWindow(), mw); + AddToolBarCommand *cmd = new AddToolBarCommand(i18n("Add Toolbar to '%1'").tqarg(formWindow()->name()), formWindow(), mw); formWindow()->commandHistory()->addCommand(cmd); cmd->execute(); } else if (id == commands[ "add_menu_item" ]) { - AddMenuCommand *cmd = new AddMenuCommand(i18n("Add Menu to '%1'").arg(formWindow()->name()), formWindow(), mw); + AddMenuCommand *cmd = new AddMenuCommand(i18n("Add Menu to '%1'").tqarg(formWindow()->name()), formWindow(), mw); formWindow()->commandHistory()->addCommand(cmd); cmd->execute(); } @@ -1320,8 +1320,8 @@ void MainWindow::clipboardChanged() void MainWindow::selectionChanged() { - layoutChilds = false; - layoutSelected = false; + tqlayoutChilds = false; + tqlayoutSelected = false; breakLayout = false; if (!formWindow()) { actionEditCut->setEnabled(false); @@ -1358,7 +1358,7 @@ void MainWindow::selectionChanged() int unlaidout = 0; int laidout = 0; for (TQWidget *w = widgets.first(); w; w = widgets.next()) { - if (!w->parentWidget() || WidgetFactory::layoutType(w->parentWidget()) == WidgetFactory::NoLayout) + if (!w->tqparentWidget() || WidgetFactory::tqlayoutType(w->tqparentWidget()) == WidgetFactory::NoLayout) unlaidout++; else laidout++; @@ -1370,27 +1370,27 @@ void MainWindow::selectionChanged() actionEditGridLayout->setEnabled(unlaidout > 1); actionEditBreakLayout->setEnabled(laidout > 0); actionEditAdjustSize->setEnabled(laidout > 0); - layoutSelected = unlaidout > 1; + tqlayoutSelected = unlaidout > 1; breakLayout = laidout > 0; } else if (selectedWidgets == 1) { TQWidget *w = widgets.first(); - bool isContainer = WidgetDatabase::isContainer(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w))) || + bool isContainer = WidgetDatabase::isContainer(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w)))) || w == formWindow()->mainContainer(); - actionEditAdjustSize->setEnabled(!w->parentWidget() || - WidgetFactory::layoutType(w->parentWidget()) == WidgetFactory::NoLayout); + actionEditAdjustSize->setEnabled(!w->tqparentWidget() || + WidgetFactory::tqlayoutType(w->tqparentWidget()) == WidgetFactory::NoLayout); if (!isContainer) { actionEditHLayout->setEnabled(false); actionEditVLayout->setEnabled(false); actionEditGridLayout->setEnabled(false); - if (w->parentWidget() && WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout) { - actionEditBreakLayout->setEnabled(!isAToolBarChild(w)); + if (w->tqparentWidget() && WidgetFactory::tqlayoutType(w->tqparentWidget()) != WidgetFactory::NoLayout) { + actionEditBreakLayout->setEnabled(!isAToolBarChild(TQT_TQOBJECT(w))); breakLayout = true; } else { actionEditBreakLayout->setEnabled(false); } } else { - if (WidgetFactory::layoutType(w) == WidgetFactory::NoLayout) { + if (WidgetFactory::tqlayoutType(w) == WidgetFactory::NoLayout) { if (!formWindow()->hasInsertedChildren(w)) { actionEditHLayout->setEnabled(false); actionEditVLayout->setEnabled(false); @@ -1401,24 +1401,24 @@ void MainWindow::selectionChanged() actionEditVLayout->setEnabled(true); actionEditGridLayout->setEnabled(true); actionEditBreakLayout->setEnabled(false); - layoutChilds = true; + tqlayoutChilds = true; } - if (w->parentWidget() && WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout) { - actionEditBreakLayout->setEnabled(!isAToolBarChild(w)); + if (w->tqparentWidget() && WidgetFactory::tqlayoutType(w->tqparentWidget()) != WidgetFactory::NoLayout) { + actionEditBreakLayout->setEnabled(!isAToolBarChild(TQT_TQOBJECT(w))); breakLayout = true; } } else { actionEditHLayout->setEnabled(false); actionEditVLayout->setEnabled(false); actionEditGridLayout->setEnabled(false); - actionEditBreakLayout->setEnabled(!isAToolBarChild(w)); + actionEditBreakLayout->setEnabled(!isAToolBarChild(TQT_TQOBJECT(w))); breakLayout = true; } } } else if (selectedWidgets == 0 && formWindow()) { actionEditAdjustSize->setEnabled(true); TQWidget *w = formWindow()->mainContainer(); - if (WidgetFactory::layoutType(w) == WidgetFactory::NoLayout) { + if (WidgetFactory::tqlayoutType(w) == WidgetFactory::NoLayout) { if (!formWindow()->hasInsertedChildren(w)) { actionEditHLayout->setEnabled(false); actionEditVLayout->setEnabled(false); @@ -1429,7 +1429,7 @@ void MainWindow::selectionChanged() actionEditVLayout->setEnabled(true); actionEditGridLayout->setEnabled(true); actionEditBreakLayout->setEnabled(false); - layoutChilds = true; + tqlayoutChilds = true; } } else { actionEditHLayout->setEnabled(false); @@ -1464,7 +1464,7 @@ void MainWindow::writeConfig() config->setGroup("Background"); config->writeEntry("UsePixmap", backPix); - config->writeEntry("Color", qworkspace->backgroundColor().name()); + config->writeEntry("Color", TQString(qworkspace->backgroundColor().name())); /* config->setGroup("Geometry"); @@ -1491,7 +1491,7 @@ void MainWindow::readConfig() restoreConfig = config->readBoolEntry("RestoreWorkspace", true); splashScreen = config->readBoolEntry("SplashScreen", true); docPath = config->readEntry("DocPath", docPath); - templPath = config->readEntry("TemplatePath", TQString::null); + templPath = config->readEntry("TemplatePath", TQString()); config->setGroup("Grid"); sGrid = config->readBoolEntry("Snap", true); @@ -1541,9 +1541,9 @@ HierarchyView *MainWindow::objectHierarchy() const return hierarchyView; } -TQPopupMenu *MainWindow::setupNormalHierarchyMenu(TQWidget *parent) +TQPopupMenu *MainWindow::setupNormalHierarchyMenu(TQWidget *tqparent) { - TQPopupMenu *menu = new TQPopupMenu(parent); + TQPopupMenu *menu = new TQPopupMenu(tqparent); actionEditCut->plug(menu); actionEditCopy->plug(menu); @@ -1553,12 +1553,12 @@ TQPopupMenu *MainWindow::setupNormalHierarchyMenu(TQWidget *parent) return menu; } -TQPopupMenu *MainWindow::setupTabWidgetHierarchyMenu(TQWidget *parent, const char *addSlot, const char *removeSlot) +TQPopupMenu *MainWindow::setupTabWidgetHierarchyMenu(TQWidget *tqparent, const char *addSlot, const char *removeSlot) { - TQPopupMenu *menu = new TQPopupMenu(parent); + TQPopupMenu *menu = new TQPopupMenu(tqparent); - menu->insertItem(i18n("Add Page"), parent, addSlot); - menu->insertItem(i18n("Delete Page"), parent, removeSlot); + menu->insertItem(i18n("Add Page"), tqparent, addSlot); + menu->insertItem(i18n("Delete Page"), tqparent, removeSlot); menu->insertSeparator(); actionEditCut->plug(menu); actionEditCopy->plug(menu); @@ -1620,15 +1620,15 @@ ActionEditor *MainWindow::actioneditor() const bool MainWindow::openEditor(TQWidget* w, FormWindow*) { - if (WidgetFactory::hasSpecialEditor(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)))) { - statusBar()->message(i18n("Edit %1...").arg(w->className())); - WidgetFactory::editWidget(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)), this, w, formWindow()); + if (WidgetFactory::hasSpecialEditor(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))))) { + statusBar()->message(i18n("Edit %1...").tqarg(w->className())); + WidgetFactory::editWidget(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))), this, w, formWindow()); statusBar()->clear(); return true; } - const TQMetaProperty* text = w->metaObject()->property(w->metaObject()->findProperty("text", true), true); - const TQMetaProperty* title = w->metaObject()->property(w->metaObject()->findProperty("title", true), true); + const TQMetaProperty* text = w->tqmetaObject()->property(w->tqmetaObject()->tqfindProperty("text", true), true); + const TQMetaProperty* title = w->tqmetaObject()->property(w->tqmetaObject()->tqfindProperty("title", true), true); if (text && text->designable(w)) { bool ok = false; TQString text; @@ -1639,13 +1639,13 @@ bool MainWindow::openEditor(TQWidget* w, FormWindow*) text = KInputDialog::getText(i18n("Text"), i18n("New text:"), w->property("text").toString(), &ok, this); } if (ok) { - TQString pn(i18n("Set the 'text' of '%2'").arg(w->name())); - SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), w, propertyEditor, + TQString pn(i18n("Set the 'text' of '%2'").tqarg(w->name())); + SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, "text", w->property("text"), - text, TQString::null, TQString::null); + text, TQString(), TQString()); cmd->execute(); formWindow()->commandHistory()->addCommand(cmd); - MetaDataBase::setPropertyChanged(w, "text", true); + MetaDataBase::setPropertyChanged(TQT_TQOBJECT(w), "text", true); } return true; } @@ -1654,13 +1654,13 @@ bool MainWindow::openEditor(TQWidget* w, FormWindow*) TQString text; text = KInputDialog::getText(i18n("Title"), i18n("New title:"), w->property("title").toString(), &ok, this); if (ok) { - TQString pn(i18n("Set the 'title' of '%2'").arg(w->name())); - SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), w, propertyEditor, + TQString pn(i18n("Set the 'title' of '%2'").tqarg(w->name())); + SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, "title", w->property("title"), - text, TQString::null, TQString::null); + text, TQString(), TQString()); cmd->execute(); formWindow()->commandHistory()->addCommand(cmd); - MetaDataBase::setPropertyChanged(w, "title", true); + MetaDataBase::setPropertyChanged(TQT_TQOBJECT(w), "title", true); } return true; } @@ -1706,9 +1706,9 @@ TQString MainWindow::documentationPath() const TQString result = docPath; if (docPath[0] == '$') { - int fs = docPath.find('/'); + int fs = docPath.tqfind('/'); if (fs == -1) - fs = docPath.find('\\'); + fs = docPath.tqfind('\\'); if (fs > -1) { result = docPath.mid(1, fs-1); @@ -1756,7 +1756,7 @@ void MainWindow::checkTempFiles() void MainWindow::showDialogHelp() { TQWidget *w = (TQWidget*)sender(); - w = w->topLevelWidget(); + w = w->tqtopLevelWidget(); TQString link = "designer-manual-12.html#"; @@ -1777,9 +1777,9 @@ void MainWindow::showDialogHelp() else if (w->inherits("DatabaseConnectionBase")) link += "dialog-edit-database-connections"; else if (w->inherits("FindDialog")) - link += "dialog-find-text"; + link += "dialog-tqfind-text"; else if (w->inherits("ReplaceDialog")) - link += "dialog-replace-text"; + link += "dialog-tqreplace-text"; else if (w->inherits("GotoLineDialog")) link += "dialog-go-to-line"; else if (w->inherits("ConnectionEditorBase")) @@ -1836,13 +1836,13 @@ void MainWindow::setModified(bool b, TQWidget *window) ((FormWindow *) w)->modificationChanged(b); return; } - w = w->parentWidget(true); + w = w->tqparentWidget(true); if (w->inherits("FormWindow")) { ((FormWindow *) w)->modificationChanged(b); return; } - w = w->parentWidget(true); + w = w->tqparentWidget(true); } } @@ -1869,20 +1869,20 @@ void MainWindow::formNameChanged(FormWindow*) int MainWindow::currentLayoutDefaultSpacing() const { if (((MainWindow*)this)->formWindow()) - return ((MainWindow*)this)->formWindow()->layoutDefaultSpacing(); + return ((MainWindow*)this)->formWindow()->tqlayoutDefaultSpacing(); return BOXLAYOUT_DEFAULT_SPACING; } int MainWindow::currentLayoutDefaultMargin() const { if (((MainWindow*)this)->formWindow()) - return ((MainWindow*)this)->formWindow()->layoutDefaultMargin(); + return ((MainWindow*)this)->formWindow()->tqlayoutDefaultMargin(); return BOXLAYOUT_DEFAULT_MARGIN; } TQString MainWindow::whatsThisFrom(const TQString&) { - return TQString::null; + return TQString(); } void MainWindow::slotActivePartChanged(KParts::Part * part) -- cgit v1.2.1