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/newformimpl.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'kommander/editor/newformimpl.cpp') diff --git a/kommander/editor/newformimpl.cpp b/kommander/editor/newformimpl.cpp index ee623e48..e1ef5662 100644 --- a/kommander/editor/newformimpl.cpp +++ b/kommander/editor/newformimpl.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 @@ -57,7 +57,7 @@ void FormItem::insert() FormWindow *fw = 0; FormFile *ff = new FormFile(FormFile::createUnnamedFileName(), true); fw = new FormWindow(ff, MainWindow::self, MainWindow::self->qWorkspace(), n); - MetaDataBase::addEntry(fw); + MetaDataBase::addEntry(TQT_TQOBJECT(fw)); TQWidget *w = 0L; if (fType == Dialog) { @@ -72,7 +72,7 @@ void FormItem::insert() if (w) { w->setProperty("useInternalParser", true); - MetaDataBase::setPropertyChanged(w, "useInternalParser", true); + MetaDataBase::setPropertyChanged(TQT_TQOBJECT(w), "useInternalParser", true); } fw->setCaption(n); fw->resize(600, 480); @@ -81,7 +81,7 @@ void FormItem::insert() // the wizard might have changed a lot, lets update everything MainWindow::self->actioneditor()->setFormWindow(fw); MainWindow::self->objectHierarchy()->setFormWindow(fw, fw); - fw->killAccels(fw); + fw->killAccels(TQT_TQOBJECT(fw)); fw->setFocus(); } @@ -100,12 +100,12 @@ static void unifyFormName(FormWindow *fw, TQWorkspace *qworkspace) if (w != fw) lst << w->name(); - if (lst.findIndex(fw->name()) == -1) + if (lst.tqfindIndex(fw->name()) == -1) return; TQString origName = fw->name(); TQString n = origName; int i = 1; - while (lst.findIndex(n) != -1) + while (lst.tqfindIndex(n) != -1) n = origName + TQString::number(i++); fw->setName(n); fw->setCaption(n); @@ -121,22 +121,22 @@ void CustomFormItem::insert() if (!resource.load(ff)) { TQMessageBox::information(MainWindow::self, i18n("Load Template"), - i18n("Could not load form description from template '%1'").arg(filename)); + i18n("Could not load form description from template '%1'").tqarg(filename)); delete ff; return; } - ff->setFileName(TQString::null); + ff->setFileName(TQString()); if (MainWindow::self->formWindow()) { - MainWindow::self->formWindow()->setFileName(TQString::null); + MainWindow::self->formWindow()->setFileName(TQString()); unifyFormName(MainWindow::self->formWindow(), MainWindow::self->qWorkspace()); } } } -NewForm::NewForm(TQWidget *parent, const TQString &templatePath) - : NewFormBase(parent, 0, true) +NewForm::NewForm(TQWidget *tqparent, const TQString &templatePath) + : NewFormBase(tqparent, 0, true) { connect(helpButton, TQT_SIGNAL(clicked()), MainWindow::self, TQT_SLOT(showDialogHelp())); @@ -165,15 +165,15 @@ NewForm::NewForm(TQWidget *parent, const TQString &templatePath) if (!TQFile::exists(*it)) continue; TQDir dir(*it); - const QFileInfoList* fileList = dir.entryInfoList(TQDir::DefaultFilter, TQDir::DirsFirst | TQDir::Name); + const TQFileInfoList* fileList = dir.entryInfoList(TQDir::DefaultFilter, TQDir::DirsFirst | TQDir::Name); if (fileList) - for (QFileInfoListIterator fit(*fileList); fit.current(); ++fit) + for (TQFileInfoListIterator fit(*fileList); fit.current(); ++fit) { TQFileInfo* fi = fit.current(); if (!fi->isFile() || fi->extension() != "kmdr") continue; TQString name = fi->baseName(); - name = name.replace("_", " "); + name = name.tqreplace("_", " "); CustomFormItem *ci = new CustomFormItem(templateView, name); allItems.append(ci); ci->setDragEnabled(false); -- cgit v1.2.1