diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-12 01:36:19 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-12 01:36:19 +0000 |
| commit | 99a2774ca6f1cab334de5d43fe36fc44ae889a4c (patch) | |
| tree | eff34cf0762227f6baf2a93e8fef48d4bed2651c | |
| parent | 1c104292188541106338d4940b0f04beeb4301a0 (diff) | |
| download | tdesdk-99a2774ca6f1cab334de5d43fe36fc44ae889a4c.tar.gz tdesdk-99a2774ca6f1cab334de5d43fe36fc44ae889a4c.zip | |
TQt4 convert kdesdk
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1236185 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
1147 files changed, 10515 insertions, 10127 deletions
diff --git a/cervisia/addremovedlg.cpp b/cervisia/addremovedlg.cpp index d28372e6..a0ed07a9 100644 --- a/cervisia/addremovedlg.cpp +++ b/cervisia/addremovedlg.cpp @@ -30,8 +30,8 @@ #include <klocale.h> -AddRemoveDialog::AddRemoveDialog(ActionType action, TQWidget* parent, const char* name) - : KDialogBase(parent, name, true, TQString::null, +AddRemoveDialog::AddRemoveDialog(ActionType action, TQWidget* tqparent, const char* name) + : KDialogBase(tqparent, name, true, TQString(), Ok | Cancel | Help, Ok, true) { setCaption( (action==Add)? i18n("CVS Add") : @@ -40,18 +40,18 @@ AddRemoveDialog::AddRemoveDialog(ActionType action, TQWidget* parent, const char TQFrame* mainWidget = makeMainWidget(); - TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint()); + TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint()); - TQLabel *textlabel = new QLabel + TQLabel *textlabel = new TQLabel ( (action==Add)? i18n("Add the following files to the repository:") : (action==AddBinary)? i18n("Add the following binary files to the repository:") : i18n("Remove the following files from the repository:") , mainWidget ); - layout->addWidget(textlabel); + tqlayout->addWidget(textlabel); m_listBox = new TQListBox(mainWidget); m_listBox->setSelectionMode(TQListBox::NoSelection); - layout->addWidget(m_listBox, 5); + tqlayout->addWidget(m_listBox, 5); // Add warning message to dialog when user wants to remove a file if (action==Remove) @@ -69,9 +69,9 @@ AddRemoveDialog::AddRemoveDialog(ActionType action, TQWidget* parent, const char "your local working copy."), mainWidget); warningLayout->addWidget(warningText); - layout->addSpacing(5); - layout->addLayout(warningLayout); - layout->addSpacing(5); + tqlayout->addSpacing(5); + tqlayout->addLayout(warningLayout); + tqlayout->addSpacing(5); } if( action == Remove ) @@ -85,10 +85,10 @@ void AddRemoveDialog::setFileList(const TQStringList& files) { // the dot for the root directory is hard to see, so // we convert it to the absolut path - if( files.find(".") != files.end() ) + if( files.tqfind(".") != files.end() ) { TQStringList copy(files); - int idx = copy.findIndex("."); + int idx = copy.tqfindIndex("."); copy[idx] = TQFileInfo(".").absFilePath(); m_listBox->insertStringList(copy); @@ -98,4 +98,4 @@ void AddRemoveDialog::setFileList(const TQStringList& files) } -// kate: space-indent on; indent-width 4; replace-tabs on; +// kate: space-indent on; indent-width 4; tqreplace-tabs on; diff --git a/cervisia/addremovedlg.h b/cervisia/addremovedlg.h index e18547f2..e151e097 100644 --- a/cervisia/addremovedlg.h +++ b/cervisia/addremovedlg.h @@ -35,7 +35,7 @@ class AddRemoveDialog : public KDialogBase public: enum ActionType { Add, AddBinary, Remove }; - explicit AddRemoveDialog(ActionType action, TQWidget* parent=0, const char* name=0); + explicit AddRemoveDialog(ActionType action, TQWidget* tqparent=0, const char* name=0); void setFileList(const TQStringList& files); @@ -46,4 +46,4 @@ private: #endif -// kate: space-indent on; indent-width 4; replace-tabs on; +// kate: space-indent on; indent-width 4; tqreplace-tabs on; diff --git a/cervisia/addrepositorydlg.cpp b/cervisia/addrepositorydlg.cpp index c370b02a..8a4d05fd 100644 --- a/cervisia/addrepositorydlg.cpp +++ b/cervisia/addrepositorydlg.cpp @@ -33,17 +33,17 @@ AddRepositoryDialog::AddRepositoryDialog(KConfig& cfg, const TQString& repo, - TQWidget* parent, const char* name) - : KDialogBase(parent, name, true, i18n("Add Repository"), + TQWidget* tqparent, const char* name) + : KDialogBase(tqparent, name, true, i18n("Add Repository"), Ok | Cancel, Ok, true) , partConfig(cfg) { TQFrame* mainWidget = makeMainWidget(); - TQBoxLayout* layout = new TQVBoxLayout(mainWidget, 0, spacingHint()); + TQBoxLayout* tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint()); TQLabel* repo_label = new TQLabel(i18n("&Repository:"), mainWidget); - layout->addWidget(repo_label); + tqlayout->addWidget(repo_label); repo_edit = new KLineEdit(mainWidget); repo_edit->setFocus(); @@ -53,33 +53,33 @@ AddRepositoryDialog::AddRepositoryDialog(KConfig& cfg, const TQString& repo, repo_edit->setText(repo); repo_edit->setEnabled(false); } - layout->addWidget(repo_edit); + tqlayout->addWidget(repo_edit); TQLabel* rsh_label = new TQLabel(i18n("Use remote &shell (only for :ext: repositories):"), mainWidget); - layout->addWidget(rsh_label); + tqlayout->addWidget(rsh_label); rsh_edit = new KLineEdit(mainWidget); rsh_label->setBuddy(rsh_edit); - layout->addWidget(rsh_edit); + tqlayout->addWidget(rsh_edit); TQLabel* server_label = new TQLabel(i18n("Invoke this program on the server side:"), mainWidget); - layout->addWidget(server_label); + tqlayout->addWidget(server_label); server_edit = new KLineEdit(mainWidget); server_label->setBuddy(server_edit); - layout->addWidget(server_edit); + tqlayout->addWidget(server_edit); TQHBox* compressionBox = new TQHBox(mainWidget); m_useDifferentCompression = new TQCheckBox(i18n("Use different &compression level:"), compressionBox); m_compressionLevel = new KIntNumInput(compressionBox); m_compressionLevel->setRange(0, 9, 1, false); - layout->addWidget(compressionBox); + tqlayout->addWidget(compressionBox); m_retrieveCvsignoreFile = new TQCheckBox(i18n("Download cvsignore file from " "server"), mainWidget); - layout->addWidget(m_retrieveCvsignoreFile); + tqlayout->addWidget(m_retrieveCvsignoreFile); connect( repo_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(repoChanged()) ); @@ -180,9 +180,9 @@ void AddRepositoryDialog::repoChanged() { TQString repo = repository(); rsh_edit->setEnabled((!repo.startsWith(":pserver:")) - && repo.contains(":")); - m_useDifferentCompression->setEnabled(repo.contains(":")); - if( !repo.contains(":") ) + && repo.tqcontains(":")); + m_useDifferentCompression->setEnabled(repo.tqcontains(":")); + if( !repo.tqcontains(":") ) m_compressionLevel->setEnabled(false); else compressionToggled(m_useDifferentCompression->isChecked()); diff --git a/cervisia/addrepositorydlg.h b/cervisia/addrepositorydlg.h index 7ef270a4..3e18c6d6 100644 --- a/cervisia/addrepositorydlg.h +++ b/cervisia/addrepositorydlg.h @@ -33,9 +33,10 @@ class KLineEdit; class AddRepositoryDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - AddRepositoryDialog(KConfig& cfg, const TQString& repo, TQWidget* parent = 0, + AddRepositoryDialog(KConfig& cfg, const TQString& repo, TQWidget* tqparent = 0, const char* name = 0); virtual ~AddRepositoryDialog(); diff --git a/cervisia/annotatectl.cpp b/cervisia/annotatectl.cpp index f74735e3..09d0cef0 100644 --- a/cervisia/annotatectl.cpp +++ b/cervisia/annotatectl.cpp @@ -79,7 +79,7 @@ void AnnotateController::showDialog(const TQString& fileName, const TQString& re // hide progress dialog delete d->progress; d->progress = 0; - d->dialog->setCaption(i18n("CVS Annotate: %1").arg(fileName)); + d->dialog->setCaption(i18n("CVS Annotate: %1").tqarg(fileName)); d->dialog->show(); } @@ -182,8 +182,8 @@ void AnnotateController::Private::parseCvsAnnotateOutput() if( rev == oldRevision ) { - logInfo.m_author = TQString::null; - rev = TQString::null; + logInfo.m_author = TQString(); + rev = TQString(); } else { diff --git a/cervisia/annotatectl.h b/cervisia/annotatectl.h index 1000d0db..72078375 100644 --- a/cervisia/annotatectl.h +++ b/cervisia/annotatectl.h @@ -33,7 +33,7 @@ public: AnnotateController(AnnotateDialog* dialog, CvsService_stub* cvsService); ~AnnotateController(); - void showDialog(const TQString& fileName, const TQString& revision = TQString::null); + void showDialog(const TQString& fileName, const TQString& revision = TQString()); private: struct Private; diff --git a/cervisia/annotatedlg.cpp b/cervisia/annotatedlg.cpp index 86b64b43..e40a26bd 100644 --- a/cervisia/annotatedlg.cpp +++ b/cervisia/annotatedlg.cpp @@ -23,8 +23,8 @@ #include "annotateview.h" -AnnotateDialog::AnnotateDialog(KConfig& cfg, TQWidget *parent, const char *name) - : KDialogBase(parent, name, false, TQString::null, +AnnotateDialog::AnnotateDialog(KConfig& cfg, TQWidget *tqparent, const char *name) + : KDialogBase(tqparent, name, false, TQString(), Close | Help, Close, true) , partConfig(cfg) { @@ -33,7 +33,7 @@ AnnotateDialog::AnnotateDialog(KConfig& cfg, TQWidget *parent, const char *name) setHelp("annotate"); - setWFlags(Qt::WDestructiveClose | getWFlags()); + setWFlags(TQt::WDestructiveClose | getWFlags()); TQSize size = configDialogSize(partConfig, "AnnotateDialog"); resize(size); diff --git a/cervisia/annotatedlg.h b/cervisia/annotatedlg.h index d9ba0317..f0360e73 100644 --- a/cervisia/annotatedlg.h +++ b/cervisia/annotatedlg.h @@ -39,7 +39,7 @@ class AnnotateDialog : public KDialogBase { public: - explicit AnnotateDialog( KConfig& cfg, TQWidget *parent=0, const char *name=0 ); + explicit AnnotateDialog( KConfig& cfg, TQWidget *tqparent=0, const char *name=0 ); virtual ~AnnotateDialog(); diff --git a/cervisia/annotateview.cpp b/cervisia/annotateview.cpp index 58d8d407..c3b4634a 100644 --- a/cervisia/annotateview.cpp +++ b/cervisia/annotateview.cpp @@ -31,12 +31,12 @@ using namespace Cervisia; -class AnnotateViewItem : public QListViewItem +class AnnotateViewItem : public TQListViewItem { public: enum { LineNumberColumn, AuthorColumn, ContentColumn }; - AnnotateViewItem(AnnotateView *parent, const LogInfo& logInfo, + AnnotateViewItem(AnnotateView *tqparent, const LogInfo& logInfo, const TQString &content, bool odd, int linenumber); virtual int compare(TQListViewItem *item, int col, bool ascending) const; @@ -58,9 +58,9 @@ private: const int AnnotateViewItem::BORDER = 4; -AnnotateViewItem::AnnotateViewItem(AnnotateView *parent, const LogInfo& logInfo, +AnnotateViewItem::AnnotateViewItem(AnnotateView *tqparent, const LogInfo& logInfo, const TQString &content, bool odd, int linenumber) - : TQListViewItem(parent) + : TQListViewItem(tqparent) , m_logInfo(logInfo) , m_content(content) , m_odd(odd) @@ -85,7 +85,7 @@ TQString AnnotateViewItem::text(int col) const return TQString::number(m_lineNumber); case AuthorColumn: if( m_logInfo.m_author.isNull() ) - return TQString::null; + return TQString(); else return (m_logInfo.m_author + TQChar(' ') + m_logInfo.m_revision); case ContentColumn: @@ -94,7 +94,7 @@ TQString AnnotateViewItem::text(int col) const ; }; - return TQString::null; + return TQString(); } @@ -137,11 +137,11 @@ int AnnotateViewItem::width(const TQFontMetrics &fm, const TQListView *, int col /*! @todo The dummy column (remaining space eater) doesn't work - caused by a bug in TQHeader::adjustHeaderSize() in Qt <= 3.0.4. + caused by a bug in TQHeader::adjustHeaderSize() in TQt <= 3.0.4. */ -AnnotateView::AnnotateView(KConfig &cfg, TQWidget *parent, const char *name) - : TQListView(parent, name, WRepaintNoErase | WResizeNoErase) +AnnotateView::AnnotateView(KConfig &cfg, TQWidget *tqparent, const char *name) + : TQListView(tqparent, name, WRepaintNoErase | WResizeNoErase) { setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken); setAllColumnsShowFocus(true); @@ -150,12 +150,12 @@ AnnotateView::AnnotateView(KConfig &cfg, TQWidget *parent, const char *name) header()->hide(); // setResizeMode(LastColumn); - addColumn(TQString::null); - addColumn(TQString::null); - addColumn(TQString::null); + addColumn(TQString()); + addColumn(TQString()); + addColumn(TQString()); setSorting(AnnotateViewItem::LineNumberColumn); - setColumnAlignment(AnnotateViewItem::LineNumberColumn, Qt::AlignRight); + setColumnAlignment(AnnotateViewItem::LineNumberColumn, TQt::AlignRight); ToolTip* toolTip = new ToolTip(viewport()); @@ -175,7 +175,7 @@ void AnnotateView::addLine(const LogInfo& logInfo, const TQString& content, } -TQSize AnnotateView::sizeHint() const +TQSize AnnotateView::tqsizeHint() const { TQFontMetrics fm(fontMetrics()); return TQSize(100 * fm.width("0"), 10 * fm.lineSpacing()); @@ -191,7 +191,7 @@ void AnnotateView::slotQueryToolTip(const TQPoint& viewportPos, const int column(header()->sectionAt(viewportPos.x())); if ((column == AnnotateViewItem::AuthorColumn) && !item->m_logInfo.m_author.isNull()) { - viewportRect = itemRect(item); + viewportRect = tqitemRect(item); text = item->m_logInfo.createToolTipText(false); } } diff --git a/cervisia/annotateview.h b/cervisia/annotateview.h index f0ae7e21..acaafe24 100644 --- a/cervisia/annotateview.h +++ b/cervisia/annotateview.h @@ -34,18 +34,19 @@ struct LogInfo; } -class AnnotateView : public QListView +class AnnotateView : public TQListView { Q_OBJECT + TQ_OBJECT public: - explicit AnnotateView( KConfig &cfg, TQWidget *parent=0, const char *name=0 ); + explicit AnnotateView( KConfig &cfg, TQWidget *tqparent=0, const char *name=0 ); void addLine(const Cervisia::LogInfo& logInfo, const TQString& content, bool odd); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; private slots: diff --git a/cervisia/cervisia.1.in b/cervisia/cervisia.1.in index b810f98c..3a0c720a 100644 --- a/cervisia/cervisia.1.in +++ b/cervisia/cervisia.1.in @@ -10,7 +10,7 @@ \fB\\$1\fR .PP .. -.de Sp \" Vertical space (when we can't use .PP) +.de Sp \"Qt::Vertical space (when we can't use .PP) .if t .sp .5v .if n .sp .. @@ -144,7 +144,7 @@ Cervisia \- Graphical CVS frontend [\ \fB\-\-nocrashhandler\fR\ ] [\ \fB\-\-waitforwm\fR\ ] [\ \fB\-\-style\fR\ \fIstyle\fR\ ] - [\ \fB\-\-geometry\fR\ \fIgeometry\fR\ ] + [\ \fB\-\-tqgeometry\fR\ \fItqgeometry\fR\ ] [\ \fB\-\-resolve\fR\ \fIfilename\fR\ ] [\ \fB\-\-log\fR\ \fIfilename\fR\ ] [\ \fB\-\-annotate\fR\ \fIfilename\fR\ ] @@ -193,9 +193,9 @@ Waits for a \s-1WM_NET\s0 compatible windowmanager .IP "\fB\-\-style\fR \fIstyle\fR" 4 .IX Item "--style style" Sets the application \s-1GUI\s0 style -.IP "\fB\-\-geometry\fR \fIgeometry\fR" 4 -.IX Item "--geometry geometry" -Sets the geometry of the main window +.IP "\fB\-\-tqgeometry\fR \fItqgeometry\fR" 4 +.IX Item "--tqgeometry tqgeometry" +Sets the tqgeometry of the main window .SH "FILES" .IX Header "FILES" \&\fI_KDECONFDIR_/cervisiarc\fR \- global configuration file diff --git a/cervisia/cervisia.pod b/cervisia/cervisia.pod index 940ba8e0..75ea6b27 100644 --- a/cervisia/cervisia.pod +++ b/cervisia/cervisia.pod @@ -14,7 +14,7 @@ B<cervisia> S<[ B<--nocrashhandler> ]> S<[ B<--waitforwm> ]> S<[ B<--style> I<style> ]> - S<[ B<--geometry> I<geometry> ]> + S<[ B<--tqgeometry> I<tqgeometry> ]> S<[ B<--resolve> I<filename> ]> S<[ B<--log> I<filename> ]> S<[ B<--annotate> I<filename> ]> @@ -80,9 +80,9 @@ Waits for a WM_NET compatible windowmanager Sets the application GUI style -=item B<--geometry> I<geometry> +=item B<--tqgeometry> I<tqgeometry> -Sets the geometry of the main window +Sets the tqgeometry of the main window =head1 FILES diff --git a/cervisia/cervisiapart.cpp b/cervisia/cervisiapart.cpp index df166d7a..abc66521 100644 --- a/cervisia/cervisiapart.cpp +++ b/cervisia/cervisiapart.cpp @@ -80,9 +80,9 @@ using Cervisia::TagDialog; K_EXPORT_COMPONENT_FACTORY( libcervisiapart, CervisiaFactory ) -CervisiaPart::CervisiaPart( TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name, const TQStringList& /*args*/ ) - : KParts::ReadOnlyPart( parent, name ) +CervisiaPart::CervisiaPart( TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name, const TQStringList& /*args*/ ) + : KParts::ReadOnlyPart( tqparent, name ) , hasRunningJob( false ) , opt_hideFiles( false ) , opt_hideUpToDate( false ) @@ -129,14 +129,14 @@ CervisiaPart::CervisiaPart( TQWidget *parentWidget, const char *widgetName, // an explaination if( cvsService ) { - Orientation o = splitHorz ? TQSplitter::Vertical - : TQSplitter::Horizontal; - splitter = new TQSplitter(o, parentWidget, widgetName); + Qt::Orientation o = splitHorz ? Qt::Vertical + : Qt::Horizontal; + splitter = new TQSplitter(o, tqparentWidget, widgetName); // avoid PartManager's warning that Part's window can't handle focus - splitter->setFocusPolicy( TQWidget::StrongFocus ); + splitter->setFocusPolicy( TQ_StrongFocus ); update = new UpdateView(*config(), splitter); - update->setFocusPolicy( TQWidget::StrongFocus ); + update->setFocusPolicy( TQ_StrongFocus ); update->setFocus(); connect( update, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), this, TQT_SLOT(popupRequested(KListView*, TQListViewItem*, const TQPoint&)) ); @@ -144,14 +144,14 @@ CervisiaPart::CervisiaPart( TQWidget *parentWidget, const char *widgetName, this, TQT_SLOT(openFile(TQString)) ); protocol = new ProtocolView(appId, splitter); - protocol->setFocusPolicy( TQWidget::StrongFocus ); + protocol->setFocusPolicy( TQ_StrongFocus ); setWidget(splitter); } else setWidget(new TQLabel(i18n("This KPart is non-functional, because the " "cvs DCOP service could not be started."), - parentWidget)); + tqparentWidget)); if( cvsService ) { @@ -213,7 +213,7 @@ void CervisiaPart::slotSetupStatusBar() { // create the active filter indicator and add it to the statusbar filterLabel = new TQLabel("UR", m_statusBar->statusBar()); - filterLabel->setFixedSize(filterLabel->sizeHint()); + filterLabel->setFixedSize(filterLabel->tqsizeHint()); filterLabel->setText(""); TQToolTip::add(filterLabel, i18n("F - All files are hidden, the tree shows only folders\n" @@ -257,8 +257,8 @@ void CervisiaPart::setupActions() action->setToolTip( hint ); action->setWhatsThis( hint ); - action = new KAction( i18n("&Status"), "vcs_status", Key_F5, - this, TQT_SLOT( slotStatus() ), + action = new KAction( i18n("&tqStatus"), "vcs_status", Key_F5, + this, TQT_SLOT( slottqStatus() ), actionCollection(), "file_status" ); hint = i18n("Updates the status (cvs -n update) of the selected files and folders"); action->setToolTip( hint ); @@ -322,7 +322,7 @@ void CervisiaPart::setupActions() // View Menu // action = new KAction( i18n("Stop"), "stop", Key_Escape, - protocol, TQT_SLOT(cancelJob()), + TQT_TQOBJECT(protocol), TQT_SLOT(cancelJob()), actionCollection(), "stop_job" ); action->setEnabled( false ); hint = i18n("Stops any running sub-processes"); @@ -649,7 +649,7 @@ void CervisiaPart::popupRequested(KListView*, TQListViewItem* item, const TQPoin if( isFileItem(item) ) { // remove old 'Edit with...' menu - if( m_editWithId && popup->findItem(m_editWithId) != 0 ) + if( m_editWithId && popup->tqfindItem(m_editWithId) != 0 ) { popup->removeItem(m_editWithId); delete m_currentEditMenu; @@ -726,7 +726,7 @@ void CervisiaPart::aboutCervisia() "GNU General Public License for more details.\n" "See the ChangeLog file for a list of contributors.")); TQMessageBox::about(0, i18n("About Cervisia"), - aboutstr.arg(CERVISIA_VERSION).arg(KDE_VERSION_STRING)); + aboutstr.tqarg(CERVISIA_VERSION).tqarg(KDE_VERSION_STRING)); } @@ -856,7 +856,7 @@ void CervisiaPart::slotUpdate() } -void CervisiaPart::slotStatus() +void CervisiaPart::slottqStatus() { TQStringList list = update->multipleSelection(); if (list.isEmpty()) @@ -969,7 +969,7 @@ void CervisiaPart::slotCommit() return; TQString msg = dlg.logMessage(); - if( !recentCommits.contains( msg ) ) + if( !recentCommits.tqcontains( msg ) ) { recentCommits.prepend( msg ); while (recentCommits.count() > 50) @@ -1166,13 +1166,13 @@ void CervisiaPart::slotAnnotate() void CervisiaPart::slotDiffBase() { - showDiff(TQString::fromLatin1("BASE")); + showDiff(TQString::tqfromLatin1("BASE")); } void CervisiaPart::slotDiffHead() { - showDiff(TQString::fromLatin1("HEAD")); + showDiff(TQString::tqfromLatin1("HEAD")); } @@ -1504,7 +1504,7 @@ void CervisiaPart::slotLastChange() int pos, lastnumber; bool ok; - if ( (pos = revA.findRev('.')) == -1 + if ( (pos = revA.tqfindRev('.')) == -1 || (lastnumber=revA.right(revA.length()-pos-1).toUInt(&ok), !ok) ) { KMessageBox::sorry(widget(), @@ -1635,8 +1635,8 @@ void CervisiaPart::slotConfigure() conf->setGroup("LookAndFeel"); bool splitHorz = conf->readBoolEntry("SplitHorizontally",true); splitter->setOrientation( splitHorz ? - TQSplitter::Vertical : - TQSplitter::Horizontal); + Qt::Vertical : + Qt::Horizontal); } void CervisiaPart::slotHelp() @@ -1673,7 +1673,7 @@ void CervisiaPart::showDiff(const TQString& revision) // Non-modal dialog DiffDialog *l = new DiffDialog(*config()); - if (l->parseCvsDiff(cvsService, fileName, revision, TQString::null)) + if (l->parseCvsDiff(cvsService, fileName, revision, TQString())) l->show(); else delete l; @@ -1692,9 +1692,9 @@ void CervisiaPart::slotJobFinished() if( m_jobType == Commit ) { - KNotifyClient::event(widget()->parentWidget()->winId(), "cvs_commit_done", + KNotifyClient::event(widget()->tqparentWidget()->winId(), "cvs_commit_done", i18n("A CVS commit to repository %1 is done") - .arg(repository)); + .tqarg(repository)); m_jobType = Unknown; } } @@ -1757,14 +1757,14 @@ bool CervisiaPart::openSandbox(const TQString &dirname) KConfig *conf = config(); conf->setGroup("General"); - bool dostatus = conf->readBoolEntry(repository.contains(":")? + bool dostatus = conf->readBoolEntry(repository.tqcontains(":")? "StatusForRemoteRepos" : "StatusForLocalRepos", false); if (dostatus) { update->setSelected(update->firstChild(), true); - slotStatus(); + slottqStatus(); } //load the recentCommits for this app from the KConfig app @@ -1931,7 +1931,7 @@ void CervisiaBrowserExtension::setPropertiesActionEnabled(bool enabled) void CervisiaBrowserExtension::properties() { - static_cast<CervisiaPart*>(parent())->slotFileProperties(); + static_cast<CervisiaPart*>(tqparent())->slotFileProperties(); } // Local Variables: diff --git a/cervisia/cervisiapart.h b/cervisia/cervisiapart.h index 08b29e19..877f5cfc 100644 --- a/cervisia/cervisiapart.h +++ b/cervisia/cervisiapart.h @@ -53,10 +53,11 @@ class CervisiaBrowserExtension; class CervisiaPart : public KParts::ReadOnlyPart { Q_OBJECT + TQ_OBJECT public: - CervisiaPart( TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name=0, const TQStringList& args = TQStringList()); + CervisiaPart( TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name=0, const TQStringList& args = TQStringList()); virtual ~CervisiaPart(); /** @@ -82,7 +83,7 @@ public slots: void slotOpen(); void slotResolve(); - void slotStatus(); + void slottqStatus(); void slotUpdate(); void slotChangeLog(); void slotCommit(); @@ -157,7 +158,7 @@ private: void writeSettings(); bool openSandbox(const TQString &dirname); - void updateSandbox(const TQString &extraopt = TQString::null); + void updateSandbox(const TQString &extraopt = TQString()); void addOrRemove(AddRemoveDialog::ActionType action); void addOrRemoveWatch(WatchDialog::ActionType action); void createOrDeleteTag(Cervisia::TagDialog::ActionType action); @@ -200,6 +201,7 @@ typedef KParts::GenericFactory<CervisiaPart> CervisiaFactory; class CervisiaBrowserExtension : public KParts::BrowserExtension { Q_OBJECT + TQ_OBJECT public: CervisiaBrowserExtension( CervisiaPart * ); diff --git a/cervisia/cervisiashell.cpp b/cervisia/cervisiashell.cpp index eb0518e2..53e42bf1 100644 --- a/cervisia/cervisiashell.cpp +++ b/cervisia/cervisiashell.cpp @@ -43,7 +43,7 @@ CervisiaShell::CervisiaShell( const char *name ) KLibFactory* factory = KLibLoader::self()->factory("libcervisiapart"); if( factory ) { - m_part = static_cast<KParts::ReadOnlyPart*>(factory->create(this, + m_part = static_cast<KParts::ReadOnlyPart*>(factory->create(TQT_TQOBJECT(this), "cervisiaview", "KParts::ReadOnlyPart")); if( m_part ) setCentralWidget(m_part->widget()); @@ -92,19 +92,19 @@ void CervisiaShell::setupActions() { setStandardToolBarMenuEnabled( true ); - KAction *action = KStdAction::configureToolbars( this, TQT_SLOT(slotConfigureToolBars()), + KAction *action = KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolBars()), actionCollection() ); TQString hint = i18n("Allows you to configure the toolbar"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = KStdAction::keyBindings( this, TQT_SLOT(slotConfigureKeys()), + action = KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT(slotConfigureKeys()), actionCollection() ); hint = i18n("Allows you to customize the keybindings"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = KStdAction::quit( kapp, TQT_SLOT( quit() ), actionCollection() ); + action = KStdAction::quit( TQT_TQOBJECT(kapp), TQT_SLOT( quit() ), actionCollection() ); hint = i18n("Exits Cervisia"); action->setToolTip( hint ); action->setWhatsThis( hint ); diff --git a/cervisia/cervisiashell.h b/cervisia/cervisiashell.h index e96e15d9..87c33b02 100644 --- a/cervisia/cervisiashell.h +++ b/cervisia/cervisiashell.h @@ -34,6 +34,7 @@ class KRecentFilesAction; class CervisiaShell : public KParts::MainWindow { Q_OBJECT + TQ_OBJECT public: CervisiaShell(const char* name=0); diff --git a/cervisia/changelogdlg.cpp b/cervisia/changelogdlg.cpp index 49476610..edaa3b6f 100644 --- a/cervisia/changelogdlg.cpp +++ b/cervisia/changelogdlg.cpp @@ -33,15 +33,15 @@ static inline TQString DateStringISO8601() { - return TQDate::currentDate().toString(Qt::ISODate); + return TQDate::tqcurrentDate().toString(Qt::ISODate); } ChangeLogDialog::Options *ChangeLogDialog::options = 0; -ChangeLogDialog::ChangeLogDialog(KConfig& cfg, TQWidget *parent, const char *name) - : KDialogBase(parent, name, true, i18n("Edit ChangeLog"), +ChangeLogDialog::ChangeLogDialog(KConfig& cfg, TQWidget *tqparent, const char *name) + : KDialogBase(tqparent, name, true, i18n("Edit ChangeLog"), Ok | Cancel, Ok, true) , partConfig(cfg) { @@ -167,7 +167,7 @@ TQString ChangeLogDialog::message() for (j = 0; j < (int)str.length(); ++j) if (!str[j].isSpace()) break; - str.remove(0, QMIN(j, 8)); + str.remove(0, TQMIN(j, 8)); } res += str; res += '\n'; diff --git a/cervisia/changelogdlg.h b/cervisia/changelogdlg.h index ee7b8fc4..54e36e87 100644 --- a/cervisia/changelogdlg.h +++ b/cervisia/changelogdlg.h @@ -31,7 +31,7 @@ class KConfig; class ChangeLogDialog : public KDialogBase { public: - explicit ChangeLogDialog( KConfig& cfg, TQWidget *parent=0, const char *name=0 ); + explicit ChangeLogDialog( KConfig& cfg, TQWidget *tqparent=0, const char *name=0 ); virtual ~ChangeLogDialog(); diff --git a/cervisia/checkoutdlg.cpp b/cervisia/checkoutdlg.cpp index 32885e8e..e2b09697 100644 --- a/cervisia/checkoutdlg.cpp +++ b/cervisia/checkoutdlg.cpp @@ -43,9 +43,9 @@ using Cervisia::IsValidTag; CheckoutDialog::CheckoutDialog(KConfig& cfg, CvsService_stub* service, - ActionType action, TQWidget* parent, + ActionType action, TQWidget* tqparent, const char* name) - : KDialogBase(parent, name, true, TQString::null, + : KDialogBase(tqparent, name, true, TQString(), Ok | Cancel | Help, Ok, true) , act(action) , partConfig(cfg) @@ -55,9 +55,9 @@ CheckoutDialog::CheckoutDialog(KConfig& cfg, CvsService_stub* service, TQFrame* mainWidget = makeMainWidget(); - TQBoxLayout* layout = new TQVBoxLayout(mainWidget, 0, spacingHint()); + TQBoxLayout* tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint()); - TQGridLayout* grid = new TQGridLayout(layout); + TQGridLayout* grid = new TQGridLayout(tqlayout); grid->setColStretch(0, 1); grid->setColStretch(1, 20); for( int i = 0; i < ((action==Checkout)? 4 : 10); ++i ) @@ -66,7 +66,7 @@ CheckoutDialog::CheckoutDialog(KConfig& cfg, CvsService_stub* service, repo_combo = new TQComboBox(true, mainWidget); repo_combo->setFocus(); // make sure combobox is smaller than the screen - repo_combo->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); + repo_combo->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); grid->addWidget(repo_combo, 0, 1); TQLabel* repo_label = new TQLabel(repo_combo, i18n("&Repository:"), mainWidget); @@ -198,7 +198,7 @@ CheckoutDialog::CheckoutDialog(KConfig& cfg, CvsService_stub* service, TQStringList list2 = Repositories::readConfigFile(); TQStringList::ConstIterator it2; for (it2 = list2.begin(); it2 != list2.end(); ++it2) - if (!list1.contains(*it2)) + if (!list1.tqcontains(*it2)) repo_combo->insertItem(*it2); setHelp((act == Import) ? "importing" : "checkingout"); @@ -353,9 +353,9 @@ void CheckoutDialog::moduleButtonClicked() if (str.left(12) == "Unknown host") continue; - int pos = str.find(' '); + int pos = str.tqfind(' '); if (pos == -1) - pos = str.find('\t'); + pos = str.tqfind('\t'); if (pos == -1) pos = str.length(); TQString module( str.left(pos).stripWhiteSpace() ); @@ -386,7 +386,7 @@ void CheckoutDialog::branchButtonClicked() if( !cvsService->ok() ) return; - ProgressDialog dlg(this, "Remote Log", cvsJob, TQString::null, + ProgressDialog dlg(this, "Remote Log", cvsJob, TQString(), i18n("CVS Remote Log")); if( !dlg.execute() ) return; @@ -398,11 +398,11 @@ void CheckoutDialog::branchButtonClicked() if( line.isEmpty() || line[0] != '\t' ) continue; - if( (colonPos = line.find(':', 1)) < 0 ) + if( (colonPos = line.tqfind(':', 1)) < 0 ) continue; const TQString tag = line.mid(1, colonPos - 1); - if( !branchTagList.contains(tag) ) + if( !branchTagList.tqcontains(tag) ) branchTagList.push_back(tag); } diff --git a/cervisia/checkoutdlg.h b/cervisia/checkoutdlg.h index 633f1feb..4e6d3b73 100644 --- a/cervisia/checkoutdlg.h +++ b/cervisia/checkoutdlg.h @@ -35,12 +35,13 @@ class CvsService_stub; class CheckoutDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: enum ActionType { Checkout, Import }; CheckoutDialog( KConfig& cfg, CvsService_stub* service, ActionType action, - TQWidget *parent=0, const char *name=0 ); + TQWidget *tqparent=0, const char *name=0 ); TQString workingDirectory() const; TQString repository() const; diff --git a/cervisia/commitdlg.cpp b/cervisia/commitdlg.cpp index 4fdaca68..5077e5d8 100644 --- a/cervisia/commitdlg.cpp +++ b/cervisia/commitdlg.cpp @@ -36,11 +36,11 @@ #include "diffdlg.h" -class CommitListItem : public QCheckListItem +class CommitListItem : public TQCheckListItem { public: - CommitListItem(TQListView* parent, const TQString& text, const TQString fileName) - : TQCheckListItem(parent, text, TQCheckListItem::CheckBox) + CommitListItem(TQListView* tqparent, const TQString& text, const TQString fileName) + : TQCheckListItem(tqparent, text, TQCheckListItem::CheckBox) , m_fileName(fileName) { } @@ -53,18 +53,18 @@ private: CommitDialog::CommitDialog(KConfig& cfg, CvsService_stub* service, - TQWidget *parent, const char *name) - : KDialogBase(parent, name, true, i18n("CVS Commit"), + TQWidget *tqparent, const char *name) + : KDialogBase(tqparent, name, true, i18n("CVS Commit"), Ok | Cancel | Help | User1, Ok, true) , partConfig(cfg) , cvsService(service) { TQFrame* mainWidget = makeMainWidget(); - TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint()); + TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint()); TQLabel *textlabel = new TQLabel( i18n("Commit the following &files:"), mainWidget ); - layout->addWidget(textlabel); + tqlayout->addWidget(textlabel); m_fileList = new KListView(mainWidget); m_fileList->addColumn(""); @@ -75,30 +75,30 @@ CommitDialog::CommitDialog(KConfig& cfg, CvsService_stub* service, this, TQT_SLOT(fileSelected(TQListViewItem*))); connect( m_fileList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(fileHighlighted()) ); - layout->addWidget(m_fileList, 5); + tqlayout->addWidget(m_fileList, 5); TQLabel *archivelabel = new TQLabel(i18n("Older &messages:"), mainWidget); - layout->addWidget(archivelabel); + tqlayout->addWidget(archivelabel); combo = new TQComboBox(mainWidget); archivelabel->setBuddy(combo); connect( combo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(comboActivated(int)) ); // make sure that combobox is smaller than the screen - combo->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed)); - layout->addWidget(combo); + combo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed)); + tqlayout->addWidget(combo); TQLabel *messagelabel = new TQLabel(i18n("&Log message:"), mainWidget); - layout->addWidget(messagelabel); + tqlayout->addWidget(messagelabel); edit = new Cervisia::LogMessageEdit(mainWidget); messagelabel->setBuddy(edit); edit->setCheckSpellingEnabled(true); edit->setFocus(); edit->setMinimumSize(400, 100); - layout->addWidget(edit, 10); + tqlayout->addWidget(edit, 10); m_useTemplateChk = new TQCheckBox(i18n("Use log message &template"), mainWidget); - layout->addWidget(m_useTemplateChk); + tqlayout->addWidget(m_useTemplateChk); connect( m_useTemplateChk, TQT_SIGNAL(clicked()), this, TQT_SLOT(useTemplateClicked()) ); checkForTemplateFile(); @@ -185,7 +185,7 @@ void CommitDialog::setLogHistory(const TQStringList &list) continue; TQString txt = *it; - int index = txt.find('\n', 0); + int index = txt.tqfind('\n', 0); if ( index != -1 ) // Fetch first line { txt = txt.mid(0, index); diff --git a/cervisia/commitdlg.h b/cervisia/commitdlg.h index 61350c7e..7ee5ee1b 100644 --- a/cervisia/commitdlg.h +++ b/cervisia/commitdlg.h @@ -37,9 +37,10 @@ class CvsService_stub; class CommitDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - CommitDialog( KConfig& cfg, CvsService_stub* service, TQWidget *parent=0, + CommitDialog( KConfig& cfg, CvsService_stub* service, TQWidget *tqparent=0, const char *name=0 ); virtual ~CommitDialog(); diff --git a/cervisia/cvsdir.cpp b/cervisia/cvsdir.cpp index 20f2994d..11473c2f 100644 --- a/cervisia/cvsdir.cpp +++ b/cervisia/cvsdir.cpp @@ -31,16 +31,16 @@ CvsDir::CvsDir(const TQString &path) {} -const QFileInfoList *CvsDir::entryInfoList() const +const TQFileInfoList *CvsDir::entryInfoList() const { DirIgnoreList ignorelist(absPath()); - const QFileInfoList *fulllist = TQDir::entryInfoList(); + const TQFileInfoList *fulllist = TQDir::entryInfoList(); if (!fulllist) return 0; entrylist.clear(); - QFileInfoListIterator it(*fulllist); + TQFileInfoListIterator it(*fulllist); for (; it.current(); ++it) { if (!ignorelist.matches(it.current()) && !GlobalIgnoreList().matches(it.current())) diff --git a/cervisia/cvsdir.h b/cervisia/cvsdir.h index 2b9cd9ce..c2ebf065 100644 --- a/cervisia/cvsdir.h +++ b/cervisia/cvsdir.h @@ -24,15 +24,15 @@ #include <tqdir.h> -class CvsDir : public QDir +class CvsDir : public TQDir { public: explicit CvsDir(const TQString &path); - const QFileInfoList *entryInfoList() const; + const TQFileInfoList *entryInfoList() const; private: - mutable QFileInfoList entrylist; + mutable TQFileInfoList entrylist; }; #endif diff --git a/cervisia/cvsinitdlg.cpp b/cervisia/cvsinitdlg.cpp index cf0b4641..f6be89d6 100644 --- a/cervisia/cvsinitdlg.cpp +++ b/cervisia/cvsinitdlg.cpp @@ -32,8 +32,8 @@ using Cervisia::CvsInitDialog; -CvsInitDialog::CvsInitDialog(TQWidget* parent, const char* name) - : KDialogBase(parent, name, true, i18n("Create New Repository (cvs init)"), +CvsInitDialog::CvsInitDialog(TQWidget* tqparent, const char* name) + : KDialogBase(tqparent, name, true, i18n("Create New Repository (cvs init)"), Ok | Cancel, Ok, true) { TQFrame* mainWidget = makeMainWidget(); diff --git a/cervisia/cvsinitdlg.h b/cervisia/cvsinitdlg.h index 9ca35ad0..f36d8742 100644 --- a/cervisia/cvsinitdlg.h +++ b/cervisia/cvsinitdlg.h @@ -32,9 +32,10 @@ namespace Cervisia class CvsInitDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - CvsInitDialog(TQWidget* parent = 0, const char* name = 0); + CvsInitDialog(TQWidget* tqparent = 0, const char* name = 0); TQString directory() const; diff --git a/cervisia/cvsservice/DESIGN b/cervisia/cvsservice/DESIGN index cbd414da..90ad3f18 100644 --- a/cervisia/cvsservice/DESIGN +++ b/cervisia/cvsservice/DESIGN @@ -16,7 +16,7 @@ The cvs DCOP service consists of the following three parts: 3. CvsJob - This class represents a cvs job. You can execute and cancel it, and you can retrieve the output of the cvs client by either - connecting to the proper DCOP signals or by using the output() + connecting to the proper DCOP Q_SIGNALS or by using the output() method. There are two types of jobs. First the non-concurrent job which has to run alone, like cvs update or import. Second the jobs which can run concurrently like cvs log or annotate. @@ -45,7 +45,7 @@ How-to use this service in C++ applications: // call "cvs log" for cervisiapart.h DCOPRef job = cvsService.log("cervisiapart.h"); - // connect to signals to get output + // connect to Q_SIGNALS to get output connectDCOPSignal(job.app(), job.obj(), "jobExited(bool, int)", [MY SLOT]); connectDCOPSignal(job.app(), job.obj(), "receivedStdout(QString)", [MY SLOT]); diff --git a/cervisia/cvsservice/cvsjob.h b/cervisia/cvsservice/cvsjob.h index 88aaa9fb..f469f91c 100644 --- a/cervisia/cvsservice/cvsjob.h +++ b/cervisia/cvsservice/cvsjob.h @@ -32,6 +32,7 @@ class KProcess; class KDE_EXPORT CvsJob : public TQObject, public DCOPObject { Q_OBJECT +// TQ_OBJECT K_DCOP public: diff --git a/cervisia/cvsservice/cvsloginjob.cpp b/cervisia/cvsservice/cvsloginjob.cpp index ad6f9176..0288df0e 100644 --- a/cervisia/cvsservice/cvsloginjob.cpp +++ b/cervisia/cvsservice/cvsloginjob.cpp @@ -97,15 +97,15 @@ bool CvsLoginJob::execute() kdDebug(8051) << "process output = " << line << endl; // retrieve repository from 'Logging in to'-line - if( line.contains(LOGIN_PHRASE) ) + if( line.tqcontains(LOGIN_PHRASE) ) { - repository = line.remove(0, line.find(":pserver:")); + repository = line.remove(0, line.tqfind(":pserver:")); continue; } // process asks for the password // search case insensitive as cvs and cvsnt use different capitalization - if( line.contains(PASS_PHRASE, false) ) + if( line.tqcontains(PASS_PHRASE, false) ) { kdDebug(8051) << "process waits for the password." << endl; @@ -123,7 +123,7 @@ bool CvsLoginJob::execute() m_Proc->writeLine(password); // wait for the result - while( !line.contains(FAILURE_PHRASE) ) + while( !line.tqcontains(FAILURE_PHRASE) ) { line = m_Proc->readLine(); if( line.isNull() ) diff --git a/cervisia/cvsservice/repository.cpp b/cervisia/cvsservice/repository.cpp index d5f06ef4..2ac4c241 100644 --- a/cervisia/cvsservice/repository.cpp +++ b/cervisia/cvsservice/repository.cpp @@ -144,7 +144,7 @@ bool Repository::setWorkingCopy(const TQString& dirName) return false; d->workingCopy = path; - d->location = TQString::null; + d->location = TQString(); // determine path to the repository TQFile rootFile(path + "/CVS/Root"); @@ -157,7 +157,7 @@ bool Repository::setWorkingCopy(const TQString& dirName) // add identities (ssh-add) to ssh-agent // TODO CL make sure this is called only once - if( d->location.contains(":ext:", false) > 0 ) + if( d->location.tqcontains(":ext:", false) > 0 ) { SshAgent ssh; ssh.addSshIdentities(); @@ -223,11 +223,11 @@ void Repository::Private::readConfig() // // In order to be able to read this group, we then have to manually add // the port number to it. - TQString repositoryGroup = TQString::fromLatin1("Repository-") + location; + TQString repositoryGroup = TQString::tqfromLatin1("Repository-") + location; if( !config->hasGroup(repositoryGroup) ) { // find the position of the first path separator - const int insertPos = repositoryGroup.find('/'); + const int insertPos = repositoryGroup.tqfind('/'); if( insertPos > 0 ) { // add port to location diff --git a/cervisia/cvsservice/repository.h b/cervisia/cvsservice/repository.h index 6f638949..6739c0d6 100644 --- a/cervisia/cvsservice/repository.h +++ b/cervisia/cvsservice/repository.h @@ -35,6 +35,7 @@ class KDE_EXPORT Repository : public TQObject, public DCOPObject { K_DCOP Q_OBJECT +// TQ_OBJECT public: Repository(); diff --git a/cervisia/cvsservice/sshagent.cpp b/cervisia/cvsservice/sshagent.cpp index 4f8abd25..6c6845f6 100644 --- a/cervisia/cvsservice/sshagent.cpp +++ b/cervisia/cvsservice/sshagent.cpp @@ -32,12 +32,12 @@ // initialize static member variables bool SshAgent::m_isRunning = false; bool SshAgent::m_isOurAgent = false; -TQString SshAgent::m_authSock = TQString::null; -TQString SshAgent::m_pid = TQString::null; +TQString SshAgent::m_authSock = TQString(); +TQString SshAgent::m_pid = TQString(); -SshAgent::SshAgent(TQObject* parent, const char* name) - : TQObject(parent, name) +SshAgent::SshAgent(TQObject* tqparent, const char* name) + : TQObject(tqparent, name) { } diff --git a/cervisia/cvsservice/sshagent.h b/cervisia/cvsservice/sshagent.h index 3de23076..e14bc0ae 100644 --- a/cervisia/cvsservice/sshagent.h +++ b/cervisia/cvsservice/sshagent.h @@ -28,12 +28,13 @@ class KProcess; -class SshAgent : public QObject +class SshAgent : public TQObject { Q_OBJECT + TQ_OBJECT public: - SshAgent(TQObject* parent = 0, const char* name = 0); + SshAgent(TQObject* tqparent = 0, const char* name = 0); ~SshAgent(); bool querySshAgent(); diff --git a/cervisia/diffdlg.cpp b/cervisia/diffdlg.cpp index fadb6582..1de5e48f 100644 --- a/cervisia/diffdlg.cpp +++ b/cervisia/diffdlg.cpp @@ -41,8 +41,8 @@ #include "diffview.h" -DiffDialog::DiffDialog(KConfig& cfg, TQWidget *parent, const char *name, bool modal) - : KDialogBase(parent, name, modal, TQString::null, +DiffDialog::DiffDialog(KConfig& cfg, TQWidget *tqparent, const char *name, bool modal) + : KDialogBase(tqparent, name, modal, TQString(), Close | Help | User1, Close, true, KStdGuiItem::saveAs()) , partConfig(cfg) { @@ -51,30 +51,30 @@ DiffDialog::DiffDialog(KConfig& cfg, TQWidget *parent, const char *name, bool mo TQFrame* mainWidget = makeMainWidget(); - TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint()); + TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint()); - TQGridLayout *pairlayout = new TQGridLayout(layout); - pairlayout->setRowStretch(0, 0); - pairlayout->setRowStretch(1, 1); - pairlayout->setColStretch(1, 0); - pairlayout->addColSpacing(1, 16); - pairlayout->setColStretch(0, 10); - pairlayout->setColStretch(2, 10); + TQGridLayout *pairtqlayout = new TQGridLayout(tqlayout); + pairtqlayout->setRowStretch(0, 0); + pairtqlayout->setRowStretch(1, 1); + pairtqlayout->setColStretch(1, 0); + pairtqlayout->addColSpacing(1, 16); + pairtqlayout->setColStretch(0, 10); + pairtqlayout->setColStretch(2, 10); revlabel1 = new TQLabel(mainWidget); - pairlayout->addWidget(revlabel1, 0, 0); + pairtqlayout->addWidget(revlabel1, 0, 0); revlabel2 = new TQLabel(mainWidget); - pairlayout->addWidget(revlabel2, 0, 2); + pairtqlayout->addWidget(revlabel2, 0, 2); diff1 = new DiffView(cfg, true, false, mainWidget); diff2 = new DiffView(cfg, true, true, mainWidget); DiffZoomWidget *zoom = new DiffZoomWidget(cfg, mainWidget); zoom->setDiffView(diff2); - pairlayout->addWidget(diff1, 1, 0); - pairlayout->addWidget(zoom, 1, 1); - pairlayout->addWidget(diff2, 1, 2); + pairtqlayout->addWidget(diff1, 1, 0); + pairtqlayout->addWidget(zoom, 1, 1); + pairtqlayout->addWidget(diff2, 1, 2); diff1->setPartner(diff2); diff2->setPartner(diff1); @@ -85,35 +85,35 @@ DiffDialog::DiffDialog(KConfig& cfg, TQWidget *parent, const char *name, bool mo this, TQT_SLOT(toggleSynchronize(bool)) ); itemscombo = new TQComboBox(mainWidget); - itemscombo->insertItem(TQString::null); + itemscombo->insertItem(TQString()); connect( itemscombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(comboActivated(int)) ); nofnlabel = new TQLabel(mainWidget); // avoids auto resize when the text is changed - nofnlabel->setMinimumWidth(fontMetrics().width(i18n("%1 differences").arg(10000))); + nofnlabel->setMinimumWidth(fontMetrics().width(i18n("%1 differences").tqarg(10000))); - backbutton = new TQPushButton(TQString::fromLatin1("&<<"), mainWidget); + backbutton = new TQPushButton(TQString::tqfromLatin1("&<<"), mainWidget); connect( backbutton, TQT_SIGNAL(clicked()), TQT_SLOT(backClicked()) ); - forwbutton = new TQPushButton(TQString::fromLatin1("&>>"), mainWidget); + forwbutton = new TQPushButton(TQString::tqfromLatin1("&>>"), mainWidget); connect( forwbutton, TQT_SIGNAL(clicked()), TQT_SLOT(forwClicked()) ); connect( this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(saveAsClicked()) ); - TQBoxLayout *buttonlayout = new TQHBoxLayout(layout); - buttonlayout->addWidget(syncbox, 0); - buttonlayout->addStretch(4); - buttonlayout->addWidget(itemscombo); - buttonlayout->addStretch(1); - buttonlayout->addWidget(nofnlabel); - buttonlayout->addStretch(1); - buttonlayout->addWidget(backbutton); - buttonlayout->addWidget(forwbutton); + TQBoxLayout *buttontqlayout = new TQHBoxLayout(tqlayout); + buttontqlayout->addWidget(syncbox, 0); + buttontqlayout->addStretch(4); + buttontqlayout->addWidget(itemscombo); + buttontqlayout->addStretch(1); + buttontqlayout->addWidget(nofnlabel); + buttontqlayout->addStretch(1); + buttontqlayout->addWidget(backbutton); + buttontqlayout->addWidget(forwbutton); setHelp("diff"); - setWFlags(Qt::WDestructiveClose | getWFlags()); + setWFlags(TQt::WDestructiveClose | getWFlags()); TQSize size = configDialogSize(partConfig, "DiffDialog"); resize(size); @@ -189,18 +189,18 @@ static TQString regionAsString(int linenoA, int linecountA, int linenoB, int lin int lineendB = linenoB+linecountB-1; TQString res; if (linecountB == 0) - res = TQString("%1,%2d%3").arg(linenoA).arg(lineendA).arg(linenoB-1); + res = TQString("%1,%2d%3").tqarg(linenoA).tqarg(lineendA).tqarg(linenoB-1); else if (linecountA == 0) - res = TQString("%1a%2,%3").arg(linenoA-1).arg(linenoB).arg(lineendB); + res = TQString("%1a%2,%3").tqarg(linenoA-1).tqarg(linenoB).tqarg(lineendB); else if (linenoA == lineendA) if (linenoB == lineendB) - res = TQString("%1c%2").arg(linenoA).arg(linenoB); + res = TQString("%1c%2").tqarg(linenoA).tqarg(linenoB); else - res = TQString("%1c%2,%3").arg(linenoA).arg(linenoB).arg(lineendB); + res = TQString("%1c%2,%3").tqarg(linenoA).tqarg(linenoB).tqarg(lineendB); else if (linenoB == lineendB) - res = TQString("%1,%2c%3").arg(linenoA).arg(lineendA).arg(linenoB); + res = TQString("%1,%2c%3").tqarg(linenoA).tqarg(lineendA).tqarg(linenoB); else - res = TQString("%1,%2c%3,%4").arg(linenoA).arg(lineendA).arg(linenoB).arg(lineendB); + res = TQString("%1,%2c%3,%4").tqarg(linenoA).tqarg(lineendA).tqarg(linenoB).tqarg(lineendB); return res; @@ -222,7 +222,7 @@ bool DiffDialog::parseCvsDiff(CvsService_stub* service, const TQString& fileName TQStringList linesA, linesB; int linenoA, linenoB; - setCaption(i18n("CVS Diff: %1").arg(fileName)); + setCaption(i18n("CVS Diff: %1").tqarg(fileName)); revlabel1->setText( revA.isEmpty()? i18n("Repository:") : i18n("Revision ")+revA+":" ); @@ -236,7 +236,7 @@ bool DiffDialog::parseCvsDiff(CvsService_stub* service, const TQString& fileName // front end, it is executed from here. Of course, in that // case this dialog wouldn't have to be created in the first // place, but this design at least makes the handling trans- - // parent for the calling routines + // tqparent for the calling routines TQString extdiff = partConfig.readPathEntry("ExternalDiff"); if (!extdiff.isEmpty()) @@ -302,7 +302,7 @@ bool DiffDialog::parseCvsDiff(CvsService_stub* service, const TQString& fileName if (!linesA.isEmpty() || !linesB.isEmpty()) newDiffHunk(linenoA, linenoB, linesA, linesB); - // sets the right size as there is no more auto resize in QComboBox + // sets the right size as there is no more auto resize in TQComboBox itemscombo->adjustSize(); updateNofN(); @@ -408,9 +408,9 @@ void DiffDialog::updateNofN() { TQString str; if (markeditem >= 0) - str = i18n("%1 of %2").arg(markeditem+1).arg(items.count()); + str = i18n("%1 of %2").tqarg(markeditem+1).tqarg(items.count()); else - str = i18n("%1 differences").arg(items.count()); + str = i18n("%1 differences").tqarg(items.count()); nofnlabel->setText(str); itemscombo->setCurrentItem(markeditem==-2? 0 : markeditem+1); @@ -443,8 +443,8 @@ void DiffDialog::updateHighlight(int newitem) diff1->setCenterLine(item->linenoA); diff2->setCenterLine(item->linenoB); } - diff1->repaint(); - diff2->repaint(); + diff1->tqrepaint(); + diff2->tqrepaint(); updateNofN(); } @@ -477,7 +477,7 @@ void DiffDialog::forwClicked() void DiffDialog::saveAsClicked() { - TQString fileName = KFileDialog::getSaveFileName(TQString::null, TQString::null, this); + TQString fileName = KFileDialog::getSaveFileName(TQString(), TQString(), this); if( fileName.isEmpty() ) return; diff --git a/cervisia/diffdlg.h b/cervisia/diffdlg.h index e0af7d4a..eec4bee4 100644 --- a/cervisia/diffdlg.h +++ b/cervisia/diffdlg.h @@ -37,10 +37,11 @@ class CvsService_stub; class DiffDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - explicit DiffDialog( KConfig& config, TQWidget *parent=0, const char *name=0, + explicit DiffDialog( KConfig& config, TQWidget *tqparent=0, const char *name=0, bool modal=false ); virtual ~DiffDialog(); diff --git a/cervisia/diffview.cpp b/cervisia/diffview.cpp index 597ec97f..baf80152 100644 --- a/cervisia/diffview.cpp +++ b/cervisia/diffview.cpp @@ -54,8 +54,8 @@ const int DiffView::BORDER = 7; DiffView::DiffView( KConfig& cfg, bool withlinenos, bool withmarker, - TQWidget *parent, const char *name ) - : QtTableView(parent, name, WRepaintNoErase) + TQWidget *tqparent, const char *name ) + : TQtTableView(tqparent, name, WRepaintNoErase) , partConfig(cfg) { setNumRows(0); @@ -92,7 +92,7 @@ DiffView::DiffView( KConfig& cfg, bool withlinenos, bool withmarker, void DiffView::setFont(const TQFont &font) { - QtTableView::setFont(font); + TQtTableView::setFont(font); TQFontMetrics fm(font); setCellHeight(fm.lineSpacing()); } @@ -118,14 +118,14 @@ void DiffView::setPartner(DiffView *other) void DiffView::vertPositionChanged(int val) { if (partner) - partner->setYOffset(QMIN(val,partner->maxYOffset())); + partner->setYOffset(TQMIN(val,partner->maxYOffset())); } void DiffView::horzPositionChanged(int val) { if (partner) - partner->setXOffset(QMIN(val,partner->maxXOffset())); + partner->setXOffset(TQMIN(val,partner->maxXOffset())); } @@ -154,7 +154,7 @@ void DiffView::setCenterOffset(int offset) if (!rowIsVisible(offset)) { int visiblerows = viewHeight()/cellHeight(0); - setTopCell( QMAX(0, offset - visiblerows/2) ); + setTopCell( TQMAX(0, offset - visiblerows/2) ); } } @@ -173,12 +173,12 @@ void DiffView::addLine(const TQString &line, DiffType type, int no) // For some fonts, e.g. "Clean", is fm.maxWidth() greater than // fmbold.maxWidth(). TQString copy(line); - const int numTabs = copy.contains('\t', false); - copy.replace( TQRegExp("\t"), ""); + const int numTabs = copy.tqcontains('\t', false); + copy.tqreplace( TQRegExp("\t"), ""); - const int tabSize = m_tabWidth * QMAX(fm.maxWidth(), fmbold.maxWidth()); - const int copyWidth = QMAX(fm.width(copy), fmbold.width(copy)); - textwidth = QMAX(textwidth, copyWidth + numTabs * tabSize); + const int tabSize = m_tabWidth * TQMAX(fm.maxWidth(), fmbold.maxWidth()); + const int copyWidth = TQMAX(fm.width(copy), fmbold.width(copy)); + textwidth = TQMAX(textwidth, copyWidth + numTabs * tabSize); DiffViewItem *item = new DiffViewItem; item->line = line; @@ -211,7 +211,7 @@ int DiffView::findLine(int lineno) int offset; DiffViewItem tmp; tmp.no = lineno; - if ( (offset = items.find(&tmp)) == -1) + if ( (offset = items.tqfind(&tmp)) == -1) { kdDebug(8050) << "Internal Error: Line " << lineno << " not found" << endl; return -1; @@ -279,7 +279,7 @@ int DiffView::cellWidth(int col) else if (marker && (col == 0 || col == 1)) { TQFontMetrics fm( fontMetrics() ); - return QMAX(QMAX( fm.width(i18n("Delete")), + return TQMAX(TQMAX( fm.width(i18n("Delete")), fm.width(i18n("Insert"))), fm.width(i18n("Change")))+2*BORDER; } @@ -288,12 +288,12 @@ int DiffView::cellWidth(int col) int rest = (linenos || marker)? cellWidth(0) : 0; if (linenos && marker) rest += cellWidth(1); - return QMAX(textwidth, viewWidth()-rest); + return TQMAX(textwidth, viewWidth()-rest); } } -TQSize DiffView::sizeHint() const +TQSize DiffView::tqsizeHint() const { TQFontMetrics fm(font()); return TQSize( 4*fm.width("0123456789"), fm.lineSpacing()*8 ); @@ -351,7 +351,7 @@ void DiffView::paintCell(TQPainter *p, int row, int col) innerborder = BORDER; str = (item->type==Change)? i18n("Change") : (item->type==Insert)? i18n("Insert") - : (item->type==Delete)? i18n("Delete") : TQString::null; + : (item->type==Delete)? i18n("Delete") : TQString(); } else { @@ -388,10 +388,10 @@ void DiffView::wheelEvent(TQWheelEvent *e) } -DiffZoomWidget::DiffZoomWidget(KConfig& cfg, TQWidget *parent, const char *name) - : TQFrame(parent, name) +DiffZoomWidget::DiffZoomWidget(KConfig& cfg, TQWidget *tqparent, const char *name) + : TQFrame(tqparent, name) { - setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) ); + tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) ); cfg.setGroup("Colors"); TQColor defaultColor=TQColor(237, 190, 190); @@ -415,9 +415,9 @@ void DiffZoomWidget::setDiffView(DiffView *view) } -TQSize DiffZoomWidget::sizeHint() const +TQSize DiffZoomWidget::tqsizeHint() const { - return TQSize(25, style().pixelMetric(TQStyle::PM_ScrollBarExtent, this)); + return TQSize(25, tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent, this)); } @@ -426,7 +426,7 @@ bool DiffZoomWidget::eventFilter(TQObject *o, TQEvent *e) if (e->type() == TQEvent::Show || e->type() == TQEvent::Hide || e->type() == TQEvent::Resize) - repaint(); + tqrepaint(); return TQFrame::eventFilter(o, e); } @@ -440,7 +440,7 @@ void DiffZoomWidget::paintEvent(TQPaintEvent *) // only y and height are important const TQRect scrollBarGroove(scrollBar->isVisible() - ? style().querySubControlMetrics(TQStyle::CC_ScrollBar, + ? tqstyle().querySubControlMetrics(TQStyle::CC_ScrollBar, scrollBar, TQStyle::SC_ScrollBarGroove) : rect()); @@ -460,7 +460,7 @@ void DiffZoomWidget::paintEvent(TQPaintEvent *) { const char lineType(lineTypes[index]); - // don't use qRound() to avoid painting outside of the pixmap + // don't use tqRound() to avoid painting outside of the pixmap // (yPos1 must be lesser than scrollBarGroove.height()) const int yPos1(static_cast<int>(index * scale)); @@ -488,7 +488,7 @@ void DiffZoomWidget::paintEvent(TQPaintEvent *) if (color.isValid()) { - const int yPos2(qRound(index * scale)); + const int yPos2(tqRound(index * scale)); const int areaHeight((yPos2 != yPos1) ? yPos2 - yPos1 : 1); p.fillRect(0, yPos1, pixbuf.width(), areaHeight, TQBrush(color)); diff --git a/cervisia/diffview.h b/cervisia/diffview.h index 160dd2cd..7099f172 100644 --- a/cervisia/diffview.h +++ b/cervisia/diffview.h @@ -39,15 +39,16 @@ protected: }; -class DiffView : public QtTableView +class DiffView : public TQtTableView { Q_OBJECT + TQ_OBJECT public: enum DiffType { Change, Insert, Delete, Neutral, Unchanged, Separator }; DiffView( KConfig& cfg, bool withlinenos, bool withmarker, - TQWidget *parent=0, const char *name=0 ); + TQWidget *tqparent=0, const char *name=0 ); void setPartner(DiffView *other); @@ -73,7 +74,7 @@ public: virtual void setFont(const TQFont &font); virtual int cellWidth(int col); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; virtual void paintCell(TQPainter *p, int row, int col); virtual void wheelEvent(TQWheelEvent *); const TQScrollBar *scrollBar() const @@ -101,16 +102,17 @@ private: }; -class DiffZoomWidget : public QFrame +class DiffZoomWidget : public TQFrame { Q_OBJECT + TQ_OBJECT public: - DiffZoomWidget(KConfig& cfg, TQWidget *parent=0, const char *name=0); + DiffZoomWidget(KConfig& cfg, TQWidget *tqparent=0, const char *name=0); ~DiffZoomWidget(); void setDiffView(DiffView *view); - TQSize sizeHint() const; + TQSize tqsizeHint() const; protected: void paintEvent(TQPaintEvent *); diff --git a/cervisia/editwithmenu.cpp b/cervisia/editwithmenu.cpp index d7d1044a..b91283e8 100644 --- a/cervisia/editwithmenu.cpp +++ b/cervisia/editwithmenu.cpp @@ -27,8 +27,8 @@ using namespace Cervisia; #include <kurl.h> -EditWithMenu::EditWithMenu(const KURL& url, TQWidget* parent) - : TQObject(parent) +EditWithMenu::EditWithMenu(const KURL& url, TQWidget* tqparent) + : TQObject(tqparent) , m_menu(0) , m_url(url) { diff --git a/cervisia/editwithmenu.h b/cervisia/editwithmenu.h index b551ce89..88872621 100644 --- a/cervisia/editwithmenu.h +++ b/cervisia/editwithmenu.h @@ -30,12 +30,13 @@ namespace Cervisia { -class EditWithMenu : public QObject +class EditWithMenu : public TQObject { Q_OBJECT + TQ_OBJECT public: - EditWithMenu(const KURL& url, TQWidget* parent); + EditWithMenu(const KURL& url, TQWidget* tqparent); TQPopupMenu* menu(); private slots: diff --git a/cervisia/entry.h b/cervisia/entry.h index f3705d35..2c0a1c98 100644 --- a/cervisia/entry.h +++ b/cervisia/entry.h @@ -43,7 +43,7 @@ struct Entry }; /** - * Sets status to \a EntryStatus::Unknown and type to \a File. + * Sets status to \a EntrytqStatus::Unknown and type to \a File. */ Entry(); @@ -60,7 +60,7 @@ struct Entry /** * The status of this entry. */ - EntryStatus m_status; + EntrytqStatus m_status; /** * The revision of this entry. diff --git a/cervisia/entry_status.cpp b/cervisia/entry_status.cpp index 00ff3b32..c76c135c 100644 --- a/cervisia/entry_status.cpp +++ b/cervisia/entry_status.cpp @@ -28,10 +28,10 @@ namespace Cervisia { -TQString toString(EntryStatus entryStatus) +TQString toString(EntrytqStatus entrytqStatus) { TQString result; - switch (entryStatus) + switch (entrytqStatus) { case LocallyModified: result = i18n("Locally Modified"); diff --git a/cervisia/entry_status.h b/cervisia/entry_status.h index aa964735..b1d6cf6f 100644 --- a/cervisia/entry_status.h +++ b/cervisia/entry_status.h @@ -31,7 +31,7 @@ namespace Cervisia /** * All stati a an entry could have. */ -enum EntryStatus +enum EntrytqStatus { LocallyModified, LocallyAdded, @@ -51,11 +51,11 @@ enum EntryStatus /** * The entry status as translated string. * - * @param entryStatus The entry status to translate. + * @param entrytqStatus The entry status to translate. * * @return The translated string. */ -TQString toString(EntryStatus entryStatus); +TQString toString(EntrytqStatus entrytqStatus); } // namespace Cervisia diff --git a/cervisia/entry_status_change.h b/cervisia/entry_status_change.h index 3518eed8..7935cf1d 100644 --- a/cervisia/entry_status_change.h +++ b/cervisia/entry_status_change.h @@ -44,7 +44,7 @@ struct EntryStatusChange /** * The new status of the entry. */ - EntryStatus m_status; + EntrytqStatus m_status; }; diff --git a/cervisia/globalignorelist.cpp b/cervisia/globalignorelist.cpp index b3834a42..4b5c8a47 100644 --- a/cervisia/globalignorelist.cpp +++ b/cervisia/globalignorelist.cpp @@ -81,7 +81,7 @@ void GlobalIgnoreList::addEntry(const TQString& entry) // Bug #89215: // Make sure '.' and '..' are always in the ignore list, so // UpdateDirItem::maybeScanDir() doesn't loop endlessly. - addEntriesFromString(TQString::fromLatin1(". ..")); + addEntriesFromString(TQString::tqfromLatin1(". ..")); } } @@ -92,7 +92,7 @@ void GlobalIgnoreList::setup() .nse_depinfo #* .#* cvslog.* ,* CVS CVS.adm .del-* *.a *.olb *.o *.obj\ *.so *.Z *~ *.old *.elc *.ln *.bak *.BAK *.orig *.rej *.exe _$* *$"; - addEntriesFromString(TQString::fromLatin1(ignorestr)); + addEntriesFromString(TQString::tqfromLatin1(ignorestr)); addEntriesFromString(TQString::fromLocal8Bit(::getenv("CVSIGNORE"))); addEntriesFromFile(TQDir::homeDirPath() + "/.cvsignore"); diff --git a/cervisia/historydlg.cpp b/cervisia/historydlg.cpp index 4eb9cca5..cb519b0b 100644 --- a/cervisia/historydlg.cpp +++ b/cervisia/historydlg.cpp @@ -40,7 +40,7 @@ static TQDateTime parseDate(const TQString& date, const TQString& _time, const T { // cvs history only prints hh:mm but parseDateISO8601 needs hh:mm:ss TQString time(_time); - if( time.contains(':') == 1 ) + if( time.tqcontains(':') == 1 ) time += ":00"; TQDateTime dateTime; @@ -50,14 +50,14 @@ static TQDateTime parseDate(const TQString& date, const TQString& _time, const T } -class HistoryItem : public QListViewItem +class HistoryItem : public TQListViewItem { public: enum { Date, Event, Author, Revision, File, Path }; - HistoryItem(TQListView *parent, const TQDateTime& date) - : TQListViewItem(parent), m_date(date) + HistoryItem(TQListView *tqparent, const TQDateTime& date) + : TQListViewItem(tqparent), m_date(date) {} virtual int compare(TQListViewItem* i, int col, bool) const; @@ -138,14 +138,14 @@ bool HistoryItem::isOther() } -HistoryDialog::HistoryDialog(KConfig& cfg, TQWidget *parent, const char *name) - : KDialogBase(parent, name, false, TQString::null, +HistoryDialog::HistoryDialog(KConfig& cfg, TQWidget *tqparent, const char *name) + : KDialogBase(tqparent, name, false, TQString(), Close | Help, ButtonCode(0), true) , partConfig(cfg) { TQFrame* mainWidget = makeMainWidget(); - TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint()); + TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint()); listview = new KListView(mainWidget); listview->setSelectionMode(TQListView::NoSelection); @@ -159,7 +159,7 @@ HistoryDialog::HistoryDialog(KConfig& cfg, TQWidget *parent, const char *name) listview->addColumn(i18n("File")); listview->addColumn(i18n("Repo Path")); listview->setFocus(); - layout->addWidget(listview, 1); + tqlayout->addWidget(listview, 1); commit_box = new TQCheckBox(i18n("Show c&ommit events"), mainWidget); commit_box->setChecked(true); @@ -215,7 +215,7 @@ HistoryDialog::HistoryDialog(KConfig& cfg, TQWidget *parent, const char *name) connect( dirname_edit, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(choiceChanged()) ); - TQGridLayout *grid = new TQGridLayout(layout); + TQGridLayout *grid = new TQGridLayout(tqlayout); grid->setColStretch(0, 1); grid->setColStretch(1, 0); grid->setColStretch(2, 4); @@ -237,7 +237,7 @@ HistoryDialog::HistoryDialog(KConfig& cfg, TQWidget *parent, const char *name) setHelp("browsinghistory"); - setWFlags(Qt::WDestructiveClose | getWFlags()); + setWFlags(TQt::WDestructiveClose | getWFlags()); TQSize size = configDialogSize(partConfig, "HistoryDialog"); resize(size); @@ -246,7 +246,7 @@ HistoryDialog::HistoryDialog(KConfig& cfg, TQWidget *parent, const char *name) for (int i = 0; i < listview->columns(); ++i) listview->setColumnWidthMode(i, TQListView::Manual); - listview->restoreLayout(&partConfig, TQString::fromLatin1("HistoryListView")); + listview->restoreLayout(&partConfig, TQString::tqfromLatin1("HistoryListView")); } @@ -254,7 +254,7 @@ HistoryDialog::~HistoryDialog() { saveDialogSize(partConfig, "HistoryDialog"); - listview->saveLayout(&partConfig, TQString::fromLatin1("HistoryListView")); + listview->saveLayout(&partConfig, TQString::tqfromLatin1("HistoryListView")); } diff --git a/cervisia/historydlg.h b/cervisia/historydlg.h index 307250c6..7c0e4feb 100644 --- a/cervisia/historydlg.h +++ b/cervisia/historydlg.h @@ -35,9 +35,10 @@ class CvsService_stub; class HistoryDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - explicit HistoryDialog( KConfig& cfg, TQWidget *parent=0, const char *name=0 ); + explicit HistoryDialog( KConfig& cfg, TQWidget *tqparent=0, const char *name=0 ); virtual ~HistoryDialog(); bool parseHistory(CvsService_stub* cvsService); diff --git a/cervisia/logdlg.cpp b/cervisia/logdlg.cpp index 28b3078e..9b5df78f 100644 --- a/cervisia/logdlg.cpp +++ b/cervisia/logdlg.cpp @@ -57,12 +57,12 @@ #include "patchoptiondlg.h" -LogDialog::LogDialog(KConfig& cfg, TQWidget *parent, const char *name) - : KDialogBase(parent, name, false, TQString::null, +LogDialog::LogDialog(KConfig& cfg, TQWidget *tqparent, const char *name) + : KDialogBase(tqparent, name, false, TQString(), Ok | Apply | Close | Help | User1 | User2 | User3, Close, true, KGuiItem(i18n("&Annotate")), KGuiItem(i18n("&Diff"), "vcs_diff"), - KGuiItem(i18n("&Find..."), "find")) + KGuiItem(i18n("&Find..."), "tqfind")) , cvsService(0) , partConfig(cfg) { @@ -110,7 +110,7 @@ LogDialog::LogDialog(KConfig& cfg, TQWidget *parent, const char *name) tags.setAutoDelete(true); TQWidget *mainWidget = new TQWidget(splitter); - TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint()); + TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint()); for (int i = 0; i < 2; ++i) { @@ -118,10 +118,10 @@ LogDialog::LogDialog(KConfig& cfg, TQWidget *parent, const char *name) { TQFrame *frame = new TQFrame(mainWidget); frame->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); - layout->addWidget(frame); + tqlayout->addWidget(frame); } - TQGridLayout *grid = new TQGridLayout(layout); + TQGridLayout *grid = new TQGridLayout(tqlayout); grid->setRowStretch(0, 0); grid->setRowStretch(1, 0); grid->setRowStretch(2, 1); @@ -137,7 +137,7 @@ LogDialog::LogDialog(KConfig& cfg, TQWidget *parent, const char *name) revbox[i] = new TQLabel(mainWidget); revbox[i]->setFrameStyle(TQFrame::Panel | TQFrame::Sunken); - grid->addWidget(revbox[i], 0, 1, Qt::AlignVCenter); + grid->addWidget(revbox[i], 0, 1, TQt::AlignVCenter); TQLabel *selectlabel = new TQLabel(i18n("Select by tag:"), mainWidget); grid->addWidget(selectlabel, 0, 2); @@ -166,7 +166,7 @@ LogDialog::LogDialog(KConfig& cfg, TQWidget *parent, const char *name) commentbox[i] = new TQTextEdit(mainWidget); commentbox[i]->setReadOnly(true); - commentbox[i]->setTextFormat(Qt::PlainText); + commentbox[i]->setTextFormat(TQt::PlainText); fm = commentbox[i]->fontMetrics(); commentbox[i]->setMinimumHeight(2*fm.lineSpacing()+10); grid->addMultiCellWidget(commentbox[i], 2, 2, 1, 3); @@ -199,7 +199,7 @@ LogDialog::LogDialog(KConfig& cfg, TQWidget *parent, const char *name) setButtonGuiItem(Apply, KGuiItem(i18n("Create Patch..."))); setHelp("browsinglogs"); - setWFlags(Qt::WDestructiveClose | getWFlags()); + setWFlags(TQt::WDestructiveClose | getWFlags()); TQSize size = configDialogSize(partConfig, "LogDialog"); resize(size); @@ -233,7 +233,7 @@ bool LogDialog::parseCvsLog(CvsService_stub* service, const TQString& fileName) cvsService = service; filename = fileName; - setCaption(i18n("CVS Log: %1").arg(filename)); + setCaption(i18n("CVS Log: %1").tqarg(filename)); DCOPRef job = cvsService->log(filename); if( !cvsService->ok() ) @@ -262,8 +262,8 @@ bool LogDialog::parseCvsLog(CvsService_stub* service, const TQString& fileName) const TQString tag(strlist[0].simplifyWhiteSpace()); TQString branchpoint; int pos1, pos2; - if( (pos2 = rev.findRev('.')) > 0 && - (pos1 = rev.findRev('.', pos2-1)) > 0 && + if( (pos2 = rev.tqfindRev('.')) > 0 && + (pos1 = rev.tqfindRev('.', pos2-1)) > 0 && rev.mid(pos1+1, pos2-pos1-1) == "0" ) { // For a branch tag 2.10.0.6, we want: @@ -303,7 +303,7 @@ bool LogDialog::parseCvsLog(CvsService_stub* service, const TQString& fileName) // convert date into ISO format (YYYY-MM-DDTHH:MM:SS) int len = strList[0].length(); TQString dateTimeStr = strList[0].right(len-6); // remove 'date: ' - dateTimeStr.replace('/', '-'); + dateTimeStr.tqreplace('/', '-'); TQString date = dateTimeStr.section(' ', 0, 0); TQString time = dateTimeStr.section(' ', 1, 1); @@ -338,8 +338,8 @@ bool LogDialog::parseCvsLog(CvsService_stub* service, const TQString& fileName) TQString branchrev; int pos1, pos2; // 1.60.x.y => revision belongs to branch 1.60.0.x - if( (pos2 = rev.findRev('.')) > 0 && - (pos1 = rev.findRev('.', pos2-1)) > 0 ) + if( (pos2 = rev.tqfindRev('.')) > 0 && + (pos1 = rev.tqfindRev('.', pos2-1)) > 0 ) branchrev = rev.left(pos2); // Build Cervisia::TagInfo for logInfo @@ -380,8 +380,8 @@ bool LogDialog::parseCvsLog(CvsService_stub* service, const TQString& fileName) } } - tagcombo[0]->insertItem(TQString::null); - tagcombo[1]->insertItem(TQString::null); + tagcombo[0]->insertItem(TQString()); + tagcombo[1]->insertItem(TQString()); TQPtrListIterator<LogDialogTagInfo> it(tags); for( ; it.current(); ++it ) { diff --git a/cervisia/logdlg.h b/cervisia/logdlg.h index 50ecf7c7..2214b227 100644 --- a/cervisia/logdlg.h +++ b/cervisia/logdlg.h @@ -52,9 +52,10 @@ public: class LogDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - explicit LogDialog( KConfig& cfg, TQWidget *parent=0, const char *name=0 ); + explicit LogDialog( KConfig& cfg, TQWidget *tqparent=0, const char *name=0 ); virtual ~LogDialog(); diff --git a/cervisia/loginfo.cpp b/cervisia/loginfo.cpp index b97ff1f0..8e6464d0 100644 --- a/cervisia/loginfo.cpp +++ b/cervisia/loginfo.cpp @@ -41,7 +41,7 @@ TQString TagInfo::toString(bool prefixWithType) const TQString text; if (prefixWithType) { - text += typeToString() + TQString::fromLatin1(": "); + text += typeToString() + TQString::tqfromLatin1(": "); } text += m_name; @@ -71,32 +71,32 @@ TQString TagInfo::typeToString() const TQString LogInfo::createToolTipText(bool showTime) const { - TQString text(TQString::fromLatin1("<nobr><b>")); + TQString text(TQString::tqfromLatin1("<nobr><b>")); text += TQStyleSheet::escape(m_revision); - text += TQString::fromLatin1("</b> "); + text += TQString::tqfromLatin1("</b> "); text += TQStyleSheet::escape(m_author); - text += TQString::fromLatin1(" <b>"); + text += TQString::tqfromLatin1(" <b>"); text += TQStyleSheet::escape(dateTimeToString(showTime)); - text += TQString::fromLatin1("</b></nobr>"); + text += TQString::tqfromLatin1("</b></nobr>"); if (!m_comment.isEmpty()) { - text += TQString::fromLatin1("<pre>"); + text += TQString::tqfromLatin1("<pre>"); text += TQStyleSheet::escape(m_comment); - text += TQString::fromLatin1("</pre>"); + text += TQString::tqfromLatin1("</pre>"); } if (!m_tags.isEmpty()) { - text += TQString::fromLatin1("<i>"); + text += TQString::tqfromLatin1("<i>"); for (TTagInfoSeq::const_iterator it = m_tags.begin(); it != m_tags.end(); ++it) { if (it != m_tags.begin() || m_comment.isEmpty()) - text += TQString::fromLatin1("<br>"); + text += TQString::tqfromLatin1("<br>"); text += TQStyleSheet::escape((*it).toString()); } - text += TQString::fromLatin1("</i>"); + text += TQString::tqfromLatin1("</i>"); } return text; diff --git a/cervisia/loginfo.h b/cervisia/loginfo.h index 92c67312..e75df840 100644 --- a/cervisia/loginfo.h +++ b/cervisia/loginfo.h @@ -58,7 +58,7 @@ struct TagInfo Tag = 1 << 2 }; - explicit TagInfo(const TQString& name = TQString::null, Type type = Tag); + explicit TagInfo(const TQString& name = TQString(), Type type = Tag); /** * @param prefixWithType prefix the string with the type of the tag diff --git a/cervisia/loglist.cpp b/cervisia/loglist.cpp index 833a2429..5b7bec74 100644 --- a/cervisia/loglist.cpp +++ b/cervisia/loglist.cpp @@ -69,7 +69,7 @@ LogListViewItem::LogListViewItem(TQListView* list, const Cervisia::LogInfo& logI setText(Tags, logInfo.tagsToString(Cervisia::TagInfo::Tag, Cervisia::LogInfo::NoTagType, - TQString::fromLatin1(", "))); + TQString::tqfromLatin1(", "))); } @@ -78,7 +78,7 @@ TQString LogListViewItem::truncateLine(const TQString &s) int pos; TQString res = s.simplifyWhiteSpace(); - if ( (pos = res.find('\n')) != -1 ) + if ( (pos = res.tqfind('\n')) != -1 ) res = res.left(pos) + "..."; return res; @@ -106,8 +106,8 @@ int LogListViewItem::compare(TQListViewItem* i, int col, bool ascending) const } -LogListView::LogListView(KConfig& cfg, TQWidget *parent, const char *name) - : KListView(parent, name) +LogListView::LogListView(KConfig& cfg, TQWidget *tqparent, const char *name) + : KListView(tqparent, name) , partConfig(cfg) { setAllColumnsShowFocus(true); @@ -131,13 +131,13 @@ LogListView::LogListView(KConfig& cfg, TQWidget *parent, const char *name) for (int i = 0; i < columns(); ++i) setColumnWidthMode(i, Manual); - restoreLayout(&partConfig, TQString::fromLatin1("LogList view")); + restoreLayout(&partConfig, TQString::tqfromLatin1("LogList view")); } LogListView::~LogListView() { - saveLayout(&partConfig, TQString::fromLatin1("LogList view")); + saveLayout(&partConfig, TQString::tqfromLatin1("LogList view")); } @@ -169,7 +169,7 @@ void LogListView::contentsMousePressEvent(TQMouseEvent *e) // Retrieve revision const TQString revision = selItem->text(LogListViewItem::Revision); - if ( e->button() == LeftButton ) + if ( e->button() == Qt::LeftButton ) { // If the control key was pressed, then we change revision B not A if( e->state() & ControlButton ) @@ -177,7 +177,7 @@ void LogListView::contentsMousePressEvent(TQMouseEvent *e) else emit revisionClicked(revision, false); } - else if ( e->button() == MidButton ) + else if ( e->button() == Qt::MidButton ) emit revisionClicked(revision, true); } @@ -220,7 +220,7 @@ void LogListView::slotQueryToolTip(const TQPoint& viewportPos, { if (const LogListViewItem* item = static_cast<LogListViewItem*>(itemAt(viewportPos))) { - viewportRect = itemRect(item); + viewportRect = tqitemRect(item); text = item->m_logInfo.createToolTipText(); } } diff --git a/cervisia/loglist.h b/cervisia/loglist.h index 3c608ea8..1ec26bbc 100644 --- a/cervisia/loglist.h +++ b/cervisia/loglist.h @@ -39,9 +39,10 @@ struct LogInfo; class LogListView : public KListView { Q_OBJECT + TQ_OBJECT public: - explicit LogListView( KConfig& cfg, TQWidget *parent=0, const char *name=0 ); + explicit LogListView( KConfig& cfg, TQWidget *tqparent=0, const char *name=0 ); virtual ~LogListView(); void addRevision(const Cervisia::LogInfo& logInfo); diff --git a/cervisia/logmessageedit.cpp b/cervisia/logmessageedit.cpp index f861c873..e97a5d68 100644 --- a/cervisia/logmessageedit.cpp +++ b/cervisia/logmessageedit.cpp @@ -26,8 +26,8 @@ using Cervisia::LogMessageEdit; #include <kaccel.h> -LogMessageEdit::LogMessageEdit(TQWidget* parent) - : KTextEdit(parent) +LogMessageEdit::LogMessageEdit(TQWidget* tqparent) + : KTextEdit(tqparent) , KCompletionBase() , m_completing(false) , m_completionStartPos(0) @@ -69,14 +69,14 @@ void LogMessageEdit::setCompletedItems(const TQStringList&) void LogMessageEdit::keyPressEvent(TQKeyEvent* event) { - bool noModifier = (event->state() == NoButton || + bool noModifier = (event->state() == Qt::NoButton || event->state() == ShiftButton || event->state() == Keypad); if( noModifier ) { TQString keycode = event->text(); - if( !keycode.isEmpty() && keycode.unicode()->isPrint() ) + if( !keycode.isEmpty() && keycode.tqunicode()->isPrint() ) { KTextEdit::keyPressEvent(event); tryCompletion(); @@ -132,8 +132,8 @@ void LogMessageEdit::keyPressEvent(TQKeyEvent* event) } // any other key (except modifiers) will end the text completion - if( event->key() != Qt::Key_Shift && event->key() != Qt::Key_Control && - event->key() != Qt::Key_Alt && event->key() != Qt::Key_Meta ) + if( event->key() != TQt::Key_Shift && event->key() != TQt::Key_Control && + event->key() != TQt::Key_Alt && event->key() != TQt::Key_Meta ) { m_completing = false; setCheckSpellingEnabled(true); @@ -159,7 +159,7 @@ void LogMessageEdit::tryCompletion() if( paragraphText.at(index).isSpace() ) { if( !m_completing ) - m_completionStartPos = paragraphText.findRev(' ', index-1) + 1; + m_completionStartPos = paragraphText.tqfindRev(' ', index-1) + 1; int length = index - m_completionStartPos; TQString word = paragraphText.mid(m_completionStartPos, length); diff --git a/cervisia/logmessageedit.h b/cervisia/logmessageedit.h index c27865b6..4d5321ed 100644 --- a/cervisia/logmessageedit.h +++ b/cervisia/logmessageedit.h @@ -33,9 +33,10 @@ namespace Cervisia class LogMessageEdit : public KTextEdit, public KCompletionBase { Q_OBJECT + TQ_OBJECT public: - explicit LogMessageEdit(TQWidget* parent); + explicit LogMessageEdit(TQWidget* tqparent); virtual void setCompletedText(const TQString& match); virtual void setCompletedItems(const TQStringList& items); diff --git a/cervisia/logplainview.cpp b/cervisia/logplainview.cpp index 413180af..2f965baf 100644 --- a/cervisia/logplainview.cpp +++ b/cervisia/logplainview.cpp @@ -31,9 +31,9 @@ using namespace Cervisia; -LogPlainView::LogPlainView(TQWidget* parent, const char* name) - : KTextBrowser(parent, name) - , m_find(0) +LogPlainView::LogPlainView(TQWidget* tqparent, const char* name) + : KTextBrowser(tqparent, name) + , m_tqfind(0) , m_findPos(0) { setNotifyClick(false); @@ -42,7 +42,7 @@ LogPlainView::LogPlainView(TQWidget* parent, const char* name) LogPlainView::~LogPlainView() { - delete m_find; m_find = 0; + delete m_tqfind; m_tqfind = 0; } @@ -53,7 +53,7 @@ void LogPlainView::addRevision(const LogInfo& logInfo) // assemble revision information lines TQString logEntry; - logEntry += "<b>" + i18n("revision %1").arg(TQStyleSheet::escape(logInfo.m_revision)) + + logEntry += "<b>" + i18n("revision %1").tqarg(TQStyleSheet::escape(logInfo.m_revision)) + "</b>"; logEntry += " [<a href=\"revA#" + TQStyleSheet::escape(logInfo.m_revision) + "\">" + i18n("Select for revision A") + @@ -62,8 +62,8 @@ void LogPlainView::addRevision(const LogInfo& logInfo) i18n("Select for revision B") + "</a>]<br>"; logEntry += "<i>" + - i18n("date: %1; author: %2").arg(TQStyleSheet::escape(logInfo.dateTimeToString())) - .arg(TQStyleSheet::escape(logInfo.m_author)) + + i18n("date: %1; author: %2").tqarg(TQStyleSheet::escape(logInfo.dateTimeToString())) + .tqarg(TQStyleSheet::escape(logInfo.m_author)) + "</i>"; append(logEntry); @@ -107,11 +107,11 @@ void LogPlainView::addRevision(const LogInfo& logInfo) void LogPlainView::searchText(int options, const TQString& pattern) { - m_find = new KFind(pattern, options, this); + m_tqfind = new KFind(pattern, options, this); - connect(m_find, TQT_SIGNAL(highlight(const TQString&, int, int)), + connect(m_tqfind, TQT_SIGNAL(highlight(const TQString&, int, int)), this, TQT_SLOT(searchHighlight(const TQString&, int, int))); - connect(m_find, TQT_SIGNAL(findNext()), + connect(m_tqfind, TQT_SIGNAL(findNext()), this, TQT_SLOT(findNext())); m_findPos = 0; @@ -140,24 +140,24 @@ void LogPlainView::findNext() while( res == KFind::NoMatch && m_findPos < paragraphs() && m_findPos >= 0 ) { - if( m_find->needData() ) + if( m_tqfind->needData() ) { TQString richText = text(m_findPos); - // replace <br/> with '\n' - richText.replace(breakLineTag, "\n"); + // tqreplace <br/> with '\n' + richText.tqreplace(breakLineTag, "\n"); // remove html tags from text - richText.replace(htmlTags, ""); + richText.tqreplace(htmlTags, ""); - m_find->setData(richText); + m_tqfind->setData(richText); } - res = m_find->find(); + res = m_tqfind->find(); if( res == KFind::NoMatch ) { - if( m_find->options() & KFindDialog::FindBackwards ) + if( m_tqfind->options() & KFindDialog::FindBackwards ) --m_findPos; else ++m_findPos; @@ -167,15 +167,15 @@ void LogPlainView::findNext() // reached the end? if( res == KFind::NoMatch ) { - if( m_find->shouldRestart() ) + if( m_tqfind->shouldRestart() ) { m_findPos = 0; findNext(); } else { - delete m_find; - m_find = 0; + delete m_tqfind; + m_tqfind = 0; } } } diff --git a/cervisia/logplainview.h b/cervisia/logplainview.h index 37e60f7b..90e60c69 100644 --- a/cervisia/logplainview.h +++ b/cervisia/logplainview.h @@ -34,9 +34,10 @@ struct LogInfo; class LogPlainView : public KTextBrowser { Q_OBJECT + TQ_OBJECT public: - explicit LogPlainView(TQWidget* parent = 0, const char* name = 0); + explicit LogPlainView(TQWidget* tqparent = 0, const char* name = 0); ~LogPlainView(); void addRevision(const Cervisia::LogInfo& logInfo); @@ -55,7 +56,7 @@ protected: virtual void setSource(const TQString& name); private: - KFind* m_find; + KFind* m_tqfind; int m_findPos; }; diff --git a/cervisia/logtree.cpp b/cervisia/logtree.cpp index d0e8e6d2..9ae65930 100644 --- a/cervisia/logtree.cpp +++ b/cervisia/logtree.cpp @@ -59,8 +59,8 @@ public: }; -LogTreeView::LogTreeView(TQWidget *parent, const char *name) - : TQTable(parent, name) +LogTreeView::LogTreeView(TQWidget *tqparent, const char *name) + : TQTable(tqparent, name) { if (!static_initialized) { @@ -82,7 +82,7 @@ LogTreeView::LogTreeView(TQWidget *parent, const char *name) setLeftMargin(0); setFrameStyle( TQFrame::WinPanel | TQFrame::Sunken ); setBackgroundMode(PaletteBase); - setFocusPolicy(NoFocus); + setFocusPolicy(TQ_NoFocus); currentRow = -1; currentCol = -1; @@ -105,8 +105,8 @@ void LogTreeView::addRevision(const Cervisia::LogInfo& logInfo) // find branch int pos1, pos2; - if ((pos2 = rev.findRev('.')) > 0 && - (pos1 = rev.findRev('.', pos2-1)) > 0) + if ((pos2 = rev.tqfindRev('.')) > 0 && + (pos1 = rev.tqfindRev('.', pos2-1)) > 0) { // e. g. for rev = 1.1.2.3 we have // branchrev = 1.1.2, branchpoint = 1.1 @@ -243,13 +243,13 @@ void LogTreeView::setSelectedPair(TQString selectionA, TQString selectionB) if (oldstate != newstate) { it.current()->selected = newstate; - repaint(false); + tqrepaint(false); } } } -TQSize LogTreeView::sizeHint() const +TQSize LogTreeView::tqsizeHint() const { return TQSize(2 * static_width, 3 * static_height); } @@ -433,8 +433,8 @@ void LogTreeView::paintRevisionCell(TQPainter *p, void LogTreeView::contentsMousePressEvent(TQMouseEvent *e) { - if ( e->button() == MidButton || - e->button() == LeftButton) + if ( e->button() == Qt::MidButton || + e->button() == Qt::LeftButton) { int row = rowAt( e->pos().y() ); int col = columnAt( e->pos().x() ); @@ -446,8 +446,8 @@ void LogTreeView::contentsMousePressEvent(TQMouseEvent *e) { // Change selection for revision B if the middle mouse button or // the left mouse button with the control key was pressed - bool changeRevB = (e->button() == MidButton) || - (e->button() == LeftButton && + bool changeRevB = (e->button() == Qt::MidButton) || + (e->button() == Qt::LeftButton && e->state() & ControlButton); emit revisionClicked(it.current()->m_logInfo.m_revision, changeRevB); diff --git a/cervisia/logtree.h b/cervisia/logtree.h index 360a1a99..0180491d 100644 --- a/cervisia/logtree.h +++ b/cervisia/logtree.h @@ -41,12 +41,13 @@ typedef TQPtrList<LogTreeItem> LogTreeItemList; typedef TQPtrList<LogTreeConnection> LogTreeConnectionList; -class LogTreeView : public QTable +class LogTreeView : public TQTable { Q_OBJECT + TQ_OBJECT public: - explicit LogTreeView( TQWidget *parent=0, const char *name=0 ); + explicit LogTreeView( TQWidget *tqparent=0, const char *name=0 ); void addRevision(const Cervisia::LogInfo& logInfo); void setSelectedPair(TQString selectionA, TQString selectionB); @@ -55,7 +56,7 @@ public: virtual void paintCell(TQPainter *p, int row, int col, const TQRect& cr, bool selected, const TQColorGroup& cg); - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; virtual TQString text(int row, int col) const; diff --git a/cervisia/mergedlg.cpp b/cervisia/mergedlg.cpp index e2b770c6..d0f015ed 100644 --- a/cervisia/mergedlg.cpp +++ b/cervisia/mergedlg.cpp @@ -34,21 +34,21 @@ MergeDialog::MergeDialog(CvsService_stub* service, - TQWidget *parent, const char *name) - : KDialogBase(parent, name, true, i18n("CVS Merge"), + TQWidget *tqparent, const char *name) + : KDialogBase(tqparent, name, true, i18n("CVS Merge"), Ok | Cancel, Ok, true), cvsService(service) { int const iComboBoxMinWidth(30 * fontMetrics().width('0')); - int const iWidgetIndent(style().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0) + 6); + int const iWidgetIndent(tqstyle().tqpixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0) + 6); TQFrame* mainWidget = makeMainWidget(); - TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint()); + TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint()); bybranch_button = new TQRadioButton(i18n("Merge from &branch:"), mainWidget); bybranch_button->setChecked(true); - layout->addWidget(bybranch_button); + tqlayout->addWidget(bybranch_button); branch_combo = new TQComboBox(true, mainWidget); branch_combo->setMinimumWidth(iComboBoxMinWidth); @@ -57,13 +57,13 @@ MergeDialog::MergeDialog(CvsService_stub* service, connect( branch_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(branchButtonClicked()) ); - TQBoxLayout *branchedit_layout = new TQHBoxLayout(layout); + TQBoxLayout *branchedit_layout = new TQHBoxLayout(tqlayout); branchedit_layout->addSpacing(iWidgetIndent); branchedit_layout->addWidget(branch_combo, 2); branchedit_layout->addWidget(branch_button, 0); bytags_button = new TQRadioButton(i18n("Merge &modifications:"), mainWidget); - layout->addWidget(bytags_button); + tqlayout->addWidget(bytags_button); TQLabel *tag1_label = new TQLabel(i18n("between tag: "), mainWidget); tag1_combo = new TQComboBox(true, mainWidget); @@ -77,7 +77,7 @@ MergeDialog::MergeDialog(CvsService_stub* service, connect( tag_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(tagButtonClicked()) ); - TQGridLayout *tagsedit_layout = new TQGridLayout(layout); + TQGridLayout *tagsedit_layout = new TQGridLayout(tqlayout); tagsedit_layout->addColSpacing(0, iWidgetIndent); tagsedit_layout->setColStretch(0, 0); tagsedit_layout->setColStretch(1, 1); diff --git a/cervisia/mergedlg.h b/cervisia/mergedlg.h index 47869b40..58327b74 100644 --- a/cervisia/mergedlg.h +++ b/cervisia/mergedlg.h @@ -34,10 +34,11 @@ class CvsService_stub; class MergeDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: MergeDialog( CvsService_stub* service, - TQWidget *parent=0, const char *name=0 ); + TQWidget *tqparent=0, const char *name=0 ); bool byBranch() const; TQString branch() const; diff --git a/cervisia/misc.cpp b/cervisia/misc.cpp index fe5e5682..a0eb35be 100644 --- a/cervisia/misc.cpp +++ b/cervisia/misc.cpp @@ -60,7 +60,7 @@ static int FindWhiteSpace(const TQString& str, int index) if( index < 0 || index >= length ) return -1; - const TQChar* const startPos = str.unicode(); + const TQChar* const startPos = str.tqunicode(); const TQChar* const endPos = startPos + length; const TQChar* pos = startPos + index; @@ -74,7 +74,7 @@ static int FindWhiteSpace(const TQString& str, int index) static const TQStringList FetchBranchesAndTags(const TQString& searchedType, CvsService_stub* cvsService, - TQWidget* parent) + TQWidget* tqparent) { TQStringList branchOrTagList; @@ -82,7 +82,7 @@ static const TQStringList FetchBranchesAndTags(const TQString& searchedType, if( !cvsService->ok() ) return branchOrTagList; - ProgressDialog dlg(parent, "Status", job, TQString::null, i18n("CVS Status")); + ProgressDialog dlg(tqparent, "tqStatus", job, TQString(), i18n("CVS tqStatus")); if( dlg.execute() ) { @@ -95,14 +95,14 @@ static const TQStringList FetchBranchesAndTags(const TQString& searchedType, continue; if( (wsPos = FindWhiteSpace(line, 2)) < 0 ) continue; - if( (bracketPos = line.find('(', wsPos + 1)) < 0 ) + if( (bracketPos = line.tqfind('(', wsPos + 1)) < 0 ) continue; - if( (colonPos = line.find(':', bracketPos + 1)) < 0 ) + if( (colonPos = line.tqfind(':', bracketPos + 1)) < 0 ) continue; const TQString tag = line.mid(1, wsPos - 1); const TQString type = line.mid(bracketPos + 1, colonPos - bracketPos - 1); - if( type == searchedType && !branchOrTagList.contains(tag) ) + if( type == searchedType && !branchOrTagList.tqcontains(tag) ) branchOrTagList.push_back(tag); } @@ -122,7 +122,7 @@ bool Cervisia::IsValidTag(const TQString& tag) for( uint i = 1; i < tag.length(); ++i ) { - if( !isgraph(tag[i].latin1()) || prohibitedChars.contains(tag[i]) ) + if( !isgraph(tag[i].latin1()) || prohibitedChars.tqcontains(tag[i]) ) return false; } @@ -142,7 +142,7 @@ TQString Cervisia::UserName() // 2. Try to retrieve the information from the system struct passwd* pw = getpwuid(getuid()); if( !pw ) - return TQString::null; + return TQString(); char hostname[512]; hostname[0] = '\0'; @@ -205,7 +205,7 @@ TQString Cervisia::NormalizeRepository(const TQString& repository) } -bool Cervisia::CheckOverwrite(const TQString& fileName, TQWidget* parent) +bool Cervisia::CheckOverwrite(const TQString& fileName, TQWidget* tqparent) { bool result = true; @@ -214,8 +214,8 @@ bool Cervisia::CheckOverwrite(const TQString& fileName, TQWidget* parent) // does the file already exist? if( fi.exists() ) { - result = (KMessageBox::warningContinueCancel(parent, - i18n("A file named \"%1\" already exists. Are you sure you want to overwrite it?").arg(fileName), + result = (KMessageBox::warningContinueCancel(tqparent, + i18n("A file named \"%1\" already exists. Are you sure you want to overwrite it?").tqarg(fileName), i18n("Overwrite File?"), KGuiItem(i18n("&Overwrite"), "filesave", i18n("Overwrite the file"))) == KMessageBox::Continue); } @@ -248,7 +248,7 @@ TQStringList splitLine(TQString line, char delim) TQStringList list; line = line.simplifyWhiteSpace(); - while ((pos = line.find(delim)) != -1) + while ((pos = line.tqfind(delim)) != -1) { list.append(line.left(pos)); line = line.mid(pos+1, line.length()-pos-1); @@ -259,17 +259,17 @@ TQStringList splitLine(TQString line, char delim) } -const TQStringList fetchBranches(CvsService_stub* cvsService, TQWidget* parent) +const TQStringList fetchBranches(CvsService_stub* cvsService, TQWidget* tqparent) { - return FetchBranchesAndTags(TQString::fromLatin1("branch"), cvsService, - parent); + return FetchBranchesAndTags(TQString::tqfromLatin1("branch"), cvsService, + tqparent); } -const TQStringList fetchTags(CvsService_stub* cvsService, TQWidget* parent) +const TQStringList fetchTags(CvsService_stub* cvsService, TQWidget* tqparent) { - return FetchBranchesAndTags(TQString::fromLatin1("revision"), cvsService, - parent); + return FetchBranchesAndTags(TQString::tqfromLatin1("revision"), cvsService, + tqparent); } @@ -292,7 +292,7 @@ TQString tempFileName(const TQString& suffix) if (!tempFiles) tempFiles = new TQStringList; - KTempFile f(TQString::null, suffix); + KTempFile f(TQString(), suffix); tempFiles->append(f.name()); return f.name(); } @@ -309,12 +309,12 @@ int compareRevisions(const TQString& rev1, const TQString& rev2) int startPos2(0); while (startPos1 < length1 && startPos2 < length2) { - int pos1(rev1.find('.', startPos1)); + int pos1(rev1.tqfind('.', startPos1)); if (pos1 < 0) pos1 = length1; const int partLength1(pos1 - startPos1); - int pos2(rev2.find('.', startPos2)); + int pos2(rev2.tqfind('.', startPos2)); if (pos2 < 0) pos2 = length2; const int partLength2(pos2 - startPos2); diff --git a/cervisia/misc.h b/cervisia/misc.h index 803c8131..c3715cee 100644 --- a/cervisia/misc.h +++ b/cervisia/misc.h @@ -50,7 +50,7 @@ TQString UserName(); */ TQString NormalizeRepository(const TQString& repository); -bool CheckOverwrite(const TQString& fileName, TQWidget* parent=0); +bool CheckOverwrite(const TQString& fileName, TQWidget* tqparent=0); } @@ -61,8 +61,8 @@ TQStringList splitLine(TQString, char delim=' '); TQString tempFileName(const TQString& suffix); void cleanupTempFiles(); -const TQStringList fetchBranches(CvsService_stub* cvsService, TQWidget* parent); -const TQStringList fetchTags(CvsService_stub* cvsService, TQWidget* parent); +const TQStringList fetchBranches(CvsService_stub* cvsService, TQWidget* tqparent); +const TQStringList fetchTags(CvsService_stub* cvsService, TQWidget* tqparent); /** * Compares two revision numbers. diff --git a/cervisia/patchoptiondlg.cpp b/cervisia/patchoptiondlg.cpp index b764c57c..a65aea6c 100644 --- a/cervisia/patchoptiondlg.cpp +++ b/cervisia/patchoptiondlg.cpp @@ -28,8 +28,8 @@ using Cervisia::PatchOptionDialog; #include <klocale.h> -PatchOptionDialog::PatchOptionDialog(TQWidget* parent, const char* name) - : KDialogBase(parent, name, true/*modal*/, TQString::null, +PatchOptionDialog::PatchOptionDialog(TQWidget* tqparent, const char* name) + : KDialogBase(tqparent, name, true/*modal*/, TQString(), Ok | Cancel | Help, Ok, true/*separator*/) { TQFrame* mainWidget = makeMainWidget(); diff --git a/cervisia/patchoptiondlg.h b/cervisia/patchoptiondlg.h index a518b910..20afb4b7 100644 --- a/cervisia/patchoptiondlg.h +++ b/cervisia/patchoptiondlg.h @@ -34,9 +34,10 @@ namespace Cervisia class PatchOptionDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - explicit PatchOptionDialog(TQWidget* parent = 0, const char* name = 0); + explicit PatchOptionDialog(TQWidget* tqparent = 0, const char* name = 0); virtual ~PatchOptionDialog(); TQString diffOptions() const; diff --git a/cervisia/progressdlg.cpp b/cervisia/progressdlg.cpp index a7e34018..d77c25f2 100644 --- a/cervisia/progressdlg.cpp +++ b/cervisia/progressdlg.cpp @@ -52,10 +52,10 @@ struct ProgressDialog::Private }; -ProgressDialog::ProgressDialog(TQWidget* parent, const TQString& heading, +ProgressDialog::ProgressDialog(TQWidget* tqparent, const TQString& heading, const DCOPRef& job, const TQString& errorIndicator, const TQString& caption) - : KDialogBase(parent, 0, true, caption, Cancel, Cancel, true) + : KDialogBase(tqparent, 0, true, caption, Cancel, Cancel, true) , DCOPObject() , d(new Private) { @@ -90,8 +90,8 @@ void ProgressDialog::setupGui(const TQString& heading) TQHBoxLayout* hboxLayout = new TQHBoxLayout(headingBox); TQLabel* textLabel = new TQLabel(heading, headingBox); - textLabel->setMinimumWidth(textLabel->sizeHint().width()); - textLabel->setFixedHeight(textLabel->sizeHint().height()); + textLabel->setMinimumWidth(textLabel->tqsizeHint().width()); + textLabel->setFixedHeight(textLabel->tqsizeHint().height()); hboxLayout->addWidget(textLabel); hboxLayout->addStretch(); @@ -104,7 +104,7 @@ void ProgressDialog::setupGui(const TQString& heading) TQFontMetrics fm(d->resultbox->fontMetrics()); d->resultbox->setMinimumSize(fm.width("0")*70, fm.lineSpacing()*8); - resize(sizeHint()); + resize(tqsizeHint()); } @@ -252,7 +252,7 @@ void ProgressDialog::startGuiPart() void ProgressDialog::processOutput() { int pos; - while( (pos = d->buffer.find('\n')) != -1 ) + while( (pos = d->buffer.tqfind('\n')) != -1 ) { TQString item = d->buffer.left(pos); if( item.startsWith(d->errorId1) || diff --git a/cervisia/progressdlg.h b/cervisia/progressdlg.h index feb7f8d9..6eb71d88 100644 --- a/cervisia/progressdlg.h +++ b/cervisia/progressdlg.h @@ -32,9 +32,10 @@ class ProgressDialog : public KDialogBase, public DCOPObject { K_DCOP Q_OBJECT +// TQ_OBJECT public: - ProgressDialog(TQWidget* parent, const TQString& heading, const DCOPRef& job, + ProgressDialog(TQWidget* tqparent, const TQString& heading, const DCOPRef& job, const TQString& errorIndicator, const TQString& caption = ""); ~ProgressDialog(); diff --git a/cervisia/protocolview.cpp b/cervisia/protocolview.cpp index 2de8405f..b4456331 100644 --- a/cervisia/protocolview.cpp +++ b/cervisia/protocolview.cpp @@ -32,15 +32,15 @@ #include "cvsjob_stub.h" -ProtocolView::ProtocolView(const TQCString& appId, TQWidget *parent, const char *name) - : TQTextEdit(parent, name) +ProtocolView::ProtocolView(const TQCString& appId, TQWidget *tqparent, const char *name) + : TQTextEdit(tqparent, name) , job(0) , m_isUpdateJob(false) { setReadOnly(true); setUndoRedoEnabled(false); setTabChangesFocus(true); - setTextFormat(Qt::LogText); + setTextFormat(TQt::LogText); KConfig *config = CervisiaPart::config(); config->setGroup("LookAndFeel"); @@ -124,7 +124,7 @@ void ProtocolView::slotJobExited(bool normalExit, int exitStatus) if( normalExit ) { if( exitStatus ) - msg = i18n("[Exited with status %1]\n").arg(exitStatus); + msg = i18n("[Exited with status %1]\n").tqarg(exitStatus); else msg = i18n("[Finished]\n"); } @@ -142,7 +142,7 @@ void ProtocolView::slotJobExited(bool normalExit, int exitStatus) void ProtocolView::processOutput() { int pos; - while ( (pos = buf.find('\n')) != -1) + while ( (pos = buf.tqfind('\n')) != -1) { TQString line = buf.left(pos); if (!line.isEmpty()) @@ -180,8 +180,8 @@ void ProtocolView::appendLine(const TQString &line) color = remoteChangeColor; append(color.isValid() - ? TQString("<font color=\"%1\"><b>%2</b></font>").arg(color.name()) - .arg(escapedLine) + ? TQString("<font color=\"%1\"><b>%2</b></font>").tqarg(color.name()) + .tqarg(escapedLine) : escapedLine); } diff --git a/cervisia/protocolview.h b/cervisia/protocolview.h index b2e69669..aaf1e797 100644 --- a/cervisia/protocolview.h +++ b/cervisia/protocolview.h @@ -34,9 +34,10 @@ class ProtocolView : public TQTextEdit, public DCOPObject { K_DCOP Q_OBJECT +// TQ_OBJECT public: - explicit ProtocolView(const TQCString& appId, TQWidget *parent=0, const char *name=0); + explicit ProtocolView(const TQCString& appId, TQWidget *tqparent=0, const char *name=0); ~ProtocolView(); bool startJob(bool isUpdateJob = false); diff --git a/cervisia/qttableview.cpp b/cervisia/qttableview.cpp index d62557a9..b569b403 100644 --- a/cervisia/qttableview.cpp +++ b/cervisia/qttableview.cpp @@ -1,13 +1,13 @@ /********************************************************************** ** $Id$ ** -** Implementation of QtTableView class +** Implementation of TQtTableView class ** ** Created : 941115 ** ** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. ** -** This file contains a class moved out of the Qt GUI Toolkit API. It +** This file contains a class moved out of the TQt GUI Toolkit API. It ** may be used, distributed and modified without limitation. ** **********************************************************************/ @@ -33,31 +33,31 @@ enum ScrollBarDirtyFlags { }; -#define HSBEXT horizontalScrollBar()->sizeHint().height() -#define VSBEXT verticalScrollBar()->sizeHint().width() +#define HSBEXT horizontalScrollBar()->tqsizeHint().height() +#define VSBEXT verticalScrollBar()->tqsizeHint().width() -class QCornerSquare : public QWidget // internal class +class TQCornerSquare : public TQWidget // internal class { public: - QCornerSquare( TQWidget *, const char* = 0 ); + TQCornerSquare( TQWidget *, const char* = 0 ); void paintEvent( TQPaintEvent * ); }; -QCornerSquare::QCornerSquare( TQWidget *parent, const char *name ) - : TQWidget( parent, name ) +TQCornerSquare::TQCornerSquare( TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ) { } -void QCornerSquare::paintEvent( TQPaintEvent * ) +void TQCornerSquare::paintEvent( TQPaintEvent * ) { } // NOT REVISED /*! - \class QtTableView qttableview.h - \brief The QtTableView class provides an abstract base for tables. + \class TQtTableView qttableview.h + \brief The TQtTableView class provides an abstract base for tables. \obsolete @@ -71,7 +71,7 @@ void QCornerSquare::paintEvent( TQPaintEvent * ) call to setTableFlags(), some table content manipulation and an implementation of paintCell(). Subclasses that need cells with variable width or height must reimplement cellHeight() and/or - cellWidth(). Use updateTableSize() to tell QtTableView when the + cellWidth(). Use updateTableSize() to tell TQtTableView when the width or height has changed. When you read this documentation, it is important to understand the @@ -87,7 +87,7 @@ void QCornerSquare::paintEvent( TQPaintEvent * ) used by functions such as setXOffset() or maxYOffset(). \i The \e widget coordinates. (0,0) is the top-left corner of the widget, - \e including the frame. They are used by functions such as repaint(). + \e including the frame. They are used by functions such as tqrepaint(). \i The \e view coordinates. (0,0) is the top-left corner of the view, \e excluding the frame. This is the least-used coordinate system; it is used by @@ -114,17 +114,17 @@ void QCornerSquare::paintEvent( TQPaintEvent * ) more bugs than expected and our analysis indicates that the widget's very flexibility is the problem. If TQScrollView or TQListBox can easily be made to do the job you need, we recommend subclassing - those widgets rather than QtTableView. In addition, TQScrollView makes - it easy to have child widgets inside tables, which QtTableView + those widgets rather than TQtTableView. In addition, TQScrollView makes + it easy to have child widgets inside tables, which TQtTableView doesn't support at all. - \sa QScrollView + \sa TQScrollView \link guibooks.html#fowler GUI Design Handbook: Table\endlink */ /*! - Constructs a table view. The \a parent, \a name and \f arguments + Constructs a table view. The \a tqparent, \a name and \f arguments are passed to the TQFrame constructor. The \link setTableFlags() table flags\endlink are all cleared (set to 0). @@ -134,7 +134,7 @@ void QCornerSquare::paintEvent( TQPaintEvent * ) The \link setCellHeight() cell height\endlink and \link setCellWidth() cell width\endlink are set to 0. - Frame line shapes (TQFrame::HLink and TQFrame::VLine) are disallowed; + Frame line tqshapes (TQFrame::HLink and TQFrame::VLine) are disallowed; see TQFrame::setFrameStyle(). Note that the \a f argument is \e not \link setTableFlags() table @@ -143,8 +143,8 @@ void QCornerSquare::paintEvent( TQPaintEvent * ) */ -QtTableView::QtTableView( TQWidget *parent, const char *name, WFlags f ) - : TQFrame( parent, name, f ) +TQtTableView::TQtTableView( TQWidget *tqparent, const char *name, WFlags f ) + : TQFrame( tqparent, name, f ) { nRows = nCols = 0; // zero rows/cols xCellOffs = yCellOffs = 0; // zero offset @@ -168,7 +168,7 @@ QtTableView::QtTableView( TQWidget *parent, const char *name, WFlags f ) Destroys the table view. */ -QtTableView::~QtTableView() +TQtTableView::~TQtTableView() { delete vScrollBar; delete hScrollBar; @@ -182,7 +182,7 @@ QtTableView::~QtTableView() \sa setPalette() */ -void QtTableView::setBackgroundColor( const TQColor &c ) +void TQtTableView::setBackgroundColor( const TQColor &c ) { TQWidget::setBackgroundColor( c ); } @@ -190,7 +190,7 @@ void QtTableView::setBackgroundColor( const TQColor &c ) /*!\reimp */ -void QtTableView::setPalette( const TQPalette &p ) +void TQtTableView::setPalette( const TQPalette &p ) { TQWidget::setPalette( p ); } @@ -198,7 +198,7 @@ void QtTableView::setPalette( const TQPalette &p ) /*!\reimp */ -void QtTableView::show() +void TQtTableView::show() { showOrHideScrollBars(); TQWidget::show(); @@ -206,7 +206,7 @@ void QtTableView::show() /*! - \overload void QtTableView::repaint( bool erase ) + \overload void TQtTableView::tqrepaint( bool erase ) Repaints the entire view. */ @@ -220,16 +220,16 @@ void QtTableView::show() If \a w is negative, it is replaced with <code>width() - x</code>. If \a h is negative, it is replaced with <code>height() - y</code>. - Doing a repaint() usually is faster than doing an update(), but + Doing a tqrepaint() usually is faster than doing an update(), but calling update() many times in a row will generate a single paint event. - At present, QtTableView is the only widget that reimplements \link - TQWidget::repaint() repaint()\endlink. It does this because by - clearing and then repainting one cell at at time, it can make the + At present, TQtTableView is the only widget that reimplements \link + TQWidget::tqrepaint() tqrepaint()\endlink. It does this because by + clearing and then tqrepainting one cell at at time, it can make the screen flicker less than it would otherwise. */ -void QtTableView::repaint( int x, int y, int w, int h, bool erase ) +void TQtTableView::tqrepaint( int x, int y, int w, int h, bool erase ) { if ( !isVisible() || testWState(WState_BlockUpdates) ) return; @@ -248,14 +248,14 @@ void QtTableView::repaint( int x, int y, int w, int h, bool erase ) } /*! - \overload void QtTableView::repaint( const TQRect &r, bool erase ) + \overload void TQtTableView::tqrepaint( const TQRect &r, bool erase ) Replaints rectangle \a r. If \a erase is TRUE draws the background using the palette's background. */ /*! - \fn int QtTableView::numRows() const + \fn int TQtTableView::numRows() const Returns the number of rows in the table. \sa numCols(), setNumRows() */ @@ -264,16 +264,16 @@ void QtTableView::repaint( int x, int y, int w, int h, bool erase ) Sets the number of rows of the table to \a rows (must be non-negative). Does not change topCell(). - The table repaints itself automatically if autoUpdate() is set. + The table tqrepaints itself automatically if autoUpdate() is set. \sa numCols(), setNumCols(), numRows() */ -void QtTableView::setNumRows( int rows ) +void TQtTableView::setNumRows( int rows ) { if ( rows < 0 ) { -#if defined(QT_CHECK_RANGE) - qWarning( "QtTableView::setNumRows: (%s) Negative argument %d.", +#if defined(TQT_CHECK_RANGE) + qWarning( "TQtTableView::setNumRows: (%s) Negative argument %d.", name( "unnamed" ), rows ); #endif return; @@ -287,7 +287,7 @@ void QtTableView::setNumRows( int rows ) nRows = rows; if ( autoUpdate() && isVisible() && ( oldLastVisible != lastRowVisible() || oldTopCell != topCell() ) ) - repaint( oldTopCell != topCell() ); + tqrepaint( oldTopCell != topCell() ); } else { // Be more careful - if destructing, bad things might happen. nRows = rows; @@ -297,7 +297,7 @@ void QtTableView::setNumRows( int rows ) } /*! - \fn int QtTableView::numCols() const + \fn int TQtTableView::numCols() const Returns the number of columns in the table. \sa numRows(), setNumCols() */ @@ -306,16 +306,16 @@ void QtTableView::setNumRows( int rows ) Sets the number of columns of the table to \a cols (must be non-negative). Does not change leftCell(). - The table repaints itself automatically if autoUpdate() is set. + The table tqrepaints itself automatically if autoUpdate() is set. \sa numCols(), numRows(), setNumRows() */ -void QtTableView::setNumCols( int cols ) +void TQtTableView::setNumCols( int cols ) { if ( cols < 0 ) { -#if defined(QT_CHECK_RANGE) - qWarning( "QtTableView::setNumCols: (%s) Negative argument %d.", +#if defined(TQT_CHECK_RANGE) + qWarning( "TQtTableView::setNumCols: (%s) Negative argument %d.", name( "unnamed" ), cols ); #endif return; @@ -327,7 +327,7 @@ void QtTableView::setNumCols( int cols ) if ( autoUpdate() && isVisible() ) { int maxCol = lastColVisible(); if ( maxCol >= oldCols || maxCol >= nCols ) - repaint(); + tqrepaint(); } updateScrollBars( horRange ); updateFrameSize(); @@ -335,7 +335,7 @@ void QtTableView::setNumCols( int cols ) /*! - \fn int QtTableView::topCell() const + \fn int TQtTableView::topCell() const Returns the index of the first row in the table that is visible in the view. The index of the first row is 0. \sa leftCell(), setTopCell() @@ -347,14 +347,14 @@ void QtTableView::setNumCols( int cols ) \sa setYOffset(), setTopLeftCell(), setLeftCell() */ -void QtTableView::setTopCell( int row ) +void TQtTableView::setTopCell( int row ) { setTopLeftCell( row, -1 ); return; } /*! - \fn int QtTableView::leftCell() const + \fn int TQtTableView::leftCell() const Returns the index of the first column in the table that is visible in the view. The index of the very leftmost column is 0. \sa topCell(), setLeftCell() @@ -366,7 +366,7 @@ void QtTableView::setTopCell( int row ) \sa setXOffset(), setTopLeftCell(), setTopCell() */ -void QtTableView::setLeftCell( int col ) +void TQtTableView::setLeftCell( int col ) { setTopLeftCell( -1, col ); return; @@ -379,7 +379,7 @@ void QtTableView::setLeftCell( int col ) \sa setLeftCell(), setTopCell(), setOffset() */ -void QtTableView::setTopLeftCell( int row, int col ) +void TQtTableView::setTopLeftCell( int row, int col ) { int newX = xOffs; int newY = yOffs; @@ -411,7 +411,7 @@ void QtTableView::setTopLeftCell( int row, int col ) /*! - \fn int QtTableView::xOffset() const + \fn int TQtTableView::xOffset() const Returns the x coordinate in \e table coordinates of the pixel that is currently on the left edge of the view. @@ -428,13 +428,13 @@ void QtTableView::setTopLeftCell( int row, int col ) \sa xOffset(), setYOffset(), setOffset(), setLeftCell() */ -void QtTableView::setXOffset( int x ) +void TQtTableView::setXOffset( int x ) { setOffset( x, yOffset() ); } /*! - \fn int QtTableView::yOffset() const + \fn int TQtTableView::yOffset() const Returns the y coordinate in \e table coordinates of the pixel that is currently on the top edge of the view. @@ -453,7 +453,7 @@ void QtTableView::setXOffset( int x ) \sa yOffset(), setXOffset(), setOffset(), setTopCell() */ -void QtTableView::setYOffset( int y ) +void TQtTableView::setYOffset( int y ) { setOffset( xOffset(), y ); } @@ -469,7 +469,7 @@ void QtTableView::setYOffset( int y ) \sa xOffset(), yOffset(), setXOffset(), setYOffset(), setTopLeftCell() */ -void QtTableView::setOffset( int x, int y, bool updateScrBars ) +void TQtTableView::setOffset( int x, int y, bool updateScrBars ) { if ( (!testTableFlags(Tbl_snapToHGrid) || xCellDelta == 0) && (!testTableFlags(Tbl_snapToVGrid) || yCellDelta == 0) && @@ -541,7 +541,7 @@ void QtTableView::setOffset( int x, int y, bool updateScrBars ) /*! - \overload int QtTableView::cellWidth() const + \overload int TQtTableView::cellWidth() const Returns the column width in pixels. Returns 0 if the columns have variable widths. @@ -559,7 +559,7 @@ void QtTableView::setOffset( int x, int y, bool updateScrBars ) \sa setCellWidth(), cellHeight(), totalWidth(), updateTableSize() */ -int QtTableView::cellWidth( int ) +int TQtTableView::cellWidth( int ) { return cellW; } @@ -569,19 +569,19 @@ int QtTableView::cellWidth( int ) Sets the width in pixels of the table cells to \a cellWidth. Setting it to 0 means that the column width is variable. When - set to 0 (this is the default) QtTableView calls the virtual function + set to 0 (this is the default) TQtTableView calls the virtual function cellWidth() to get the width. \sa cellWidth(), setCellHeight(), totalWidth(), numCols() */ -void QtTableView::setCellWidth( int cellWidth ) +void TQtTableView::setCellWidth( int cellWidth ) { if ( cellW == cellWidth ) return; -#if defined(QT_CHECK_RANGE) +#if defined(TQT_CHECK_RANGE) if ( cellWidth < 0 || cellWidth > SHRT_MAX ) { - qWarning( "QtTableView::setCellWidth: (%s) Argument out of range (%d)", + qWarning( "TQtTableView::setCellWidth: (%s) Argument out of range (%d)", name( "unnamed" ), cellWidth ); return; } @@ -590,12 +590,12 @@ void QtTableView::setCellWidth( int cellWidth ) updateScrollBars( horSteps | horRange ); if ( autoUpdate() && isVisible() ) - repaint(); + tqrepaint(); } /*! - \overload int QtTableView::cellHeight() const + \overload int TQtTableView::cellHeight() const Returns the row height, in pixels. Returns 0 if the rows have variable heights. @@ -614,7 +614,7 @@ void QtTableView::setCellWidth( int cellWidth ) \sa setCellHeight(), cellWidth(), totalHeight() */ -int QtTableView::cellHeight( int ) +int TQtTableView::cellHeight( int ) { return cellH; } @@ -623,26 +623,26 @@ int QtTableView::cellHeight( int ) Sets the height in pixels of the table cells to \a cellHeight. Setting it to 0 means that the row height is variable. When set - to 0 (this is the default), QtTableView calls the virtual function + to 0 (this is the default), TQtTableView calls the virtual function cellHeight() to get the height. \sa cellHeight(), setCellWidth(), totalHeight(), numRows() */ -void QtTableView::setCellHeight( int cellHeight ) +void TQtTableView::setCellHeight( int cellHeight ) { if ( cellH == cellHeight ) return; -#if defined(QT_CHECK_RANGE) +#if defined(TQT_CHECK_RANGE) if ( cellHeight < 0 || cellHeight > SHRT_MAX ) { - qWarning( "QtTableView::setCellHeight: (%s) Argument out of range (%d)", + qWarning( "TQtTableView::setCellHeight: (%s) Argument out of range (%d)", name( "unnamed" ), cellHeight ); return; } #endif cellH = (short)cellHeight; if ( autoUpdate() && isVisible() ) - repaint(); + tqrepaint(); updateScrollBars( verSteps | verRange ); } @@ -658,7 +658,7 @@ void QtTableView::setCellHeight( int cellHeight ) \sa cellWidth(), totalHeight() */ -int QtTableView::totalWidth() +int TQtTableView::totalWidth() { if ( cellW ) { return cellW*nCols; @@ -682,7 +682,7 @@ int QtTableView::totalWidth() \sa cellHeight(), totalWidth() */ -int QtTableView::totalHeight() +int TQtTableView::totalHeight() { if ( cellH ) { return cellH*nRows; @@ -696,7 +696,7 @@ int QtTableView::totalHeight() /*! - \fn uint QtTableView::tableFlags() const + \fn uint TQtTableView::tableFlags() const Returns the union of the table flags that are currently set. @@ -704,7 +704,7 @@ int QtTableView::totalHeight() */ /*! - \fn bool QtTableView::testTableFlags( uint f ) const + \fn bool TQtTableView::testTableFlags( uint f ) const Returns TRUE if any of the table flags in \a f are currently set, otherwise FALSE. @@ -716,7 +716,7 @@ int QtTableView::totalHeight() Sets the table flags to \a f. If a flag setting changes the appearance of the table, the table is - repainted if - and only if - autoUpdate() is TRUE. + tqrepainted if - and only if - autoUpdate() is TRUE. The table flags are mostly single bits, though there are some multibit flags for convenience. Here is a complete list: @@ -777,7 +777,7 @@ int QtTableView::totalHeight() \sa clearTableFlags(), testTableFlags(), tableFlags() */ -void QtTableView::setTableFlags( uint f ) +void TQtTableView::setTableFlags( uint f ) { f = (f ^ tFlags) & f; // clear flags already set tFlags |= f; @@ -785,7 +785,7 @@ void QtTableView::setTableFlags( uint f ) bool updateOn = autoUpdate(); setAutoUpdate( FALSE ); - uint repaintMask = Tbl_cutCellsV | Tbl_cutCellsH; + uint tqrepaintMask = Tbl_cutCellsV | Tbl_cutCellsH; if ( f & Tbl_vScrollBar ) { setVerScrollBar( TRUE ); @@ -816,15 +816,15 @@ void QtTableView::setTableFlags( uint f ) (f & Tbl_snapToVGrid) != 0 && yCellDelta != 0 ) { snapToGrid( (f & Tbl_snapToHGrid) != 0, // do snapping (f & Tbl_snapToVGrid) != 0 ); - repaintMask |= Tbl_snapToGrid; // repaint table + tqrepaintMask |= Tbl_snapToGrid; // tqrepaint table } } if ( updateOn ) { setAutoUpdate( TRUE ); updateScrollBars(); - if ( isVisible() && (f & repaintMask) ) - repaint(); + if ( isVisible() && (f & tqrepaintMask) ) + tqrepaint(); } } @@ -843,7 +843,7 @@ void QtTableView::setTableFlags( uint f ) \sa setTableFlags(), testTableFlags(), tableFlags() */ -void QtTableView::clearTableFlags( uint f ) +void TQtTableView::clearTableFlags( uint f ) { f = (f ^ ~tFlags) & f; // clear flags that are already 0 tFlags &= ~f; @@ -851,7 +851,7 @@ void QtTableView::clearTableFlags( uint f ) bool updateOn = autoUpdate(); setAutoUpdate( FALSE ); - uint repaintMask = Tbl_cutCellsV | Tbl_cutCellsH; + uint tqrepaintMask = Tbl_cutCellsV | Tbl_cutCellsH; if ( f & Tbl_vScrollBar ) { setVerScrollBar( FALSE ); @@ -863,7 +863,7 @@ void QtTableView::clearTableFlags( uint f ) int maxX = maxXOffset(); if ( xOffs > maxX ) { setOffset( maxX, yOffs ); - repaintMask |= Tbl_scrollLastHCell; + tqrepaintMask |= Tbl_scrollLastHCell; } updateScrollBars( horRange ); } @@ -871,7 +871,7 @@ void QtTableView::clearTableFlags( uint f ) int maxY = maxYOffset(); if ( yOffs > maxY ) { setOffset( xOffs, maxY ); - repaintMask |= Tbl_scrollLastVCell; + tqrepaintMask |= Tbl_scrollLastVCell; } updateScrollBars( verRange ); } @@ -880,7 +880,7 @@ void QtTableView::clearTableFlags( uint f ) (f & Tbl_smoothVScrolling) != 0 && yCellDelta != 0 ) { snapToGrid( (f & Tbl_smoothHScrolling) != 0, // do snapping (f & Tbl_smoothVScrolling) != 0 ); - repaintMask |= Tbl_smoothScrolling; // repaint table + tqrepaintMask |= Tbl_smoothScrolling; // tqrepaint table } } if ( f & Tbl_snapToHGrid ) { @@ -892,15 +892,15 @@ void QtTableView::clearTableFlags( uint f ) if ( updateOn ) { setAutoUpdate( TRUE ); updateScrollBars(); // returns immediately if nothing to do - if ( isVisible() && (f & repaintMask) ) - repaint(); + if ( isVisible() && (f & tqrepaintMask) ) + tqrepaint(); } } /*! - \fn bool QtTableView::autoUpdate() const + \fn bool TQtTableView::autoUpdate() const Returns TRUE if the view updates itself automatically whenever it is changed in some way. @@ -915,23 +915,23 @@ void QtTableView::clearTableFlags( uint f ) automatically whenever it has changed in some way (for example, when a \link setTableFlags() flag\endlink is changed). - If \a enable is FALSE, the view does NOT repaint itself or update + If \a enable is FALSE, the view does NOT tqrepaint itself or update its internal state variables when it is changed. This can be useful to avoid flicker during large changes and is singularly useless otherwise. Disable auto-update, do the changes, re-enable - auto-update and call repaint(). + auto-update and call tqrepaint(). \warning Do not leave the view in this state for a long time (i.e., between events). If, for example, the user interacts with the view when auto-update is off, strange things can happen. - Setting auto-update to TRUE does not repaint the view; you must call - repaint() to do this. + Setting auto-update to TRUE does not tqrepaint the view; you must call + tqrepaint() to do this. - \sa autoUpdate(), repaint() + \sa autoUpdate(), tqrepaint() */ -void QtTableView::setAutoUpdate( bool enable ) +void TQtTableView::setAutoUpdate( bool enable ) { if ( isUpdatesEnabled() == enable ) return; @@ -947,12 +947,12 @@ void QtTableView::setAutoUpdate( bool enable ) Repaints the cell at row \a row, column \a col if it is inside the view. If \a erase is TRUE, the relevant part of the view is cleared to the - background color/pixmap before the contents are repainted. + background color/pixmap before the contents are tqrepainted. \sa isVisible() */ -void QtTableView::updateCell( int row, int col, bool erase ) +void TQtTableView::updateCell( int row, int col, bool erase ) { int xPos, yPos; if ( !colXPos( col, &xPos ) ) @@ -962,12 +962,12 @@ void QtTableView::updateCell( int row, int col, bool erase ) TQRect uR = TQRect( xPos, yPos, cellW ? cellW : cellWidth(col), cellH ? cellH : cellHeight(row) ); - repaint( uR.intersect(viewRect()), erase ); + tqrepaint( uR.intersect(viewRect()), erase ); } /*! - \fn TQRect QtTableView::cellUpdateRect() const + \fn TQRect TQtTableView::cellUpdateRect() const This function should be called only from the paintCell() function in subclasses. It returns the portion of a cell that actually needs to be @@ -981,7 +981,7 @@ void QtTableView::updateCell( int row, int col, bool erase ) frame, in \e widget coordinates. */ -TQRect QtTableView::viewRect() const +TQRect TQtTableView::viewRect() const { return TQRect( frameWidth(), frameWidth(), viewWidth(), viewHeight() ); } @@ -997,7 +997,7 @@ TQRect QtTableView::viewRect() const \sa lastColVisible() */ -int QtTableView::lastRowVisible() const +int TQtTableView::lastRowVisible() const { int cellMaxY; int row = findRawRow( maxViewY(), &cellMaxY ); @@ -1024,7 +1024,7 @@ int QtTableView::lastRowVisible() const \sa lastRowVisible() */ -int QtTableView::lastColVisible() const +int TQtTableView::lastColVisible() const { int cellMaxX; int col = findRawCol( maxViewX(), &cellMaxX ); @@ -1046,7 +1046,7 @@ int QtTableView::lastColVisible() const \sa colIsVisible() */ -bool QtTableView::rowIsVisible( int row ) const +bool TQtTableView::rowIsVisible( int row ) const { return rowYPos( row, 0 ); } @@ -1056,7 +1056,7 @@ bool QtTableView::rowIsVisible( int row ) const \sa rowIsVisible() */ -bool QtTableView::colIsVisible( int col ) const +bool TQtTableView::colIsVisible( int col ) const { return colXPos( col, 0 ); } @@ -1068,11 +1068,11 @@ bool QtTableView::colIsVisible( int col ) const bottom left corner between the two scroll bars with an empty widget. */ -void QtTableView::coverCornerSquare( bool enable ) +void TQtTableView::coverCornerSquare( bool enable ) { coveringCornerSquare = enable; if ( !cornerSquare && enable ) { - cornerSquare = new QCornerSquare( this ); + cornerSquare = new TQCornerSquare( this ); Q_CHECK_PTR( cornerSquare ); cornerSquare->setGeometry( maxViewX() + frameWidth() + 1, maxViewY() + frameWidth() + 1, @@ -1102,7 +1102,7 @@ void QtTableView::coverCornerSquare( bool enable ) \link setTableFlags() Tbl_snapTo*Grid \endlink table flags. */ -void QtTableView::snapToGrid( bool horizontal, bool vertical ) +void TQtTableView::snapToGrid( bool horizontal, bool vertical ) { int newXCell = -1; int newYCell = -1; @@ -1132,7 +1132,7 @@ void QtTableView::snapToGrid( bool horizontal, bool vertical ) scroll bar. */ -void QtTableView::horSbValue( int val ) +void TQtTableView::horSbValue( int val ) { if ( horSliding ) { horSliding = FALSE; @@ -1152,7 +1152,7 @@ void QtTableView::horSbValue( int val ) Scrolls the table smoothly horizontally even if \c Tbl_snapToHGrid is set. */ -void QtTableView::horSbSliding( int val ) +void TQtTableView::horSbSliding( int val ) { if ( testTableFlags(Tbl_snapToHGrid) && testTableFlags(Tbl_smoothHScrolling) ) { @@ -1170,7 +1170,7 @@ void QtTableView::horSbSliding( int val ) TQScrollBar::sliderReleased() signal. */ -void QtTableView::horSbSlidingDone( ) +void TQtTableView::horSbSlidingDone( ) { if ( testTableFlags(Tbl_snapToHGrid) && testTableFlags(Tbl_smoothHScrolling) ) @@ -1186,7 +1186,7 @@ void QtTableView::horSbSlidingDone( ) scroll bar. */ -void QtTableView::verSbValue( int val ) +void TQtTableView::verSbValue( int val ) { if ( verSliding ) { verSliding = FALSE; @@ -1206,7 +1206,7 @@ void QtTableView::verSbValue( int val ) Scrolls the table smoothly vertically even if \c Tbl_snapToVGrid is set. */ -void QtTableView::verSbSliding( int val ) +void TQtTableView::verSbSliding( int val ) { if ( testTableFlags(Tbl_snapToVGrid) && testTableFlags(Tbl_smoothVScrolling) ) { @@ -1224,7 +1224,7 @@ void QtTableView::verSbSliding( int val ) TQScrollBar::sliderReleased() signal. */ -void QtTableView::verSbSlidingDone( ) +void TQtTableView::verSbSlidingDone( ) { if ( testTableFlags(Tbl_snapToVGrid) && testTableFlags(Tbl_smoothVScrolling) ) @@ -1239,12 +1239,12 @@ void QtTableView::verSbSlidingDone( ) do so for each cell. */ -void QtTableView::setupPainter( TQPainter * ) +void TQtTableView::setupPainter( TQPainter * ) { } /*! - \fn void QtTableView::paintCell( TQPainter *p, int row, int col ) + \fn void TQtTableView::paintCell( TQPainter *p, int row, int col ) This pure virtual function is called to paint the single cell at \a (row,col) using \a p, which is open when paintCell() is called and @@ -1265,10 +1265,10 @@ void QtTableView::setupPainter( TQPainter * ) /*! Handles paint events, \a e, for the table view. - Calls paintCell() for the cells that needs to be repainted. + Calls paintCell() for the cells that needs to be tqrepainted. */ -void QtTableView::paintEvent( TQPaintEvent *e ) +void TQtTableView::paintEvent( TQPaintEvent *e ) { TQRect updateR = e->rect(); // update rectangle if ( sbDirty ) { @@ -1279,7 +1279,7 @@ void QtTableView::paintEvent( TQPaintEvent *e ) TQPainter paint( this ); - if ( !contentsRect().contains( updateR, TRUE ) ) {// update frame ? + if ( !contentsRect().tqcontains( updateR, TRUE ) ) {// update frame ? drawFrame( &paint ); if ( updateR.left() < frameWidth() ) //### updateR.setLeft( frameWidth() ); @@ -1314,7 +1314,7 @@ void QtTableView::paintEvent( TQPaintEvent *e ) TQRect winR = viewRect(); TQRect cellR; TQRect cellUR; -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS TQWMatrix matrix; #endif @@ -1338,11 +1338,11 @@ void QtTableView::paintEvent( TQPaintEvent *e ) if ( eraseInPaint ) paint.eraseRect( cellUR ); -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS matrix.translate( xPos, yPos ); paint.setWorldMatrix( matrix ); if ( testTableFlags(Tbl_clipCellPainting) || - frameWidth() > 0 && !winR.contains( cellR ) ) { //##arnt + frameWidth() > 0 && !winR.tqcontains( cellR ) ) { //##arnt paint.setClipRect( cellUR ); paintCell( &paint, row, col ); paint.setClipping( FALSE ); @@ -1354,7 +1354,7 @@ void QtTableView::paintEvent( TQPaintEvent *e ) #else paint.translate( xPos, yPos ); if ( testTableFlags(Tbl_clipCellPainting) || - frameWidth() > 0 && !winR.contains( cellR ) ) { //##arnt + frameWidth() > 0 && !winR.tqcontains( cellR ) ) { //##arnt paint.setClipRect( cellUR ); paintCell( &paint, row, col ); paint.setClipping( FALSE ); @@ -1378,13 +1378,13 @@ void QtTableView::paintEvent( TQPaintEvent *e ) // Note that this needs to be done regardless whether we do // eraseInPaint or not. Reason: a subclass may implement - // flicker-freeness and encourage the use of repaint(FALSE). + // flicker-freeness and encourage the use of tqrepaint(FALSE). // The subclass, however, cannot draw all pixels, just those - // inside the cells. So QtTableView is reponsible for all pixels + // inside the cells. So TQtTableView is reponsible for all pixels // outside the cells. TQRect viewR = viewRect(); - const TQColorGroup g = colorGroup(); + const TQColorGroup g = tqcolorGroup(); if ( xPos <= maxX ) { TQRect r = viewR; @@ -1407,20 +1407,20 @@ void QtTableView::paintEvent( TQPaintEvent *e ) /*!\reimp */ -void QtTableView::resizeEvent( TQResizeEvent * ) +void TQtTableView::resizeEvent( TQResizeEvent * ) { updateScrollBars( horValue | verValue | horSteps | horGeometry | horRange | verSteps | verGeometry | verRange ); showOrHideScrollBars(); updateFrameSize(); - int maxX = QMIN( xOffs, maxXOffset() ); // ### can be slow - int maxY = QMIN( yOffs, maxYOffset() ); + int maxX = TQMIN( xOffs, maxXOffset() ); // ### can be slow + int maxY = TQMIN( yOffs, maxYOffset() ); setOffset( maxX, maxY ); } -void QtTableView::wheelEvent( TQWheelEvent * e ) +void TQtTableView::wheelEvent( TQWheelEvent * e ) { - if( e->orientation() == Vertical && vScrollBar && vScrollBar->isVisible() ) + if( e->orientation() ==Qt::Vertical && vScrollBar && vScrollBar->isVisible() ) TQApplication::sendEvent( vScrollBar, e ); } @@ -1428,9 +1428,9 @@ void QtTableView::wheelEvent( TQWheelEvent * e ) Redraws all visible cells in the table view. */ -void QtTableView::updateView() +void TQtTableView::updateView() { - repaint( viewRect() ); + tqrepaint( viewRect() ); } /*! @@ -1439,18 +1439,18 @@ void QtTableView::updateView() values; use findRow() to translate to cell numbers. */ -TQScrollBar *QtTableView::verticalScrollBar() const +TQScrollBar *TQtTableView::verticalScrollBar() const { - QtTableView *that = (QtTableView*)this; // semantic const + TQtTableView *that = (TQtTableView*)this; // semantic const if ( !vScrollBar ) { - TQScrollBar *sb = new TQScrollBar( TQScrollBar::Vertical, that ); -#ifndef QT_NO_CURSOR + TQScrollBar *sb = new TQScrollBar( Qt::Vertical, that ); +#ifndef TQT_NO_CURSOR sb->setCursor( arrowCursor ); #endif - sb->resize( sb->sizeHint() ); // height is irrelevant + sb->resize( sb->tqsizeHint() ); // height is irrelevant Q_CHECK_PTR(sb); sb->setTracking( FALSE ); - sb->setFocusPolicy( NoFocus ); + sb->setFocusPolicy( TQ_NoFocus ); connect( sb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(verSbValue(int))); connect( sb, TQT_SIGNAL(sliderMoved(int)), @@ -1470,16 +1470,16 @@ TQScrollBar *QtTableView::verticalScrollBar() const values; use findCol() to translate to cell numbers. */ -TQScrollBar *QtTableView::horizontalScrollBar() const +TQScrollBar *TQtTableView::horizontalScrollBar() const { - QtTableView *that = (QtTableView*)this; // semantic const + TQtTableView *that = (TQtTableView*)this; // semantic const if ( !hScrollBar ) { - TQScrollBar *sb = new TQScrollBar( TQScrollBar::Horizontal, that ); -#ifndef QT_NO_CURSOR + TQScrollBar *sb = new TQScrollBar( Qt::Horizontal, that ); +#ifndef TQT_NO_CURSOR sb->setCursor( arrowCursor ); #endif - sb->resize( sb->sizeHint() ); // width is irrelevant - sb->setFocusPolicy( NoFocus ); + sb->resize( sb->tqsizeHint() ); // width is irrelevant + sb->setFocusPolicy( TQ_NoFocus ); Q_CHECK_PTR(sb); sb->setTracking( FALSE ); connect( sb, TQT_SIGNAL(valueChanged(int)), @@ -1500,7 +1500,7 @@ TQScrollBar *QtTableView::horizontalScrollBar() const setAutoUpdate() and the \link setTableFlags() table flags\endlink. */ -void QtTableView::setHorScrollBar( bool on, bool update ) +void TQtTableView::setHorScrollBar( bool on, bool update ) { if ( on ) { tFlags |= Tbl_hScrollBar; @@ -1526,7 +1526,7 @@ void QtTableView::setHorScrollBar( bool on, bool update ) else sbDirty = sbDirty | verMask; if ( hideScrollBar && isVisible() ) - repaint( hScrollBar->x(), hScrollBar->y(), + tqrepaint( hScrollBar->x(), hScrollBar->y(), width() - hScrollBar->x(), hScrollBar->height() ); } if ( update ) @@ -1539,7 +1539,7 @@ void QtTableView::setHorScrollBar( bool on, bool update ) setAutoUpdate() and the \link setTableFlags() table flags\endlink. */ -void QtTableView::setVerScrollBar( bool on, bool update ) +void TQtTableView::setVerScrollBar( bool on, bool update ) { if ( on ) { tFlags |= Tbl_vScrollBar; @@ -1565,7 +1565,7 @@ void QtTableView::setVerScrollBar( bool on, bool update ) else sbDirty = sbDirty | horMask; if ( hideScrollBar && isVisible() ) - repaint( vScrollBar->x(), vScrollBar->y(), + tqrepaint( vScrollBar->x(), vScrollBar->y(), vScrollBar->width(), height() - vScrollBar->y() ); } if ( update ) @@ -1575,7 +1575,7 @@ void QtTableView::setVerScrollBar( bool on, bool update ) -int QtTableView::findRawRow( int yPos, int *cellMaxY, int *cellMinY, +int TQtTableView::findRawRow( int yPos, int *cellMaxY, int *cellMinY, bool goOutsideView ) const { int r = -1; @@ -1583,8 +1583,8 @@ int QtTableView::findRawRow( int yPos, int *cellMaxY, int *cellMinY, return r; if ( goOutsideView || yPos >= minViewY() && yPos <= maxViewY() ) { if ( yPos < minViewY() ) { -#if defined(QT_CHECK_RANGE) - qWarning( "QtTableView::findRawRow: (%s) internal error: " +#if defined(TQT_CHECK_RANGE) + qWarning( "TQtTableView::findRawRow: (%s) internal error: " "yPos < minViewY() && goOutsideView " "not supported. (%d,%d)", name( "unnamed" ), yPos, yOffs ); @@ -1599,7 +1599,7 @@ int QtTableView::findRawRow( int yPos, int *cellMaxY, int *cellMinY, *cellMinY = r*cellH + minViewY() - yCellDelta; r += yCellOffs; // absolute cell index } else { // variable cell height - QtTableView *tw = (QtTableView *)this; + TQtTableView *tw = (TQtTableView *)this; r = yCellOffs; int h = minViewY() - yCellDelta; //##arnt3 int oldH = h; @@ -1622,7 +1622,7 @@ int QtTableView::findRawRow( int yPos, int *cellMaxY, int *cellMinY, } -int QtTableView::findRawCol( int xPos, int *cellMaxX, int *cellMinX , +int TQtTableView::findRawCol( int xPos, int *cellMaxX, int *cellMinX , bool goOutsideView ) const { int c = -1; @@ -1630,8 +1630,8 @@ int QtTableView::findRawCol( int xPos, int *cellMaxX, int *cellMinX , return c; if ( goOutsideView || xPos >= minViewX() && xPos <= maxViewX() ) { if ( xPos < minViewX() ) { -#if defined(QT_CHECK_RANGE) - qWarning( "QtTableView::findRawCol: (%s) internal error: " +#if defined(TQT_CHECK_RANGE) + qWarning( "TQtTableView::findRawCol: (%s) internal error: " "xPos < minViewX() && goOutsideView " "not supported. (%d,%d)", name( "unnamed" ), xPos, xOffs ); @@ -1646,7 +1646,7 @@ int QtTableView::findRawCol( int xPos, int *cellMaxX, int *cellMinX , *cellMinX = c*cellW + minViewX() - xCellDelta; c += xCellOffs; // absolute cell index } else { // variable cell width - QtTableView *tw = (QtTableView *)this; + TQtTableView *tw = (TQtTableView *)this; c = xCellOffs; int w = minViewX() - xCellDelta; //##arnt3 int oldW = w; @@ -1676,7 +1676,7 @@ int QtTableView::findRawCol( int xPos, int *cellMaxX, int *cellMinX , \sa findCol(), rowYPos() */ -int QtTableView::findRow( int yPos ) const +int TQtTableView::findRow( int yPos ) const { int cellMaxY; int row = findRawRow( yPos, &cellMaxY ); @@ -1696,7 +1696,7 @@ int QtTableView::findRow( int yPos ) const \sa findRow(), colXPos() */ -int QtTableView::findCol( int xPos ) const +int TQtTableView::findCol( int xPos ) const { int cellMaxX; int col = findRawCol( xPos, &cellMaxX ); @@ -1718,7 +1718,7 @@ int QtTableView::findCol( int xPos ) const \sa colXPos(), findRow() */ -bool QtTableView::rowYPos( int row, int *yPos ) const +bool TQtTableView::rowYPos( int row, int *yPos ) const { int y; if ( row >= yCellOffs ) { @@ -1731,7 +1731,7 @@ bool QtTableView::rowYPos( int row, int *yPos ) const //##arnt3 y = minViewY() - yCellDelta; // y of leftmost cell in view int r = yCellOffs; - QtTableView *tw = (QtTableView *)this; + TQtTableView *tw = (TQtTableView *)this; int maxY = maxViewY(); while ( r < row && y <= maxY ) y += tw->cellHeight( r++ ); @@ -1758,7 +1758,7 @@ bool QtTableView::rowYPos( int row, int *yPos ) const \sa rowYPos(), findCol() */ -bool QtTableView::colXPos( int col, int *xPos ) const +bool TQtTableView::colXPos( int col, int *xPos ) const { int x; if ( col >= xCellOffs ) { @@ -1771,7 +1771,7 @@ bool QtTableView::colXPos( int col, int *xPos ) const //##arnt3 x = minViewX() - xCellDelta; // x of uppermost cell in view int c = xCellOffs; - QtTableView *tw = (QtTableView *)this; + TQtTableView *tw = (TQtTableView *)this; int maxX = maxViewX(); while ( c < col && x <= maxX ) x += tw->cellWidth( c++ ); @@ -1792,7 +1792,7 @@ bool QtTableView::colXPos( int col, int *xPos ) const down by \a yPixels pixels. Both may be negative. \warning You might find that TQScrollView offers a higher-level of - functionality than using QtTableView and this function. + functionality than using TQtTableView and this function. This function is \e not the same as TQWidget::scroll(); in particular, the signs of \a xPixels and \a yPixels have the reverse semantics. @@ -1801,7 +1801,7 @@ bool QtTableView::colXPos( int col, int *xPos ) const setLeftCell() */ -void QtTableView::scroll( int xPixels, int yPixels ) +void TQtTableView::scroll( int xPixels, int yPixels ) { TQWidget::scroll( -xPixels, -yPixels, contentsRect() ); } @@ -1814,7 +1814,7 @@ void QtTableView::scroll( int xPixels, int yPixels ) \sa maxViewY(), viewWidth(), contentsRect() */ -int QtTableView::minViewX() const +int TQtTableView::minViewX() const { return frameWidth(); } @@ -1827,7 +1827,7 @@ int QtTableView::minViewX() const \sa maxViewX(), viewHeight(), contentsRect() */ -int QtTableView::minViewY() const +int TQtTableView::minViewY() const { return frameWidth(); } @@ -1841,7 +1841,7 @@ int QtTableView::minViewY() const \sa maxViewY(), viewWidth(), contentsRect() */ -int QtTableView::maxViewX() const +int TQtTableView::maxViewX() const { return width() - 1 - frameWidth() - (tFlags & Tbl_vScrollBar ? VSBEXT @@ -1857,7 +1857,7 @@ int QtTableView::maxViewX() const \sa maxViewX(), viewHeight(), contentsRect() */ -int QtTableView::maxViewY() const +int TQtTableView::maxViewY() const { return height() - 1 - frameWidth() - (tFlags & Tbl_hScrollBar ? HSBEXT @@ -1873,7 +1873,7 @@ int QtTableView::maxViewY() const \sa minViewX() maxViewX(), viewHeight(), contentsRect() viewRect() */ -int QtTableView::viewWidth() const +int TQtTableView::viewWidth() const { return maxViewX() - minViewX() + 1; } @@ -1887,13 +1887,13 @@ int QtTableView::viewWidth() const \sa minViewY() maxViewY() viewWidth() contentsRect() viewRect() */ -int QtTableView::viewHeight() const +int TQtTableView::viewHeight() const { return maxViewY() - minViewY() + 1; } -void QtTableView::doAutoScrollBars() +void TQtTableView::doAutoScrollBars() { int viewW = width() - frameWidth() - minViewX(); int viewH = height() - frameWidth() - minViewY(); @@ -1947,7 +1947,7 @@ void QtTableView::doAutoScrollBars() /*! - \fn void QtTableView::updateScrollBars() + \fn void TQtTableView::updateScrollBars() Updates the scroll bars' contents and presence to match the table's state. Generally, you should not need to call this. @@ -1962,7 +1962,7 @@ void QtTableView::doAutoScrollBars() \sa setTableFlags() */ -void QtTableView::updateScrollBars( uint f ) +void TQtTableView::updateScrollBars( uint f ) { sbDirty = sbDirty | f; if ( inSbUpdate ) @@ -1999,7 +1999,7 @@ void QtTableView::updateScrollBars( uint f ) if ( sbDirty & horSteps ) { if ( cellW ) - hScrollBar->setSteps( QMIN(cellW,viewWidth()/2), viewWidth() ); + hScrollBar->setSteps( TQMIN(cellW,viewWidth()/2), viewWidth() ); else hScrollBar->setSteps( 16, viewWidth() ); } @@ -2010,7 +2010,7 @@ void QtTableView::updateScrollBars( uint f ) if ( sbDirty & horValue ) hScrollBar->setValue( xOffs ); - // show scrollbar only when it has a sane geometry + // show scrollbar only when it has a sane tqgeometry if ( !hScrollBar->isVisible() ) hScrollBar->show(); } @@ -2023,7 +2023,7 @@ void QtTableView::updateScrollBars( uint f ) if ( sbDirty & verSteps ) { if ( cellH ) - vScrollBar->setSteps( QMIN(cellH,viewHeight()/2), viewHeight() ); + vScrollBar->setSteps( TQMIN(cellH,viewHeight()/2), viewHeight() ); else vScrollBar->setSteps( 16, viewHeight() ); // fttb! ### } @@ -2034,7 +2034,7 @@ void QtTableView::updateScrollBars( uint f ) if ( sbDirty & verValue ) vScrollBar->setValue( yOffs ); - // show scrollbar only when it has a sane geometry + // show scrollbar only when it has a sane tqgeometry if ( !vScrollBar->isVisible() ) vScrollBar->show(); } @@ -2048,7 +2048,7 @@ void QtTableView::updateScrollBars( uint f ) } -void QtTableView::updateFrameSize() +void TQtTableView::updateFrameSize() { int rw = width() - ( testTableFlags(Tbl_vScrollBar) ? VSBEXT : 0 ); @@ -2065,9 +2065,9 @@ void QtTableView::updateFrameSize() setFrameRect( TQRect(0,0,rw,rh) ); if ( rw != fw ) - update( QMIN(fw,rw) - frameWidth() - 2, 0, frameWidth()+4, rh ); + update( TQMIN(fw,rw) - frameWidth() - 2, 0, frameWidth()+4, rh ); if ( rh != fh ) - update( 0, QMIN(fh,rh) - frameWidth() - 2, rw, frameWidth()+4 ); + update( 0, TQMIN(fh,rh) - frameWidth() - 2, rw, frameWidth()+4 ); } } @@ -2081,7 +2081,7 @@ void QtTableView::updateFrameSize() \sa maxColOffset(), maxYOffset(), totalWidth() */ -int QtTableView::maxXOffset() +int TQtTableView::maxXOffset() { int tw = totalWidth(); int maxOffs; @@ -2127,7 +2127,7 @@ int QtTableView::maxXOffset() \sa maxRowOffset(), maxXOffset(), totalHeight() */ -int QtTableView::maxYOffset() +int TQtTableView::maxYOffset() { int th = totalHeight(); int maxOffs; @@ -2174,7 +2174,7 @@ int QtTableView::maxYOffset() \sa maxXOffset(), maxRowOffset() */ -int QtTableView::maxColOffset() +int TQtTableView::maxColOffset() { int mx = maxXOffset(); if ( cellW ) @@ -2200,7 +2200,7 @@ int QtTableView::maxColOffset() \sa maxYOffset(), maxColOffset() */ -int QtTableView::maxRowOffset() +int TQtTableView::maxRowOffset() { int my = maxYOffset(); if ( cellH ) @@ -2216,7 +2216,7 @@ int QtTableView::maxRowOffset() } -void QtTableView::showOrHideScrollBars() +void TQtTableView::showOrHideScrollBars() { if ( !autoUpdate() ) return; @@ -2257,10 +2257,10 @@ void QtTableView::showOrHideScrollBars() Call this function when the table view's total size is changed; typically because the result of cellHeight() or cellWidth() have changed. - This function does not repaint the widget. + This function does not tqrepaint the widget. */ -void QtTableView::updateTableSize() +void TQtTableView::updateTableSize() { bool updateOn = autoUpdate(); setAutoUpdate( FALSE ); diff --git a/cervisia/qttableview.h b/cervisia/qttableview.h index 00b49c8d..cfddade0 100644 --- a/cervisia/qttableview.h +++ b/cervisia/qttableview.h @@ -1,45 +1,46 @@ /********************************************************************** ** $Id$ ** -** Definition of QtTableView class +** Definition of TQtTableView class ** ** Created : 941115 ** ** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. ** -** This file contains a class moved out of the Qt GUI Toolkit API. It +** This file contains a class moved out of the TQt GUI Toolkit API. It ** may be used, distributed and modified without limitation. ** **********************************************************************/ -#ifndef QTTABLEVIEW_H -#define QTTABLEVIEW_H +#ifndef TQTTABLEVIEW_H +#define TQTTABLEVIEW_H -#ifndef QT_H +#ifndef TQT_H #include "tqframe.h" -#endif // QT_H +#endif // TQT_H -#ifndef QT_NO_QTTABLEVIEW +#ifndef TQT_NO_TQTTABLEVIEW class TQScrollBar; -class QCornerSquare; +class TQCornerSquare; -class QtTableView : public QFrame +class TQtTableView : public TQFrame { Q_OBJECT + TQ_OBJECT public: virtual void setBackgroundColor( const TQColor & ); virtual void setPalette( const TQPalette & ); void show(); - void repaint( bool erase=TRUE ); - void repaint( int x, int y, int w, int h, bool erase=TRUE ); - void repaint( const TQRect &, bool erase=TRUE ); + void tqrepaint( bool erase=TRUE ); + void tqrepaint( int x, int y, int w, int h, bool erase=TRUE ); + void tqrepaint( const TQRect &, bool erase=TRUE ); protected: - QtTableView( TQWidget *parent=0, const char *name=0, WFlags f=0 ); - ~QtTableView(); + TQtTableView( TQWidget *tqparent=0, const char *name=0, WFlags f=0 ); + ~TQtTableView(); int numRows() const; virtual void setNumRows( int ); @@ -78,8 +79,8 @@ protected: void updateCell( int row, int column, bool erase=TRUE ); - QRect cellUpdateRect() const; - QRect viewRect() const; + TQRect cellUpdateRect() const; + TQRect viewRect() const; int lastRowVisible() const; int lastColVisible() const; @@ -163,16 +164,16 @@ private: uint inSbUpdate : 1; uint tFlags; - QRect cellUpdateR; + TQRect cellUpdateR; TQScrollBar *vScrollBar; TQScrollBar *hScrollBar; - QCornerSquare *cornerSquare; + TQCornerSquare *cornerSquare; private: // Disabled copy constructor and operator= -#if defined(Q_DISABLE_COPY) - QtTableView( const QtTableView & ); - QtTableView &operator=( const QtTableView & ); +#if defined(TQ_DISABLE_COPY) + TQtTableView( const TQtTableView & ); + TQtTableView &operator=( const TQtTableView & ); #endif }; @@ -201,52 +202,52 @@ const uint Tbl_snapToVGrid = 0x00010000; const uint Tbl_snapToGrid = 0x00018000; -inline int QtTableView::numRows() const +inline int TQtTableView::numRows() const { return nRows; } -inline int QtTableView::numCols() const +inline int TQtTableView::numCols() const { return nCols; } -inline int QtTableView::topCell() const +inline int TQtTableView::topCell() const { return yCellOffs; } -inline int QtTableView::leftCell() const +inline int TQtTableView::leftCell() const { return xCellOffs; } -inline int QtTableView::xOffset() const +inline int TQtTableView::xOffset() const { return xOffs; } -inline int QtTableView::yOffset() const +inline int TQtTableView::yOffset() const { return yOffs; } -inline int QtTableView::cellHeight() const +inline int TQtTableView::cellHeight() const { return cellH; } -inline int QtTableView::cellWidth() const +inline int TQtTableView::cellWidth() const { return cellW; } -inline uint QtTableView::tableFlags() const +inline uint TQtTableView::tableFlags() const { return tFlags; } -inline bool QtTableView::testTableFlags( uint f ) const +inline bool TQtTableView::testTableFlags( uint f ) const { return (tFlags & f) != 0; } -inline TQRect QtTableView::cellUpdateRect() const +inline TQRect TQtTableView::cellUpdateRect() const { return cellUpdateR; } -inline bool QtTableView::autoUpdate() const +inline bool TQtTableView::autoUpdate() const { return isUpdatesEnabled(); } -inline void QtTableView::repaint( bool erase ) -{ repaint( 0, 0, width(), height(), erase ); } +inline void TQtTableView::tqrepaint( bool erase ) +{ tqrepaint( 0, 0, width(), height(), erase ); } -inline void QtTableView::repaint( const TQRect &r, bool erase ) -{ repaint( r.x(), r.y(), r.width(), r.height(), erase ); } +inline void TQtTableView::tqrepaint( const TQRect &r, bool erase ) +{ tqrepaint( r.x(), r.y(), r.width(), r.height(), erase ); } -inline void QtTableView::updateScrollBars() +inline void TQtTableView::updateScrollBars() { updateScrollBars( 0 ); } -#endif // QT_NO_QTTABLEVIEW +#endif // TQT_NO_TQTTABLEVIEW -#endif // QTTABLEVIEW_H +#endif // TQTTABLEVIEW_H diff --git a/cervisia/repositories.cpp b/cervisia/repositories.cpp index 7f52a39d..c8da2857 100644 --- a/cervisia/repositories.cpp +++ b/cervisia/repositories.cpp @@ -59,7 +59,7 @@ static TQStringList readCvsPassFile() { int pos; TQString line = stream.readLine(); - if ( (pos = line.find(' ')) != -1) + if ( (pos = line.tqfind(' ')) != -1) { if (line[0] != '/') // old format list.append(line.left(pos)); @@ -88,7 +88,7 @@ static TQStringList readCvsntPassFile() { const TQString line(stream.readLine()); - const int pos(line.find("=A")); + const int pos(line.tqfind("=A")); if (pos >= 0) list.append(line.left(pos)); } @@ -117,7 +117,7 @@ TQStringList Repositories::readConfigFile() // Some people actually use CVSROOT, so we add it here char *env; - if ( (env = ::getenv("CVSROOT")) != 0 && !list.contains(env)) + if ( (env = ::getenv("CVSROOT")) != 0 && !list.tqcontains(env)) list.append(env); return list; diff --git a/cervisia/repositorydlg.cpp b/cervisia/repositorydlg.cpp index a30a13ce..d152b1b0 100644 --- a/cervisia/repositorydlg.cpp +++ b/cervisia/repositorydlg.cpp @@ -40,7 +40,7 @@ class RepositoryListItem : public KListViewItem { public: - RepositoryListItem(KListView* parent, const TQString& repo, bool loggedin); + RepositoryListItem(KListView* tqparent, const TQString& repo, bool loggedin); void setRsh(const TQString& rsh); void setServer(const TQString& server) { m_server = server; } @@ -56,7 +56,7 @@ public: { TQString str = text(1); return (str.startsWith("ext (") ? str.mid(5, str.length()-6) - : TQString::null); + : TQString()); } TQString server() const { return m_server; } int compression() const @@ -85,9 +85,9 @@ static bool LoginNeeded(const TQString& repository) } -RepositoryListItem::RepositoryListItem(KListView* parent, const TQString& repo, +RepositoryListItem::RepositoryListItem(KListView* tqparent, const TQString& repo, bool loggedin) - : KListViewItem(parent) + : KListViewItem(tqparent) , m_isLoggedIn(loggedin) { setText(0, repo); @@ -105,7 +105,7 @@ void RepositoryListItem::setRsh(const TQString& rsh) method = "pserver"; else if( repo.startsWith(":sspi:") ) method = "sspi"; - else if( repo.contains(':') ) + else if( repo.tqcontains(':') ) { method = "ext"; if( !rsh.isEmpty() ) @@ -141,20 +141,20 @@ void RepositoryListItem::setIsLoggedIn(bool isLoggedIn) void RepositoryListItem::changeLoginStatusColumn() { - TQString loginStatus; + TQString logintqStatus; if( LoginNeeded(repository()) ) - loginStatus = m_isLoggedIn ? i18n("Logged in") : i18n("Not logged in"); + logintqStatus = m_isLoggedIn ? i18n("Logged in") : i18n("Not logged in"); else - loginStatus = i18n("No login required"); + logintqStatus = i18n("No login required"); - setText(3, loginStatus); + setText(3, logintqStatus); } RepositoryDialog::RepositoryDialog(KConfig& cfg, CvsService_stub* cvsService, - TQWidget* parent, const char* name) - : KDialogBase(parent, name, true, i18n("Configure Access to Repositories"), + TQWidget* tqparent, const char* name) + : KDialogBase(tqparent, name, true, i18n("Configure Access to Repositories"), Ok | Cancel | Help, Ok, true) , m_partConfig(cfg) , m_cvsService(cvsService) @@ -170,7 +170,7 @@ RepositoryDialog::RepositoryDialog(KConfig& cfg, CvsService_stub* cvsService, m_repoList->addColumn(i18n("Repository")); m_repoList->addColumn(i18n("Method")); m_repoList->addColumn(i18n("Compression")); - m_repoList->addColumn(i18n("Status")); + m_repoList->addColumn(i18n("tqStatus")); m_repoList->setFocus(); connect(m_repoList, TQT_SIGNAL(doubleClicked(TQListViewItem*)), @@ -178,7 +178,7 @@ RepositoryDialog::RepositoryDialog(KConfig& cfg, CvsService_stub* cvsService, connect(m_repoList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); - KButtonBox* actionbox = new KButtonBox(mainWidget, KButtonBox::Vertical); + KButtonBox* actionbox = new KButtonBox(mainWidget, Qt::Vertical); TQPushButton* addbutton = actionbox->addButton(i18n("&Add...")); m_modifyButton = actionbox->addButton(i18n("&Modify...")); m_removeButton = actionbox->addButton(i18n("&Remove")); @@ -186,7 +186,7 @@ RepositoryDialog::RepositoryDialog(KConfig& cfg, CvsService_stub* cvsService, m_loginButton = actionbox->addButton(i18n("Login...")); m_logoutButton = actionbox->addButton(i18n("Logout")); actionbox->addStretch(); - actionbox->layout(); + actionbox->tqlayout(); hbox->addWidget(actionbox, 0); m_loginButton->setEnabled(false); @@ -222,7 +222,7 @@ RepositoryDialog::RepositoryDialog(KConfig& cfg, CvsService_stub* cvsService, setHelp("accessing-repository"); - setWFlags(Qt::WDestructiveClose | getWFlags()); + setWFlags(TQt::WDestructiveClose | getWFlags()); TQSize size = configDialogSize(m_partConfig, "RepositoryDialog"); resize(size); @@ -231,7 +231,7 @@ RepositoryDialog::RepositoryDialog(KConfig& cfg, CvsService_stub* cvsService, for (int i = 0; i < m_repoList->columns(); ++i) m_repoList->setColumnWidthMode(i, TQListView::Manual); - m_repoList->restoreLayout(&m_partConfig, TQString::fromLatin1("RepositoryListView")); + m_repoList->restoreLayout(&m_partConfig, TQString::tqfromLatin1("RepositoryListView")); } @@ -239,7 +239,7 @@ RepositoryDialog::~RepositoryDialog() { saveDialogSize(m_partConfig, "RepositoryDialog"); - m_repoList->saveLayout(&m_partConfig, TQString::fromLatin1("RepositoryListView")); + m_repoList->saveLayout(&m_partConfig, TQString::tqfromLatin1("RepositoryListView")); delete m_serviceConfig; } @@ -274,7 +274,7 @@ void RepositoryDialog::readConfigFile() RepositoryListItem* ritem = static_cast<RepositoryListItem*>(item); // read entries from cvs DCOP service configuration - m_serviceConfig->setGroup(TQString::fromLatin1("Repository-") + + m_serviceConfig->setGroup(TQString::tqfromLatin1("Repository-") + ritem->repository()); TQString rsh = m_serviceConfig->readEntry("rsh", TQString()); @@ -319,7 +319,7 @@ void RepositoryDialog::slotOk() void RepositoryDialog::slotAddClicked() { - AddRepositoryDialog dlg(m_partConfig, TQString::null, this); + AddRepositoryDialog dlg(m_partConfig, TQString(), this); // default compression level dlg.setCompression(-1); if( dlg.exec() ) @@ -490,7 +490,7 @@ void RepositoryDialog::slotSelectionChanged() void RepositoryDialog::writeRepositoryData(RepositoryListItem* item) { // write entries to cvs DCOP service configuration - m_serviceConfig->setGroup(TQString::fromLatin1("Repository-") + + m_serviceConfig->setGroup(TQString::tqfromLatin1("Repository-") + item->repository()); m_serviceConfig->writeEntry("rsh", item->rsh()); @@ -501,4 +501,4 @@ void RepositoryDialog::writeRepositoryData(RepositoryListItem* item) #include "repositorydlg.moc" -// kate: space-indent on; indent-width 4; replace-tabs on; +// kate: space-indent on; indent-width 4; tqreplace-tabs on; diff --git a/cervisia/repositorydlg.h b/cervisia/repositorydlg.h index 9fd7cc3c..3dc7d2f5 100644 --- a/cervisia/repositorydlg.h +++ b/cervisia/repositorydlg.h @@ -36,10 +36,11 @@ class RepositoryListItem; class RepositoryDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: RepositoryDialog(KConfig& cfg, CvsService_stub* cvsService, - TQWidget* parent = 0, const char* name = 0); + TQWidget* tqparent = 0, const char* name = 0); virtual ~RepositoryDialog(); void readConfigFile(); @@ -74,4 +75,4 @@ private: #endif -// kate: space-indent on; indent-width 4; replace-tabs on; +// kate: space-indent on; indent-width 4; tqreplace-tabs on; diff --git a/cervisia/resolvedlg.cpp b/cervisia/resolvedlg.cpp index 8fce2ee7..5bf34db3 100644 --- a/cervisia/resolvedlg.cpp +++ b/cervisia/resolvedlg.cpp @@ -68,11 +68,11 @@ public: // already reach end of text on previous call if( m_endPos < 0 ) { - m_currentLine = TQString::null; + m_currentLine = TQString(); return m_currentLine; } - m_endPos = m_text.find('\n', m_startPos); + m_endPos = m_text.tqfind('\n', m_startPos); int length = m_endPos - m_startPos + 1; m_currentLine = m_text.mid(m_startPos, length); @@ -95,8 +95,8 @@ private: } -ResolveDialog::ResolveDialog(KConfig& cfg, TQWidget *parent, const char *name) - : KDialogBase(parent, name, false, TQString::null, +ResolveDialog::ResolveDialog(KConfig& cfg, TQWidget *tqparent, const char *name) + : KDialogBase(tqparent, name, false, TQString(), Close | Help | User1 | User2, Close, true, KStdGuiItem::saveAs(), KStdGuiItem::save()) , markeditem(-1) @@ -106,27 +106,27 @@ ResolveDialog::ResolveDialog(KConfig& cfg, TQWidget *parent, const char *name) TQFrame* mainWidget = makeMainWidget(); - TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint()); + TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint()); - TQSplitter *vertSplitter = new TQSplitter(TQSplitter::Vertical, mainWidget); + TQSplitter *vertSplitter = new TQSplitter(Qt::Vertical, mainWidget); - TQSplitter *splitter = new TQSplitter(TQSplitter::Horizontal, vertSplitter); + TQSplitter *splitter = new TQSplitter(Qt::Horizontal, vertSplitter); TQWidget *versionALayoutWidget = new TQWidget(splitter); - TQBoxLayout *versionAlayout = new TQVBoxLayout(versionALayoutWidget, 5); + TQBoxLayout *versionAtqlayout = new TQVBoxLayout(versionALayoutWidget, 5); TQLabel *revlabel1 = new TQLabel(i18n("Your version (A):"), versionALayoutWidget); - versionAlayout->addWidget(revlabel1); + versionAtqlayout->addWidget(revlabel1); diff1 = new DiffView(cfg, true, false, versionALayoutWidget); - versionAlayout->addWidget(diff1, 10); + versionAtqlayout->addWidget(diff1, 10); TQWidget* versionBLayoutWidget = new TQWidget(splitter); - TQBoxLayout *versionBlayout = new TQVBoxLayout(versionBLayoutWidget, 5); + TQBoxLayout *versionBtqlayout = new TQVBoxLayout(versionBLayoutWidget, 5); TQLabel *revlabel2 = new TQLabel(i18n("Other version (B):"), versionBLayoutWidget); - versionBlayout->addWidget(revlabel2); + versionBtqlayout->addWidget(revlabel2); diff2 = new DiffView(cfg, true, false, versionBLayoutWidget); - versionBlayout->addWidget(diff2, 10); + versionBtqlayout->addWidget(diff2, 10); diff1->setPartner(diff2); diff2->setPartner(diff1); @@ -140,7 +140,7 @@ ResolveDialog::ResolveDialog(KConfig& cfg, TQWidget *parent, const char *name) merge = new DiffView(cfg, false, false, mergeLayoutWidget); mergeLayout->addWidget(merge, 10); - layout->addWidget(vertSplitter); + tqlayout->addWidget(vertSplitter); abutton = new TQPushButton("&A", mainWidget); connect( abutton, TQT_SIGNAL(clicked()), TQT_SLOT(aClicked()) ); @@ -158,7 +158,7 @@ ResolveDialog::ResolveDialog(KConfig& cfg, TQWidget *parent, const char *name) connect( editbutton, TQT_SIGNAL(clicked()), TQT_SLOT(editClicked()) ); nofnlabel = new TQLabel(mainWidget); - nofnlabel->setAlignment(AlignCenter); + nofnlabel->tqsetAlignment(AlignCenter); backbutton = new TQPushButton("&<<", mainWidget); connect( backbutton, TQT_SIGNAL(clicked()), TQT_SLOT(backClicked()) ); @@ -166,17 +166,17 @@ ResolveDialog::ResolveDialog(KConfig& cfg, TQWidget *parent, const char *name) forwbutton = new TQPushButton("&>>", mainWidget); connect( forwbutton, TQT_SIGNAL(clicked()), TQT_SLOT(forwClicked()) ); - TQBoxLayout *buttonlayout = new TQHBoxLayout(layout); - buttonlayout->addWidget(abutton, 1); - buttonlayout->addWidget(bbutton, 1); - buttonlayout->addWidget(abbutton, 1); - buttonlayout->addWidget(babutton, 1); - buttonlayout->addWidget(editbutton, 1); - buttonlayout->addStretch(1); - buttonlayout->addWidget(nofnlabel, 2); - buttonlayout->addStretch(1); - buttonlayout->addWidget(backbutton, 1); - buttonlayout->addWidget(forwbutton, 1); + TQBoxLayout *buttontqlayout = new TQHBoxLayout(tqlayout); + buttontqlayout->addWidget(abutton, 1); + buttontqlayout->addWidget(bbutton, 1); + buttontqlayout->addWidget(abbutton, 1); + buttontqlayout->addWidget(babutton, 1); + buttontqlayout->addWidget(editbutton, 1); + buttontqlayout->addStretch(1); + buttontqlayout->addWidget(nofnlabel, 2); + buttontqlayout->addStretch(1); + buttontqlayout->addWidget(backbutton, 1); + buttontqlayout->addWidget(forwbutton, 1); connect( this, TQT_SIGNAL(user2Clicked()), TQT_SLOT(saveClicked()) ); connect( this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(saveAsClicked()) ); @@ -187,7 +187,7 @@ ResolveDialog::ResolveDialog(KConfig& cfg, TQWidget *parent, const char *name) setHelp("resolvingconflicts"); - setWFlags(Qt::WDestructiveClose | getWFlags()); + setWFlags(TQt::WDestructiveClose | getWFlags()); TQSize size = configDialogSize(partConfig, "ResolveDialog"); resize(size); @@ -222,7 +222,7 @@ bool ResolveDialog::parseFile(const TQString &name) int advanced1, advanced2; enum { Normal, VersionA, VersionB } state; - setCaption(i18n("CVS Resolve: %1").arg(name)); + setCaption(i18n("CVS Resolve: %1").tqarg(name)); fname = name; @@ -369,7 +369,7 @@ TQString ResolveDialog::readFile() { TQFile f(fname); if( !f.open(IO_ReadOnly) ) - return TQString::null; + return TQString(); TQTextStream stream(&f); TQTextCodec* codec = DetectCodec(fname); @@ -383,9 +383,9 @@ void ResolveDialog::updateNofN() { TQString str; if (markeditem >= 0) - str = i18n("%1 of %2").arg(markeditem+1).arg(items.count()); + str = i18n("%1 of %2").tqarg(markeditem+1).tqarg(items.count()); else - str = i18n("%1 conflicts").arg(items.count()); + str = i18n("%1 conflicts").tqarg(items.count()); nofnlabel->setText(str); backbutton->setEnabled(markeditem != -1); @@ -424,9 +424,9 @@ void ResolveDialog::updateHighlight(int newitem) diff2->setCenterLine(item->linenoB); merge->setCenterOffset(item->offsetM); } - diff1->repaint(); - diff2->repaint(); - merge->repaint(); + diff1->tqrepaint(); + diff2->tqrepaint(); + merge->tqrepaint(); updateNofN(); } @@ -456,7 +456,7 @@ void ResolveDialog::updateMergedVersion(ResolveItem* item, while ( (item = items.next()) != 0 ) item->offsetM += difference; - merge->repaint(); + merge->tqrepaint(); } @@ -562,9 +562,9 @@ void ResolveDialog::editClicked() } delete dlg; - diff1->repaint(); - diff2->repaint(); - merge->repaint(); + diff1->tqrepaint(); + diff2->tqrepaint(); + merge->tqrepaint(); } diff --git a/cervisia/resolvedlg.h b/cervisia/resolvedlg.h index 461d8461..4f169847 100644 --- a/cervisia/resolvedlg.h +++ b/cervisia/resolvedlg.h @@ -38,11 +38,12 @@ class ResolveItem; class ResolveDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: enum ChooseType { ChA, ChB, ChAB, ChBA, ChEdit }; - explicit ResolveDialog( KConfig& cfg, TQWidget *parent=0, const char *name=0 ); + explicit ResolveDialog( KConfig& cfg, TQWidget *tqparent=0, const char *name=0 ); virtual ~ResolveDialog(); bool parseFile(const TQString &name); diff --git a/cervisia/resolvedlg_p.cpp b/cervisia/resolvedlg_p.cpp index 1023465a..f5bbdf2f 100644 --- a/cervisia/resolvedlg_p.cpp +++ b/cervisia/resolvedlg_p.cpp @@ -22,8 +22,8 @@ using namespace Cervisia; #include <ktextedit.h> -ResolveEditorDialog::ResolveEditorDialog(KConfig& cfg, TQWidget *parent, const char *name) - : KDialogBase(parent, name, true, TQString::null, +ResolveEditorDialog::ResolveEditorDialog(KConfig& cfg, TQWidget *tqparent, const char *name) + : KDialogBase(tqparent, name, true, TQString(), Ok | Cancel, Ok, true) , m_partConfig(cfg) { diff --git a/cervisia/resolvedlg_p.h b/cervisia/resolvedlg_p.h index 680da0a6..463561c2 100644 --- a/cervisia/resolvedlg_p.h +++ b/cervisia/resolvedlg_p.h @@ -33,7 +33,7 @@ namespace Cervisia class ResolveEditorDialog : public KDialogBase { public: - explicit ResolveEditorDialog(KConfig& cfg, TQWidget* parent=0, const char* name=0); + explicit ResolveEditorDialog(KConfig& cfg, TQWidget* tqparent=0, const char* name=0); virtual ~ResolveEditorDialog(); void setContent(const TQString& text); diff --git a/cervisia/settingsdlg.cpp b/cervisia/settingsdlg.cpp index 1d50b6c1..ba08273a 100644 --- a/cervisia/settingsdlg.cpp +++ b/cervisia/settingsdlg.cpp @@ -52,14 +52,14 @@ namespace inline TQPixmap LoadIcon(const char* iconName) { KIconLoader* loader = KGlobal::instance()->iconLoader(); - return loader->loadIcon(TQString::fromLatin1(iconName), KIcon::NoGroup, + return loader->loadIcon(TQString::tqfromLatin1(iconName), KIcon::NoGroup, KIcon::SizeMedium); } } -FontButton::FontButton( const TQString &text, TQWidget *parent, const char *name ) - : TQPushButton(text, parent, name) +FontButton::FontButton( const TQString &text, TQWidget *tqparent, const char *name ) + : TQPushButton(text, tqparent, name) { connect( this, TQT_SIGNAL(clicked()), this, TQT_SLOT(chooseFont()) ); } @@ -73,15 +73,15 @@ void FontButton::chooseFont() return; setFont(newFont); - repaint(false); + tqrepaint(false); } -SettingsDialog::SettingsDialog( KConfig *conf, TQWidget *parent, const char *name ) +SettingsDialog::SettingsDialog( KConfig *conf, TQWidget *tqparent, const char *name ) : KDialogBase(KDialogBase::IconList, i18n("Configure Cervisia"), KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Help, KDialogBase::Ok, - parent, name, true) + tqparent, name, true) { config = conf; @@ -99,7 +99,7 @@ SettingsDialog::SettingsDialog( KConfig *conf, TQWidget *parent, const char *nam addDiffPage(); // - // Status Options + // tqStatus Options // addStatusPage(); @@ -204,7 +204,7 @@ void SettingsDialog::writeSettings() CervisiaSettings::setDiffDeleteColor(m_diffDeleteButton->color()); // I'm not yet sure whether this is a hack or not :-) - TQWidgetListIt it(*TQApplication::allWidgets()); + TQWidgetListIt it(*TQApplication::tqallWidgets()); for (; it.current(); ++it) { TQWidget *w = it.current(); @@ -234,26 +234,26 @@ void SettingsDialog::done(int res) */ void SettingsDialog::addGeneralPage() { - TQFrame* generalPage = addPage(i18n("General"), TQString::null, + TQFrame* generalPage = addPage(i18n("General"), TQString(), LoadIcon("misc")); - TQVBoxLayout* layout = new TQVBoxLayout(generalPage, 0, KDialog::spacingHint()); + TQVBoxLayout* tqlayout = new TQVBoxLayout(generalPage, 0, KDialog::spacingHint()); TQLabel *usernamelabel = new TQLabel( i18n("&User name for the change log editor:"), generalPage ); usernameedit = new KLineEdit(generalPage); usernameedit->setFocus(); usernamelabel->setBuddy(usernameedit); - layout->addWidget(usernamelabel); - layout->addWidget(usernameedit); + tqlayout->addWidget(usernamelabel); + tqlayout->addWidget(usernameedit); TQLabel *cvspathlabel = new TQLabel( i18n("&Path to CVS executable, or 'cvs':"), generalPage ); cvspathedit = new KURLRequester(generalPage); cvspathlabel->setBuddy(cvspathedit); - layout->addWidget(cvspathlabel); - layout->addWidget(cvspathedit); + tqlayout->addWidget(cvspathlabel); + tqlayout->addWidget(cvspathedit); - layout->addStretch(); + tqlayout->addStretch(); } @@ -262,8 +262,8 @@ void SettingsDialog::addGeneralPage() */ void SettingsDialog::addDiffPage() { - TQGrid *diffPage = addGridPage(2, TQGrid::Horizontal, i18n("Diff Viewer"), - TQString::null, LoadIcon("vcs_diff")); + TQGrid *diffPage = addGridPage(2, Qt::Horizontal, i18n("Diff Viewer"), + TQString(), LoadIcon("vcs_diff")); TQLabel *contextlabel = new TQLabel( i18n("&Number of context lines in diff dialog:"), diffPage ); contextedit = new KIntNumInput( 0, diffPage ); @@ -293,13 +293,13 @@ void SettingsDialog::addDiffPage() */ void SettingsDialog::addStatusPage() { - TQVBox* statusPage = addVBoxPage(i18n("Status"), TQString::null, + TQVBox* statusPage = addVBoxPage(i18n("tqStatus"), TQString(), LoadIcon("fork")); remotestatusbox = new TQCheckBox(i18n("When opening a sandbox from a &remote repository,\n" - "start a File->Status command automatically"), statusPage); + "start a File->tqStatus command automatically"), statusPage); localstatusbox = new TQCheckBox(i18n("When opening a sandbox from a &local repository,\n" - "start a File->Status command automatically"), statusPage); + "start a File->tqStatus command automatically"), statusPage); // dummy widget to take up the vertical space new TQWidget(statusPage); @@ -311,7 +311,7 @@ void SettingsDialog::addStatusPage() */ void SettingsDialog::addAdvancedPage() { - TQVBox* frame = addVBoxPage(i18n("Advanced"), TQString::null, + TQVBox* frame = addVBoxPage(i18n("Advanced"), TQString(), LoadIcon("configure")); m_advancedPage = new AdvancedPage(frame); @@ -325,7 +325,7 @@ void SettingsDialog::addAdvancedPage() */ void SettingsDialog::addLookAndFeelPage() { - TQVBox* lookPage = addVBoxPage(i18n("Appearance"), TQString::null, + TQVBox* lookPage = addVBoxPage(i18n("Appearance"), TQString(), LoadIcon("looknfeel")); TQGroupBox* fontGroupBox = new TQGroupBox(4, Qt::Vertical, i18n("Fonts"), @@ -341,37 +341,37 @@ void SettingsDialog::addLookAndFeelPage() m_changelogFontBox = new FontButton(i18n("Font for ChangeLog View..."), fontGroupBox); - TQGroupBox* colorGroupBox = new TQGroupBox(4, Qt::Horizontal, + TQGroupBox* tqcolorGroupBox = new TQGroupBox(4, Qt::Horizontal, i18n("Colors"), lookPage); - colorGroupBox->setColumns(4); - colorGroupBox->setInsideSpacing(KDialog::spacingHint()); + tqcolorGroupBox->setColumns(4); + tqcolorGroupBox->setInsideSpacing(KDialog::spacingHint()); - TQLabel* conflictLabel = new TQLabel(i18n("Conflict:"), colorGroupBox); - m_conflictButton = new KColorButton(colorGroupBox); + TQLabel* conflictLabel = new TQLabel(i18n("Conflict:"), tqcolorGroupBox); + m_conflictButton = new KColorButton(tqcolorGroupBox); conflictLabel->setBuddy(m_conflictButton); - TQLabel* diffChangeLabel = new TQLabel(i18n("Diff change:"), colorGroupBox); - m_diffChangeButton = new KColorButton(colorGroupBox); + TQLabel* diffChangeLabel = new TQLabel(i18n("Diff change:"), tqcolorGroupBox); + m_diffChangeButton = new KColorButton(tqcolorGroupBox); diffChangeLabel->setBuddy(m_diffChangeButton); - TQLabel* localChangeLabel = new TQLabel(i18n("Local change:"), colorGroupBox); - m_localChangeButton = new KColorButton(colorGroupBox); + TQLabel* localChangeLabel = new TQLabel(i18n("Local change:"), tqcolorGroupBox); + m_localChangeButton = new KColorButton(tqcolorGroupBox); localChangeLabel->setBuddy(m_localChangeButton); - TQLabel* diffInsertLabel = new TQLabel(i18n("Diff insertion:"), colorGroupBox); - m_diffInsertButton = new KColorButton(colorGroupBox); + TQLabel* diffInsertLabel = new TQLabel(i18n("Diff insertion:"), tqcolorGroupBox); + m_diffInsertButton = new KColorButton(tqcolorGroupBox); diffInsertLabel->setBuddy(m_diffInsertButton); - TQLabel* remoteChangeLabel = new TQLabel(i18n("Remote change:"), colorGroupBox); - m_remoteChangeButton = new KColorButton(colorGroupBox); + TQLabel* remoteChangeLabel = new TQLabel(i18n("Remote change:"), tqcolorGroupBox); + m_remoteChangeButton = new KColorButton(tqcolorGroupBox); remoteChangeLabel->setBuddy( m_remoteChangeButton ); - TQLabel* diffDeleteLabel = new TQLabel(i18n("Diff deletion:"), colorGroupBox); - m_diffDeleteButton = new KColorButton(colorGroupBox); + TQLabel* diffDeleteLabel = new TQLabel(i18n("Diff deletion:"), tqcolorGroupBox); + m_diffDeleteButton = new KColorButton(tqcolorGroupBox); diffDeleteLabel->setBuddy(m_diffDeleteButton); - TQLabel* notInCvsLabel = new TQLabel(i18n("Not in cvs:"), colorGroupBox); - m_notInCvsButton = new KColorButton(colorGroupBox); + TQLabel* notInCvsLabel = new TQLabel(i18n("Not in cvs:"), tqcolorGroupBox); + m_notInCvsButton = new KColorButton(tqcolorGroupBox); notInCvsLabel->setBuddy(m_notInCvsButton); m_splitterBox = new TQCheckBox(i18n("Split main window &horizontally"), lookPage); diff --git a/cervisia/settingsdlg.h b/cervisia/settingsdlg.h index 190840d9..ad189bde 100644 --- a/cervisia/settingsdlg.h +++ b/cervisia/settingsdlg.h @@ -35,12 +35,13 @@ class KURLRequester; class AdvancedPage; -class FontButton : public QPushButton +class FontButton : public TQPushButton { Q_OBJECT + TQ_OBJECT public: - FontButton( const TQString &text, TQWidget *parent=0, const char *name=0 ); + FontButton( const TQString &text, TQWidget *tqparent=0, const char *name=0 ); private slots: void chooseFont(); @@ -50,9 +51,10 @@ private slots: class SettingsDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - SettingsDialog( KConfig *conf, TQWidget *parent=0, const char *name=0 ); + SettingsDialog( KConfig *conf, TQWidget *tqparent=0, const char *name=0 ); virtual ~SettingsDialog(); protected slots: diff --git a/cervisia/settingsdlg_advanced.ui b/cervisia/settingsdlg_advanced.ui index 232c2678..1e129e04 100644 --- a/cervisia/settingsdlg_advanced.ui +++ b/cervisia/settingsdlg_advanced.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>AdvancedPage</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>advancedPage</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -26,14 +26,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>41</height> </size> </property> </spacer> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>timeoutLbl</cstring> </property> @@ -44,7 +44,7 @@ <cstring>kcfg_Timeout</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>compressionLbl</cstring> </property> @@ -55,7 +55,7 @@ <cstring>kcfg_Compression</cstring> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>kcfg_UseSshAgent</cstring> </property> @@ -87,7 +87,7 @@ </widget> </grid> </widget> -<layoutdefaults spacing="6" margin="0"/> +<tqlayoutdefaults spacing="6" margin="0"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/cervisia/stringmatcher.cpp b/cervisia/stringmatcher.cpp index 6e70a6e0..189ee925 100644 --- a/cervisia/stringmatcher.cpp +++ b/cervisia/stringmatcher.cpp @@ -43,7 +43,7 @@ namespace bool StringMatcher::match(const TQString& text) const { - if (m_exactPatterns.find(text) != m_exactPatterns.end()) + if (m_exactPatterns.tqfind(text) != m_exactPatterns.end()) { return true; } @@ -133,7 +133,7 @@ unsigned int countMetaCharacters(const TQString& text) { unsigned int count(0); - const TQChar* pos(text.unicode()); + const TQChar* pos(text.tqunicode()); const TQChar* posEnd(pos + text.length()); while (pos < posEnd) { diff --git a/cervisia/tagdlg.cpp b/cervisia/tagdlg.cpp index 7dc3df0c..3563c381 100644 --- a/cervisia/tagdlg.cpp +++ b/cervisia/tagdlg.cpp @@ -35,8 +35,8 @@ using Cervisia::TagDialog; TagDialog::TagDialog(ActionType action, CvsService_stub* service, - TQWidget *parent, const char *name) - : KDialogBase(parent, name, true, TQString::null, + TQWidget *tqparent, const char *name) + : KDialogBase(tqparent, name, true, TQString(), Ok | Cancel | Help, Ok, true), act(action), cvsService(service), @@ -47,7 +47,7 @@ TagDialog::TagDialog(ActionType action, CvsService_stub* service, TQFrame* mainWidget = makeMainWidget(); - TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint()); + TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint()); if (action == Delete) { @@ -61,7 +61,7 @@ TagDialog::TagDialog(ActionType action, CvsService_stub* service, connect( tag_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(tagButtonClicked()) ); - TQBoxLayout *tagedit_layout = new TQHBoxLayout(layout); + TQBoxLayout *tagedit_layout = new TQHBoxLayout(tqlayout); tagedit_layout->addWidget(tag_label); tagedit_layout->addWidget(tag_combo); tagedit_layout->addWidget(tag_button); @@ -74,15 +74,15 @@ TagDialog::TagDialog(ActionType action, CvsService_stub* service, TQLabel *tag_label = new TQLabel(tag_edit, i18n("&Name of tag:"), mainWidget); - TQBoxLayout *tagedit_layout = new TQHBoxLayout(layout); + TQBoxLayout *tagedit_layout = new TQHBoxLayout(tqlayout); tagedit_layout->addWidget(tag_label); tagedit_layout->addWidget(tag_edit); branchtag_button = new TQCheckBox(i18n("Create &branch with this tag"), mainWidget); - layout->addWidget(branchtag_button); + tqlayout->addWidget(branchtag_button); forcetag_button = new TQCheckBox(i18n("&Force tag creation even if tag already exists"), mainWidget); - layout->addWidget(forcetag_button); + tqlayout->addWidget(forcetag_button); } setHelp("taggingbranching"); diff --git a/cervisia/tagdlg.h b/cervisia/tagdlg.h index cd9edcda..57d720bf 100644 --- a/cervisia/tagdlg.h +++ b/cervisia/tagdlg.h @@ -36,12 +36,13 @@ namespace Cervisia class TagDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: enum ActionType { Create, Delete }; TagDialog( ActionType action, CvsService_stub* service, - TQWidget *parent=0, const char *name=0 ); + TQWidget *tqparent=0, const char *name=0 ); bool branchTag() const; bool forceTag() const; diff --git a/cervisia/tooltip.cpp b/cervisia/tooltip.cpp index 728945ca..efc5108e 100644 --- a/cervisia/tooltip.cpp +++ b/cervisia/tooltip.cpp @@ -49,8 +49,8 @@ void ToolTip::maybeTip(const TQPoint& pos) { text = truncateLines(text, font(), - parentWidget()->mapToGlobal(pos), - KGlobalSettings::desktopGeometry(parentWidget())); + tqparentWidget()->mapToGlobal(pos), + KGlobalSettings::desktopGeometry(tqparentWidget())); tip(rect, text); } } @@ -66,18 +66,18 @@ TQString truncateLines(const TQString& text, const TQChar newLine('\n'); const int lineSpacing(fm.lineSpacing()); - const int numberOfLines(text.contains(newLine) + 1); + const int numberOfLines(text.tqcontains(newLine) + 1); const int maxNumberOfLines(size.height() / lineSpacing); if (numberOfLines <= maxNumberOfLines) return text; - const TQChar* unicode(text.unicode()); - for (int count(maxNumberOfLines); count; ++unicode) - if (*unicode == newLine) + const TQChar* tqunicode(text.tqunicode()); + for (int count(maxNumberOfLines); count; ++tqunicode) + if (*tqunicode == newLine) --count; - return text.left(unicode - text.unicode() - 1); + return text.left(tqunicode - text.tqunicode() - 1); } @@ -94,12 +94,12 @@ TQString truncateLines(const TQString& text, - desktopGeometry.top() - 10); // calculate the tooltip's size - const TQSimpleRichText layoutedText(text, font); + const TQSimpleRichText tqlayoutedText(text, font); // only if the tooltip's size is bigger in x- and y-direction the text must // be truncated otherwise the tip is moved to a position where it fits - return ((layoutedText.widthUsed() > maxWidth) - && (layoutedText.height() > maxHeight)) + return ((tqlayoutedText.widthUsed() > maxWidth) + && (tqlayoutedText.height() > maxHeight)) ? truncateLines(text, TQFontMetrics(font), TQSize(maxWidth, maxHeight)) : text; } diff --git a/cervisia/tooltip.h b/cervisia/tooltip.h index f6a47999..1036af5b 100644 --- a/cervisia/tooltip.h +++ b/cervisia/tooltip.h @@ -34,15 +34,16 @@ namespace Cervisia * - no more need to subclass just connect to the signal queryToolTip() * - truncate too large tooltip texts. */ -class ToolTip : public TQObject, public QToolTip +class ToolTip : public TQObject, public TQToolTip { Q_OBJECT + TQ_OBJECT public: /** * @param widget The widget you want to add tooltips to. It's also used as - * parent for the TQObject. So you don't have to free an instance of this + * tqparent for the TQObject. So you don't have to free an instance of this * class yourself. */ explicit ToolTip(TQWidget* widget); @@ -54,9 +55,9 @@ signals: * wants to display anythink it must set a valid tooltip rectangle and a * non empty text. * - * @param pos The position of the tooltip in the parent widget's coordinate system. + * @param pos The position of the tooltip in the tqparent widget's coordinate system. * - * @param rect The rectangle in the parent widget's coordinate system where the + * @param rect The rectangle in the tqparent widget's coordinate system where the * tooltip is valid. * * @param text The tooltip text. diff --git a/cervisia/updatedlg.cpp b/cervisia/updatedlg.cpp index 4cd4367c..71e88ebe 100644 --- a/cervisia/updatedlg.cpp +++ b/cervisia/updatedlg.cpp @@ -34,21 +34,21 @@ UpdateDialog::UpdateDialog(CvsService_stub* service, - TQWidget *parent, const char *name) - : KDialogBase(parent, name, true, i18n("CVS Update"), + TQWidget *tqparent, const char *name) + : KDialogBase(tqparent, name, true, i18n("CVS Update"), Ok | Cancel, Ok, true), cvsService(service) { int const iComboBoxMinWidth(40 * fontMetrics().width('0')); - int const iWidgetIndent(style().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0) + 6); + int const iWidgetIndent(tqstyle().tqpixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0) + 6); TQFrame* mainWidget = makeMainWidget(); - TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint()); + TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint()); bybranch_button = new TQRadioButton(i18n("Update to &branch: "), mainWidget); bybranch_button->setChecked(true); - layout->addWidget(bybranch_button); + tqlayout->addWidget(bybranch_button); branch_combo = new TQComboBox(true, mainWidget); branch_combo->setMinimumWidth(iComboBoxMinWidth); @@ -57,13 +57,13 @@ UpdateDialog::UpdateDialog(CvsService_stub* service, connect( branch_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(branchButtonClicked()) ); - TQBoxLayout *branchedit_layout = new TQHBoxLayout(layout); + TQBoxLayout *branchedit_layout = new TQHBoxLayout(tqlayout); branchedit_layout->addSpacing(iWidgetIndent); branchedit_layout->addWidget(branch_combo); branchedit_layout->addWidget(branch_button); bytag_button = new TQRadioButton(i18n("Update to &tag: "), mainWidget); - layout->addWidget(bytag_button); + tqlayout->addWidget(bytag_button); tag_combo = new TQComboBox(true, mainWidget); tag_combo->setMinimumWidth(iComboBoxMinWidth); @@ -72,17 +72,17 @@ UpdateDialog::UpdateDialog(CvsService_stub* service, connect( tag_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(tagButtonClicked()) ); - TQBoxLayout *tagedit_layout = new TQHBoxLayout(layout); + TQBoxLayout *tagedit_layout = new TQHBoxLayout(tqlayout); tagedit_layout->addSpacing(iWidgetIndent); tagedit_layout->addWidget(tag_combo); tagedit_layout->addWidget(tag_button); bydate_button = new TQRadioButton(i18n("Update to &date ('yyyy-mm-dd'):"), mainWidget); - layout->addWidget(bydate_button); + tqlayout->addWidget(bydate_button); date_edit = new KLineEdit(mainWidget); - TQBoxLayout *dateedit_layout = new TQHBoxLayout(layout); + TQBoxLayout *dateedit_layout = new TQHBoxLayout(tqlayout); dateedit_layout->addSpacing(iWidgetIndent); dateedit_layout->addWidget(date_edit); diff --git a/cervisia/updatedlg.h b/cervisia/updatedlg.h index de7b7354..883342b4 100644 --- a/cervisia/updatedlg.h +++ b/cervisia/updatedlg.h @@ -35,10 +35,11 @@ class CvsService_stub; class UpdateDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: UpdateDialog( CvsService_stub* service, - TQWidget *parent=0, const char *name=0 ); + TQWidget *tqparent=0, const char *name=0 ); bool byTag() const; TQString tag() const; diff --git a/cervisia/updateview.cpp b/cervisia/updateview.cpp index 710eabd8..62e691ee 100644 --- a/cervisia/updateview.cpp +++ b/cervisia/updateview.cpp @@ -35,11 +35,11 @@ using Cervisia::Entry; -using Cervisia::EntryStatus; +using Cervisia::EntrytqStatus; -UpdateView::UpdateView(KConfig& partConfig, TQWidget *parent, const char *name) - : KListView(parent, name), +UpdateView::UpdateView(KConfig& partConfig, TQWidget *tqparent, const char *name) + : KListView(tqparent, name), m_partConfig(partConfig), m_unfoldingTree(false) { @@ -49,7 +49,7 @@ UpdateView::UpdateView(KConfig& partConfig, TQWidget *parent, const char *name) addColumn(i18n("File Name"), 280); addColumn(i18n("File Type"), 180); - addColumn(i18n("Status"), 90); + addColumn(i18n("tqStatus"), 90); addColumn(i18n("Revision"), 70); addColumn(i18n("Tag/Date"), 90); addColumn(i18n("Timestamp"), 120); @@ -65,13 +65,13 @@ UpdateView::UpdateView(KConfig& partConfig, TQWidget *parent, const char *name) for (int col = 0; col < columns(); ++col) setColumnWidthMode(col, TQListView::Manual); - restoreLayout(&m_partConfig, TQString::fromLatin1("UpdateView")); + restoreLayout(&m_partConfig, TQString::tqfromLatin1("UpdateView")); } UpdateView::~UpdateView() { - saveLayout(&m_partConfig, TQString::fromLatin1("UpdateView")); + saveLayout(&m_partConfig, TQString::tqfromLatin1("UpdateView")); } @@ -191,9 +191,9 @@ bool UpdateView::isUnfoldingTree() const void UpdateView::replaceItem(TQListViewItem* oldItem, TQListViewItem* newItem) { - const int index(relevantSelection.find(oldItem)); + const int index(relevantSelection.tqfind(oldItem)); if (index >= 0) - relevantSelection.replace(index, newItem); + relevantSelection.tqreplace(index, newItem); } @@ -208,8 +208,8 @@ void UpdateView::unfoldSelectedFolders() // setup name of selected folder TQString selectedItem = selection.first(); - if( selectedItem.contains('/') ) - selectedItem.remove(0, selectedItem.findRev('/')+1); + if( selectedItem.tqcontains('/') ) + selectedItem.remove(0, selectedItem.tqfindRev('/')+1); // avoid flicker const bool updatesEnabled = isUpdatesEnabled(); @@ -234,7 +234,7 @@ void UpdateView::unfoldSelectedFolders() dirItem->maybeScanDir(recursive); // scanning can take some time so keep the gui alive - qApp->processEvents(); + tqApp->processEvents(); } dirItem->setOpen(!isUnfolded); @@ -254,7 +254,7 @@ void UpdateView::unfoldSelectedFolders() dirItem->maybeScanDir(recursive); // scanning can take some time so keep the gui alive - qApp->processEvents(); + tqApp->processEvents(); } dirItem->setOpen(!isUnfolded); @@ -305,7 +305,7 @@ void UpdateView::unfoldTree() dirItem->maybeScanDir(recursive); // scanning can take some time so keep the gui alive - qApp->processEvents(); + tqApp->processEvents(); } dirItem->setOpen(true); @@ -333,7 +333,7 @@ void UpdateView::foldTree() while (TQListViewItem* item = it.current()) { // don't close the top level directory - if (isDirItem(item) && item->parent()) + if (isDirItem(item) && item->tqparent()) item->setOpen(false); ++it; @@ -500,8 +500,8 @@ void UpdateView::syncSelection() UpdateDirItem* dirItem(0); if (isDirItem(item)) dirItem = static_cast<UpdateDirItem*>(item); - else if (TQListViewItem* parentItem = item->parent()) - dirItem = static_cast<UpdateDirItem*>(parentItem); + else if (TQListViewItem* tqparentItem = item->tqparent()) + dirItem = static_cast<UpdateDirItem*>(tqparentItem); if (dirItem) setDirItems.insert(dirItem); @@ -518,7 +518,7 @@ void UpdateView::syncSelection() dirItem->syncWithDirectory(); dirItem->syncWithEntries(); - qApp->processEvents(); + tqApp->processEvents(); } TQApplication::restoreOverrideCursor(); @@ -548,7 +548,7 @@ void UpdateView::updateColors() /** - * Process one line from the output of 'cvs update'. If parseAsStatus + * Process one line from the output of 'cvs update'. If parseAstqStatus * is true, it is assumed that the output is from a command * 'cvs update -n', i.e. cvs actually changes no files. */ @@ -556,7 +556,7 @@ void UpdateView::processUpdateLine(TQString str) { if (str.length() > 2 && str[1] == ' ') { - EntryStatus status(Cervisia::Unknown); + EntrytqStatus status(Cervisia::Unknown); switch (str[0].latin1()) { case 'C': @@ -586,8 +586,8 @@ void UpdateView::processUpdateLine(TQString str) updateItem(str.mid(2), status, false); } - const TQString removedFileStart(TQString::fromLatin1("cvs server: ")); - const TQString removedFileEnd(TQString::fromLatin1(" is no longer in the repository")); + const TQString removedFileStart(TQString::tqfromLatin1("cvs server: ")); + const TQString removedFileEnd(TQString::tqfromLatin1(" is no longer in the repository")); if (str.startsWith(removedFileStart) && str.endsWith(removedFileEnd)) { } @@ -600,7 +600,7 @@ void UpdateView::processUpdateLine(TQString str) } -void UpdateView::updateItem(const TQString& filePath, EntryStatus status, bool isdir) +void UpdateView::updateItem(const TQString& filePath, EntrytqStatus status, bool isdir) { if (isdir && filePath == TQChar('.')) return; diff --git a/cervisia/updateview.h b/cervisia/updateview.h index d583b16b..ecf5fcf4 100644 --- a/cervisia/updateview.h +++ b/cervisia/updateview.h @@ -35,6 +35,7 @@ class KConfig; class UpdateView : public KListView { Q_OBJECT + TQ_OBJECT public: @@ -42,7 +43,7 @@ public: NoRemoved=4, NoNotInCVS=8 , NoEmptyDirectories = 16 }; enum Action { Add, Remove, Update, UpdateNoAct, Commit }; - explicit UpdateView(KConfig& partConfig, TQWidget *parent=0, const char *name=0); + explicit UpdateView(KConfig& partConfig, TQWidget *tqparent=0, const char *name=0); virtual ~UpdateView(); @@ -85,7 +86,7 @@ private slots: void itemExecuted(TQListViewItem *item); private: - void updateItem(const TQString &filename, Cervisia::EntryStatus status, bool isdir); + void updateItem(const TQString &filename, Cervisia::EntrytqStatus status, bool isdir); void rememberSelection(bool recursive); void syncSelection(); void markUpdated(bool laststage, bool success); diff --git a/cervisia/updateview_items.cpp b/cervisia/updateview_items.cpp index 582c9aae..efa83593 100644 --- a/cervisia/updateview_items.cpp +++ b/cervisia/updateview_items.cpp @@ -39,7 +39,7 @@ using Cervisia::Entry; -using Cervisia::EntryStatus; +using Cervisia::EntrytqStatus; // ------------------------------------------------------------------------------ @@ -51,16 +51,16 @@ TQString UpdateItem::dirPath() const { TQString path; - const UpdateItem* item = static_cast<UpdateItem*>(parent()); + const UpdateItem* item = static_cast<UpdateItem*>(tqparent()); while (item) { - const UpdateItem* parentItem = static_cast<UpdateItem*>(item->parent()); - if (parentItem) + const UpdateItem* tqparentItem = static_cast<UpdateItem*>(item->tqparent()); + if (tqparentItem) { path.prepend(item->m_entry.m_name + TQDir::separator()); } - item = parentItem; + item = tqparentItem; } return path; @@ -70,7 +70,7 @@ TQString UpdateItem::dirPath() const TQString UpdateItem::filePath() const { // the filePath of the root item is '.' - return parent() ? dirPath() + m_entry.m_name : TQChar('.'); + return tqparent() ? dirPath() + m_entry.m_name : TQChar('.'); } @@ -79,9 +79,9 @@ TQString UpdateItem::filePath() const // ------------------------------------------------------------------------------ -UpdateDirItem::UpdateDirItem(UpdateDirItem* parent, +UpdateDirItem::UpdateDirItem(UpdateDirItem* tqparent, const Entry& entry) - : UpdateItem(parent, entry), + : UpdateItem(tqparent, entry), m_opened(false) { setExpandable(true); @@ -89,9 +89,9 @@ UpdateDirItem::UpdateDirItem(UpdateDirItem* parent, } -UpdateDirItem::UpdateDirItem(UpdateView* parent, +UpdateDirItem::UpdateDirItem(UpdateView* tqparent, const Entry& entry) - : UpdateItem(parent, entry), + : UpdateItem(tqparent, entry), m_opened(false) { setExpandable(true); @@ -103,7 +103,7 @@ UpdateDirItem::UpdateDirItem(UpdateView* parent, * Update the status of an item; if it doesn't exist yet, create new one */ void UpdateDirItem::updateChildItem(const TQString& name, - EntryStatus status, + EntrytqStatus status, bool isdir) { if (UpdateItem* item = findItem(name)) @@ -111,7 +111,7 @@ void UpdateDirItem::updateChildItem(const TQString& name, if (isFileItem(item)) { UpdateFileItem* fileItem = static_cast<UpdateFileItem*>(item); - fileItem->setStatus(status); + fileItem->settqStatus(status); } return; } @@ -127,7 +127,7 @@ void UpdateDirItem::updateChildItem(const TQString& name, else { entry.m_type = Entry::File; - createFileItem(entry)->setStatus(status); + createFileItem(entry)->settqStatus(status); } } @@ -150,7 +150,7 @@ void UpdateDirItem::updateEntriesItem(const Entry& entry, entry.m_status == Cervisia::LocallyRemoved || entry.m_status == Cervisia::Conflict) { - fileItem->setStatus(entry.m_status); + fileItem->settqStatus(entry.m_status); } fileItem->setRevTag(entry.m_revision, entry.m_tag); fileItem->setDate(entry.m_dateTime); @@ -175,10 +175,10 @@ void UpdateDirItem::scanDirectory() const CvsDir dir(path); - const QFileInfoList *files = dir.entryInfoList(); + const TQFileInfoList *files = dir.entryInfoList(); if (files) { - QFileInfoListIterator it(*files); + TQFileInfoListIterator it(*files); for (; it.current(); ++it) { Entry entry; @@ -217,7 +217,7 @@ UpdateFileItem* UpdateDirItem::createFileItem(const Entry& entry) UpdateItem* UpdateDirItem::insertItem(UpdateItem* item) { - QPair<TMapItemsByName::iterator, bool> result + TQPair<TMapItemsByName::iterator, bool> result = m_itemsByName.insert(TMapItemsByName::value_type(item->entry().m_name, item)); if (!result.second) { @@ -245,15 +245,15 @@ UpdateItem* UpdateDirItem::insertItem(UpdateItem* item) UpdateItem* UpdateDirItem::findItem(const TQString& name) const { - const TMapItemsByName::const_iterator it = m_itemsByName.find(name); + const TMapItemsByName::const_iterator it = m_itemsByName.tqfind(name); return (it != m_itemsByName.end()) ? *it : 0; } -// Qt-3.3.8 changed the parsing in TQDateTime::fromString() but introduced +// TQt-3.3.8 changed the parsing in TQDateTime::fromString() but introduced // a bug which leads to the problem that days with 1 digit will incorrectly being // parsed as day 0 - which is invalid. -// workaround with the implementation from Qt-3.3.6 +// workaround with the implementation from TQt-3.3.6 TQDateTime parseDateTime(const TQString &s) { static const char * const qt_shortMonthNames[] = { @@ -288,7 +288,7 @@ TQDateTime parseDateTime(const TQString &s) TQDate date( year, month, day ); TQTime time; int hour, minute, second; - int pivot = s.find( TQRegExp(TQString::fromLatin1("[0-9][0-9]:[0-9][0-9]:[0-9][0-9]")) ); + int pivot = s.tqfind( TQRegExp(TQString::tqfromLatin1("[0-9][0-9]:[0-9][0-9]:[0-9][0-9]")) ); if ( pivot != -1 ) { hour = s.mid( pivot, 2 ).toInt(); minute = s.mid( pivot+3, 2 ).toInt(); @@ -337,7 +337,7 @@ void UpdateDirItem::syncWithEntries() const TQString options(line.section('/', 4, 4)); entry.m_tag = line.section('/', 5, 5); - const bool isBinary(options.find("-kb") >= 0); + const bool isBinary(options.tqfind("-kb") >= 0); // file date in local time entry.m_dateTime = TQFileInfo(path + entry.m_name).lastModified(); @@ -349,13 +349,13 @@ void UpdateDirItem::syncWithEntries() entry.m_status = Cervisia::LocallyRemoved; rev.remove(0, 1); } - else if (timestamp.find('+') >= 0) + else if (timestamp.tqfind('+') >= 0) { entry.m_status = Cervisia::Conflict; } else { - // workaround Qt-3.3.8 bug with our own function (see function above) + // workaround TQt-3.3.8 bug with our own function (see function above) // const TQDateTime date(TQDateTime::fromString(timestamp)); // UTC Time const TQDateTime date(parseDateTime(timestamp)); // UTC Time TQDateTime fileDateUTC; @@ -392,8 +392,8 @@ void UpdateDirItem::syncWithDirectory() // is file removed? if (!dir.exists(it.key())) { - fileItem->setStatus(Cervisia::Removed); - fileItem->setRevTag(TQString::null, TQString::null); + fileItem->settqStatus(Cervisia::Removed); + fileItem->setRevTag(TQString(), TQString()); } } } @@ -494,21 +494,21 @@ TQString UpdateDirItem::text(int column) const // ------------------------------------------------------------------------------ -UpdateFileItem::UpdateFileItem(UpdateDirItem* parent, const Entry& entry) - : UpdateItem(parent, entry), +UpdateFileItem::UpdateFileItem(UpdateDirItem* tqparent, const Entry& entry) + : UpdateItem(tqparent, entry), m_undefined(false) { } -void UpdateFileItem::setStatus(EntryStatus status) +void UpdateFileItem::settqStatus(EntrytqStatus status) { if (status != m_entry.m_status) { m_entry.m_status = status; const bool visible(applyFilter(updateView()->filter())); if (visible) - repaint(); + tqrepaint(); } m_undefined = false; } @@ -584,7 +584,7 @@ void UpdateFileItem::setRevTag(const TQString& rev, const TQString& tag) if (isVisible()) { widthChanged(); - repaint(); + tqrepaint(); } } @@ -598,13 +598,13 @@ void UpdateFileItem::setDate(const TQDateTime& date) void UpdateFileItem::markUpdated(bool laststage, bool success) { - EntryStatus newstatus = m_entry.m_status; + EntrytqStatus newstatus = m_entry.m_status; if (laststage) { if (undefinedState() && m_entry.m_status != Cervisia::NotInCVS) newstatus = success? Cervisia::UpToDate : Cervisia::Unknown; - setStatus(newstatus); + settqStatus(newstatus); } else setUndefinedState(true); @@ -668,7 +668,7 @@ int UpdateFileItem::compare(TQListViewItem* i, case MimeType: iResult = KMimeType::findByPath(entry().m_name)->comment().localeAwareCompare(KMimeType::findByPath(item->entry().m_name)->comment()); break; - case Status: + case tqStatus: if ((iResult = ::compare(statusClass(), item->statusClass())) == 0) iResult = entry().m_name.localeAwareCompare(item->entry().m_name); break; @@ -698,7 +698,7 @@ TQString UpdateFileItem::text(int column) const case MimeType: result = KMimeType::findByPath(entry().m_name)->comment(); break; - case Status: + case tqStatus: result = toString(entry().m_status); break; case Revision: diff --git a/cervisia/updateview_items.h b/cervisia/updateview_items.h index 0b24ca85..83bd0efc 100644 --- a/cervisia/updateview_items.h +++ b/cervisia/updateview_items.h @@ -38,20 +38,20 @@ class Visitor; UpdateDirItem* findOrCreateDirItem(const TQString&, UpdateDirItem*); -class UpdateItem : public QListViewItem +class UpdateItem : public TQListViewItem { public: - UpdateItem(UpdateView* parent, const Cervisia::Entry& entry) - : TQListViewItem(parent), m_entry(entry) {} - UpdateItem(UpdateItem* parent, const Cervisia::Entry& entry) - : TQListViewItem(parent), m_entry(entry) {} + UpdateItem(UpdateView* tqparent, const Cervisia::Entry& entry) + : TQListViewItem(tqparent), m_entry(entry) {} + UpdateItem(UpdateItem* tqparent, const Cervisia::Entry& entry) + : TQListViewItem(tqparent), m_entry(entry) {} const Cervisia::Entry& entry() const { return m_entry; } // Returns the path (relative to the repository). - // TQString::null for the root item and its (direct) children. - // If it's not TQString::null it ends with '/'. + // TQString() for the root item and its (direct) tqchildren. + // If it's not TQString() it ends with '/'. TQString dirPath() const; // Returns the file name, including the path (relative to the repository) @@ -73,12 +73,12 @@ public: enum { Name }; - UpdateDirItem(UpdateView* parent, const Cervisia::Entry& entry); - UpdateDirItem(UpdateDirItem* parent, const Cervisia::Entry& entry); + UpdateDirItem(UpdateView* tqparent, const Cervisia::Entry& entry); + UpdateDirItem(UpdateDirItem* tqparent, const Cervisia::Entry& entry); void syncWithDirectory(); void syncWithEntries(); - void updateChildItem(const TQString& name, Cervisia::EntryStatus status, bool isdir); + void updateChildItem(const TQString& name, Cervisia::EntrytqStatus status, bool isdir); void updateEntriesItem(const Cervisia::Entry& entry, bool isBinary); bool wasScanned() const { return m_opened; } @@ -119,9 +119,9 @@ class UpdateFileItem : public UpdateItem { public: - enum { Name, MimeType, Status, Revision, TagOrDate, Timestamp }; + enum { Name, MimeType, tqStatus, Revision, TagOrDate, Timestamp }; - UpdateFileItem(UpdateDirItem* parent, const Cervisia::Entry& entry); + UpdateFileItem(UpdateDirItem* tqparent, const Cervisia::Entry& entry); bool undefinedState() const { return m_undefined; } @@ -132,7 +132,7 @@ public: int col, int width, int align); virtual int rtti() const { return RTTI; } - void setStatus(Cervisia::EntryStatus status); + void settqStatus(Cervisia::EntrytqStatus status); void setRevTag(const TQString& rev, const TQString& tag); void setDate(const TQDateTime& date); void setUndefinedState(bool b) diff --git a/cervisia/updateview_visitors.cpp b/cervisia/updateview_visitors.cpp index 0dae046b..74e7f41b 100644 --- a/cervisia/updateview_visitors.cpp +++ b/cervisia/updateview_visitors.cpp @@ -47,14 +47,14 @@ void ApplyFilterVisitor::preVisit(UpdateDirItem* item) void ApplyFilterVisitor::postVisit(UpdateDirItem* item) { // a UpdateDirItem is visible if - // - it has visible children + // - it has visible tqchildren // - it is not opened // - empty directories are not hidden - // - it has no parent (top level item) + // - it has no tqparent (top level item) const bool visible(!m_invisibleDirItems.count(item) || !item->wasScanned() || !(m_filter & UpdateView::NoEmptyDirectories) - || !item->parent()); + || !item->tqparent()); // only set invisible as TQListViewItem::setVisible() is recursive // and so maybe overrides the state applied by the filter @@ -81,7 +81,7 @@ void ApplyFilterVisitor::visit(UpdateFileItem* item) void ApplyFilterVisitor::markAllParentsAsVisible(UpdateItem* item) { - while ((item = static_cast<UpdateDirItem*>(item->parent()))) + while ((item = static_cast<UpdateDirItem*>(item->tqparent()))) { TItemSet::iterator it = m_invisibleDirItems.find(item); if (it != m_invisibleDirItems.end()) @@ -90,7 +90,7 @@ void ApplyFilterVisitor::markAllParentsAsVisible(UpdateItem* item) } else { - // if this item isn't in the map anymore all parents + // if this item isn't in the map anymore all tqparents // are already removed too break; } diff --git a/cervisia/watchdlg.cpp b/cervisia/watchdlg.cpp index 1ea42da6..2e1fc74e 100644 --- a/cervisia/watchdlg.cpp +++ b/cervisia/watchdlg.cpp @@ -28,45 +28,45 @@ #include <klocale.h> -WatchDialog::WatchDialog(ActionType action, TQWidget *parent, const char *name) - : KDialogBase(parent, name, true, TQString::null, +WatchDialog::WatchDialog(ActionType action, TQWidget *tqparent, const char *name) + : KDialogBase(tqparent, name, true, TQString(), Ok | Cancel | Help, Ok, true) { setCaption( (action==Add)? i18n("CVS Watch Add") : i18n("CVS Watch Remove") ); TQFrame* mainWidget = makeMainWidget(); - TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint()); + TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint()); - TQLabel *textlabel = new QLabel + TQLabel *textlabel = new TQLabel ( (action==Add)? i18n("Add watches for the following events:") : i18n("Remove watches for the following events:"), mainWidget ); - layout->addWidget(textlabel, 0); + tqlayout->addWidget(textlabel, 0); all_button = new TQRadioButton(i18n("&All"), mainWidget); all_button->setFocus(); all_button->setChecked(true); - layout->addWidget(all_button); + tqlayout->addWidget(all_button); only_button = new TQRadioButton(i18n("&Only:"), mainWidget); - layout->addWidget(only_button); + tqlayout->addWidget(only_button); - TQGridLayout *eventslayout = new TQGridLayout(layout); - eventslayout->addColSpacing(0, 20); - eventslayout->setColStretch(0, 0); - eventslayout->setColStretch(1, 1); + TQGridLayout *eventstqlayout = new TQGridLayout(tqlayout); + eventstqlayout->addColSpacing(0, 20); + eventstqlayout->setColStretch(0, 0); + eventstqlayout->setColStretch(1, 1); commitbox = new TQCheckBox(i18n("&Commits"), mainWidget); commitbox->setEnabled(false); - eventslayout->addWidget(commitbox, 0, 1); + eventstqlayout->addWidget(commitbox, 0, 1); editbox = new TQCheckBox(i18n("&Edits"), mainWidget); editbox->setEnabled(false); - eventslayout->addWidget(editbox, 1, 1); + eventstqlayout->addWidget(editbox, 1, 1); uneditbox = new TQCheckBox(i18n("&Unedits"), mainWidget); uneditbox->setEnabled(false); - eventslayout->addWidget(uneditbox, 2, 1); + eventstqlayout->addWidget(uneditbox, 2, 1); TQButtonGroup* group = new TQButtonGroup(mainWidget); group->hide(); diff --git a/cervisia/watchdlg.h b/cervisia/watchdlg.h index ea7e9b39..3189d676 100644 --- a/cervisia/watchdlg.h +++ b/cervisia/watchdlg.h @@ -35,7 +35,7 @@ public: enum ActionType { Add, Remove }; enum Events { None=0, All=1, Commits=2, Edits=4, Unedits=8 }; - explicit WatchDialog( ActionType action, TQWidget *parent=0, const char *name=0 ); + explicit WatchDialog( ActionType action, TQWidget *tqparent=0, const char *name=0 ); Events events() const; diff --git a/cervisia/watchersdlg.cpp b/cervisia/watchersdlg.cpp index 157f154b..ea42f053 100644 --- a/cervisia/watchersdlg.cpp +++ b/cervisia/watchersdlg.cpp @@ -30,14 +30,14 @@ #include "progressdlg.h" -WatchersDialog::WatchersDialog(KConfig& cfg, TQWidget* parent, const char* name) - : KDialogBase(parent, name, false, TQString::null, +WatchersDialog::WatchersDialog(KConfig& cfg, TQWidget* tqparent, const char* name) + : KDialogBase(tqparent, name, false, TQString(), Close, ButtonCode(0), true) , partConfig(cfg) { TQFrame* mainWidget = makeMainWidget(); - TQBoxLayout *layout = new TQVBoxLayout(mainWidget, 0, spacingHint()); + TQBoxLayout *tqlayout = new TQVBoxLayout(mainWidget, 0, spacingHint()); table = new TQTable(mainWidget, "watchersTable"); table->setNumCols(5); @@ -57,9 +57,9 @@ WatchersDialog::WatchersDialog(KConfig& cfg, TQWidget* parent, const char* name) header->setLabel(3, i18n("Unedit")); header->setLabel(4, i18n("Commit")); - layout->addWidget(table, 1); + tqlayout->addWidget(table, 1); - setWFlags(Qt::WDestructiveClose | getWFlags()); + setWFlags(TQt::WDestructiveClose | getWFlags()); TQSize size = configDialogSize(partConfig, "WatchersDialog"); resize(size); @@ -103,15 +103,15 @@ bool WatchersDialog::parseWatchers(CvsService_stub* cvsService, table->setText(numRows, 1, list[1]); TQCheckTableItem* item = new TQCheckTableItem(table, ""); - item->setChecked(list.contains("edit")); + item->setChecked(list.tqcontains("edit")); table->setItem(numRows, 2, item); item = new TQCheckTableItem(table, ""); - item->setChecked(list.contains("unedit")); + item->setChecked(list.tqcontains("unedit")); table->setItem(numRows, 3, item); item = new TQCheckTableItem(table, ""); - item->setChecked(list.contains("commit")); + item->setChecked(list.tqcontains("commit")); table->setItem(numRows, 4, item); ++numRows; diff --git a/cervisia/watchersdlg.h b/cervisia/watchersdlg.h index fff50d88..9cfb023a 100644 --- a/cervisia/watchersdlg.h +++ b/cervisia/watchersdlg.h @@ -31,7 +31,7 @@ class CvsService_stub; class WatchersDialog : public KDialogBase { public: - explicit WatchersDialog(KConfig& cfg, TQWidget* parent = 0, + explicit WatchersDialog(KConfig& cfg, TQWidget* tqparent = 0, const char* name = 0); virtual ~WatchersDialog(); diff --git a/kapptemplate/appframework/app.spec b/kapptemplate/appframework/app.spec index b0f3fd48..8cd1be53 100644 --- a/kapptemplate/appframework/app.spec +++ b/kapptemplate/appframework/app.spec @@ -34,8 +34,8 @@ make -j$numprocs make install-strip DESTDIR=\$RPM_BUILD_ROOT cd $RPM_BUILD_ROOT -find . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > $RPM_BUILD_DIR/%{name}-master.list -find . -type f -o -type l | sed 's|^\.||' >> \$RPM_BUILD_DIR/%{name}-master.list +tqfind . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > $RPM_BUILD_DIR/%{name}-master.list +tqfind . -type f -o -type l | sed 's|^\.||' >> \$RPM_BUILD_DIR/%{name}-master.list %clean rm -rf \$RPM_BUILD_DIR/%{name}-%{version} diff --git a/kapptemplate/existing/app-Makefile.am b/kapptemplate/existing/app-Makefile.am index 79236a7f..5241a4f2 100644 --- a/kapptemplate/existing/app-Makefile.am +++ b/kapptemplate/existing/app-Makefile.am @@ -23,7 +23,7 @@ ${APP_NAME_LC}_SOURCES = ${EXISTING_SOURCE} # these are the headers for your project that won't be installed noinst_HEADERS = ${EXISTING_HEADER} -# let automoc handle all of the meta source files (moc) +# let autotqmoc handle all of the meta source files (tqmoc) METASOURCES = AUTO messages: rc.cpp diff --git a/kapptemplate/kapp/app-Makefile.am b/kapptemplate/kapp/app-Makefile.am index 9ed82a08..5cf0ca86 100644 --- a/kapptemplate/kapp/app-Makefile.am +++ b/kapptemplate/kapp/app-Makefile.am @@ -31,7 +31,7 @@ ${APP_NAME_LC}_client_LDFLAGS = \$(KDE_RPATH) \$(all_libraries) ${APP_NAME_LC}_client_LDADD = \$(LIB_KDECORE) ${APP_NAME_LC}_client_SOURCES = ${APP_NAME_LC}_client.cpp -# let automoc handle all of the meta source files (moc) +# let autotqmoc handle all of the meta source files (tqmoc) METASOURCES = AUTO messages: rc.cpp diff --git a/kapptemplate/kapp/app.cpp b/kapptemplate/kapp/app.cpp index 04f88108..a1333cf7 100644 --- a/kapptemplate/kapp/app.cpp +++ b/kapptemplate/kapp/app.cpp @@ -144,7 +144,7 @@ void ${APP_NAME}::dragEnterEvent(TQDragEnterEvent *event) void ${APP_NAME}::dropEvent(TQDropEvent *event) { // this is a very simplistic implementation of a drop event. we - // will only accept a dropped URL. the Qt dnd code can do *much* + // will only accept a dropped URL. the TQt dnd code can do *much* // much more, so please read the docs there KURL::List urls; @@ -174,7 +174,7 @@ void ${APP_NAME}::fileOpen() // this slot is called whenever the File->Open menu is selected, // the Open shortcut is pressed (usually CTRL+O) or the Open toolbar // button is clicked - KURL url = KURLRequesterDlg::getURL(TQString::null, this, i18n("Open Location") ); + KURL url = KURLRequesterDlg::getURL(TQString(), this, i18n("Open Location") ); if (!url.isEmpty()) m_view->openURL(url); } @@ -206,7 +206,7 @@ void ${APP_NAME}::filePrint() if (!m_printer) m_printer = new KPrinter; if (m_printer->setup(this)) { - // setup the printer. with Qt, you always "print" to a + // setup the printer. with TQt, you always "print" to a // TQPainter.. whether the output medium is a pixmap, a screen, // or paper TQPainter p; diff --git a/kapptemplate/kapp/app.h b/kapptemplate/kapp/app.h index 2b1d1d55..dfcbf7cc 100644 --- a/kapptemplate/kapp/app.h +++ b/kapptemplate/kapp/app.h @@ -26,6 +26,7 @@ class KURL; class ${APP_NAME} : public KMainWindow { Q_OBJECT + TQ_OBJECT public: /** * Default Constructor @@ -44,7 +45,7 @@ public: protected: /** - * Overridden virtuals for Qt drag 'n drop (XDND) + * Overridden virtuals for TQt drag 'n drop (XDND) */ virtual void dragEnterEvent(TQDragEnterEvent *event); virtual void dropEvent(TQDropEvent *event); diff --git a/kapptemplate/kapp/apppref.cpp b/kapptemplate/kapp/apppref.cpp index 6a479b83..5ab7d8a6 100644 --- a/kapptemplate/kapp/apppref.cpp +++ b/kapptemplate/kapp/apppref.cpp @@ -22,20 +22,20 @@ ${APP_NAME}Preferences::${APP_NAME}Preferences() m_pageTwo = new ${APP_NAME}PrefPageTwo(frame); } -${APP_NAME}PrefPageOne::${APP_NAME}PrefPageOne(TQWidget *parent) - : TQFrame(parent) +${APP_NAME}PrefPageOne::${APP_NAME}PrefPageOne(TQWidget *tqparent) + : TQFrame(tqparent) { - TQHBoxLayout *layout = new TQHBoxLayout(this); - layout->setAutoAdd(true); + TQHBoxLayout *tqlayout = new TQHBoxLayout(this); + tqlayout->setAutoAdd(true); new TQLabel("Add something here", this); } -${APP_NAME}PrefPageTwo::${APP_NAME}PrefPageTwo(TQWidget *parent) - : TQFrame(parent) +${APP_NAME}PrefPageTwo::${APP_NAME}PrefPageTwo(TQWidget *tqparent) + : TQFrame(tqparent) { - TQHBoxLayout *layout = new TQHBoxLayout(this); - layout->setAutoAdd(true); + TQHBoxLayout *tqlayout = new TQHBoxLayout(this); + tqlayout->setAutoAdd(true); new TQLabel("Add something here", this); } diff --git a/kapptemplate/kapp/apppref.h b/kapptemplate/kapp/apppref.h index 234223f6..c20c8af3 100644 --- a/kapptemplate/kapp/apppref.h +++ b/kapptemplate/kapp/apppref.h @@ -12,6 +12,7 @@ class ${APP_NAME}PrefPageTwo; class ${APP_NAME}Preferences : public KDialogBase { Q_OBJECT + TQ_OBJECT public: ${APP_NAME}Preferences(); @@ -20,18 +21,20 @@ private: ${APP_NAME}PrefPageTwo *m_pageTwo; }; -class ${APP_NAME}PrefPageOne : public QFrame +class ${APP_NAME}PrefPageOne : public TQFrame { Q_OBJECT + TQ_OBJECT public: - ${APP_NAME}PrefPageOne(TQWidget *parent = 0); + ${APP_NAME}PrefPageOne(TQWidget *tqparent = 0); }; -class ${APP_NAME}PrefPageTwo : public QFrame +class ${APP_NAME}PrefPageTwo : public TQFrame { Q_OBJECT + TQ_OBJECT public: - ${APP_NAME}PrefPageTwo(TQWidget *parent = 0); + ${APP_NAME}PrefPageTwo(TQWidget *tqparent = 0); }; #endif // ${APP_NAME_UC}PREF_H diff --git a/kapptemplate/kapp/appview.cpp b/kapptemplate/kapp/appview.cpp index 3527596b..48365348 100644 --- a/kapptemplate/kapp/appview.cpp +++ b/kapptemplate/kapp/appview.cpp @@ -12,11 +12,11 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}view.cpp #include <kmessagebox.h> #include <krun.h> -${APP_NAME}View::${APP_NAME}View(TQWidget *parent) - : TQWidget(parent), +${APP_NAME}View::${APP_NAME}View(TQWidget *tqparent) + : TQWidget(tqparent), DCOPObject("${APP_NAME}Iface") { - // setup our layout manager to automatically add our widgets + // setup our tqlayout manager to automatically add our widgets TQHBoxLayout *top_layout = new TQHBoxLayout(this); top_layout->setAutoAdd(true); diff --git a/kapptemplate/kapp/appview.h b/kapptemplate/kapp/appview.h index 14fc3043..25dddfd1 100644 --- a/kapptemplate/kapp/appview.h +++ b/kapptemplate/kapp/appview.h @@ -24,11 +24,12 @@ class KURL; class ${APP_NAME}View : public TQWidget, public ${APP_NAME}Iface { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - ${APP_NAME}View(TQWidget *parent); + ${APP_NAME}View(TQWidget *tqparent); /** * Destructor diff --git a/kapptemplate/kapptemplate.common b/kapptemplate/kapptemplate.common index 8cff2d60..a5a63a16 100644 --- a/kapptemplate/kapptemplate.common +++ b/kapptemplate/kapptemplate.common @@ -299,7 +299,7 @@ function GetFileList if [ -d "$DIRECTORY" ]; then # FILES=`/bin/ls -1 -I "no-exe" -I*~ $DIRECTORY`; - FILES=`cd $DIRECTORY; find . ! -name "*~" -maxdepth 1 -type f -print | sed 's,^\./,,' | sort`; + FILES=`cd $DIRECTORY; tqfind . ! -name "*~" -maxdepth 1 -type f -print | sed 's,^\./,,' | sort`; if [ ! "$FILES" ]; then diff --git a/kapptemplate/kapptemplate.in b/kapptemplate/kapptemplate.in index dde86d04..7490f94e 100644 --- a/kapptemplate/kapptemplate.in +++ b/kapptemplate/kapptemplate.in @@ -13,7 +13,7 @@ function LoadDefaults { # horrid hack to try and figure out what shell we are using - # basically, if we can find /usr/ucb/echo, then we are almost for sure + # basically, if we can tqfind /usr/ucb/echo, then we are almost for sure # NOT on a Linux system and probably 'echo "\c" works. if we don't # find it, we'll assume that the shell is really bash. if [ -f "/usr/ucb/echo" ]; diff --git a/kapptemplate/kpartapp/app-Makefile.am b/kapptemplate/kpartapp/app-Makefile.am index 3aa0495f..fc096f65 100644 --- a/kapptemplate/kpartapp/app-Makefile.am +++ b/kapptemplate/kpartapp/app-Makefile.am @@ -10,7 +10,7 @@ INCLUDES = \$(all_includes) # these are the headers for your project noinst_HEADERS = ${APP_NAME_LC}.h ${APP_NAME_LC}_part.h -# let automoc handle all of the meta source files (moc) +# let autotqmoc handle all of the meta source files (tqmoc) METASOURCES = AUTO messages: rc.cpp diff --git a/kapptemplate/kpartapp/app.cpp b/kapptemplate/kpartapp/app.cpp index 626aa8bd..c5d21f06 100644 --- a/kapptemplate/kpartapp/app.cpp +++ b/kapptemplate/kpartapp/app.cpp @@ -152,7 +152,7 @@ void ${APP_NAME}::fileOpen() // the Open shortcut is pressed (usually CTRL+O) or the Open toolbar // button is clicked KURL url = - KFileDialog::getOpenURL( TQString::null, TQString::null, this ); + KFileDialog::getOpenURL( TQString(), TQString(), this ); if (url.isEmpty() == false) { diff --git a/kapptemplate/kpartapp/app.h b/kapptemplate/kpartapp/app.h index 41daea60..b9862c3b 100644 --- a/kapptemplate/kpartapp/app.h +++ b/kapptemplate/kpartapp/app.h @@ -21,6 +21,7 @@ cat << EOF > $LOCATION_ROOT/$APP_NAME_LC/${APP_NAME_LC}.h class ${APP_NAME} : public KParts::MainWindow { Q_OBJECT + TQ_OBJECT public: /** * Default Constructor diff --git a/kapptemplate/kpartapp/app_part-desktop b/kapptemplate/kpartapp/app_part-desktop index 6ba3bf54..b32923f6 100644 --- a/kapptemplate/kpartapp/app_part-desktop +++ b/kapptemplate/kpartapp/app_part-desktop @@ -3,7 +3,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}_part.desktop [Desktop Entry] Encoding=UTF-8 Name=${APP_NAME}Part -MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; +MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-tqmoc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart X-KDE-Library=lib${APP_NAME_LC}part Type=Service diff --git a/kapptemplate/kpartapp/app_part.cpp b/kapptemplate/kpartapp/app_part.cpp index d8880577..25bf0886 100644 --- a/kapptemplate/kpartapp/app_part.cpp +++ b/kapptemplate/kpartapp/app_part.cpp @@ -17,16 +17,16 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}_part.cpp typedef KParts::GenericFactory<${APP_NAME}Part> ${APP_NAME}PartFactory; K_EXPORT_COMPONENT_FACTORY( lib${APP_NAME_LC}part, ${APP_NAME}PartFactory ) -${APP_NAME}Part::${APP_NAME}Part( TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name, +${APP_NAME}Part::${APP_NAME}Part( TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name, const TQStringList & /*args*/ ) - : KParts::ReadWritePart(parent, name) + : KParts::ReadWritePart(tqparent, name) { // we need an instance setInstance( ${APP_NAME}PartFactory::instance() ); // this should be your custom internal widget - m_widget = new TQMultiLineEdit( parentWidget, widgetName ); + m_widget = new TQMultiLineEdit( tqparentWidget, widgetName ); // notify the part that this is our internal widget setWidget(m_widget); @@ -79,7 +79,7 @@ void ${APP_NAME}Part::setModified(bool modified) else save->setEnabled(false); - // in any event, we want our parent to do it's thing + // in any event, we want our tqparent to do it's thing ReadWritePart::setModified(modified); } @@ -101,7 +101,7 @@ bool ${APP_NAME}Part::openFile() return false; // our example widget is text-based, so we use TQTextStream instead - // of a raw QDataStream + // of a raw TQDataStream TQTextStream stream(&file); TQString str; while (!stream.eof()) @@ -124,7 +124,7 @@ bool ${APP_NAME}Part::saveFile() if (isReadWrite() == false) return false; - // m_file is always local, so we use QFile + // m_file is always local, so we use TQFile TQFile file(m_file); if (file.open(IO_WriteOnly) == false) return false; diff --git a/kapptemplate/kpartapp/app_part.h b/kapptemplate/kpartapp/app_part.h index 75eedc4f..908adaa3 100644 --- a/kapptemplate/kpartapp/app_part.h +++ b/kapptemplate/kpartapp/app_part.h @@ -22,12 +22,13 @@ class KAboutData; class ${APP_NAME}Part : public KParts::ReadWritePart { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - ${APP_NAME}Part(TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name, const TQStringList &args); + ${APP_NAME}Part(TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name, const TQStringList &args); /** * Destructor diff --git a/kapptemplate/kpartplugin/plugin_app.cpp b/kapptemplate/kpartplugin/plugin_app.cpp index 0ec7a273..c6a27fb8 100644 --- a/kapptemplate/kpartplugin/plugin_app.cpp +++ b/kapptemplate/kpartplugin/plugin_app.cpp @@ -13,9 +13,9 @@ typedef KGenericFactory<Plugin${APP_NAME}> ${APP_NAME}Factory; K_EXPORT_COMPONENT_FACTORY( lib${APP_NAME_LC}plugin, ${APP_NAME}Factory( "${APP_NAME_LC}" ) ); -Plugin${APP_NAME}::Plugin${APP_NAME}( TQObject* parent, const char* name, +Plugin${APP_NAME}::Plugin${APP_NAME}( TQObject* tqparent, const char* name, const TQStringList & /*args*/ ) - : Plugin( parent, name ) + : Plugin( tqparent, name ) { // Instantiate all of your actions here. These will appear in // Konqueror's menu and toolbars. @@ -33,7 +33,7 @@ void Plugin${APP_NAME}::slotAction() // This plugin assumes KHTMLPart. If your plugin can handle more // than this or a different Part than this, simply delete or // change the following block. - if ( !parent()->inherits("KHTMLPart") ) + if ( !tqparent()->inherits("KHTMLPart") ) { TQString title( i18n( "Cannot Translate Source" ) ); TQString text( i18n( "You cannot translate anything except web pages " @@ -43,9 +43,9 @@ void Plugin${APP_NAME}::slotAction() return; } - // Get a handle on our parent so we may get the necessary data for + // Get a handle on our tqparent so we may get the necessary data for // processing - KHTMLPart *part = dynamic_cast<KHTMLPart *>(parent()); + KHTMLPart *part = dynamic_cast<KHTMLPart *>(tqparent()); // This plugin only uses the URL. You may use whatever data you // need. diff --git a/kapptemplate/kpartplugin/plugin_app.h b/kapptemplate/kpartplugin/plugin_app.h index 8bb225b8..2d1745f5 100644 --- a/kapptemplate/kpartplugin/plugin_app.h +++ b/kapptemplate/kpartplugin/plugin_app.h @@ -8,8 +8,9 @@ cat << EOF > $LOCATION_ROOT/$APP_NAME_LC/plugin_${APP_NAME_LC}.h class Plugin${APP_NAME} : public KParts::Plugin { Q_OBJECT + TQ_OBJECT public: - Plugin${APP_NAME}( TQObject* parent = 0, const char* name = 0, + Plugin${APP_NAME}( TQObject* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList() ); virtual ~Plugin${APP_NAME}(); diff --git a/kbabel/addons/kfile-plugins/kfile_po.cpp b/kbabel/addons/kfile-plugins/kfile_po.cpp index 457e4bd9..5ad0ebaa 100644 --- a/kbabel/addons/kfile-plugins/kfile_po.cpp +++ b/kbabel/addons/kfile-plugins/kfile_po.cpp @@ -17,11 +17,11 @@ * In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -40,9 +40,9 @@ using namespace KBabel; typedef KGenericFactory<KPoPlugin> POFactory; K_EXPORT_COMPONENT_FACTORY(kfile_po, POFactory("kfile_po")) -KPoPlugin::KPoPlugin(TQObject *parent, const char *name, +KPoPlugin::KPoPlugin(TQObject *tqparent, const char *name, const TQStringList& args) - : KFilePlugin(parent, name, args) + : KFilePlugin(tqparent, name, args) { KFileMimeTypeInfo* info = addMimeTypeInfo("application/x-gettext"); @@ -62,7 +62,7 @@ bool KPoPlugin::readInfo(KFileMetaInfo& metaInfo, uint) { PoInfo poInfo; TQStringList wordList; - ConversionStatus status = PoInfo::info(metaInfo.path(), poInfo, wordList, false, false, false); + ConversiontqStatus status = PoInfo::info(metaInfo.path(), poInfo, wordList, false, false, false); if (status == OK) { KFileMetaInfoGroup group = appendGroup(metaInfo, "CatalogInfo"); diff --git a/kbabel/addons/kfile-plugins/kfile_po.h b/kbabel/addons/kfile-plugins/kfile_po.h index 091bd5f3..d5e46c34 100644 --- a/kbabel/addons/kfile-plugins/kfile_po.h +++ b/kbabel/addons/kfile-plugins/kfile_po.h @@ -17,11 +17,11 @@ * In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -40,9 +40,10 @@ class TQStringList; class KPoPlugin : public KFilePlugin { Q_OBJECT + TQ_OBJECT public: - KPoPlugin(TQObject *parent, const char *name, const TQStringList& args); + KPoPlugin(TQObject *tqparent, const char *name, const TQStringList& args); virtual bool readInfo(KFileMetaInfo& info, uint); }; diff --git a/kbabel/addons/preview/pothumbcreator.cpp b/kbabel/addons/preview/pothumbcreator.cpp index 0883025c..87eb5dbf 100644 --- a/kbabel/addons/preview/pothumbcreator.cpp +++ b/kbabel/addons/preview/pothumbcreator.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -110,7 +110,7 @@ bool PoThumbCreator::create(const TQString &path, int width, int height, TQImage int w = pix.width()-2*xBorder; int h = pix.height()*2/3-2*yBorder; - int d = QMIN(w,h); + int d = TQMIN(w,h); xBorder = (pix.width()-d)/2; yBorder = (pix.height()*2/3-d)/2; @@ -118,7 +118,7 @@ bool PoThumbCreator::create(const TQString &path, int width, int height, TQImage if(fuzzyAngle>0) { - p.setBrush(Qt::blue); + p.setBrush(TQt::blue); if(poInfo.total == poInfo.fuzzy) { @@ -132,7 +132,7 @@ bool PoThumbCreator::create(const TQString &path, int width, int height, TQImage if(untransAngle>0) { - p.setBrush(Qt::red); + p.setBrush(TQt::red); if(poInfo.untranslated == poInfo.total) { @@ -146,7 +146,7 @@ bool PoThumbCreator::create(const TQString &path, int width, int height, TQImage if(circle - fuzzyAngle - untransAngle>0) { - p.setBrush(Qt::darkGreen); + p.setBrush(TQt::darkGreen); if(poInfo.fuzzy==0 && poInfo.untranslated==0) { @@ -180,9 +180,9 @@ bool PoThumbCreator::create(const TQString &path, int width, int height, TQImage int numLines = (int) (canvasHeight / chSize.height()); int rest = pix.width() - (numCharsPerLine * chSize.width()); - xBorder = QMAX( xBorder, rest/2); // center horizontally + xBorder = TQMAX( xBorder, rest/2); // center horizontally rest = pix.height()/3 - (numLines * chSize.height()); - yBorder = QMAX( yBorder, rest/2); // center vertically + yBorder = TQMAX( yBorder, rest/2); // center vertically // end centering @@ -207,7 +207,7 @@ bool PoThumbCreator::create(const TQString &path, int width, int height, TQImage if(!poInfo.encoding.isEmpty()) text += poInfo.encoding+'\n'; - int lines = text.contains('\n')+1; + int lines = text.tqcontains('\n')+1; if(lines < numLines) { text = poInfo.headerComment+'\n'+text; @@ -259,9 +259,9 @@ bool PoThumbCreator::create(const TQString &path, int width, int height, TQImage max = (*it).length(); } rest = pix.width() - (max * chSize.width()); - xBorder = QMAX( xBorder, rest/2); // center horizontally + xBorder = TQMAX( xBorder, rest/2); // center horizontally rest = pix.height()/3 - (lineList.count() * chSize.height()); - yBorder = QMAX( yBorder, rest/2); // center vertically + yBorder = TQMAX( yBorder, rest/2); // center vertically // where to paint the characters int x = xBorder, y = pix.height()*2/3; @@ -286,7 +286,7 @@ bool PoThumbCreator::create(const TQString &path, int width, int height, TQImage // physical newline in the file if we don't come from one if ( !newLine ) { - int pos = text.find( '\n', i ); + int pos = text.tqfind( '\n', i ); if ( pos > (int) i ) i = pos +1; } @@ -311,7 +311,7 @@ bool PoThumbCreator::create(const TQString &path, int width, int height, TQImage rect = m_splitter->coordinates( ch ); if ( !rect.isEmpty() ) { - bitBlt( &pix, TQPoint(x,y), fontPixmap, rect, Qt::CopyROP ); + bitBlt( &pix, TQPoint(x,y), fontPixmap, rect, TQt::CopyROP ); } x += xOffset; // next character @@ -339,11 +339,11 @@ bool PoThumbCreator::create(const TQString &path, int width, int height, TQImage } int x = pix.width()-kbabelPix.width()-4; - x = QMAX(x,0); + x = TQMAX(x,0); if(!kbabelPix.isNull()) { bitBlt(&pix, TQPoint(x,4), &kbabelPix, kbabelPix.rect() - , Qt::CopyROP); + , TQt::CopyROP); } } diff --git a/kbabel/addons/preview/pothumbcreator.h b/kbabel/addons/preview/pothumbcreator.h index 25a1f7ab..f975b554 100644 --- a/kbabel/addons/preview/pothumbcreator.h +++ b/kbabel/addons/preview/pothumbcreator.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp index 1292c0cf..a659505e 100644 --- a/kbabel/catalogmanager/catalogmanager.cpp +++ b/kbabel/catalogmanager/catalogmanager.cpp @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -126,7 +126,7 @@ void CatalogManager::init() if ( _project == NULL ) { - KMessageBox::error( this, i18n("Cannot open project file\n%1").arg(_configFile) + KMessageBox::error( this, i18n("Cannot open project file\n%1").tqarg(_configFile) , i18n("Project File Error")); _project = KBabel::ProjectManager::open(KBabel::ProjectManager::defaultProjectName()); @@ -136,13 +136,13 @@ void CatalogManager::init() , this, TQT_SLOT (updateSettings())); TQWidget *view = new TQWidget(this); - TQVBoxLayout* layout= new TQVBoxLayout(view); - layout->setMargin(0); - layout->setSpacing(KDialog::spacingHint()); + TQVBoxLayout* tqlayout= new TQVBoxLayout(view); + tqlayout->setMargin(0); + tqlayout->setSpacing(KDialog::spacingHint()); _catalogManager=new CatalogManagerView(_project, view,"catalog manager"); - layout->addWidget(_catalogManager); - layout->setStretchFactor(_catalogManager,1); + tqlayout->addWidget(_catalogManager); + tqlayout->setStretchFactor(_catalogManager,1); connect(this,TQT_SIGNAL(settingsChanged(KBabel::CatManSettings)) ,_catalogManager,TQT_SLOT(setSettings(KBabel::CatManSettings))); @@ -162,7 +162,7 @@ void CatalogManager::init() KWin::setIcons(winId(),BarIcon("catalogmanager",32) ,SmallIcon("catalogmanager")); - TQHBoxLayout* hBoxL = new TQHBoxLayout(layout); + TQHBoxLayout* hBoxL = new TQHBoxLayout(tqlayout); _progressLabel = new TQLabel(view); hBoxL->addWidget(_progressLabel); _progressBar=new KProgress(view); @@ -235,10 +235,10 @@ void CatalogManager::setupActions() // the edit menu action = new KAction( i18n("Fi&nd in Files..."), CTRL+Key_F, this, - TQT_SLOT(find()), actionCollection(), "find_in_files"); + TQT_SLOT(tqfind()), actionCollection(), "find_in_files"); action->setEnabled(false); action = new KAction( i18n("Re&place in Files..."), CTRL+Key_R, this, - TQT_SLOT(replace()), actionCollection(), "replace_in_files"); + TQT_SLOT(tqreplace()), actionCollection(), "replace_in_files"); action->setEnabled(false); action = new KAction( i18n("&Stop Searching"), "stop", Key_Escape, this, TQT_SLOT(stopSearching()), actionCollection(), "stop_search"); @@ -430,9 +430,9 @@ void CatalogManager::setupActions() TQT_SLOT( cvsCommit( ) ), actionCollection( ), "cvs_commit" ); (void)new KAction( i18n( "Commit Marked" ), 0, _catalogManager, TQT_SLOT( cvsCommitMarked( ) ), actionCollection( ), "cvs_commit_marked" ); - (void)new KAction( i18n( "Status" ), 0, _catalogManager, - TQT_SLOT( cvsStatus( ) ), actionCollection( ), "cvs_status" ); - (void)new KAction( i18n( "Status for Marked" ), 0, _catalogManager, + (void)new KAction( i18n( "tqStatus" ), 0, _catalogManager, + TQT_SLOT( cvstqStatus( ) ), actionCollection( ), "cvs_status" ); + (void)new KAction( i18n( "tqStatus for Marked" ), 0, _catalogManager, TQT_SLOT( cvsStatusMarked( ) ), actionCollection( ), "cvs_status_marked" ); (void)new KAction( i18n( "Show Diff" ), 0, _catalogManager, TQT_SLOT( cvsDiff( ) ), actionCollection( ), "cvs_diff" ); @@ -456,13 +456,13 @@ void CatalogManager::setupActions() TQT_SLOT( svnCommit( ) ), actionCollection( ), "svn_commit" ); (void)new KAction( i18n( "Commit Marked" ), 0, _catalogManager, TQT_SLOT( svnCommitMarked( ) ), actionCollection( ), "svn_commit_marked" ); - (void)new KAction( i18n( "Status (Local)" ), 0, _catalogManager, + (void)new KAction( i18n( "tqStatus (Local)" ), 0, _catalogManager, TQT_SLOT( svnStatusLocal() ), actionCollection( ), "svn_status_local" ); - (void)new KAction( i18n( "Status (Local) for Marked" ), 0, _catalogManager, + (void)new KAction( i18n( "tqStatus (Local) for Marked" ), 0, _catalogManager, TQT_SLOT( svnStatusLocalMarked() ), actionCollection( ), "svn_status_local_marked" ); - (void)new KAction( i18n( "Status (Remote)" ), 0, _catalogManager, + (void)new KAction( i18n( "tqStatus (Remote)" ), 0, _catalogManager, TQT_SLOT( svnStatusRemote() ), actionCollection( ), "svn_status_remote" ); - (void)new KAction( i18n( "Status (Remote) for Marked" ), 0, _catalogManager, + (void)new KAction( i18n( "tqStatus (Remote) for Marked" ), 0, _catalogManager, TQT_SLOT( svnStatusRemoteMarked() ), actionCollection( ), "svn_status_remote_marked" ); (void)new KAction( i18n( "Show Diff" ), 0, _catalogManager, TQT_SLOT( svnDiff( ) ), actionCollection( ), "svn_diff" ); @@ -552,7 +552,7 @@ void CatalogManager::setupStatusBar() _statusProgressBar->hide(); statusBar()->addWidget(progressBox,1); - statusBar()->setMinimumHeight(_statusProgressBar->sizeHint().height()); + statusBar()->setMinimumHeight(_statusProgressBar->tqsizeHint().height()); TQWhatsThis::add(statusBar(), i18n("<qt><p><b>Statusbar</b></p>\n" @@ -912,7 +912,7 @@ void CatalogManager::clearStatusProgressBar() void CatalogManager::setNumberOfFound(int toBeSent, int total) { - _foundLabel->setText(i18n("Found: %1/%2").arg(toBeSent).arg(total)); + _foundLabel->setText(i18n("Found: %1/%2").tqarg(toBeSent).tqarg(total)); } void CatalogManager::decreaseNumberOfFound() @@ -928,7 +928,7 @@ void CatalogManager::slotHelp() kapp->invokeHelp("CATALOGMANAGER","kbabel"); } -void CatalogManager::find() +void CatalogManager::tqfind() { if( !_findDialog ) _findDialog = new FindInFilesDialog(false,this); @@ -950,8 +950,8 @@ void CatalogManager::find() _findOptions.accelMarker = _project->miscSettings().accelMarker; _foundFilesList.clear(); - kdDebug(KBABEL_CATMAN) << "Calling catalogmanagerview::find" << endl; - TQString url = _catalogManager->find(_findOptions, _toBeSearched ); + kdDebug(KBABEL_CATMAN) << "Calling catalogmanagerview::tqfind" << endl; + TQString url = _catalogManager->tqfind(_findOptions, _toBeSearched ); if( _catalogManager->isStopped() ) return; if( !url.isEmpty() ) @@ -1011,7 +1011,7 @@ void CatalogManager::find() } } -void CatalogManager::replace() +void CatalogManager::tqreplace() { if( !_replaceDialog ) _replaceDialog = new FindInFilesDialog(true,this); @@ -1036,7 +1036,7 @@ void CatalogManager::replace() options.accelMarker = _project->miscSettings().accelMarker; _foundFilesList.clear(); - TQString url = _catalogManager->find(options, _toBeSearched ); + TQString url = _catalogManager->tqfind(options, _toBeSearched ); if( _catalogManager->isStopped() ) return; if( !url.isEmpty() ) @@ -1209,7 +1209,7 @@ void CatalogManager::projectOpen() { oldproject = TQString(); } - const TQString file = KFileDialog::getOpenFileName(oldproject, TQString::null, this); + const TQString file = KFileDialog::getOpenFileName(oldproject, TQString(), this); if (file.isEmpty()) { return; @@ -1232,7 +1232,7 @@ void CatalogManager::projectOpen() } else { - KMessageBox::error (this, i18n("Cannot open project file %1").arg(file)); + KMessageBox::error (this, i18n("Cannot open project file %1").tqarg(file)); } } diff --git a/kbabel/catalogmanager/catalogmanager.h b/kbabel/catalogmanager/catalogmanager.h index 17235d8e..89fdef13 100644 --- a/kbabel/catalogmanager/catalogmanager.h +++ b/kbabel/catalogmanager/catalogmanager.h @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -70,6 +70,7 @@ namespace KBabel class CatalogManager : public KMainWindow { Q_OBJECT + TQ_OBJECT public: CatalogManager(TQString configfile = TQString() ); ~CatalogManager(); @@ -99,8 +100,8 @@ public slots: void selectedChanged(uint actionValue); virtual void slotHelp(); - virtual void find(); - virtual void replace(); + virtual void tqfind(); + virtual void tqreplace(); virtual void stopSearching(); virtual void optionsPreferences(); virtual void optionsShowStatusbar(bool on); @@ -137,7 +138,7 @@ private: void restoreView(); void saveView(); - void saveSettings( TQString configFile = TQString::null ); + void saveSettings( TQString configFile = TQString() ); void setupActions(); void setupStatusBar(); diff --git a/kbabel/catalogmanager/catalogmanagerapp.h b/kbabel/catalogmanager/catalogmanagerapp.h index 3534a516..8e5bee23 100644 --- a/kbabel/catalogmanager/catalogmanagerapp.h +++ b/kbabel/catalogmanager/catalogmanagerapp.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kbabel/catalogmanager/catalogmanageriface.h b/kbabel/catalogmanager/catalogmanageriface.h index 037aa7c0..35345e9c 100644 --- a/kbabel/catalogmanager/catalogmanageriface.h +++ b/kbabel/catalogmanager/catalogmanageriface.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kbabel/catalogmanager/catalogmanagerview.cpp b/kbabel/catalogmanager/catalogmanagerview.cpp index 991e1899..49e10c05 100644 --- a/kbabel/catalogmanager/catalogmanagerview.cpp +++ b/kbabel/catalogmanager/catalogmanagerview.cpp @@ -23,11 +23,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -91,15 +91,15 @@ const char* columnNames[] = { I18N_NOOP("Fuzzy"), I18N_NOOP("Untranslated"), I18N_NOOP("Total"), - I18N_NOOP("CVS/SVN Status"), + I18N_NOOP("CVS/SVN tqStatus"), I18N_NOOP("Last Revision"), I18N_NOOP("Last Translator") }; #define COLTEXT(a) (i18n(columnNames[a])) -CatalogManagerView::CatalogManagerView(KBabel::Project::Ptr project, TQWidget* parent,const char* name) - : TQListView(parent,name) +CatalogManagerView::CatalogManagerView(KBabel::Project::Ptr project, TQWidget* tqparent,const char* name) + : TQListView(tqparent,name) , _dirWatch(0) , _readInfoCount(0) , _active(false) @@ -143,7 +143,7 @@ CatalogManagerView::CatalogManagerView(KBabel::Project::Ptr project, TQWidget* p setColumnAlignment(2,AlignCenter); addColumn(COLTEXT(COL_TOTAL)); setColumnAlignment(3,AlignCenter); - addColumn(TQString::null); // CVS/SVN column, header is set later + addColumn(TQString()); // CVS/SVN column, header is set later addColumn(COLTEXT(COL_REVISION)); addColumn(COLTEXT(COL_TRANSLATOR)); @@ -445,7 +445,7 @@ void CatalogManagerView::loadMarks() #endif { KMessageBox::error(this,i18n( - "Error while trying to open file:\n %1").arg(url.prettyURL())); + "Error while trying to open file:\n %1").tqarg(url.prettyURL())); return; } @@ -471,7 +471,7 @@ void CatalogManagerView::loadMarks() { KMessageBox::error(this ,i18n("Error while trying to read file:\n %1\n" - "Maybe it is not a valid file with list of markings.").arg(url.prettyURL())); + "Maybe it is not a valid file with list of markings.").tqarg(url.prettyURL())); f.close(); return; } @@ -480,7 +480,7 @@ void CatalogManagerView::loadMarks() else { KMessageBox::error(this,i18n( - "Error while trying to open file:\n %1").arg(url.prettyURL())); + "Error while trying to open file:\n %1").tqarg(url.prettyURL())); } KIO::NetAccess::removeTempFile( filename ); @@ -516,8 +516,8 @@ void CatalogManagerView::saveMarks() // ### FIXME: why is the file dialog not doing this? if ( KIO::NetAccess::exists( url2, false, this ) ) { - if(KMessageBox::warningContinueCancel(this,TQString("<qt>%1</qt>").arg(i18n("The file %1 already exists. " - "Do you want to overwrite it?").arg(url2.prettyURL())),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Cancel) + if(KMessageBox::warningContinueCancel(this,TQString("<qt>%1</qt>").tqarg(i18n("The file %1 already exists. " + "Do you want to overwrite it?").tqarg(url2.prettyURL())),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Cancel) { return; } @@ -568,7 +568,7 @@ void CatalogManagerView::saveMarks() { // ### KDE4 FIXME: strip the final \n of the message KMessageBox::error( this, - i18n( "An error occurred while trying to write to file:\n%1\n" ).arg( url.prettyURL()) ); + i18n( "An error occurred while trying to write to file:\n%1\n" ).tqarg( url.prettyURL()) ); } else if ( !localFile ) { @@ -577,7 +577,7 @@ void CatalogManagerView::saveMarks() { // ### KDE4 FIXME: strip the final \n of the message KMessageBox::error(this, - i18n("An error occurred while trying to upload the file:\n%1\n").arg(url.prettyURL())); + i18n("An error occurred while trying to upload the file:\n%1\n").tqarg(url.prettyURL())); } } @@ -713,7 +713,7 @@ void CatalogManagerView::markedStatistics() showStatistics( i, markedDoList ); } -void CatalogManagerView::showStatistics( CatManListItem *i, TQStringList &childrenList ) +void CatalogManagerView::showStatistics( CatManListItem *i, TQStringList &tqchildrenList ) { KLocale *locale = KGlobal::locale(); @@ -727,7 +727,7 @@ void CatalogManagerView::showStatistics( CatManListItem *i, TQStringList &child int totalUntranslated=0; TQStringList::const_iterator it; - for( it = childrenList.constBegin(); it != childrenList.constEnd(); ++it ) + for( it = tqchildrenList.constBegin(); it != tqchildrenList.constEnd(); ++it ) { CatManListItem* item = _fileList[(*it)]; @@ -768,29 +768,29 @@ void CatalogManagerView::showStatistics( CatManListItem *i, TQStringList &child if(name.isEmpty()) msg = i18n("Statistics for all:\n"); else - msg = i18n("Statistics for %1:\n").arg(name); + msg = i18n("Statistics for %1:\n").tqarg(name); - msg+=i18n("Number of packages: %1\n").arg(locale->formatNumber(totalPackages, 0)); + msg+=i18n("Number of packages: %1\n").tqarg(locale->formatNumber(totalPackages, 0)); percent=100.0-((double)needworkPo*100.0)/totalPackages; - msg+=i18n("Complete translated: %1 % (%2)\n").arg(locale->formatNumber(percent,2)).arg(locale->formatNumber(totalPackages-needworkPo, 0)); + msg+=i18n("Complete translated: %1 % (%2)\n").tqarg(locale->formatNumber(percent,2)).tqarg(locale->formatNumber(totalPackages-needworkPo, 0)); percent=100.0-((double)totalPo*100.0)/totalPackages; - msg+=i18n("Only template available: %1 % (%2)\n").arg(locale->formatNumber(percent,2)).arg(locale->formatNumber(totalPackages-totalPo,0)); + msg+=i18n("Only template available: %1 % (%2)\n").tqarg(locale->formatNumber(percent,2)).tqarg(locale->formatNumber(totalPackages-totalPo,0)); percent=((double)totalNoPot*100.0)/totalPackages; - msg+=i18n("Only PO file available: %1 % (%2)\n").arg(locale->formatNumber(percent,02)).arg(locale->formatNumber(totalNoPot, 0)); + msg+=i18n("Only PO file available: %1 % (%2)\n").tqarg(locale->formatNumber(percent,02)).tqarg(locale->formatNumber(totalNoPot, 0)); - msg+=i18n("Number of messages: %1\n").arg(locale->formatNumber(totalMsgid, 0)); + msg+=i18n("Number of messages: %1\n").tqarg(locale->formatNumber(totalMsgid, 0)); long int totalTranslated = totalMsgid - totalFuzzy - totalUntranslated; percent=((double)totalTranslated*100.0)/totalMsgid; - msg+=i18n("Translated: %1 % (%2)\n").arg(locale->formatNumber(percent,2)).arg(locale->formatNumber(totalTranslated, 0)); + msg+=i18n("Translated: %1 % (%2)\n").tqarg(locale->formatNumber(percent,2)).tqarg(locale->formatNumber(totalTranslated, 0)); percent=((double)totalFuzzy*100.0)/totalMsgid; - msg+=i18n("Fuzzy: %1 % (%2)\n").arg(locale->formatNumber(percent,2)).arg(locale->formatNumber(totalFuzzy, 0)); + msg+=i18n("Fuzzy: %1 % (%2)\n").tqarg(locale->formatNumber(percent,2)).tqarg(locale->formatNumber(totalFuzzy, 0)); percent=((double)totalUntranslated*100.0)/totalMsgid; - msg+=i18n("Untranslated: %1 % (%2)\n").arg(locale->formatNumber(percent,2)).arg(locale->formatNumber(totalUntranslated, 0)); + msg+=i18n("Untranslated: %1 % (%2)\n").tqarg(locale->formatNumber(percent,2)).tqarg(locale->formatNumber(totalUntranslated, 0)); KMessageBox::information(this,msg,i18n("Statistics")); } @@ -807,7 +807,7 @@ void CatalogManagerView::checkSyntax() if(!item->hasPo()) return; - Msgfmt::Status status; + Msgfmt::tqStatus status; TQString output; Msgfmt msgfmt; @@ -850,7 +850,7 @@ void CatalogManagerView::checkSyntax() } else { - Msgfmt::Status status; + Msgfmt::tqStatus status; TQString output; Msgfmt msgfmt; @@ -866,7 +866,7 @@ void CatalogManagerView::checkSyntax() if(!name.isEmpty()) { msg=i18n("All files in folder %1 are syntactically correct.\n" -"Output of \"msgfmt --statistics\":\n").arg(name)+output; +"Output of \"msgfmt --statistics\":\n").tqarg(name)+output; } else { @@ -882,7 +882,7 @@ void CatalogManagerView::checkSyntax() if(!name.isEmpty()) { msg=i18n("At least one file in folder %1 has syntax errors.\n" -"Output of \"msgfmt --statistics\":\n").arg(name)+output; +"Output of \"msgfmt --statistics\":\n").tqarg(name)+output; } else { @@ -898,7 +898,7 @@ void CatalogManagerView::checkSyntax() if(!name.isEmpty()) { msg=i18n("At least one file in folder %1 has header syntax errors.\n" -"Output of \"msgfmt --statistics\":\n").arg(name)+output; +"Output of \"msgfmt --statistics\":\n").tqarg(name)+output; } else { @@ -914,7 +914,7 @@ void CatalogManagerView::checkSyntax() if(!name.isEmpty()) { msg=i18n("An error occurred while processing \"msgfmt --statistics *.po\" " -"in folder %1").arg(name); +"in folder %1").tqarg(name); } else { @@ -985,10 +985,10 @@ void CatalogManagerView::mailFiles() CatManListItem* item = (CatManListItem*)currentItem(); if(item->isDir()) { TQStringList filesToSend; - TQStringList childrenList = item->allChildrenList(true); + TQStringList tqchildrenList = item->allChildrenList(true); TQStringList::const_iterator it; - for (it = childrenList.constBegin(); it != childrenList.constEnd(); ++it) { + for (it = tqchildrenList.constBegin(); it != tqchildrenList.constEnd(); ++it) { CatManListItem* i = _fileList[(*it)]; if (i->hasPo()) { filesToSend << i->poFile(); @@ -1023,23 +1023,23 @@ void CatalogManagerView::packageFiles( ) CatManListItem* item = (CatManListItem*)currentItem(); if(item->isDir()) { TQStringList filesToPackage; - TQStringList childrenList = item->allChildrenList(true); + TQStringList tqchildrenList = item->allChildrenList(true); TQStringList::const_iterator it; - for (it = childrenList.constBegin(); it != childrenList.constEnd(); ++it) { + for (it = tqchildrenList.constBegin(); it != tqchildrenList.constEnd(); ++it) { CatManListItem* i = _fileList[(*it)]; if (i->hasPo()) { filesToPackage << i->poFile(); } } - TQString packageFileName = KFileDialog::getSaveFileName(TQString::null,"*.tar.bz2\n*.tar.gz",this); - mailer->buildArchive( filesToPackage, packageFileName, TQString::null, false ); + TQString packageFileName = KFileDialog::getSaveFileName(TQString(),"*.tar.bz2\n*.tar.gz",this); + mailer->buildArchive( filesToPackage, packageFileName, TQString(), false ); } else { if (item->hasPo()) { TQStringList fileToPackage(item->poFile()); - TQString packageFileName = KFileDialog::getSaveFileName(TQString::null,"*.tar.bz2\n*.tar.gz",this); - mailer->buildArchive( fileToPackage, packageFileName, TQString::null, false ); + TQString packageFileName = KFileDialog::getSaveFileName(TQString(),"*.tar.bz2\n*.tar.gz",this); + mailer->buildArchive( fileToPackage, packageFileName, TQString(), false ); } } } @@ -1057,8 +1057,8 @@ void CatalogManagerView::packageMarkedFiles( ) } } - TQString packageFileName = KFileDialog::getSaveFileName(TQString::null,"*.tar.bz2\n*.tar.gz",this); - mailer->buildArchive( filesToPackage, packageFileName, TQString::null, false ); + TQString packageFileName = KFileDialog::getSaveFileName(TQString(),"*.tar.bz2\n*.tar.gz",this); + mailer->buildArchive( filesToPackage, packageFileName, TQString(), false ); } // CVS @@ -1082,14 +1082,14 @@ void CatalogManagerView::cvsCommitMarked( ) doCVSCommand( CVS::Commit, true ); } -void CatalogManagerView::cvsStatus( ) +void CatalogManagerView::cvstqStatus( ) { - doCVSCommand( CVS::Status ); + doCVSCommand( CVS::tqStatus ); } void CatalogManagerView::cvsStatusMarked( ) { - doCVSCommand( CVS::Status, true ); + doCVSCommand( CVS::tqStatus, true ); } void CatalogManagerView::cvsUpdateTemplate( ) @@ -1137,7 +1137,7 @@ void CatalogManagerView::doCVSCommand( CVS::Command cmd, bool marked, bool templ TQString cvsItem; CatManListItem * item = (CatManListItem*)currentItem( ); if ( ( cmd == CVS::Commit || cmd == CVS::Diff ) && item->isDir( ) ) { - // all children including directories + // all tqchildren including directories TQStringList cvsItems = item->allChildrenFileList (true, false, true); if ( !cvsItems.isEmpty( ) ) cvshandler->execCVSCommand( this, cmd, cvsItems, templates, config ); @@ -1249,7 +1249,7 @@ void CatalogManagerView::doSVNCommand( SVN::Command cmd, bool marked, bool templ TQString svnItem; CatManListItem * item = (CatManListItem*)currentItem( ); if ( ( cmd == SVN::Commit || cmd == SVN::Diff ) && item->isDir( ) ) { - // all children including directories + // all tqchildren including directories TQStringList svnItems = item->allChildrenFileList (true, false, true); if ( !svnItems.isEmpty( ) ) svnhandler->execSVNCommand( this, cmd, svnItems, templates, config ); @@ -1270,7 +1270,7 @@ void CatalogManagerView::showLog() _logWindow->show(); } -TQString CatalogManagerView::find( FindOptions &options, TQStringList &rest ) +TQString CatalogManagerView::tqfind( FindOptions &options, TQStringList &rest ) { CatManListItem* i=(CatManListItem*) currentItem(); @@ -1283,14 +1283,14 @@ TQString CatalogManagerView::find( FindOptions &options, TQStringList &rest ) const TQString search = options.findStr.lower().simplifyWhiteSpace(); TQStringList searchWords = TQStringList::split(' ', search); - TQStringList childrenList; - if( i->isFile() ) childrenList.append(i->name()); - else childrenList =i->allChildrenList(true); + TQStringList tqchildrenList; + if( i->isFile() ) tqchildrenList.append(i->name()); + else tqchildrenList =i->allChildrenList(true); - emit prepareFindProgressBar(childrenList.size()); + emit prepareFindProgressBar(tqchildrenList.size()); TQStringList::const_iterator it; - for( it = childrenList.constBegin(); it != childrenList.constEnd(); ++it ) + for( it = tqchildrenList.constBegin(); it != tqchildrenList.constEnd(); ++it ) { CatManListItem* item = _fileList[(*it)]; @@ -1341,11 +1341,11 @@ TQString CatalogManagerView::find( FindOptions &options, TQStringList &rest ) const TQString foundItemFile = itemFile; it++; - while( it != childrenList.constEnd() ) + while( it != tqchildrenList.constEnd() ) { CatManListItem *item = _fileList[(*it)]; - itemFile = TQString::null; + itemFile = TQString(); if( options.inTemplates ) { if( item->hasPot() ) itemFile=item->potFile(); @@ -1353,7 +1353,7 @@ TQString CatalogManagerView::find( FindOptions &options, TQStringList &rest ) if( item->hasPo() )itemFile=item->poFile(); } if( options.inMarkedFiles && !item->marked() ) - itemFile=TQString::null; + itemFile=TQString(); if( !itemFile.isNull()) { @@ -1380,10 +1380,10 @@ TQString CatalogManagerView::find( FindOptions &options, TQStringList &rest ) _stopSearch = false; rest.clear(); if( _updateNesting == 0 && !_stop ) emit updateFinished(); - return TQString::null; + return TQString(); } } - return TQString::null; + return TQString(); } bool CatalogManagerView::hasMatchingWords( TQStringList &itemWords, TQStringList &searchWords) @@ -1391,8 +1391,8 @@ bool CatalogManagerView::hasMatchingWords( TQStringList &itemWords, TQStringList for( TQStringList::const_iterator it1 = searchWords.constBegin() ; it1 != searchWords.constEnd() ; ++it1 ) for( TQStringList::const_iterator it2 = itemWords.constBegin() ; it2 != itemWords.constEnd() ; ++it2 ) if( *it1 == *it2 - || (*it1).contains(*it2) - || (*it2).contains(*it1) ) return true; + || (*it1).tqcontains(*it2) + || (*it2).tqcontains(*it1) ) return true; return false; } @@ -1499,12 +1499,12 @@ void CatalogManagerView::slotDeleteFile() if(item && item->isFile() && item->hasPo() && !item->hasPot()) { - const TQString msg=i18n("Do you really want to delete the file %1?").arg(item->poFile()); + const TQString msg=i18n("Do you really want to delete the file %1?").tqarg(item->poFile()); if(KMessageBox::warningContinueCancel(this,msg,i18n("Warning"),KGuiItem( i18n("Delete"), "editdelete"))== KMessageBox::Continue) { if(!TQFile::remove(item->poFile())) { - KMessageBox::sorry(this,i18n("Was not able to delete the file %1!").arg(item->poFile())); + KMessageBox::sorry(this,i18n("Was not able to delete the file %1!").tqarg(item->poFile())); } } } @@ -1609,11 +1609,11 @@ void CatalogManagerView::slotDirCommand(int index) if(index>=0 && item && item->isDir()) { TQString cmd=*(_settings.dirCommands).at(index); - cmd.replace("@PACKAGE@",item->name()); - cmd.replace("@PODIR@",item->poFile()); - cmd.replace("@POTDIR@",item->potFile()); - cmd.replace("@POFILES@",current().join(" ")); - cmd.replace("@MARKEDPOFILES@",marked().join(" ")); + cmd.tqreplace("@PACKAGE@",item->name()); + cmd.tqreplace("@PODIR@",item->poFile()); + cmd.tqreplace("@POTDIR@",item->potFile()); + cmd.tqreplace("@POFILES@",current().join(" ")); + cmd.tqreplace("@MARKEDPOFILES@",marked().join(" ")); kdDebug(KBABEL_CATMAN) << cmd << endl; @@ -1638,15 +1638,15 @@ void CatalogManagerView::slotFileCommand(int index) if(index>=0 && item && item->isFile()) { - CatManListItem* parent = (CatManListItem*)item->parent(); + CatManListItem* tqparent = (CatManListItem*)item->tqparent(); TQString cmd=*(_settings.fileCommands).at(index); - cmd.replace("@PACKAGE@",item->name()); - cmd.replace("@POFILE@",item->poFile()); - cmd.replace("@POTFILE@",item->potFile()); - cmd.replace("@PODIR@",parent->poFile()); - cmd.replace("@POTDIR@",parent->potFile()); - cmd.replace("@POEMAIL@",item->text(COL_TRANSLATOR)); + cmd.tqreplace("@PACKAGE@",item->name()); + cmd.tqreplace("@POFILE@",item->poFile()); + cmd.tqreplace("@POTFILE@",item->potFile()); + cmd.tqreplace("@PODIR@",tqparent->poFile()); + cmd.tqreplace("@POTDIR@",tqparent->potFile()); + cmd.tqreplace("@POEMAIL@",item->text(COL_TRANSLATOR)); kdDebug(KBABEL_CATMAN) << cmd << endl; @@ -1660,7 +1660,7 @@ void CatalogManagerView::slotFileCommand(int index) connect( proc,TQT_SIGNAL( receivedStderr(KProcess*,char*,int) ), this ,TQT_SLOT( showOutput(KProcess*,char*,int) ) ); - *proc << "cd" << parent->poFile() << ";" << cmd; + *proc << "cd" << tqparent->poFile() << ";" << cmd; proc->start(KProcess::NotifyOnExit,KProcess::AllOutput); } @@ -1765,7 +1765,7 @@ void CatalogManagerView::buildTree() { KMessageBox::error(this,i18n("You have not specified a valid folder " "for the base folder of the PO files:\n%1\n" -"Please check your settings in the project settings dialog.").arg(_settings.poBaseDir)); +"Please check your settings in the project settings dialog.").tqarg(_settings.poBaseDir)); _active=false; _updateNesting--; @@ -1782,7 +1782,7 @@ void CatalogManagerView::buildTree() { KMessageBox::error(this,i18n("You have not specified a valid folder " "for the base folder of the PO template files:\n%1\n" -"Please check your settings in the project settings dialog.").arg(_settings.potBaseDir)); +"Please check your settings in the project settings dialog.").tqarg(_settings.potBaseDir)); } cvshandler->setPOTBaseDir( _settings.potBaseDir ); @@ -1929,7 +1929,7 @@ bool CatalogManagerView::buildDir(const TQString& baseDir,const TQString& relDir _fileList.insert(file,item); _readInfoFileList.prepend(file); - if(_markerList.contains(file)) + if(_markerList.tqcontains(file)) { item->setMarked(true); } @@ -1953,7 +1953,7 @@ bool CatalogManagerView::buildDir(const TQString& baseDir,const TQString& relDir } TQString subDir=relDir+(*it)+"/"; - if(!_dirWatch->contains(baseDir+subDir)) + if(!_dirWatch->tqcontains(baseDir+subDir)) { _dirWatch->addDir(baseDir+subDir); } @@ -2027,7 +2027,7 @@ void CatalogManagerView::updateDir(TQString relDir) item = new CatManListItem(this, thisItem,poBaseDir+file+".po",potBaseDir+file+".pot",file); _fileList.insert(file,item); - if(_markerList.contains(file)) + if(_markerList.tqcontains(file)) { item->setMarked(true); } @@ -2056,7 +2056,7 @@ void CatalogManagerView::updateDir(TQString relDir) bool newDirAdded=false; TQString subDir=relDir+(*it)+"/"; - if(!_dirWatch->contains(potBaseDir+subDir)) + if(!_dirWatch->tqcontains(potBaseDir+subDir)) { _dirWatch->addDir(potBaseDir+subDir); @@ -2109,7 +2109,7 @@ void CatalogManagerView::updateDir(TQString relDir) item = new CatManListItem(this, thisItem,poBaseDir+file+".po",potBaseDir+file+".pot",file); _fileList.insert(file,item); - if(_markerList.contains(file)) + if(_markerList.tqcontains(file)) { item->setMarked(true); } @@ -2138,7 +2138,7 @@ void CatalogManagerView::updateDir(TQString relDir) bool newDirAdded=false; TQString subDir=relDir+(*it)+"/"; - if(!_dirWatch->contains(poBaseDir+subDir)) + if(!_dirWatch->tqcontains(poBaseDir+subDir)) { _dirWatch->addDir(poBaseDir+subDir); newDirAdded=true; @@ -2206,8 +2206,8 @@ void CatalogManagerView::updateDir(TQString relDir) deleteDirItem(relDir); // if this directory has to be removed, check, if - // the parent directory has to be removed too - const int index=relDir.findRev("/",relDir.length()-2); + // the tqparent directory has to be removed too + const int index=relDir.tqfindRev("/",relDir.length()-2); if(index<0) { relDir="/"; @@ -2266,12 +2266,12 @@ void CatalogManagerView::directoryChanged(const TQString& dir) CatManListItem* thisItem=_dirList[relDir]; if(!thisItem) { - // if this item is not in the list search for next existing parent item + // if this item is not in the list search for next existing tqparent item TQString prevRelDir; do { prevRelDir=relDir; - const int index=relDir.findRev("/",relDir.length()-2); + const int index=relDir.tqfindRev("/",relDir.length()-2); if(index<0) { relDir="/"; @@ -2289,7 +2289,7 @@ void CatalogManagerView::directoryChanged(const TQString& dir) } else { - // if a parent item dir is found, create the needed item in this dir + // if a tqparent item dir is found, create the needed item in this dir // and build the tree from this item on kdDebug(KBABEL_CATMAN) << "building dir: " << prevRelDir << endl; CatManListItem* item = new CatManListItem(this, thisItem,_settings.poBaseDir+prevRelDir @@ -2417,7 +2417,7 @@ void CatalogManagerView::directoryDeleted(const TQString& dir) void CatalogManagerView::fileInfoRead( TQString filename ) { - if( _readInfoFileList.find( filename ) != _readInfoFileList.end() ) { + if( _readInfoFileList.tqfind( filename ) != _readInfoFileList.end() ) { emit progress( ++_readInfoCount); _readInfoFileList.remove( filename ); } @@ -2518,8 +2518,8 @@ void CatalogManagerView::contentsMouseMoveEvent(TQMouseEvent* event) if(event->state() & LeftButton) { const int delay = KGlobalSettings::dndEventDelay(); - if(QABS( event->pos().x() - _pressPos.x() ) >= delay || - QABS( event->pos().y() - _pressPos.y() ) >= delay) + if(TQABS( event->pos().x() - _pressPos.x() ) >= delay || + TQABS( event->pos().y() - _pressPos.y() ) >= delay) { CatManListItem* item = (CatManListItem*)itemAt(contentsToViewport(_pressPos)); if(item && item->isFile()) @@ -2624,7 +2624,7 @@ CatManListItem *CatalogManagerView::itemBelow( CatManListItem *item ) { while( !static_cast<CatManListItem *>( item->nextSibling() ) ) { - item = static_cast<CatManListItem *>( item->parent() ); + item = static_cast<CatManListItem *>( item->tqparent() ); if( !item ) return item; } return static_cast<CatManListItem *>( item->nextSibling() ); @@ -2634,7 +2634,7 @@ CatManListItem *CatalogManagerView::itemBelow( CatManListItem *item ) { while( !static_cast<CatManListItem *>( item->nextSibling() ) ) { - item = static_cast<CatManListItem *>( item->parent()); + item = static_cast<CatManListItem *>( item->tqparent()); if( !item ) return item; } return static_cast<CatManListItem *>( item->nextSibling() ); @@ -2651,7 +2651,7 @@ CatManListItem *CatalogManagerView::itemAbove( CatManListItem *item ) { while( !static_cast<CatManListItem *>( item->previousSibling() ) ) { - item = static_cast<CatManListItem *>( item->parent() ); + item = static_cast<CatManListItem *>( item->tqparent() ); if( !item ) return item; } return static_cast<CatManListItem *>( item->previousSibling() ); @@ -2661,7 +2661,7 @@ CatManListItem *CatalogManagerView::itemAbove( CatManListItem *item ) { while( !static_cast<CatManListItem *>( item->previousSibling() ) ) { - item = static_cast<CatManListItem *>( item->parent()); + item = static_cast<CatManListItem *>( item->tqparent()); if( !item ) return item; } return static_cast<CatManListItem *>( item->previousSibling() ); @@ -3008,7 +3008,7 @@ void CatalogManagerView::validate_internal( const TQStringList& files, const KDa true, i18n("Validation Options"), KDialogBase::Ok|KDialogBase::Cancel); _validateOptions = new ValidationOptions(_validateOptionsDlg); _validateOptionsDlg->setMainWidget( _validateOptions ); - _validateOptions->resize( _validateOptions->sizeHint() ); + _validateOptions->resize( _validateOptions->tqsizeHint() ); // setup stored values _validateOptions->markAsFuzzy->setChecked( _markAsFuzzy ); @@ -3129,4 +3129,4 @@ void CatalogManagerView::toggleColumn( uint column, bool show ) } #include "catalogmanagerview.moc" -// kate: space-indent on; indent-width 4; replace-tabs on; +// kate: space-indent on; indent-width 4; tqreplace-tabs on; diff --git a/kbabel/catalogmanager/catalogmanagerview.h b/kbabel/catalogmanager/catalogmanagerview.h index a1a23729..26a05d9f 100644 --- a/kbabel/catalogmanager/catalogmanagerview.h +++ b/kbabel/catalogmanager/catalogmanagerview.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -74,11 +74,12 @@ namespace KBabel class PoInfo; } -class CatalogManagerView : public QListView +class CatalogManagerView : public TQListView { Q_OBJECT + TQ_OBJECT public: - CatalogManagerView(KBabel::Project::Ptr project, TQWidget* parent=0, const char* name=0); + CatalogManagerView(KBabel::Project::Ptr project, TQWidget* tqparent=0, const char* name=0); virtual ~CatalogManagerView(); KBabel::CatManSettings settings() const; @@ -125,14 +126,14 @@ public slots: * traverses all childs in the directory of the current item * (including all subdirectories) and displays some statistics * about the translations. If the item is a file, its - * parent directory is used instead. + * tqparent directory is used instead. */ void statistics(); /** * traverses all marked childs in the directory of the current item * (including all subdirectories) and displays some statistics * about the translations. If the item is a file, its - * parent directory is used instead. + * tqparent directory is used instead. */ void markedStatistics(); /** @@ -160,7 +161,7 @@ public slots: void cvsUpdateMarked( ); void cvsCommit( ); void cvsCommitMarked( ); - void cvsStatus( ); + void cvstqStatus( ); void cvsStatusMarked( ); void cvsUpdateTemplate( ); void cvsUpdateMarkedTemplate( ); @@ -184,7 +185,7 @@ public slots: void svnInfo(); void svnInfoMarked(); - TQString find(KBabel::FindOptions &options, TQStringList &rest); + TQString tqfind(KBabel::FindOptions &options, TQStringList &rest); void showLog(); @@ -193,7 +194,7 @@ public slots: /** * Stop searching, do not try to proceed to the next file * @ref @find will return clear list of rest to be searched - * and @ref TQString::null, if search string was not is the last searched file + * and @ref TQString(), if search string was not is the last searched file */ void stopSearch(); @@ -234,7 +235,7 @@ public slots: /** * Returns the list of all currently selected files. If current selection is dir, - * it returns list of all its children. + * it returns list of all its tqchildren. */ TQStringList current(); /** diff --git a/kbabel/catalogmanager/catmanlistitem.cpp b/kbabel/catalogmanager/catmanlistitem.cpp index 5613a0bd..8d1496d4 100644 --- a/kbabel/catalogmanager/catmanlistitem.cpp +++ b/kbabel/catalogmanager/catmanlistitem.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -53,15 +53,15 @@ using namespace KBabel; -CatManListItem::CatManListItem(CatalogManagerView *view, TQListViewItem* parent,TQString fullPath,TQString fullPotPath,TQString package) - : TQListViewItem(parent) +CatManListItem::CatManListItem(CatalogManagerView *view, TQListViewItem* tqparent,TQString fullPath,TQString fullPotPath,TQString package) + : TQListViewItem(tqparent) { _view = view; init(fullPath,fullPotPath,package); } -CatManListItem::CatManListItem(CatalogManagerView *view, TQListView* parent,TQString fullPath,TQString fullPotPath) - : TQListViewItem(parent) +CatManListItem::CatManListItem(CatalogManagerView *view, TQListView* tqparent,TQString fullPath,TQString fullPotPath) + : TQListViewItem(tqparent) { _primary=TQFileInfo(fullPath); _template=TQFileInfo(fullPotPath); @@ -102,7 +102,7 @@ void CatManListItem::init(const TQString& fullPath, const TQString& fullPotPath, _wordList.clear(); _wordListUpdated = false; - update(parent()->isOpen(),false,true); + update(tqparent()->isOpen(),false,true); if( !isDir() ) setPixmap(COL_MARKER,ICON_NOFLAG); } @@ -183,7 +183,7 @@ void CatManListItem::setOpen(bool open) TQStringList CatManListItem::allChildrenList(bool onlyFiles) const { - TQStringList childrenList; + TQStringList tqchildrenList; CatManListItem * myChild = (CatManListItem*)firstChild(); while( myChild ) @@ -192,26 +192,26 @@ TQStringList CatManListItem::allChildrenList(bool onlyFiles) const if(myChild->isFile()) { - childrenList.append(name); + tqchildrenList.append(name); } else if(myChild->isDir()) { if(!onlyFiles) - childrenList.append(name); + tqchildrenList.append(name); - childrenList+=myChild->allChildrenList(onlyFiles); + tqchildrenList+=myChild->allChildrenList(onlyFiles); } myChild = (CatManListItem*)myChild->nextSibling(); } - return childrenList; + return tqchildrenList; } TQStringList CatManListItem::allChildrenFileList(bool onlyFiles, bool emptyDirs, bool onlyModified) const { - TQStringList childrenList; + TQStringList tqchildrenList; CatManListItem * myChild = (CatManListItem*)firstChild(); while( myChild ) @@ -219,22 +219,22 @@ TQStringList CatManListItem::allChildrenFileList(bool onlyFiles, bool emptyDirs, if(myChild->isFile() && myChild->hasPo() && !(!myChild->isModified() && onlyModified)) { - childrenList.append(myChild->poFile()); + tqchildrenList.append(myChild->poFile()); } else if(myChild->isDir()) { if(!onlyFiles && (emptyDirs || myChild->_primary.exists() )) { - childrenList.append(myChild->poFile()); + tqchildrenList.append(myChild->poFile()); } - childrenList+=myChild->allChildrenFileList(onlyFiles,false,onlyModified); + tqchildrenList+=myChild->allChildrenFileList(onlyFiles,false,onlyModified); } myChild = (CatManListItem*)myChild->nextSibling(); } - return childrenList; + return tqchildrenList; } @@ -332,11 +332,11 @@ TQString CatManListItem::key(int col, bool) const void CatManListItem::update(bool showPoInfo,bool includeChildren , bool noParents) { - if( _view->isStopped() ) return; // if parent view is stopped, we should stop as well + if( _view->isStopped() ) return; // if tqparent view is stopped, we should stop as well bool updateWordList = _view->settings().indexWords; - // flag, if something has changed and parent has to be updated + // flag, if something has changed and tqparent has to be updated bool updateParent=false; // update flags for files... @@ -417,7 +417,7 @@ void CatManListItem::update(bool showPoInfo,bool includeChildren if(showPoInfo) { - _lastUpdated=TQDateTime::currentDateTime(); + _lastUpdated=TQDateTime::tqcurrentDateTime(); bool neededWork=needsWork(); bool needWork=false; @@ -435,17 +435,17 @@ void CatManListItem::update(bool showPoInfo,bool includeChildren const CVSHandler* cvsHandler = _view->cvsHandler(); const SVNHandler* svnHandler = _view->svnHandler(); - const CVSHandler::FileStatus cvsFileStatus = cvsHandler->fstatus( poFile() ); - const SVNHandler::FileStatus svnFileStatus = svnHandler->fstatus( poFile() ); + const CVSHandler::FiletqStatus cvsFiletqStatus = cvsHandler->fstatus( poFile() ); + const SVNHandler::FiletqStatus svnFiletqStatus = svnHandler->fstatus( poFile() ); - _isModified = cvsHandler->isConsideredModified( cvsFileStatus ) - || svnHandler->isConsideredModified( svnFileStatus ); + _isModified = cvsHandler->isConsideredModified( cvsFiletqStatus ) + || svnHandler->isConsideredModified( svnFiletqStatus ); TQString versionControl; - if ( cvsFileStatus != CVSHandler::NO_REPOSITORY ) - versionControl = cvsHandler->fileStatus( cvsFileStatus ); - else if ( svnFileStatus != SVNHandler::NO_REPOSITORY ) - versionControl = svnHandler->fileStatus( svnFileStatus ); + if ( cvsFiletqStatus != CVSHandler::NO_REPOSITORY ) + versionControl = cvsHandler->filetqStatus( cvsFiletqStatus ); + else if ( svnFiletqStatus != SVNHandler::NO_REPOSITORY ) + versionControl = svnHandler->filetqStatus( svnFiletqStatus ); else versionControl = i18n("No version control"); @@ -532,15 +532,15 @@ void CatManListItem::update(bool showPoInfo,bool includeChildren if(showPoInfo) { - _lastUpdated=TQDateTime::currentDateTime(); + _lastUpdated=TQDateTime::tqcurrentDateTime(); // clean previous state information - setText(COL_FUZZY,TQString::null); - setText(COL_UNTRANS,TQString::null); - setText(COL_TOTAL,TQString::null); - setText(COL_CVS_OR_SVN, TQString::null); - setText(COL_REVISION, TQString::null); - setText(COL_TRANSLATOR, TQString::null); + setText(COL_FUZZY,TQString()); + setText(COL_UNTRANS,TQString()); + setText(COL_TOTAL,TQString()); + setText(COL_CVS_OR_SVN, TQString()); + setText(COL_REVISION, TQString()); + setText(COL_TRANSLATOR, TQString()); setPixmap(COL_NAME,ICON_UPDATING); @@ -596,7 +596,7 @@ void CatManListItem::update(bool showPoInfo,bool includeChildren // however, is can be saved template or translation!!! - only translation is handled??? void CatManListItem::updateAfterSave( PoInfo &poInfo ) { - // flag, if something has changed and parent has to be updated + // flag, if something has changed and tqparent has to be updated bool updateParent=false; // update flags for files... @@ -617,7 +617,7 @@ void CatManListItem::updateAfterSave( PoInfo &poInfo ) TQString name=_primary.fileName(); setText(COL_NAME,name.left(name.length()-3)); - _lastUpdated=TQDateTime::currentDateTime(); + _lastUpdated=TQDateTime::tqcurrentDateTime(); bool neededWork=needsWork(); bool needWork=false; @@ -625,14 +625,14 @@ void CatManListItem::updateAfterSave( PoInfo &poInfo ) TQPixmap icon; _hasErrors=false; - const CVSHandler::FileStatus cvsFileStatus = _view->cvsHandler()->fstatus(poFile()); - const SVNHandler::FileStatus svnFileStatus = _view->svnHandler()->fstatus(poFile()); + const CVSHandler::FiletqStatus cvsFiletqStatus = _view->cvsHandler()->fstatus(poFile()); + const SVNHandler::FiletqStatus svnFiletqStatus = _view->svnHandler()->fstatus(poFile()); TQString versionControl; - if ( cvsFileStatus != CVSHandler::NO_REPOSITORY ) - versionControl = _view->cvsHandler()->fileStatus( cvsFileStatus ); - else if ( svnFileStatus != SVNHandler::NO_REPOSITORY ) - versionControl = _view->svnHandler()->fileStatus( svnFileStatus ); + if ( cvsFiletqStatus != CVSHandler::NO_REPOSITORY ) + versionControl = _view->cvsHandler()->filetqStatus( cvsFiletqStatus ); + else if ( svnFiletqStatus != SVNHandler::NO_REPOSITORY ) + versionControl = _view->svnHandler()->filetqStatus( svnFiletqStatus ); else versionControl = i18n("No version control"); @@ -661,7 +661,7 @@ void CatManListItem::updateAfterSave( PoInfo &poInfo ) setPixmap(COL_NAME,icon); - // if the status changed, update the parent item + // if the status changed, update the tqparent item if(needWork != neededWork) { updateParent=true; @@ -677,11 +677,11 @@ void CatManListItem::updateAfterSave( PoInfo &poInfo ) void CatManListItem::updateParents() { - CatManListItem *item = (CatManListItem*)parent(); + CatManListItem *item = (CatManListItem*)tqparent(); while( item && !_view->isStopped()) { item->update(false,false); - item = (CatManListItem*)item->parent(); + item = (CatManListItem*)item->tqparent(); } } @@ -799,12 +799,12 @@ TQString CatManListItem::package(bool rootSlash) const TQString CatManListItem::packageDir( ) const { - return ( _type == Dir ? _package : TQString::null ); + return ( _type == Dir ? _package : TQString() ); } TQString CatManListItem::name() const { - int index = _package.findRev("/"); + int index = _package.tqfindRev("/"); return _package.right(_package.length()-index-1); } @@ -825,12 +825,12 @@ TQPixmap CatManListItem::paintExclamation(TQPixmap* pixmap) int width=pixmap->width(); int height=pixmap->height(); - int diameter=QMIN(width,height); + int diameter=TQMIN(width,height); - TQBitmap mask=pixmap->createHeuristicMask(); + TQBitmap tqmask=pixmap->createHeuristicMask(); - TQPainter mp(&mask); - mp.setPen(TQPen(Qt::color1,1)); + TQPainter mp(&tqmask); + mp.setPen(TQPen(TQt::color1,1)); mp.drawEllipse(width-diameter,height-diameter,diameter,diameter); TQPixmap result(width,height); @@ -840,14 +840,14 @@ TQPixmap CatManListItem::paintExclamation(TQPixmap* pixmap) p.setPen( TQPen(red,1) ); p.drawEllipse(width-diameter,height-diameter,diameter,diameter); - result.setMask(mask); + result.setMask(tqmask); return result; } TQListViewItem *CatManListItem::previousSibling() { - TQListViewItem * i = parent(); + TQListViewItem * i = tqparent(); if( !i ) return i; i = i->firstChild(); if( !i ) return i; diff --git a/kbabel/catalogmanager/catmanlistitem.h b/kbabel/catalogmanager/catmanlistitem.h index b156c034..a21db4f0 100644 --- a/kbabel/catalogmanager/catmanlistitem.h +++ b/kbabel/catalogmanager/catmanlistitem.h @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -54,25 +54,25 @@ namespace KBabel class PoInfo; } -class CatManListItem : public QListViewItem +class CatManListItem : public TQListViewItem { public: /** the type of this item */ enum Type{File,Dir}; - CatManListItem(CatalogManagerView *view, TQListViewItem* parent,TQString fullPath + CatManListItem(CatalogManagerView *view, TQListViewItem* tqparent,TQString fullPath ,TQString fullPotPath,TQString package); /** creates the toplevel root item with package name "/" */ - CatManListItem(CatalogManagerView *view, TQListView* parent,TQString fullPath, TQString fullPotPath); + CatManListItem(CatalogManagerView *view, TQListView* tqparent,TQString fullPath, TQString fullPotPath); /** * returns the package names (including relative path) of the - * children of this item + * tqchildren of this item */ TQStringList contentsList(bool onlyFiles=false) const; /** - * returns the package names of all children of this item + * returns the package names of all tqchildren of this item * (including all subdirectries) * @param onlyFiles flag, if only the names of files should be returned * @see CatManListItem::contentsList @@ -80,7 +80,7 @@ public: TQStringList allChildrenList(bool onlyFiles=false) const; /** - * returns the relative file names of all children of this item + * returns the relative file names of all tqchildren of this item * (including all subdirectries) * @param onlyFiles flag, if only the names of files should be returned * @param emptyDirs flag, if the empty dirs (dirs without PO files in them) should be returned @@ -94,7 +94,7 @@ public: /** * checks if the file on the disc has changed, * reads information about the file and displays it - * @param noParents flag, if the update has to include the parent + * @param noParents flag, if the update has to include the tqparent * of the item, if the status has changed. Since at the first build of * the tree, the status of every item changes, this is not useful then. */ @@ -119,7 +119,7 @@ public: /** returns the package name (inlcuding relative path to base-directory) */ TQString package(bool rootSlash=true) const; - /** returns the relative path of a dir or TQString::null if not a dir. */ + /** returns the relative path of a dir or TQString() if not a dir. */ TQString packageDir( ) const; /** returns the package name (without path) */ @@ -172,7 +172,7 @@ public: TQStringList &wordList() { return _wordList; } bool wordsUpdated() { return _wordListUpdated; } - /** These are not in Qt, so we need to implement it ourselves*/ + /** These are not in TQt, so we need to implement it ourselves*/ TQListViewItem *previousSibling(); TQListViewItem *lastChild(); @@ -183,8 +183,8 @@ private: * @param showPoInfo if true, reads information about the * file using @ref Catalog::info * ( slow for big files ) - * @param includeChildren flag, if possible children should be updated,too - * @param noParents flag, if parents should be updated, when state + * @param includeChildren flag, if possible tqchildren should be updated,too + * @param noParents flag, if tqparents should be updated, when state * of the item has changed */ void update(bool showPoInfo=true,bool includeChildren=false @@ -227,7 +227,7 @@ private: /** a list of errors found by validation tool*/ TQValueList<IgnoreItem> _errors; - /** parent view for this item, used for stopping the activity */ + /** tqparent view for this item, used for stopping the activity */ CatalogManagerView *_view; /** index of words, but it does not contain any useful information as values */ diff --git a/kbabel/catalogmanager/catmanresource.h b/kbabel/catalogmanager/catmanresource.h index 06b3ac33..0c8a694a 100644 --- a/kbabel/catalogmanager/catmanresource.h +++ b/kbabel/catalogmanager/catmanresource.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kbabel/catalogmanager/findinfilesdialog.cpp b/kbabel/catalogmanager/findinfilesdialog.cpp index becffa51..587d7f75 100644 --- a/kbabel/catalogmanager/findinfilesdialog.cpp +++ b/kbabel/catalogmanager/findinfilesdialog.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -44,11 +44,11 @@ using namespace KBabel; -FindInFilesDialog::FindInFilesDialog(bool forReplace, TQWidget* parent) - :FindDialog(forReplace, parent) +FindInFilesDialog::FindInFilesDialog(bool forReplace, TQWidget* tqparent) + :FindDialog(forReplace, tqparent) { TQGroupBox* box = new TQGroupBox(2, Qt::Horizontal, i18n("File Options"), mainWidget()); - mainWidget()->layout()->add(box); + mainWidget()->tqlayout()->add(box); _inAllFiles = new TQCheckBox(i18n("&In all files"),box); _inMarked = new TQCheckBox(i18n("&Marked files"),box); @@ -57,7 +57,7 @@ FindInFilesDialog::FindInFilesDialog(bool forReplace, TQWidget* parent) _askForSave = new TQCheckBox(i18n("Save &without asking"),box); TQWhatsThis::add(box,i18n("<qt><p><b>File Options</b></p>" - "<p>Here you can finetune where to find:" + "<p>Here you can finetune where to tqfind:" "<ul><li><b>In all files</b>: search in all files, otherwise searched " "is the selected file or files in the selected folder</li>" "<li><b>Ask before next file</b>: show a dialog asking to proceed to the next file</li>" diff --git a/kbabel/catalogmanager/findinfilesdialog.h b/kbabel/catalogmanager/findinfilesdialog.h index 4ddbbb7d..afabcb58 100644 --- a/kbabel/catalogmanager/findinfilesdialog.h +++ b/kbabel/catalogmanager/findinfilesdialog.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -41,12 +41,13 @@ class TQCheckBox; class FindInFilesDialog : public FindDialog { Q_OBJECT + TQ_OBJECT public: /** * Constructor * @param replaceDlg flag, if this is a replace dialog */ - FindInFilesDialog(bool replaceDlg, TQWidget* parent); + FindInFilesDialog(bool replaceDlg, TQWidget* tqparent); ~FindInFilesDialog(); /** diff --git a/kbabel/catalogmanager/future.cpp b/kbabel/catalogmanager/future.cpp index 4c9c8a90..a1da0036 100644 --- a/kbabel/catalogmanager/future.cpp +++ b/kbabel/catalogmanager/future.cpp @@ -2,7 +2,7 @@ // Misc. messages already existing in the kbabel-svn branch i18n("SVN"); -i18n( "CVS/SVN Status" ); +i18n( "CVS/SVN tqStatus" ); // Messages for further SVN functions i18n( "Resolved" ); diff --git a/kbabel/catalogmanager/libcvs/cvsdialog.cpp b/kbabel/catalogmanager/libcvs/cvsdialog.cpp index 090b3de3..1a71cf94 100644 --- a/kbabel/catalogmanager/libcvs/cvsdialog.cpp +++ b/kbabel/catalogmanager/libcvs/cvsdialog.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -32,7 +32,7 @@ **************************************************************************** */ -// Qt include files +// TQt include files #include <tqcheckbox.h> #include <tqcombobox.h> #include <tqfileinfo.h> @@ -60,8 +60,8 @@ #include "cvsdialog.h" -CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config ) - : KDialog( parent, "CVSDIALOG", true ), m_config( config ) +CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * tqparent, KSharedConfig* config ) + : KDialog( tqparent, "CVSDIALOG", true ), m_config( config ) { _cmd = cmd; p=0L; @@ -69,7 +69,7 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config TQString temp; - TQVBoxLayout * layout = new TQVBoxLayout( this, 6, 6, "MAIN LAYOUT" ); + TQVBoxLayout * tqlayout = new TQVBoxLayout( this, 6, 6, "MAIN LAYOUT" ); // Set the label's text depending on the CVS command. switch ( cmd ) { @@ -79,18 +79,18 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config case CVS::Commit: temp = i18n( "Commit the following files:" ); break; - case CVS::Status: + case CVS::tqStatus: temp = i18n( "Get status for the following files:" ); break; case CVS::Diff: temp = i18n( "Get diff for the following files:" ); break; } - layout->addWidget( new TQLabel( temp, this ) ); + tqlayout->addWidget( new TQLabel( temp, this ) ); // Widget for showing the list of files. filebox = new TQListBox( this ); - layout->addWidget( filebox ); + tqlayout->addWidget( filebox ); // Add special widgets for 'cvs commit'. if ( cmd == CVS::Commit ) { @@ -101,25 +101,25 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config oldMessages = new TQComboBox( this ); oldMessages->setDuplicatesEnabled( false ); label->setBuddy( oldMessages ); - layout->addWidget( label ); - layout->addWidget( oldMessages ); + tqlayout->addWidget( label ); + tqlayout->addWidget( oldMessages ); // Textfield for entering a log message. label = new TQLabel( i18n( "&Log message:" ), this ); logedit = new TQTextEdit( this ); label->setBuddy( logedit ); - layout->addWidget( label ); - layout->addWidget( logedit ); + tqlayout->addWidget( label ); + tqlayout->addWidget( logedit ); label = new TQLabel( i18n( "E&ncoding:" ), this ); m_encodingComboBox = new KComboBox( this ); label->setBuddy( m_encodingComboBox ); - layout->addWidget( label ); - layout->addWidget( m_encodingComboBox ); + tqlayout->addWidget( label ); + tqlayout->addWidget( m_encodingComboBox ); TQStringList encodingList; // The last encoding will be added at the top of the list, when the seetings will be read. - encodingList << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).arg( "UTF-8" ); - encodingList << i18n( "Descriptive encoding name", "Locale ( %1 )" ).arg( TQTextCodec::codecForLocale()->mimeName() ); + encodingList << i18n( "Descriptive encoding name", "Recommended ( %1 )" ).tqarg( "UTF-8" ); + encodingList << i18n( "Descriptive encoding name", "Locale ( %1 )" ).tqarg( TQTextCodec::codecForLocale()->mimeName() ); encodingList += KGlobal::charsets()->descriptiveEncodingNames(); m_encodingComboBox->insertStringList( encodingList ); @@ -143,8 +143,8 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config case CVS::Commit: temp = i18n( "&Commit" ); break; - case CVS::Status: - temp = i18n( "&Get Status" ); + case CVS::tqStatus: + temp = i18n( "&Get tqStatus" ); break; case CVS::Diff: temp = i18n( "&Get Diff" ); @@ -156,19 +156,19 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config cancelBtn = new TQPushButton( i18n( "C&ancel" ), this ); buttons->addWidget( cancelBtn ); - layout->addLayout( buttons ); + tqlayout->addLayout( buttons ); TQFrame * line = new TQFrame( this ); line->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); - layout->addWidget( line ); + tqlayout->addWidget( line ); - layout->addWidget( new TQLabel( i18n( "Command output:" ), this ) ); + tqlayout->addWidget( new TQLabel( i18n( "Command output:" ), this ) ); output = new TQTextEdit( this ); output->setReadOnly( true ); - layout->addWidget( output ); + tqlayout->addWidget( output ); - resize( TQSize( 600, 450 ).expandedTo( minimumSizeHint( ) ) ); + resize( TQSize( 600, 450 ).expandedTo( tqminimumSizeHint( ) ) ); if ( cmd == CVS::Commit ) logedit->setFocus( ); @@ -244,14 +244,14 @@ void CVSDialog::slotExecuteCommand( ) if ( !codec ) { - KMessageBox::error( this, i18n( "Cannot find encoding: %1" ).arg( m_encoding ) ); + KMessageBox::error( this, i18n( "Cannot find encoding: %1" ).tqarg( m_encoding ) ); return; } else if ( !codec->canEncode( msg ) ) { const int res = KMessageBox::warningContinueCancel( this, i18n( "The commit log message cannot be encoded in the selected encoding: %1.\n" - "Do you want to continue?" ).arg( m_encoding ) ); + "Do you want to continue?" ).tqarg( m_encoding ) ); if ( res != KMessageBox::Continue ) return; } @@ -282,7 +282,7 @@ void CVSDialog::slotExecuteCommand( ) } // Change the command line to have the real name of the temporary file - _commandLine.replace( "@LOG@FILE@", KProcess::quote( m_tempFile->name() ) ); + _commandLine.tqreplace( "@LOG@FILE@", KProcess::quote( m_tempFile->name() ) ); // Update the list of log messages if ( !msg.isEmpty() ) { @@ -330,7 +330,7 @@ void CVSDialog::slotProcessStdout( KProcess*, char * buffer, int len ) output->setCursorPosition( output->lines( ), 0 ); // If the command is 'cvs status' or 'cvs diff' collect the output of stdout. - if ( (_cmd == CVS::Status) || (_cmd == CVS::Diff) ) + if ( (_cmd == CVS::tqStatus) || (_cmd == CVS::Diff) ) _statusOutput += TQString::fromLocal8Bit( buffer, len ); } @@ -339,7 +339,7 @@ void CVSDialog::slotProcessStderr( KProcess*, char * buffer, int len ) // If an error occurs while executing the command display stderr in // another color. TQColor oldColor( output->color( ) ); - output->setColor( Qt::red ); + output->setColor( TQt::red ); output->append( TQString::fromLocal8Bit( buffer, len ) ); output->setColor( oldColor ); output->setCursorPosition( output->lines( ), 0 ); @@ -348,7 +348,7 @@ void CVSDialog::slotProcessStderr( KProcess*, char * buffer, int len ) void CVSDialog::slotProcessExited( KProcess * p ) { if ( p->exitStatus( ) ) - output->append( i18n( "[ Exited with status %1 ]" ).arg( p->exitStatus( ) ) ); + output->append( i18n( "[ Exited with status %1 ]" ).tqarg( p->exitStatus( ) ) ); else output->append( i18n( "[ Finished ]" ) ); @@ -383,9 +383,9 @@ void CVSDialog::readSettings( ) m_logMessages.clear(); m_squeezedLogMessages.clear(); for ( int cnt = 0; cnt < 10; cnt++ ) - if ( config->hasKey( TQString( "CommitLogMessage%1" ).arg( cnt ) ) ) + if ( config->hasKey( TQString( "CommitLogMessage%1" ).tqarg( cnt ) ) ) { - const TQString logMessage = config->readEntry( TQString( "CommitLogMessage%1" ).arg( cnt ) ); + const TQString logMessage = config->readEntry( TQString( "CommitLogMessage%1" ).tqarg( cnt ) ); if ( !logMessage.isEmpty() ) { // If the message is too long, cut it to 80 characters (or the combo box becomes too wide) @@ -398,7 +398,7 @@ void CVSDialog::readSettings( ) } m_encoding = config->readEntry( "CVSEncoding", "UTF-8" ); - m_encodingComboBox->insertItem( i18n( "Descriptive encoding name", "Last choice ( %1 )" ).arg( m_encoding ), 0); + m_encodingComboBox->insertItem( i18n( "Descriptive encoding name", "Last choice ( %1 )" ).tqarg( m_encoding ), 0); } } @@ -413,7 +413,7 @@ void CVSDialog::saveSettings( ) int cnt = 0; TQStringList::const_iterator it; for ( it = m_logMessages.constBegin( ); it != m_logMessages.constEnd( ) && cnt < 10 ; ++it, ++cnt ) - config->writeEntry( TQString( "CommitLogMessage%1" ).arg( cnt ), *it ); + config->writeEntry( TQString( "CommitLogMessage%1" ).tqarg( cnt ), *it ); config->writeEntry( "CVSEncoding", m_encoding ); } diff --git a/kbabel/catalogmanager/libcvs/cvsdialog.h b/kbabel/catalogmanager/libcvs/cvsdialog.h index 0eccf24c..3c492704 100644 --- a/kbabel/catalogmanager/libcvs/cvsdialog.h +++ b/kbabel/catalogmanager/libcvs/cvsdialog.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -39,7 +39,7 @@ #include <kdialog.h> // Project specific include files #include "cvsresources.h" -// Forwarding Qt classes +// Forwarding TQt classes class TQCheckBox; class TQComboBox; class TQListBox; @@ -66,13 +66,14 @@ class KComboBox; class CVSDialog : public KDialog { Q_OBJECT + TQ_OBJECT public: /** * Constructor for creating the dialog. * @param cmd The type of command to be executed. */ - CVSDialog( CVS::Command cmd, TQWidget * parent, KSharedConfig* config ); + CVSDialog( CVS::Command cmd, TQWidget * tqparent, KSharedConfig* config ); ~CVSDialog(); /** * Set the list of files which will be used for the CVS command. diff --git a/kbabel/catalogmanager/libcvs/cvshandler.cpp b/kbabel/catalogmanager/libcvs/cvshandler.cpp index 66eeac0a..73d149d3 100644 --- a/kbabel/catalogmanager/libcvs/cvshandler.cpp +++ b/kbabel/catalogmanager/libcvs/cvshandler.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -36,7 +36,7 @@ #include <sys/stat.h> #include <time.h> #include <unistd.h> -// Qt include files +// TQt include files #include <tqdir.h> #include <tqfile.h> #include <tqfileinfo.h> @@ -81,7 +81,7 @@ void CVSHandler::setPOTBaseDir( const TQString& dir ) emit signalIsPOTRepository( _isPOTRepository ); } -TQString CVSHandler::fileStatus( const FileStatus status ) const +TQString CVSHandler::filetqStatus( const FiletqStatus status ) const { switch ( status ) { case NO_REPOSITORY: @@ -111,7 +111,7 @@ TQString CVSHandler::fileStatus( const FileStatus status ) const } } -CVSHandler::FileStatus CVSHandler::fstatus( const TQString& filename ) const +CVSHandler::FiletqStatus CVSHandler::fstatus( const TQString& filename ) const { // no valid repository if ( !_isPORepository ) @@ -130,7 +130,7 @@ CVSHandler::FileStatus CVSHandler::fstatus( const TQString& filename ) const // ### FIXME: it does not take care of CVS/Entries.Log // a line in CVS/Entries has the following format: // [D]/NAME/REVISION/[CONFLICT+]TIMESTAMP/OPTIONS/TAGDATE - TQRegExp rx( TQString( "^D?/%1/" ).arg( info.fileName( ) ) ); + TQRegExp rx( TQString( "^D?/%1/" ).tqarg( info.fileName( ) ) ); TQString temp; TQTextStream stream( &entries ); @@ -138,7 +138,7 @@ CVSHandler::FileStatus CVSHandler::fstatus( const TQString& filename ) const bool isInRepository = false; while ( !stream.atEnd() ) { temp = stream.readLine( ); - if ( temp.find( rx ) == 0 ) { + if ( temp.tqfind( rx ) == 0 ) { isInRepository = true; break; } @@ -162,7 +162,7 @@ CVSHandler::FileStatus CVSHandler::fstatus( const TQString& filename ) const return LOCALLY_REMOVED; // check for conflicts - if ( timestamp.find( '+' ) >= 0 ) + if ( timestamp.tqfind( '+' ) >= 0 ) return CONFLICT; // calculate the UTC time from the file's last modified date @@ -177,23 +177,23 @@ CVSHandler::FileStatus CVSHandler::fstatus( const TQString& filename ) const return UP_TO_DATE; } -TQString CVSHandler::cvsStatus( const TQString& filename ) const +TQString CVSHandler::cvstqStatus( const TQString& filename ) const { return map[filename]; } -void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQString& filename, bool templates, KSharedConfig* config ) +void CVSHandler::execCVSCommand( TQWidget* tqparent, CVS::Command cmd, const TQString& filename, bool templates, KSharedConfig* config ) { if ( !_isPORepository ) { // This message box should never be visible but who knows... ;-) - KMessageBox::sorry( parent, i18n( "This is not a valid CVS repository. " + KMessageBox::sorry( tqparent, i18n( "This is not a valid CVS repository. " "The CVS commands cannot be executed." ) ); return; } TQFileInfo info( filename ); if ( !info.isDir( ) ) { - execCVSCommand( parent, cmd, TQStringList( filename ), templates, config ); + execCVSCommand( tqparent, cmd, TQStringList( filename ), templates, config ); return; } @@ -210,7 +210,7 @@ void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStr command += "commit -F @LOG@FILE@"; checkToAdd( TQStringList( filename ) ); break; - case CVS::Status: + case CVS::tqStatus: command += "status"; break; case CVS::Diff: @@ -218,14 +218,14 @@ void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStr break; } - showDialog( parent, cmd, TQStringList( filename ), command, config ); + showDialog( tqparent, cmd, TQStringList( filename ), command, config ); } -void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config ) +void CVSHandler::execCVSCommand( TQWidget* tqparent, CVS::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config ) { if ( !_isPORepository ) { // This message box should never be visible but who knows... ;-) - KMessageBox::sorry( parent, i18n( "This is not a valid CVS repository. " + KMessageBox::sorry( tqparent, i18n( "This is not a valid CVS repository. " "The CVS commands cannot be executed." ) ); return; } @@ -241,7 +241,7 @@ void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStr command += "commit -F @LOG@FILE@"; checkToAdd( files ); break; - case CVS::Status: + case CVS::tqStatus: command += "status"; break; case CVS::Diff: @@ -262,7 +262,7 @@ void CVSHandler::execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStr command += " \'" + temp + "\'"; } - showDialog( parent, cmd, files, command, config ); + showDialog( tqparent, cmd, files, command, config ); } void CVSHandler::setAutoUpdateTemplates( bool update ) @@ -270,9 +270,9 @@ void CVSHandler::setAutoUpdateTemplates( bool update ) _autoUpdateTemplates = update; } -void CVSHandler::showDialog( TQWidget* parent, CVS::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config ) +void CVSHandler::showDialog( TQWidget* tqparent, CVS::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config ) { - CVSDialog * dia = new CVSDialog( cmd, parent, config ); + CVSDialog * dia = new CVSDialog( cmd, tqparent, config ); dia->setFiles( files ); dia->setCommandLine( commandLine ); if ( cmd == CVS::Commit ) { @@ -280,7 +280,7 @@ void CVSHandler::showDialog( TQWidget* parent, CVS::Command cmd, const TQStringL } if ( dia->exec( ) == KDialog::Accepted ) { - if ( cmd == CVS::Status ) + if ( cmd == CVS::tqStatus ) processStatusOutput( dia->statusOutput( ) ); if ( cmd == CVS::Diff ) processDiff( dia->statusOutput( ) ); @@ -313,7 +313,7 @@ void CVSHandler::checkToAdd( const TQStringList& files ) toBeAdded << *it; temp = TQFileInfo( *it ).dirPath( true ); } - // check recursivlely if parent dirs have to be added as well + // check recursivlely if tqparent dirs have to be added as well while ( fstatus( temp ) == NOT_IN_CVS && toBeAdded.findIndex( temp ) == -1 ) { toBeAdded << temp; temp = TQFileInfo( temp ).dirPath( true ); @@ -357,7 +357,7 @@ void CVSHandler::processStatusOutput( const TQString& status ) TQString entr = *it; // translate the filename from repository to local TQRegExp rx( basedir + ".*,v" ); - int pos = entr.find( rx ); + int pos = entr.tqfind( rx ); TQString file = _poBaseDir + entr.mid( pos + basedir.length( ), rx.matchedLength( ) - basedir.length( ) - 2 ); @@ -365,14 +365,14 @@ void CVSHandler::processStatusOutput( const TQString& status ) // TODO: do some markup - map.replace( file, entr ); + map.tqreplace( file, entr ); } } void CVSHandler::processDiff( TQString output ) { output.remove( TQRegExp( "\\[ .* \\]$" )); - output.remove( TQRegExp( "^" + i18n("[ Starting command ]" ).replace("[","\\[").replace("]","\\]"))); + output.remove( TQRegExp( "^" + i18n("[ Starting command ]" ).tqreplace("[","\\[").tqreplace("]","\\]"))); KTempFile tmpFile; *(tmpFile.textStream()) << output; @@ -383,7 +383,7 @@ void CVSHandler::processDiff( TQString output ) KMessageBox::error( 0, error ); } -bool CVSHandler::isConsideredModified( const FileStatus status ) const +bool CVSHandler::isConsideredModified( const FiletqStatus status ) const { /* * A file is modified if it is either: diff --git a/kbabel/catalogmanager/libcvs/cvshandler.h b/kbabel/catalogmanager/libcvs/cvshandler.h index 961c41fd..78e248da 100644 --- a/kbabel/catalogmanager/libcvs/cvshandler.h +++ b/kbabel/catalogmanager/libcvs/cvshandler.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -35,13 +35,13 @@ #ifndef CVSHANDLER_H #define CVSHANDLER_H -// Qt include files +// TQt include files #include <tqmap.h> #include <tqobject.h> // Project specific include files #include "cvsdialog.h" #include "cvsresources.h" -// Forwarding Qt classes +// Forwarding TQt classes class TQString; class TQStringList; class TQWidget; @@ -54,12 +54,13 @@ class KSharedConfig; * @short Backend for CVS support in Catalog Manager * @author Marco Wegner <mail@marcowegner.de> */ -class CVSHandler : public QObject +class CVSHandler : public TQObject { Q_OBJECT + TQ_OBJECT public: - enum FileStatus { + enum FiletqStatus { NO_REPOSITORY, NOT_IN_CVS, LOCALLY_ADDED, @@ -69,24 +70,24 @@ class CVSHandler : public QObject UP_TO_DATE }; - CVSHandler( const TQString& poBaseDir = TQString::null, const TQString& potBaseDir = TQString::null ); + CVSHandler( const TQString& poBaseDir = TQString(), const TQString& potBaseDir = TQString() ); void setPOBaseDir( const TQString& dir ); void setPOTBaseDir( const TQString& dir ); - FileStatus fstatus( const TQString& filename ) const; - TQString fileStatus( const FileStatus status ) const; - TQString cvsStatus( const TQString& filename ) const; + FiletqStatus fstatus( const TQString& filename ) const; + TQString filetqStatus( const FiletqStatus status ) const; + TQString cvstqStatus( const TQString& filename ) const; - void execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQString& filename, bool templates, KSharedConfig* config ); - void execCVSCommand( TQWidget* parent, CVS::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config ); + void execCVSCommand( TQWidget* tqparent, CVS::Command cmd, const TQString& filename, bool templates, KSharedConfig* config ); + void execCVSCommand( TQWidget* tqparent, CVS::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config ); void setAutoUpdateTemplates( bool update ); /** * True if the file was modified or has another status considered as a modification */ - bool isConsideredModified( const FileStatus status ) const; + bool isConsideredModified( const FiletqStatus status ) const; signals: void signalIsPORepository( bool ); @@ -94,7 +95,7 @@ class CVSHandler : public QObject void signalFilesCommitted( const TQStringList& ); private: - void showDialog( TQWidget* parent, CVS::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config ); + void showDialog( TQWidget* tqparent, CVS::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config ); void checkToAdd( const TQStringList& files ); void processStatusOutput( const TQString& status ); void processDiff( TQString output ); diff --git a/kbabel/catalogmanager/libcvs/cvsresources.h b/kbabel/catalogmanager/libcvs/cvsresources.h index 627802f7..4c2bc144 100644 --- a/kbabel/catalogmanager/libcvs/cvsresources.h +++ b/kbabel/catalogmanager/libcvs/cvsresources.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -35,7 +35,7 @@ #define CVSRESOURCES_H namespace CVS { - enum Command { Update, Commit, Status, Diff }; + enum Command { Update, Commit, tqStatus, Diff }; } #endif // CVSRESOURCES_H diff --git a/kbabel/catalogmanager/libsvn/svndialog.cpp b/kbabel/catalogmanager/libsvn/svndialog.cpp index a6f7d229..e6cb76e5 100644 --- a/kbabel/catalogmanager/libsvn/svndialog.cpp +++ b/kbabel/catalogmanager/libsvn/svndialog.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -32,7 +32,7 @@ **************************************************************************** */ -// Qt include files +// TQt include files #include <tqcheckbox.h> #include <tqcombobox.h> #include <tqfileinfo.h> @@ -57,8 +57,8 @@ #include "svndialog.h" -SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config ) - : KDialog( parent, "SVN DIALOG", true ), m_tempFile( 0 ), m_config( config ) +SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * tqparent, KSharedConfig* config ) + : KDialog( tqparent, "SVN DIALOG", true ), m_tempFile( 0 ), m_config( config ) { _cmd = cmd; p=0L; @@ -66,7 +66,7 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config TQString temp; - TQVBoxLayout * layout = new TQVBoxLayout( this, 6, 6, "MAIN LAYOUT" ); + TQVBoxLayout * tqlayout = new TQVBoxLayout( this, 6, 6, "MAIN LAYOUT" ); // Set the label's text depending on the SVN command. switch ( cmd ) { @@ -89,11 +89,11 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config temp = i18n( "Get information for the following files:" ); break; } - layout->addWidget( new TQLabel( temp, this ) ); + tqlayout->addWidget( new TQLabel( temp, this ) ); // Widget for showing the list of files. filebox = new TQListBox( this ); - layout->addWidget( filebox ); + tqlayout->addWidget( filebox ); // Add special widgets for 'svn commit'. if ( cmd == SVN::Commit ) { @@ -104,15 +104,15 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config oldMessages = new TQComboBox( this ); oldMessages->setDuplicatesEnabled( false ); label->setBuddy( oldMessages ); - layout->addWidget( label ); - layout->addWidget( oldMessages ); + tqlayout->addWidget( label ); + tqlayout->addWidget( oldMessages ); // Textfield for entering a log message. label = new TQLabel( i18n( "&Log message:" ), this ); logedit = new TQTextEdit( this ); label->setBuddy( logedit ); - layout->addWidget( label ); - layout->addWidget( logedit ); + tqlayout->addWidget( label ); + tqlayout->addWidget( logedit ); connect( oldMessages, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotComboActivated( int ) ) ); @@ -136,7 +136,7 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config break; case SVN::StatusRemote: case SVN::StatusLocal: - temp = i18n( "&Get Status" ); + temp = i18n( "&Get tqStatus" ); break; case SVN::Diff: temp = i18n( "&Get Diff" ); @@ -151,19 +151,19 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config cancelBtn = new TQPushButton( i18n( "C&ancel" ), this ); buttons->addWidget( cancelBtn ); - layout->addLayout( buttons ); + tqlayout->addLayout( buttons ); TQFrame * line = new TQFrame( this ); line->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); - layout->addWidget( line ); + tqlayout->addWidget( line ); - layout->addWidget( new TQLabel( i18n( "Command output:" ), this ) ); + tqlayout->addWidget( new TQLabel( i18n( "Command output:" ), this ) ); output = new TQTextEdit( this ); output->setReadOnly( true ); - layout->addWidget( output ); + tqlayout->addWidget( output ); - resize( TQSize( 600, 450 ).expandedTo( minimumSizeHint( ) ) ); + resize( TQSize( 600, 450 ).expandedTo( tqminimumSizeHint( ) ) ); if ( cmd == SVN::Commit ) logedit->setFocus( ); @@ -261,7 +261,7 @@ void SVNDialog::slotExecuteCommand( ) } // Change the command line to have the real name of the temporary file - _commandLine.replace( "@LOG@FILE@", KProcess::quote( m_tempFile->name() ) ); + _commandLine.tqreplace( "@LOG@FILE@", KProcess::quote( m_tempFile->name() ) ); // Update the list of log messages if ( !msg.isEmpty() ) { @@ -318,7 +318,7 @@ void SVNDialog::slotProcessStderr( KProcess*, char * buffer, int len ) // If an error occurs while executing the command display stderr in // another color. TQColor oldColor( output->color( ) ); - output->setColor( Qt::red ); + output->setColor( TQt::red ); output->append( TQString::fromLocal8Bit( buffer, len ) ); output->setColor( oldColor ); output->setCursorPosition( output->lines( ), 0 ); @@ -327,7 +327,7 @@ void SVNDialog::slotProcessStderr( KProcess*, char * buffer, int len ) void SVNDialog::slotProcessExited( KProcess * p ) { if ( p->exitStatus( ) ) - output->append( i18n( "[ Exited with status %1 ]" ).arg( p->exitStatus( ) ) ); + output->append( i18n( "[ Exited with status %1 ]" ).tqarg( p->exitStatus( ) ) ); else output->append( i18n( "[ Finished ]" ) ); @@ -362,9 +362,9 @@ void SVNDialog::readSettings( ) m_logMessages.clear(); m_squeezedLogMessages.clear(); for ( int cnt = 0; cnt < 10; cnt++ ) - if ( config->hasKey( TQString( "CommitLogMessage%1" ).arg( cnt ) ) ) + if ( config->hasKey( TQString( "CommitLogMessage%1" ).tqarg( cnt ) ) ) { - const TQString logMessage = config->readEntry( TQString( "CommitLogMessage%1" ).arg( cnt ) ); + const TQString logMessage = config->readEntry( TQString( "CommitLogMessage%1" ).tqarg( cnt ) ); if ( !logMessage.isEmpty() ) { // If the message is too long, cut it to 80 characters (or the combo box becomes too wide) @@ -390,11 +390,11 @@ void SVNDialog::saveSettings( ) int cnt = 0; TQStringList::const_iterator it; for ( it = m_logMessages.constBegin( ); it != m_logMessages.constEnd( ) && cnt < 10 ; ++it, ++cnt ) - config->writeEntry( TQString( "CommitLogMessage%1" ).arg( cnt ), *it ); + config->writeEntry( TQString( "CommitLogMessage%1" ).tqarg( cnt ), *it ); } m_config->sync(); } #include "svndialog.moc" -// kate: space-indent on; indent-width 2; replace-tabs on; +// kate: space-indent on; indent-width 2; tqreplace-tabs on; diff --git a/kbabel/catalogmanager/libsvn/svndialog.h b/kbabel/catalogmanager/libsvn/svndialog.h index d1ca2d16..55c57f27 100644 --- a/kbabel/catalogmanager/libsvn/svndialog.h +++ b/kbabel/catalogmanager/libsvn/svndialog.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -39,7 +39,7 @@ #include <kdialog.h> // Project specific include files #include "svnresources.h" -// Forwarding Qt classes +// Forwarding TQt classes class TQCheckBox; class TQComboBox; class TQListBox; @@ -65,13 +65,14 @@ class KSharedConfig; class SVNDialog : public KDialog { Q_OBJECT + TQ_OBJECT public: /** * Constructor for creating the dialog. * @param cmd The type of command to be executed. */ - SVNDialog( SVN::Command cmd, TQWidget * parent, KSharedConfig* config ); + SVNDialog( SVN::Command cmd, TQWidget * tqparent, KSharedConfig* config ); ~SVNDialog(); /** * Set the list of files which will be used for the SVN command. diff --git a/kbabel/catalogmanager/libsvn/svnhandler.cpp b/kbabel/catalogmanager/libsvn/svnhandler.cpp index 1ac98f66..c648c2bb 100644 --- a/kbabel/catalogmanager/libsvn/svnhandler.cpp +++ b/kbabel/catalogmanager/libsvn/svnhandler.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -36,7 +36,7 @@ #include <unistd.h> #include <sys/stat.h> #include <time.h> -// Qt include files +// TQt include files #include <tqdir.h> #include <tqfile.h> #include <tqfileinfo.h> @@ -83,7 +83,7 @@ void SVNHandler::setPOTBaseDir( const TQString& dir ) emit signalIsPOTRepository( _isPOTRepository ); } -TQString SVNHandler::fileStatus( const FileStatus status ) const +TQString SVNHandler::filetqStatus( const FiletqStatus status ) const { switch ( status ) { case NO_REPOSITORY: @@ -115,7 +115,7 @@ TQString SVNHandler::fileStatus( const FileStatus status ) const } } -SVNHandler::FileStatus SVNHandler::fstatus( const TQString& filename ) const +SVNHandler::FiletqStatus SVNHandler::fstatus( const TQString& filename ) const { // no valid repository if ( !_isPORepository ) @@ -145,7 +145,7 @@ SVNHandler::FileStatus SVNHandler::fstatus( const TQString& filename ) const int errorLine, errorCol; TQDomNodeList nodelist; TQDomNode node; - TQDomElement entry, wcStatus; + TQDomElement entry, wctqStatus; // Parse the output. if ( !doc.setContent( out.getOutput(), &errorMsg, &errorLine, &errorCol ) ) { @@ -177,22 +177,22 @@ SVNHandler::FileStatus SVNHandler::fstatus( const TQString& filename ) const if ( node.isNull() ) return ERROR_IN_WC; - wcStatus = node.toElement(); + wctqStatus = node.toElement(); - if ( wcStatus.attributeNode("item").value() == "normal" ) + if ( wctqStatus.attributeNode("item").value() == "normal" ) return UP_TO_DATE; - if ( wcStatus.attributeNode("item").value() == "modified" ) + if ( wctqStatus.attributeNode("item").value() == "modified" ) return LOCALLY_MODIFIED; - if ( wcStatus.attributeNode("item").value() == "conflicted" ) + if ( wctqStatus.attributeNode("item").value() == "conflicted" ) return CONFLICT; - if ( wcStatus.attributeNode("item").value() == "unversioned" ) + if ( wctqStatus.attributeNode("item").value() == "unversioned" ) return NOT_IN_SVN; // TODO Ignored entry should have separate return value probably. - if ( wcStatus.attributeNode("item").value() == "ignored" ) + if ( wctqStatus.attributeNode("item").value() == "ignored" ) return NOT_IN_SVN; - if ( wcStatus.attributeNode("item").value() == "added" ) + if ( wctqStatus.attributeNode("item").value() == "added" ) return LOCALLY_ADDED; - if ( wcStatus.attributeNode("item").value() == "deleted" ) + if ( wctqStatus.attributeNode("item").value() == "deleted" ) return LOCALLY_REMOVED; // TODO What to do with "missing", "incomplete", "replaced", "merged", // "obstructed", "external"? Can these appear at all in our case? @@ -269,23 +269,23 @@ no_status_xml: } -TQString SVNHandler::svnStatus( const TQString& filename ) const +TQString SVNHandler::svntqStatus( const TQString& filename ) const { return map[filename]; } -void SVNHandler::execSVNCommand( TQWidget* parent, SVN::Command cmd, const TQString& filename, bool templates, KSharedConfig* config) +void SVNHandler::execSVNCommand( TQWidget* tqparent, SVN::Command cmd, const TQString& filename, bool templates, KSharedConfig* config) { // Unlike cvs, svn works also from outside the repository(as long as the path is in a repository of course!) // ### FIXME: wrong, svn commit cannot work if the current directory is not a SVN one - execSVNCommand( parent, cmd, TQStringList( filename ), templates, config ); + execSVNCommand( tqparent, cmd, TQStringList( filename ), templates, config ); } -void SVNHandler::execSVNCommand( TQWidget* parent, SVN::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config ) +void SVNHandler::execSVNCommand( TQWidget* tqparent, SVN::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config ) { if ( !_isPORepository ) { // This message box should never be visible but who knows... ;-) - KMessageBox::sorry( parent, i18n( "This is not a valid SVN repository. " + KMessageBox::sorry( tqparent, i18n( "This is not a valid SVN repository. " "The SVN commands cannot be executed." ) ); return; } @@ -328,7 +328,7 @@ void SVNHandler::execSVNCommand( TQWidget* parent, SVN::Command cmd, const TQStr command += " \'" + temp + "\'"; } - showDialog( parent, cmd, files, command, config ); + showDialog( tqparent, cmd, files, command, config ); } void SVNHandler::setAutoUpdateTemplates( bool update ) @@ -336,9 +336,9 @@ void SVNHandler::setAutoUpdateTemplates( bool update ) _autoUpdateTemplates = update; } -void SVNHandler::showDialog( TQWidget* parent, SVN::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config ) +void SVNHandler::showDialog( TQWidget* tqparent, SVN::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config ) { - SVNDialog * dia = new SVNDialog( cmd, parent, config ); + SVNDialog * dia = new SVNDialog( cmd, tqparent, config ); dia->setFiles( files ); dia->setCommandLine( commandLine ); if ( cmd == SVN::Commit ) { @@ -415,7 +415,7 @@ void SVNHandler::checkToAdd( const TQStringList& files ) } // ### TODO: does SVN really needs this or does it do it automatically? - // check recursivlely if parent dirs have to be added as well + // check recursivlely if tqparent dirs have to be added as well while ( ! isInSvn( temp ) && toBeAdded.findIndex( temp ) == -1 ) { toBeAdded << temp; temp = TQFileInfo( temp ).dirPath( true ); @@ -464,7 +464,7 @@ void SVNHandler::processStatusOutput( const TQString& status ) TQString entr = *it; // translate the filename from repository to local TQRegExp rx( basedir + ".*,v" ); - int pos = entr.find( rx ); + int pos = entr.tqfind( rx ); TQString file = _poBaseDir + entr.mid( pos + basedir.length( ), rx.matchedLength( ) - basedir.length( ) - 2 ); @@ -472,7 +472,7 @@ void SVNHandler::processStatusOutput( const TQString& status ) // TODO: do some markup - map.replace( file, entr ); + map.tqreplace( file, entr ); } #endif } @@ -480,7 +480,7 @@ void SVNHandler::processStatusOutput( const TQString& status ) void SVNHandler::processDiff( TQString output ) { output.remove( TQRegExp( "\\[ .* \\]$" )); - output.remove( TQRegExp( "^" + i18n("[ Starting command ]" ).replace("[","\\[").replace("]","\\]"))); + output.remove( TQRegExp( "^" + i18n("[ Starting command ]" ).tqreplace("[","\\[").tqreplace("]","\\]"))); KTempFile tmpFile; *(tmpFile.textStream()) << output; @@ -491,7 +491,7 @@ void SVNHandler::processDiff( TQString output ) KMessageBox::error( 0, error ); } -bool SVNHandler::isConsideredModified( const FileStatus status ) const +bool SVNHandler::isConsideredModified( const FiletqStatus status ) const { /* * A file is modified if it is either: @@ -541,4 +541,4 @@ void SVNOutputCollector::slotGatherStdout( KProcess*, char* data, int len ) #include "svnhandler.moc" -// kate: space-indent on; indent-width 2; replace-tabs on; +// kate: space-indent on; indent-width 2; tqreplace-tabs on; diff --git a/kbabel/catalogmanager/libsvn/svnhandler.h b/kbabel/catalogmanager/libsvn/svnhandler.h index 82039421..cad3e93f 100644 --- a/kbabel/catalogmanager/libsvn/svnhandler.h +++ b/kbabel/catalogmanager/libsvn/svnhandler.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -35,13 +35,13 @@ #ifndef SVNHANDLER_H #define SVNHANDLER_H -// Qt include files +// TQt include files #include <tqmap.h> #include <tqobject.h> // Project specific include files #include "svndialog.h" #include "svnresources.h" -// Forwarding Qt classes +// Forwarding TQt classes class TQString; class TQStringList; @@ -52,12 +52,13 @@ class KSharedConfig; * * @short Backend for SVN support in Catalog Manager */ -class SVNHandler : public QObject +class SVNHandler : public TQObject { Q_OBJECT + TQ_OBJECT public: - enum FileStatus { + enum FiletqStatus { NO_REPOSITORY, NOT_IN_SVN, LOCALLY_ADDED, @@ -68,24 +69,24 @@ class SVNHandler : public QObject ERROR_IN_WC ///< The working copy has data that cannot be handled }; - SVNHandler( const TQString& poBaseDir = TQString::null, const TQString& potBaseDir = TQString::null ); + SVNHandler( const TQString& poBaseDir = TQString(), const TQString& potBaseDir = TQString() ); void setPOBaseDir( const TQString& dir ); void setPOTBaseDir( const TQString& dir ); - FileStatus fstatus( const TQString& filename ) const; - TQString fileStatus( const FileStatus status ) const; - TQString svnStatus( const TQString& filename ) const; + FiletqStatus fstatus( const TQString& filename ) const; + TQString filetqStatus( const FiletqStatus status ) const; + TQString svntqStatus( const TQString& filename ) const; - void execSVNCommand( TQWidget* parent, SVN::Command cmd, const TQString& filename, bool templates, KSharedConfig* config ); - void execSVNCommand( TQWidget* parent, SVN::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config ); + void execSVNCommand( TQWidget* tqparent, SVN::Command cmd, const TQString& filename, bool templates, KSharedConfig* config ); + void execSVNCommand( TQWidget* tqparent, SVN::Command cmd, const TQStringList& files, bool templates, KSharedConfig* config ); void setAutoUpdateTemplates( bool update ); /** * True if the file was modified or has another status considered as a modification */ - bool isConsideredModified( const FileStatus status ) const; + bool isConsideredModified( const FiletqStatus status ) const; signals: void signalIsPORepository( bool ); @@ -93,7 +94,7 @@ class SVNHandler : public QObject void signalFilesCommitted( const TQStringList& ); private: - void showDialog( TQWidget* parent, SVN::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config ); + void showDialog( TQWidget* tqparent, SVN::Command cmd, const TQStringList& files, const TQString& commandLine, KSharedConfig* config ); /// Check quickly if the file is part of a SVN repository bool isInSvn( const TQString& path ); void checkToAdd( const TQStringList& files ); @@ -112,9 +113,10 @@ class SVNHandler : public QObject TQMap<TQString,TQString> map; }; -class SVNOutputCollector: public QObject +class SVNOutputCollector: public TQObject { Q_OBJECT + TQ_OBJECT public: SVNOutputCollector( KProcess* ); diff --git a/kbabel/catalogmanager/libsvn/svnresources.h b/kbabel/catalogmanager/libsvn/svnresources.h index d9032a4f..1d68aa16 100644 --- a/kbabel/catalogmanager/libsvn/svnresources.h +++ b/kbabel/catalogmanager/libsvn/svnresources.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kbabel/catalogmanager/main.cpp b/kbabel/catalogmanager/main.cpp index 706ad67f..31030dd5 100644 --- a/kbabel/catalogmanager/main.cpp +++ b/kbabel/catalogmanager/main.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -188,7 +188,7 @@ int main(int argc, char **argv) I18N_NOOP("(c) 1999,2000,2001,2002,2003,2004,2005,2006 The KBabel developers"),0,"http://kbabel.kde.org"); about.addAuthor("Matthias Kiefer",I18N_NOOP("Original author"),"kiefer@kde.org"); - about.addAuthor("Stanislav Visnovsky",I18N_NOOP("Current maintainer, porting to KDE3/Qt3.") + about.addAuthor("Stanislav Visnovsky",I18N_NOOP("Current maintainer, porting to KDE3/TQt3.") ,"visnovsky@kde.org"); about.addAuthor("Nicolas Goutte", I18N_NOOP("Current maintainer"), "goutte@kde.org"); @@ -211,7 +211,7 @@ int main(int argc, char **argv) about.addCredit("Bram Schoenmakers",I18N_NOOP("Support for making diffs and some minor " "improvements."),"bramschoenmakers@kde.nl"); - about.addCredit("Trolltech", I18N_NOOP("KBabel contains code from Qt"), 0, "http://www.trolltech.com"); + about.addCredit("Trolltech", I18N_NOOP("KBabel contains code from TQt"), 0, "http://www.trolltech.com"); about.addCredit("GNU gettext", I18N_NOOP("KBabel contains code from GNU gettext"), 0, "http://www.gnu.org/software/gettext/"); diff --git a/kbabel/catalogmanager/markpatterndialog.cpp b/kbabel/catalogmanager/markpatterndialog.cpp index f56a735b..ecb88bb8 100644 --- a/kbabel/catalogmanager/markpatterndialog.cpp +++ b/kbabel/catalogmanager/markpatterndialog.cpp @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -47,8 +47,8 @@ #include "markpatterndialog.h" #include "markpatternwidget.h" -MarkPatternDialog::MarkPatternDialog(TQWidget * parent, const char * name) - : KDialogBase(parent, name, true, 0, Ok|Cancel, Ok) +MarkPatternDialog::MarkPatternDialog(TQWidget * tqparent, const char * name) + : KDialogBase(tqparent, name, true, 0, Ok|Cancel, Ok) { actionButton(Ok)->setEnabled(false); @@ -127,7 +127,7 @@ void MarkPatternDialog::slotRegexpButtonClicked( ) { if (!regexpEditDialog) regexpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( - "KRegExpEditor/KRegExpEditor", TQString::null, this); + "KRegExpEditor/KRegExpEditor", TQString(), this); KRegExpEditorInterface * iface = dynamic_cast<KRegExpEditorInterface *>(regexpEditDialog); diff --git a/kbabel/catalogmanager/markpatterndialog.h b/kbabel/catalogmanager/markpatterndialog.h index de919130..46a39c32 100644 --- a/kbabel/catalogmanager/markpatterndialog.h +++ b/kbabel/catalogmanager/markpatterndialog.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -43,9 +43,10 @@ class MarkPatternWidget; class MarkPatternDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - MarkPatternDialog(TQWidget * parent, const char * name = 0); + MarkPatternDialog(TQWidget * tqparent, const char * name = 0); TQString pattern( ); bool isCaseSensitive( ); diff --git a/kbabel/catalogmanager/markpatternwidget.ui b/kbabel/catalogmanager/markpatternwidget.ui index b4b8745e..2a4c88af 100644 --- a/kbabel/catalogmanager/markpatternwidget.ui +++ b/kbabel/catalogmanager/markpatternwidget.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>MarkPatternWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>MarkPatternWidget</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>mainLabel</cstring> </property> @@ -35,7 +35,7 @@ <bool>true</bool> </property> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -46,7 +46,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>caseSensitive</cstring> </property> @@ -54,7 +54,7 @@ <string>C&ase sensitive</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>inclTemplates</cstring> </property> @@ -62,7 +62,7 @@ <string>&Include templates</string> </property> </widget> - <widget class="QRadioButton" row="3" column="0"> + <widget class="TQRadioButton" row="3" column="0"> <property name="name"> <cstring>useWildcards</cstring> </property> @@ -70,7 +70,7 @@ <string>Use &wildcards</string> </property> </widget> - <widget class="QPushButton" row="4" column="1"> + <widget class="TQPushButton" row="4" column="1"> <property name="name"> <cstring>regexpButton</cstring> </property> @@ -78,7 +78,7 @@ <string>&Edit</string> </property> </widget> - <widget class="QRadioButton" row="4" column="0"> + <widget class="TQRadioButton" row="4" column="0"> <property name="name"> <cstring>useRegExp</cstring> </property> @@ -120,7 +120,7 @@ <forwards> <forward>class KComboBox;</forward> </forwards> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/kbabel/catalogmanager/multiroughtransdlg.cpp b/kbabel/catalogmanager/multiroughtransdlg.cpp index 248ac55a..70cc32fc 100644 --- a/kbabel/catalogmanager/multiroughtransdlg.cpp +++ b/kbabel/catalogmanager/multiroughtransdlg.cpp @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -48,19 +48,19 @@ using namespace KBabel; MultiRoughTransDlg::MultiRoughTransDlg(KBabelDictBox *dict, TQPtrList<CatManListItem> files - , TQWidget *parent,const char *name) - : RoughTransDlg(dict, new Catalog(), parent, name ) + , TQWidget *tqparent,const char *name) + : RoughTransDlg(dict, new Catalog(), tqparent, name ) ,_fileList(files) { - TQWidget* bars = static_cast<TQWidget*>(progressbar->parent()); + TQWidget* bars = static_cast<TQWidget*>(progressbar->tqparent()); TQLabel* label = new TQLabel( i18n("Files:"), bars ); filesProgressbar = new KProgress(bars,"files progressbar"); filesProgressbar->setTextEnabled(true); filesProgressbar->setFormat("%v/%m (%p%)"); filesProgressbar->setTotalSteps(files.count()); - TQHBoxLayout* mylayout= new TQHBoxLayout(bars->layout()); - mylayout->add(label); - mylayout->add(filesProgressbar); + TQHBoxLayout* mytqlayout= new TQHBoxLayout(bars->tqlayout()); + mytqlayout->add(label); + mytqlayout->add(filesProgressbar); msgButtonClicked(0); } @@ -82,7 +82,7 @@ void MultiRoughTransDlg::translate() if( catalog->openURL( url ) != OK ) { KMessageBox::error(this, i18n("Error while trying to read file:\n %1\n" - "Maybe it is not a valid PO file.").arg(url.prettyURL())); + "Maybe it is not a valid PO file.").tqarg(url.prettyURL())); filesProgressbar->advance(1); continue; } @@ -94,7 +94,7 @@ void MultiRoughTransDlg::translate() if( catalog->openURL( poturl, url ) != OK ) { KMessageBox::error(this, i18n("Error while trying to read file:\n %1\n" - "Maybe it is not a valid PO file.").arg(poturl.prettyURL())); + "Maybe it is not a valid PO file.").tqarg(poturl.prettyURL())); filesProgressbar->advance(1); continue; } @@ -131,13 +131,13 @@ void MultiRoughTransDlg::showAllStatistics() "Exact translations: %2 (%3%)\n" "Approximate translations: %4 (%5%)\n" "Nothing found: %6 (%7%)") - .arg( locale->formatNumber(tt,0) ) - .arg( locale->formatNumber(etc,0) ) - .arg( locale->formatNumber( ((double)(10000*etc/tt))/100) ) - .arg( locale->formatNumber(ptc,0) ) - .arg( locale->formatNumber(((double)(10000*ptc/tt))/100) ) - .arg( locale->formatNumber(nothing,0) ) - .arg( locale->formatNumber(((double)(10000*nothing/tt)/100) ) ); + .tqarg( locale->formatNumber(tt,0) ) + .tqarg( locale->formatNumber(etc,0) ) + .tqarg( locale->formatNumber( ((double)(10000*etc/tt))/100) ) + .tqarg( locale->formatNumber(ptc,0) ) + .tqarg( locale->formatNumber(((double)(10000*ptc/tt))/100) ) + .tqarg( locale->formatNumber(nothing,0) ) + .tqarg( locale->formatNumber(((double)(10000*nothing/tt)/100) ) ); KMessageBox::information(this, statMsg , i18n("Rough Translation Statistics")); diff --git a/kbabel/catalogmanager/multiroughtransdlg.h b/kbabel/catalogmanager/multiroughtransdlg.h index cdc4d1ed..560ae1d8 100644 --- a/kbabel/catalogmanager/multiroughtransdlg.h +++ b/kbabel/catalogmanager/multiroughtransdlg.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -40,9 +40,10 @@ class CatManListItem; class MultiRoughTransDlg : public RoughTransDlg { Q_OBJECT + TQ_OBJECT public: - MultiRoughTransDlg(KBabelDictBox* dictBox, TQPtrList<CatManListItem> list, TQWidget *parent + MultiRoughTransDlg(KBabelDictBox* dictBox, TQPtrList<CatManListItem> list, TQWidget *tqparent , const char *name=0); protected slots: diff --git a/kbabel/catalogmanager/validateprogress.cpp b/kbabel/catalogmanager/validateprogress.cpp index b8c563a8..8c957ca9 100644 --- a/kbabel/catalogmanager/validateprogress.cpp +++ b/kbabel/catalogmanager/validateprogress.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -52,8 +52,8 @@ // version identification for validation ignores #define IGNOREFILE_VERSION 0x00 -ValidateProgressDialog::ValidateProgressDialog(const TQString& ignoreURL, TQWidget *parent,const char *name) - : KDialogBase(parent,name,true,i18n("Caption of dialog","Validation") +ValidateProgressDialog::ValidateProgressDialog(const TQString& ignoreURL, TQWidget *tqparent,const char *name) + : KDialogBase(tqparent,name,true,i18n("Caption of dialog","Validation") , Close, Close) , _ignoreURL(ignoreURL), _tool(0), _stopped(false) , _ignoreFuzzy(false), _setAsFuzzy(false) @@ -168,7 +168,7 @@ void ValidateProgressDialog::validate_internal() } TQString errortext=TQString::number(item.index+1)+": " + item.msgid.first().left(50); - errortext.replace("\n"," "); + errortext.tqreplace("\n"," "); if( item.msgid.first().length() > 50 ) errortext+="..."; _mainWidget->_errorList->insertItem( errortext); @@ -187,7 +187,7 @@ void ValidateProgressDialog::validate_internal() "\n" "Checked files: %1\n" "Number of errors: %2\n" - "Number of ignored errors: %3").arg(checked).arg(errors).arg(ignorederrors),i18n("Validation Done")); + "Number of ignored errors: %3").tqarg(checked).tqarg(errors).tqarg(ignorederrors),i18n("Validation Done")); } delete _tool; @@ -205,7 +205,7 @@ void ValidateProgressDialog::errorItemDoubleClicked(TQListBoxItem * item) TQString it = item->text(); bool ok =false; - int offset = it.find(":"); + int offset = it.tqfind(":"); int num; if( offset < -1 ) num = 0; @@ -239,7 +239,7 @@ void ValidateProgressDialog::showContextMenu(TQListBoxItem * item, const TQPoint errorItemDoubleClicked( item ); break; case ID_ERROR_IGNORE: - IgnoreItem it = _errors.find(item->text()).data(); + IgnoreItem it = _errors.tqfind(item->text()).data(); // if there is no pixmap, it's the whole file if( !item->pixmap() ) diff --git a/kbabel/catalogmanager/validateprogress.h b/kbabel/catalogmanager/validateprogress.h index 15c7c238..f0ae950f 100644 --- a/kbabel/catalogmanager/validateprogress.h +++ b/kbabel/catalogmanager/validateprogress.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -59,9 +59,10 @@ TQDataStream & operator>>( TQDataStream & stream, IgnoreItem & ident); class ValidateProgressDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ValidateProgressDialog(const TQString& ignoreURL, TQWidget* parent, const char *name=0); + ValidateProgressDialog(const TQString& ignoreURL, TQWidget* tqparent, const char *name=0); virtual ~ValidateProgressDialog(); void setIgnoreFuzzy(bool enable) { _ignoreFuzzy = enable; } diff --git a/kbabel/catalogmanager/validateprogresswidget.ui b/kbabel/catalogmanager/validateprogresswidget.ui index a181806b..ccef3b74 100644 --- a/kbabel/catalogmanager/validateprogresswidget.ui +++ b/kbabel/catalogmanager/validateprogresswidget.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>ValidateProgressWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ValidateProgressWidget</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -16,19 +16,19 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>_currentAction</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>92</width> <height>0</height> @@ -51,7 +51,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -72,7 +72,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>_currentLabel</cstring> </property> @@ -80,7 +80,7 @@ <string>Current file:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel3_2</cstring> </property> @@ -90,7 +90,7 @@ </widget> </grid> </widget> - <widget class="QListBox"> + <widget class="TQListBox"> <item> <property name="text"> <string>New Item</string> @@ -113,13 +113,13 @@ <includes> <include location="local" impldecl="in implementation">validateprogresswidget.ui.h</include> </includes> -<signals> +<Q_SIGNALS> <signal>setValidationProgressBar(int)</signal> -</signals> -<slots> +</Q_SIGNALS> +<Q_SLOTS> <slot>setupFileProgressBar( QString text, int maxvalue )</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kprogress.h</includehint> <includehint>ksqueezedtextlabel.h</includehint> diff --git a/kbabel/catalogmanager/validateprogresswidget.ui.h b/kbabel/catalogmanager/validateprogresswidget.ui.h index f3723e02..70655c72 100644 --- a/kbabel/catalogmanager/validateprogresswidget.ui.h +++ b/kbabel/catalogmanager/validateprogresswidget.ui.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -32,7 +32,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ @@ -44,5 +44,5 @@ void ValidateProgressWidget::setupFileProgressBar( TQString text, int maxvalue ) TQString t = text[0].upper()+text.mid(1)+":"; _currentAction->setText(t); - _currentAction->repaint(); + _currentAction->tqrepaint(); } diff --git a/kbabel/catalogmanager/validationoptions.ui b/kbabel/catalogmanager/validationoptions.ui index 61079ff3..23e560c4 100644 --- a/kbabel/catalogmanager/validationoptions.ui +++ b/kbabel/catalogmanager/validationoptions.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>ValidationOptions</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ValidationOptions</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -16,15 +16,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>markAsFuzzy</cstring> </property> @@ -39,7 +39,7 @@ marked as fuzzy and the resulting file will be saved.</p></qt></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>ignoreFuzzy</cstring> </property> @@ -56,5 +56,5 @@ marked as fuzzy will not be validated at all.</p></qt></string> </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kbabel/common/argextractor.cpp b/kbabel/common/argextractor.cpp index ec5d659f..5666acdc 100644 --- a/kbabel/common/argextractor.cpp +++ b/kbabel/common/argextractor.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kbabel/common/argextractor.h b/kbabel/common/argextractor.h index dd84f1c2..83545520 100644 --- a/kbabel/common/argextractor.h +++ b/kbabel/common/argextractor.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -58,7 +58,7 @@ public: /** * Create an argument extractor for "string" */ - ArgExtractor(TQString string=TQString::null); + ArgExtractor(TQString string=TQString()); /** * Set a new list of tag regular expressions. It also diff --git a/kbabel/common/catalog.cpp b/kbabel/common/catalog.cpp index d6501c3e..3639748c 100644 --- a/kbabel/common/catalog.cpp +++ b/kbabel/common/catalog.cpp @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -70,8 +70,8 @@ #include <kmessagebox.h> using namespace KBabel; -Catalog::Catalog(TQObject* parent, const char* name, TQString projectFile) - : TQObject(parent,name) +Catalog::Catalog(TQObject* tqparent, const char* name, TQString projectFile) + : TQObject(tqparent,name) { if ( projectFile.isEmpty() ) projectFile = KBabel::ProjectManager::defaultProjectName(); @@ -79,7 +79,7 @@ Catalog::Catalog(TQObject* parent, const char* name, TQString projectFile) readPreferences(); } -Catalog::Catalog(const Catalog& c): TQObject(c.parent(),c.name() +Catalog::Catalog(const Catalog& c): TQObject(c.tqparent(),c.name() ) { kdFatal() << "Copy constructor of Catalog, please report how to reproduce to the authors" << endl; @@ -93,7 +93,7 @@ Catalog::~Catalog() TQString Catalog::msgctxt(uint index) const { if ( d->_entries.isEmpty() ) - return TQString::null; + return TQString(); uint max=d->_entries.count()-1; if(index > max) index=max; @@ -103,7 +103,7 @@ TQString Catalog::msgctxt(uint index) const TQStringList Catalog::msgid(uint index, const bool noNewlines) const { if ( d->_entries.isEmpty() ) - return TQString::null; + return TQString(); uint max=d->_entries.count()-1; if(index > max) index=max; @@ -114,7 +114,7 @@ TQStringList Catalog::msgid(uint index, const bool noNewlines) const TQStringList Catalog::msgstr(uint index, const bool noNewlines) const { if ( d->_entries.isEmpty() ) - return TQString::null; + return TQString(); uint max=d->_entries.count()-1; if(index > max) @@ -126,7 +126,7 @@ TQStringList Catalog::msgstr(uint index, const bool noNewlines) const TQString Catalog::comment(uint index) const { if ( d->_entries.isEmpty() ) - return TQString::null; + return TQString(); uint max=d->_entries.count()-1; if(index > max) index=max; @@ -165,7 +165,7 @@ int Catalog::indexForMsgid(const TQString& id) const int i=0; TQValueVector<CatalogItem>::ConstIterator it = d->_entries.begin(); - while(it != d->_entries.end() && !((*it).msgid(true).contains(id))) + while(it != d->_entries.end() && !((*it).msgid(true).tqcontains(id))) { ++it; i++; @@ -290,8 +290,8 @@ bool Catalog::setHeader(CatalogItem newHeader) { // normalize the values - ensure every key:value pair is only on a single line TQString values = newHeader.msgstr().first(); - values.replace ("\n", ""); - values.replace ("\\n", "\\n\n"); + values.tqreplace ("\n", ""); + values.tqreplace ("\\n", "\\n\n"); kdDebug () << "Normalized header: " << values << endl; @@ -343,7 +343,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const temp+="\\n"; for( it = headerList.begin(); it != headerList.end(); ++it ) { - if((*it).contains(TQRegExp("^ *Last-Translator:.*"))) + if((*it).tqcontains(TQRegExp("^ *Last-Translator:.*"))) { (*it) = temp; found=true; @@ -363,7 +363,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const for( it = headerList.begin(); it != headerList.end(); ++it ) { - if((*it).contains(TQRegExp("^ *PO-Revision-Date:.*"))) + if((*it).tqcontains(TQRegExp("^ *PO-Revision-Date:.*"))) { (*it) = temp; found=true; @@ -380,11 +380,11 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const found=false; temp="Project-Id-Version: "+saveOptions.projectString+"\\n"; - temp.replace( "@PACKAGE@", packageName()); + temp.tqreplace( "@PACKAGE@", packageName()); for( it = headerList.begin(); it != headerList.end(); ++it ) { - if((*it).contains(TQRegExp("^ *Project-Id-Version:.*"))) + if((*it).tqcontains(TQRegExp("^ *Project-Id-Version:.*"))) { (*it) = temp; found=true; @@ -408,7 +408,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const temp+="\\n"; for( it = headerList.begin(); it != headerList.end(); ++it ) { - if((*it).contains(TQRegExp("^ *Language-Team:.*"))) + if((*it).tqcontains(TQRegExp("^ *Language-Team:.*"))) { (*it) = temp; found=true; @@ -440,7 +440,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const it = headerList.begin(); while( it != headerList.end() ) { - if( (*it).find( TQRegExp( "^ *Content-Type:.*" ) ) != -1 ) + if( (*it).tqfind( TQRegExp( "^ *Content-Type:.*" ) ) != -1 ) { if ( found ) { @@ -483,7 +483,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const for( it = headerList.begin(); it != headerList.end(); ++it ) { - if((*it).contains(TQRegExp("^ *Content-Transfer-Encoding:.*"))) + if((*it).tqcontains(TQRegExp("^ *Content-Transfer-Encoding:.*"))) { (*it) = temp; found=true; @@ -497,12 +497,12 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const } temp="X-Generator: KBabel %1\\n"; - temp=temp.arg(VERSION); + temp=temp.tqarg(VERSION); found=false; for( it = headerList.begin(); it != headerList.end(); ++it ) { - if((*it).contains(TQRegExp("^ *X-Generator:.*"))) + if((*it).tqcontains(TQRegExp("^ *X-Generator:.*"))) { (*it) = temp; found=true; @@ -519,7 +519,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const found=false; for( it = headerList.begin(); it != headerList.end(); ++it ) { - if((*it).contains(TQRegExp("^ *MIME-Version:"))) + if((*it).tqcontains(TQRegExp("^ *MIME-Version:"))) { (*it) = temp; found=true; @@ -533,7 +533,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const temp="Plural-Forms: %1\\n"; - temp=temp.arg(identityOptions.gnuPluralFormHeader); + temp=temp.tqarg(identityOptions.gnuPluralFormHeader); found=false; // update plural form header @@ -541,7 +541,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const { for( it = headerList.begin(); it != headerList.end(); ++it ) { - if((*it).contains(TQRegExp("^ *Plural-Forms:"))) + if((*it).tqcontains(TQRegExp("^ *Plural-Forms:"))) { (*it) = temp; found=true; @@ -564,7 +564,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const for( it = commentList.begin(); it != commentList.end(); ++it ) { // U+00A9 is the Copyright sign - if ( (*it).find( TQRegExp("^# *Copyright (\\(C\\)|\\x00a9).*Free Software Foundation, Inc") ) != -1 ) + if ( (*it).tqfind( TQRegExp("^# *Copyright (\\(C\\)|\\x00a9).*Free Software Foundation, Inc") ) != -1 ) { found=true; break; @@ -572,21 +572,21 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const } if(found) { - if ( (*it).find( TQRegExp("^# *Copyright (\\(C\\)|\\x00a9) YEAR Free Software Foundation, Inc\\.") ) != -1 ) + if ( (*it).tqfind( TQRegExp("^# *Copyright (\\(C\\)|\\x00a9) YEAR Free Software Foundation, Inc\\.") ) != -1 ) { //template string if( saveOptions.FSFCopyright == ProjectSettingsBase::Remove) (*it).remove(" YEAR Free Software Foundation, Inc"); else - (*it).replace("YEAR", TQDate::currentDate().toString("yyyy")); + (*it).tqreplace("YEAR", TQDate::tqcurrentDate().toString("yyyy")); } else if( saveOptions.FSFCopyright == ProjectSettingsBase::Update ) { //update years - TQString cy = TQDate::currentDate().toString("yyyy"); - if( !(*it).contains( TQRegExp(cy)) ) // is the year already included? + TQString cy = TQDate::tqcurrentDate().toString("yyyy"); + if( !(*it).tqcontains( TQRegExp(cy)) ) // is the year already included? { - int index = (*it).findRev( TQRegExp("[\\d]+[\\d\\-, ]*") ); + int index = (*it).tqfindRev( TQRegExp("[\\d]+[\\d\\-, ]*") ); if( index == -1 ) { KMessageBox::information(0,i18n("Free Software Foundation Copyright does not contain any year. " @@ -603,14 +603,14 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const && ( !saveOptions.descriptionString.isEmpty() ) ) { temp = "# "+saveOptions.descriptionString; - temp.replace( "@PACKAGE@", packageName()); - temp.replace( "@LANGUAGE@", identityOptions.languageName); + temp.tqreplace( "@PACKAGE@", packageName()); + temp.tqreplace( "@LANGUAGE@", identityOptions.languageName); temp = temp.stripWhiteSpace(); // The description strings has often buggy variants already in the file, these must be removed TQString regexpstr = "^#\\s+" + TQRegExp::escape( saveOptions.descriptionString.stripWhiteSpace() ) + "\\s*$"; - regexpstr.replace( "@PACKAGE@", ".*" ); - regexpstr.replace( "@LANGUAGE@", ".*" ); + regexpstr.tqreplace( "@PACKAGE@", ".*" ); + regexpstr.tqreplace( "@LANGUAGE@", ".*" ); //kdDebug() << "REGEXPSTR: " << regexpstr << endl; TQRegExp regexp ( regexpstr ); @@ -674,7 +674,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const { temp+=(" <"+identityOptions.authorEmail+">"); } - temp+=", "+TQDate::currentDate().toString("yyyy")+"."; + temp+=", "+TQDate::tqcurrentDate().toString("yyyy")+"."; // ### TODO: it would be nice if the entry could start with "COPYRIGHT" and have the "(C)" symbol (both not mandatory) TQRegExp regexpAuthorYear( "^#.*(<.+@.+>)?,\\s*([\\d]+[\\d\\-, ]*|YEAR)" ); @@ -683,11 +683,11 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const while ( it != commentList.end() ) { bool deleteItem = false; - if ( (*it).find ( "copyright", 0, false ) != -1 ) + if ( (*it).tqfind ( "copyright", 0, false ) != -1 ) { // We have a line with a copyright. It should not be moved. } - else if ( (*it).find ( regexpYearAlone ) != -1 ) + else if ( (*it).tqfind ( regexpYearAlone ) != -1 ) { // We have found a year number that is preceeded by a comma. // That is typical of KBabel 1.10 (and earlier?) when there is neither an author name nor an email @@ -699,9 +699,9 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const // Typical placeholder, remove it. deleteItem = true; } - else if ( (*it).find ( regexpAuthorYear ) != -1 ) // email address followed by year + else if ( (*it).tqfind ( regexpAuthorYear ) != -1 ) // email address followed by year { - if ( foundAuthors.find( (*it) ) == foundAuthors.end() ) + if ( foundAuthors.tqfind( (*it) ) == foundAuthors.end() ) { // The author line is new (and not a duplicate), so add it to the author line list foundAuthors.append( (*it) ); @@ -721,17 +721,17 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const found = false; bool foundAuthor = false; - const TQString cy = TQDate::currentDate().toString("yyyy"); + const TQString cy = TQDate::tqcurrentDate().toString("yyyy"); ait = foundAuthors.end(); for( it = foundAuthors.begin() ; it!=foundAuthors.end(); ++it ) { - if ( (*it).find( TQRegExp( + if ( (*it).tqfind( TQRegExp( TQRegExp::escape( identityOptions.authorName )+".*" + TQRegExp::escape( identityOptions.authorEmail ) ) ) != -1 ) { foundAuthor = true; - if( (*it).find( cy ) != -1 ) + if( (*it).tqfind( cy ) != -1 ) found = true; else ait = it; @@ -744,7 +744,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const else if ( ait != foundAuthors.end() ) { //update years - const int index = (*ait).findRev( TQRegExp("[\\d]+[\\d\\-, ]*") ); + const int index = (*ait).tqfindRev( TQRegExp("[\\d]+[\\d\\-, ]*") ); if ( index == -1 ) (*ait)+=", "+cy; else @@ -760,7 +760,7 @@ CatalogItem Catalog::updatedHeader(CatalogItem oldHeader, bool usePrefs) const it=commentList.end(); do --it; - while( ( it != commentList.begin() ) && ( (*it).find( TQRegExp( "^#(\\s*$|[:,\\.])" ) ) == -1 ) ); + while( ( it != commentList.begin() ) && ( (*it).tqfind( TQRegExp( "^#(\\s*$|[:,\\.])" ) ) == -1 ) ); ++it; for( ait = foundAuthors.begin() ; ait != foundAuthors.end() ; ++ait ) { @@ -816,7 +816,7 @@ void Catalog::setFuzzy(uint index, bool on) } -void Catalog::removeFuzzyStatus(uint index) +void Catalog::removeFuzzytqStatus(uint index) { setFuzzy(index,false); } @@ -838,7 +838,7 @@ TQString Catalog::packageName() const TQString package=d->_url.fileName(); - int index=package.find(TQRegExp("(\\."+identitySettings().languageCode+")?\\.pot?$")); + int index=package.tqfind(TQRegExp("(\\."+identitySettings().languageCode+")?\\.pot?$")); if(index>0) package=package.left(index); @@ -848,7 +848,7 @@ TQString Catalog::packageName() const void Catalog::setPackage(const TQString& package ) { - const int pos = package.findRev( '/' ); + const int pos = package.tqfindRev( '/' ); if( pos < 0 ) { d->_packageDir = TQString(); @@ -888,10 +888,10 @@ TQString Catalog::encoding() const return encodingStr; } -ConversionStatus Catalog::openURL(const KURL& url, const TQString& package) +ConversiontqStatus Catalog::openURL(const KURL& url, const TQString& package) { TQString target; - ConversionStatus error = OK; + ConversiontqStatus error = OK; if(KIO::NetAccess::download(url, target, NULL)) { @@ -971,8 +971,8 @@ ConversionStatus Catalog::openURL(const KURL& url, const TQString& package) if( package.isEmpty() ) { - d->_packageName=TQString::null; - d->_packageDir=TQString::null; + d->_packageName=TQString(); + d->_packageDir=TQString(); } else setPackage(package); @@ -992,10 +992,10 @@ ConversionStatus Catalog::openURL(const KURL& url, const TQString& package) } } -ConversionStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, const TQString& package) +ConversiontqStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, const TQString& package) { TQString target; - ConversionStatus error = OK; + ConversiontqStatus error = OK; if(KIO::NetAccess::download(openUrl, target, NULL)) { @@ -1069,8 +1069,8 @@ ConversionStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, cons d->_url = saveURL; if( package.isEmpty() ) { - d->_packageName=TQString::null; - d->_packageDir=TQString::null; + d->_packageName=TQString(); + d->_packageDir=TQString(); } else setPackage(package); @@ -1093,9 +1093,9 @@ ConversionStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, cons } } -Msgfmt::Status Catalog::checkSyntax(TQString& output, bool clearErrors) +Msgfmt::tqStatus Catalog::checkSyntax(TQString& output, bool clearErrors) { - if( !d->_mimeTypes.contains( "application/x-gettext" ) ) + if( !d->_mimeTypes.tqcontains( "application/x-gettext" ) ) return Msgfmt::Unsupported; TQString filename; @@ -1112,7 +1112,7 @@ Msgfmt::Status Catalog::checkSyntax(TQString& output, bool clearErrors) } Msgfmt msgfmt; - Msgfmt::Status result = msgfmt.checkSyntax( filename , output, pluralFormType() != KDESpecific ); + Msgfmt::tqStatus result = msgfmt.checkSyntax( filename , output, pluralFormType() != KDESpecific ); if( clearErrors) clearErrorList(); @@ -1128,10 +1128,10 @@ Msgfmt::Status Catalog::checkSyntax(TQString& output, bool clearErrors) const TQStringList lines = TQStringList::split("\n",output); for ( TQStringList::const_iterator it = lines.constBegin(); it != lines.constEnd(); ++it ) { - if( (*it).find(TQRegExp("^.+:\\d+:")) >= 0 ) + if( (*it).tqfind(TQRegExp("^.+:\\d+:")) >= 0 ) { - const int begin=(*it).find(":",0)+1; - const int end=(*it).find(":",begin); + const int begin=(*it).tqfind(":",0)+1; + const int end=(*it).tqfind(":",begin); const TQString line=(*it).mid(begin,end-begin); @@ -1148,7 +1148,7 @@ Msgfmt::Status Catalog::checkSyntax(TQString& output, bool clearErrors) continue; } - if( !d->_errorIndex.contains(currentIndex) ) + if( !d->_errorIndex.tqcontains(currentIndex) ) { d->_errorIndex.append(currentIndex); d->_entries[currentIndex].setSyntaxError(true); @@ -1177,7 +1177,7 @@ void Catalog::clearErrorList() void Catalog::removeFromErrorList(uint index) { - if(d->_errorIndex.contains(index)) + if(d->_errorIndex.tqcontains(index)) { d->_errorIndex.remove(index); d->_entries[index].setSyntaxError(false); @@ -1185,7 +1185,7 @@ void Catalog::removeFromErrorList(uint index) } } -TQStringList Catalog::itemStatus(uint index, bool recheck, TQPtrList<KDataTool> whatToCheck) +TQStringList Catalog::itemtqStatus(uint index, bool recheck, TQPtrList<KDataTool> whatToCheck) { if ( d->_entries.isEmpty() ) return TQStringList(); @@ -1207,7 +1207,7 @@ TQStringList Catalog::itemStatus(uint index, bool recheck, TQPtrList<KDataTool> return item.errors(); } -TQStringList Catalog::itemStatus(uint index) +TQStringList Catalog::itemtqStatus(uint index) { if ( d->_entries.isEmpty() ) return TQStringList(); @@ -1241,7 +1241,7 @@ bool Catalog::checkUsingTool(KDataTool* tool, bool clearErrors) { if( !tool->run( "validate", (void*)(&(*it)), "CatalogItem", "application/x-kbabel-catalogitem" )) { - if( !d->_errorIndex.contains(index) ) + if( !d->_errorIndex.tqcontains(index) ) { d->_errorIndex.append(index); hasErrors=true; @@ -1461,7 +1461,7 @@ bool Catalog::isUntranslated(uint index) const bool Catalog::hasError(uint index, DocPosition& pos) const { - if( d->_errorIndex.contains(index) ) + if( d->_errorIndex.tqcontains(index) ) { pos.item=index; pos.form=0; @@ -1734,7 +1734,7 @@ int Catalog::findNextInList(const TQValueList<uint>& list,uint index) const int nextIndex=-1; // find index in List - it=list.find(index); + it=list.tqfind(index); // if the given index is found in the list and not the last entry // in the list, return the next listentry @@ -1765,7 +1765,7 @@ int Catalog::findPrevInList(const TQValueList<uint>& list,uint index) const int prevIndex=-1; - it=list.find(index); + it=list.tqfind(index); // if the given index is found in the list and not the last entry // in the list, return the next listentry @@ -1800,7 +1800,7 @@ int Catalog::findPrevInList(const TQValueList<uint>& list,uint index) const TQString Catalog::dateTime() const { - const TQDateTime dt = TQDateTime::currentDateTime(); + const TQDateTime dt = TQDateTime::tqcurrentDateTime(); TQString dateTimeString; const SaveSettings options = d->_project->saveSettings(); @@ -1831,49 +1831,49 @@ TQString Catalog::dateTime() const const TQTime time = dt.time(); // the year - dateTimeString.replace( "%Y", TQString::number( date.year() ) ); - dateTimeString.replace( "%y", TQString::number( date.year() ).right(2) ); + dateTimeString.tqreplace( "%Y", TQString::number( date.year() ) ); + dateTimeString.tqreplace( "%y", TQString::number( date.year() ).right(2) ); // the month if(date.month()<10) { - dateTimeString.replace( "%m", "0"+TQString::number( date.month() ) ); + dateTimeString.tqreplace( "%m", "0"+TQString::number( date.month() ) ); } else { - dateTimeString.replace( "%m", TQString::number( date.month() ) ); + dateTimeString.tqreplace( "%m", TQString::number( date.month() ) ); } - dateTimeString.replace( "%f", TQString::number( date.month() ) ); + dateTimeString.tqreplace( "%f", TQString::number( date.month() ) ); - dateTimeString.replace( "%b", date.longMonthName(date.month()) ); - dateTimeString.replace( "%h", date.longMonthName(date.month()) ); + dateTimeString.tqreplace( "%b", date.longMonthName(date.month()) ); + dateTimeString.tqreplace( "%h", date.longMonthName(date.month()) ); // the day - dateTimeString.replace( "%j", TQString::number( date.dayOfYear() ) ); - dateTimeString.replace( "%e", TQString::number( date.day() ) ); + dateTimeString.tqreplace( "%j", TQString::number( date.dayOfYear() ) ); + dateTimeString.tqreplace( "%e", TQString::number( date.day() ) ); if(date.day() < 10) { - dateTimeString.replace( "%d", "0"+TQString::number( date.day() ) ); + dateTimeString.tqreplace( "%d", "0"+TQString::number( date.day() ) ); } else { - dateTimeString.replace( "%d", TQString::number( date.day() ) ); + dateTimeString.tqreplace( "%d", TQString::number( date.day() ) ); } - dateTimeString.replace( "%a", date.longDayName( date.dayOfWeek() ) ); + dateTimeString.tqreplace( "%a", date.longDayName( date.dayOfWeek() ) ); // hour - dateTimeString.replace( "%k", TQString::number( time.hour() ) ); + dateTimeString.tqreplace( "%k", TQString::number( time.hour() ) ); if(time.hour() < 10) { - dateTimeString.replace( "%H", "0"+TQString::number( time.hour() ) ); + dateTimeString.tqreplace( "%H", "0"+TQString::number( time.hour() ) ); } else { - dateTimeString.replace( "%H", TQString::number( time.hour() ) ); + dateTimeString.tqreplace( "%H", TQString::number( time.hour() ) ); } TQString zone; // AM or PM @@ -1888,46 +1888,46 @@ TQString Catalog::dateTime() const zone="AM"; } - dateTimeString.replace( "%I", TQString::number( hour ) ); + dateTimeString.tqreplace( "%I", TQString::number( hour ) ); if(hour < 10) { - dateTimeString.replace( "%i", "0"+TQString::number( hour ) ); + dateTimeString.tqreplace( "%i", "0"+TQString::number( hour ) ); } else { - dateTimeString.replace( "%i", TQString::number( hour ) ); + dateTimeString.tqreplace( "%i", TQString::number( hour ) ); } - dateTimeString.replace( "%p", zone ); + dateTimeString.tqreplace( "%p", zone ); // minutes if(time.minute() < 10) { - dateTimeString.replace( "%M", "0"+TQString::number( time.minute() ) ); + dateTimeString.tqreplace( "%M", "0"+TQString::number( time.minute() ) ); } else { - dateTimeString.replace( "%M", TQString::number( time.minute() ) ); + dateTimeString.tqreplace( "%M", TQString::number( time.minute() ) ); } // seconds if(time.second() < 10) { - dateTimeString.replace( "%S", "0"+TQString::number( time.second() ) ); + dateTimeString.tqreplace( "%S", "0"+TQString::number( time.second() ) ); } else { - dateTimeString.replace( "%S", TQString::number( time.second() ) ); + dateTimeString.tqreplace( "%S", TQString::number( time.second() ) ); } // timezone - dateTimeString.replace( "%Z", d->_project->identitySettings().timeZone ); + dateTimeString.tqreplace( "%Z", d->_project->identitySettings().timeZone ); TQTime t; const int offset = KRFCDate::localUTCOffset(); const int correction = offset < 0 ? -60 : 60; t = t.addSecs( offset * correction ); - dateTimeString.replace( "%z", ( offset < 0 ? "-" : "+" ) + t.toString("hhmm") ); + dateTimeString.tqreplace( "%z", ( offset < 0 ? "-" : "+" ) + t.toString("hhmm") ); break; } } @@ -1936,7 +1936,7 @@ TQString Catalog::dateTime() const } -ConversionStatus Catalog::saveFile() +ConversiontqStatus Catalog::saveFile() { if(d->_url.isEmpty()) { @@ -1947,11 +1947,11 @@ ConversionStatus Catalog::saveFile() return saveFileAs(d->_url,true); } -ConversionStatus Catalog::saveFileAs(const KURL &url, bool overwrite) +ConversiontqStatus Catalog::saveFileAs(const KURL &url, bool overwrite) { if( d->_active ) return BUSY; - ConversionStatus status=OK; + ConversiontqStatus status=OK; bool newName=false; KURL targetURL=d->_url; @@ -2036,14 +2036,14 @@ TQString Catalog::saveTempFile() TQString filename = kapp->tempSaveName("/temp/kbabel_temp.po"); if( writeFile(filename) != OK ) { - filename = TQString::null; + filename = TQString(); } return filename; } -ConversionStatus Catalog::writeFile(TQString localFile , bool overwrite) +ConversiontqStatus Catalog::writeFile(TQString localFile , bool overwrite) { TQFileInfo info(localFile); @@ -2066,7 +2066,7 @@ ConversionStatus Catalog::writeFile(TQString localFile , bool overwrite) } } - ConversionStatus error = OK; + ConversiontqStatus error = OK; CatalogExportPlugin* filter=0; // gimme plugin for this MIME type @@ -2179,72 +2179,72 @@ PoInfo Catalog::headerInfo(const CatalogItem headerItem) // extract information from the header for(it=header.begin();it!=header.end();++it) { - if((*it).contains(TQRegExp("^\\s*Project-Id-Version\\s*:\\s*.+\\s*$"))) + if((*it).tqcontains(TQRegExp("^\\s*Project-Id-Version\\s*:\\s*.+\\s*$"))) { - info.project=(*it).replace(TQRegExp("^\\s*Project-Id-Version\\s*:\\s*"),""); + info.project=(*it).tqreplace(TQRegExp("^\\s*Project-Id-Version\\s*:\\s*"),""); if(info.project.right(2)=="\\n") info.project.remove(info.project.length()-2,2); info.project=info.project.simplifyWhiteSpace(); } - else if((*it).contains(TQRegExp("^\\s*POT-Creation-Date\\s*:\\s*.+\\s*$"))) + else if((*it).tqcontains(TQRegExp("^\\s*POT-Creation-Date\\s*:\\s*.+\\s*$"))) { - info.creation=(*it).replace(TQRegExp("^\\s*POT-Creation-Date\\s*:\\s*"),""); + info.creation=(*it).tqreplace(TQRegExp("^\\s*POT-Creation-Date\\s*:\\s*"),""); if(info.creation.right(2)=="\\n") info.creation.remove(info.creation.length()-2,2); info.creation=info.creation.simplifyWhiteSpace(); } - else if((*it).contains(TQRegExp("^\\s*PO-Revision-Date\\s*:\\s*.+\\s*$"))) + else if((*it).tqcontains(TQRegExp("^\\s*PO-Revision-Date\\s*:\\s*.+\\s*$"))) { - info.revision=(*it).replace(TQRegExp("^\\s*PO-Revision-Date\\s*:\\s*"),""); + info.revision=(*it).tqreplace(TQRegExp("^\\s*PO-Revision-Date\\s*:\\s*"),""); if(info.revision.right(2)=="\\n") info.revision.remove(info.revision.length()-2,2); info.revision=info.revision.simplifyWhiteSpace(); } - else if((*it).contains(TQRegExp("^\\s*Last-Translator\\s*:\\s*.+\\s*$"))) + else if((*it).tqcontains(TQRegExp("^\\s*Last-Translator\\s*:\\s*.+\\s*$"))) { - info.lastTranslator=(*it).replace(TQRegExp("^\\s*Last-Translator\\s*:\\s*"),""); + info.lastTranslator=(*it).tqreplace(TQRegExp("^\\s*Last-Translator\\s*:\\s*"),""); if(info.lastTranslator.right(2)=="\\n") info.lastTranslator.remove(info.lastTranslator.length()-2,2); info.lastTranslator=info.lastTranslator.simplifyWhiteSpace(); } - else if((*it).contains(TQRegExp("^\\s*Language-Team\\s*:\\s*.+\\s*"))) + else if((*it).tqcontains(TQRegExp("^\\s*Language-Team\\s*:\\s*.+\\s*"))) { - info.languageTeam=(*it).replace(TQRegExp("^\\s*Language-Team\\s*:\\s*"),""); + info.languageTeam=(*it).tqreplace(TQRegExp("^\\s*Language-Team\\s*:\\s*"),""); if(info.languageTeam.right(2)=="\\n") info.languageTeam.remove(info.languageTeam.length()-2,2); info.languageTeam=info.languageTeam.simplifyWhiteSpace(); } - else if((*it).contains(TQRegExp("^\\s*MIME-Version\\s*:\\s*.+\\s*"))) + else if((*it).tqcontains(TQRegExp("^\\s*MIME-Version\\s*:\\s*.+\\s*"))) { - info.mimeVersion=(*it).replace(TQRegExp("^\\s*MIME-Version\\s*:\\s*"),""); + info.mimeVersion=(*it).tqreplace(TQRegExp("^\\s*MIME-Version\\s*:\\s*"),""); if(info.mimeVersion.right(2)=="\\n") info.mimeVersion.remove(info.mimeVersion.length()-2,2); info.mimeVersion=info.mimeVersion.simplifyWhiteSpace(); } - else if((*it).contains(TQRegExp("^\\s*Content-Type\\s*:\\s*.+\\s*"))) + else if((*it).tqcontains(TQRegExp("^\\s*Content-Type\\s*:\\s*.+\\s*"))) { - info.contentType=(*it).replace(TQRegExp("^\\s*Content-Type\\s*:\\s*"),""); + info.contentType=(*it).tqreplace(TQRegExp("^\\s*Content-Type\\s*:\\s*"),""); if(info.contentType.right(2)=="\\n") info.contentType.remove(info.contentType.length()-2,2); info.contentType=info.contentType.simplifyWhiteSpace(); } - else if((*it).contains(TQRegExp("^\\s*Content-Transfer-Encoding\\s*:\\s*.+\\s*"))) + else if((*it).tqcontains(TQRegExp("^\\s*Content-Transfer-Encoding\\s*:\\s*.+\\s*"))) { - info.encoding=(*it).replace(TQRegExp("^\\s*Content-Transfer-Encoding\\s*:\\s*"),""); + info.encoding=(*it).tqreplace(TQRegExp("^\\s*Content-Transfer-Encoding\\s*:\\s*"),""); if(info.encoding.right(2)=="\\n") info.encoding.remove(info.encoding.length()-2,2); @@ -2590,9 +2590,9 @@ bool Catalog::findNext(const FindOptions* findOpts, DocPosition& docPos, int& le } if(findOpts->ignoreAccelMarker - && targetStr.contains(miscOptions.accelMarker)) + && targetStr.tqcontains(miscOptions.accelMarker)) { - accelMarkerPos = targetStr.find(miscOptions.accelMarker); + accelMarkerPos = targetStr.tqfind(miscOptions.accelMarker); targetStr.remove(accelMarkerPos,1); if(docPos.offset > (uint)accelMarkerPos) @@ -2605,7 +2605,7 @@ bool Catalog::findNext(const FindOptions* findOpts, DocPosition& docPos, int& le if(findOpts->wholeWords) { TQString pre=targetStr.mid(pos-1,1); TQString post=targetStr.mid(pos+len,1); - if(!pre.contains(TQRegExp("[a-zA-Z0-9]")) && !post.contains(TQRegExp("[a-zA-Z0-9]")) ){ + if(!pre.tqcontains(TQRegExp("[a-zA-Z0-9]")) && !post.tqcontains(TQRegExp("[a-zA-Z0-9]")) ){ success=true; docPos.offset=pos; } @@ -2617,13 +2617,13 @@ bool Catalog::findNext(const FindOptions* findOpts, DocPosition& docPos, int& le } } else { - if( (pos=targetStr.find(searchStr,docPos.offset,findOpts->caseSensitive)) >= 0 ) { + if( (pos=targetStr.tqfind(searchStr,docPos.offset,findOpts->caseSensitive)) >= 0 ) { len=searchStr.length(); if(findOpts->wholeWords) { TQString pre=targetStr.mid(pos-1,1); TQString post=targetStr.mid(pos+len,1); - if(!pre.contains(TQRegExp("[a-zA-Z0-9]")) && !post.contains(TQRegExp("[a-zA-Z0-9]")) ){ + if(!pre.tqcontains(TQRegExp("[a-zA-Z0-9]")) && !post.tqcontains(TQRegExp("[a-zA-Z0-9]")) ){ success=true; docPos.offset=pos; } @@ -2839,9 +2839,9 @@ bool Catalog::findPrev(const FindOptions* findOpts, DocPosition& docPos, int& le } if(findOpts->ignoreAccelMarker - && targetStr.contains(miscOptions.accelMarker)) + && targetStr.tqcontains(miscOptions.accelMarker)) { - accelMarkerPos = targetStr.find(miscOptions.accelMarker); + accelMarkerPos = targetStr.tqfind(miscOptions.accelMarker); targetStr.remove(accelMarkerPos,1); if(docPos.offset > (uint)accelMarkerPos) @@ -2854,7 +2854,7 @@ bool Catalog::findPrev(const FindOptions* findOpts, DocPosition& docPos, int& le else if( findOpts->isRegExp ) { /* don't work!? - if((pos=targetStr.findRev(regexp,docPos.offset)) >= 0 ) { + if((pos=targetStr.tqfindRev(regexp,docPos.offset)) >= 0 ) { regexp.match(targetStr,pos,&len); // to get the length of the string */ bool found=false; @@ -2871,7 +2871,7 @@ bool Catalog::findPrev(const FindOptions* findOpts, DocPosition& docPos, int& le if(findOpts->wholeWords) { TQString pre=targetStr.mid(pos-1,1); TQString post=targetStr.mid(pos+len,1); - if(!pre.contains(TQRegExp("[a-zA-Z0-9]")) && !post.contains(TQRegExp("[a-zA-Z0-9]")) ){ + if(!pre.tqcontains(TQRegExp("[a-zA-Z0-9]")) && !post.tqcontains(TQRegExp("[a-zA-Z0-9]")) ){ success=true; docPos.offset=pos; } @@ -2882,13 +2882,13 @@ bool Catalog::findPrev(const FindOptions* findOpts, DocPosition& docPos, int& le } } } - else if( (pos=targetStr.findRev(searchStr,docPos.offset-1,findOpts->caseSensitive)) >= 0 + else if( (pos=targetStr.tqfindRev(searchStr,docPos.offset-1,findOpts->caseSensitive)) >= 0 && (uint)pos < docPos.offset) { len=searchStr.length(); if(findOpts->wholeWords) { TQString pre=targetStr.mid(pos-1,1); TQString post=targetStr.mid(pos+len,1); - if(!pre.contains(TQRegExp("[a-zA-Z0-9]")) && !post.contains(TQRegExp("[a-zA-Z0-9]")) ){ + if(!pre.tqcontains(TQRegExp("[a-zA-Z0-9]")) && !post.tqcontains(TQRegExp("[a-zA-Z0-9]")) ){ success=true; docPos.offset=pos; } @@ -3071,8 +3071,8 @@ Catalog::DiffResult Catalog::diff(uint entry, TQString *result) // then look if the same msgid is contained in the diff file // FIXME: should care about plural forms in msgid TQString id = msgid(entry).first(); - id.replace( "\n",""); - if(d->msgidDiffList.contains(id)) + id.tqreplace( "\n",""); + if(d->msgidDiffList.tqcontains(id)) { // FIXME:: should care about plural forms in msgid *result = msgid(entry).first(); @@ -3091,8 +3091,8 @@ Catalog::DiffResult Catalog::diff(uint entry, TQString *result) // then look if there are entries with the same translation kdWarning() << "Diff feature (2) does not work with plural forms" << endl; TQString str = msgstr(entry).first(); - str.replace("\n",""); - if(d->msgstr2MsgidDiffList.contains(str)) + str.tqreplace("\n",""); + if(d->msgstr2MsgidDiffList.tqcontains(str)) { TQStringList list = d->msgstr2MsgidDiffList[str]; @@ -3134,7 +3134,7 @@ Catalog::DiffResult Catalog::diff(uint entry, TQString *result) int counter=0; int oldPercent=0; - int max = QMAX( d->msgidDiffList.count()-1, 1); + int max = TQMAX( d->msgidDiffList.count()-1, 1); TQStringList::ConstIterator it; for(it = d->msgidDiffList.begin(); @@ -3193,7 +3193,7 @@ Catalog::DiffResult Catalog::diff(uint entry, TQString *result) TQString r = wordDiff(idForDiff,id); //esp for plural forms - *result = r.replace("\\n<KBABELADD>" + TQString(TQChar(0x00B6)) + "</KBABELADD>", "\\n\n"); + *result = r.tqreplace("\\n<KBABELADD>" + TQString(TQChar(0x00B6)) + "</KBABELADD>", "\\n\n"); s = new TQString(*result); if( !d->diffCache.insert(entry,s) ) @@ -3220,7 +3220,7 @@ void Catalog::setDiffList( const TQValueList<DiffEntry>& list) d->msgstr2MsgidDiffList.clear(); d->diffCache.clear(); - uint max = QMAX(list.count()-1,1); + uint max = TQMAX(list.count()-1,1); int oldPercent=0; uint counter=0; TQValueList<DiffEntry>::ConstIterator it; @@ -3236,14 +3236,14 @@ void Catalog::setDiffList( const TQValueList<DiffEntry>& list) } TQString id = (*it).msgid; - id.replace("\n",""); + id.tqreplace("\n",""); TQString str = (*it).msgstr; - str.replace("\n",""); + str.tqreplace("\n",""); d->msgidDiffList.append(id); if(!str.isEmpty()) { - if(d->msgstr2MsgidDiffList.contains(str)) + if(d->msgstr2MsgidDiffList.tqcontains(str)) { TQStringList sl = d->msgstr2MsgidDiffList[str]; sl.append(id); @@ -3506,4 +3506,4 @@ void Catalog::wordCount (uint &total, uint &fuzzy, uint &untranslated) const #include "catalog.moc" -// kate: space-indent on; indent-width 4; replace-tabs on; +// kate: space-indent on; indent-width 4; tqreplace-tabs on; diff --git a/kbabel/common/catalog.h b/kbabel/common/catalog.h index 6a5c0491..74fbcdd7 100644 --- a/kbabel/common/catalog.h +++ b/kbabel/common/catalog.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -107,9 +107,10 @@ struct DiffEntry * @short Class, that represents a translation catalog(po-file) * @author Matthias Kiefer <matthias.kiefer@gmx.de> */ -class KDE_EXPORT Catalog : public QObject +class KDE_EXPORT Catalog : public TQObject { Q_OBJECT + TQ_OBJECT public: enum DiffResult{DiffOk, DiffNotFound, DiffNeedList}; @@ -127,11 +128,11 @@ public: /** * A constructor for an empty message catalog. - * @param parent parent @ref TQObject for this catalog + * @param tqparent tqparent @ref TQObject for this catalog * @param name unique name for this object * @param configFile configuration file to read config from */ - Catalog(TQObject* parent=0, const char* name=0, TQString projectFile = TQString() ); + Catalog(TQObject* tqparent=0, const char* name=0, TQString projectFile = TQString() ); /** * Deprecated. A copy constructor. Do not use since each Catalog registers @@ -225,7 +226,7 @@ public: * @return the list of errors found for a given item index * @param index index of the item to check */ - TQStringList itemStatus(uint index); + TQStringList itemtqStatus(uint index); /** * @return the list of errors found for a given item index @@ -233,7 +234,7 @@ public: * @param recheck flag, if the item status should be checked now * @param whatToCheck what checks to do (a list of tools to be used */ - TQStringList itemStatus(uint index, bool recheck, TQPtrList<KDataTool> whatToCheck); + TQStringList itemtqStatus(uint index, bool recheck, TQPtrList<KDataTool> whatToCheck); /** * replaces msgstr in catalog item at index index with msgstr @@ -252,7 +253,7 @@ public: bool setHeader(CatalogItem header); /** removes string ", fuzzy" from comment */ - void removeFuzzyStatus(uint index); + void removeFuzzytqStatus(uint index); /** sets or unsets fuzzy status of entry index */ void setFuzzy(uint index, bool on); @@ -296,19 +297,19 @@ public: * opens file url by using KDE's network downlad and calls * openFile with a local filename */ - ConversionStatus openURL(const KURL& url, const TQString& package=TQString::null); + ConversiontqStatus openURL(const KURL& url, const TQString& package=TQString()); /** * opens file openURL by using KDE's network downlad and calls * openFile with a local filename * sets current URL to saveURL */ - ConversionStatus openURL(const KURL& openURL, const KURL& saveURL, const TQString& package=TQString::null); + ConversiontqStatus openURL(const KURL& openURL, const KURL& saveURL, const TQString& package=TQString()); /** save the file under the old filename */ - ConversionStatus saveFile(); + ConversiontqStatus saveFile(); /** saves the file under a new filename */ - ConversionStatus saveFileAs(const KURL& url,bool overwrite=false); + ConversiontqStatus saveFileAs(const KURL& url,bool overwrite=false); /** * saves the current catalog in a temporary file and @@ -341,7 +342,7 @@ public: * @param clearError should the errors be cleared before running msgfmt * @return the file codec used for the current catalog */ - Msgfmt::Status checkSyntax(TQString& output, bool clearErrors=true); + Msgfmt::tqStatus checkSyntax(TQString& output, bool clearErrors=true); /** * checks using an external tool. The tool must provide the "validate" command @@ -478,12 +479,12 @@ public: TagSettings tagSettings() const; /** - * reads the header from QTextstream and puts it in header + * reads the header from TQTextstream and puts it in header * I made it static to be able to use this function for * the search in po-files. This way, I can easily find the first * catalog entry in the textstream */ -// static ConversionStatus readHeader(TQTextStream& stream,CatalogItem& header); +// static ConversiontqStatus readHeader(TQTextStream& stream,CatalogItem& header); void registerView(CatalogView* view); @@ -611,7 +612,7 @@ private: void processCommand(EditCommand* cmd, CatalogView* view2exclude=0, bool undo=false); /** do the actual file write using plugin */ - ConversionStatus writeFile(TQString localfile, bool overwrite=false); + ConversiontqStatus writeFile(TQString localfile, bool overwrite=false); /** * generates lists that contain indexes of all fuzzy and untranslated entries diff --git a/kbabel/common/catalog_private.h b/kbabel/common/catalog_private.h index e27f1174..a02327b7 100644 --- a/kbabel/common/catalog_private.h +++ b/kbabel/common/catalog_private.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -112,9 +112,9 @@ public: TQStringList _catalogExtra; CatalogPrivate(Project::Ptr project) : - _packageName( TQString::null ), _packageDir( TQString::null ), + _packageName( TQString() ), _packageDir( TQString() ), _header (project), - _importID( TQString::null ), _mimeTypes( "text/plain" ), + _importID( TQString() ), _mimeTypes( "text/plain" ), _modified(false), _readOnly(false), _generatedFromDocbook(false), _active(false), _stop(false), fileCodec(0), diffCache(30,76), numberOfPluralForms(-1), diff --git a/kbabel/common/catalogfileplugin.h b/kbabel/common/catalogfileplugin.h index 77b760e8..ea7cc245 100644 --- a/kbabel/common/catalogfileplugin.h +++ b/kbabel/common/catalogfileplugin.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -50,7 +50,7 @@ class CatalogExportPluginPrivate; /** * Result of the conversion */ -enum ConversionStatus { +enum ConversiontqStatus { OK, NOT_IMPLEMENTED, NO_FILE, @@ -79,12 +79,13 @@ enum ConversionStatus { * @short Base class for Catalog import plugins * @author Stanislav Visnovsky <visnovsky@kde.org> */ -class KDE_EXPORT CatalogImportPlugin: public QObject +class KDE_EXPORT CatalogImportPlugin: public TQObject { Q_OBJECT + TQ_OBJECT public: - CatalogImportPlugin(TQObject* parent, const char* name); + CatalogImportPlugin(TQObject* tqparent, const char* name); virtual ~CatalogImportPlugin(); /** @@ -96,7 +97,7 @@ public: * @param catalog the catalog to be filled * @return result of the operation */ - ConversionStatus open(const TQString& file, const TQString& mimetype, Catalog* catalog); + ConversiontqStatus open(const TQString& file, const TQString& mimetype, Catalog* catalog); /** * Reimplement this method to load the local file passed as an argument. @@ -108,7 +109,7 @@ public: * @param file file to be loaded * @param mimetype the expected MIME type (the type used for plugin selection */ - virtual ConversionStatus load(const TQString& file, const TQString& mimetype) = 0; + virtual ConversiontqStatus load(const TQString& file, const TQString& mimetype) = 0; /** * Reimplement this method to return unique identification of your plugin */ @@ -174,14 +175,15 @@ private: * @short Base class for Catalog export plugins * @author Stanislav Visnovsky <visnovsky@kde.org> */ -class KDE_EXPORT CatalogExportPlugin: public QObject +class KDE_EXPORT CatalogExportPlugin: public TQObject { Q_OBJECT + TQ_OBJECT public: - CatalogExportPlugin(TQObject* parent, const char* name); + CatalogExportPlugin(TQObject* tqparent, const char* name); virtual ~CatalogExportPlugin(); - virtual ConversionStatus save(const TQString& file, const TQString& mimetype, const Catalog* catalog) = 0; + virtual ConversiontqStatus save(const TQString& file, const TQString& mimetype, const Catalog* catalog) = 0; static TQStringList availableExportMimeTypes(); diff --git a/kbabel/common/catalogitem.cpp b/kbabel/common/catalogitem.cpp index bd55d7b6..14604438 100644 --- a/kbabel/common/catalogitem.cpp +++ b/kbabel/common/catalogitem.cpp @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -75,7 +75,7 @@ TQString CatalogItem::msgctxt(const bool noNewlines) const if( noNewlines ) { TQString tmp = d->_msgctxt; - tmp.replace("\n", " "); // ### TODO: " " or "" ? + tmp.tqreplace("\n", " "); // ### TODO: " " or "" ? return tmp; } else @@ -207,29 +207,29 @@ TQStringList CatalogItem::argList( RegExpExtractor& te) bool CatalogItem::isFuzzy() const { - return d->_comment.find( TQRegExp(",\\s*fuzzy") ) != -1; + return d->_comment.tqfind( TQRegExp(",\\s*fuzzy") ) != -1; } bool CatalogItem::isCformat() const { // Allow "possible-c-format" (from xgettext --debug) or "c-format" // Note the regexp (?: ) is similar to () but it does not capture (so it is faster) - return d->_comment.find( TQRegExp(",\\s*(?:possible-)c-format") ) == -1; + return d->_comment.tqfind( TQRegExp(",\\s*(?:possible-)c-format") ) == -1; } bool CatalogItem::isNoCformat() const { - return d->_comment.find( TQRegExp(",\\s*no-c-format") ) == -1; + return d->_comment.tqfind( TQRegExp(",\\s*no-c-format") ) == -1; } -bool CatalogItem::isQtformat() const +bool CatalogItem::isTQtformat() const { - return d->_comment.find( TQRegExp(",\\s*qt-format") ) == -1; + return d->_comment.tqfind( TQRegExp(",\\s*qt-format") ) == -1; } -bool CatalogItem::isNoQtformat() const +bool CatalogItem::isNoTQtformat() const { - return d->_comment.find( TQRegExp(",\\s*no-qt-format") ) == -1; + return d->_comment.tqfind( TQRegExp(",\\s*no-qt-format") ) == -1; } bool CatalogItem::isUntranslated() const @@ -252,23 +252,23 @@ int CatalogItem::totalLines() const int lines=0; if(!d->_comment.isEmpty()) { - lines = d->_comment.contains('\n')+1; + lines = d->_comment.tqcontains('\n')+1; } int msgctxtLines=0; if(!d->_msgctxt.isEmpty()) { - msgctxtLines=d->_msgctxt.contains('\n')+1; + msgctxtLines=d->_msgctxt.tqcontains('\n')+1; } int msgidLines=0; TQStringList::ConstIterator it; for(it=d->_msgid.begin(); it != d->_msgid.end(); ++it) { - msgidLines += (*it).contains('\n')+1; + msgidLines += (*it).tqcontains('\n')+1; } int msgstrLines=0; for(it=d->_msgstr.begin(); it != d->_msgstr.end(); ++it) { - msgstrLines += (*it).contains('\n')+1; + msgstrLines += (*it).tqcontains('\n')+1; } if(msgctxtLines>1) @@ -286,7 +286,7 @@ int CatalogItem::totalLines() const void CatalogItem::setSyntaxError(bool on) { - if(on && !d->_errors.contains("syntax error")) + if(on && !d->_errors.tqcontains("syntax error")) d->_errors.append("syntax error"); else d->_errors.remove("syntax error"); @@ -305,7 +305,7 @@ TQPtrList<EditCommand> CatalogItem::removeFuzzy(bool doIt) TQRegExp fuzzyStr(",\\s*fuzzy"); int offset; - offset=comment.find(fuzzyStr); + offset=comment.tqfind(fuzzyStr); while(offset>=0) { cmd = new DelTextCmd(offset,fuzzyStr.cap(),0); @@ -314,11 +314,11 @@ TQPtrList<EditCommand> CatalogItem::removeFuzzy(bool doIt) comment.remove(offset,fuzzyStr.cap().length()); - offset=comment.find(fuzzyStr,offset+1); + offset=comment.tqfind(fuzzyStr,offset+1); } // remove empty comment lines - if( comment.contains( TQRegExp("^#\\s*$") )) + if( comment.tqcontains( TQRegExp("^#\\s*$") )) { cmd = new DelTextCmd(0,comment,0); cmd->setPart(Comment); @@ -326,9 +326,9 @@ TQPtrList<EditCommand> CatalogItem::removeFuzzy(bool doIt) comment=""; } - if( comment.contains( TQRegExp("\n#\\s*$") )) + if( comment.tqcontains( TQRegExp("\n#\\s*$") )) { - offset=comment.find( TQRegExp("\n#\\s*$") ); + offset=comment.tqfind( TQRegExp("\n#\\s*$") ); while(offset>=0) { cmd = new DelTextCmd(offset,comment.mid(offset),0); @@ -337,15 +337,15 @@ TQPtrList<EditCommand> CatalogItem::removeFuzzy(bool doIt) comment.remove(offset,comment.length()-offset); - offset=comment.find( TQRegExp("\n#\\s*$"), offset+1 ); + offset=comment.tqfind( TQRegExp("\n#\\s*$"), offset+1 ); } } - if( comment.contains( TQRegExp("\n#\\s*\n") )) + if( comment.tqcontains( TQRegExp("\n#\\s*\n") )) { - offset=comment.find( TQRegExp("\n#\\s*\n") )+1; + offset=comment.tqfind( TQRegExp("\n#\\s*\n") )+1; while(offset>=0) { - int endIndex=comment.find("\n",offset)+1; + int endIndex=comment.tqfind("\n",offset)+1; cmd = new DelTextCmd(offset,comment.mid(offset,endIndex-offset),0); cmd->setPart(Comment); @@ -353,7 +353,7 @@ TQPtrList<EditCommand> CatalogItem::removeFuzzy(bool doIt) comment.remove(offset,endIndex-offset); - offset=comment.find( TQRegExp("\n#\\s*\n"), offset+1 ); + offset=comment.tqfind( TQRegExp("\n#\\s*\n"), offset+1 ); } } @@ -499,7 +499,7 @@ void CatalogItem::clearErrors() void CatalogItem::appendError(const TQString& error ) { - if( !d->_errors.contains( error ) ) + if( !d->_errors.tqcontains( error ) ) d->_errors.append(error); } @@ -518,4 +518,4 @@ void CatalogItem::setProject( Project::Ptr project ) d->_project = project; } -// kate: space-indent on; indent-width 4; replace-tabs on; +// kate: space-indent on; indent-width 4; tqreplace-tabs on; diff --git a/kbabel/common/catalogitem.h b/kbabel/common/catalogitem.h index 51b7b21b..bb02b1d8 100644 --- a/kbabel/common/catalogitem.h +++ b/kbabel/common/catalogitem.h @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -95,14 +95,14 @@ public: * if the string ", qt-format" is contained in the comment * @since 1.11.2 (KDE 3.5.2) */ - bool isQtformat() const; + bool isTQtformat() const; /** * returns true, * if the string ", no-qt-format" is contained in the comment * @since 1.11.2 (KDE 3.5.2) */ - bool isNoQtformat() const; + bool isNoTQtformat() const; /** * returns true, if the Msgid is untranslated, this means the diff --git a/kbabel/common/catalogitem_private.h b/kbabel/common/catalogitem_private.h index 411e76b2..9304adda 100644 --- a/kbabel/common/catalogitem_private.h +++ b/kbabel/common/catalogitem_private.h @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kbabel/common/catalogsettings.cpp b/kbabel/common/catalogsettings.cpp index 4b87f522..a25920ba 100644 --- a/kbabel/common/catalogsettings.cpp +++ b/kbabel/common/catalogsettings.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -59,11 +59,11 @@ TQString KBabel::charsetString(const TQTextCodec *codec) if ( encodingStr.startsWith("CP " ) ) encodingStr.remove( 2, 1 ); else if ( encodingStr.startsWith("IBM " ) ) - encodingStr.replace( "IBM ", "CP" ); + encodingStr.tqreplace( "IBM ", "CP" ); return encodingStr; } else - return TQString::null; + return TQString(); } TQString KBabel::GNUPluralForms(const TQString& lang) @@ -192,7 +192,7 @@ TQString Defaults::Identity::authorEmail() TQString Defaults::Identity::mailingList() { TQString lang=Defaults::Identity::languageCode(); - int temp=lang.find("_"); + int temp=lang.tqfind("_"); lang=lang.left(temp); return lang+"@li.org"; } diff --git a/kbabel/common/catalogsettings.h b/kbabel/common/catalogsettings.h index 50bdbada..552f88c5 100644 --- a/kbabel/common/catalogsettings.h +++ b/kbabel/common/catalogsettings.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -63,7 +63,7 @@ struct KDE_EXPORT SaveSettings int encoding; bool useOldEncoding; - Qt::DateFormat dateFormat; + TQt::DateFormat dateFormat; TQString customDateFormat; TQString projectString; @@ -102,7 +102,7 @@ struct KDE_EXPORT MiscSettings { /** * The char, that marks keyboard accelerators. - * Default is '&' as used by Qt + * Default is '&' as used by TQt */ TQChar accelMarker; diff --git a/kbabel/common/catalogview.h b/kbabel/common/catalogview.h index 03056c43..0029c306 100644 --- a/kbabel/common/catalogview.h +++ b/kbabel/common/catalogview.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kbabel/common/diff.cpp b/kbabel/common/diff.cpp index 455a26f1..4d38babb 100644 --- a/kbabel/common/diff.cpp +++ b/kbabel/common/diff.cpp @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kbabel/common/diff.h b/kbabel/common/diff.h index 2ce055bf..15454f17 100644 --- a/kbabel/common/diff.h +++ b/kbabel/common/diff.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -81,7 +81,7 @@ typedef enum inline TQString LCSprinter::getString() { - return resultString.join("").replace(TQChar('\n'), ""); //w/o replace we'd get whole line colored + return resultString.join("").tqreplace(TQChar('\n'), ""); //w/o replace we'd get whole line colored } #endif // DIFF_H diff --git a/kbabel/common/editcmd.cpp b/kbabel/common/editcmd.cpp index 4ea98364..b0c8cd09 100644 --- a/kbabel/common/editcmd.cpp +++ b/kbabel/common/editcmd.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -68,7 +68,7 @@ bool DelTextCmd::merge( EditCommand* other) && o->type() == type() && o->pluralNumber==pluralNumber ) { DelTextCmd* o = (DelTextCmd*) other; - if ( offset + int(str.length()) == o->offset && !str.contains(TQRegExp("^\\s$")) ) + if ( offset + int(str.length()) == o->offset && !str.tqcontains(TQRegExp("^\\s$")) ) { o->str.prepend( str ); o->offset = offset; @@ -95,7 +95,7 @@ bool InsTextCmd::merge( EditCommand* other) if ( o->index()==index() && o->part() == part() && o->type() == type() && o->pluralNumber==pluralNumber ) { - if ( offset == o->offset + int(o->str.length()) && !str.contains(TQRegExp("^\\s$")) ) + if ( offset == o->offset + int(o->str.length()) && !str.tqcontains(TQRegExp("^\\s$")) ) { o->str += str; return true; diff --git a/kbabel/common/editcmd.h b/kbabel/common/editcmd.h index 64bd4b93..5dc1c536 100644 --- a/kbabel/common/editcmd.h +++ b/kbabel/common/editcmd.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kbabel/common/exportplugin.cpp b/kbabel/common/exportplugin.cpp index 327e85d0..3aa5af48 100644 --- a/kbabel/common/exportplugin.cpp +++ b/kbabel/common/exportplugin.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -45,7 +45,7 @@ struct KBabel::CatalogExportPluginPrivate bool _stop; }; -CatalogExportPlugin::CatalogExportPlugin(TQObject* parent, const char* name) : TQObject(parent,name) +CatalogExportPlugin::CatalogExportPlugin(TQObject* tqparent, const char* name) : TQObject(tqparent,name) { d = new CatalogExportPluginPrivate; d->_stop=false; diff --git a/kbabel/common/findoptions.h b/kbabel/common/findoptions.h index 518828df..9274a156 100644 --- a/kbabel/common/findoptions.h +++ b/kbabel/common/findoptions.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kbabel/common/importplugin.cpp b/kbabel/common/importplugin.cpp index 711d77cd..4ef1562c 100644 --- a/kbabel/common/importplugin.cpp +++ b/kbabel/common/importplugin.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -43,7 +43,7 @@ using namespace KBabel; -CatalogImportPlugin::CatalogImportPlugin(TQObject* parent, const char* name) : TQObject(parent,name) +CatalogImportPlugin::CatalogImportPlugin(TQObject* tqparent, const char* name) : TQObject(tqparent,name) { d = new CatalogImportPluginPrivate; d->_catalog = 0; @@ -99,13 +99,13 @@ void CatalogImportPlugin::setMimeTypes( const TQString& mimetypes ) d->_mimeTypes=mimetypes; } -ConversionStatus CatalogImportPlugin::open(const TQString& file, const TQString& mimetype, Catalog* catalog) +ConversiontqStatus CatalogImportPlugin::open(const TQString& file, const TQString& mimetype, Catalog* catalog) { d->_stopped=false; d->_catalog=catalog; startTransaction(); - ConversionStatus result = load(file, mimetype); + ConversiontqStatus result = load(file, mimetype); if( d->_stopped ) { d->_started=false; diff --git a/kbabel/common/importplugin_private.h b/kbabel/common/importplugin_private.h index 594ce21f..657a1879 100644 --- a/kbabel/common/importplugin_private.h +++ b/kbabel/common/importplugin_private.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kbabel/common/itempart.h b/kbabel/common/itempart.h index 842f195b..3aff285e 100644 --- a/kbabel/common/itempart.h +++ b/kbabel/common/itempart.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kbabel/common/kbabeldatatool.h b/kbabel/common/kbabeldatatool.h index 207f8bc5..ae1406c6 100644 --- a/kbabel/common/kbabeldatatool.h +++ b/kbabel/common/kbabeldatatool.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -47,9 +47,10 @@ namespace KBabel class KBabelDataTool: public KDataTool { Q_OBJECT + TQ_OBJECT protected: - KBabelDataTool( TQObject* parent, const char* name ) : KDataTool( parent, name ) {} + KBabelDataTool( TQObject* tqparent, const char* name ) : KDataTool( tqparent, name ) {} public slots: /** The only method to be redefined in inherited classes. * This method is called everytime the settings are changed. diff --git a/kbabel/common/kbmailer.cpp b/kbabel/common/kbmailer.cpp index 0526bd74..1cb26723 100644 --- a/kbabel/common/kbmailer.cpp +++ b/kbabel/common/kbmailer.cpp @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -53,8 +53,8 @@ using namespace KBabel; -KBabelMailer::KBabelMailer( TQWidget* parent, Project::Ptr project) - : _project( project ), m_parent( parent ) +KBabelMailer::KBabelMailer( TQWidget* tqparent, Project::Ptr project) + : _project( project ), m_parent( tqparent ) { m_tempDir.setAutoDelete( true ); readConfig(); @@ -103,7 +103,7 @@ void KBabelMailer::sendOneFile( const KURL& url) kapp->invokeMailer("", "", "", "", "", "", fileName); else { - KMessageBox::error( m_parent, i18n("Error while trying to download file %1.").arg( url.prettyURL() ) ); + KMessageBox::error( m_parent, i18n("Error while trying to download file %1.").tqarg( url.prettyURL() ) ); } } else @@ -133,7 +133,7 @@ TQString KBabelMailer::createArchive(TQStringList fileList, TQString initialName // do nothing if there are no files in the list if (fileList.empty()) - return TQString::null; + return TQString(); // determine the name of the archive, do nothing if none is given // or Cancel was pressed @@ -176,7 +176,7 @@ TQString KBabelMailer::buildArchive(TQStringList fileList, TQString archiveName, KTar archive(archiveName, mimetype); if (!archive.open(IO_WriteOnly)) { KMessageBox::error( m_parent, i18n("Error while trying to create archive file.") ); - return TQString::null; + return TQString(); } // add files to this archive @@ -190,7 +190,7 @@ TQString KBabelMailer::buildArchive(TQStringList fileList, TQString archiveName, #endif TQString poTempName; if ( !KIO::NetAccess::download( url, poTempName, m_parent ) ) { - KMessageBox::error( m_parent, i18n("Error while trying to read file %1.").arg( url.prettyURL() ) ); + KMessageBox::error( m_parent, i18n("Error while trying to read file %1.").tqarg( url.prettyURL() ) ); continue; } @@ -199,13 +199,13 @@ TQString KBabelMailer::buildArchive(TQStringList fileList, TQString archiveName, // actually reside in one of its subdirectories. Else they are stored // without relative path. TQString poArchFileName = url.path(); - if (_poBaseDir.isEmpty( ) || poArchFileName.find(_poBaseDir) != 0) + if (_poBaseDir.isEmpty( ) || poArchFileName.tqfind(_poBaseDir) != 0) poArchFileName = TQFileInfo( poArchFileName ).fileName(); else poArchFileName.remove( TQRegExp( "^" + TQRegExp::escape( _poBaseDir ) + "/?" ) ); if ( !archive.addLocalFile( poTempName, poArchFileName ) ) { - KMessageBox::error( m_parent, i18n("Error while trying to copy file %1 into archive.").arg( url.prettyURL() ) ); + KMessageBox::error( m_parent, i18n("Error while trying to copy file %1 into archive.").tqarg( url.prettyURL() ) ); } KIO::NetAccess::removeTempFile(poTempName); diff --git a/kbabel/common/kbmailer.h b/kbabel/common/kbmailer.h index 17481636..1f35d6e2 100644 --- a/kbabel/common/kbmailer.h +++ b/kbabel/common/kbmailer.h @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -62,11 +62,11 @@ class KDE_EXPORT KBabelMailer /** * Constructor. * - * @param parent The parent widget. + * @param tqparent The tqparent widget. * @param project The project to be used. - * @since 1.11.2 (KDE 3.5.2): @p parent parameter + * @since 1.11.2 (KDE 3.5.2): @p tqparent parameter */ - KBabelMailer( TQWidget* parent, Project::Ptr project); + KBabelMailer( TQWidget* tqparent, Project::Ptr project); virtual ~KBabelMailer(); /** @@ -91,7 +91,7 @@ class KDE_EXPORT KBabelMailer * @param fileList contains the names of the files to be sent. * @param initialName the possible name of the archive */ - void sendFiles(TQStringList fileList, const TQString& initialName = TQString::null); + void sendFiles(TQStringList fileList, const TQString& initialName = TQString()); /** * Sets the the PO files' base directory. * @@ -109,7 +109,7 @@ class KDE_EXPORT KBabelMailer * name is queried. * * @return name of the archive if it was created successfully, - * otherwise TQString::null. + * otherwise TQString(). */ TQString createArchive(TQStringList fileList, TQString initialName); @@ -157,7 +157,7 @@ class KDE_EXPORT KBabelMailer */ TQString _poBaseDir; - /// The parent widget + /// The tqparent widget TQWidget* m_parent; }; diff --git a/kbabel/common/kbproject.cpp b/kbabel/common/kbproject.cpp index 73ac9dbd..99fece7e 100644 --- a/kbabel/common/kbproject.cpp +++ b/kbabel/common/kbproject.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -250,7 +250,7 @@ SaveSettings Project::saveSettings () settings.autoSyntaxCheck = _settings->autoSyntaxCheck(); settings.saveObsolete = _settings->saveObsolete(); settings.customDateFormat = _settings->customDateFormat(); - settings.dateFormat = (Qt::DateFormat)_settings->dateFormat(); + settings.dateFormat = (TQt::DateFormat)_settings->dateFormat(); settings.updateDescription = _settings->updateDescription(); settings.descriptionString = _settings->descriptionString(); settings.updateTranslatorCopyright = _settings->updateTranslatorCopyright(); diff --git a/kbabel/common/kbproject.h b/kbabel/common/kbproject.h index 4c3d6fc7..b9356c12 100644 --- a/kbabel/common/kbproject.h +++ b/kbabel/common/kbproject.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -46,6 +46,7 @@ namespace KBabel class KDE_EXPORT Project : public TQObject, public KShared { Q_OBJECT + TQ_OBJECT public: typedef KSharedPtr <Project> Ptr; diff --git a/kbabel/common/kbprojectmanager.cpp b/kbabel/common/kbprojectmanager.cpp index ab117c97..77a2fb9d 100644 --- a/kbabel/common/kbprojectmanager.cpp +++ b/kbabel/common/kbprojectmanager.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kbabel/common/kbprojectmanager.h b/kbabel/common/kbprojectmanager.h index abfce3e4..40ec5884 100644 --- a/kbabel/common/kbprojectmanager.h +++ b/kbabel/common/kbprojectmanager.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kbabel/common/libgettext/pofiles.h b/kbabel/common/libgettext/pofiles.h index cf2e3ec8..a670bb9a 100644 --- a/kbabel/common/libgettext/pofiles.h +++ b/kbabel/common/libgettext/pofiles.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kbabel/common/libgettext/tokens.h b/kbabel/common/libgettext/tokens.h index dfbf693d..78e19c19 100644 --- a/kbabel/common/libgettext/tokens.h +++ b/kbabel/common/libgettext/tokens.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kbabel/common/msgfmt.cpp b/kbabel/common/msgfmt.cpp index 61525a2f..86632720 100644 --- a/kbabel/common/msgfmt.cpp +++ b/kbabel/common/msgfmt.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -46,14 +46,14 @@ using namespace KBabel; -Msgfmt::Msgfmt(TQObject* parent,const char* name) - : TQObject(parent , name) +Msgfmt::Msgfmt(TQObject* tqparent,const char* name) + : TQObject(tqparent , name) { } -Msgfmt::Status Msgfmt::checkSyntax(TQString file,TQString& output, bool gnu) +Msgfmt::tqStatus Msgfmt::checkSyntax(TQString file,TQString& output, bool gnu) { - Status stat=Ok; + tqStatus stat=Ok; // this method does not return the right retrun values at the moment :-( KProcess proc; @@ -80,7 +80,7 @@ Msgfmt::Status Msgfmt::checkSyntax(TQString file,TQString& output, bool gnu) } else if(proc.normalExit()) { - if( proc.exitStatus() || _output.contains(TQRegExp("^.+:\\d+:")) ) // little workaround :-( + if( proc.exitStatus() || _output.tqcontains(TQRegExp("^.+:\\d+:")) ) // little workaround :-( stat=SyntaxError; } else @@ -92,9 +92,9 @@ Msgfmt::Status Msgfmt::checkSyntax(TQString file,TQString& output, bool gnu) return stat; } -Msgfmt::Status Msgfmt::checkSyntaxInDir(TQString dir,TQString regexp,TQString& output) +Msgfmt::tqStatus Msgfmt::checkSyntaxInDir(TQString dir,TQString regexp,TQString& output) { - Status stat=Ok; + tqStatus stat=Ok; // this method does not return the right return values at the moment :-( KProcess proc; @@ -109,7 +109,7 @@ Msgfmt::Status Msgfmt::checkSyntaxInDir(TQString dir,TQString regexp,TQString& o _output=""; proc << "IFS='\n'; msgfmt --statistics -o /dev/null " - "$(find" << KProcess::quote(dir) << "-name" << KProcess::quote(regexp) << ")"; + "$(tqfind" << KProcess::quote(dir) << "-name" << KProcess::quote(regexp) << ")"; if(!proc.start(KProcess::Block,KProcess::Stderr)) { @@ -117,7 +117,7 @@ Msgfmt::Status Msgfmt::checkSyntaxInDir(TQString dir,TQString regexp,TQString& o } else if(proc.normalExit()) { - if( proc.exitStatus() || _output.contains(TQRegExp("^.+:\\d+:")) ) // little workaround :-( + if( proc.exitStatus() || _output.tqcontains(TQRegExp("^.+:\\d+:")) ) // little workaround :-( stat=SyntaxError; } else diff --git a/kbabel/common/msgfmt.h b/kbabel/common/msgfmt.h index 1a025312..9831a43f 100644 --- a/kbabel/common/msgfmt.h +++ b/kbabel/common/msgfmt.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -42,15 +42,16 @@ class TQString; namespace KBabel { -class KDE_EXPORT Msgfmt : private QObject +class KDE_EXPORT Msgfmt : private TQObject { Q_OBJECT + TQ_OBJECT public: - enum Status{NoExecutable,Ok,SyntaxError,HeaderError,Error,Unsupported}; - Msgfmt(TQObject* parent=0,const char* name=0); + enum tqStatus{NoExecutable,Ok,SyntaxError,HeaderError,Error,Unsupported}; + Msgfmt(TQObject* tqparent=0,const char* name=0); - Status checkSyntax(TQString file,TQString& output, bool gnu = false); - Status checkSyntaxInDir(TQString dir,TQString regexp,TQString& output); + tqStatus checkSyntax(TQString file,TQString& output, bool gnu = false); + tqStatus checkSyntaxInDir(TQString dir,TQString regexp,TQString& output); private slots: void addToOutput(KProcess*,char *buffer, int buflen); diff --git a/kbabel/common/pluralforms.h b/kbabel/common/pluralforms.h index f65dba01..5e84fa2d 100644 --- a/kbabel/common/pluralforms.h +++ b/kbabel/common/pluralforms.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kbabel/common/poinfo.cpp b/kbabel/common/poinfo.cpp index 68e13da8..f7245141 100644 --- a/kbabel/common/poinfo.cpp +++ b/kbabel/common/poinfo.cpp @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -123,7 +123,7 @@ void PoInfo::cacheRead() // Check the file cache version. // If it is not the current version, we do not read the cache file - Q_UINT32 version; + TQ_UINT32 version; s >> version; if( version != POINFOCACHE_VERSION ) { // Wrong POINFOCACHE_VERSION, so abort @@ -134,13 +134,13 @@ void PoInfo::cacheRead() /* * Check the version of the TQDataStream with which the cache file was written * - * If the cache file was written by an incompatible future version of Qt, + * If the cache file was written by an incompatible future version of TQt, * the cache file will not be read. * - * On the other side, a cache file written by a previous version of Qt can be read, + * On the other side, a cache file written by a previous version of TQt can be read, * by setting the version of the TQDataStream used. */ - Q_INT32 qdatastreamVersion; + TQ_INT32 qdatastreamVersion; s >> qdatastreamVersion; if( qdatastreamVersion > 0 && qdatastreamVersion <= s.version() ) { s.setVersion( qdatastreamVersion ); @@ -173,13 +173,13 @@ void PoInfo::cacheWrite() if( stream ) { // Write the cache file version - // We choose to fix a format (Q_UINT32) for compatibility (Qt version, platforms, architectures) - const Q_UINT32 version = POINFOCACHE_VERSION; + // We choose to fix a format (TQ_UINT32) for compatibility (TQt version, platforms, architectures) + const TQ_UINT32 version = POINFOCACHE_VERSION; *stream << version; - // Write the version of the QDataStream - // Here too we choose a fixed format (Q_INT32) for compatibility - const Q_INT32 qdatastreamVersion = stream->version(); + // Write the version of the TQDataStream + // Here too we choose a fixed format (TQ_INT32) for compatibility + const TQ_INT32 qdatastreamVersion = stream->version(); *stream << qdatastreamVersion; TQDictIterator<poInfoCacheItem> it( _poInfoCache ); // iterator for dict @@ -209,7 +209,7 @@ bool PoInfo::cacheFind(const TQString url, PoInfo& info) cacheRead(); } - poInfoCacheItem *item = _poInfoCache.find( url ); + poInfoCacheItem *item = _poInfoCache.tqfind( url ); if( item ) { TQFileInfo fi( url ); @@ -297,7 +297,7 @@ PoInfo PoInfo::headerInfo(const CatalogItem& headerItem) { bool knownKey=false; // We search for the : character, which is the separator between key and value - const int res=(*it).find(':'); + const int res=(*it).tqfind(':'); if (res>=0) { knownKey=true; // We know most keys, if not it will be changed to false in the "else" case @@ -305,7 +305,7 @@ PoInfo PoInfo::headerInfo(const CatalogItem& headerItem) TQString value=(*it).mid(res+1); // "Chop" the \n at the end if (value.endsWith("\\n")) - value.remove(value.length()-2,2); // ### Qt4: use value.chop(2) + value.remove(value.length()-2,2); // ### TQt4: use value.chop(2) value=value.simplifyWhiteSpace(); kdDebug(KBABEL) << "Header key: " << key << " value: " << value << endl; if (key=="Project-Id-Version") @@ -335,7 +335,7 @@ PoInfo PoInfo::headerInfo(const CatalogItem& headerItem) TQString line=(*it); if(line.right(2)=="\\n") - line.remove(line.length()-2,2); // ### Qt4: use value.chop(2) + line.remove(line.length()-2,2); // ### TQt4: use value.chop(2) if(!info.others.isEmpty()) info.others+='\n'; @@ -350,12 +350,12 @@ PoInfo PoInfo::headerInfo(const CatalogItem& headerItem) } -ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive) +ConversiontqStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive) { return PoInfo::info( url, info, wordList, updateWordList, interactive, true); } -ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive, bool msgfmt) +ConversiontqStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive, bool msgfmt) { stopStaticRead = false; @@ -372,7 +372,7 @@ ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &w // First check file with msgfmt to be sure, it is syntactically correct Msgfmt msgfmt; TQString output; - Msgfmt::Status stat = msgfmt.checkSyntax( target , output ); + Msgfmt::tqStatus stat = msgfmt.checkSyntax( target , output ); if(stat == Msgfmt::SyntaxError) { KIO::NetAccess::removeTempFile(target); @@ -395,7 +395,7 @@ ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &w lexer->yylex(); // now parse the rest of the file - ConversionStatus success=OK; + ConversiontqStatus success=OK; while( lexer->lastToken != T_EOF && success==OK) { @@ -415,7 +415,7 @@ ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &w { success=OK; - if( temp.comment().contains("\n#~") ) continue; // skip obsolete + if( temp.comment().tqcontains("\n#~") ) continue; // skip obsolete if( temp.msgid().first().isEmpty()) //header { @@ -453,7 +453,7 @@ ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &w { TQString w = sl.first(); sl.pop_front(); - if( !wordList.contains(w) ) wordList.append( w ); + if( !wordList.tqcontains(w) ) wordList.append( w ); } st = temp.msgstr().join(" " ).simplifyWhiteSpace().lower(); sl = TQStringList::split( ' ', st ); @@ -461,7 +461,7 @@ ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &w { TQString w = sl.first(); sl.pop_front(); - if( !wordList.contains(w) ) wordList.append( w ); + if( !wordList.tqcontains(w) ) wordList.append( w ); } st = temp.comment().simplifyWhiteSpace().lower(); sl = TQStringList::split( ' ', st ); @@ -469,7 +469,7 @@ ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &w { TQString w = sl.first(); sl.pop_front(); - if( !wordList.contains(w) ) wordList.append( w ); + if( !wordList.tqcontains(w) ) wordList.append( w ); } } } @@ -532,7 +532,7 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options ) // first read header CatalogItem temp; - ConversionStatus status = fastRead( temp, lexer, true ); + ConversiontqStatus status = fastRead( temp, lexer, true ); if( status != OK || !temp.msgid().first().isEmpty() ) { delete lexer; @@ -560,15 +560,15 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options ) if( options.isRegExp ) pos=regexp.search(text, 0 ); else - pos=text.find(searchStr,0,options.caseSensitive); + pos=text.tqfind(searchStr,0,options.caseSensitive); if( pos >= 0) { if( options.wholeWords) { len = searchStr.length(); TQString pre = text.mid(pos-1,1); TQString post = text.mid(pos+len,1); - if( !pre.contains( TQRegExp("[a-zA-Z0-9]")) && - !post.contains( TQRegExp("[a-zA-Z0-9]") ) + if( !pre.tqcontains( TQRegExp("[a-zA-Z0-9]")) && + !post.tqcontains( TQRegExp("[a-zA-Z0-9]") ) ) { delete lexer; delete stream; @@ -601,7 +601,7 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options ) if( options.ignoreAccelMarker ) { - pos = text.find( options.accelMarker ); + pos = text.tqfind( options.accelMarker ); if( pos >= 0 ) text.remove( pos, 1 ); } @@ -609,7 +609,7 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options ) if( options.isRegExp ) pos=regexp.search(text, 0 ); else - pos=text.find(searchStr,0,options.caseSensitive); + pos=text.tqfind(searchStr,0,options.caseSensitive); if( pos >= 0) { @@ -617,8 +617,8 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options ) len = searchStr.length(); TQString pre = text.mid(pos-1,1); TQString post = text.mid(pos+len,1); - if( !pre.contains( TQRegExp("[a-zA-Z0-9]")) && - !post.contains( TQRegExp("[a-zA-Z0-9]") ) + if( !pre.tqcontains( TQRegExp("[a-zA-Z0-9]")) && + !post.tqcontains( TQRegExp("[a-zA-Z0-9]") ) ) { delete lexer; delete stream; @@ -666,7 +666,7 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options ) } // this does not like any incorrect files -ConversionStatus PoInfo::fastRead( CatalogItem& item, GettextFlexLexer *lexer, bool storeText) +ConversiontqStatus PoInfo::fastRead( CatalogItem& item, GettextFlexLexer *lexer, bool storeText) { item.clear(); _gettextPluralForm = false; @@ -758,7 +758,7 @@ ConversionStatus PoInfo::fastRead( CatalogItem& item, GettextFlexLexer *lexer, b { TQStringList msgstrs = item.msgstr(); TQString s = TQString::fromUtf8(lexer->YYText()); - while( lexer->lastToken == T_MSGSTR && s.contains( TQRegExp("^msgstr\\[[0-9]+\\]" ) ) ) + while( lexer->lastToken == T_MSGSTR && s.tqcontains( TQRegExp("^msgstr\\[[0-9]+\\]" ) ) ) { if( lexer->yylex() != T_STRING ) return PARSE_ERROR; it = msgstrs.fromLast(); @@ -778,4 +778,4 @@ ConversionStatus PoInfo::fastRead( CatalogItem& item, GettextFlexLexer *lexer, b return OK; } -// kate: space-indent on; indent-width 4; replace-tabs on; +// kate: space-indent on; indent-width 4; tqreplace-tabs on; diff --git a/kbabel/common/poinfo.h b/kbabel/common/poinfo.h index 830d35eb..58e0bc66 100644 --- a/kbabel/common/poinfo.h +++ b/kbabel/common/poinfo.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -105,7 +105,7 @@ public: * being parsed? * @since KBabel 1.11 (KDE 3.5) */ - static ConversionStatus info(const TQString& url,PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive, bool msgfmt); + static ConversiontqStatus info(const TQString& url,PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive, bool msgfmt); /** * @brief Get information about the PO file @@ -121,7 +121,7 @@ public: * KBabel 1.11.1 (KDE 3.5.1) * @note This function always call Gettext's mgfmt before parsing each file */ - static ConversionStatus info(const TQString& url,PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive = true); + static ConversiontqStatus info(const TQString& url,PoInfo& info, TQStringList &wordList, bool updateWordList, bool interactive = true); static PoInfo headerInfo(const CatalogItem&); static bool findInFile(const TQString& url, FindOptions options ); @@ -147,7 +147,7 @@ private: */ static void cacheRead(); - static ConversionStatus fastRead( CatalogItem& item, GettextFlexLexer* lexer, bool storeText ); + static ConversiontqStatus fastRead( CatalogItem& item, GettextFlexLexer* lexer, bool storeText ); static bool _gettextPluralForm; }; diff --git a/kbabel/common/projectsettings.cpp b/kbabel/common/projectsettings.cpp index 3f8f47a3..1d3efd77 100644 --- a/kbabel/common/projectsettings.cpp +++ b/kbabel/common/projectsettings.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kbabel/common/projectsettings.h b/kbabel/common/projectsettings.h index 49afc0a6..556088dd 100644 --- a/kbabel/common/projectsettings.h +++ b/kbabel/common/projectsettings.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -108,7 +108,7 @@ struct SourceContextSettings */ TQStringList sourcePaths; - void SourceContextSettins() { codeRoot = TQString::null; sourcePaths.clear(); } + void SourceContextSettins() { codeRoot = TQString(); sourcePaths.clear(); } }; /** diff --git a/kbabel/common/regexpextractor.cpp b/kbabel/common/regexpextractor.cpp index 058834ea..d07c36ed 100644 --- a/kbabel/common/regexpextractor.cpp +++ b/kbabel/common/regexpextractor.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -42,7 +42,7 @@ using namespace KBabel; RegExpExtractor::RegExpExtractor(const TQStringList& regexps) : _regExpList( regexps ) { - _string=TQString::null; + _string=TQString(); _matches.setAutoDelete(true); } @@ -64,7 +64,7 @@ TQString RegExpExtractor::firstMatch() if(ti) return ti->extracted; - return TQString::null; + return TQString(); } TQString RegExpExtractor::nextMatch() @@ -76,7 +76,7 @@ TQString RegExpExtractor::nextMatch() if(ti) return ti->extracted; - return TQString::null; + return TQString(); } TQString RegExpExtractor::match(uint tagnumber) @@ -85,7 +85,7 @@ TQString RegExpExtractor::match(uint tagnumber) if(ti) return ti->extracted; - return TQString::null; + return TQString(); } int RegExpExtractor::matchIndex(uint tagnumber) @@ -103,7 +103,7 @@ TQString RegExpExtractor::prevMatch() if(ti) return ti->extracted; - return TQString::null; + return TQString(); } TQString RegExpExtractor::lastMatch() @@ -112,7 +112,7 @@ TQString RegExpExtractor::lastMatch() if(ti) return ti->extracted; - return TQString::null; + return TQString(); } TQStringList RegExpExtractor::matches() @@ -140,7 +140,7 @@ TQString RegExpExtractor::plainString(bool keepPos) { s+=' '; } - tmp.replace(ti->index,len,s); + tmp.tqreplace(ti->index,len,s); } if(!keepPos) @@ -151,18 +151,18 @@ TQString RegExpExtractor::plainString(bool keepPos) return tmp; } -TQString RegExpExtractor::matchesReplaced(const TQString& replace) +TQString RegExpExtractor::matchesReplaced(const TQString& tqreplace) { TQString tmp=_string; int posCorrection=0; - int replaceLen=replace.length(); + int replaceLen=tqreplace.length(); MatchedEntryInfo *ti; for(ti=_matches.first(); ti != 0; ti=_matches.next()) { uint len=ti->extracted.length(); - tmp.replace(ti->index + posCorrection,len,replace); + tmp.tqreplace(ti->index + posCorrection,len,tqreplace); posCorrection+=(replaceLen-len); } @@ -213,7 +213,7 @@ void RegExpExtractor::processString() { s+=' '; } - tmp.replace(pos,tag.length(),s); + tmp.tqreplace(pos,tag.length(),s); break; } diff --git a/kbabel/common/regexpextractor.h b/kbabel/common/regexpextractor.h index 83ff8f60..06de48c0 100644 --- a/kbabel/common/regexpextractor.h +++ b/kbabel/common/regexpextractor.h @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -125,7 +125,7 @@ public: /** * @return the string, where matches are replaced with the given string */ - TQString matchesReplaced(const TQString& replace); + TQString matchesReplaced(const TQString& tqreplace); //Functions that allow user to define his own regexps. diff --git a/kbabel/common/resources.h b/kbabel/common/resources.h index d6054b43..35c2baca 100644 --- a/kbabel/common/resources.h +++ b/kbabel/common/resources.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kbabel/common/stringdistance.cpp b/kbabel/common/stringdistance.cpp index 8de11c98..3ffc4194 100644 --- a/kbabel/common/stringdistance.cpp +++ b/kbabel/common/stringdistance.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -41,7 +41,7 @@ const int Distance::editCost_replace_base = 1; const int HammingDistance::editCost = 1; -const int LevenshteinDistance::editCost_replace = 1; +const int LevenshteinDistance::editCost_tqreplace = 1; const int LevenshteinDistance::editCost_insert = 1; const int LevenshteinDistance::editCost_delete = 1; @@ -166,9 +166,9 @@ double LevenshteinDistance::calculate(const TQString& left_string, const TQStri { for(r = 1; r < right_size; r++) { - tmp_value = QMIN( ( D(l-1,r) + editCost_delete ), + tmp_value = TQMIN( ( D(l-1,r) + editCost_delete ), ( D(l-1,r-1) + nodeDistance(left_string[l-1], right_string[r-1]) ) ) ; - D(l,r) = QMIN( tmp_value, + D(l,r) = TQMIN( tmp_value, ( D(l,r-1) + editCost_insert ) ); } } diff --git a/kbabel/common/stringdistance.h b/kbabel/common/stringdistance.h index 89c60627..7520c863 100644 --- a/kbabel/common/stringdistance.h +++ b/kbabel/common/stringdistance.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -63,7 +63,7 @@ private: // emphasize the following members are private * * The class Distance calculates the distance * between two Entities (left & right). - * It is the parent for other distance-classes. + * It is the tqparent for other distance-classes. */ class Distance : public NonCopyable { @@ -114,8 +114,8 @@ class LevenshteinDistance : public Distance { protected: virtual double calculate(const TQString& left_string, const TQString& right_string); - int editCostReplace() { return editCost_replace; } - static const int editCost_replace; + int editCostReplace() { return editCost_tqreplace; } + static const int editCost_tqreplace; static const int editCost_insert; static const int editCost_delete; }; diff --git a/kbabel/common/tagextractor.cpp b/kbabel/common/tagextractor.cpp index fded2703..4fae0e7b 100644 --- a/kbabel/common/tagextractor.cpp +++ b/kbabel/common/tagextractor.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kbabel/common/tagextractor.h b/kbabel/common/tagextractor.h index 3845b9fd..d6018f37 100644 --- a/kbabel/common/tagextractor.h +++ b/kbabel/common/tagextractor.h @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kbabel/commonui/cmdedit.cpp b/kbabel/commonui/cmdedit.cpp index 07a35c2f..f0da9701 100644 --- a/kbabel/commonui/cmdedit.cpp +++ b/kbabel/commonui/cmdedit.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -42,41 +42,41 @@ #include <kdialog.h> -CmdEdit::CmdEdit(TQWidget* parent, const char* name) - : TQWidget(parent,name) +CmdEdit::CmdEdit(TQWidget* tqparent, const char* name) + : TQWidget(tqparent,name) { - TQGridLayout* layout = new TQGridLayout( this , 1 , 1 ); - layout->setSpacing( KDialog::spacingHint() ); + TQGridLayout* tqlayout = new TQGridLayout( this , 1 , 1 ); + tqlayout->setSpacing( KDialog::spacingHint() ); TQLabel* nameLabel = new TQLabel( i18n("Command &Label:"), this); TQLabel* cmdLabel = new TQLabel( i18n("Co&mmand:"), this); - layout->addWidget( nameLabel, 0 , 0 ); - layout->addWidget( cmdLabel, 0 , 1 ); + tqlayout->addWidget( nameLabel, 0 , 0 ); + tqlayout->addWidget( cmdLabel, 0 , 1 ); _cmdNameEdit = new TQLineEdit( this , "cmdNameEdit" ); _cmdNameEdit->setMaxLength(20); nameLabel->setBuddy(_cmdNameEdit); - layout->addWidget( _cmdNameEdit , 1 , 0 ); + tqlayout->addWidget( _cmdNameEdit , 1 , 0 ); _cmdEdit = new TQLineEdit( this , "cmdEdit" ); cmdLabel->setBuddy(_cmdEdit); - layout->addWidget( _cmdEdit , 1 , 1 ); + tqlayout->addWidget( _cmdEdit , 1 , 1 ); _addButton = new TQPushButton( i18n("&Add"), this ); _addButton->setEnabled(false); - layout->addWidget( _addButton , 1 , 2 ); + tqlayout->addWidget( _addButton , 1 , 2 ); _editButton = new TQPushButton( i18n("&Edit"), this ); _editButton->setEnabled(false); - layout->addWidget( _editButton , 3 , 2 ); + tqlayout->addWidget( _editButton , 3 , 2 ); _removeButton = new TQPushButton( i18n("&Remove"), this ); _removeButton->setEnabled(false); - layout->addWidget( _removeButton , 4 , 2 ); + tqlayout->addWidget( _removeButton , 4 , 2 ); TQHBoxLayout* hbox = new TQHBoxLayout(); - layout->addLayout(hbox,5,2); + tqlayout->addLayout(hbox,5,2); _upButton = new TQToolButton(UpArrow,this); _upButton->setFixedSize(20,20); @@ -90,21 +90,21 @@ CmdEdit::CmdEdit(TQWidget* parent, const char* name) _commandNames = new TQListBox( this , "commandNamesBox" ); _commandNames->setMinimumSize(100, 100); - layout->addMultiCellWidget( _commandNames , 3 , 6 , 0 , 0); + tqlayout->addMultiCellWidget( _commandNames , 3 , 6 , 0 , 0); _commands = new TQListBox( this , "commandsBox" ); _commands->setMinimumSize(160, 100); - layout->addMultiCellWidget( _commands , 3 , 6 , 1 ,1 ); + tqlayout->addMultiCellWidget( _commands , 3 , 6 , 1 ,1 ); - layout->setColStretch(0,1); - layout->setColStretch(1,2); - layout->setColStretch(2,0); + tqlayout->setColStretch(0,1); + tqlayout->setColStretch(1,2); + tqlayout->setColStretch(2,0); - layout->addRowSpacing(2, KDialog::spacingHint()); - layout->addRowSpacing(6, KDialog::spacingHint()); + tqlayout->addRowSpacing(2, KDialog::spacingHint()); + tqlayout->addRowSpacing(6, KDialog::spacingHint()); - setMinimumSize(layout->sizeHint()); + setMinimumSize(tqlayout->tqsizeHint()); connect(_addButton , TQT_SIGNAL(clicked()) , this , TQT_SLOT(addCmd()) ) ; diff --git a/kbabel/commonui/cmdedit.h b/kbabel/commonui/cmdedit.h index 288b6fb5..bd091166 100644 --- a/kbabel/commonui/cmdedit.h +++ b/kbabel/commonui/cmdedit.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -45,11 +45,12 @@ class TQLineEdit; class TQPushButton; class TQToolButton; -class CmdEdit : public QWidget +class CmdEdit : public TQWidget { Q_OBJECT + TQ_OBJECT public: - CmdEdit(TQWidget* parent=0,const char* name=0); + CmdEdit(TQWidget* tqparent=0,const char* name=0); void setCommands(const TQStringList& commands,const TQStringList& commandNames); void commands(TQStringList& commands, TQStringList& commandNames); diff --git a/kbabel/commonui/context.cpp b/kbabel/commonui/context.cpp index 55c0f196..63e07b28 100644 --- a/kbabel/commonui/context.cpp +++ b/kbabel/commonui/context.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -62,8 +62,8 @@ #include <ktexteditor/selectioninterface.h> #include <ktexteditor/viewcursorinterface.h> -SourceContext::SourceContext(TQWidget *parent, KBabel::Project::Ptr project): TQWidget(parent) - , m_parent( parent ) +SourceContext::SourceContext(TQWidget *tqparent, KBabel::Project::Ptr project): TQWidget(tqparent) + , m_parent( tqparent ) , _part(0) , _view(0) , _referenceCombo(0) @@ -160,14 +160,14 @@ TQValueList<ContextInfo> SourceContext::resolvePath( const TQString& packageDir, if ( !poDir.isEmpty() ) { - pref.replace( "@POFILEDIR@", poDir ); + pref.tqreplace( "@POFILEDIR@", poDir ); } - else if ( pref.find( "@POFILEDIR@ " ) != -1 ) + else if ( pref.tqfind( "@POFILEDIR@ " ) != -1 ) continue; // No need to keep this path pattern, as we have no PO file dir - pref.replace( "@PACKAGEDIR@", packageDir); - pref.replace( "@PACKAGE@", packageName); - pref.replace( "@CODEROOT@", _project->settings()->codeRoot()); + pref.tqreplace( "@PACKAGEDIR@", packageDir); + pref.tqreplace( "@PACKAGE@", packageName); + pref.tqreplace( "@CODEROOT@", _project->settings()->codeRoot()); prefixes.append(pref); } @@ -191,7 +191,7 @@ TQValueList<ContextInfo> SourceContext::resolvePath( const TQString& packageDir, ref.line = re.cap(2).toInt(); ref.path = re.cap(1); // ### TODO KDE4: perhaps we should not do the replace if compiled for Windows - ref.path.replace( TQChar( '\\' ), TQChar( '/' ) ); + ref.path.tqreplace( TQChar( '\\' ), TQChar( '/' ) ); rawRefList.append( ref ); } } @@ -223,7 +223,7 @@ TQValueList<ContextInfo> SourceContext::resolvePath( const TQString& packageDir, ref.line = res.cap(2).toInt(); ref.path = res.cap(1); // ### TODO KDE4: perhaps we should not do the replace if compiled for Windows - ref.path.replace( TQChar( '\\' ), TQChar( '/' ) ); + ref.path.tqreplace( TQChar( '\\' ), TQChar( '/' ) ); rawRefList.append( ref ); } } @@ -240,7 +240,7 @@ TQValueList<ContextInfo> SourceContext::resolvePath( const TQString& packageDir, for ( TQStringList::const_iterator it1 = prefixes.constBegin(); it1 != prefixes.constEnd(); ++it1 ) { TQString path = (*it1); - path.replace( "@COMMENTPATH@", fileName); + path.tqreplace( "@COMMENTPATH@", fileName); //kdDebug() << "CONTEXT PATH: " << path << endl; // DEBUG TQFileInfo pathInfo( path ); @@ -302,4 +302,4 @@ void SourceContext::setProject( KBabel::Project::Ptr project ) #include "context.moc" -// kate: space-indent on; indent-width 4; replace-tabs on; +// kate: space-indent on; indent-width 4; tqreplace-tabs on; diff --git a/kbabel/commonui/context.h b/kbabel/commonui/context.h index ab52fb8b..dd7218b4 100644 --- a/kbabel/commonui/context.h +++ b/kbabel/commonui/context.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -74,11 +74,12 @@ struct ContextInfo * @note It requires a KPart implementing KTextEditor interface with selections. * @author Stanislav Visnovsky <visnovsky@kde.org> */ -class KDE_EXPORT SourceContext : public QWidget +class KDE_EXPORT SourceContext : public TQWidget { Q_OBJECT + TQ_OBJECT public: - SourceContext(TQWidget* parent, KBabel::Project::Ptr project); + SourceContext(TQWidget* tqparent, KBabel::Project::Ptr project); void setProject(KBabel::Project::Ptr project); diff --git a/kbabel/commonui/diffpreferences.ui b/kbabel/commonui/diffpreferences.ui index a3ea5a4e..301842af 100644 --- a/kbabel/commonui/diffpreferences.ui +++ b/kbabel/commonui/diffpreferences.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>DiffPreferences</class> <author>Stanislav Visnovsky</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DiffPreferences</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -17,7 +17,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>kcfg_UseDBForDiff</cstring> </property> @@ -44,7 +44,7 @@ in KBabel's main window.</p></qt></string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioButton1</cstring> </property> @@ -52,7 +52,7 @@ in KBabel's main window.</p></qt></string> <string>Use &file</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioButton2</cstring> </property> @@ -60,7 +60,7 @@ in KBabel's main window.</p></qt></string> <string>Use messages from &translation database</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioButton3</cstring> </property> @@ -70,15 +70,15 @@ in KBabel's main window.</p></qt></string> </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -116,7 +116,7 @@ the database are used for diffing.</p></qt></string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>31</height> @@ -133,7 +133,7 @@ the database are used for diffing.</p></qt></string> <functions> <function>init()</function> </functions> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kbabel/commonui/diffpreferences.ui.h b/kbabel/commonui/diffpreferences.ui.h index 5b02d278..2050dff3 100644 --- a/kbabel/commonui/diffpreferences.ui.h +++ b/kbabel/commonui/diffpreferences.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ diff --git a/kbabel/commonui/finddialog.cpp b/kbabel/commonui/finddialog.cpp index d210811a..a08347fc 100644 --- a/kbabel/commonui/finddialog.cpp +++ b/kbabel/commonui/finddialog.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -52,20 +52,20 @@ using namespace KBabel; -FindDialog::FindDialog(bool forReplace, TQWidget* parent) - :KDialogBase(parent, "finddialog",true, "", Ok|Cancel, Ok) +FindDialog::FindDialog(bool forReplace, TQWidget* tqparent) + :KDialogBase(tqparent, "finddialog",true, "", Ok|Cancel, Ok) , _regExpEditDialog(0), _replaceDlg(forReplace) { TQWidget* page = new TQWidget(this); - TQVBoxLayout *layout = new TQVBoxLayout(page, 0, spacingHint()); + TQVBoxLayout *tqlayout = new TQVBoxLayout(page, 0, spacingHint()); TQLabel *label = new TQLabel(i18n("&Find:"),page); - layout->addWidget(label); + tqlayout->addWidget(label); _findCombo = new KComboBox(true, page, "findCombo"); _findCombo->setMaxCount(10); _findCombo->setInsertionPolicy(KComboBox::AtTop); - layout->addWidget(_findCombo); + tqlayout->addWidget(_findCombo); label->setBuddy(_findCombo); TQString msg=i18n("<qt><p><b>Find text</b></p>" @@ -82,11 +82,11 @@ FindDialog::FindDialog(bool forReplace, TQWidget* parent) setButtonOK(i18n("&Replace")); _replaceLabel = new TQLabel(i18n("&Replace with:"),page); - layout->addWidget(_replaceLabel); + tqlayout->addWidget(_replaceLabel); _replaceCombo = new KComboBox(true, page, "replaceCombo"); _replaceCombo->setMaxCount(10); _replaceCombo->setInsertionPolicy(KComboBox::AtTop); - layout->addWidget(_replaceCombo); + tqlayout->addWidget(_replaceCombo); _replaceLabel->setBuddy(_replaceCombo); msg=i18n("<qt><p><b>Replace text</b></p>" @@ -99,7 +99,7 @@ FindDialog::FindDialog(bool forReplace, TQWidget* parent) } else { setCaption(i18n("Find")); - setButtonOK(KGuiItem(i18n("&Find"),"find")); + setButtonOK(KGuiItem(i18n("&Find"),"tqfind")); _replaceLabel=0; _replaceCombo=0; @@ -107,7 +107,7 @@ FindDialog::FindDialog(bool forReplace, TQWidget* parent) _buttonGrp = new TQButtonGroup(3, Qt::Horizontal, i18n("Where to Search"), page); connect(_buttonGrp,TQT_SIGNAL(clicked(int)), this, TQT_SLOT(inButtonsClicked(int))); - layout->addWidget(_buttonGrp); + tqlayout->addWidget(_buttonGrp); _inMsgid = new TQCheckBox(i18n("&Msgid"),_buttonGrp); _inMsgstr = new TQCheckBox(i18n("M&sgstr"),_buttonGrp); @@ -119,7 +119,7 @@ FindDialog::FindDialog(bool forReplace, TQWidget* parent) TQGroupBox* box = new TQGroupBox(2, Qt::Horizontal, i18n("Options"), page); - layout->addWidget(box); + tqlayout->addWidget(box); _caseSensitive = new TQCheckBox(i18n("C&ase sensitive"),box); _wholeWords = new TQCheckBox(i18n("O&nly whole words"),box); @@ -502,7 +502,7 @@ void FindDialog::saveSettings() void FindDialog::inButtonsClicked(int id) { // check if at least one button is checked - if(! _buttonGrp->find(id)->isOn() ) { + if(! _buttonGrp->tqfind(id)->isOn() ) { if(!_inMsgstr->isOn() && !_inComment->isOn() ) { if(_inMsgid->isEnabled()) { if( !_inMsgid->isOn() ) { @@ -520,7 +520,7 @@ void FindDialog::inButtonsClicked(int id) void FindDialog::regExpButtonClicked() { if ( _regExpEditDialog == 0 ) - _regExpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString::null, this ); + _regExpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), this ); KRegExpEditorInterface *iface = dynamic_cast<KRegExpEditorInterface *>( _regExpEditDialog ); if( iface ) @@ -531,17 +531,17 @@ void FindDialog::regExpButtonClicked() } } -ReplaceDialog::ReplaceDialog(TQWidget* parent) - :KDialogBase(Plain, "", Close|User1|User2|User3, User1, parent,"finddialog" +ReplaceDialog::ReplaceDialog(TQWidget* tqparent) + :KDialogBase(Plain, "", Close|User1|User2|User3, User1, tqparent,"finddialog" , true,false,i18n("&Replace"),i18n("&Goto Next"),i18n("R&eplace All")) { TQWidget* page = plainPage(); - TQVBoxLayout *layout = new TQVBoxLayout(page, 0, spacingHint()); + TQVBoxLayout *tqlayout = new TQVBoxLayout(page, 0, spacingHint()); TQLabel *label = new TQLabel(i18n("Replace this string?"),page); - layout->addWidget(label); + tqlayout->addWidget(label); - connect(this,TQT_SIGNAL(user1Clicked()),this,TQT_SIGNAL(replace())); + connect(this,TQT_SIGNAL(user1Clicked()),this,TQT_SIGNAL(tqreplace())); connect(this,TQT_SIGNAL(user2Clicked()),this,TQT_SIGNAL(next())); connect(this,TQT_SIGNAL(user3Clicked()),this,TQT_SIGNAL(replaceAll())); } diff --git a/kbabel/commonui/finddialog.h b/kbabel/commonui/finddialog.h index e489c51a..174d8b81 100644 --- a/kbabel/commonui/finddialog.h +++ b/kbabel/commonui/finddialog.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -47,12 +47,13 @@ class KComboBox; class KDE_EXPORT FindDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * Constructor * @param replaceDlg flag, if this is a replace dialog */ - FindDialog(bool replaceDlg, TQWidget* parent); + FindDialog(bool replaceDlg, TQWidget* tqparent); ~FindDialog(); /** @@ -122,12 +123,13 @@ private: class KDE_EXPORT ReplaceDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ReplaceDialog(TQWidget* parent); + ReplaceDialog(TQWidget* tqparent); ~ReplaceDialog(); signals: - void replace(); + void tqreplace(); void replaceAll(); void next(); diff --git a/kbabel/commonui/kactionselector.cpp b/kbabel/commonui/kactionselector.cpp index 699dcc26..52a60bbf 100644 --- a/kbabel/commonui/kactionselector.cpp +++ b/kbabel/commonui/kactionselector.cpp @@ -17,11 +17,11 @@ * * * In addition, as a special exception, the copyright holders give * * permission to link the code of this program with any edition of * - * the Qt library by Trolltech AS, Norway (or with modified versions * - * of Qt that use the same license as Qt), and distribute linked * + * the TQt library by Trolltech AS, Norway (or with modified versions * + * of TQt that use the same license as TQt), and distribute linked * * combinations including the two. You must obey the GNU General * * Public License in all respects for all of the code used other than * - * Qt. If you modify this file, you may extend this exception to * + * TQt. If you modify this file, you may extend this exception to * * your version of the file, but you are not obligated to do so. If * * you do not wish to do so, delete this exception statement from * * your version. * @@ -57,8 +57,8 @@ class KActionSelectorPrivate { //BEGIN Constructor/destructor -KActionSelector::KActionSelector( TQWidget *parent, const char *name ) - : TQWidget( parent, name ) +KActionSelector::KActionSelector( TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ) { d = new KActionSelectorPrivate(); d->moveOnDoubleClick = true; @@ -360,7 +360,7 @@ void KActionSelector::polish() void KActionSelector::keyPressEvent( TQKeyEvent *e ) { if ( ! d->keyboardEnabled ) return; - if ( (e->state() & Qt::ControlButton) ) + if ( (e->state() & TQt::ControlButton) ) { switch ( e->key() ) { @@ -387,7 +387,7 @@ bool KActionSelector::eventFilter( TQObject *o, TQEvent *e ) { if ( d->keyboardEnabled && e->type() == TQEvent::KeyPress ) { - if ( (((TQKeyEvent*)e)->state() & Qt::ControlButton) ) + if ( (((TQKeyEvent*)e)->state() & TQt::ControlButton) ) { switch ( ((TQKeyEvent*)e)->key() ) { diff --git a/kbabel/commonui/kactionselector.h b/kbabel/commonui/kactionselector.h index f9bae466..421597ba 100644 --- a/kbabel/commonui/kactionselector.h +++ b/kbabel/commonui/kactionselector.h @@ -17,11 +17,11 @@ * * * In addition, as a special exception, the copyright holders give * * permission to link the code of this program with any edition of * - * the Qt library by Trolltech AS, Norway (or with modified versions * - * of Qt that use the same license as Qt), and distribute linked * + * the TQt library by Trolltech AS, Norway (or with modified versions * + * of TQt that use the same license as TQt), and distribute linked * * combinations including the two. You must obey the GNU General * * Public License in all respects for all of the code used other than * - * Qt. If you modify this file, you may extend this exception to * + * TQt. If you modify this file, you may extend this exception to * * your version of the file, but you are not obligated to do so. If * * you do not wish to do so, delete this exception statement from * * your version. * @@ -86,18 +86,19 @@ class KActionSelectorPrivate; class KActionSelector : public TQWidget { Q_OBJECT + TQ_OBJECT Q_ENUMS( ButtonIconSize InsertionPolicy ) - Q_PROPERTY( bool moveOnDoubleClick READ moveOnDoubleClick WRITE setMoveOnDoubleClick ) - Q_PROPERTY( bool keyboardEnabled READ keyboardEnabled WRITE setKeyboardEnabled ) - Q_PROPERTY( TQString availableLabel READ availableLabel WRITE setAvailableLabel ) - Q_PROPERTY( TQString selectedLabel READ selectedLabel WRITE setSelectedLabel ) - Q_PROPERTY( ButtonIconSize buttonIconSize READ buttonIconSize WRITE setButtonIconSize ) - Q_PROPERTY( InsertionPolicy availableInsertionPolicy READ availableInsertionPolicy WRITE setAvailableInsertionPolicy ) - Q_PROPERTY( InsertionPolicy selectedInsertionPolicy READ selectedInsertionPolicy WRITE setSelectedInsertionPolicy ) - Q_PROPERTY( bool showUpDownButtons READ showUpDownButtons WRITE setShowUpDownButtons ) + TQ_PROPERTY( bool moveOnDoubleClick READ moveOnDoubleClick WRITE setMoveOnDoubleClick ) + TQ_PROPERTY( bool keyboardEnabled READ keyboardEnabled WRITE setKeyboardEnabled ) + TQ_PROPERTY( TQString availableLabel READ availableLabel WRITE setAvailableLabel ) + TQ_PROPERTY( TQString selectedLabel READ selectedLabel WRITE setSelectedLabel ) + TQ_PROPERTY( ButtonIconSize buttonIconSize READ buttonIconSize WRITE setButtonIconSize ) + TQ_PROPERTY( InsertionPolicy availableInsertionPolicy READ availableInsertionPolicy WRITE setAvailableInsertionPolicy ) + TQ_PROPERTY( InsertionPolicy selectedInsertionPolicy READ selectedInsertionPolicy WRITE setSelectedInsertionPolicy ) + TQ_PROPERTY( bool showUpDownButtons READ showUpDownButtons WRITE setShowUpDownButtons ) public: - KActionSelector( TQWidget *parent=0, const char *name=0 ); + KActionSelector( TQWidget *tqparent=0, const char *name=0 ); ~KActionSelector(); /** diff --git a/kbabel/commonui/klisteditor.ui b/kbabel/commonui/klisteditor.ui index 63fbfceb..cb6c43ac 100644 --- a/kbabel/commonui/klisteditor.ui +++ b/kbabel/commonui/klisteditor.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KListEditor</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KListEditor</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -30,7 +30,7 @@ <property name="spacing"> <number>0</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>_frame</cstring> </property> @@ -55,7 +55,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -69,12 +69,12 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>_edit</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -88,7 +88,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QListBox"> + <widget class="TQListBox"> <item> <property name="text"> <string>New Item</string> @@ -97,14 +97,14 @@ <property name="name"> <cstring>_list</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>200</width> <height>200</height> </size> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout5_2</cstring> </property> @@ -118,7 +118,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>_addButton</cstring> </property> @@ -129,7 +129,7 @@ <string>Add</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>_removeButton</cstring> </property> @@ -140,7 +140,7 @@ <string>Remove</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>_upButton</cstring> </property> @@ -151,7 +151,7 @@ <string>Up</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>_downButton</cstring> </property> @@ -172,7 +172,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -242,10 +242,10 @@ <includes> <include location="local" impldecl="in implementation">klisteditor.ui.h</include> </includes> -<signals> +<Q_SIGNALS> <signal>itemsChanged()</signal> -</signals> -<slots> +</Q_SIGNALS> +<Q_SLOTS> <slot>addToList()</slot> <slot>downInList()</slot> <slot>removeFromList()</slot> @@ -255,7 +255,7 @@ <slot>setList( QStringList contents )</slot> <slot access="protected">editChanged( const QString & s )</slot> <slot>setTitle( const QString & s )</slot> - <slot returnType="QStringList">list()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> + <slot returnType="TQStringList">list()</slot> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kbabel/commonui/klisteditor.ui.h b/kbabel/commonui/klisteditor.ui.h index 3d0e17df..1845943c 100644 --- a/kbabel/commonui/klisteditor.ui.h +++ b/kbabel/commonui/klisteditor.ui.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -32,7 +32,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** -** If you wish to add, delete or rename slots use Qt Designer which will +** If you wish to add, delete or rename slots use TQt Designer which will ** update this file, preserving your code. Create an init() slot in place of ** a constructor, and a destroy() slot in place of a destructor. *****************************************************************************/ diff --git a/kbabel/commonui/projectpref.cpp b/kbabel/commonui/projectpref.cpp index 16e6c114..f34d2cc2 100644 --- a/kbabel/commonui/projectpref.cpp +++ b/kbabel/commonui/projectpref.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kbabel/commonui/projectpref.h b/kbabel/commonui/projectpref.h index ce4e7f86..07cae2f1 100644 --- a/kbabel/commonui/projectpref.h +++ b/kbabel/commonui/projectpref.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -58,6 +58,7 @@ namespace KBabel { class KDE_EXPORT ProjectDialog : public KConfigDialog { Q_OBJECT + TQ_OBJECT public: ProjectDialog(Project::Ptr project); diff --git a/kbabel/commonui/projectprefwidgets.cpp b/kbabel/commonui/projectprefwidgets.cpp index 0357065e..4a363c47 100644 --- a/kbabel/commonui/projectprefwidgets.cpp +++ b/kbabel/commonui/projectprefwidgets.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -76,18 +76,18 @@ using namespace KBabel; -static TQSize sizeHintForWidget(const TQWidget* widget) +static TQSize tqsizeHintForWidget(const TQWidget* widget) { // - // The size is computed by adding the sizeHint().height() of all - // widget children and taking the width of the widest child and adding - // layout()->margin() and layout()->spacing() + // The size is computed by adding the tqsizeHint().height() of all + // widget tqchildren and taking the width of the widest child and adding + // tqlayout()->margin() and tqlayout()->spacing() // TQSize size; int numChild = 0; - TQObjectList *l = (TQObjectList*)(widget->children()); + TQObjectList *l = (TQObjectList*)(widget->tqchildren()); for( uint i=0; i < l->count(); i++ ) { @@ -97,7 +97,7 @@ static TQSize sizeHintForWidget(const TQWidget* widget) numChild += 1; TQWidget *w=((TQWidget*)o); - TQSize s = w->sizeHint(); + TQSize s = w->tqsizeHint(); if( s.isEmpty() == true ) { s = TQSize( 50, 100 ); // Default size @@ -109,8 +109,8 @@ static TQSize sizeHintForWidget(const TQWidget* widget) if( numChild > 0 ) { - size.setHeight( size.height() + widget->layout()->spacing()*(numChild-1) ); - size += TQSize( widget->layout()->margin()*2, widget->layout()->margin()*2 + 1 ); + size.setHeight( size.height() + widget->tqlayout()->spacing()*(numChild-1) ); + size += TQSize( widget->tqlayout()->margin()*2, widget->tqlayout()->margin()*2 + 1 ); } else { @@ -123,16 +123,16 @@ static TQSize sizeHintForWidget(const TQWidget* widget) -SavePreferences::SavePreferences(TQWidget *parent) - : KTabCtl(parent) +SavePreferences::SavePreferences(TQWidget *tqparent) + : KTabCtl(tqparent) { TQWidget* page = new TQWidget(this); - TQVBoxLayout* layout=new TQVBoxLayout(page); - layout->setSpacing(KDialog::spacingHint()); - layout->setMargin(KDialog::marginHint()); + TQVBoxLayout* tqlayout=new TQVBoxLayout(page); + tqlayout->setSpacing(KDialog::spacingHint()); + tqlayout->setMargin(KDialog::marginHint()); TQGroupBox* box=new TQGroupBox(1,Qt::Horizontal,page); - layout->addWidget(box); + tqlayout->addWidget(box); box->setMargin(KDialog::marginHint()); _updateButton = new TQCheckBox(i18n("&Update header when saving"),box, "kcfg_AutoUpdate"); @@ -141,7 +141,7 @@ SavePreferences::SavePreferences(TQWidget *parent) _saveObsoleteButton = new TQCheckBox(i18n("Save &obsolete entries"),box, "kcfg_SaveObsolete"); TQGroupBox* descBox=new TQGroupBox(1,Qt::Horizontal,i18n("De&scription"),page); - layout->addWidget(descBox); + tqlayout->addWidget(descBox); descBox->setMargin(KDialog::marginHint()); _descriptionEdit = new TQLineEdit(descBox, "kcfg_DescriptionString"); @@ -149,7 +149,7 @@ SavePreferences::SavePreferences(TQWidget *parent) TQGroupBox* encodingBox = new TQGroupBox(1,Qt::Horizontal,i18n("Encoding") ,page); encodingBox->setMargin(KDialog::marginHint()); - layout->addWidget(encodingBox); + tqlayout->addWidget(encodingBox); TQHBox *b = new TQHBox(encodingBox); TQLabel* tempLabel=new TQLabel(i18n("Default:"),b); @@ -177,23 +177,23 @@ SavePreferences::SavePreferences(TQWidget *parent) _autoSaveBox = new TQGroupBox( 1, Qt::Horizontal, i18n( "Automatic Saving" ), page ); _autoSaveBox->setMargin( KDialog::marginHint( ) ); - layout->addWidget( _autoSaveBox ); + tqlayout->addWidget( _autoSaveBox ); _autoSaveDelay = new KIntNumInput( _autoSaveBox, "kcfg_AutoSaveDelay" ); _autoSaveDelay->setRange( 0, 60 ); _autoSaveDelay->setSuffix( i18n( "Short for minutes", " min" ) ); _autoSaveDelay->setSpecialValueText( i18n( "No autosave" ) ); - layout->addStretch(1); - page->setMinimumSize(sizeHintForWidget(page)); + tqlayout->addStretch(1); + page->setMinimumSize(tqsizeHintForWidget(page)); addTab(page, i18n("&General")); page = new TQWidget(this); - layout=new TQVBoxLayout(page); - layout->setSpacing(KDialog::spacingHint()); - layout->setMargin(KDialog::marginHint()); + tqlayout=new TQVBoxLayout(page); + tqlayout->setSpacing(KDialog::spacingHint()); + tqlayout->setMargin(KDialog::marginHint()); TQGroupBox* gridBox = new TQGroupBox(2,Qt::Horizontal,i18n("Fields to Update"),page); - layout->addWidget(gridBox); + tqlayout->addWidget(gridBox); gridBox->setMargin(KDialog::marginHint()); _revisionButton = new TQCheckBox(i18n("Re&vision-Date"),gridBox, "kcfg_UpdateRevisionDate"); @@ -204,10 +204,10 @@ SavePreferences::SavePreferences(TQWidget *parent) _projectButton = new TQCheckBox(i18n("Pro&ject"),gridBox, "kcfg_UpdateProject"); TQButtonGroup* dateBox = new TQButtonGroup(2,Qt::Horizontal,i18n("Format of Revision-Date"),page, "kcfg_DateFormat"); - layout->addWidget(dateBox); + tqlayout->addWidget(dateBox); box->setMargin(KDialog::marginHint()); - // we remove/insert default date button to correctly map Qt::DateFormat to our Ids + // we remove/insert default date button to correctly map TQt::DateFormat to our Ids _defaultDateButton = new TQRadioButton( i18n("De&fault date format"),dateBox ); dateBox->remove (_defaultDateButton); _localDateButton = new TQRadioButton( i18n("Local date fo&rmat"),dateBox ); @@ -225,7 +225,7 @@ SavePreferences::SavePreferences(TQWidget *parent) TQGroupBox* projectBox = new TQGroupBox(1,Qt::Horizontal,i18n("Project String") ,page); projectBox->setMargin(KDialog::marginHint()); - layout->addWidget(projectBox); + tqlayout->addWidget(projectBox); b = new TQHBox(projectBox); tempLabel=new TQLabel(i18n("Project-Id:"),b); @@ -234,32 +234,32 @@ SavePreferences::SavePreferences(TQWidget *parent) b->setSpacing(KDialog::spacingHint()); tempLabel->setBuddy(_projectEdit); - layout->addStretch(1); - page->setMinimumSize(sizeHintForWidget(page)); + tqlayout->addStretch(1); + page->setMinimumSize(tqsizeHintForWidget(page)); addTab(page, i18n("&Header")); page = new TQWidget(this); - layout=new TQVBoxLayout(page); - layout->setSpacing(KDialog::spacingHint()); - layout->setMargin(KDialog::marginHint()); + tqlayout=new TQVBoxLayout(page); + tqlayout->setSpacing(KDialog::spacingHint()); + tqlayout->setMargin(KDialog::marginHint()); TQGroupBox* translatorCopyrightBox = new TQGroupBox(1,Qt::Horizontal, page); translatorCopyrightBox->setMargin(KDialog::marginHint()); _translatorCopyrightButton = new TQCheckBox(i18n("Update &translator copyright") ,translatorCopyrightBox, "kcfg_UpdateTranslatorCopyright"); - layout->addWidget(translatorCopyrightBox); + tqlayout->addWidget(translatorCopyrightBox); TQGroupBox* fsfBox=new TQButtonGroup(1,Qt::Horizontal,i18n("Free Software Foundation Copyright"),page, "kcfg_FSFCopyright"); - layout->addWidget(fsfBox); + tqlayout->addWidget(fsfBox); fsfBox->setMargin(KDialog::marginHint()); _removeFSFButton = new TQRadioButton(i18n("&Remove copyright if empty"),fsfBox); _updateFSFButton = new TQRadioButton(i18n("&Update copyright"),fsfBox); _nochangeFSFButton = new TQRadioButton(i18n("Do ¬ change"),fsfBox); - layout->addStretch(1); - page->setMinimumSize(sizeHintForWidget(page)); + tqlayout->addStretch(1); + page->setMinimumSize(tqsizeHintForWidget(page)); addTab(page, i18n("Cop&yright")); TQWhatsThis::add(_updateButton, @@ -289,7 +289,7 @@ SavePreferences::SavePreferences(TQWidget *parent) "<ul><li><b>%1</b>: this is the encoding that fits the character " "set of your system language.</li>" "<li><b>%2</b>: uses Unicode (UTF-8) encoding.</li>" -"</ul></qt>").arg(defaultName).arg(utf8Name) ); +"</ul></qt>").tqarg(defaultName).tqarg(utf8Name) ); TQWhatsThis::add(_oldEncodingButton @@ -323,7 +323,7 @@ SavePreferences::SavePreferences(TQWidget *parent) "in the online help.</p>" "</qt>") ); - setMinimumSize(sizeHint()); + setMinimumSize(tqsizeHint()); } @@ -398,22 +398,22 @@ void SavePreferences::setAutoSaveVisible( const bool on ) -IdentityPreferences::IdentityPreferences(TQWidget* parent, const TQString& project) - : TQWidget(parent) +IdentityPreferences::IdentityPreferences(TQWidget* tqparent, const TQString& project) + : TQWidget(tqparent) { TQWidget* page = this; - TQVBoxLayout* layout=new TQVBoxLayout(page); - layout->setSpacing(KDialog::spacingHint()); - layout->setMargin(KDialog::marginHint()); + TQVBoxLayout* tqlayout=new TQVBoxLayout(page); + tqlayout->setSpacing(KDialog::spacingHint()); + tqlayout->setMargin(KDialog::marginHint()); if( !project.isEmpty() ) { // show the project name in the widget at the top - layout->addWidget(new TQLabel(i18n("<font size=\"+1\">Project: %1</font>").arg(project),page)); + tqlayout->addWidget(new TQLabel(i18n("<font size=\"+1\">Project: %1</font>").tqarg(project),page)); } TQGroupBox* group = new TQGroupBox(2,Qt::Horizontal,page); - layout->addWidget(group); + tqlayout->addWidget(group); group->setMargin(KDialog::marginHint()); TQLabel* tempLabel=new TQLabel(i18n("&Name:"),group); @@ -443,12 +443,12 @@ IdentityPreferences::IdentityPreferences(TQWidget* parent, const TQString& proje tempLabel=new TQLabel(i18n("&Language mailing list:"),group); _listEdit = new TQLineEdit(group, "kcfg_Mailinglist"); - _listEdit->setMinimumSize(100,_listEdit->sizeHint().height()); + _listEdit->setMinimumSize(100,_listEdit->tqsizeHint().height()); tempLabel->setBuddy(_listEdit); tempLabel=new TQLabel(i18n("&Timezone:"), group); _timezoneEdit = new TQLineEdit(group, "kcfg_Timezone"); - _timezoneEdit->setMinimumSize(100,_timezoneEdit->sizeHint().height()); + _timezoneEdit->setMinimumSize(100,_timezoneEdit->tqsizeHint().height()); tempLabel->setBuddy(_timezoneEdit); @@ -462,7 +462,7 @@ IdentityPreferences::IdentityPreferences(TQWidget* parent, const TQString& proje group = new TQGroupBox(1,Qt::Horizontal,page); - layout->addWidget(group); + tqlayout->addWidget(group); group->setMargin(KDialog::marginHint()); hbox = new TQHBox(group); @@ -534,11 +534,11 @@ IdentityPreferences::IdentityPreferences(TQWidget* parent, const TQString& proje "GNU gettext tools for currently set language; just press the <b>Lookup</b> " "button.</p></qt>")); - layout->addStretch(1); + tqlayout->addStretch(1); - page->setMinimumSize(sizeHintForWidget(page)); + page->setMinimumSize(tqsizeHintForWidget(page)); - setMinimumSize(sizeHint()); + setMinimumSize(tqsizeHint()); _mailEdit->installEventFilter(this); _listEdit->installEventFilter(this); @@ -619,12 +619,12 @@ void IdentityPreferences::testPluralForm() "of singular/plural forms automatically for the " "language code \"%1\".\n" "Do you have kdelibs.po installed for this language?\n" - "Please set the correct number manually.").arg(lang); + "Please set the correct number manually.").tqarg(lang); } else { msg = i18n("The number of singular/plural forms found for " - "the language code \"%1\" is %2.").arg(lang).arg(number); + "the language code \"%1\" is %2.").tqarg(lang).tqarg(number); } if(!msg.isEmpty()) @@ -658,18 +658,18 @@ void IdentityPreferences::lookupGnuPluralFormHeader() } -MiscPreferences::MiscPreferences(TQWidget *parent) - : TQWidget(parent), _regExpEditDialog(0) +MiscPreferences::MiscPreferences(TQWidget *tqparent) + : TQWidget(tqparent), _regExpEditDialog(0) { TQWidget* page = this; - TQVBoxLayout* layout=new TQVBoxLayout(page); - layout->setSpacing(KDialog::spacingHint()); - layout->setMargin(KDialog::marginHint()); + TQVBoxLayout* tqlayout=new TQVBoxLayout(page); + tqlayout->setSpacing(KDialog::spacingHint()); + tqlayout->setMargin(KDialog::marginHint()); TQGroupBox* box=new TQGroupBox(1,Qt::Horizontal,page); box->setMargin(KDialog::marginHint()); - layout->addWidget(box); + tqlayout->addWidget(box); TQHBox *hbox = new TQHBox(box); hbox->setSpacing(KDialog::spacingHint()); @@ -681,7 +681,7 @@ MiscPreferences::MiscPreferences(TQWidget *parent) hbox->setStretchFactor(accelMarkerEdit,1); TQString msg=i18n("<qt><p><b>Marker for keyboard accelerator</b></p>" "<p>Define here, what character marks the following " - "character as keyboard accelerator. For example in Qt it is " + "character as keyboard accelerator. For example in TQt it is " "'&' and in Gtk it is '_'.</p></qt>"); TQWhatsThis::add(label,msg); TQWhatsThis::add(accelMarkerEdit,msg); @@ -715,7 +715,7 @@ MiscPreferences::MiscPreferences(TQWidget *parent) vbgroup->setTitle(i18n("Compression Method for Mail Attachments")); vbgroup->setRadioButtonExclusive(true); vbgroup->setMargin(KDialog::marginHint()); - layout->addWidget(vbgroup); + tqlayout->addWidget(vbgroup); bzipButton = new TQRadioButton(i18n("tar/&bzip2"), vbgroup, "kcfg_BZipCompression"); gzipButton = new TQRadioButton(i18n("tar/&gzip"), vbgroup); @@ -723,8 +723,8 @@ MiscPreferences::MiscPreferences(TQWidget *parent) compressSingle = new TQCheckBox(i18n("&Use compression when sending " "a single file"), vbgroup, "kcfg_CompressSingleFile"); - layout->addStretch(1); - page->setMinimumSize(sizeHintForWidget(page)); + tqlayout->addStretch(1); + page->setMinimumSize(tqsizeHintForWidget(page)); } void MiscPreferences::defaults(const MiscSettings& settings) @@ -770,7 +770,7 @@ TQString MiscPreferences::contextInfo() const void MiscPreferences::setContextInfo(TQString reg) { - reg.replace("\n","\\n"); + reg.tqreplace("\n","\\n"); contextInfoEdit->setText(reg); } @@ -778,7 +778,7 @@ void MiscPreferences::regExpButtonClicked() { if ( _regExpEditDialog==0 ) _regExpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog> - ("KRegExpEditor/KRegExpEditor", TQString::null, this ); + ("KRegExpEditor/KRegExpEditor", TQString(), this ); KRegExpEditorInterface *iface = dynamic_cast<KRegExpEditorInterface *>( _regExpEditDialog ); if( iface ) @@ -790,34 +790,34 @@ void MiscPreferences::regExpButtonClicked() } -SpellPreferences::SpellPreferences(TQWidget* parent) - : TQWidget(parent) +SpellPreferences::SpellPreferences(TQWidget* tqparent) + : TQWidget(tqparent) { TQWidget* page = this; - TQVBoxLayout* layout=new TQVBoxLayout(page); - layout->setSpacing(KDialog::spacingHint()); - layout->setMargin(KDialog::marginHint()); + TQVBoxLayout* tqlayout=new TQVBoxLayout(page); + tqlayout->setSpacing(KDialog::spacingHint()); + tqlayout->setMargin(KDialog::marginHint()); onFlyBtn = new TQCheckBox(i18n("On the &fly spellchecking"),page, "kcfg_OnFlySpellCheck"); - layout->addWidget(onFlyBtn); + tqlayout->addWidget(onFlyBtn); TQWhatsThis::add(onFlyBtn, i18n("<qt><p><b>On the fly spellchecking</b></p>" "<p>Activate this to let KBabel spell check the text " "as you type. Mispelled words will be colored by the error color.</p></qt>")); spellConfig = new KSpellConfig(page,"spellConfigWidget",0,false); - layout->addWidget(spellConfig); + tqlayout->addWidget(spellConfig); remIgnoredBtn = new TQCheckBox(i18n("&Remember ignored words"),page, "kcfg_RememberIgnored"); - layout->addWidget(remIgnoredBtn); + tqlayout->addWidget(remIgnoredBtn); connect( spellConfig, TQT_SIGNAL( configChanged() ) , this, TQT_SIGNAL ( settingsChanged() ) ); TQLabel *tempLabel = new TQLabel(i18n("F&ile to store ignored words:"),page); - layout->addWidget(tempLabel); + tqlayout->addWidget(tempLabel); ignoreURLEdit = new KURLRequester(page, "kcfg_IgnoreURL"); - layout->addWidget(ignoreURLEdit); + tqlayout->addWidget(ignoreURLEdit); tempLabel->setBuddy(ignoreURLEdit); connect(remIgnoredBtn,TQT_SIGNAL(toggled(bool)),ignoreURLEdit @@ -833,11 +833,11 @@ SpellPreferences::SpellPreferences(TQWidget* parent) TQWhatsThis::add(tempLabel,msg); TQWhatsThis::add(ignoreURLEdit,msg); - layout->addStretch(1); + tqlayout->addStretch(1); - page->setMinimumSize(sizeHintForWidget(page)); + page->setMinimumSize(tqsizeHintForWidget(page)); - setMinimumSize(sizeHint()); + setMinimumSize(tqsizeHint()); } @@ -874,18 +874,18 @@ void SpellPreferences::defaults(const SpellcheckSettings& settings) *spellConfig = spCfg; } -CatmanPreferences::CatmanPreferences(TQWidget* parent) - : TQWidget(parent) +CatmanPreferences::CatmanPreferences(TQWidget* tqparent) + : TQWidget(tqparent) { TQWidget* page = this; - TQVBoxLayout* layout=new TQVBoxLayout(page); - layout->setSpacing(KDialog::spacingHint()); - layout->setMargin(KDialog::marginHint()); + TQVBoxLayout* tqlayout=new TQVBoxLayout(page); + tqlayout->setSpacing(KDialog::spacingHint()); + tqlayout->setMargin(KDialog::marginHint()); TQGroupBox* box=new TQGroupBox(1,Qt::Horizontal,page); box->setMargin(KDialog::marginHint()); - layout->addWidget(box); + tqlayout->addWidget(box); TQLabel* label=new TQLabel(i18n("&Base folder of PO files:"),box); TQHBox* hbox = new TQHBox(box); @@ -896,7 +896,7 @@ CatmanPreferences::CatmanPreferences(TQWidget* parent) _poDirEdit = new KURLRequester(hbox, "kcfg_PoBaseDir"); _poDirEdit->setMode( mode ); - _poDirEdit->setMinimumSize(250,_poDirEdit->sizeHint().height()); + _poDirEdit->setMinimumSize(250,_poDirEdit->tqsizeHint().height()); label->setBuddy(_poDirEdit); @@ -906,7 +906,7 @@ CatmanPreferences::CatmanPreferences(TQWidget* parent) _potDirEdit = new KURLRequester(hbox, "kcfg_PotBaseDir"); _potDirEdit->setMode( mode ); - _potDirEdit->setMinimumSize(250,_potDirEdit->sizeHint().height()); + _potDirEdit->setMinimumSize(250,_potDirEdit->tqsizeHint().height()); label->setBuddy(_potDirEdit); @@ -919,7 +919,7 @@ CatmanPreferences::CatmanPreferences(TQWidget* parent) box=new TQGroupBox(1,Qt::Horizontal,page); box->setMargin(KDialog::marginHint()); - layout->addWidget(box); + tqlayout->addWidget(box); _openWindowButton = new TQCheckBox(i18n("O&pen files in new window"),box, "kcfg_OpenWindow"); @@ -939,7 +939,7 @@ CatmanPreferences::CatmanPreferences(TQWidget* parent) _indexButton = new TQCheckBox( i18n("Create inde&x for file contents"), box, "kcfg_IndexWords" ); TQWhatsThis::add( _indexButton , i18n("<qt><p><b>Create index for file contents</b></p>\n" -"<p>If you check this, KBabel will create an index for each PO file to speed up the find/replace functions.</p>\n" +"<p>If you check this, KBabel will create an index for each PO file to speed up the tqfind/replace functions.</p>\n" "<p>NOTE: This will slow down updating the file information considerably.</p></qt>") ); m_msgfmtButton = new TQCheckBox( i18n("Run &msgfmt before processing a file"), box, "kcfg_msgfmt" ); @@ -956,11 +956,11 @@ CatmanPreferences::CatmanPreferences(TQWidget* parent) "so invalid PO files could be shown as good ones, " "even if Gettext tools would reject such files.</p></qt>") ); - layout->addStretch(1); + tqlayout->addStretch(1); - page->setMinimumSize(sizeHintForWidget(page)); + page->setMinimumSize(tqsizeHintForWidget(page)); - setMinimumSize(sizeHint()); + setMinimumSize(tqsizeHint()); } @@ -976,18 +976,18 @@ void CatmanPreferences::defaults(const CatManSettings& settings) m_msgfmtButton->setChecked( settings.msgfmt ); } -DirCommandsPreferences::DirCommandsPreferences(TQWidget* parent) - : TQWidget(parent) +DirCommandsPreferences::DirCommandsPreferences(TQWidget* tqparent) + : TQWidget(tqparent) { TQWidget* page = this; - TQVBoxLayout* layout=new TQVBoxLayout(page); - layout->setSpacing(KDialog::spacingHint()); - layout->setMargin(KDialog::marginHint()); + TQVBoxLayout* tqlayout=new TQVBoxLayout(page); + tqlayout->setSpacing(KDialog::spacingHint()); + tqlayout->setMargin(KDialog::marginHint()); TQGroupBox* box = new TQGroupBox( 1 , Qt::Horizontal , i18n("Commands for Folders") , page ); box->setMargin( KDialog::marginHint() ); - layout->addWidget( box ); + tqlayout->addWidget( box ); _dirCmdEdit = new CmdEdit( box ); new TQLabel( i18n("Replaceables:\n@PACKAGE@, @PODIR@, @POTDIR@\n" @@ -1010,10 +1010,10 @@ DirCommandsPreferences::DirCommandsPreferences(TQWidget* parent) - layout->addStretch(1); - page->setMinimumSize(sizeHintForWidget(page)); + tqlayout->addStretch(1); + page->setMinimumSize(tqsizeHintForWidget(page)); - setMinimumSize(sizeHint()); + setMinimumSize(tqsizeHint()); } @@ -1039,18 +1039,18 @@ void DirCommandsPreferences::defaults(const CatManSettings& settings) } -FileCommandsPreferences::FileCommandsPreferences(TQWidget* parent) - : TQWidget(parent) +FileCommandsPreferences::FileCommandsPreferences(TQWidget* tqparent) + : TQWidget(tqparent) { TQWidget* page = this; - TQVBoxLayout* layout=new TQVBoxLayout(page); - layout->setSpacing(KDialog::spacingHint()); - layout->setMargin(KDialog::marginHint()); + TQVBoxLayout* tqlayout=new TQVBoxLayout(page); + tqlayout->setSpacing(KDialog::spacingHint()); + tqlayout->setMargin(KDialog::marginHint()); TQGroupBox* box=new TQGroupBox( 1 , Qt::Horizontal , i18n("Commands for Files") , page ); box->setMargin( KDialog::marginHint() ); - layout->addWidget( box ); + tqlayout->addWidget( box ); _fileCmdEdit = new CmdEdit( box ); new TQLabel( i18n("Replaceables:\n" @@ -1074,10 +1074,10 @@ FileCommandsPreferences::FileCommandsPreferences(TQWidget* parent) - layout->addStretch(1); - page->setMinimumSize(sizeHintForWidget(page)); + tqlayout->addStretch(1); + page->setMinimumSize(tqsizeHintForWidget(page)); - setMinimumSize(sizeHint()); + setMinimumSize(tqsizeHint()); } @@ -1102,18 +1102,18 @@ void FileCommandsPreferences::defaults(const CatManSettings& settings) _fileCmdEdit->setCommands( settings.fileCommands, settings.fileCommandNames ); } -ViewPreferences::ViewPreferences(TQWidget* parent) - : TQWidget(parent) +ViewPreferences::ViewPreferences(TQWidget* tqparent) + : TQWidget(tqparent) { TQWidget* page = this; - TQVBoxLayout* layout=new TQVBoxLayout(page); - layout->setSpacing(KDialog::spacingHint()); - layout->setMargin(KDialog::marginHint()); + TQVBoxLayout* tqlayout=new TQVBoxLayout(page); + tqlayout->setSpacing(KDialog::spacingHint()); + tqlayout->setMargin(KDialog::marginHint()); TQGroupBox* box=new TQGroupBox(2, Qt::Horizontal,i18n("Shown Columns"),page); box->setMargin(KDialog::marginHint()); - layout->addWidget(box); + tqlayout->addWidget(box); _flagColumnCheckbox = new TQCheckBox( i18n("Fla&g"), box, "kcfg_ShowFlagColumn" ); _fuzzyColumnCheckbox = new TQCheckBox( i18n("&Fuzzy"), box, "kcfg_ShowFuzzyColumn" ); @@ -1126,11 +1126,11 @@ ViewPreferences::ViewPreferences(TQWidget* parent) TQWhatsThis::add(box,i18n("<qt><p><b>Shown columns</b></p>\n" "<p></p></qt>")); - layout->addStretch(1); + tqlayout->addStretch(1); - page->setMinimumSize(sizeHintForWidget(page)); + page->setMinimumSize(tqsizeHintForWidget(page)); - setMinimumSize(sizeHint()); + setMinimumSize(tqsizeHint()); } @@ -1145,12 +1145,12 @@ void ViewPreferences::defaults(const CatManSettings& _settings) _translatorColumnCheckbox->setChecked(_settings.translatorColumn); } -SourceContextPreferences::SourceContextPreferences(TQWidget* parent): TQWidget(parent) +SourceContextPreferences::SourceContextPreferences(TQWidget* tqparent): TQWidget(tqparent) { TQWidget* page = this; - TQVBoxLayout* layout=new TQVBoxLayout(page); - layout->setSpacing(KDialog::spacingHint()); - layout->setMargin(KDialog::marginHint()); + TQVBoxLayout* tqlayout=new TQVBoxLayout(page); + tqlayout->setSpacing(KDialog::spacingHint()); + tqlayout->setMargin(KDialog::marginHint()); TQHBox* box = new TQHBox(page); box->setSpacing(KDialog::spacingHint()); @@ -1159,21 +1159,21 @@ SourceContextPreferences::SourceContextPreferences(TQWidget* parent): TQWidget(p const KFile::Mode mode = static_cast<KFile::Mode>( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); _coderootEdit = new KURLRequester ( box, "kcfg_CodeRoot" ); _coderootEdit->setMode( mode ); - _coderootEdit->setMinimumSize( 250, _coderootEdit->sizeHint().height() ); + _coderootEdit->setMinimumSize( 250, _coderootEdit->tqsizeHint().height() ); tempLabel->setBuddy( _coderootEdit ); - layout->addWidget(box); + tqlayout->addWidget(box); // FIXME: use KConfigXT _pathsEditor = new KListEditor(page); _pathsEditor->setTitle(i18n("Path Patterns")); - layout->addWidget(_pathsEditor); + tqlayout->addWidget(_pathsEditor); connect ( _pathsEditor, TQT_SIGNAL (itemsChanged ()) , this, TQT_SIGNAL (itemsChanged ())); _pathsEditor->installEventFilter(this); - setMinimumSize(sizeHint()); + setMinimumSize(tqsizeHint()); } SourceContextPreferences::~SourceContextPreferences() diff --git a/kbabel/commonui/projectprefwidgets.h b/kbabel/commonui/projectprefwidgets.h index ea5b9d30..f5fef9e2 100644 --- a/kbabel/commonui/projectprefwidgets.h +++ b/kbabel/commonui/projectprefwidgets.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -65,8 +65,9 @@ struct ModuleInfo; class KDE_EXPORT SavePreferences : public KTabCtl { Q_OBJECT + TQ_OBJECT public: - SavePreferences(TQWidget* parent=0); + SavePreferences(TQWidget* tqparent=0); void defaults(const KBabel::SaveSettings& settings); void setAutoSaveVisible(const bool on); @@ -108,11 +109,12 @@ private slots: }; -class IdentityPreferences : public QWidget +class IdentityPreferences : public TQWidget { Q_OBJECT + TQ_OBJECT public: - IdentityPreferences(TQWidget *parent = 0, const TQString& project = ""); + IdentityPreferences(TQWidget *tqparent = 0, const TQString& project = ""); virtual bool eventFilter(TQObject *, TQEvent*); void defaults(const KBabel::IdentitySettings& settings); @@ -138,11 +140,12 @@ private: }; -class MiscPreferences : public QWidget +class MiscPreferences : public TQWidget { Q_OBJECT + TQ_OBJECT public: - MiscPreferences(TQWidget *parent=0); + MiscPreferences(TQWidget *tqparent=0); void defaults(const KBabel::MiscSettings& settings); private slots: @@ -163,11 +166,12 @@ private: TQCheckBox* compressSingle; }; -class SpellPreferences : public QWidget +class SpellPreferences : public TQWidget { Q_OBJECT + TQ_OBJECT public: - SpellPreferences(TQWidget *parent=0); + SpellPreferences(TQWidget *tqparent=0); void mergeSettings(KBabel::SpellcheckSettings& set) const; void updateWidgets(const KBabel::SpellcheckSettings& settings); @@ -184,11 +188,12 @@ private: }; -class CatmanPreferences : public QWidget +class CatmanPreferences : public TQWidget { Q_OBJECT + TQ_OBJECT public: - CatmanPreferences(TQWidget *parent = 0); + CatmanPreferences(TQWidget *tqparent = 0); void defaults(const KBabel::CatManSettings& settings); private: @@ -202,11 +207,12 @@ private: TQCheckBox* m_msgfmtButton; }; -class DirCommandsPreferences : public QWidget +class DirCommandsPreferences : public TQWidget { Q_OBJECT + TQ_OBJECT public: - DirCommandsPreferences(TQWidget *parent = 0); + DirCommandsPreferences(TQWidget *tqparent = 0); virtual ~DirCommandsPreferences(); void mergeSettings(KBabel::CatManSettings& settings) const; @@ -220,11 +226,12 @@ private: CmdEdit* _dirCmdEdit; }; -class FileCommandsPreferences : public QWidget +class FileCommandsPreferences : public TQWidget { Q_OBJECT + TQ_OBJECT public: - FileCommandsPreferences(TQWidget *parent = 0); + FileCommandsPreferences(TQWidget *tqparent = 0); virtual ~FileCommandsPreferences(); void mergeSettings(KBabel::CatManSettings& settings) const; @@ -238,11 +245,12 @@ private: CmdEdit* _fileCmdEdit; }; -class ViewPreferences : public QWidget +class ViewPreferences : public TQWidget { Q_OBJECT + TQ_OBJECT public: - ViewPreferences(TQWidget *parent = 0); + ViewPreferences(TQWidget *tqparent = 0); void defaults(const KBabel::CatManSettings& settings); private: @@ -261,11 +269,12 @@ private: * @short Class for setting preferences for source context * @author Stanislav Visnovsky <visnovsky@kde.org> */ -class SourceContextPreferences : public QWidget +class SourceContextPreferences : public TQWidget { Q_OBJECT + TQ_OBJECT public: - SourceContextPreferences(TQWidget* parent=0); + SourceContextPreferences(TQWidget* tqparent=0); virtual ~SourceContextPreferences(); void mergeSettings(KBabel::SourceContextSettings& settings) const; diff --git a/kbabel/commonui/projectwizard.cpp b/kbabel/commonui/projectwizard.cpp index e5df7285..5858195b 100644 --- a/kbabel/commonui/projectwizard.cpp +++ b/kbabel/commonui/projectwizard.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -47,8 +47,8 @@ using namespace KBabel; -ProjectWizard::ProjectWizard(TQWidget *parent,const char *name) - : KWizard(parent,name,true) +ProjectWizard::ProjectWizard(TQWidget *tqparent,const char *name) + : KWizard(tqparent,name,true) { _wizard = new ProjectStep1(this,"project wizard widget"); @@ -60,8 +60,8 @@ ProjectWizard::ProjectWizard(TQWidget *parent,const char *name) { // we need untranslated entries here, because of Translation Robot! TQString entry = (*it); - const int i = entry.find('_'); - entry.replace(0, i, entry.left(i).lower()); + const int i = entry.tqfind('_'); + entry.tqreplace(0, i, entry.left(i).lower()); all_languages.setGroup(entry); entry = all_languages.readEntryUntranslated("Name"); if( ! entry.isEmpty() ) @@ -138,7 +138,7 @@ void ProjectWizard::next() if( file.exists() ) { if (KMessageBox::warningContinueCancel(0, i18n("The file '%1' already exists.\n" - "Do you want to replace it?").arg(url()), i18n("File Exists"), i18n("Replace") ) == KMessageBox::Cancel) + "Do you want to replace it?").tqarg(url()), i18n("File Exists"), i18n("Replace") ) == KMessageBox::Cancel) return; } diff --git a/kbabel/commonui/projectwizard.h b/kbabel/commonui/projectwizard.h index 7805190f..487a16e7 100644 --- a/kbabel/commonui/projectwizard.h +++ b/kbabel/commonui/projectwizard.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -48,8 +48,9 @@ namespace KBabel { class KDE_EXPORT ProjectWizard : public KWizard { Q_OBJECT + TQ_OBJECT public: - ProjectWizard(TQWidget* parent = 0, const char * name = 0); + ProjectWizard(TQWidget* tqparent = 0, const char * name = 0); Project::Ptr project(); diff --git a/kbabel/commonui/projectwizardwidget.ui b/kbabel/commonui/projectwizardwidget.ui index 3ad04de7..592b6792 100644 --- a/kbabel/commonui/projectwizardwidget.ui +++ b/kbabel/commonui/projectwizardwidget.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ProjectStep1</class> <author>Stanislav Visnovsky <visnovsky@kde.org></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ProjectStep1</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -17,7 +17,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -38,9 +38,9 @@ and also a type of the translation project. </p></string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <grid> <property name="name"> @@ -66,7 +66,7 @@ project.</p> </qt></string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -86,7 +86,7 @@ standard.</p> </qt></string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -110,7 +110,7 @@ as well as in the title of windows opened for the project. </p></qt></string> </property> </widget> - <widget class="QComboBox" row="2" column="1"> + <widget class="TQComboBox" row="2" column="1"> <property name="name"> <cstring>_projectLanguage</cstring> </property> @@ -127,7 +127,7 @@ standard.</p> </qt></string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -176,7 +176,7 @@ as well as in the title of windows opened for the project. </p></qt></string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -194,7 +194,7 @@ project.</p> </qt></string> </property> </widget> - <widget class="QComboBox" row="3" column="1"> + <widget class="TQComboBox" row="3" column="1"> <item> <property name="text"> <string>KDE</string> @@ -255,8 +255,8 @@ done</li> <includes> <include location="local" impldecl="in implementation">projectwizardwidget.ui.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> -<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<tqlayoutdefaults spacing="6" margin="11"/> +<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kbabel/commonui/projectwizardwidget.ui.h b/kbabel/commonui/projectwizardwidget.ui.h index 6f16e162..c9ed3465 100644 --- a/kbabel/commonui/projectwizardwidget.ui.h +++ b/kbabel/commonui/projectwizardwidget.ui.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -32,7 +32,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ diff --git a/kbabel/commonui/projectwizardwidget2.ui b/kbabel/commonui/projectwizardwidget2.ui index 05d21a20..33c9ab11 100644 --- a/kbabel/commonui/projectwizardwidget2.ui +++ b/kbabel/commonui/projectwizardwidget2.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ProjectStep2</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ProjectStep2</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -21,7 +21,7 @@ The files and the folders in these folders will then be merged into one tree.< <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -44,15 +44,15 @@ leave the entries empty, the Catalog Manager will not work.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -86,15 +86,15 @@ will not work.</string> </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -138,7 +138,7 @@ will not work.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>100</height> @@ -149,7 +149,7 @@ will not work.</string> </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kbabel/commonui/roughtransdlg.cpp b/kbabel/commonui/roughtransdlg.cpp index 75395630..5c8f76a6 100644 --- a/kbabel/commonui/roughtransdlg.cpp +++ b/kbabel/commonui/roughtransdlg.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -64,8 +64,8 @@ using namespace KBabel; RoughTransDlg::RoughTransDlg(KBabelDictBox *dict, Catalog *cat - , TQWidget *parent,const char *name) - : KDialogBase(parent,name,true + , TQWidget *tqparent,const char *name) + : KDialogBase(tqparent,name,true ,i18n("Caption of dialog","Rough Translation") , User1|User2|User3|Close) ,catalog(cat) @@ -77,7 +77,7 @@ RoughTransDlg::RoughTransDlg(KBabelDictBox *dict, Catalog *cat ,partTransCounter(0) ,totalTried(0) { - setButtonBoxOrientation(Vertical); + setButtonBoxQt::OrientationQt::Vertical); setButtonText(User1,i18n("&Start")); setButtonText(User2,i18n("S&top")); setButtonText(User3,i18n("C&ancel")); @@ -187,9 +187,9 @@ RoughTransDlg::RoughTransDlg(KBabelDictBox *dict, Catalog *cat progressbar = new KProgress(mw,"progressbar"); progressbar->setTextEnabled(true); progressbar->setFormat("%v/%m (%p%)"); - TQHBoxLayout* pblayout= new TQHBoxLayout(mainLayout); - pblayout->add(label); - pblayout->add(progressbar); + TQHBoxLayout* pbtqlayout= new TQHBoxLayout(mainLayout); + pbtqlayout->add(label); + pbtqlayout->add(progressbar); transButton->setChecked(config->readBoolEntry("Translated",false)); untransButton->setChecked(config->readBoolEntry("Untranslated",true)); @@ -292,7 +292,7 @@ void RoughTransDlg::translate() if( catalog->pluralForm(i) == NoPluralForm ) { TQString origTrans = catalog->msgstr(i).first(); - if(msg.find("_: NAME OF TRANSLATORS\\n")==0) + if(msg.tqfind("_: NAME OF TRANSLATORS\\n")==0) { TQString authorName; if( !catalog->identitySettings().authorLocalizedName.isEmpty() ) @@ -302,24 +302,24 @@ void RoughTransDlg::translate() authorName = catalog->identitySettings().authorName; else continue; // there is no name to be inserted - if( !TQStringList::split(',', origTrans).contains(authorName) ) + if( !TQStringList::split(',', origTrans).tqcontains(authorName) ) { if(origTrans.isEmpty() ) translation=authorName; else translation+=origTrans+","+authorName; } } - else if(msg.find("_: EMAIL OF TRANSLATORS\\n")==0) + else if(msg.tqfind("_: EMAIL OF TRANSLATORS\\n")==0) { // skip, if email is not specified in settings if( catalog->identitySettings().authorEmail.isEmpty() ) continue; - if( !TQStringList::split(',', origTrans).contains(catalog->identitySettings().authorEmail) ) + if( !TQStringList::split(',', origTrans).tqcontains(catalog->identitySettings().authorEmail) ) { if(origTrans.isEmpty() ) translation=catalog->identitySettings().authorEmail; else translation=origTrans+","+catalog->identitySettings().authorEmail; } } - else if (msg.find("ROLES_OF_TRANSLATORS") == 0) + else if (msg.tqfind("ROLES_OF_TRANSLATORS") == 0) { TQString temp = "<othercredit role=\\\"translator\\\">\n<firstname></firstname>" "<surname></surname>\n<affiliation><address><email>" + @@ -327,10 +327,10 @@ void RoughTransDlg::translate() "</affiliation><contrib></contrib></othercredit>"; if (origTrans.isEmpty( )) translation = temp; - else if (origTrans.find(catalog->identitySettings( ).authorEmail) < 0) + else if (origTrans.tqfind(catalog->identitySettings( ).authorEmail) < 0) translation = origTrans + "\n" + temp; } - else if (msg.find("CREDIT_FOR_TRANSLATORS") == 0) + else if (msg.tqfind("CREDIT_FOR_TRANSLATORS") == 0) { TQString authorName; if (!catalog->identitySettings( ).authorLocalizedName.isEmpty( )) @@ -341,8 +341,8 @@ void RoughTransDlg::translate() catalog->identitySettings( ).authorEmail + "</email></para>"; if (origTrans.isEmpty( )) translation = temp; - else if (origTrans.find(authorName) < 0 && - origTrans.find(catalog->identitySettings( ).authorEmail) < 0) + else if (origTrans.tqfind(authorName) < 0 && + origTrans.tqfind(catalog->identitySettings( ).authorEmail) < 0) translation = origTrans + "\n" + temp; } } @@ -350,8 +350,8 @@ void RoughTransDlg::translate() else // not kdeSpecific { // skip KDE specific texts - if( msg.find("_: EMAIL OF TRANSLATORS\\n")==0 || msg.find("_: NAME OF TRANSLATORS\\n")==0 || - msg.find("ROLES_OF_TRANSLATORS")==0 || msg.find("CREDIT_FOR_TRANSLATORS")==0) + if( msg.tqfind("_: EMAIL OF TRANSLATORS\\n")==0 || msg.tqfind("_: NAME OF TRANSLATORS\\n")==0 || + msg.tqfind("ROLES_OF_TRANSLATORS")==0 || msg.tqfind("CREDIT_FOR_TRANSLATORS")==0) continue; } @@ -364,9 +364,9 @@ void RoughTransDlg::translate() totalTried++; - if(msg.contains(contextReg)) + if(msg.tqcontains(contextReg)) { - msg.replace(contextReg,""); + msg.tqreplace(contextReg,""); } // try exact translation @@ -442,7 +442,7 @@ void RoughTransDlg::translate() TQStringList wordList; TQChar accel; TQString endingPunctuation; - int pos = msg.findRev(endPunctReg); + int pos = msg.tqfindRev(endPunctReg); if(pos >= 0) { endingPunctuation = msg.right(msg.length()-pos); @@ -475,18 +475,18 @@ void RoughTransDlg::translate() } else if(!word.isEmpty() ) { - if(!word.contains(digitReg)) + if(!word.tqcontains(digitReg)) wordList.append(word); - word=TQString::null; + word=TQString(); } } else if(!word.isEmpty()) { - if(!word.contains(digitReg)) + if(!word.tqcontains(digitReg)) wordList.append(word); - word=TQString::null; + word=TQString(); } } @@ -500,37 +500,37 @@ void RoughTransDlg::translate() { if(msg[index+1]=='n' && msg[index+2].isSpace()) { - if(!word.isEmpty() && !word.contains(digitReg)) + if(!word.isEmpty() && !word.tqcontains(digitReg)) wordList.append(word); - word=TQString::null; + word=TQString(); wordList.append("\\n\n"); index+=2; } else if(!word.isEmpty() ) { - if(!word.contains(digitReg)) + if(!word.tqcontains(digitReg)) wordList.append(word); - word=TQString::null; + word=TQString(); } } else if(!word.isEmpty()) { - if(!word.contains(digitReg)) + if(!word.tqcontains(digitReg)) wordList.append(word); - word=TQString::null; + word=TQString(); } } else if(!word.isEmpty()) { - if(!word.contains(digitReg)) { + if(!word.tqcontains(digitReg)) { wordList.append(word); } - word=TQString::null; + word=TQString(); } } @@ -571,7 +571,7 @@ void RoughTransDlg::translate() } if(wordCounter==0) - translation=TQString::null; + translation=TQString(); ++dit; } @@ -582,7 +582,7 @@ void RoughTransDlg::translate() // try to set the correct keyboard accelerator if(!accel.isNull()) { - int index = translation.find(accel,0,false); + int index = translation.tqfind(accel,0,false); if(index >= 0) { translation.insert(index,accelMarker); @@ -673,13 +673,13 @@ void RoughTransDlg::showStatistics() "Exact translations: %2 (%3%)\n" "Approximate translations: %4 (%5%)\n" "Nothing found: %6 (%7%)") - .arg( locale->formatNumber(totalTried,0) ) - .arg( locale->formatNumber(exactTransCounter,0) ) - .arg( locale->formatNumber( ((double)(10000*exactTransCounter/QMAX(totalTried,1)))/100) ) - .arg( locale->formatNumber(partTransCounter,0) ) - .arg( locale->formatNumber(((double)(10000*partTransCounter/QMAX(totalTried,1)))/100) ) - .arg( locale->formatNumber(nothing,0) ) - .arg( locale->formatNumber(((double)(10000*nothing/QMAX(totalTried,1)))/100) ); + .tqarg( locale->formatNumber(totalTried,0) ) + .tqarg( locale->formatNumber(exactTransCounter,0) ) + .tqarg( locale->formatNumber( ((double)(10000*exactTransCounter/TQMAX(totalTried,1)))/100) ) + .tqarg( locale->formatNumber(partTransCounter,0) ) + .tqarg( locale->formatNumber(((double)(10000*partTransCounter/TQMAX(totalTried,1)))/100) ) + .tqarg( locale->formatNumber(nothing,0) ) + .tqarg( locale->formatNumber(((double)(10000*nothing/TQMAX(totalTried,1)))/100) ); KMessageBox::information(this, statMsg , i18n("Rough Translation Statistics")); @@ -717,7 +717,7 @@ void RoughTransDlg::msgButtonClicked(int id) if(!transButton->isChecked() && !untransButton->isChecked() && !fuzzyButton->isChecked()) { - TQButton *button = whatBox->find(id); + TQButton *button = whatBox->tqfind(id); if(button == transButton) { transButton->setChecked(true); @@ -748,7 +748,7 @@ void RoughTransDlg::fuzzyButtonToggled(bool on) "check the results carefully. Deactivate this option only if " "you know what you are doing.</p></qt>"); - KMessageBox::information(this, msg, TQString::null,"MarkFuzzyWarningInRoughTransDlg"); + KMessageBox::information(this, msg, TQString(),"MarkFuzzyWarningInRoughTransDlg"); } } diff --git a/kbabel/commonui/roughtransdlg.h b/kbabel/commonui/roughtransdlg.h index aa33a66f..ec7dc609 100644 --- a/kbabel/commonui/roughtransdlg.h +++ b/kbabel/commonui/roughtransdlg.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -53,9 +53,10 @@ class TQVBox; class KDE_EXPORT RoughTransDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - RoughTransDlg(KBabelDictBox* dictBox, KBabel::Catalog* catalog, TQWidget *parent + RoughTransDlg(KBabelDictBox* dictBox, KBabel::Catalog* catalog, TQWidget *tqparent , const char *name=0); ~RoughTransDlg(); diff --git a/kbabel/commonui/toolaction.cpp b/kbabel/commonui/toolaction.cpp index 20dac847..ebb52bb4 100644 --- a/kbabel/commonui/toolaction.cpp +++ b/kbabel/commonui/toolaction.cpp @@ -18,11 +18,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -34,8 +34,8 @@ #include <kdebug.h> ToolAction::ToolAction( const TQString & text, const KShortcut& cut, const KDataToolInfo & info, const TQString & command, - TQObject * parent, const char * name ) - : KAction( text, info.iconName() == "unknown" ? TQString::null : info.iconName(), cut, parent, name ), + TQObject * tqparent, const char * name ) + : KAction( text, info.iconName() == "unknown" ? TQString() : info.iconName(), cut, tqparent, name ), m_command( command ), m_info( info ) { @@ -46,7 +46,7 @@ void ToolAction::slotActivated() emit toolActivated( m_info, m_command ); } -TQPtrList<KAction> ToolAction::dataToolActionList( const TQValueList<KDataToolInfo> & tools, const TQObject *receiver, const char* slot, const TQStringList& command, bool excludeCommand, KActionCollection* parent, const TQString& namePrefix ) +TQPtrList<KAction> ToolAction::dataToolActionList( const TQValueList<KDataToolInfo> & tools, const TQObject *receiver, const char* slot, const TQStringList& command, bool excludeCommand, KActionCollection* tqparent, const TQString& namePrefix ) { TQPtrList<KAction> actionList; if ( tools.isEmpty() ) @@ -69,12 +69,12 @@ TQPtrList<KAction> ToolAction::dataToolActionList( const TQValueList<KDataToolIn TQStringList::ConstIterator sit = shortcuts.begin(); for (; uit != userCommands.end() && cit != commands.end(); ++uit, ++cit) { - if( !excludeCommand == command.contains(*cit) ) + if( !excludeCommand == command.tqcontains(*cit) ) { TQString sc=*sit; - ToolAction * action = new ToolAction( *uit, (sc.isEmpty()?TQString::null:sc), *entry, *cit - , parent + ToolAction * action = new ToolAction( *uit, (sc.isEmpty()?TQString():sc), *entry, *cit + , tqparent , TQString(namePrefix+(*entry).service()->library()+"_"+(*cit)).utf8() ); connect( action, TQT_SIGNAL( toolActivated( const KDataToolInfo &, const TQString & ) ), receiver, slot ); @@ -96,7 +96,7 @@ TQValueList<KDataToolInfo> ToolAction::validationTools() for( TQValueList<KDataToolInfo>::ConstIterator entry = tools.begin(); entry != tools.end(); ++entry ) { - if( (*entry).commands().contains("validate") ) + if( (*entry).commands().tqcontains("validate") ) { result.append( *entry ); } diff --git a/kbabel/commonui/toolaction.h b/kbabel/commonui/toolaction.h index 7159aaf2..064b8981 100644 --- a/kbabel/commonui/toolaction.h +++ b/kbabel/commonui/toolaction.h @@ -18,11 +18,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -42,15 +42,16 @@ class KActionCollection; class KDE_EXPORT ToolAction : public KAction { Q_OBJECT + TQ_OBJECT public: - ToolAction( const TQString & text, const KShortcut& cut, const KDataToolInfo & info, const TQString & command, TQObject * parent = 0, const char * name = 0); + ToolAction( const TQString & text, const KShortcut& cut, const KDataToolInfo & info, const TQString & command, TQObject * tqparent = 0, const char * name = 0); /** * return the list of KActions created for a list of tools. @ref command * allows to specify rescriction of commands, for which the list should * or shouldn't be created according to the @ref excludeCommand flag. */ - static TQPtrList<KAction> dataToolActionList( const TQValueList<KDataToolInfo> & tools, const TQObject *receiver, const char* slot, const TQStringList& command, bool excludeCommand, KActionCollection* parent=0, const TQString& namePrefix=TQString::null ); + static TQPtrList<KAction> dataToolActionList( const TQValueList<KDataToolInfo> & tools, const TQObject *receiver, const char* slot, const TQStringList& command, bool excludeCommand, KActionCollection* tqparent=0, const TQString& namePrefix=TQString() ); /** * returns information about all available validation tools (KDataTools with support for CatalogItem diff --git a/kbabel/commonui/toolselectionwidget.cpp b/kbabel/commonui/toolselectionwidget.cpp index 1e97f473..4fadd865 100644 --- a/kbabel/commonui/toolselectionwidget.cpp +++ b/kbabel/commonui/toolselectionwidget.cpp @@ -18,11 +18,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -36,8 +36,8 @@ #include <tqlistbox.h> -ToolSelectionWidget::ToolSelectionWidget( TQWidget * parent, const char * name ) - : KActionSelector( parent, name ) +ToolSelectionWidget::ToolSelectionWidget( TQWidget * tqparent, const char * name ) + : KActionSelector( tqparent, name ) { } @@ -63,7 +63,7 @@ void ToolSelectionWidget::loadTools( const TQStringList &commands, TQStringList::ConstIterator cit = toolCommands.begin(); for (; uit != userCommands.end() && cit != toolCommands.end(); ++uit, ++cit ) { - if( commands.contains(*cit) ) + if( commands.tqcontains(*cit) ) { availableListBox()->insertItem( *uit ); } @@ -79,7 +79,7 @@ void ToolSelectionWidget::setSelectedTools( const TQStringList& tools ) for( ; entry != _allTools.end(); ++entry ) { TQString uic=*(*entry).userCommands().at((*entry).commands().findIndex("validate")); - if( tools.contains((*entry).service()->library()) ) + if( tools.tqcontains((*entry).service()->library()) ) selectedListBox()->insertItem( uic ); else availableListBox()->insertItem( uic ); @@ -96,7 +96,7 @@ TQStringList ToolSelectionWidget::selectedTools() TQValueList<KDataToolInfo>::ConstIterator entry = _allTools.begin(); for( ; entry != _allTools.end(); ++entry ) { - if( usedNames.contains(*((*entry).userCommands().at((*entry).commands().findIndex("validate")))) ) + if( usedNames.tqcontains(*((*entry).userCommands().at((*entry).commands().findIndex("validate")))) ) result += (*entry).service()->library(); } return result; diff --git a/kbabel/commonui/toolselectionwidget.h b/kbabel/commonui/toolselectionwidget.h index bbc08ca0..a019b823 100644 --- a/kbabel/commonui/toolselectionwidget.h +++ b/kbabel/commonui/toolselectionwidget.h @@ -18,11 +18,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -40,8 +40,9 @@ class KDataToolInfo; class KDE_EXPORT ToolSelectionWidget : public KActionSelector { Q_OBJECT + TQ_OBJECT public: - ToolSelectionWidget(TQWidget* parent=0, const char* name=0 ); + ToolSelectionWidget(TQWidget* tqparent=0, const char* name=0 ); TQStringList selectedTools(); diff --git a/kbabel/datatools/accelerators/main.cc b/kbabel/datatools/accelerators/main.cc index 632eb7b5..b082c635 100644 --- a/kbabel/datatools/accelerators/main.cc +++ b/kbabel/datatools/accelerators/main.cc @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -51,8 +51,8 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_accelstool, KGenericFactory<AcceleratorTool> using namespace KBabel; -AcceleratorTool::AcceleratorTool( TQObject* parent, const char* name, const TQStringList & ) - : KDataTool( parent, name ), _cache_origin( 0 ) +AcceleratorTool::AcceleratorTool( TQObject* tqparent, const char* name, const TQStringList & ) + : KDataTool( tqparent, name ), _cache_origin( 0 ) { // bogus translation just for allowing the translation i18n("what check found errors","accelerator"); @@ -97,8 +97,8 @@ bool AcceleratorTool::run( const TQString& command, void* data, const TQString& { // FIXME: this should care about plural forms in msgid TQString lineid=item->msgid().first(); - lineid.replace( _context, ""); - lineid.replace(TQRegExp("\\n"),""); + lineid.tqreplace( _context, ""); + lineid.tqreplace(TQRegExp("\\n"),""); lineid.simplifyWhiteSpace(); TQString regStr(_marker); regStr+="[^\\s]"; @@ -110,12 +110,12 @@ bool AcceleratorTool::run( const TQString& command, void* data, const TQString& TQString linestr=(*form); linestr.simplifyWhiteSpace(); - int n = lineid.contains(reg); + int n = lineid.tqcontains(reg); if( _marker == '&' ) - n = n - lineid.contains(TQRegExp("(&[a-z,A-Z,\\-,0-9,#]*;)|(&&(?!&+))")); - int m = linestr.contains(reg); + n = n - lineid.tqcontains(TQRegExp("(&[a-z,A-Z,\\-,0-9,#]*;)|(&&(?!&+))")); + int m = linestr.tqcontains(reg); if( _marker == '&' ) - m = m - linestr.contains(TQRegExp("(&[a-z,A-Z,\\-,0-9,#]*;)|(&&(?!&+))")); + m = m - linestr.tqcontains(TQRegExp("(&[a-z,A-Z,\\-,0-9,#]*;)|(&&(?!&+))")); hasError = hasError || ( n<=1 && m != n); } } diff --git a/kbabel/datatools/accelerators/main.h b/kbabel/datatools/accelerators/main.h index ee9ae3a8..df1617cf 100644 --- a/kbabel/datatools/accelerators/main.h +++ b/kbabel/datatools/accelerators/main.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -42,9 +42,10 @@ class AcceleratorTool : public KDataTool { Q_OBJECT + TQ_OBJECT public: - AcceleratorTool( TQObject* parent, const char* name, const TQStringList & ); + AcceleratorTool( TQObject* tqparent, const char* name, const TQStringList & ); virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype); private: diff --git a/kbabel/datatools/arguments/main.cc b/kbabel/datatools/arguments/main.cc index e80c7c35..4b533061 100644 --- a/kbabel/datatools/arguments/main.cc +++ b/kbabel/datatools/arguments/main.cc @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -51,8 +51,8 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_argstool, KGenericFactory<ArgumentTool> ( "kb using namespace KBabel; -ArgumentTool::ArgumentTool( TQObject* parent, const char* name, const TQStringList & ) - : KDataTool( parent, name ), _cache_origin( 0 ) +ArgumentTool::ArgumentTool( TQObject* tqparent, const char* name, const TQStringList & ) + : KDataTool( tqparent, name ), _cache_origin( 0 ) { i18n( "what check found errors","arguments"); } @@ -110,46 +110,46 @@ bool ArgumentTool::run( const TQString& command, void* data, const TQString& dat if( line.startsWith("_n:" )) { // truncate text after first \n to get args only once - line = line.mid(0,line.find("\\n")); + line = line.mid(0,line.tqfind("\\n")); } } - line.replace(_context, ""); - line.replace(TQRegExp("\\n"),""); + line.tqreplace(_context, ""); + line.tqreplace(TQRegExp("\\n"),""); line.simplifyWhiteSpace(); // flag, for GNU only we can allow reordering bool non_gnu = (item->pluralForm() == KDESpecific); - int index=line.find(TQRegExp("%.")); + int index=line.tqfind(TQRegExp("%.")); while(index>=0) { - int endIndex=line.find(TQRegExp("[^\\d]"),index+1); + int endIndex=line.tqfind(TQRegExp("[^\\d]"),index+1); if(endIndex<0) { endIndex=line.length(); } - else if( formatChars.contains(line[endIndex]) ) + else if( formatChars.tqcontains(line[endIndex]) ) { endIndex++; } if(endIndex - index > 1 ) { TQString arg = line.mid(index,endIndex-index); - if( arg.contains( TQRegExp("\\d") ) ) { + if( arg.tqcontains( TQRegExp("\\d") ) ) { non_gnu = true; } argList.append(arg); } - index=line.find(TQRegExp("%."),endIndex); + index=line.tqfind(TQRegExp("%."),endIndex); } if( item->pluralForm()==KDESpecific) { // FIXME: this is KDE specific - if( _checkPlurals && line.startsWith("_n:" ) && !argList.contains("%n") ) + if( _checkPlurals && line.startsWith("_n:" ) && !argList.tqcontains("%n") ) { argList.append("%n"); } @@ -180,7 +180,7 @@ bool ArgumentTool::run( const TQString& command, void* data, const TQString& dat line=(*i); - line.replace(TQRegExp("\\n"),""); + line.tqreplace(TQRegExp("\\n"),""); TQRegExp argdesc( "%((["+formatChars+"])" @@ -196,7 +196,7 @@ bool ArgumentTool::run( const TQString& command, void* data, const TQString& dat if( index == -1 ) break; // do not add a redundant argument, if it is non GNU - if( !non_gnu || !foundArgs.contains( argdesc.cap(0) ) ) + if( !non_gnu || !foundArgs.tqcontains( argdesc.cap(0) ) ) foundArgs.append( argdesc.cap( 0 ) ); } while( true ); @@ -205,7 +205,7 @@ bool ArgumentTool::run( const TQString& command, void* data, const TQString& dat if( non_gnu ) { for ( TQStringList::Iterator it = foundArgs.begin(); it != foundArgs.end(); ++it ) { - if( argList.find( *it ) == argList.end() ) { + if( argList.tqfind( *it ) == argList.end() ) { hasError = true; break; } else { @@ -224,10 +224,10 @@ bool ArgumentTool::run( const TQString& command, void* data, const TQString& dat for ( TQStringList::Iterator it = foundArgs.begin(); it != foundArgs.end(); ++it , ++oit) { if( *it == *oit ) { // argument is the same, mark as used - *oit = TQString::null; + *oit = TQString(); } else { // try to strip replacement - int index = (*it).find( '$' ); + int index = (*it).tqfind( '$' ); if( index == -1 ) { // there is no replacement, this is wrong hasError = true; @@ -239,7 +239,7 @@ bool ArgumentTool::run( const TQString& command, void* data, const TQString& dat TQStringList::Iterator a = argList.at( place.toInt()-1 ); if( a != argList.end() && (*a) == arg ) { - (*a) = TQString::null; + (*a) = TQString(); } else { diff --git a/kbabel/datatools/arguments/main.h b/kbabel/datatools/arguments/main.h index ea7e4e23..1831ea33 100644 --- a/kbabel/datatools/arguments/main.h +++ b/kbabel/datatools/arguments/main.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -42,9 +42,10 @@ class ArgumentTool : public KDataTool { Q_OBJECT + TQ_OBJECT public: - ArgumentTool( TQObject* parent, const char* name, const TQStringList & ); + ArgumentTool( TQObject* tqparent, const char* name, const TQStringList & ); virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype); private: KBabel::Project::Ptr _cache_origin; diff --git a/kbabel/datatools/context/main.cc b/kbabel/datatools/context/main.cc index 066ef430..ed89f125 100644 --- a/kbabel/datatools/context/main.cc +++ b/kbabel/datatools/context/main.cc @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -52,8 +52,8 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_contexttool, KGenericFactory<ContextTool> ( " using namespace KBabel; -ContextTool::ContextTool( TQObject* parent, const char* name, const TQStringList & ) - : KDataTool( parent, name ), _cache_origin( 0 ) +ContextTool::ContextTool( TQObject* tqparent, const char* name, const TQStringList & ) + : KDataTool( tqparent, name ), _cache_origin( 0 ) { i18n("what check found errors","context info"); } @@ -92,8 +92,8 @@ bool ContextTool::run( const TQString& command, void* data, const TQString& data bool hasError = false; - if(!item->isUntranslated() && item->msgid().first().contains(_context) - && item->msgstr().first().contains(_context) ) + if(!item->isUntranslated() && item->msgid().first().tqcontains(_context) + && item->msgstr().first().tqcontains(_context) ) { hasError = true; } diff --git a/kbabel/datatools/context/main.h b/kbabel/datatools/context/main.h index 8dc24e9f..c85d8d83 100644 --- a/kbabel/datatools/context/main.h +++ b/kbabel/datatools/context/main.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -40,9 +40,10 @@ class ContextTool : public KDataTool { Q_OBJECT + TQ_OBJECT public: - ContextTool( TQObject* parent, const char* name, const TQStringList & ); + ContextTool( TQObject* tqparent, const char* name, const TQStringList & ); virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype); private: KBabel::Project::Ptr _cache_origin; diff --git a/kbabel/datatools/equations/main.cc b/kbabel/datatools/equations/main.cc index 64d19adf..96cb3057 100644 --- a/kbabel/datatools/equations/main.cc +++ b/kbabel/datatools/equations/main.cc @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -52,8 +52,8 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_equationstool, KGenericFactory<EquationsTool> using namespace KBabel; -EquationsTool::EquationsTool( TQObject* parent, const char* name, const TQStringList & ) - : KDataTool( parent, name ), _equation("^[a-zA-Z0-9]+=.+") +EquationsTool::EquationsTool( TQObject* tqparent, const char* name, const TQStringList & ) + : KDataTool( tqparent, name ), _equation("^[a-zA-Z0-9]+=.+") { i18n("what check found errors","equations"); } @@ -86,12 +86,12 @@ bool EquationsTool::run( const TQString& command, void* data, const TQString& da bool hasError = false; - if(!item->isUntranslated() && !item->msgid().first().contains('\n') - && item->msgid().first().contains(_equation)) + if(!item->isUntranslated() && !item->msgid().first().tqcontains('\n') + && item->msgid().first().tqcontains(_equation)) { - int index = item->msgid().first().find('='); + int index = item->msgid().first().tqfind('='); TQString left = item->msgid().first().left(index); - index = item->msgstr().first().find('='); + index = item->msgstr().first().tqfind('='); if(left != item->msgstr().first().left(index)) hasError = true; } diff --git a/kbabel/datatools/equations/main.h b/kbabel/datatools/equations/main.h index 72fae529..11adddaf 100644 --- a/kbabel/datatools/equations/main.h +++ b/kbabel/datatools/equations/main.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -39,9 +39,10 @@ class EquationsTool : public KDataTool { Q_OBJECT + TQ_OBJECT public: - EquationsTool( TQObject* parent, const char* name, const TQStringList & ); + EquationsTool( TQObject* tqparent, const char* name, const TQStringList & ); virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype); private: TQRegExp _equation; diff --git a/kbabel/datatools/length/main.cc b/kbabel/datatools/length/main.cc index 5b2bc411..2851429e 100644 --- a/kbabel/datatools/length/main.cc +++ b/kbabel/datatools/length/main.cc @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -55,8 +55,8 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_lengthtool, KGenericFactory<LengthTool> ( "kb using namespace KBabel; -LengthTool::LengthTool( TQObject* parent, const char* name, const TQStringList & ) - : KDataTool( parent, name ), _cache_origin( 0 ) +LengthTool::LengthTool( TQObject* tqparent, const char* name, const TQStringList & ) + : KDataTool( tqparent, name ), _cache_origin( 0 ) { i18n("which check found errors","translation has inconsistent length"); } @@ -104,7 +104,7 @@ bool LengthTool::run( const TQString& command, void* data, const TQString& datat if( item->pluralForm() == KDESpecific ) { str = TQStringList::split( "\\n", item->msgstr().first(), true ); id = TQStringList::split( "\\n", - item->msgid().first().replace( TQRegExp(_plurals), ""), true ); + item->msgid().first().tqreplace( TQRegExp(_plurals), ""), true ); } else { str = item->msgstr(); id = item->msgid(); @@ -113,12 +113,12 @@ bool LengthTool::run( const TQString& command, void* data, const TQString& datat //Check for translations that are too short or too long //This may not be totally correct but we check both //the singular and plural forms against each translated plural. - //FIXME: replace 10% check with configurable setting or a statistical + //FIXME: tqreplace 10% check with configurable setting or a statistical //based expected length relationship int idlen, strlen; for( TQStringList::Iterator i = id.begin() ; i != id.end() ; i++ ) { TQString iditem = (*i); - idlen = iditem.replace( TQRegExp(_context),"").length(); + idlen = iditem.tqreplace( TQRegExp(_context),"").length(); for( TQStringList::Iterator j = str.begin() ; j != str.end() ; j++ ) { TQString stritem = (*j); strlen = stritem.length(); diff --git a/kbabel/datatools/length/main.h b/kbabel/datatools/length/main.h index 6a4ec06f..cff49df8 100644 --- a/kbabel/datatools/length/main.h +++ b/kbabel/datatools/length/main.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -41,9 +41,10 @@ class LengthTool : public KDataTool { Q_OBJECT + TQ_OBJECT public: - LengthTool( TQObject* parent, const char* name, const TQStringList & ); + LengthTool( TQObject* tqparent, const char* name, const TQStringList & ); virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype); private: KBabel::Project::Ptr _cache_origin; diff --git a/kbabel/datatools/not-translated/main.cc b/kbabel/datatools/not-translated/main.cc index 22e23c84..3082c552 100644 --- a/kbabel/datatools/not-translated/main.cc +++ b/kbabel/datatools/not-translated/main.cc @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -54,8 +54,8 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_nottranslatedtool, KGenericFactory<NotTransla using namespace KBabel; -NotTranslatedTool::NotTranslatedTool( TQObject* parent, const char* name, const TQStringList & ) - : KDataTool( parent, name ) , _cache_origin( 0 ) +NotTranslatedTool::NotTranslatedTool( TQObject* tqparent, const char* name, const TQStringList & ) + : KDataTool( tqparent, name ) , _cache_origin( 0 ) { i18n("which check found errors","English text in translation"); } @@ -101,13 +101,13 @@ bool NotTranslatedTool::run( const TQString& command, void* data, const TQString if( item->pluralForm() == KDESpecific ) { str = TQStringList::split( "\\n", item->msgstr().first(), true ); id = TQStringList::split( "\\n", - item->msgid().first().replace( TQRegExp(_plurals), ""), true ); + item->msgid().first().tqreplace( TQRegExp(_plurals), ""), true ); } else { str = item->msgstr(); id = item->msgid(); } for( TQStringList::Iterator i = id.begin() ; i != id.end() ; i++ ) { - TQString id_str = (*i).replace( TQRegExp(_context), ""); + TQString id_str = (*i).tqreplace( TQRegExp(_context), ""); for( TQStringList::Iterator j = str.begin() ; j != str.end() ; j++ ) { TQString str_str = (*j); hasError = hasError || ( id_str == str_str ); diff --git a/kbabel/datatools/not-translated/main.h b/kbabel/datatools/not-translated/main.h index c1aeabd8..a9cba848 100644 --- a/kbabel/datatools/not-translated/main.h +++ b/kbabel/datatools/not-translated/main.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -41,9 +41,10 @@ class NotTranslatedTool : public KDataTool { Q_OBJECT + TQ_OBJECT public: - NotTranslatedTool( TQObject* parent, const char* name, const TQStringList & ); + NotTranslatedTool( TQObject* tqparent, const char* name, const TQStringList & ); virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype); private: diff --git a/kbabel/datatools/pluralforms/main.cc b/kbabel/datatools/pluralforms/main.cc index 87dfef71..9005b4ce 100644 --- a/kbabel/datatools/pluralforms/main.cc +++ b/kbabel/datatools/pluralforms/main.cc @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -53,8 +53,8 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_pluraltool, KGenericFactory<PluralsTool> ( "k using namespace KBabel; -PluralsTool::PluralsTool( TQObject* parent, const char* name, const TQStringList & ) - : KDataTool( parent, name ), _cache_origin( 0 ), _neededForms(-1) +PluralsTool::PluralsTool( TQObject* tqparent, const char* name, const TQStringList & ) + : KDataTool( tqparent, name ), _cache_origin( 0 ), _neededForms(-1) { i18n("what check found errors", "plural forms"); } @@ -102,11 +102,11 @@ bool PluralsTool::run( const TQString& command, void* data, const TQString& data if(!item->isUntranslated() && item->pluralForm() == KDESpecific ) { - if(_neededForms <= 0 || item->msgstr().first().contains(_plurals)) + if(_neededForms <= 0 || item->msgstr().first().tqcontains(_plurals)) { hasError = true; } - else if( item->msgstr().first().contains(TQString("\\n"))+1 != _neededForms ) + else if( item->msgstr().first().tqcontains(TQString("\\n"))+1 != _neededForms ) { hasError = true; } diff --git a/kbabel/datatools/pluralforms/main.h b/kbabel/datatools/pluralforms/main.h index 420824d2..ee6617dd 100644 --- a/kbabel/datatools/pluralforms/main.h +++ b/kbabel/datatools/pluralforms/main.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -40,9 +40,10 @@ class PluralsTool : public KDataTool { Q_OBJECT + TQ_OBJECT public: - PluralsTool( TQObject* parent, const char* name, const TQStringList & ); + PluralsTool( TQObject* tqparent, const char* name, const TQStringList & ); virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype); private: KBabel::Project::Ptr _cache_origin; diff --git a/kbabel/datatools/punctuation/main.cc b/kbabel/datatools/punctuation/main.cc index 8806b536..42b2f2eb 100644 --- a/kbabel/datatools/punctuation/main.cc +++ b/kbabel/datatools/punctuation/main.cc @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -51,8 +51,8 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_punctuationtool, KGenericFactory<PunctuationT using namespace KBabel; -PunctuationTool::PunctuationTool( TQObject* parent, const char* name, const TQStringList & ) - : KDataTool( parent, name ) +PunctuationTool::PunctuationTool( TQObject* tqparent, const char* name, const TQStringList & ) + : KDataTool( tqparent, name ) { // bogus translation just for allowing the translation i18n("what check found errors","punctuation"); @@ -92,7 +92,7 @@ bool PunctuationTool::run( const TQString& command, void* data, const TQString& // lookup punctuation in original text TQRegExp punc("[\\.!\\?:]+$"); - int i = lineid.find(punc); + int i = lineid.tqfind(punc); TQString t(""); @@ -102,7 +102,7 @@ bool PunctuationTool::run( const TQString& command, void* data, const TQString& { // check, that both plural forms contain the same punctuation TQString pl = *(item->msgid().at(1)); - int j = pl.find(punc); + int j = pl.tqfind(punc); TQString tp(""); if( j != -1 ) tp = pl.right(pl.length()-j); @@ -122,7 +122,7 @@ bool PunctuationTool::run( const TQString& command, void* data, const TQString& { TQString linestr=(*form); - int j = linestr.find(punc); + int j = linestr.tqfind(punc); // there is no punctuation in original, but one in the translation if( i == -1 && j != i ) diff --git a/kbabel/datatools/punctuation/main.h b/kbabel/datatools/punctuation/main.h index eb30293f..6d58783e 100644 --- a/kbabel/datatools/punctuation/main.h +++ b/kbabel/datatools/punctuation/main.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -38,9 +38,10 @@ class PunctuationTool : public KDataTool { Q_OBJECT + TQ_OBJECT public: - PunctuationTool( TQObject* parent, const char* name, const TQStringList & ); + PunctuationTool( TQObject* tqparent, const char* name, const TQStringList & ); virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype); }; diff --git a/kbabel/datatools/regexp/main.cc b/kbabel/datatools/regexp/main.cc index eca0be81..132a8c21 100644 --- a/kbabel/datatools/regexp/main.cc +++ b/kbabel/datatools/regexp/main.cc @@ -49,13 +49,13 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_regexptool, KGenericFactory<RegExpTool> ( "kb using namespace KBabel; -RegExpTool::RegExpTool( TQObject* parent, const char* name, const TQStringList & ) - : KDataTool( parent, name ) +RegExpTool::RegExpTool( TQObject* tqparent, const char* name, const TQStringList & ) + : KDataTool( tqparent, name ) { i18n("which check found errors","translation has inconsistent length"); loadExpressions(); if ( ! _error.isNull() ) - KMessageBox::error( (TQWidget*)parent, i18n( "Error loading data (%1)" ).arg( _error ) ); + KMessageBox::error( (TQWidget*)tqparent, i18n( "Error loading data (%1)" ).tqarg( _error ) ); } bool RegExpTool::run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype ) diff --git a/kbabel/datatools/regexp/main.h b/kbabel/datatools/regexp/main.h index 64df538b..c28c37d0 100644 --- a/kbabel/datatools/regexp/main.h +++ b/kbabel/datatools/regexp/main.h @@ -57,9 +57,10 @@ typedef TQValueList<Expression> ExpressionList; class RegExpTool : public KDataTool { Q_OBJECT + TQ_OBJECT public: - RegExpTool( TQObject* parent, const char* name, const TQStringList & ); + RegExpTool( TQObject* tqparent, const char* name, const TQStringList & ); virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype); private: diff --git a/kbabel/datatools/setfuzzy/main.cc b/kbabel/datatools/setfuzzy/main.cc index 54bbcb57..192dc4f6 100644 --- a/kbabel/datatools/setfuzzy/main.cc +++ b/kbabel/datatools/setfuzzy/main.cc @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -49,8 +49,8 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_setfuzzytool, KGenericFactory<SetFuzzyTool> ( using namespace KBabel; -SetFuzzyTool::SetFuzzyTool( TQObject* parent, const char* name, const TQStringList & ) - : KDataTool( parent, name ) +SetFuzzyTool::SetFuzzyTool( TQObject* tqparent, const char* name, const TQStringList & ) + : KDataTool( tqparent, name ) { } diff --git a/kbabel/datatools/setfuzzy/main.h b/kbabel/datatools/setfuzzy/main.h index 45e0bc38..729abd1a 100644 --- a/kbabel/datatools/setfuzzy/main.h +++ b/kbabel/datatools/setfuzzy/main.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -38,9 +38,10 @@ class SetFuzzyTool : public KDataTool { Q_OBJECT + TQ_OBJECT public: - SetFuzzyTool( TQObject* parent, const char* name, const TQStringList & ); + SetFuzzyTool( TQObject* tqparent, const char* name, const TQStringList & ); virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype); }; diff --git a/kbabel/datatools/whitespace/main.cc b/kbabel/datatools/whitespace/main.cc index 7bfa50b2..3fdd0f47 100644 --- a/kbabel/datatools/whitespace/main.cc +++ b/kbabel/datatools/whitespace/main.cc @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -54,8 +54,8 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_whitespacetool, KGenericFactory<WhitespaceToo using namespace KBabel; -WhitespaceTool::WhitespaceTool( TQObject* parent, const char* name, const TQStringList & ) - : KDataTool( parent, name ), _cache_origin( 0 ), _equation("^[a-zA-Z0-9]+=") +WhitespaceTool::WhitespaceTool( TQObject* tqparent, const char* name, const TQStringList & ) + : KDataTool( tqparent, name ), _cache_origin( 0 ), _equation("^[a-zA-Z0-9]+=") { i18n("which check found errors","whitespace only translation"); } @@ -104,27 +104,27 @@ bool WhitespaceTool::run( const TQString& command, void* data, const TQString& d if( item->pluralForm() == KDESpecific ) { str = TQStringList::split( "\\n", item->msgstr().first(), true ); id = TQStringList::split( "\\n", - item->msgid().first().replace( TQRegExp(_plurals), ""), true ); + item->msgid().first().tqreplace( TQRegExp(_plurals), ""), true ); } else { str = item->msgstr(); id = item->msgid(); } //Strip equations - id.first().replace( TQRegExp(_equation), ""); - str.first().replace( TQRegExp(_equation), ""); + id.first().tqreplace( TQRegExp(_equation), ""); + str.first().tqreplace( TQRegExp(_equation), ""); //Ignore Messages with blank msgid components for( TQStringList::Iterator it = id.begin() ; it != id.end() ; it++ ) { TQString resultstring = (*it); - hasIdError = hasIdError || resultstring.contains(_whitespace); + hasIdError = hasIdError || resultstring.tqcontains(_whitespace); } if( hasIdError ) return true; //Check each TQString in the List is not whitespace for( TQStringList::Iterator it = str.begin() ; it != str.end() ; it++ ) { TQString resultstring = (*it); - hasStrError = hasStrError || resultstring.contains(_whitespace); + hasStrError = hasStrError || resultstring.tqcontains(_whitespace); } } diff --git a/kbabel/datatools/whitespace/main.h b/kbabel/datatools/whitespace/main.h index c8cd373a..9c6c4f24 100644 --- a/kbabel/datatools/whitespace/main.h +++ b/kbabel/datatools/whitespace/main.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -42,9 +42,10 @@ class WhitespaceTool : public KDataTool { Q_OBJECT + TQ_OBJECT public: - WhitespaceTool( TQObject* parent, const char* name, const TQStringList & ); + WhitespaceTool( TQObject* tqparent, const char* name, const TQStringList & ); virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype); private: KBabel::Project::Ptr _cache_origin; diff --git a/kbabel/datatools/xml/main.cc b/kbabel/datatools/xml/main.cc index 3bcf66da..57a6f785 100644 --- a/kbabel/datatools/xml/main.cc +++ b/kbabel/datatools/xml/main.cc @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -54,8 +54,8 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_xmltool, KGenericFactory<XMLTool> ( "kbabelda using namespace KBabel; -XMLTool::XMLTool( TQObject* parent, const char* name, const TQStringList & ) - : KDataTool( parent, name ), _cache_origin( 0 ) +XMLTool::XMLTool( TQObject* tqparent, const char* name, const TQStringList & ) + : KDataTool( tqparent, name ), _cache_origin( 0 ) { i18n( "what check found errors", "XML tags" ); } @@ -94,12 +94,12 @@ bool XMLTool::run( const TQString& command, void* data, const TQString& datatype uint correctnessLevel = 0; TQString msgid = item->msgid().first(); - msgid.replace( "\\\"", "\"" ); // Change '\"' to '"' - msgid.replace( TQRegExp( "&(?![a-zA-Z0-9]+;)" ), "&" ); - msgid.replace( _context, "" ); - msgid.replace("\n",""); // delete newlines + msgid.tqreplace( "\\\"", "\"" ); // Change '\"' to '"' + msgid.tqreplace( TQRegExp( "&(?![a-zA-Z0-9]+;)" ), "&" ); + msgid.tqreplace( _context, "" ); + msgid.tqreplace("\n",""); // delete newlines - if( _levelCache.contains(msgid) ) + if( _levelCache.tqcontains(msgid) ) { correctnessLevel = _levelCache[msgid]; } @@ -134,8 +134,8 @@ bool XMLTool::run( const TQString& command, void* data, const TQString& datatype for( TQStringList::Iterator form = str.begin() ; form != str.end() ; form++ ) { TQString text=(*form); - text.replace( "\\\"", "\"" ); // Change '\"' to '"' - text.replace( TQRegExp( "&(?![a-zA-Z0-9]+;)" ), "&" ); + text.tqreplace( "\\\"", "\"" ); // Change '\"' to '"' + text.tqreplace( TQRegExp( "&(?![a-zA-Z0-9]+;)" ), "&" ); // isNonCaseWithoutCommonCompliant can fail // even though higher level checks works @@ -189,16 +189,16 @@ bool XMLTool::isNonCaseWithoutCommonCompliant( const TQString& text) TQDomDocument doc; TQString test = text.lower(); TQRegExp rx( "(<br>)|(<hr>)|(<p>)||(<\\w+@(\\w+.)*\\w+>)" ); - test.replace( rx, "" ); + test.tqreplace( rx, "" ); TQString a; do { a = test; - test.replace( TQRegExp("<[^_:A-Za-z/]"), "" ); + test.tqreplace( TQRegExp("<[^_:A-Za-z/]"), "" ); } while( a!=test); - test.replace( TQRegExp("<$"), "" ); + test.tqreplace( TQRegExp("<$"), "" ); return doc.setContent("<para>" + test + "</para>" ); } diff --git a/kbabel/datatools/xml/main.h b/kbabel/datatools/xml/main.h index 68c06cdb..1b983475 100644 --- a/kbabel/datatools/xml/main.h +++ b/kbabel/datatools/xml/main.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -41,9 +41,10 @@ class XMLTool : public KDataTool { Q_OBJECT + TQ_OBJECT public: - XMLTool( TQObject* parent, const char* name, const TQStringList & ); + XMLTool( TQObject* tqparent, const char* name, const TQStringList & ); virtual bool run( const TQString& command, void* data, const TQString& datatype, const TQString& mimetype); private: bool isFullyCompliant( const TQString& text); diff --git a/kbabel/filters/gettext/gettextexport.cpp b/kbabel/filters/gettext/gettextexport.cpp index c2fe9c67..21db665e 100644 --- a/kbabel/filters/gettext/gettextexport.cpp +++ b/kbabel/filters/gettext/gettextexport.cpp @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -51,12 +51,12 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_gettextexport, KGenericFactory<GettextExportP using namespace KBabel; -GettextExportPlugin::GettextExportPlugin(TQObject* parent, const char* name, const TQStringList &) : - CatalogExportPlugin(parent,name), m_wrapWidth( -1 ) +GettextExportPlugin::GettextExportPlugin(TQObject* tqparent, const char* name, const TQStringList &) : + CatalogExportPlugin(tqparent,name), m_wrapWidth( -1 ) { } -ConversionStatus GettextExportPlugin::save(const TQString& localFile , const TQString& mimetype, const Catalog* catalog) +ConversiontqStatus GettextExportPlugin::save(const TQString& localFile , const TQString& mimetype, const Catalog* catalog) { // check, whether we know how to handle the extra data if( catalog->importPluginID() != "GNU gettext") @@ -70,7 +70,7 @@ ConversionStatus GettextExportPlugin::save(const TQString& localFile , const TQS if(file.open(IO_WriteOnly)) { - int progressRatio = QMAX(100/ QMAX(catalog->numberOfEntries(),1), 1); + int progressRatio = TQMAX(100/ TQMAX(catalog->numberOfEntries(),1), 1); emit signalResetProgressBar(i18n("saving file"),100); TQTextStream stream(&file); @@ -196,7 +196,7 @@ ConversionStatus GettextExportPlugin::save(const TQString& localFile , const TQS } else { - //emit signalError(i18n("Wasn't able to open file %1").arg(filename.ascii())); + //emit signalError(i18n("Wasn't able to open file %1").tqarg(filename.ascii())); return OS_ERROR; } @@ -211,7 +211,7 @@ void GettextExportPlugin::writeComment( TQTextStream& stream, const TQString& co int pos = 0; for(;;) { - const int newpos = comment.find( '\n', pos, false ); + const int newpos = comment.tqfind( '\n', pos, false ); if ( newpos == pos ) { ++pos; @@ -305,7 +305,7 @@ void GettextExportPlugin::writeKeyword( TQTextStream& stream, const TQString& ke realText.remove( '\n' ); bool needFirstEmptyLine = false; - if ( realText.find( "\\n" ) != -1 ) + if ( realText.tqfind( "\\n" ) != -1 ) { // We have more than one (logical) line, so write the extra empty line needFirstEmptyLine = true; @@ -340,7 +340,7 @@ void GettextExportPlugin::writeKeyword( TQTextStream& stream, const TQString& ke // Be sure that at least two useful characters are written, even if the wrap width is too small availableWidth = 2; } - const int newlinePos = realText.find ( "\\n", pos ); + const int newlinePos = realText.tqfind ( "\\n", pos ); if ( ( newlinePos >= 0 ) && ( newlinePos - pos + 2 < availableWidth ) ) { // The newline is near than the maximum available numbers of characters diff --git a/kbabel/filters/gettext/gettextexport.h b/kbabel/filters/gettext/gettextexport.h index 2d1b9681..cfe46ed0 100644 --- a/kbabel/filters/gettext/gettextexport.h +++ b/kbabel/filters/gettext/gettextexport.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -53,8 +53,8 @@ class TQTextCodec; class GettextExportPlugin: public KBabel::CatalogExportPlugin { public: - GettextExportPlugin(TQObject* parent, const char* name, const TQStringList &); - virtual KBabel::ConversionStatus save(const TQString& file, const TQString& mimetype, const KBabel::Catalog* catalog); + GettextExportPlugin(TQObject* tqparent, const char* name, const TQStringList &); + virtual KBabel::ConversiontqStatus save(const TQString& file, const TQString& mimetype, const KBabel::Catalog* catalog); private: /** diff --git a/kbabel/filters/gettext/gettextimport.cpp b/kbabel/filters/gettext/gettextimport.cpp index 9210c1a9..848cfeb1 100644 --- a/kbabel/filters/gettext/gettextimport.cpp +++ b/kbabel/filters/gettext/gettextimport.cpp @@ -1,4 +1,4 @@ -// kate: space-indent on; indent-width 3; replace-tabs on; +// kate: space-indent on; indent-width 3; tqreplace-tabs on; /* **************************************************************************** This file is part of KBabel @@ -23,11 +23,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -53,11 +53,11 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_gettextimport, KGenericFactory<GettextImportP using namespace KBabel; -GettextImportPlugin::GettextImportPlugin(TQObject* parent, const char* name, const TQStringList &) : CatalogImportPlugin(parent,name) +GettextImportPlugin::GettextImportPlugin(TQObject* tqparent, const char* name, const TQStringList &) : CatalogImportPlugin(tqparent,name) { } -ConversionStatus GettextImportPlugin::load(const TQString& filename, const TQString&) +ConversiontqStatus GettextImportPlugin::load(const TQString& filename, const TQString&) { kdDebug( KBABEL ) << k_funcinfo << endl; @@ -117,7 +117,7 @@ ConversionStatus GettextImportPlugin::load(const TQString& filename, const TQStr kdDebug(KBABEL) << "start parsing..." << endl; // first read header - const ConversionStatus status = readHeader(stream); + const ConversiontqStatus status = readHeader(stream); if ( status == RECOVERED_PARSE_ERROR ) @@ -163,7 +163,7 @@ ConversionStatus GettextImportPlugin::load(const TQString& filename, const TQStr } // check if header seems to indicate docbook content generated by xml2pot - const bool docbookContent = (tempHeader.msgstr().find("application/x-xml2pot") != tempHeader.msgstr().end()); + const bool docbookContent = (tempHeader.msgstr().tqfind("application/x-xml2pot") != tempHeader.msgstr().end()); // now parse the rest of the file uint counter=0; @@ -179,7 +179,7 @@ ConversionStatus GettextImportPlugin::load(const TQString& filename, const TQStr return STOPPED; } - const ConversionStatus success=readEntry(stream); + const ConversiontqStatus success=readEntry(stream); if(success==OK) { @@ -200,7 +200,7 @@ ConversionStatus GettextImportPlugin::load(const TQString& filename, const TQStr appendCatalogItem(tempCatItem); // check if first comment seems to indicate a docbook source file if(counter==0) - docbookFile = ( tempCatItem.comment().find(".docbook") != -1 ); + docbookFile = ( tempCatItem.comment().tqfind(".docbook") != -1 ); } } else if(success==RECOVERED_PARSE_ERROR) @@ -297,12 +297,12 @@ TQTextCodec* GettextImportPlugin::codecForArray(TQByteArray& array, bool* hadCod } TQTextStream stream( array, IO_ReadOnly ); - // ### TODO Qt4: see if it can be done with TQByteArray alone, in an encoding-neutral way. + // ### TODO TQt4: see if it can be done with TQByteArray alone, in an encoding-neutral way. // Set ISO-8859-1 as it is a relatively neutral encoding when reading (compared to UTF-8 or a random locale encoing) stream.setEncoding( TQTextStream::Latin1 ); // first read header - ConversionStatus status = readHeader(stream); + ConversiontqStatus status = readHeader(stream); if(status!=OK && status != RECOVERED_PARSE_ERROR) { kdDebug(KBABEL) << "wasn't able to read header" << endl; @@ -360,11 +360,11 @@ TQTextCodec* GettextImportPlugin::codecForArray(TQByteArray& array, bool* hadCod return codec; } -ConversionStatus GettextImportPlugin::readHeader(TQTextStream& stream) +ConversiontqStatus GettextImportPlugin::readHeader(TQTextStream& stream) { CatalogItem temp; int filePos=stream.device()->at(); - ConversionStatus status=readEntry(stream); + ConversiontqStatus status=readEntry(stream); if(status==OK || status==RECOVERED_PARSE_ERROR) { @@ -380,7 +380,7 @@ ConversionStatus GettextImportPlugin::readHeader(TQTextStream& stream) return PARSE_ERROR; } -ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) +ConversiontqStatus GettextImportPlugin::readEntry(TQTextStream& stream) { //kdDebug( KBABEL ) << k_funcinfo << " START" << endl; enum {Begin,Comment,Msgctxt,Msgid,Msgstr} part=Begin; @@ -408,7 +408,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) //kdDebug() << "Parsing line: " << line << endl; - // ### Qt4: no need of a such a check + // ### TQt4: no need of a such a check if(line.isNull()) // file end break; else if ( line.startsWith( "<<<<<<<" ) || line.startsWith( "=======" ) || line.startsWith( ">>>>>>>" ) ) @@ -439,7 +439,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) part=Comment; _comment=line; } - else if(line.find(TQRegExp("^msgctxt\\s*\".*\"$")) != -1) + else if(line.tqfind(TQRegExp("^msgctxt\\s*\".*\"$")) != -1) { part=Msgctxt; @@ -449,7 +449,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) _msgctxt=line; seenMsgctxt=true; } - else if(line.find(TQRegExp("^msgid\\s*\".*\"$")) != -1) + else if(line.tqfind(TQRegExp("^msgid\\s*\".*\"$")) != -1) { part=Msgid; @@ -460,7 +460,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) (*(_msgid).begin())=line; } // one of the quotation marks is missing - else if(line.find(TQRegExp("^msgid\\s*\"?.*\"?$")) != -1) + else if(line.tqfind(TQRegExp("^msgid\\s*\"?.*\"?$")) != -1) { part=Msgid; @@ -494,7 +494,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) { _comment+=("\n"+line); } - else if(line.find(TQRegExp("^msgctxt\\s*\".*\"$")) != -1) + else if(line.tqfind(TQRegExp("^msgctxt\\s*\".*\"$")) != -1) { part=Msgctxt; @@ -504,7 +504,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) _msgctxt=line; seenMsgctxt=true; } - else if(line.find(TQRegExp("^msgid\\s*\".*\"$")) != -1) + else if(line.tqfind(TQRegExp("^msgid\\s*\".*\"$")) != -1) { part=Msgid; @@ -515,7 +515,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) (*(_msgid).begin())=line; } // one of the quotation marks is missing - else if(line.find(TQRegExp("^msgid\\s*\"?.*\"?$")) != -1) + else if(line.tqfind(TQRegExp("^msgid\\s*\"?.*\"?$")) != -1) { part=Msgid; @@ -539,7 +539,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) { if(line.isEmpty()) continue; - else if(line.find(TQRegExp("^\".*\\n?\"$")) != -1) + else if(line.tqfind(TQRegExp("^\".*\\n?\"$")) != -1) { // remove quotes at beginning and the end of the lines line.remove(TQRegExp("^\"")); @@ -551,7 +551,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) else _msgctxt+=("\n"+line); } - else if(line.find(TQRegExp("^msgid\\s*\".*\"$")) != -1) + else if(line.tqfind(TQRegExp("^msgid\\s*\".*\"$")) != -1) { part=Msgid; @@ -562,7 +562,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) (*(_msgid).begin())=line; } // one of the quotation marks is missing - else if(line.find(TQRegExp("^msgid\\s*\"?.*\"?$")) != -1) + else if(line.tqfind(TQRegExp("^msgid\\s*\"?.*\"?$")) != -1) { part=Msgid; @@ -586,7 +586,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) { if(line.isEmpty()) continue; - else if(line.find(TQRegExp("^\".*\\n?\"$")) != -1) + else if(line.tqfind(TQRegExp("^\".*\\n?\"$")) != -1) { // remove quotes at beginning and the end of the lines line.remove(TQRegExp("^\"")); @@ -604,7 +604,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) else (*it)+=("\n"+line); } - else if(line.find(TQRegExp("^msgid_plural\\s*\".*\"$")) != -1) + else if(line.tqfind(TQRegExp("^msgid_plural\\s*\".*\"$")) != -1) { part=Msgid; _gettextPluralForm = true; @@ -616,7 +616,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) _msgid.append(line); } // one of the quotation marks is missing - else if(line.find(TQRegExp("^msgid_plural\\s*\"?.*\"?$")) != -1) + else if(line.tqfind(TQRegExp("^msgid_plural\\s*\"?.*\"?$")) != -1) { part=Msgid; _gettextPluralForm = true; @@ -631,7 +631,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) recoverableError=true; } else if(!_gettextPluralForm - && (line.find(TQRegExp("^msgstr\\s*\".*\\n?\"$")) != -1)) + && (line.tqfind(TQRegExp("^msgstr\\s*\".*\\n?\"$")) != -1)) { part=Msgstr; @@ -642,7 +642,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) (*msgstrIt)=line; } else if(!_gettextPluralForm - && line.find(TQRegExp("^msgstr\\s*\"?.*\\n?\"?$")) != -1) + && line.tqfind(TQRegExp("^msgstr\\s*\"?.*\\n?\"?$")) != -1) { part=Msgstr; @@ -656,7 +656,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) recoverableError=true; } else if( _gettextPluralForm - && (line.find(TQRegExp("^msgstr\\[0\\]\\s*\".*\\n?\"$")) != -1)) + && (line.tqfind(TQRegExp("^msgstr\\[0\\]\\s*\".*\\n?\"$")) != -1)) { part=Msgstr; @@ -667,7 +667,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) (*msgstrIt)=line; } else if( _gettextPluralForm - && (line.find(TQRegExp("^msgstr\\[0\\]\\s*\"?.*\\n?\"?$")) != -1)) + && (line.tqfind(TQRegExp("^msgstr\\[0\\]\\s*\"?.*\\n?\"?$")) != -1)) { part=Msgstr; @@ -694,7 +694,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) break; } // a line of the msgid with a missing quotation mark - else if(line.find(TQRegExp("^\"?.+\\n?\"?$")) != -1) + else if(line.tqfind(TQRegExp("^\"?.+\\n?\"?$")) != -1) { recoverableError=true; @@ -726,7 +726,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) if(line.isEmpty()) continue; // another line of the msgstr - else if(line.find(TQRegExp("^\".*\\n?\"$")) != -1) + else if(line.tqfind(TQRegExp("^\".*\\n?\"$")) != -1) { // remove quotes at beginning and the end of the lines line.remove(TQRegExp("^\"")); @@ -738,7 +738,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) (*msgstrIt)+=("\n"+line); } else if( _gettextPluralForm - && (line.find(TQRegExp("^msgstr\\[[0-9]+\\]\\s*\".*\\n?\"$")) != -1)) + && (line.tqfind(TQRegExp("^msgstr\\[[0-9]+\\]\\s*\".*\\n?\"$")) != -1)) { // remove quotes at beginning and the end of the lines line.remove(TQRegExp("^msgstr\\[[0-9]+\\]\\s*\"?")); @@ -747,7 +747,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) msgstrIt=_msgstr.append(line); } else if( _gettextPluralForm - && (line.find(TQRegExp("^msgstr\\[[0-9]\\]\\s*\"?.*\\n?\"?$")) != -1)) + && (line.tqfind(TQRegExp("^msgstr\\[[0-9]\\]\\s*\"?.*\\n?\"?$")) != -1)) { // remove quotes at beginning and the end of the lines line.remove(TQRegExp("^msgstr\\[[0-9]\\]\\s*\"?")); @@ -758,7 +758,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) if(!line.isEmpty()) recoverableError=true; } - else if((line.find(TQRegExp("^\\s*msgid")) != -1) || (line.find(TQRegExp("^\\s*#")) != -1)) + else if((line.tqfind(TQRegExp("^\\s*msgid")) != -1) || (line.tqfind(TQRegExp("^\\s*#")) != -1)) { // We have read successfully one entry, so end loop. stream.device()->at(pos);// reset position in stream to beginning of this line @@ -771,7 +771,7 @@ ConversionStatus GettextImportPlugin::readEntry(TQTextStream& stream) break; } // another line of the msgstr with a missing quotation mark - else if(line.find(TQRegExp("^\"?.+\\n?\"?$")) != -1) + else if(line.tqfind(TQRegExp("^\"?.+\\n?\"?$")) != -1) { recoverableError=true; diff --git a/kbabel/filters/gettext/gettextimport.h b/kbabel/filters/gettext/gettextimport.h index 54ced3f0..5549168b 100644 --- a/kbabel/filters/gettext/gettextimport.h +++ b/kbabel/filters/gettext/gettextimport.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -49,14 +49,14 @@ class TQTextCodec; class GettextImportPlugin: public KBabel::CatalogImportPlugin { public: - GettextImportPlugin(TQObject* parent, const char* name, const TQStringList &); - virtual KBabel::ConversionStatus load(const TQString& file, const TQString& mimetype); + GettextImportPlugin(TQObject* tqparent, const char* name, const TQStringList &); + virtual KBabel::ConversiontqStatus load(const TQString& file, const TQString& mimetype); virtual const TQString id() { return "GNU gettext"; } private: TQTextCodec* codecForArray(TQByteArray& arary, bool* hadCodec); - KBabel::ConversionStatus readHeader(TQTextStream& stream); - KBabel::ConversionStatus readEntry(TQTextStream& stream); + KBabel::ConversiontqStatus readHeader(TQTextStream& stream); + KBabel::ConversiontqStatus readEntry(TQTextStream& stream); // description of the last read entry TQString _msgctxt; diff --git a/kbabel/filters/linguist/linguistexport.cpp b/kbabel/filters/linguist/linguistexport.cpp index af0a3298..3b5bc5fc 100644 --- a/kbabel/filters/linguist/linguistexport.cpp +++ b/kbabel/filters/linguist/linguistexport.cpp @@ -24,11 +24,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -53,15 +53,15 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_linguistexport, KGenericFactory<LinguistExpor using namespace KBabel; -LinguistExportPlugin::LinguistExportPlugin( TQObject * parent, const char * name, const TQStringList& ) - : CatalogExportPlugin( parent, name ) +LinguistExportPlugin::LinguistExportPlugin( TQObject * tqparent, const char * name, const TQStringList& ) + : CatalogExportPlugin( tqparent, name ) { } -ConversionStatus LinguistExportPlugin::save( const TQString& filename, const TQString&, const Catalog * catalog ) +ConversiontqStatus LinguistExportPlugin::save( const TQString& filename, const TQString&, const Catalog * catalog ) { // Check whether we know how to handle the extra data. - if ( catalog->importPluginID( ) != "Qt translation source" ) + if ( catalog->importPluginID( ) != "TQt translation source" ) return UNSUPPORTED_TYPE; TQFile file( filename ); @@ -76,7 +76,7 @@ ConversionStatus LinguistExportPlugin::save( const TQString& filename, const TQS doc.appendChild( doc.createElement( "TS" ) ); // Create a default context just in case none is given in the messages. - context = "Default"; // ### FIXME: Qt's default seems named "@default" + context = "Default"; // ### FIXME: TQt's default seems named "@default" bool fuzzy; @@ -123,17 +123,17 @@ const TQString LinguistExportPlugin::extractComment( TQDomDocument& doc, const T * writing the comment for Linguist */ - int pos = comment.find("#, fuzzy"); + int pos = comment.tqfind("#, fuzzy"); if ( pos >= 0) { fuzzy = true; comment.remove("#, fuzzy"); } TQString newContext; - pos = comment.find( '\n' ); + pos = comment.tqfind( '\n' ); if ( pos >= 0 ) { newContext = comment.left( pos ); - comment.replace( 0, pos + 1, "" ); // ### TODO: use TQString::remove + comment.tqreplace( 0, pos + 1, "" ); // ### TODO: use TQString::remove } else { newContext = comment; comment = ""; // ### TODO: use TQString() instead of "" diff --git a/kbabel/filters/linguist/linguistexport.h b/kbabel/filters/linguist/linguistexport.h index b3399ed1..f4ed3240 100644 --- a/kbabel/filters/linguist/linguistexport.h +++ b/kbabel/filters/linguist/linguistexport.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -51,8 +51,8 @@ class Catalog; class LinguistExportPlugin : public KBabel::CatalogExportPlugin { public: - LinguistExportPlugin( TQObject * parent, const char * name, const TQStringList& ); - virtual KBabel::ConversionStatus save( const TQString& filename, const TQString& mimetype, const KBabel::Catalog * catalog ); + LinguistExportPlugin( TQObject * tqparent, const char * name, const TQStringList& ); + virtual KBabel::ConversiontqStatus save( const TQString& filename, const TQString& mimetype, const KBabel::Catalog * catalog ); private: const TQString extractComment( TQDomDocument& doc, const TQString& s, bool& fuzzy ); diff --git a/kbabel/filters/linguist/linguistimport.cpp b/kbabel/filters/linguist/linguistimport.cpp index a1870bd7..b46f5f97 100644 --- a/kbabel/filters/linguist/linguistimport.cpp +++ b/kbabel/filters/linguist/linguistimport.cpp @@ -1,4 +1,4 @@ -// kate: space-indent on; indent-width 2; replace-tabs on; +// kate: space-indent on; indent-width 2; tqreplace-tabs on; /* **************************************************************************** This file is part of KBabel @@ -26,18 +26,18 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. **************************************************************************** */ -// Qt include files +// TQt include files #include <tqfile.h> #include <tqfileinfo.h> #include <tqobject.h> @@ -55,12 +55,12 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_linguistimport, KGenericFactory<LinguistImpor using namespace KBabel; -LinguistImportPlugin::LinguistImportPlugin( TQObject * parent, const char * name, const TQStringList& ) - : CatalogImportPlugin( parent, name ) +LinguistImportPlugin::LinguistImportPlugin( TQObject * tqparent, const char * name, const TQStringList& ) + : CatalogImportPlugin( tqparent, name ) { } -ConversionStatus LinguistImportPlugin::load( const TQString& filename, const TQString& ) +ConversiontqStatus LinguistImportPlugin::load( const TQString& filename, const TQString& ) { if ( filename.isEmpty( ) ) { kdDebug( ) << "fatal error: empty filename to open" << endl; @@ -113,9 +113,9 @@ ConversionStatus LinguistImportPlugin::load( const TQString& filename, const TQS return OK; } -void LinguistImportPlugin::parse( const TQDomElement& parentElement ) +void LinguistImportPlugin::parse( const TQDomElement& tqparentElement ) { - TQDomNode node = parentElement.firstChild( ); + TQDomNode node = tqparentElement.firstChild( ); while ( !node.isNull( ) ) { if ( node.isElement( ) ) { diff --git a/kbabel/filters/linguist/linguistimport.h b/kbabel/filters/linguist/linguistimport.h index 175a28f8..fa7aa36c 100644 --- a/kbabel/filters/linguist/linguistimport.h +++ b/kbabel/filters/linguist/linguistimport.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -45,18 +45,18 @@ class TQString; class TQStringList; /** - * The class for importing Qt's translation source files. + * The class for importing TQt's translation source files. */ class LinguistImportPlugin : public KBabel::CatalogImportPlugin { public: - LinguistImportPlugin( TQObject * parent, const char * name, const TQStringList& ); + LinguistImportPlugin( TQObject * tqparent, const char * name, const TQStringList& ); - virtual KBabel::ConversionStatus load( const TQString& filename, const TQString& mimetype ); - virtual const TQString id( ) { return "Qt translation source"; } + virtual KBabel::ConversiontqStatus load( const TQString& filename, const TQString& mimetype ); + virtual const TQString id( ) { return "TQt translation source"; } private: - void parse( const TQDomElement& parentElement ); + void parse( const TQDomElement& tqparentElement ); private: uint msgcnt; diff --git a/kbabel/filters/xliff/xliffexport.cpp b/kbabel/filters/xliff/xliffexport.cpp index 9400b9c6..82033521 100644 --- a/kbabel/filters/xliff/xliffexport.cpp +++ b/kbabel/filters/xliff/xliffexport.cpp @@ -24,11 +24,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -53,12 +53,12 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_xliffexport, KGenericFactory<XLIFFExportPlugi using namespace KBabel; -XLIFFExportPlugin::XLIFFExportPlugin( TQObject * parent, const char * name, const TQStringList& ) - : CatalogExportPlugin( parent, name ) +XLIFFExportPlugin::XLIFFExportPlugin( TQObject * tqparent, const char * name, const TQStringList& ) + : CatalogExportPlugin( tqparent, name ) { } -ConversionStatus XLIFFExportPlugin::save( const TQString& filename, const TQString&, const Catalog * catalog ) +ConversiontqStatus XLIFFExportPlugin::save( const TQString& filename, const TQString&, const Catalog * catalog ) { // Check whether we know how to handle the extra data. if ( catalog->importPluginID( ) != "XLIFF 1.1" ) @@ -147,7 +147,7 @@ void XLIFFExportPlugin::createMessage( TQDomDocument& doc, TQDomElement& transla TQDomElement XLIFFExportPlugin::getContext( TQDomDocument& doc, const TQString& file, const TQString& id ) { // Find out whether there is already such a context in the TQDomDocument. - TQDomNode parentelem = doc.documentElement(); + TQDomNode tqparentelem = doc.documentElement(); TQDomNode elem = doc.documentElement( ).firstChild( ); while ( !elem.isNull( ) ) { if ( elem.isElement( ) && elem.toElement().tagName( ) == "file" && elem.toElement().attribute ("original") == file ) { @@ -162,12 +162,12 @@ TQDomElement XLIFFExportPlugin::getContext( TQDomDocument& doc, const TQString& kdError () << "File not found at all, creating" << endl; TQDomElement newelem = doc.createElement ("file"); newelem.setAttribute ("original", file); - parentelem.appendChild (newelem); + tqparentelem.appendChild (newelem); elem = newelem; } // lookup body tag - parentelem = elem; + tqparentelem = elem; elem = elem.firstChild (); while ( !elem.isNull( ) ) { if ( elem.isElement( ) && elem.toElement().tagName( ) == "body" ) { @@ -181,7 +181,7 @@ TQDomElement XLIFFExportPlugin::getContext( TQDomDocument& doc, const TQString& { kdError () << "File body not found at all, creating" << endl; TQDomElement newelem = doc.createElement ("body"); - parentelem.appendChild (newelem); + tqparentelem.appendChild (newelem); elem = newelem; } @@ -192,7 +192,7 @@ TQDomElement XLIFFExportPlugin::getContext( TQDomDocument& doc, const TQString& kdError () << "Trans-unit not found at all, creating" << endl; TQDomElement newelem = doc.createElement ("trans-unit"); newelem.setAttribute ("id", id); - parentelem.appendChild (newelem); + tqparentelem.appendChild (newelem); elem = newelem; } diff --git a/kbabel/filters/xliff/xliffexport.h b/kbabel/filters/xliff/xliffexport.h index cc44cbec..71253133 100644 --- a/kbabel/filters/xliff/xliffexport.h +++ b/kbabel/filters/xliff/xliffexport.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -51,8 +51,8 @@ class Catalog; class XLIFFExportPlugin : public KBabel::CatalogExportPlugin { public: - XLIFFExportPlugin( TQObject * parent, const char * name, const TQStringList& ); - virtual KBabel::ConversionStatus save( const TQString& filename, const TQString& mimetype, const KBabel::Catalog * catalog ); + XLIFFExportPlugin( TQObject * tqparent, const char * name, const TQStringList& ); + virtual KBabel::ConversiontqStatus save( const TQString& filename, const TQString& mimetype, const KBabel::Catalog * catalog ); private: TQDomElement extractComment( TQDomDocument& doc, const TQString& s ); diff --git a/kbabel/filters/xliff/xliffimport.cpp b/kbabel/filters/xliff/xliffimport.cpp index 25f34ec3..9d14c054 100644 --- a/kbabel/filters/xliff/xliffimport.cpp +++ b/kbabel/filters/xliff/xliffimport.cpp @@ -1,4 +1,4 @@ -// kate: space-indent on; indent-width 2; replace-tabs on; +// kate: space-indent on; indent-width 2; tqreplace-tabs on; /* **************************************************************************** This file is part of KBabel @@ -26,11 +26,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -47,7 +47,7 @@ optional comments */ -// Qt include files +// TQt include files #include <tqfile.h> #include <tqfileinfo.h> #include <tqobject.h> @@ -68,12 +68,12 @@ K_EXPORT_COMPONENT_FACTORY( kbabel_xliffimport, KGenericFactory<XLIFFImportPlugi using namespace KBabel; -XLIFFImportPlugin::XLIFFImportPlugin( TQObject * parent, const char * name, const TQStringList& ) - : CatalogImportPlugin( parent, name ) +XLIFFImportPlugin::XLIFFImportPlugin( TQObject * tqparent, const char * name, const TQStringList& ) + : CatalogImportPlugin( tqparent, name ) { } -ConversionStatus XLIFFImportPlugin::load( const TQString& filename, const TQString& ) +ConversiontqStatus XLIFFImportPlugin::load( const TQString& filename, const TQString& ) { if ( filename.isEmpty( ) ) { kdDebug( KDEBUG_AREA ) << "fatal error: empty filename to open" << endl; @@ -128,9 +128,9 @@ ConversionStatus XLIFFImportPlugin::load( const TQString& filename, const TQStri return OK; } -void XLIFFImportPlugin::parse( const TQDomElement& parentElement ) +void XLIFFImportPlugin::parse( const TQDomElement& tqparentElement ) { - TQDomNode node = parentElement.firstChild( ); + TQDomNode node = tqparentElement.firstChild( ); while ( !node.isNull( ) ) { if ( node.isElement( ) ) { diff --git a/kbabel/filters/xliff/xliffimport.h b/kbabel/filters/xliff/xliffimport.h index e86d59a3..2dbe1066 100644 --- a/kbabel/filters/xliff/xliffimport.h +++ b/kbabel/filters/xliff/xliffimport.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -50,13 +50,13 @@ class TQStringList; class XLIFFImportPlugin : public KBabel::CatalogImportPlugin { public: - XLIFFImportPlugin( TQObject * parent, const char * name, const TQStringList& ); + XLIFFImportPlugin( TQObject * tqparent, const char * name, const TQStringList& ); - virtual KBabel::ConversionStatus load( const TQString& filename, const TQString& mimetype ); + virtual KBabel::ConversiontqStatus load( const TQString& filename, const TQString& mimetype ); virtual const TQString id( ) { return "XLIFF 1.1"; } private: - void parse( const TQDomElement& parentElement ); + void parse( const TQDomElement& tqparentElement ); private: uint msgcnt; diff --git a/kbabel/kbabel/charselectview.cpp b/kbabel/kbabel/charselectview.cpp index 2e58b084..f174c3ed 100644 --- a/kbabel/kbabel/charselectview.cpp +++ b/kbabel/kbabel/charselectview.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -49,17 +49,17 @@ using namespace KBabel; -CharacterSelectorView::CharacterSelectorView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project) - : KBCatalogView(catalog,parent,project) +CharacterSelectorView::CharacterSelectorView(KBCatalog* catalog,TQWidget *tqparent, Project::Ptr project) + : KBCatalogView(catalog,tqparent,project) { - TQVBoxLayout* layout = new TQVBoxLayout( this ); - layout->setResizeMode( TQLayout::Minimum ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); + tqlayout->setResizeMode( TQLayout::Minimum ); - layout->setSpacing( KDialog::spacingHint() ); + tqlayout->setSpacing( KDialog::spacingHint() ); TQHBox* bar = new TQHBox(this); bar->setSpacing( KDialog::spacingHint() ); - layout->addWidget (bar); + tqlayout->addWidget (bar); TQLabel *lTable = new TQLabel( i18n( "Table:" ), bar ); _tableNum = new TQSpinBox( 0, 255, 1, bar ); @@ -72,7 +72,7 @@ CharacterSelectorView::CharacterSelectorView(KBCatalog* catalog,TQWidget *parent _table->setNumRows(16); scroll->addChild(_table); - layout->addWidget (scroll); + tqlayout->addWidget (scroll); connect( _table, TQT_SIGNAL( doubleClicked() ), this, TQT_SLOT( emitChar() ) ); connect( _tableNum, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( setTab(int) )); diff --git a/kbabel/kbabel/charselectview.h b/kbabel/kbabel/charselectview.h index 160b5295..4d0ee3a6 100644 --- a/kbabel/kbabel/charselectview.h +++ b/kbabel/kbabel/charselectview.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -41,11 +41,12 @@ class TQSpinBox; class CharacterSelectorView : public KBCatalogView { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - CharacterSelectorView(KBCatalog* catalog,TQWidget *parent, KBabel::Project::Ptr project); + CharacterSelectorView(KBCatalog* catalog,TQWidget *tqparent, KBabel::Project::Ptr project); void saveSettings(KConfig* config); void restoreSettings(KConfig* config); diff --git a/kbabel/kbabel/colorpreferences.ui b/kbabel/kbabel/colorpreferences.ui index 97e89df6..73f6b8d9 100644 --- a/kbabel/kbabel/colorpreferences.ui +++ b/kbabel/kbabel/colorpreferences.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ColorPreferences</class> <author>Stanislav Visnovsky</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ColorPreferences</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -33,7 +33,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -44,7 +44,7 @@ <cstring>kcfg_BackgroundColor</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -55,7 +55,7 @@ <cstring>kcfg_QuotedColor</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -74,7 +74,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>label</cstring> </property> @@ -97,7 +97,7 @@ phrases.</qt></string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -124,7 +124,7 @@ phrases.</qt></string> <string></string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -143,7 +143,7 @@ phrases.</qt></string> <string></string> </property> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -164,7 +164,7 @@ phrases.</qt></string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>50</height> @@ -175,7 +175,7 @@ phrases.</qt></string> </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> diff --git a/kbabel/kbabel/commentview.cpp b/kbabel/kbabel/commentview.cpp index 57d838b9..7126f422 100644 --- a/kbabel/kbabel/commentview.cpp +++ b/kbabel/kbabel/commentview.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -62,12 +62,12 @@ using namespace KBabel; -CommentView::CommentView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project) - : KBCatalogView(catalog,parent, project) +CommentView::CommentView(KBCatalog* catalog,TQWidget *tqparent, Project::Ptr project) + : KBCatalogView(catalog,tqparent, project) { setAcceptDrops(true); - TQVBoxLayout* layout=new TQVBoxLayout(this); + TQVBoxLayout* tqlayout=new TQVBoxLayout(this); commentEdit = new MsgMultiLineEdit(0, 0, this); commentEdit->setMinimumHeight(50); @@ -77,12 +77,12 @@ CommentView::CommentView(KBCatalog* catalog,TQWidget *parent, Project::Ptr proje TQLabel* label=new TQLabel(commentEdit,i18n("&Comment:"),this); - TQHBoxLayout* hb=new TQHBoxLayout(layout); + TQHBoxLayout* hb=new TQHBoxLayout(tqlayout); hb->addSpacing(KDialog::marginHint()); hb->addWidget(label); - layout->addWidget(commentEdit); - layout->setStretchFactor(commentEdit,1); + tqlayout->addWidget(commentEdit); + tqlayout->setStretchFactor(commentEdit,1); TQWhatsThis::add(this, i18n("<qt><p><b>Comment Editor</b></p>\n\ diff --git a/kbabel/kbabel/commentview.h b/kbabel/kbabel/commentview.h index 8dcce18d..f00d1241 100644 --- a/kbabel/kbabel/commentview.h +++ b/kbabel/kbabel/commentview.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -47,11 +47,12 @@ class MsgMultiLineEdit; class CommentView : public KBCatalogView { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - CommentView(KBCatalog* catalog,TQWidget *parent, KBabel::Project::Ptr project); + CommentView(KBCatalog* catalog,TQWidget *tqparent, KBabel::Project::Ptr project); /** * this is called from the catalog when updating his views. diff --git a/kbabel/kbabel/contextview.cpp b/kbabel/kbabel/contextview.cpp index 264d4e84..72303fef 100644 --- a/kbabel/kbabel/contextview.cpp +++ b/kbabel/kbabel/contextview.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -47,17 +47,17 @@ using namespace KBabel; -ContextView::ContextView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project) - : KBCatalogView(catalog,parent,project) +ContextView::ContextView(KBCatalog* catalog,TQWidget *tqparent, Project::Ptr project) + : KBCatalogView(catalog,tqparent,project) { - TQVBoxLayout* layout = new TQVBoxLayout( this ); - layout->setResizeMode( TQLayout::Minimum ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); + tqlayout->setResizeMode( TQLayout::Minimum ); _textview = new TQTextView (this, "context textview"); KCursor::setAutoHideCursor(_textview->viewport(),true); _textview->setReadOnly(true); - layout->addWidget (_textview); + tqlayout->addWidget (_textview); TQWhatsThis::add(this, i18n("<qt><p><b>PO Context</b></p>" @@ -92,7 +92,7 @@ void ContextView::updateView() startIndex = _currentIndex-context; } - for(uint i=startIndex; i < QMIN(startIndex+(2*context+1), total); i++) + for(uint i=startIndex; i < TQMIN(startIndex+(2*context+1), total); i++) { if(i == _currentIndex) { @@ -106,15 +106,15 @@ void ContextView::updateView() if(!temp.isEmpty()) { temp = TQStyleSheet::convertFromPlainText(temp); - temp.replace(TQRegExp("^<p>"),""); - temp.replace(TQRegExp("</p>$"),""); + temp.tqreplace(TQRegExp("^<p>"),""); + temp.tqreplace(TQRegExp("</p>$"),""); entry += "<i>"+temp+"</i><br/>"; } // FIXME: should care about plural forms temp = TQStyleSheet::convertFromPlainText(_catalog->msgid(i).first()); - temp.replace(TQRegExp("^<p>"),""); - temp.replace(TQRegExp("</p>$"),""); + temp.tqreplace(TQRegExp("^<p>"),""); + temp.tqreplace(TQRegExp("</p>$"),""); entry += temp + "<br/>---<br/>"; TQStringList tempList = _catalog->msgstr(i); @@ -137,12 +137,12 @@ void ContextView::updateView() temp = ""; for( TQStringList::Iterator i=tempList.begin() ; i != tempList.end() ; ++i) { - temp += i18n("Plural %1: %2\n").arg(counter++).arg(*i); + temp += i18n("Plural %1: %2\n").tqarg(counter++).tqarg(*i); } } temp = TQStyleSheet::convertFromPlainText(temp); - temp.replace(TQRegExp("^<p>"),""); - temp.replace(TQRegExp("</p>$"),""); + temp.tqreplace(TQRegExp("^<p>"),""); + temp.tqreplace(TQRegExp("</p>$"),""); entry += temp+"<br/>"; } diff --git a/kbabel/kbabel/contextview.h b/kbabel/kbabel/contextview.h index 72faa160..9f0b2405 100644 --- a/kbabel/kbabel/contextview.h +++ b/kbabel/kbabel/contextview.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -40,11 +40,12 @@ class TQTextView; class ContextView : public KBCatalogView { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - ContextView(KBCatalog* catalog,TQWidget *parent, KBabel::Project::Ptr project); + ContextView(KBCatalog* catalog,TQWidget *tqparent, KBabel::Project::Ptr project); public slots: virtual void updateView(); diff --git a/kbabel/kbabel/editordiffpreferences.ui b/kbabel/kbabel/editordiffpreferences.ui index db21bc8e..14e9c44c 100644 --- a/kbabel/kbabel/editordiffpreferences.ui +++ b/kbabel/kbabel/editordiffpreferences.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>EditorDiffPreferences</class> <author>Stanislav Visnovsky</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>EditorDiffPreferences</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -17,7 +17,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -28,7 +28,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -36,7 +36,7 @@ <string>Added Characters</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -47,7 +47,7 @@ <cstring>kcfg_DiffAddUnderline</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -58,7 +58,7 @@ <cstring>kcfg_DiffAddColor</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -66,7 +66,7 @@ <string>Removed Characters</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -77,7 +77,7 @@ <cstring>kcfg_DiffDelStrikeOut</cstring> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel7</cstring> </property> @@ -88,7 +88,7 @@ <cstring>kcfg_DiffDelColor</cstring> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <item> <property name="text"> <string>Highlighted</string> @@ -118,7 +118,7 @@ </color> </property> </widget> - <widget class="QComboBox" row="4" column="1"> + <widget class="TQComboBox" row="4" column="1"> <item> <property name="text"> <string>Highlighted</string> @@ -150,9 +150,9 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -170,7 +170,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>31</height> @@ -184,7 +184,7 @@ <functions> <function>init()</function> </functions> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> diff --git a/kbabel/kbabel/editorpreferences.ui b/kbabel/kbabel/editorpreferences.ui index ee8632f9..13c49925 100644 --- a/kbabel/kbabel/editorpreferences.ui +++ b/kbabel/kbabel/editorpreferences.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>EditorPreferences</class> <author>Stanislav Visnovsky</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>EditorPreferences</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -17,11 +17,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget2</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -32,7 +32,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame6</cstring> </property> @@ -46,7 +46,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_AutoUnsetFuzzy</cstring> </property> @@ -60,7 +60,7 @@ unset (this means the string <i>, fuzzy</i> is removed from the entry's comment).</p></qt></string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_CleverEditing</cstring> </property> @@ -81,7 +81,7 @@ generate syntactically incorrect text.</p></qt></string> </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -105,7 +105,7 @@ activated, you will still see a message in the statusbar. <cstring>_kcfg_AutoCheckTools</cstring> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_BeepOnError</cstring> </property> @@ -113,7 +113,7 @@ activated, you will still see a message in the statusbar. <string>&Beep on error</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_AutoCheckColorError</cstring> </property> @@ -133,7 +133,7 @@ activated, you will still see a message in the statusbar. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> @@ -142,7 +142,7 @@ activated, you will still see a message in the statusbar. </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -153,7 +153,7 @@ activated, you will still see a message in the statusbar. <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame3</cstring> </property> @@ -167,7 +167,7 @@ activated, you will still see a message in the statusbar. <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>kcfg_HighlightSyntax</cstring> </property> @@ -175,7 +175,7 @@ activated, you will still see a message in the statusbar. <string>H&ighlight syntax</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>kcfg_HighlightBackground</cstring> </property> @@ -183,7 +183,7 @@ activated, you will still see a message in the statusbar. <string>Highlight backgrou&nd</string> </property> </widget> - <widget class="QCheckBox" row="0" column="1"> + <widget class="TQCheckBox" row="0" column="1"> <property name="name"> <cstring>kcfg_WhitespacePoints</cstring> </property> @@ -191,7 +191,7 @@ activated, you will still see a message in the statusbar. <string>Mark &whitespaces with points</string> </property> </widget> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>kcfg_EnableQuotes</cstring> </property> @@ -201,22 +201,22 @@ activated, you will still see a message in the statusbar. </widget> </grid> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup1</cstring> </property> <property name="title"> - <string>Status LEDs</string> + <string>tqStatus LEDs</string> </property> <property name="whatsThis" stdset="0"> - <string><qt><p><b>Status LEDs</b></p> + <string><qt><p><b>tqStatus LEDs</b></p> <p>Choose here where the status LEDs are displayed and what color they have.</p></qt></string> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>kcfg_LedInStatusbar</cstring> </property> @@ -224,7 +224,7 @@ activated, you will still see a message in the statusbar. <string>Display in stat&usbar</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>radioButton2</cstring> </property> @@ -245,14 +245,14 @@ activated, you will still see a message in the statusbar. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel7</cstring> </property> @@ -283,7 +283,7 @@ activated, you will still see a message in the statusbar. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>29</height> @@ -341,11 +341,11 @@ activated, you will still see a message in the statusbar. <includes> <include location="local" impldecl="in implementation">editorpreferences.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot specifier="non virtual">ledWarning( bool show )</slot> <slot specifier="non virtual">toggleOther( bool other )</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>toolselectionwidget.h</includehint> <includehint>kcolorbutton.h</includehint> diff --git a/kbabel/kbabel/editorpreferences.ui.h b/kbabel/kbabel/editorpreferences.ui.h index b7f9827c..99819cde 100644 --- a/kbabel/kbabel/editorpreferences.ui.h +++ b/kbabel/kbabel/editorpreferences.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ diff --git a/kbabel/kbabel/errorlistview.cpp b/kbabel/kbabel/errorlistview.cpp index c49c7940..74deba91 100644 --- a/kbabel/kbabel/errorlistview.cpp +++ b/kbabel/kbabel/errorlistview.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -47,17 +47,17 @@ using namespace KBabel; -ErrorListView::ErrorListView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project) - : KBCatalogView(catalog,parent,project) +ErrorListView::ErrorListView(KBCatalog* catalog,TQWidget *tqparent, Project::Ptr project) + : KBCatalogView(catalog,tqparent,project) { - TQVBoxLayout* layout = new TQVBoxLayout( this ); - layout->setResizeMode( TQLayout::Minimum ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); + tqlayout->setResizeMode( TQLayout::Minimum ); _textview = new TQTextView (this); KCursor::setAutoHideCursor(_textview->viewport(),true); _textview->setReadOnly(true); - layout->addWidget(_textview); + tqlayout->addWidget(_textview); TQWhatsThis::add(this, i18n( "<qt><p><b>Error List</b></p>" "<p>This window shows the list of errors found by validator tools " @@ -70,7 +70,7 @@ void ErrorListView::updateView() if( _catalog->numberOfEntries() == 0 ) return; - _textview->setText( _catalog->itemStatus( _currentIndex ).join( "\n---\n" ) ); + _textview->setText( _catalog->itemtqStatus( _currentIndex ).join( "\n---\n" ) ); } #include "errorlistview.moc" diff --git a/kbabel/kbabel/errorlistview.h b/kbabel/kbabel/errorlistview.h index 320e122d..022d94c1 100644 --- a/kbabel/kbabel/errorlistview.h +++ b/kbabel/kbabel/errorlistview.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -39,11 +39,12 @@ class TQTextView; class ErrorListView : public KBCatalogView { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - ErrorListView(KBCatalog* catalog,TQWidget *parent, KBabel::Project::Ptr project); + ErrorListView(KBCatalog* catalog,TQWidget *tqparent, KBabel::Project::Ptr project); public slots: virtual void updateView(); diff --git a/kbabel/kbabel/fontpreferences.ui b/kbabel/kbabel/fontpreferences.ui index aefb8c7e..24c68e35 100644 --- a/kbabel/kbabel/fontpreferences.ui +++ b/kbabel/kbabel/fontpreferences.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>FontPreferences</class> <author>Stanislav Visnovsky</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>FontPreferences</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -17,7 +17,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -28,7 +28,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>checkBox1</cstring> </property> @@ -56,8 +56,8 @@ <includes> <include location="local" impldecl="in implementation">fontpreferences.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot access="private">showOnlyFixedFonts( bool on )</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kbabel/kbabel/fontpreferences.ui.h b/kbabel/kbabel/fontpreferences.ui.h index 065318f1..20e02941 100644 --- a/kbabel/kbabel/fontpreferences.ui.h +++ b/kbabel/kbabel/fontpreferences.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ diff --git a/kbabel/kbabel/gotodialog.cpp b/kbabel/kbabel/gotodialog.cpp index b08b0098..9bec7bf7 100644 --- a/kbabel/kbabel/gotodialog.cpp +++ b/kbabel/kbabel/gotodialog.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -37,8 +37,8 @@ #include "gotodialog.h" -GotoDialog::GotoDialog(int max,TQWidget* parent) - : KDialogBase(parent,0,true,i18n("Go to Entry"),Ok|Cancel) +GotoDialog::GotoDialog(int max,TQWidget* tqparent) + : KDialogBase(tqparent,0,true,i18n("Go to Entry"),Ok|Cancel) { TQGroupBox* box=new TQGroupBox(1,Qt::Horizontal,i18n("Go to Entry"),this); _spinBox= new KIntSpinBox(1,max,1,1,10,box); diff --git a/kbabel/kbabel/gotodialog.h b/kbabel/kbabel/gotodialog.h index 4c033973..afd9b250 100644 --- a/kbabel/kbabel/gotodialog.h +++ b/kbabel/kbabel/gotodialog.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -45,7 +45,7 @@ class KIntSpinBox; class GotoDialog : public KDialogBase { public: - GotoDialog(int max, TQWidget* parent); + GotoDialog(int max, TQWidget* tqparent); virtual ~GotoDialog(); /** reimplemented to select contents when shown*/ diff --git a/kbabel/kbabel/headereditor.cpp b/kbabel/kbabel/headereditor.cpp index 2f686652..553724bc 100644 --- a/kbabel/kbabel/headereditor.cpp +++ b/kbabel/kbabel/headereditor.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -49,7 +49,7 @@ using namespace KBabel; HeaderEditor::HeaderEditor(Catalog* cat,const char* name) - : KDialogBase((TQWidget*)0,name,false,TQString::null, Ok|Cancel|Default|User1) + : KDialogBase((TQWidget*)0,name,false,TQString(), Ok|Cancel|Default|User1) { restoreSettings(); @@ -108,7 +108,7 @@ bool HeaderEditor::isModified() void HeaderEditor::readHeader(bool readOnly) { - setCaption(i18n("Header Editor for %1").arg(_catalog->currentURL().prettyURL())); + setCaption(i18n("Header Editor for %1").tqarg(_catalog->currentURL().prettyURL())); _editor->headerEdit->setReadOnly(readOnly); _editor->commentEdit->setReadOnly(readOnly); diff --git a/kbabel/kbabel/headereditor.h b/kbabel/kbabel/headereditor.h index 88dda5ee..03159212 100644 --- a/kbabel/kbabel/headereditor.h +++ b/kbabel/kbabel/headereditor.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -47,6 +47,7 @@ class HeaderWidget; class HeaderEditor : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * constructor for the HeaderEditor diff --git a/kbabel/kbabel/headerwidget.ui b/kbabel/kbabel/headerwidget.ui index f74a9ef5..ce241a3d 100644 --- a/kbabel/kbabel/headerwidget.ui +++ b/kbabel/kbabel/headerwidget.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>HeaderWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>HeaderWidget</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>commentLabel</cstring> </property> @@ -35,7 +35,7 @@ <enum>NoWrap</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>headerLabel</cstring> </property> @@ -56,7 +56,7 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>ktextedit.h</includehint> <includehint>ktextedit.h</includehint> diff --git a/kbabel/kbabel/hidingmsgedit.cpp b/kbabel/kbabel/hidingmsgedit.cpp index 60a62da4..d1458fb4 100644 --- a/kbabel/kbabel/hidingmsgedit.cpp +++ b/kbabel/kbabel/hidingmsgedit.cpp @@ -15,11 +15,11 @@ * * In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -41,8 +41,8 @@ using namespace KBabel; -HidingMsgEdit::HidingMsgEdit(uint numberOfPlurals, TQWidget* eventFilter, KSpell* spell, TQWidget *parent, const char *name ) : - TQWidgetStack(parent,name) +HidingMsgEdit::HidingMsgEdit(uint numberOfPlurals, TQWidget* eventFilter, KSpell* spell, TQWidget *tqparent, const char *name ) : + TQWidgetStack(tqparent,name) , _singleEdit(0) , _multipleEdit(0) , _eventFilter(eventFilter) @@ -177,9 +177,9 @@ void HidingMsgEdit::setNumberOfPlurals( uint numberOfPlurals ) MsgMultiLineEdit* pl; for(uint i=0 ; i< _numberOfPlurals ; i++) { - pl = new MsgMultiLineEdit( i, _spell, _multipleEdit, TQString("multipleEdit %1").arg(i).local8Bit()); + pl = new MsgMultiLineEdit( i, _spell, _multipleEdit, TQString("multipleEdit %1").tqarg(i).local8Bit()); _allEdits.append(pl); - _multipleEdit->addTab( pl, i18n("Plural %1").arg(i+1)); + _multipleEdit->addTab( pl, i18n("Plural %1").tqarg(i+1)); if( _eventFilter ) pl->installEventFilter(_eventFilter); } diff --git a/kbabel/kbabel/hidingmsgedit.h b/kbabel/kbabel/hidingmsgedit.h index b38a3bd5..65c65d40 100644 --- a/kbabel/kbabel/hidingmsgedit.h +++ b/kbabel/kbabel/hidingmsgedit.h @@ -15,11 +15,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -51,8 +51,9 @@ namespace KBabel class HidingMsgEdit : public TQWidgetStack { Q_OBJECT + TQ_OBJECT public: - HidingMsgEdit(uint numberOfPlurals, TQWidget* eventFilter=0, KSpell* spell=0, TQWidget *parent=0, const char *name=0); + HidingMsgEdit(uint numberOfPlurals, TQWidget* eventFilter=0, KSpell* spell=0, TQWidget *tqparent=0, const char *name=0); ~HidingMsgEdit(); void setNumberOfPlurals(uint numberOfPlurals); @@ -101,7 +102,7 @@ public: // reiplemented to return correct value bool hasFocus (); public slots: // Public slots - void setText(TQStringList texts, TQString msgctxt = TQString::null); + void setText(TQStringList texts, TQString msgctxt = TQString()); void showSingle(); void showMultiple(); void showPlurals( bool on ); diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp index 0c3c897d..73f4d365 100644 --- a/kbabel/kbabel/kbabel.cpp +++ b/kbabel/kbabel/kbabel.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -113,11 +113,11 @@ TQPtrList<KBabelPreferences> KBabelMW::prefDialogs; class MyKProgress: public KProgress { public: - MyKProgress( TQWidget *parent, const char *name ) : KProgress( parent, name ) + MyKProgress( TQWidget *tqparent, const char *name ) : KProgress( tqparent, name ) { - setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ); + tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ); } - TQSize sizeHint() const { return TQSize( 1, 1);} + TQSize tqsizeHint() const { return TQSize( 1, 1);} }; KBabelMW::KBabelMW(TQString projectFile) @@ -129,7 +129,7 @@ KBabelMW::KBabelMW(TQString projectFile) if ( _project == NULL ) // FIXME should not happen anymore { - KMessageBox::error( this, i18n("Cannot open project file\n%1").arg(projectFile) + KMessageBox::error( this, i18n("Cannot open project file\n%1").tqarg(projectFile) , i18n("Project File Error")); _project = ProjectManager::open(KBabel::ProjectManager::defaultProjectName()); } @@ -147,7 +147,7 @@ KBabelMW::KBabelMW(KBCatalog* catalog, TQString projectFile) if ( _project == NULL ) { - KMessageBox::error( this, i18n("Cannot open project file\n%1").arg(projectFile) + KMessageBox::error( this, i18n("Cannot open project file\n%1").tqarg(projectFile) , i18n("Project File Error")); _project = ProjectManager::open(KBabel::ProjectManager::defaultProjectName()); } @@ -333,7 +333,7 @@ void KBabelMW::init(KBCatalog* catalog) "The minimum requirement is to fill out the Identity page.\n" "Also check the encoding on the Save page, which is currently " "set to %1. You may want to change this setting " - "according to the settings of your language team.").arg(encodingStr)); + "according to the settings of your language team.").tqarg(encodingStr)); TQTimer::singleShot(1,this,TQT_SLOT(projectConfigure())); } @@ -437,10 +437,10 @@ void KBabelMW::setupActions() action = KStdAction::copy(m_view, TQT_SIGNAL(signalCopy()), actionCollection()); action = KStdAction::paste(m_view, TQT_SIGNAL(signalPaste()), actionCollection()); action = KStdAction::selectAll(m_view, TQT_SIGNAL(signalSelectAll()), actionCollection()); - action = KStdAction::find(m_view, TQT_SLOT(find()), actionCollection()); + action = KStdAction::tqfind(m_view, TQT_SLOT(tqfind()), actionCollection()); action = KStdAction::findNext(m_view, TQT_SLOT(findNext()), actionCollection()); action = KStdAction::findPrev(m_view, TQT_SLOT(findPrev()), actionCollection()); - action = KStdAction::replace(m_view, TQT_SLOT(replace()), actionCollection()); + action = KStdAction::tqreplace(m_view, TQT_SLOT(tqreplace()), actionCollection()); action = KStdAction::clear( m_view, TQT_SLOT(clear()), actionCollection(), "clear" ); @@ -454,8 +454,8 @@ void KBabelMW::setupActions() action = new KAction(i18n("Copy Selected Character to Msgstr"), Key_F10, m_charselectorview ,TQT_SLOT(emitChar()), actionCollection(), "char2msgstr"); - a_unsetFuzzy = new KAction(i18n("To&ggle Fuzzy Status"), "togglefuzzy", CTRL+Key_U, m_view - , TQT_SLOT(removeFuzzyStatus()), actionCollection(), "edit_toggle_fuzzy"); + a_unsetFuzzy = new KAction(i18n("To&ggle Fuzzy tqStatus"), "togglefuzzy", CTRL+Key_U, m_view + , TQT_SLOT(removeFuzzytqStatus()), actionCollection(), "edit_toggle_fuzzy"); action = new KAction(i18n("&Edit Header..."), 0, m_view, TQT_SLOT(editHeader()), actionCollection(), "edit_edit_header"); @@ -710,7 +710,7 @@ void KBabelMW::setupStatusBar() TQColor ledColor=KBabelSettings::ledColor(); TQHBox* statusBox = new TQHBox(statusBar(),"statusBox"); statusBox->setSpacing(2); - new TQLabel(" "+i18n("Status: "),statusBox); + new TQLabel(" "+i18n("tqStatus: "),statusBox); _fuzzyLed = new KLed(ledColor,KLed::Off,KLed::Sunken,KLed::Rectangular ,statusBox); _fuzzyLed->setFixedSize(15,12); @@ -724,7 +724,7 @@ void KBabelMW::setupStatusBar() _errorLed->setFixedSize(15,12); new TQLabel(i18n("faulty")+" ",statusBox); - statusBox->setFixedWidth(statusBox->sizeHint().width()); + statusBox->setFixedWidth(statusBox->tqsizeHint().width()); statusBar()->addWidget(statusBox); } @@ -732,7 +732,7 @@ void KBabelMW::setupStatusBar() statusBar()->insertItem(i18n("RW"),ID_STATUS_READONLY); - statusBar()->insertItem(i18n("Line: %1 Col: %2").arg(1).arg(1) + statusBar()->insertItem(i18n("Line: %1 Col: %2").tqarg(1).tqarg(1) ,ID_STATUS_CURSOR); TQHBox* progressBox = new TQHBox(statusBar(),"progressBox"); @@ -743,7 +743,7 @@ void KBabelMW::setupStatusBar() progressBox->setStretchFactor(_progressBar,1); statusBar()->addWidget(progressBox,1); - statusBar()->setMinimumHeight(progressBox->sizeHint().height()); + statusBar()->setMinimumHeight(progressBox->tqsizeHint().height()); TQWhatsThis::add(statusBar(), i18n("<qt><p><b>Statusbar</b></p>\n\ @@ -996,10 +996,10 @@ void KBabelMW::wheelEvent(TQWheelEvent *e) void KBabelMW::openRecent(const KURL& url) { - KBabelView *view = KBabelView::viewForURL(url,TQString::null); + KBabelView *view = KBabelView::viewForURL(url,TQString()); if(view) { - KWin::activateWindow(view->topLevelWidget()->winId()); + KWin::activateWindow(view->tqtopLevelWidget()->winId()); return; } @@ -1008,7 +1008,7 @@ void KBabelMW::openRecent(const KURL& url) void KBabelMW::open(const KURL& url) { - open(url,TQString::null,false); + open(url,TQString(),false); } void KBabelMW::open(const KURL& url, const TQString package, bool newWindow) @@ -1019,7 +1019,7 @@ void KBabelMW::open(const KURL& url, const TQString package, bool newWindow) if(view) { kdDebug(KBABEL) << "there is a such view" << endl; - KWin::activateWindow(view->topLevelWidget()->winId()); + KWin::activateWindow(view->tqtopLevelWidget()->winId()); return; } @@ -1361,23 +1361,23 @@ void KBabelMW::faultyDisplayed(bool flag) void KBabelMW::displayedEntryChanged(const KBabel::DocPosition& pos) { - statusBar()->changeItem(i18n("Current: %1").arg(pos.item+1),ID_STATUS_CURRENT); + statusBar()->changeItem(i18n("Current: %1").tqarg(pos.item+1),ID_STATUS_CURRENT); _currentIndex = pos.item; } void KBabelMW::setNumberOfTotal(uint number) { - statusBar()->changeItem(i18n("Total: %1").arg(number),ID_STATUS_TOTAL); + statusBar()->changeItem(i18n("Total: %1").tqarg(number),ID_STATUS_TOTAL); } void KBabelMW::setNumberOfFuzzies(uint number) { - statusBar()->changeItem(i18n("Fuzzy: %1").arg(number),ID_STATUS_FUZZY); + statusBar()->changeItem(i18n("Fuzzy: %1").tqarg(number),ID_STATUS_FUZZY); } void KBabelMW::setNumberOfUntranslated(uint number) { - statusBar()->changeItem(i18n("Untranslated: %1").arg(number),ID_STATUS_UNTRANS); + statusBar()->changeItem(i18n("Untranslated: %1").tqarg(number),ID_STATUS_UNTRANS); } void KBabelMW::hasFuzzyAfterwards(bool flag) @@ -1566,7 +1566,7 @@ void KBabelMW::gettextHelp() if(!error.isEmpty()) { KMessageBox::sorry(this,i18n("An error occurred while " - "trying to open the gettext info page:\n%1").arg(error)); + "trying to open the gettext info page:\n%1").tqarg(error)); } } @@ -1602,7 +1602,7 @@ void KBabelMW::buildDictMenus() void KBabelMW::updateCursorPosition(int line, int col) { - statusBar()->changeItem(i18n("Line: %1 Col: %2").arg(line+1).arg(col+1) + statusBar()->changeItem(i18n("Line: %1 Col: %2").tqarg(line+1).tqarg(col+1) ,ID_STATUS_CURSOR); } @@ -1614,10 +1614,10 @@ KBabelMW *KBabelMW::winForURL(const KURL& url, TQString project) KBabelView *v = KBabelView::viewForURL(url,project); if(v) { - TQObject *p = v->parent(); + TQObject *p = v->tqparent(); while(p && !p->inherits("KBabelMW")) { - p = p->parent(); + p = p->tqparent(); } if(p) @@ -1634,10 +1634,10 @@ KBabelMW *KBabelMW::emptyWin(TQString project) KBabelView *v = KBabelView::emptyView(project); if(v) { - TQObject *p = v->parent(); + TQObject *p = v->tqparent(); while(p && !p->inherits("KBabelMW")) { - p = p->parent(); + p = p->tqparent(); } if(p) @@ -1668,7 +1668,7 @@ void KBabelMW::spellcheckDone( int result) TQString file = _toSpellcheck.first(); _toSpellcheck.pop_front(); if( m_view->isModified() ) fileSave(); - open(KURL( file ), TQString::null, false); + open(KURL( file ), TQString(), false); kdDebug(KBABEL) << "Starting another spellcheck" << endl; TQTimer::singleShot( 1, m_view, TQT_SLOT(spellcheckAllMulti())); } @@ -1710,7 +1710,7 @@ void KBabelMW::projectOpen() { oldproject = TQString(); } - const TQString file = KFileDialog::getOpenFileName(oldproject, TQString::null, this); + const TQString file = KFileDialog::getOpenFileName(oldproject, TQString(), this); if (file.isEmpty()) { return; @@ -1751,7 +1751,7 @@ void KBabelMW::projectOpen(const TQString& file) } else { - KMessageBox::error( this, i18n("Cannot open project file\n%1").arg(file) + KMessageBox::error( this, i18n("Cannot open project file\n%1").tqarg(file) , i18n("Project File Error")); _project = ProjectManager::open(KBabel::ProjectManager::defaultProjectName()); m_view->useProject(_project); diff --git a/kbabel/kbabel/kbabel.h b/kbabel/kbabel/kbabel.h index 10f57336..392f71ad 100644 --- a/kbabel/kbabel/kbabel.h +++ b/kbabel/kbabel/kbabel.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -82,6 +82,7 @@ namespace KBabel class KBabelMW : public KDockMainWindow { Q_OBJECT + TQ_OBJECT public: /** * Default Constructor @@ -111,20 +112,20 @@ public: * @return A pointer to a KBabel, that has opened file URL or 0 if no * KBabel was found */ - static KBabelMW *winForURL(const KURL& url, TQString projectFile = TQString::null); + static KBabelMW *winForURL(const KURL& url, TQString projectFile = TQString()); /** * @return A pointer to a KBabel, that has opened no file URL or 0 if no * KBabel was found */ - static KBabelMW *emptyWin(TQString projectFile = TQString::null); + static KBabelMW *emptyWin(TQString projectFile = TQString()); public slots: void toggleEditMode(); protected: /** - * Overridden virtuals for Qt drag 'n drop (XDND) + * Overridden virtuals for TQt drag 'n drop (XDND) */ virtual void dragEnterEvent(TQDragEnterEvent *event); virtual void dropEvent(TQDropEvent *event); diff --git a/kbabel/kbabel/kbabeliface.h b/kbabel/kbabel/kbabeliface.h index 49d19f5c..854172b6 100644 --- a/kbabel/kbabel/kbabeliface.h +++ b/kbabel/kbabel/kbabeliface.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kbabel/kbabel/kbabelpref.cpp b/kbabel/kbabel/kbabelpref.cpp index 2592385e..2bc23b9d 100644 --- a/kbabel/kbabel/kbabelpref.cpp +++ b/kbabel/kbabel/kbabelpref.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kbabel/kbabel/kbabelpref.h b/kbabel/kbabel/kbabelpref.h index 6d72aaf1..827caa8e 100644 --- a/kbabel/kbabel/kbabelpref.h +++ b/kbabel/kbabel/kbabelpref.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -45,6 +45,7 @@ struct ModuleInfo; class KBabelPreferences : public KConfigDialog { Q_OBJECT + TQ_OBJECT public: KBabelPreferences(TQPtrList<ModuleInfo>); diff --git a/kbabel/kbabel/kbabelsplash.cpp b/kbabel/kbabel/kbabelsplash.cpp index 4166cffe..e5dcf563 100644 --- a/kbabel/kbabel/kbabelsplash.cpp +++ b/kbabel/kbabel/kbabelsplash.cpp @@ -15,11 +15,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -40,8 +40,8 @@ KBabelSplash* KBabelSplash::instance = 0; -KBabelSplash::KBabelSplash( TQWidget* parent, const char* name ) - : TQVBox( parent, name, WType_Dialog|WShowModal|WStyle_Customize|WStyle_NoBorder|WDestructiveClose ) +KBabelSplash::KBabelSplash( TQWidget* tqparent, const char* name ) + : TQVBox( tqparent, name, WType_Dialog|WShowModal|WStyle_Customize|WStyle_NoBorder|WDestructiveClose ) { setMargin( 0 ); setSpacing( 0 ); @@ -53,9 +53,9 @@ KBabelSplash::KBabelSplash( TQWidget* parent, const char* name ) picLabel->setFrameStyle(TQFrame::WinPanel | TQFrame::Raised); - // Set geometry, with support for Xinerama systems + // Set tqgeometry, with support for Xinerama systems TQRect r; - r.setSize(sizeHint()); + r.setSize(tqsizeHint()); int ps = TQApplication::desktop()->primaryScreen(); r.moveCenter( TQApplication::desktop()->screenGeometry(ps).center() ); setGeometry(r); diff --git a/kbabel/kbabel/kbabelsplash.h b/kbabel/kbabel/kbabelsplash.h index af23460b..24f2865a 100644 --- a/kbabel/kbabel/kbabelsplash.h +++ b/kbabel/kbabel/kbabelsplash.h @@ -15,11 +15,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -38,12 +38,13 @@ class TQPaintEvent; class TQString; -class KBabelSplash : public QVBox +class KBabelSplash : public TQVBox { Q_OBJECT + TQ_OBJECT public: - KBabelSplash( TQWidget* parent = 0, const char* name = 0 ); + KBabelSplash( TQWidget* tqparent = 0, const char* name = 0 ); ~KBabelSplash() { instance = 0; } static KBabelSplash* instance; diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp index ca41a7ad..0e685f0c 100644 --- a/kbabel/kbabel/kbabelview.cpp +++ b/kbabel/kbabel/kbabelview.cpp @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -115,11 +115,11 @@ using namespace KBabel; TQPtrList<KBabelView> *KBabelView::viewList = 0; -KBabelView::KBabelView(KBCatalog* catalog,KBabelMW *parent, Project::Ptr project) - : TQWidget(parent) +KBabelView::KBabelView(KBCatalog* catalog,KBabelMW *tqparent, Project::Ptr project) + : TQWidget(tqparent) , _redirectedBackSearch (false) , _project (project) - , m_mainwindow (parent) + , m_mainwindow (tqparent) , m_sourceview (0) { if(!viewList) @@ -307,7 +307,7 @@ void KBabelView::initDockWidgets() TQWidget *tempWidget=new TQWidget(this,"msgidWidget"); tempWidget->setMinimumSize(350,150); - TQVBoxLayout *layout=new TQVBoxLayout(tempWidget); + TQVBoxLayout *tqlayout=new TQVBoxLayout(tempWidget); msgidLabel = new HidingMsgEdit(2, this, 0, tempWidget,"msgidLabel"); msgidLabel->installEventFilter(this); @@ -328,16 +328,16 @@ void KBabelView::initDockWidgets() "and the behavior of KBabel and to Stephan Kulow, who always\n" "lends me a helping hand.\n\n" "Many good ideas, especially for the Catalog Manager, are taken\n" -"from KTranslator by Andrea Rizzi.").arg(VERSION).arg(2006)); +"from KTranslator by Andrea Rizzi.").tqarg(VERSION).tqarg(2006)); TQLabel *label=new TQLabel(msgidLabel,i18n("O&riginal string (msgid):"),tempWidget); - TQHBoxLayout* hb=new TQHBoxLayout(layout); + TQHBoxLayout* hb=new TQHBoxLayout(tqlayout); hb->addSpacing(KDialog::marginHint()); hb->addWidget(label); - layout->addWidget(msgidLabel); - layout->setStretchFactor(msgidLabel,1); + tqlayout->addWidget(msgidLabel); + tqlayout->setStretchFactor(msgidLabel,1); TQWhatsThis::add(tempWidget, i18n("<qt><p><b>Original String</b></p>\n\ @@ -382,7 +382,7 @@ of the currently displayed entry.</p></qt>")); tempWidget=new TQWidget(this,"msgstrWidget"); tempWidget->setMinimumSize(350,150); - layout=new TQVBoxLayout(tempWidget); + tqlayout=new TQVBoxLayout(tempWidget); // if undefined number of plural forms, use 1 int pf = _catalog->defaultNumberOfPluralForms(); @@ -395,7 +395,7 @@ of the currently displayed entry.</p></qt>")); label=new TQLabel(msgstrEdit,i18n("Trans&lated string (msgstr):"),tempWidget); - hb=new TQHBoxLayout(layout); + hb=new TQHBoxLayout(tqlayout); hb->setSpacing(KDialog::spacingHint()); hb->addSpacing(KDialog::marginHint()); @@ -404,7 +404,7 @@ of the currently displayed entry.</p></qt>")); if(! KBabelSettings::ledInStatusbar()) { - _fuzzyLed = new KLed(Qt::red,KLed::Off,KLed::Sunken,KLed::Rectangular + _fuzzyLed = new KLed(TQt::red,KLed::Off,KLed::Sunken,KLed::Rectangular ,tempWidget); _fuzzyLed->setFixedSize(15,12); label = new TQLabel(i18n("fuzzy"),tempWidget); @@ -413,7 +413,7 @@ of the currently displayed entry.</p></qt>")); hb->addSpacing(KDialog::spacingHint()); - _untransLed = new KLed(Qt::red,KLed::Off,KLed::Sunken,KLed::Rectangular + _untransLed = new KLed(TQt::red,KLed::Off,KLed::Sunken,KLed::Rectangular ,tempWidget); _untransLed->setFixedSize(15,12); label = new TQLabel(i18n("untranslated"),tempWidget); @@ -422,7 +422,7 @@ of the currently displayed entry.</p></qt>")); hb->addSpacing(KDialog::marginHint()); - _errorLed = new KLed(Qt::red,KLed::Off,KLed::Sunken,KLed::Rectangular + _errorLed = new KLed(TQt::red,KLed::Off,KLed::Sunken,KLed::Rectangular ,tempWidget); _errorLed->setFixedSize(15,12); label = new TQLabel(i18n("faulty"),tempWidget); @@ -434,7 +434,7 @@ of the currently displayed entry.</p></qt>")); hb->addStretch(1); // ### TODO: perhaps it should be moreprecise where the setting can be changed - TQString ledMsg=i18n("<qt><p><b>Status LEDs</b></p>\n" + TQString ledMsg=i18n("<qt><p><b>tqStatus LEDs</b></p>\n" "<p>These LEDs display the status of the currently displayed message.\n" "You can change their color in the preferences dialog section\n" "<b>Editor</b> on page <b>Appearance</b></p></qt>"); @@ -443,8 +443,8 @@ of the currently displayed entry.</p></qt>")); TQWhatsThis::add(_errorLed,ledMsg); } - layout->addWidget(msgstrEdit); - layout->setStretchFactor(msgstrEdit,1); + tqlayout->addWidget(msgstrEdit); + tqlayout->setStretchFactor(msgstrEdit,1); TQWhatsThis::add(tempWidget, i18n("<qt><p><b>Translation Editor</b></p>\n\ @@ -685,7 +685,7 @@ void KBabelView::readSettings(KConfig* config) if(KBabelSettings::autoUnsetFuzzy()) { connect(msgstrEdit,TQT_SIGNAL(textChanged()) - ,this,TQT_SLOT(autoRemoveFuzzyStatus())); + ,this,TQT_SLOT(autoRemoveFuzzytqStatus())); } setupAutoCheckTools(); @@ -788,7 +788,7 @@ void KBabelView::readProject(Project::Ptr project) { // turn off spellchecker msgstrEdit->setSpellChecker(0); - // invalidate the current settings, to make sure they are updated when needed + // tqinvalidate the current settings, to make sure they are updated when needed _spellcheckSettings.valid = false; } @@ -854,12 +854,12 @@ void KBabelView::updateSettings() } disconnect(msgstrEdit,TQT_SIGNAL(textChanged()) - ,this,TQT_SLOT(autoRemoveFuzzyStatus())); + ,this,TQT_SLOT(autoRemoveFuzzytqStatus())); if(KBabelSettings::autoUnsetFuzzy()) { connect(msgstrEdit,TQT_SIGNAL(textChanged()) - ,this,TQT_SLOT(autoRemoveFuzzyStatus())); + ,this,TQT_SLOT(autoRemoveFuzzytqStatus())); } msgstrEdit->setCleverEditing(KBabelSettings::cleverEditing()); @@ -931,7 +931,7 @@ void KBabelView::setupAutoCheckTools() TQValueList<KDataToolInfo>::Iterator it; for( it=tools.begin(); it!=tools.end() ; ++it ) { - if(KBabelSettings::autoCheckTools().contains((*it).service()->library()) ) + if(KBabelSettings::autoCheckTools().tqcontains((*it).service()->library()) ) { // maybe we can reuse the tools KDataTool* t = (*it).createTool(); @@ -1013,7 +1013,7 @@ void KBabelView::restoreSession(KConfig* config) if(!url.isEmpty()) { - open(KURL( url ), TQString::null, false,true); + open(KURL( url ), TQString(), false,true); } @@ -1116,7 +1116,7 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo cu.cleanPath(); if(checkIfModified && !url.isEmpty() && cu==url) { - KWin::activateWindow(topLevelWidget()->winId()); + KWin::activateWindow(tqtopLevelWidget()->winId()); return; } @@ -1155,12 +1155,12 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo return; } else { - KWin::activateWindow(v->topLevelWidget()->winId()); + KWin::activateWindow(v->tqtopLevelWidget()->winId()); return; } } - ConversionStatus stat=_catalog->openURL(url, package); + ConversiontqStatus stat=_catalog->openURL(url, package); switch(stat) { @@ -1180,14 +1180,14 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo { KMessageBox::error(this ,i18n("Error while trying to read file:\n %1\n" - "Maybe it is not a valid PO file.").arg(url.prettyURL())); + "Maybe it is not a valid PO file.").tqarg(url.prettyURL())); break; } case NO_ENTRY_ERROR: { KMessageBox::error(this ,i18n("Error while reading the file:\n %1\n" - "No entry found.").arg(url.prettyURL())); + "No entry found.").tqarg(url.prettyURL())); break; } case RECOVERED_PARSE_ERROR: @@ -1204,25 +1204,25 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo case NO_PERMISSIONS: { KMessageBox::error(this,i18n( - "You do not have permissions to read file:\n %1").arg(url.prettyURL())); + "You do not have permissions to read file:\n %1").tqarg(url.prettyURL())); break; } case NO_FILE: { KMessageBox::error(this,i18n( - "You have not specified a valid file:\n %1").arg(url.prettyURL())); + "You have not specified a valid file:\n %1").tqarg(url.prettyURL())); break; } case NO_PLUGIN: { KMessageBox::error(this,i18n( - "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").arg(url.prettyURL())); + "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").tqarg(url.prettyURL())); break; } case UNSUPPORTED_TYPE: { KMessageBox::error(this,i18n( - "The import plugin cannot handle this type of the file:\n %1").arg(url.prettyURL())); + "The import plugin cannot handle this type of the file:\n %1").tqarg(url.prettyURL())); break; } case STOPPED: @@ -1230,7 +1230,7 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo default: { KMessageBox::error(this,i18n( - "Error while trying to open file:\n %1").arg(url.prettyURL())); + "Error while trying to open file:\n %1").tqarg(url.prettyURL())); break; } @@ -1268,7 +1268,7 @@ void KBabelView::revertToSaved() } } - open(_catalog->currentURL(),TQString::null,false); + open(_catalog->currentURL(),TQString(),false); } void KBabelView::openTemplate(const KURL& openURL, const KURL& saveURL) @@ -1282,7 +1282,7 @@ void KBabelView::openTemplate(const KURL& openURL, const KURL& saveURL) setCursor(KCursor::waitCursor());*/ - ConversionStatus stat=_catalog->openURL(openURL,saveURL); + ConversiontqStatus stat=_catalog->openURL(openURL,saveURL); switch(stat) { @@ -1295,21 +1295,21 @@ void KBabelView::openTemplate(const KURL& openURL, const KURL& saveURL) // For a template, recoverable errors are disqualifying KMessageBox::sorry(this, i18n("There was an error while reading the file header of file:\n %1") - .arg(openURL.prettyURL())); + .tqarg(openURL.prettyURL())); break; } case PARSE_ERROR: { KMessageBox::error(this ,i18n("Error while trying to read file:\n %1\n" - "Maybe it is not a valid PO file.").arg(openURL.prettyURL())); + "Maybe it is not a valid PO file.").tqarg(openURL.prettyURL())); break; } case NO_ENTRY_ERROR: { KMessageBox::error(this ,i18n("Error while reading the file:\n %1\n" - "No entry found.").arg(openURL.prettyURL())); + "No entry found.").tqarg(openURL.prettyURL())); break; } case RECOVERED_PARSE_ERROR: @@ -1317,36 +1317,36 @@ void KBabelView::openTemplate(const KURL& openURL, const KURL& saveURL) // For a template, recoverable errors are disqualifying KMessageBox::sorry(this, i18n("Minor syntax errors were found while reading file:\n %1") - .arg(openURL.prettyURL())); + .tqarg(openURL.prettyURL())); break; } case NO_PERMISSIONS: { - KMessageBox::error(this,i18n("You do not have permissions to read file:\n %1").arg(openURL.prettyURL())); + KMessageBox::error(this,i18n("You do not have permissions to read file:\n %1").tqarg(openURL.prettyURL())); break; } case NO_FILE: { - KMessageBox::error(this,i18n("You have not specified a valid file:\n %1").arg(openURL.prettyURL())); + KMessageBox::error(this,i18n("You have not specified a valid file:\n %1").tqarg(openURL.prettyURL())); break; } case NO_PLUGIN: { KMessageBox::error(this,i18n( - "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").arg(openURL.prettyURL())); + "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").tqarg(openURL.prettyURL())); break; } case UNSUPPORTED_TYPE: { KMessageBox::error(this,i18n( - "The import plugin cannot handle this type of the file:\n %1").arg(openURL.prettyURL())); + "The import plugin cannot handle this type of the file:\n %1").tqarg(openURL.prettyURL())); break; } case STOPPED: break; default: { - KMessageBox::error(this,i18n("Error while trying to open file:\n %1").arg(openURL.prettyURL())); + KMessageBox::error(this,i18n("Error while trying to open file:\n %1").tqarg(openURL.prettyURL())); break; } @@ -1368,7 +1368,7 @@ bool KBabelView::saveFile(bool syntaxCheck) } else { - ConversionStatus stat=_catalog->saveFile(); + ConversiontqStatus stat=_catalog->saveFile(); int whatToDo = -1; @@ -1386,20 +1386,20 @@ bool KBabelView::saveFile(bool syntaxCheck) { whatToDo=KMessageBox::warningContinueCancel(this, i18n("You do not have permission to write to file:\n%1\n" - "Do you want to save to another file or cancel?").arg(_catalog->currentURL().prettyURL()), + "Do you want to save to another file or cancel?").tqarg(_catalog->currentURL().prettyURL()), i18n("Error"),KStdGuiItem::save()); break; } case NO_PLUGIN: { KMessageBox::error(this,i18n( - "KBabel cannot find a corresponding plugin for the MIME type of file:\n %1").arg(_catalog->currentURL().prettyURL())); + "KBabel cannot find a corresponding plugin for the MIME type of file:\n %1").tqarg(_catalog->currentURL().prettyURL())); break; } case UNSUPPORTED_TYPE: { KMessageBox::error(this,i18n( - "The export plugin cannot handle this type of file:\n %1").arg(_catalog->currentURL().prettyURL())); + "The export plugin cannot handle this type of file:\n %1").tqarg(_catalog->currentURL().prettyURL())); break; } case BUSY: @@ -1415,7 +1415,7 @@ bool KBabelView::saveFile(bool syntaxCheck) { whatToDo=KMessageBox::warningContinueCancel(this, i18n("An error occurred while trying to write to file:\n%1\n" - "Do you want to save to another file or cancel?").arg(_catalog->currentURL().prettyURL()), + "Do you want to save to another file or cancel?").tqarg(_catalog->currentURL().prettyURL()), i18n("Error"),KStdGuiItem::save()); break; } @@ -1448,8 +1448,8 @@ bool KBabelView::saveFileAs(KURL url, bool syntaxCheck) if (KIO::NetAccess::exists(url, false, this)) { - if(KMessageBox::warningContinueCancel(this,TQString("<qt>%1</qt>").arg(i18n("The file %1 already exists. " - "Do you want to overwrite it?").arg(url.prettyURL())),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Cancel) + if(KMessageBox::warningContinueCancel(this,TQString("<qt>%1</qt>").tqarg(i18n("The file %1 already exists. " + "Do you want to overwrite it?").tqarg(url.prettyURL())),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Cancel) { return false; } @@ -1458,7 +1458,7 @@ bool KBabelView::saveFileAs(KURL url, bool syntaxCheck) bool wasReadOnly=_catalog->isReadOnly(); - ConversionStatus stat=_catalog->saveFileAs(url,true); + ConversiontqStatus stat=_catalog->saveFileAs(url,true); // if the file was not saved sucessfully ask for saving to another file @@ -1474,30 +1474,30 @@ bool KBabelView::saveFileAs(KURL url, bool syntaxCheck) case NO_PERMISSIONS: { message=i18n("You do not have permission to write to file:\n%1\n" - "Do you want to save to another file or cancel?").arg(url.prettyURL()); + "Do you want to save to another file or cancel?").tqarg(url.prettyURL()); break; } case NO_FILE: { message=i18n("You have specified a folder:\n%1\n" - "Do you want to save to another file or cancel?").arg(url.prettyURL()); + "Do you want to save to another file or cancel?").tqarg(url.prettyURL()); break; } case NO_PLUGIN: { - message=i18n("KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").arg(url.prettyURL()); + message=i18n("KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").tqarg(url.prettyURL()); break; } case UNSUPPORTED_TYPE: { message=i18n( - "The export plugin cannot handle this type of the file:\n %1").arg(url.prettyURL()); + "The export plugin cannot handle this type of the file:\n %1").tqarg(url.prettyURL()); break; } default: { message=i18n("An error occurred while trying to write to file:\n%1\n" - "Do you want to save to another file or cancel?").arg(url.prettyURL()); + "Do you want to save to another file or cancel?").tqarg(url.prettyURL()); break; } } @@ -1518,7 +1518,7 @@ bool KBabelView::saveFileAs(KURL url, bool syntaxCheck) if (KIO::NetAccess::exists(url, false, this)) { if(KMessageBox::warningContinueCancel(this,i18n("The file %1 already exists.\n" - "Do you want to overwrite it?").arg(url.prettyURL()),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Continue) + "Do you want to overwrite it?").tqarg(url.prettyURL()),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Continue) { stat=_catalog->saveFileAs(url); if(stat!=OK) @@ -1625,7 +1625,7 @@ bool KBabelView::checkSyntax(bool msgOnlyAtError,bool question) bool returnCode=true; TQString output; - Msgfmt::Status result=_catalog->checkSyntax( output ); + Msgfmt::tqStatus result=_catalog->checkSyntax( output ); const TQStringList outputLines = TQStringList::split("\n",output); @@ -1831,20 +1831,20 @@ void KBabelView::updateEditor(int form, bool delay) if(KBabelSettings::autoUnsetFuzzy() && !msgstrEdit->isModified()) { - disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzyStatus())); + disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzytqStatus())); } msgidLabel->setText(_catalog->msgid(_currentIndex), _catalog->msgctxt(_currentIndex)); - msgidLabel->repaint(); + msgidLabel->tqrepaint(); msgstrEdit->setText(_catalog->msgstr(_currentIndex)); msgstrEdit->showForm( form ); - msgstrEdit->repaint(); + msgstrEdit->tqrepaint(); m_cataloglistview->setSelectedItem(_currentIndex); if(KBabelSettings::autoUnsetFuzzy() && _catalog->isFuzzy(_currentIndex)) { - connect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzyStatus())); + connect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzytqStatus())); } msgstrEdit->blockSignals(false); @@ -2034,7 +2034,7 @@ bool KBabelView::findNext_internal(DocPosition& pos, bool forReplace, bool gui) r = KMessageBox::questionYesNo(this, i18n("<qt>%n replacement made.<br>End of document reached.<br>Continue from the beginning?</qt>", "<qt>%n replacements made.<br>End of document reached.<br>Continue from the beginning?</qt>", - _replacesTotal), TQString::null, KStdGuiItem::cont(), KStdGuiItem::cancel()); + _replacesTotal), TQString(), KStdGuiItem::cont(), KStdGuiItem::cancel()); } else { r = KMessageBox::Yes; @@ -2042,7 +2042,7 @@ bool KBabelView::findNext_internal(DocPosition& pos, bool forReplace, bool gui) } else { r = KMessageBox::questionYesNo(this,i18n("End of document reached.\n" - "Continue from the beginning?"), TQString::null, KStdGuiItem::cont(), KStdGuiItem::cancel()); + "Continue from the beginning?"), TQString(), KStdGuiItem::cont(), KStdGuiItem::cancel()); } if(r == KMessageBox::Yes) { if(opts.inMsgid && !forReplace) @@ -2078,7 +2078,7 @@ bool KBabelView::findNext_internal(DocPosition& pos, bool forReplace, bool gui) if( opts.askForNextFile ) { int r = KMessageBox::questionYesNo(this,i18n("End of document reached.\n" - "Continue in the next file?"), TQString::null, KStdGuiItem::cont(), KStdGuiItem::cancel()); + "Continue in the next file?"), TQString(), KStdGuiItem::cont(), KStdGuiItem::cancel()); if( r != KMessageBox::Yes ) return false; } @@ -2219,7 +2219,7 @@ bool KBabelView::findPrev_internal(DocPosition& pos, bool forReplace, bool gui) r = KMessageBox::questionYesNo(this, i18n("<qt>%n replacement made.<br>Beginning of document reached.<br>Continue from the end?</qt>", "<qt>%n replacements made.<br>Beginning of document reached.<br>Continue from the end?</qt>", - _replacesTotal),TQString::null, KStdGuiItem::cont(), KStdGuiItem::cancel()); + _replacesTotal),TQString(), KStdGuiItem::cont(), KStdGuiItem::cancel()); } else { r = KMessageBox::Yes; @@ -2228,7 +2228,7 @@ bool KBabelView::findPrev_internal(DocPosition& pos, bool forReplace, bool gui) } else { r = KMessageBox::questionYesNo(this,i18n("Beginning of document reached.\n" - "Continue from the end?"), TQString::null, KStdGuiItem::cont(), KStdGuiItem::cancel()); + "Continue from the end?"), TQString(), KStdGuiItem::cont(), KStdGuiItem::cancel()); } if(r == KMessageBox::Yes) { pos.item = _catalog->numberOfEntries()-1; @@ -2331,7 +2331,7 @@ bool KBabelView::findPrev_internal(DocPosition& pos, bool forReplace, bool gui) } -void KBabelView::find() +void KBabelView::tqfind() { Part hadFocus; if(msgidLabel->hasFocus()) @@ -2425,7 +2425,7 @@ void KBabelView::find() } } -void KBabelView::replace() +void KBabelView::tqreplace() { _replacesTotal=0; _replaceLen=0; @@ -2518,7 +2518,7 @@ void KBabelView::replace() if(success) { if(!_replaceAskDialog) { _replaceAskDialog = new ReplaceDialog(this); - connect(_replaceAskDialog,TQT_SIGNAL(replace()),this,TQT_SLOT(replaceNext())); + connect(_replaceAskDialog,TQT_SIGNAL(tqreplace()),this,TQT_SLOT(replaceNext())); connect(_replaceAskDialog,TQT_SIGNAL(next()),this,TQT_SLOT(findNextReplace())); connect(_replaceAskDialog,TQT_SIGNAL(replaceAll()),this,TQT_SLOT(replaceAll())); } @@ -2749,7 +2749,7 @@ void KBabelView::replaceInFile(TQCString fileSource, KBabel::ReplaceOptions opti else { if(!_replaceAskDialog) { _replaceAskDialog = new ReplaceDialog(this); - connect(_replaceAskDialog,TQT_SIGNAL(replace()),this,TQT_SLOT(replaceNext())); + connect(_replaceAskDialog,TQT_SIGNAL(tqreplace()),this,TQT_SLOT(replaceNext())); connect(_replaceAskDialog,TQT_SIGNAL(next()),this,TQT_SLOT(findNextReplace())); connect(_replaceAskDialog,TQT_SIGNAL(replaceAll()),this,TQT_SLOT(replaceAll())); } @@ -2803,37 +2803,37 @@ void KBabelView::msgid2msgstr() TQString text = _catalog->msgid(_currentIndex).first(); // this is KDE specific: - if(text.find("_: NAME OF TRANSLATORS\\n")==0) + if(text.tqfind("_: NAME OF TRANSLATORS\\n")==0) { text=_catalog->identitySettings().authorLocalizedName; } - else if(text.find("_: EMAIL OF TRANSLATORS\\n")==0) + else if(text.tqfind("_: EMAIL OF TRANSLATORS\\n")==0) { text=_catalog->identitySettings().authorEmail; } - else if(_catalog->isGeneratedFromDocbook() && text.find("ROLES_OF_TRANSLATORS")==0) + else if(_catalog->isGeneratedFromDocbook() && text.tqfind("ROLES_OF_TRANSLATORS")==0) { text="<othercredit role=\\\"translator\\\">\n" "<firstname></firstname><surname></surname>\n" "<affiliation><address><email>"+_catalog->identitySettings().authorEmail+"</email></address>\n" "</affiliation><contrib></contrib></othercredit>"; } - else if(_catalog->isGeneratedFromDocbook() && text.find("CREDIT_FOR_TRANSLATORS")==0) + else if(_catalog->isGeneratedFromDocbook() && text.tqfind("CREDIT_FOR_TRANSLATORS")==0) { text="<para>"+_catalog->identitySettings().authorLocalizedName+"\n"+ "<email>"+_catalog->identitySettings().authorEmail+"</email></para>"; } - else if(text.contains(_catalog->miscSettings().singularPlural)) + else if(text.tqcontains(_catalog->miscSettings().singularPlural)) { - text.replace(_catalog->miscSettings().singularPlural,""); + text.tqreplace(_catalog->miscSettings().singularPlural,""); } // end of KDE specific part TQRegExp reg=_catalog->miscSettings().contextInfo; - if(text.contains(reg)) + if(text.tqcontains(reg)) { - text.replace(reg,""); + text.tqreplace(reg,""); } modifyMsgstrText(0,text,true); @@ -3159,7 +3159,7 @@ void KBabelView::forwardHistory() } } -void KBabelView::removeFuzzyStatus() +void KBabelView::removeFuzzytqStatus() { bool newState = !_catalog->isFuzzy(_currentIndex); _catalog->setFuzzy(_currentIndex,newState); @@ -3204,9 +3204,9 @@ void KBabelView::startSearch(bool delay) { TQString msg = _catalog->msgid(_currentIndex,true).first(); TQRegExp reg=_catalog->miscSettings().contextInfo; - if(msg.contains(reg)) + if(msg.tqcontains(reg)) { - msg.replace(reg,""); + msg.tqreplace(reg,""); } dictBox->setActiveModule(KBabelSettings::defaultModule()); @@ -3225,9 +3225,9 @@ void KBabelView::startSearch(const TQString module) // FIXME: should care about plural forms TQString msg = _catalog->msgid(_currentIndex,true).first(); TQRegExp reg=_catalog->miscSettings().contextInfo; - if(msg.contains(reg)) + if(msg.tqcontains(reg)) { - msg.replace(reg,""); + msg.tqreplace(reg,""); } dictBox->setActiveModule(module); @@ -3258,9 +3258,9 @@ void KBabelView::startSelectionSearch(const TQString module) // should care about plural forms TQString msg = _catalog->msgid(_currentIndex,true).first(); TQRegExp reg=_catalog->miscSettings().contextInfo; - if(msg.contains(reg)) + if(msg.tqcontains(reg)) { - msg.replace(reg,""); + msg.tqreplace(reg,""); } dictBox->startSearch(msg); @@ -3302,12 +3302,12 @@ void KBabelView::emitEntryState() TQPalette palette=msgstrEdit->palette(); palette.setColor( TQColorGroup::Text, red ); - if( _catalog->itemStatus(_currentIndex).contains("syntax error")) + if( _catalog->itemtqStatus(_currentIndex).tqcontains("syntax error")) { msgstrEdit->setCurrentColor( MsgMultiLineEdit::ErrorColor ); } else - if( !_catalog->itemStatus(_currentIndex).isEmpty() && KBabelSettings::autoCheckColorError()) + if( !_catalog->itemtqStatus(_currentIndex).isEmpty() && KBabelSettings::autoCheckColorError()) { msgstrEdit->setCurrentColor( MsgMultiLineEdit::ErrorColor ); } @@ -3332,12 +3332,12 @@ void KBabelView::checkUntranslated() emit signalUntranslatedInFront(_catalog->hasUntranslatedInFront(_currentIndex)); } -void KBabelView::autoRemoveFuzzyStatus() +void KBabelView::autoRemoveFuzzytqStatus() { // only at first text change remove fuzzy status - disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzyStatus())); + disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzytqStatus())); - //removeFuzzyStatus(); + //removeFuzzytqStatus(); } void KBabelView::toggleFuzzyLed(bool on) @@ -3446,7 +3446,7 @@ bool KBabelView::eventFilter( TQObject* object, TQEvent* event) { // This is a little workaround to use CTRL+ALT+Home, CTRL+ALT+End, Undo keys // to go to the first and the last entry. Because otherwise - // CTRL+Home and CTRL+End and Undo are caught by QTextEdit + // CTRL+Home and CTRL+End and Undo are caught by TQTextEdit TQKeyEvent *ke = (TQKeyEvent*)event; if(ke->key() == Key_Home && ke->state() == (AltButton | ControlButton)) @@ -3541,7 +3541,7 @@ void KBabelView::forwardMsgstrEditCmd(EditCommand* cmd) _catalog->applyBeginCommand(_currentIndex,Msgstr,this); - removeFuzzyStatus(); + removeFuzzytqStatus(); } cmd->setPart(Msgstr); @@ -3576,13 +3576,13 @@ void KBabelView::autoCheck(bool onlyWhenChanged) { if( !_autocheckTools.isEmpty() ) { - TQStringList oldStatus = _catalog->itemStatus(_currentIndex); + TQStringList oldtqStatus = _catalog->itemtqStatus(_currentIndex); - TQStringList status = _catalog->itemStatus( _currentIndex,true, _autocheckTools ); + TQStringList status = _catalog->itemtqStatus( _currentIndex,true, _autocheckTools ); // if there is more than one view, the status changes only in // one view, so we have to update always. - if(_catalog->isLastView() && onlyWhenChanged && oldStatus == status) + if(_catalog->isLastView() && onlyWhenChanged && oldtqStatus == status) return; if( !status.isEmpty() ) @@ -3598,8 +3598,8 @@ void KBabelView::autoCheck(bool onlyWhenChanged) else msg += ", "+locale->translate("what check found errors",(*it).utf8()); } - //i18n: translators: Status bar text that automatic checks have found some errors - emit signalChangeStatusbar(i18n("1 error: %1", "%n errors: %1", status.size ()).arg(msg)); + //i18n: translators: tqStatus bar text that automatic checks have found some errors + emit signalChangeStatusbar(i18n("1 error: %1", "%n errors: %1", status.size ()).tqarg(msg)); emit signalFaultyDisplayed(true); if(KBabelSettings::autoCheckColorError()) @@ -3611,7 +3611,7 @@ void KBabelView::autoCheck(bool onlyWhenChanged) { if(onlyWhenChanged) { - if(oldStatus != status && oldStatus.isEmpty() ) + if(oldtqStatus != status && oldtqStatus.isEmpty() ) { KNotifyClient::beep(); } @@ -3622,7 +3622,7 @@ void KBabelView::autoCheck(bool onlyWhenChanged) } } } - else if( _catalog->itemStatus(_currentIndex).isEmpty() ) + else if( _catalog->itemtqStatus(_currentIndex).isEmpty() ) { _catalog->removeFromErrorList(_currentIndex); @@ -3732,7 +3732,7 @@ void KBabelView::addSpellcheckWords( uint pos, TQString text, uint index, uint f } else if( c == '\\') { - if(pos+1 < textLength && spclChars.contains(text[pos+1]) ) + if(pos+1 < textLength && spclChars.tqcontains(text[pos+1]) ) { pos+=2; } @@ -3895,7 +3895,7 @@ void KBabelView::spellcheck() uint lastPercent=0; for(uint i=first; i <= last; i++) { - if(emitProgress && 100*i/ QMAX(total,1) > lastPercent) + if(emitProgress && 100*i/ TQMAX(total,1) > lastPercent) { lastPercent++; emit signalProgress(lastPercent); @@ -3981,9 +3981,9 @@ void KBabelView::spellStart(KSpell *) if(_spellcheckSettings.rememberIgnored) { TQString urlString = _spellcheckSettings.ignoreURL; - if(urlString.contains("@PACKAGE@")) + if(urlString.tqcontains("@PACKAGE@")) { - urlString.replace("@PACKAGE@",_catalog->packageName()); + urlString.tqreplace("@PACKAGE@",_catalog->packageName()); } // ### TODO: correctly set the URL; support for MostLocalURL KURL url(urlString); @@ -4004,7 +4004,7 @@ void KBabelView::spellStart(KSpell *) KMessageBox::sorry(this, i18n("Error opening the file that contains words " "to ignore during spell checking:\n" - "%1").arg(file.name())); + "%1").tqarg(file.name())); } } else @@ -4012,7 +4012,7 @@ void KBabelView::spellStart(KSpell *) KMessageBox::sorry(this, i18n("Only local files are allowed for saving " "ignored words to during spell checking:\n" - "%1").arg(urlString)); + "%1").tqarg(urlString)); } if(spell.ignoreList.count() > 0) @@ -4085,13 +4085,13 @@ bool KBabelView::markMisspelled(const TQString &orig, unsigned int pos) text=text.mid(begin,end-begin); TQChar accelMarker=_catalog->miscSettings().accelMarker; - if(text.contains(accelMarker)) + if(text.tqcontains(accelMarker)) { - text.replace(accelMarker,""); + text.tqreplace(accelMarker,""); } - if(text.contains('\n')) + if(text.tqcontains('\n')) { - text.replace("\n",""); + text.tqreplace("\n",""); } bool textOk=true; @@ -4099,8 +4099,8 @@ bool KBabelView::markMisspelled(const TQString &orig, unsigned int pos) { // if text and orig are not the same, // maybe it was a word with hyphens - int n=text.contains('-'); - n+=text.contains('\''); + int n=text.tqcontains('-'); + n+=text.tqcontains('\''); if( n > 0 ) { // re-get the original text since we replace some things above @@ -4113,8 +4113,8 @@ bool KBabelView::markMisspelled(const TQString &orig, unsigned int pos) while(!textFound && i <= n) { int lastPos=e+1; - e = text.find('-',lastPos); - int tmp = text.find('\'',lastPos); + e = text.tqfind('-',lastPos); + int tmp = text.tqfind('\'',lastPos); if(e < 0 && tmp > 0) { e=tmp; @@ -4127,13 +4127,13 @@ bool KBabelView::markMisspelled(const TQString &orig, unsigned int pos) if(e<0) e=text.length(); TQString w=text.mid(lastPos,e-lastPos); - if(w.contains(accelMarker)) + if(w.tqcontains(accelMarker)) { - w.replace(accelMarker,""); + w.tqreplace(accelMarker,""); } - if(text.contains('\n')) + if(text.tqcontains('\n')) { - text.replace("\n",""); + text.tqreplace("\n",""); } if( w == orig) { @@ -4225,15 +4225,15 @@ void KBabelView::spellCorrected(const TQString &orig, const TQString &word, unsi TQString marked=msgstrEdit->selectedText(); spell.origWords.append(marked); - if(marked.contains("\n") && !newWord.contains('\n')) + if(marked.tqcontains("\n") && !newWord.tqcontains('\n')) { TQString s1=newWord; - s1.replace(" ","\n"); + s1.tqreplace(" ","\n"); // if only a newline has been replaced with a white space if(s1==marked) { - newWord.replace(" "," \n"); + newWord.tqreplace(" "," \n"); } } @@ -4241,11 +4241,11 @@ void KBabelView::spellCorrected(const TQString &orig, const TQString &word, unsi // word has no accelerator, try to add the accelerator for // the same char else add in at the same position TQChar accelMarker=_catalog->miscSettings().accelMarker; - if(marked.contains(accelMarker) && !newWord.contains(accelMarker)) + if(marked.tqcontains(accelMarker) && !newWord.tqcontains(accelMarker)) { - int b=marked.find(accelMarker); + int b=marked.tqfind(accelMarker); TQChar accel=marked[b+1]; - int nb=newWord.find(accel,0,false); + int nb=newWord.tqfind(accel,0,false); if(nb>=0) { newWord.insert(nb,accelMarker); @@ -4379,7 +4379,7 @@ void KBabelView::spellCleanDone() // if the pointer is cleared, you have finished correcly if( !spell.kspell ) return; - KSpell::spellStatus status = spell.kspell->status(); + KSpell::spelltqStatus status = spell.kspell->status(); if(status == KSpell::Error || status == KSpell::Crashed) { @@ -4422,7 +4422,7 @@ void KBabelView::cancelSpellcheck() void KBabelView::spellAddIgnore(const TQString &word) { - if(!spell.ignoreList.contains(word)) + if(!spell.ignoreList.tqcontains(word)) { spell.newIgnoreList.append(word); } diff --git a/kbabel/kbabel/kbabelview.h b/kbabel/kbabel/kbabelview.h index be492548..8fecb9f0 100644 --- a/kbabel/kbabel/kbabelview.h +++ b/kbabel/kbabel/kbabelview.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -93,12 +93,13 @@ class TagListView; class KBabelView : public TQWidget, public KBabel::CatalogView { Q_OBJECT + TQ_OBJECT public: /** * Default constructor * @param buildLeds flag, if status leds should be created in editor */ - KBabelView(KBCatalog* catalog,KBabelMW *parent, KBabel::Project::Ptr project); + KBabelView(KBCatalog* catalog,KBabelMW *tqparent, KBabel::Project::Ptr project); /** * Destructor @@ -202,7 +203,7 @@ public slots: /** opens a filedialog and asks for an url */ void open(); - void open(const KURL& url, const TQString & package=TQString::null, bool checkModified=true, bool newView=false); + void open(const KURL& url, const TQString & package=TQString(), bool checkModified=true, bool newView=false); void setFilePackage(); void revertToSaved(); @@ -216,10 +217,10 @@ public slots: void textPaste(); bool findNext(); bool findPrev(); - void find(); + void tqfind(); void findInFile(TQCString fileSource, KBabel::FindOptions options); void replaceInFile(TQCString fileSource, KBabel::ReplaceOptions options); - void replace(); + void tqreplace(); void selectAll(); void deselectAll(); void clear(); @@ -267,7 +268,7 @@ public slots: void skipToTagFromTool(int index); void wordCount(); - void removeFuzzyStatus(); + void removeFuzzytqStatus(); /** opens the header editor for the po-file */ void editHeader(); @@ -450,7 +451,7 @@ protected slots: private slots: void msgstrPluralFormChanged (uint index); - void autoRemoveFuzzyStatus(); + void autoRemoveFuzzytqStatus(); /** connected to the catalog. it is called when a new file is opened*/ void newFileOpened(bool readOnly); @@ -469,13 +470,13 @@ private slots: */ void replaceNext(); /** - * called from a signal from ReplaceDialog to replace + * called from a signal from ReplaceDialog to tqreplace * all without asking anymore. */ void replaceAll(); /** * called from a signal from ReplaceDialog to go to next - * string to replace + * string to tqreplace */ void findNextReplace(); diff --git a/kbabel/kbabel/kbabelview2.cpp b/kbabel/kbabel/kbabelview2.cpp index 101674a3..7b700390 100644 --- a/kbabel/kbabel/kbabelview2.cpp +++ b/kbabel/kbabel/kbabelview2.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -203,7 +203,7 @@ void KBabelView::updateTags() { TQString s = *it; if( s.startsWith("&") ) s = "&"+s; - if(!tList.contains(s)) + if(!tList.tqcontains(s)) { _tagsMenu->insertItem(s,counter); tList.append(s); @@ -297,7 +297,7 @@ void KBabelView::modifyMsgstrText(const uint offset, const TQString& text, bool void KBabelView::insertTag(int n) { TQString tag = _tagsMenu->text(n); - if( tag.startsWith( "&&" ) ) tag = tag.remove(0,1); // replace && -> &. && is used for correct menu display + if( tag.startsWith( "&&" ) ) tag = tag.remove(0,1); // tqreplace && -> &. && is used for correct menu display modifyMsgstrText( msgstrEdit->currentIndex(), tag ); } @@ -331,10 +331,10 @@ void KBabelView::insertNextTagMsgid() if( _catalog->pluralForm( _currentIndex ) == KDESpecific ) { int pos = msgstrEdit->currentIndex(); - int currentFormBegin=s.findRev("\\n",pos); + int currentFormBegin=s.tqfindRev("\\n",pos); if( currentFormBegin == -1 ) currentFormBegin=0; else currentFormBegin+=3; // skip the newline - int currentFormEnd=s.find("\\n",pos); + int currentFormEnd=s.tqfind("\\n",pos); if( currentFormEnd == -1 ) currentFormEnd=s.length(); s=s.mid(currentFormBegin,currentFormEnd-currentFormBegin); @@ -382,7 +382,7 @@ void KBabelView::updateArgs() for(it=_args.begin(); it!=_args.end(); ++it) { TQString s = *it; - if(!tList.contains(s)) + if(!tList.tqcontains(s)) { _argsMenu->insertItem(s,counter); tList.append(s); @@ -427,10 +427,10 @@ void KBabelView::insertNextArg() if( _catalog->pluralForm( _currentIndex ) == KDESpecific ) { int pos = msgstrEdit->currentIndex(); - int currentFormBegin=s.findRev("\\n",pos); + int currentFormBegin=s.tqfindRev("\\n",pos); if( currentFormBegin == -1 ) currentFormBegin=0; else currentFormBegin+=3; // skip the newline - int currentFormEnd=s.find("\\n",pos); + int currentFormEnd=s.tqfind("\\n",pos); if( currentFormEnd == -1 ) currentFormEnd=s.length(); s=s.mid(currentFormBegin,currentFormEnd-currentFormBegin); @@ -537,7 +537,7 @@ void KBabelView::diffInternal(bool autoDf) KMessageBox::sorry(this ,i18n("An error occurred while trying to get the list " "of messages for this file from the database:\n" - "%1").arg(error)); + "%1").tqarg(error)); _diffing=false; _diffEnabled=false; @@ -709,7 +709,7 @@ bool KBabelView::openDiffFile(bool autoDiff) connect(&cat,TQT_SIGNAL(signalProgress(int)),this,TQT_SIGNAL(signalProgress(int))); emit signalResetProgressBar(i18n("loading file for diff"),100); - ConversionStatus stat = cat.openURL(url); + ConversiontqStatus stat = cat.openURL(url); emit signalClearProgressBar(); @@ -722,40 +722,40 @@ bool KBabelView::openDiffFile(bool autoDiff) { KMessageBox::sorry(this ,i18n("Error while trying to read file:\n %1\n" - "Maybe it is not a valid PO file.").arg(url.prettyURL())); + "Maybe it is not a valid PO file.").tqarg(url.prettyURL())); break; } case NO_PERMISSIONS: { KMessageBox::sorry(this,i18n( "You do not have permissions to read file:\n %1") - .arg(url.prettyURL())); + .tqarg(url.prettyURL())); break; } case NO_FILE: { KMessageBox::sorry(this,i18n( "You have not specified a valid file:\n %1") - .arg(url.prettyURL())); + .tqarg(url.prettyURL())); break; } case NO_PLUGIN: { KMessageBox::error(this,i18n( - "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").arg(url.prettyURL())); + "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").tqarg(url.prettyURL())); break; } case UNSUPPORTED_TYPE: { KMessageBox::error(this,i18n( - "The import plugin cannot handle this type of the file:\n %1").arg(url.prettyURL())); + "The import plugin cannot handle this type of the file:\n %1").tqarg(url.prettyURL())); break; } default: { KMessageBox::sorry(this,i18n( "Error while trying to open file:\n %1") - .arg(url.prettyURL())); + .tqarg(url.prettyURL())); break; } @@ -802,12 +802,12 @@ void KBabelView::showTryLaterMessageBox() "However, the string might be found " "in the files being searched at the moment.\n" "Please try later."), contents); - label2->setAlignment( Qt::AlignAuto | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak ); - label2->setMinimumSize(label2->sizeHint()); + label2->tqsetAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::ExpandTabs | TQt::WordBreak ); + label2->setMinimumSize(label2->tqsizeHint()); lay->add( label2 ); lay->addStretch(1); - TQCheckBox *checkbox = new TQCheckBox(i18n("Do not show in this find/replace session again"), topcontents); + TQCheckBox *checkbox = new TQCheckBox(i18n("Do not show in this tqfind/replace session again"), topcontents); dialog->setMainWidget(topcontents); dialog->enableButtonSeparator(false); @@ -822,7 +822,7 @@ void KBabelView::showTryLaterMessageBox() void KBabelView::setFilePackage() { bool result=false; - TQString p = KInputDialog::getText(TQString::null, i18n("Enter new package for the current file:"),_catalog->package(),&result,this); + TQString p = KInputDialog::getText(TQString(), i18n("Enter new package for the current file:"),_catalog->package(),&result,this); if( result ) { _catalog->setPackage(p); @@ -904,10 +904,10 @@ void KBabelView::plural2msgstr() case KDESpecific: { pos = msgstrEdit->currentIndex(); - currentFormBegin=text.findRev("\\n",pos); + currentFormBegin=text.tqfindRev("\\n",pos); if( currentFormBegin == -1 ) currentFormBegin=0; else currentFormBegin+=3; // skip the newline - currentFormEnd=text.find("\\n",pos); + currentFormEnd=text.tqfind("\\n",pos); if( currentFormEnd == -1 ) currentFormEnd=text.length(); text=text.mid(currentFormBegin,currentFormEnd-currentFormBegin); @@ -1020,6 +1020,6 @@ void KBabelView::wordCount() KMessageBox::information( this , i18n("Total words: %1\n\n" "Words in untranslated messages: %2\n\n" -"Words in fuzzy messages: %3").arg(total).arg(untranslated).arg(fuzzy) +"Words in fuzzy messages: %3").tqarg(total).tqarg(untranslated).tqarg(fuzzy) , i18n("Word Count") ); } diff --git a/kbabel/kbabel/kbbookmarkhandler.cpp b/kbabel/kbabel/kbbookmarkhandler.cpp index 2685905b..4d3f0a37 100644 --- a/kbabel/kbabel/kbbookmarkhandler.cpp +++ b/kbabel/kbabel/kbbookmarkhandler.cpp @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -48,12 +48,12 @@ KBabelBookmark::KBabelBookmark(int msgindex, TQString msgtext) } // insert one '&' before every consecutive group of ampersands to keep the - // first of these from acting either as accelerator or mask in the menu + // first of these from acting either as accelerator or tqmask in the menu TQRegExp rx("&+"); - int pos = msgtext.find(rx); + int pos = msgtext.tqfind(rx); while (pos >= 0) { msgtext.insert(pos, '&'); - pos = msgtext.find(rx, pos + rx.matchedLength() + 1); + pos = msgtext.tqfind(rx, pos + rx.matchedLength() + 1); } _msgtext = msgtext; @@ -94,7 +94,7 @@ void KBabelBookmarkHandler::addBookmark(KBabelBookmark* b) // if it's okay then add the bookmark _list.append(b); - _menu->insertItem(TQString("#%1 - %2").arg(b->msgindex()).arg(b->msgtext()), + _menu->insertItem(TQString("#%1 - %2").tqarg(b->msgindex()).tqarg(b->msgtext()), this, TQT_SIGNAL(signalBookmarkSelected(int)), 0, b->msgindex()); } diff --git a/kbabel/kbabel/kbbookmarkhandler.h b/kbabel/kbabel/kbbookmarkhandler.h index 3f4987f2..5de46cb1 100644 --- a/kbabel/kbabel/kbbookmarkhandler.h +++ b/kbabel/kbabel/kbbookmarkhandler.h @@ -19,11 +19,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -85,9 +85,10 @@ class KBabelBookmark /** * Simple class for managing bookmarks in KBabel. */ -class KBabelBookmarkHandler : public QObject +class KBabelBookmarkHandler : public TQObject { Q_OBJECT + TQ_OBJECT public: /** diff --git a/kbabel/kbabel/kbcatalog.cpp b/kbabel/kbabel/kbcatalog.cpp index 4c4e269a..933df9de 100644 --- a/kbabel/kbabel/kbcatalog.cpp +++ b/kbabel/kbabel/kbcatalog.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -35,8 +35,8 @@ #include "headereditor.h" -KBCatalog::KBCatalog(TQString configFile, TQObject* parent, const char* name) - : KBabel::Catalog(parent,name,configFile) +KBCatalog::KBCatalog(TQString configFile, TQObject* tqparent, const char* name) + : KBabel::Catalog(tqparent,name,configFile) { _headerEditor=0; } diff --git a/kbabel/kbabel/kbcatalog.h b/kbabel/kbabel/kbcatalog.h index 2c2846d4..9911180b 100644 --- a/kbabel/kbabel/kbcatalog.h +++ b/kbabel/kbabel/kbcatalog.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -46,9 +46,10 @@ class HeaderEditor; class KBCatalog : public KBabel::Catalog { Q_OBJECT + TQ_OBJECT public: - KBCatalog(TQString configFile = TQString::null ,TQObject* parent=0, const char* name=0); + KBCatalog(TQString configFile = TQString() ,TQObject* tqparent=0, const char* name=0); virtual ~KBCatalog(); HeaderEditor* headerEditor(); diff --git a/kbabel/kbabel/kbcataloglistview.cpp b/kbabel/kbabel/kbcataloglistview.cpp index e04da3c2..40fb29e8 100644 --- a/kbabel/kbabel/kbcataloglistview.cpp +++ b/kbabel/kbabel/kbcataloglistview.cpp @@ -34,11 +34,11 @@ using namespace KBabel; -KBCatalogListView::KBCatalogListView(KBCatalog* catalog, TQWidget *parent, KBabel::Project::Ptr project) - : TQWidget(parent) +KBCatalogListView::KBCatalogListView(KBCatalog* catalog, TQWidget *tqparent, KBabel::Project::Ptr project) + : TQWidget(tqparent) { m_catalog= catalog; - TQVBoxLayout* layout=new TQVBoxLayout(this); + TQVBoxLayout* tqlayout=new TQVBoxLayout(this); m_listview = new KListView(this, "catalogListView"); m_listview->addColumn(i18n("Id")); @@ -49,8 +49,8 @@ KBCatalogListView::KBCatalogListView(KBCatalog* catalog, TQWidget *parent, KBabe m_listview->setAllColumnsShowFocus(true); m_listview->resize(this->size()); - layout->addWidget(m_listview); - layout->setStretchFactor(m_listview,1); + tqlayout->addWidget(m_listview); + tqlayout->setStretchFactor(m_listview,1); connect(m_listview,TQT_SIGNAL(selectionChanged(TQListViewItem *)), this,TQT_SLOT(selectionChanged(TQListViewItem *))); } @@ -63,7 +63,7 @@ KBCatalogListView::~KBCatalogListView() void KBCatalogListView::selectionChanged ( TQListViewItem * item) { DocPosition pos; - int number = m_items->find(reinterpret_cast<KBCatalogListViewItem*>(item)); + int number = m_items->tqfind(reinterpret_cast<KBCatalogListViewItem*>(item)); if(number<0) number = 0; pos.item=number; diff --git a/kbabel/kbabel/kbcataloglistview.h b/kbabel/kbabel/kbcataloglistview.h index c2c46bdf..53e7327a 100644 --- a/kbabel/kbabel/kbcataloglistview.h +++ b/kbabel/kbabel/kbcataloglistview.h @@ -50,8 +50,9 @@ class KListView; class KBCatalogListView : public TQWidget, public KBabel::CatalogView { Q_OBJECT + TQ_OBJECT public: - KBCatalogListView(KBCatalog* catalog, TQWidget *parent, KBabel::Project::Ptr project); + KBCatalogListView(KBCatalog* catalog, TQWidget *tqparent, KBabel::Project::Ptr project); ~KBCatalogListView(); diff --git a/kbabel/kbabel/kbcataloglistviewitem.cpp b/kbabel/kbabel/kbcataloglistviewitem.cpp index 4bbc3049..1889e518 100644 --- a/kbabel/kbabel/kbcataloglistviewitem.cpp +++ b/kbabel/kbabel/kbcataloglistviewitem.cpp @@ -23,8 +23,8 @@ #include "kbcataloglistviewitem.h" #include <assert.h> -KBCatalogListViewItem::KBCatalogListViewItem(KListView* lv, KListViewItem* parent, uint id, TQString msgid, TQString msgstr) - : Super(lv, parent, "","",""), m_id(id), m_msgid(msgid), m_msgstr(msgstr) +KBCatalogListViewItem::KBCatalogListViewItem(KListView* lv, KListViewItem* tqparent, uint id, TQString msgid, TQString msgstr) + : Super(lv, tqparent, "","",""), m_id(id), m_msgid(msgid), m_msgstr(msgstr) { setText(0,TQString::number(id)); } @@ -38,14 +38,14 @@ void KBCatalogListViewItem::setMsgId(const TQString& st) { m_msgid = st; setup(); - repaint(); + tqrepaint(); } void KBCatalogListViewItem::setMsgStr(const TQString& st) { m_msgstr = st; setup(); - repaint(); + tqrepaint(); } uint KBCatalogListViewItem::getId() @@ -57,7 +57,7 @@ void KBCatalogListViewItem::setId(const uint id) { m_id = id; setup(); - repaint(); + tqrepaint(); } TQString KBCatalogListViewItem::key ( int column, bool ascending ) const{ @@ -205,9 +205,9 @@ TQString KBCatalogListViewItem::formatMsg(const TQString str) { // TODO: Use KBHighlighting for this TQString tmp_msgid = str; - tmp_msgid = tmp_msgid.replace( "\\n", "<br>" ); - tmp_msgid = tmp_msgid.replace( "<", "<" ); - tmp_msgid = tmp_msgid.replace( ">", ">" ); + tmp_msgid = tmp_msgid.tqreplace( "\\n", "<br>" ); + tmp_msgid = tmp_msgid.tqreplace( "<", "<" ); + tmp_msgid = tmp_msgid.tqreplace( ">", ">" ); return tmp_msgid; } diff --git a/kbabel/kbabel/kbcataloglistviewitem.h b/kbabel/kbabel/kbcataloglistviewitem.h index 4a24c159..16353c70 100644 --- a/kbabel/kbabel/kbcataloglistviewitem.h +++ b/kbabel/kbabel/kbcataloglistviewitem.h @@ -34,7 +34,7 @@ class KBCatalogListViewItem : public KListViewItem { typedef KListViewItem Super; public: - KBCatalogListViewItem(KListView* lv, KListViewItem* parent, uint id, TQString msgid, TQString msgstr); + KBCatalogListViewItem(KListView* lv, KListViewItem* tqparent, uint id, TQString msgid, TQString msgstr); ~KBCatalogListViewItem(); diff --git a/kbabel/kbabel/kbcatalogview.cpp b/kbabel/kbabel/kbcatalogview.cpp index ae701c4e..fc7898f7 100644 --- a/kbabel/kbabel/kbcatalogview.cpp +++ b/kbabel/kbabel/kbcatalogview.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -36,8 +36,8 @@ using namespace KBabel; -KBCatalogView::KBCatalogView(KBCatalog* catalog, TQWidget* parent, Project::Ptr project) - : TQWidget (parent), KBabel::CatalogView () , _project (project) +KBCatalogView::KBCatalogView(KBCatalog* catalog, TQWidget* tqparent, Project::Ptr project) + : TQWidget (tqparent), KBabel::CatalogView () , _project (project) { if (catalog == 0) kdFatal(KBABEL) << "catalog==0" << endl; diff --git a/kbabel/kbabel/kbcatalogview.h b/kbabel/kbabel/kbcatalogview.h index 355e2a4c..33cf8904 100644 --- a/kbabel/kbabel/kbcatalogview.h +++ b/kbabel/kbabel/kbcatalogview.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -43,11 +43,12 @@ class KBCatalogView : public TQWidget, public KBabel::CatalogView { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - KBCatalogView(KBCatalog* catalog, TQWidget* parent, KBabel::Project::Ptr project); + KBCatalogView(KBCatalog* catalog, TQWidget* tqparent, KBabel::Project::Ptr project); /** * Destructor diff --git a/kbabel/kbabel/kbcharselect.cpp b/kbabel/kbabel/kbcharselect.cpp index 8dd87bcc..b2719386 100644 --- a/kbabel/kbabel/kbcharselect.cpp +++ b/kbabel/kbabel/kbcharselect.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -41,8 +41,8 @@ #include <tqspinbox.h> #include <tqscrollview.h> -KBCharSelect::KBCharSelect(TQWidget* parent,const char* name) - : TQVBox(parent,name) +KBCharSelect::KBCharSelect(TQWidget* tqparent,const char* name) + : TQVBox(tqparent,name) { setSpacing( KDialog::spacingHint() ); diff --git a/kbabel/kbabel/kbcharselect.h b/kbabel/kbabel/kbcharselect.h index 83de635d..a13071bf 100644 --- a/kbabel/kbabel/kbcharselect.h +++ b/kbabel/kbabel/kbcharselect.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -39,11 +39,12 @@ class KConfig; class KCharSelectTable; class TQSpinBox; -class KBCharSelect : public QVBox +class KBCharSelect : public TQVBox { Q_OBJECT + TQ_OBJECT public: - KBCharSelect(TQWidget* parent, const char* name=0); + KBCharSelect(TQWidget* tqparent, const char* name=0); void saveSettings(KConfig* config); void restoreSettings(KConfig* config); diff --git a/kbabel/kbabel/kbhighlighting.cpp b/kbabel/kbabel/kbhighlighting.cpp index 3d555d7b..f4109a34 100644 --- a/kbabel/kbabel/kbhighlighting.cpp +++ b/kbabel/kbabel/kbhighlighting.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -98,7 +98,7 @@ void KBabelHighlighter::highlight( ) // create a single line out of the text: remove "\n", so that we only // have to deal with one single line of text. TQString text = _edit->text( ); - text.replace( "\n", "" ); + text.tqreplace( "\n", "" ); TQRegExp rx; int pos; @@ -107,10 +107,10 @@ void KBabelHighlighter::highlight( ) { for ( uint i = 0; i < regexps.count( ); ++i ) { rx.setPattern( regexps[i] ); - pos = text.find( rx ); + pos = text.tqfind( rx ); while ( pos >= 0 ) { doHighlighting( (HighlightType)(i+1), pos, rx.matchedLength( ) ); - pos = text.find( rx, pos + rx.matchedLength( ) ); + pos = text.tqfind( rx, pos + rx.matchedLength( ) ); } } } @@ -223,7 +223,7 @@ void KBabelHighlighter::flushCurrentWord() currentPos += tags.matchedLength(); } - currentWord.replace ( tags, "" ); + currentWord.tqreplace ( tags, "" ); if (!currentWord.isEmpty()) { bool isPlainWord = true; @@ -251,7 +251,7 @@ bool KBabelHighlighter::isMisspelled(const TQString& wordRaw) // word first. TQString word = wordRaw; kdDebug(KBABEL) << "isampersand: checking (raw):" << word << endl; - word.replace("&", "" ); + word.tqreplace("&", "" ); kdDebug(KBABEL) << "isMisspelled: checking: " << word << endl; // Normally isMisspelled would look up a dictionary and return @@ -266,7 +266,7 @@ bool KBabelHighlighter::isMisspelled(const TQString& wordRaw) // there is no 'spelt correctly' signal so default to Okay kdDebug(KBABEL) << "Adding word " << word << endl; - dict.replace(word, Okay); + dict.tqreplace(word, Okay); mSpell->checkWord(word, false); return false; } @@ -275,7 +275,7 @@ void KBabelHighlighter::slotMisspelling(const TQString & originalword, const TQStringList & suggestions, unsigned int) { kdDebug(KBABEL) << "Misspelled " << originalword << ", " << suggestions << endl; - dict.replace( originalword, NotOkay ); + dict.tqreplace( originalword, NotOkay ); // this is slow but since kspell is async this will have to do for now highlight(); diff --git a/kbabel/kbabel/kbhighlighting.h b/kbabel/kbabel/kbhighlighting.h index 3f202d99..f028e029 100644 --- a/kbabel/kbabel/kbhighlighting.h +++ b/kbabel/kbabel/kbhighlighting.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -47,9 +47,10 @@ class TQColor; class TQString; class TQTextEdit; -class KBabelHighlighter : public QObject +class KBabelHighlighter : public TQObject { Q_OBJECT + TQ_OBJECT public: enum HighlightType { diff --git a/kbabel/kbabel/main.cpp b/kbabel/kbabel/main.cpp index 5758d563..5d771fdc 100644 --- a/kbabel/kbabel/main.cpp +++ b/kbabel/kbabel/main.cpp @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -187,7 +187,7 @@ int KBabelApp::newInstance() widget->show(); for (int i=0; i < args->count(); i++) { - widget->open( args->url(i) , TQString::null, i != 0 ); + widget->open( args->url(i) , TQString(), i != 0 ); } kdDebug () << "Resuming DCOP" << endl; @@ -242,7 +242,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int KBabelMW *kb = KBabelMW::winForURL(u,project); if(kb) { - KWin::activateWindow(kb->topLevelWidget()->winId()); + KWin::activateWindow(kb->tqtopLevelWidget()->winId()); } else { @@ -255,7 +255,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int if( mw->inherits("KBabelMW") && mw->winId() == window) { kb = static_cast<KBabelMW*>(mw); - KWin::activateWindow(kb->topLevelWidget()->winId()); + KWin::activateWindow(kb->tqtopLevelWidget()->winId()); kb->open(u, TQString::fromUtf8(package),newWindow); kdDebug () << "Resuming DCOP" << endl; @@ -272,7 +272,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int { // here, we don't care about "open in new window", because // it's empty - KWin::setActiveWindow(kb->topLevelWidget()->winId()); + KWin::setActiveWindow(kb->tqtopLevelWidget()->winId()); kb->projectOpen(projectFile); kb->open(u,TQString::fromUtf8(package),false); @@ -289,7 +289,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int if( mw->inherits("KBabelMW") && static_cast<KBabelMW*>(mw)->project()==project) { kb = static_cast<KBabelMW*>(mw); - KWin::activateWindow(kb->topLevelWidget()->winId()); + KWin::activateWindow(kb->tqtopLevelWidget()->winId()); kb->open(u, TQString::fromUtf8(package),newWindow); kdDebug () << "Resuming DCOP" << endl; @@ -305,7 +305,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int kb = new KBabelMW(project); kb->show(); } else kb = static_cast<KBabelMW*>(mw); - KWin::activateWindow(kb->topLevelWidget()->winId()); + KWin::activateWindow(kb->tqtopLevelWidget()->winId()); kb->open(u,TQString::fromUtf8(package),newWindow); } @@ -331,7 +331,7 @@ void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilenam KBabelMW *kb = KBabelMW::winForURL(u, project); if(kb) { - KWin::activateWindow(kb->topLevelWidget()->winId()); + KWin::activateWindow(kb->tqtopLevelWidget()->winId()); } else { @@ -342,7 +342,7 @@ void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilenam if(mw && mw->inherits("KBabelMW") && static_cast<KBabelMW*>(mw)->project()==project) { kb = static_cast<KBabelMW*>(mw); - KWin::activateWindow(kb->topLevelWidget()->winId()); + KWin::activateWindow(kb->tqtopLevelWidget()->winId()); kb->projectOpen(projectFile); kb->openTemplate(t,u,TQString::fromUtf8(package),newWindow); } @@ -350,7 +350,7 @@ void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilenam { kb = new KBabelMW(project); kb->show(); - KWin::activateWindow(kb->topLevelWidget()->winId()); + KWin::activateWindow(kb->tqtopLevelWidget()->winId()); kb->openTemplate(t,u,TQString::fromUtf8(package)); } } @@ -505,7 +505,7 @@ KBabelMW* KBabelInterface::findInstance( const KURL& url, const TQString& projec if(kb) { - KWin::activateWindow(kb->topLevelWidget()->winId()); + KWin::activateWindow(kb->tqtopLevelWidget()->winId()); } } @@ -555,7 +555,7 @@ int main(int argc, char **argv) about.addAuthor("Andrea Rizzi",I18N_NOOP("Wrote the dictionary plugin " "for searching in a database and some other code.") ,"rizzi@kde.org"); - about.addAuthor("Stanislav Visnovsky",I18N_NOOP("Current maintainer, porting to KDE3/Qt3.") + about.addAuthor("Stanislav Visnovsky",I18N_NOOP("Current maintainer, porting to KDE3/TQt3.") ,"visnovsky@kde.org"); about.addAuthor("Marco Wegner",I18N_NOOP("Bug fixes, KFilePlugin for PO files, CVS support, mailing files") ,"dubbleu@web.de"); @@ -578,7 +578,7 @@ int main(int argc, char **argv) about.addCredit("SuSE GmbH" ,I18N_NOOP("Sponsored development of KBabel for a while.") ,"suse@suse.de","http://www.suse.de"); - about.addCredit("Trolltech", I18N_NOOP("KBabel contains code from Qt"), 0, "http://www.trolltech.com"); + about.addCredit("Trolltech", I18N_NOOP("KBabel contains code from TQt"), 0, "http://www.trolltech.com"); about.addCredit("Eva Brucherseifer", I18N_NOOP("String distance algorithm implementation"), "eva@kde.org"); diff --git a/kbabel/kbabel/mymultilineedit.cpp b/kbabel/kbabel/mymultilineedit.cpp index 9b7913d1..29a8da78 100644 --- a/kbabel/kbabel/mymultilineedit.cpp +++ b/kbabel/kbabel/mymultilineedit.cpp @@ -25,11 +25,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -49,7 +49,7 @@ #include <tqclipboard.h> #include <tqapplication.h> #include <tqdragobject.h> -//#include <private/qrichtext_p.h> +//#include <private/tqrichtext_p.h> #include <tqpopupmenu.h> #include <kdebug.h> @@ -62,8 +62,8 @@ using namespace KBabel; -MyMultiLineEdit::MyMultiLineEdit(int ID, TQWidget* parent,const char* name) - :KTextEdit(parent,name), emitUndo(true), +MyMultiLineEdit::MyMultiLineEdit(int ID, TQWidget* tqparent,const char* name) + :KTextEdit(tqparent,name), emitUndo(true), _firstChangedLine(0), _lastChangedLine(0), _lastParagraph(0), @@ -75,7 +75,7 @@ MyMultiLineEdit::MyMultiLineEdit(int ID, TQWidget* parent,const char* name) { setUndoRedoEnabled(false); // we handle this ourselves setWordWrap( WidgetWidth ); - viewport()->setAcceptDrops( false ); // we need our parent to get drops + viewport()->setAcceptDrops( false ); // we need our tqparent to get drops connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT( onSelectionChanged() ) ); } @@ -120,7 +120,7 @@ void MyMultiLineEdit::processCommand(EditCommand* cmd, bool undo) TQPalette _visibleHighlight( palette() ); TQPalette _invisibleHighlight( palette() ); - TQColorGroup newcg( colorGroup() ); + TQColorGroup newcg( tqcolorGroup() ); newcg.setColor( TQColorGroup::HighlightedText, newcg.text() ); newcg.setColor( TQColorGroup::Highlight, newcg.base() ); if( hasFocus() ) _invisibleHighlight.setActive( newcg ); @@ -141,7 +141,7 @@ void MyMultiLineEdit::processCommand(EditCommand* cmd, bool undo) setCursorPosition( row, col ); _firstChangedLine=row; - if(delcmd->str.find("\n")>0 )_lastChangedLine=row+delcmd->str.contains("\n"); + if(delcmd->str.tqfind("\n")>0 )_lastChangedLine=row+delcmd->str.tqcontains("\n"); else _lastChangedLine=row; KTextEdit::insert( delcmd->str ); @@ -293,10 +293,10 @@ void MyMultiLineEdit::setText(const TQString& s) _lastParagraph=0; _lastParagraphOffset=0; // workaround, since insert does not interpret markup - setTextFormat( Qt::PlainText ); + setTextFormat( TQt::PlainText ); _firstChangedLine=_lastChangedLine=0; KTextEdit::setText(s); - setTextFormat( Qt::AutoText ); + setTextFormat( TQt::AutoText ); // now the number of lines is known, let's do highlight _lastChangedLine=paragraphs(); emit textChanged(); @@ -308,7 +308,7 @@ void MyMultiLineEdit::insertAt( const TQString & s, int line, int col, bool mark // it will invoke insert, don't need to send InsTextCmd KTextEdit::insertAt(s,line,col); - // code from QMultiLineEdit + // code from TQMultiLineEdit if( mark ) setSelection( line, col, line, col + s.length(), 0 ); // end of copied code @@ -355,14 +355,14 @@ void MyMultiLineEdit::insert( const TQString & text, bool indent, bool checkNewL emit signalUndoCmd( new EndCommand(-1,UndefPart)); } - int n=text.find("\n"); + int n=text.tqfind("\n"); if( n > 0 ) _lastChangedLine+=n; // setup palettes TQPalette _visibleHighlight( palette() ); TQPalette _invisibleHighlight( palette() ); - TQColorGroup newcg( colorGroup() ); + TQColorGroup newcg( tqcolorGroup() ); newcg.setColor( TQColorGroup::HighlightedText, newcg.text() ); newcg.setColor( TQColorGroup::Highlight, newcg.base() ); if( hasFocus() ) _invisibleHighlight.setActive( newcg ); @@ -546,8 +546,8 @@ void MyMultiLineEdit::offset2Pos(int offset, int ¶graph, int &index) const int MyMultiLineEdit::pos2Offset(uint paragraph, uint index) { - paragraph = QMAX( QMIN( (int)paragraph, paragraphs() - 1), 0 ); // Sanity check - index = QMAX( QMIN( (int)index, paragraphLength( paragraph )), 0 ); // Sanity check + paragraph = TQMAX( TQMIN( (int)paragraph, paragraphs() - 1), 0 ); // Sanity check + index = TQMAX( TQMIN( (int)index, paragraphLength( paragraph )), 0 ); // Sanity check { uint lastI; @@ -569,7 +569,7 @@ int MyMultiLineEdit::pos2Offset(uint paragraph, uint index) _lastParagraphOffset=tmp; _lastParagraph=paragraph; - tmp += QMIN( lastI, index ); + tmp += TQMIN( lastI, index ); return tmp; } @@ -592,27 +592,27 @@ void MyMultiLineEdit::setOverwriteMode( bool b ) } /*******************************************************************************/ -MsgMultiLineEdit::MsgMultiLineEdit(int ID, KSpell* spell, TQWidget* parent,const char* name) - :MyMultiLineEdit(ID, parent,name), +MsgMultiLineEdit::MsgMultiLineEdit(int ID, KSpell* spell, TQWidget* tqparent,const char* name) + :MyMultiLineEdit(ID, tqparent,name), _quotes(false), _cleverEditing(false), _highlightBg(false), _spacePoints(false), - _bgColor(colorGroup().base().dark(110)), + _bgColor(tqcolorGroup().base().dark(110)), _textColor(KGlobalSettings::textColor()), - _errorColor(Qt::red), + _errorColor(TQt::red), _currentColor(KGlobalSettings::textColor()), _whitespace(0), _hlSyntax(true), - _quoteColor(Qt::darkGreen), - _unquoteColor(Qt::red), - _cformatColor(Qt::blue), - _accelColor(Qt::darkMagenta), + _quoteColor(TQt::darkGreen), + _unquoteColor(TQt::red), + _cformatColor(TQt::blue), + _accelColor(TQt::darkMagenta), _showDiff(false), _diffUnderlineAdd(true), _diffStrikeOutDel(true), - _diffAddColor(Qt::darkGreen), - _diffDelColor(Qt::darkRed), + _diffAddColor(TQt::darkGreen), + _diffDelColor(TQt::darkRed), _currentUnicodeNumber(0), highlighter(0), _tagStartPara(0), _tagStartIndex(0), _tagEndPara(0), _tagEndIndex(0) @@ -661,7 +661,7 @@ void MsgMultiLineEdit::setText(const TQString& s) if(_showDiff) { diffPos.clear(); - int lines = s.contains('\n'); + int lines = s.tqcontains('\n'); diffPos.resize(lines+1); TQStringList lineList = TQStringList::split('\n',s,true); @@ -689,7 +689,7 @@ void MsgMultiLineEdit::setText(const TQString& s) } else { - addPos = (*it).find("<KBABELADD>",lastPos); + addPos = (*it).tqfind("<KBABELADD>",lastPos); } if(haveDel && multiline) @@ -698,7 +698,7 @@ void MsgMultiLineEdit::setText(const TQString& s) } else { - delPos = (*it).find("<KBABELDEL>",lastPos); + delPos = (*it).tqfind("<KBABELDEL>",lastPos); } if(delPos >= 0 && addPos >= 0) @@ -741,7 +741,7 @@ void MsgMultiLineEdit::setText(const TQString& s) (*it).remove(addPos,11); } - int endPos = (*it).find("</KBABELADD>",addPos); + int endPos = (*it).tqfind("</KBABELADD>",addPos); if(endPos < 0) { endPos = (*it).length(); @@ -768,7 +768,7 @@ void MsgMultiLineEdit::setText(const TQString& s) (*it).remove(delPos,11); } - int endPos = (*it).find("</KBABELDEL>",delPos); + int endPos = (*it).tqfind("</KBABELDEL>",delPos); if(endPos < 0) { endPos = (*it).length(); @@ -805,9 +805,9 @@ void MsgMultiLineEdit::setText(const TQString& s) } TQRegExp reg("</?KBABELADD>"); - str.replace(reg,""); + str.tqreplace(reg,""); reg.setPattern("</?KBABELDEL>"); - str.replace(reg,""); + str.tqreplace(reg,""); } MyMultiLineEdit::setText(str); @@ -882,10 +882,10 @@ void MsgMultiLineEdit::setFont(const TQFont& font) // we don't need to calculate a special offset for non-breaking space, since // they are very similar in size TQFontMetrics fm(font); - _wsOffsetX = QMAX(fm.width(' ')/2-2,1); - _wsOffsetY = QMAX(fm.height()/2-1,0); + _wsOffsetX = TQMAX(fm.width(' ')/2-2,1); + _wsOffsetY = TQMAX(fm.height()/2-1,0); - repaint(); + tqrepaint(); } void MsgMultiLineEdit::setDiffDisplayMode(bool addUnderline, bool delStrikeOut) @@ -910,7 +910,7 @@ void MsgMultiLineEdit::setDiffColors(const TQColor& addColor void MsgMultiLineEdit::setTextColor(const TQColor &color ) { TQPalette p( palette() ); - TQColorGroup newcg( colorGroup() ); + TQColorGroup newcg( tqcolorGroup() ); newcg.setColor( TQColorGroup::Text, color ); if( hasFocus() ) p.setActive( newcg ); else p.setInactive( newcg ); @@ -989,15 +989,15 @@ void MsgMultiLineEdit::paintSpacePoints() if ( paragraphRect( curpara ).top() > contentsY()+visibleHeight()) break; const TQString& s = text(curpara); - int i = s.find( " " ); + int i = s.tqfind( " " ); while( (i >= 0) && (i < (int)s.length()-1) ) // -1 because text will end by EOLN { - TQPixmap* pm = ( s.at(i).unicode() == 0x00A0U ) ? wsnb : ws; + TQPixmap* pm = ( s.at(i).tqunicode() == 0x00A0U ) ? wsnb : ws; TQRect r = mapToView( curpara, i ); r.moveBy( r.width()/2, (r.height() - fm.descent())/2 ); r.moveBy( -pm->rect().width()/2, -pm->rect().height()/2-1 ); - bitBlt(viewport(), r.topLeft(), pm, pm->rect(), Qt::CopyROP); - i = s.find( " ", i+1 ); + bitBlt(viewport(), r.topLeft(), pm, pm->rect(), TQt::CopyROP); + i = s.tqfind( " ", i+1 ); } ++curpara; } @@ -1015,7 +1015,7 @@ void MsgMultiLineEdit::paintSpacePoints() painter.drawText( TQPoint( 0, mapToView( curpara, 0 ).top()) + TQPoint(0, qs.height() + 4), "\""); // 4 = hardcoded margin in QT - painter.drawText( mapToView( curpara, QMAX( 0, + painter.drawText( mapToView( curpara, TQMAX( 0, ((int)text( curpara ).length())-1)).topRight() + TQPoint(0, qs.height() + 4), "\""); // 4 = hardcoded margin in QT } @@ -1025,7 +1025,7 @@ void MsgMultiLineEdit::paintSpacePoints() { if( paragraphs() == (int)diffPos.size() ) // sanity check { - painter.setRasterOp( Qt::AndROP ); + painter.setRasterOp( TQt::AndROP ); for( int curpara = paranum; curpara < paragraphs() ; curpara++ ) { r = paragraphRect(curpara); @@ -1141,10 +1141,10 @@ void MsgMultiLineEdit::paintSpacePoints() } } -void MsgMultiLineEdit::repaint() +void MsgMultiLineEdit::tqrepaint() { highlight(); - MyMultiLineEdit::repaint(); + MyMultiLineEdit::tqrepaint(); } void MsgMultiLineEdit::forceUpdate() @@ -1152,7 +1152,7 @@ void MsgMultiLineEdit::forceUpdate() _firstChangedLine=0; _lastChangedLine=paragraphs()-1; highlighter->highlight(); - MyMultiLineEdit::repaint(); + MyMultiLineEdit::tqrepaint(); } void MsgMultiLineEdit::ensureCursorVisible() @@ -1167,7 +1167,7 @@ void MsgMultiLineEdit::highlight() TQColor bg; if( _highlightBg ) bg = _bgColor; - else bg = colorGroup().base(); + else bg = tqcolorGroup().base(); for( int i = 0 ; i < paragraphs() ; i++ ) setParagraphBackgroundColor( i, bg ); @@ -1188,7 +1188,7 @@ void MsgMultiLineEdit::highlight() TQRegExp markup("(\\\\)|(\")|(\\\\[abfnrtv'\"\?\\\\])|(\\\\\\d+)|(\\\\x[\\dabcdef]+)" "|(%[\\ddioxXucsfeEgGphln]+)|(&[^\\s])|(&[\\w-]+;)"); - for( i = QMAX(_firstChangedLine,0) ; i < QMIN(_lastChangedLine+1,(uint)paragraphs()) ; i++ ) { + for( i = TQMAX(_firstChangedLine,0) ; i < TQMIN(_lastChangedLine+1,(uint)paragraphs()) ; i++ ) { TQString line=text(i); @@ -1252,7 +1252,7 @@ void MsgMultiLineEdit::highlight() { TQColor c; TQFont f; - VerticalAlignment v; + Qt::VerticalAlignment v; getFormat(_firstChangedLine-1, paragraphLength(_firstChangedLine-1)-1, &f, &c, &v); TQString l = text(_firstChangedLine-1); if( c==_tagColor && !l.endsWith(">") ) // hope _tagColor will be different than other colors @@ -1522,7 +1522,7 @@ void MsgMultiLineEdit::keyPressEvent(TQKeyEvent *e) { TQString spclChars="abfnrtv'\"?\\"; if(col < (int)str.length()-1 - && spclChars.contains(str.at(col+1))) + && spclChars.tqcontains(str.at(col+1))) { del(); } @@ -1548,7 +1548,7 @@ void MsgMultiLineEdit::keyPressEvent(TQKeyEvent *e) TQString str=text(row); TQString spclChars="abfnrtv'\"?\\"; - if(!str.isEmpty() && col > 0 && spclChars.contains(str.at(col-1))) + if(!str.isEmpty() && col > 0 && spclChars.tqcontains(str.at(col-1))) { if(col > 1 && str.at(col-2)=='\\' && !isMasked(&str,col-2)) { diff --git a/kbabel/kbabel/mymultilineedit.h b/kbabel/kbabel/mymultilineedit.h index 624e5e4c..10592b0c 100644 --- a/kbabel/kbabel/mymultilineedit.h +++ b/kbabel/kbabel/mymultilineedit.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -50,8 +50,9 @@ class TQPixmap; class MyMultiLineEdit : public KTextEdit { Q_OBJECT + TQ_OBJECT public: - MyMultiLineEdit(int ID,TQWidget* parent,const char* name=0); + MyMultiLineEdit(int ID,TQWidget* tqparent,const char* name=0); /** applies cmd to the displayed text, but does not emit @@ -129,7 +130,7 @@ protected: virtual TQPopupMenu *createPopupMenu(); virtual TQPopupMenu *createPopupMenu(const TQPoint &pos); - /* the parent handles this */ + /* the tqparent handles this */ virtual void wheelEvent(TQWheelEvent*); bool emitUndo; @@ -173,10 +174,11 @@ private: class MsgMultiLineEdit : public MyMultiLineEdit { Q_OBJECT + TQ_OBJECT public: enum TextColor { NormalColor, ErrorColor }; - MsgMultiLineEdit(int ID, KSpell* spell=0, TQWidget* parent=0,const char* name=0); + MsgMultiLineEdit(int ID, KSpell* spell=0, TQWidget* tqparent=0,const char* name=0); virtual ~MsgMultiLineEdit(); /** is displaying surrounding quotes enabled? */ @@ -227,7 +229,7 @@ public slots: /** * reimplemented to call highlight() */ - void repaint(); + void tqrepaint(); void forceUpdate(); void emittedTextChanged(); @@ -251,7 +253,7 @@ private: TQRect mapToView( int para, int index ); /** - * tests if the character in string str at position col is masked with + * tests if the character in string str at position col is tqmasked with * '\' by counting the number of '\' backwards */ static bool isMasked(TQString *str,uint col); diff --git a/kbabel/kbabel/searchpreferences.ui b/kbabel/kbabel/searchpreferences.ui index 5e002657..1581084d 100644 --- a/kbabel/kbabel/searchpreferences.ui +++ b/kbabel/kbabel/searchpreferences.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>SearchPreferences</class> <author>Stanislav Visnovsky</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SearchPreferences</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -17,7 +17,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame3</cstring> </property> @@ -31,7 +31,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>kcfg_AutoSearch</cstring> </property> @@ -49,15 +49,15 @@ the popup menu that appears either when clicking in the toolbar pressed for a while.</p></qt></string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -68,7 +68,7 @@ in the toolbar pressed for a while.</p></qt></string> <cstring>_kcfg_DefaultModule</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>_kcfg_DefaultModule</cstring> </property> @@ -96,7 +96,7 @@ the desired dictionary from <b>Settings->Configure Dictionary</b> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>91</height> @@ -105,5 +105,5 @@ the desired dictionary from <b>Settings->Configure Dictionary</b> </spacer> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kbabel/kbabel/sourceview.cpp b/kbabel/kbabel/sourceview.cpp index 00d8a3b2..bf61189f 100644 --- a/kbabel/kbabel/sourceview.cpp +++ b/kbabel/kbabel/sourceview.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -45,14 +45,14 @@ using namespace KBabel; -SourceView::SourceView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project) - : KBCatalogView(catalog,parent,project) +SourceView::SourceView(KBCatalog* catalog,TQWidget *tqparent, Project::Ptr project) + : KBCatalogView(catalog,tqparent,project) { - TQVBoxLayout* layout = new TQVBoxLayout( this ); - layout->setResizeMode( TQLayout::Minimum ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); + tqlayout->setResizeMode( TQLayout::Minimum ); _contextView = new SourceContext (this, project); - layout->addWidget (_contextView); + tqlayout->addWidget (_contextView); connect(_catalog, TQT_SIGNAL(signalFileOpened(bool)), this, TQT_SLOT(setDisabled(bool))); } diff --git a/kbabel/kbabel/sourceview.h b/kbabel/kbabel/sourceview.h index a12ca767..c17c49cc 100644 --- a/kbabel/kbabel/sourceview.h +++ b/kbabel/kbabel/sourceview.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -40,11 +40,12 @@ class SourceContext; class SourceView : public KBCatalogView { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - SourceView(KBCatalog* catalog,TQWidget *parent, KBabel::Project::Ptr project); + SourceView(KBCatalog* catalog,TQWidget *tqparent, KBabel::Project::Ptr project); public slots: virtual void updateView(); diff --git a/kbabel/kbabel/spelldlg.cpp b/kbabel/kbabel/spelldlg.cpp index de9f2ce6..fc53b6e0 100644 --- a/kbabel/kbabel/spelldlg.cpp +++ b/kbabel/kbabel/spelldlg.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -40,8 +40,8 @@ #include <kglobal.h> #include <klocale.h> -SpellDlg::SpellDlg(bool haveMarkedText,TQWidget *parent,const char *name) - : KDialogBase(parent,name,true,i18n("Caption of dialog","Spelling") +SpellDlg::SpellDlg(bool haveMarkedText,TQWidget *tqparent,const char *name) + : KDialogBase(tqparent,name,true,i18n("Caption of dialog","Spelling") , Ok|Cancel) { setButtonOK(KGuiItem(i18n("&Spell Check"),"spellcheck")); diff --git a/kbabel/kbabel/spelldlg.h b/kbabel/kbabel/spelldlg.h index e12fc515..be182d7e 100644 --- a/kbabel/kbabel/spelldlg.h +++ b/kbabel/kbabel/spelldlg.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -41,9 +41,10 @@ class SpellDlgWidget; class SpellDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - SpellDlg(bool haveMarkedText, TQWidget* parent, const char *name=0); + SpellDlg(bool haveMarkedText, TQWidget* tqparent, const char *name=0); ~SpellDlg(); bool all() const; diff --git a/kbabel/kbabel/spelldlgwidget.ui b/kbabel/kbabel/spelldlgwidget.ui index fe5a5d0b..539b36e3 100644 --- a/kbabel/kbabel/spelldlgwidget.ui +++ b/kbabel/kbabel/spelldlgwidget.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>SpellDlgWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SpellDlgWidget</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -33,7 +33,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>allBtn</cstring> </property> @@ -44,7 +44,7 @@ <string>Spell check all translated messages of this file.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>currentBtn</cstring> </property> @@ -58,7 +58,7 @@ <string>Spell check only the current message.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>beginCurrentMsgBtn</cstring> </property> @@ -66,7 +66,7 @@ <string>Fro&m beginning of current message to end of file</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>beginBtn</cstring> </property> @@ -77,7 +77,7 @@ <string>Spell check all text from the beginning of the file to the current cursor position.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>endBtn</cstring> </property> @@ -88,7 +88,7 @@ <string>Spell check all text from the current cursor position to the end of the file.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>markedBtn</cstring> </property> @@ -101,7 +101,7 @@ </widget> </vbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>defaultBtn</cstring> </property> @@ -122,5 +122,5 @@ <tabstop>endBtn</tabstop> <tabstop>defaultBtn</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kbabel/kbabel/taglistview.cpp b/kbabel/kbabel/taglistview.cpp index 476c2ed7..51a37d49 100644 --- a/kbabel/kbabel/taglistview.cpp +++ b/kbabel/kbabel/taglistview.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -44,15 +44,15 @@ using namespace KBabel; -TagListView::TagListView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project) - : KBCatalogView(catalog,parent,project) +TagListView::TagListView(KBCatalog* catalog,TQWidget *tqparent, Project::Ptr project) + : KBCatalogView(catalog,tqparent,project) { - TQVBoxLayout* layout = new TQVBoxLayout( this ); - layout->setResizeMode( TQLayout::Minimum ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); + tqlayout->setResizeMode( TQLayout::Minimum ); _tagBox = new KListBox (this, "taglist textview"); - layout->addWidget (_tagBox); + tqlayout->addWidget (_tagBox); connect(_tagBox,TQT_SIGNAL(selected(const TQString&)) , this, TQT_SIGNAL(signalTagSelected(const TQString&))); diff --git a/kbabel/kbabel/taglistview.h b/kbabel/kbabel/taglistview.h index d4361a23..d2d21308 100644 --- a/kbabel/kbabel/taglistview.h +++ b/kbabel/kbabel/taglistview.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -40,11 +40,12 @@ class KListBox; class TagListView : public KBCatalogView { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - TagListView(KBCatalog* catalog,TQWidget *parent, KBabel::Project::Ptr project); + TagListView(KBCatalog* catalog,TQWidget *tqparent, KBabel::Project::Ptr project); public slots: virtual void updateView(); diff --git a/kbabel/kbabeldict/aboutmoduledlg.cpp b/kbabel/kbabeldict/aboutmoduledlg.cpp index 5de3f0fb..c4a5969e 100644 --- a/kbabel/kbabeldict/aboutmoduledlg.cpp +++ b/kbabel/kbabeldict/aboutmoduledlg.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -35,8 +35,8 @@ #include <kbugreport.h> #include <klocale.h> -AboutModuleDlg::AboutModuleDlg(const KAboutData *aboutData, TQWidget *parent) - : KAboutApplication(aboutData, parent) +AboutModuleDlg::AboutModuleDlg(const KAboutData *aboutData, TQWidget *tqparent) + : KAboutApplication(aboutData, tqparent) , _aboutData(aboutData) { setHelpLinkText(i18n("Report Bug...")); diff --git a/kbabel/kbabeldict/aboutmoduledlg.h b/kbabel/kbabeldict/aboutmoduledlg.h index 09f13f8f..a3b1656e 100644 --- a/kbabel/kbabeldict/aboutmoduledlg.h +++ b/kbabel/kbabeldict/aboutmoduledlg.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -41,9 +41,10 @@ class AboutModuleDlg : public KAboutApplication { Q_OBJECT + TQ_OBJECT public: - AboutModuleDlg(const KAboutData *aboutData, TQWidget* parent=0); + AboutModuleDlg(const KAboutData *aboutData, TQWidget* tqparent=0); public slots: virtual void helpClickedSlot(const TQString&); diff --git a/kbabel/kbabeldict/dictchooser.cpp b/kbabel/kbabeldict/dictchooser.cpp index f99c3709..d60b1de6 100644 --- a/kbabel/kbabeldict/dictchooser.cpp +++ b/kbabel/kbabeldict/dictchooser.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -45,25 +45,25 @@ #include <ktempfile.h> DictChooser::DictChooser(KBabelDictBox*b, TQStringList selected - , TQWidget *parent, const char *name) - : TQWidget(parent,name), box(b) + , TQWidget *tqparent, const char *name) + : TQWidget(tqparent,name), box(b) { tempConfig.clear(); tempConfig.setAutoDelete(true); dictList = box->moduleInfos(); - TQGridLayout *layout = new TQGridLayout(this); - layout->setSpacing(KDialog::spacingHint()); + TQGridLayout *tqlayout = new TQGridLayout(this); + tqlayout->setSpacing(KDialog::spacingHint()); TQLabel *label = new TQLabel(i18n("dictionary to not use","Do not use:"),this); - layout->addWidget(label,0,0); + tqlayout->addWidget(label,0,0); label = new TQLabel(i18n("dictionary to use","Use:"),this); - layout->addWidget(label,0,2); + tqlayout->addWidget(label,0,2); unselectedBox = new KListBox(this,"unselectedBox"); - layout->addWidget(unselectedBox,1,0); + tqlayout->addWidget(unselectedBox,1,0); TQVBoxLayout *bLayout = new TQVBoxLayout(); @@ -74,10 +74,10 @@ DictChooser::DictChooser(KBabelDictBox*b, TQStringList selected unselectBtn->setEnabled(false); bLayout->addWidget(unselectBtn); bLayout->addStretch(); - layout->addLayout(bLayout,1,1); + tqlayout->addLayout(bLayout,1,1); selectedBox = new KListBox(this,"selectedBox"); - layout->addWidget(selectedBox,1,2); + tqlayout->addWidget(selectedBox,1,2); bLayout = new TQVBoxLayout(); @@ -90,7 +90,7 @@ DictChooser::DictChooser(KBabelDictBox*b, TQStringList selected configureBtn = new TQPushButton(i18n("Con&figure..."), this); bLayout->addWidget(configureBtn); bLayout->addStretch(); - layout->addLayout(bLayout,1,3); + tqlayout->addLayout(bLayout,1,3); dictList.setAutoDelete(true); @@ -109,7 +109,7 @@ DictChooser::DictChooser(KBabelDictBox*b, TQStringList selected for(mi = dictList.first(); mi != 0; mi = dictList.next()) { - if(!selected.contains(mi->id)) + if(!selected.tqcontains(mi->id)) { unselectedBox->insertItem(mi->name); } @@ -320,7 +320,7 @@ void DictChooser::restoreConfig() { kdDebug( KBABEL_SEARCH ) << "Cleanup" << endl; // cleanup - TQDictIterator<KTempFile> it( tempConfig ); // See QDictIterator + TQDictIterator<KTempFile> it( tempConfig ); // See TQDictIterator for( ; it.current(); ++it ) { KConfig config( it.current()->name() ); diff --git a/kbabel/kbabeldict/dictchooser.h b/kbabel/kbabeldict/dictchooser.h index 3cb8e9d9..e8ef1d71 100644 --- a/kbabel/kbabeldict/dictchooser.h +++ b/kbabel/kbabeldict/dictchooser.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -47,13 +47,14 @@ class TQPushButton; class TQListBoxItem; -class KDE_EXPORT DictChooser : public QWidget +class KDE_EXPORT DictChooser : public TQWidget { Q_OBJECT + TQ_OBJECT public: DictChooser(KBabelDictBox* box, TQStringList selected, - TQWidget *parent , const char *name=0); + TQWidget *tqparent , const char *name=0); TQStringList selectedDicts(); diff --git a/kbabel/kbabeldict/dictionarymenu.cpp b/kbabel/kbabeldict/dictionarymenu.cpp index 5d648697..925c96eb 100644 --- a/kbabel/kbabeldict/dictionarymenu.cpp +++ b/kbabel/kbabeldict/dictionarymenu.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -39,8 +39,8 @@ #include <tqsignalmapper.h> DictionaryMenu::DictionaryMenu(KPopupMenu *popupMenu, KActionCollection *collection - , TQObject *parent) - : TQObject(parent, "dictionarymenu") + , TQObject *tqparent) + : TQObject(tqparent, "dictionarymenu") , popup(popupMenu) , actionCollection(collection) , maxId(10) @@ -110,13 +110,13 @@ void DictionaryMenu::add(const TQString& n, const TQString& moduleId TQString name=n; TQString keyString=key; - if(keyString.contains("%1")) + if(keyString.tqcontains("%1")) { - keyString=key.arg(accel2id.count()+1); + keyString=key.tqarg(accel2id.count()+1); } KShortcut k(keyString); - KAction* dictionaryAction = new KAction( name, k, dictionaryMapper, TQT_SLOT(map()), actionCollection, key.arg(moduleId).utf8() ); + KAction* dictionaryAction = new KAction( name, k, dictionaryMapper, TQT_SLOT(map()), actionCollection, key.tqarg(moduleId).utf8() ); uint id = maxId++; dictionaryAction->plug(popup,id); diff --git a/kbabel/kbabeldict/dictionarymenu.h b/kbabel/kbabeldict/dictionarymenu.h index a359be78..e32a7b09 100644 --- a/kbabel/kbabeldict/dictionarymenu.h +++ b/kbabel/kbabeldict/dictionarymenu.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -43,19 +43,20 @@ class TQSignalMapper; class KPopupMenu; class KActionCollection; -class KDE_EXPORT DictionaryMenu : public QObject +class KDE_EXPORT DictionaryMenu : public TQObject { Q_OBJECT + TQ_OBJECT public: - DictionaryMenu(KPopupMenu *menu, KActionCollection *collection, TQObject *parent=0); + DictionaryMenu(KPopupMenu *menu, KActionCollection *collection, TQObject *tqparent=0); ~DictionaryMenu(); void add(const TQString& name,const TQString& id); /** * Adds an item to this menu and to the keyboard accelerator. - * If key contains %1 it is replaced with a number 1-9 + * If key tqcontains %1 it is replaced with a number 1-9 */ void add(const TQString& name,const TQString& id, const TQString& key); diff --git a/kbabel/kbabeldict/kbabeldict.cpp b/kbabel/kbabeldict/kbabeldict.cpp index cae04d07..3ad967b2 100644 --- a/kbabel/kbabeldict/kbabeldict.cpp +++ b/kbabel/kbabeldict/kbabeldict.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kbabel/kbabeldict/kbabeldict.h b/kbabel/kbabeldict/kbabeldict.h index 3bfca817..8c2aef9f 100644 --- a/kbabel/kbabeldict/kbabeldict.h +++ b/kbabel/kbabeldict/kbabeldict.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -42,6 +42,7 @@ class KBabelDictView; class KBabelDict : public KDialogBase { Q_OBJECT + TQ_OBJECT public: KBabelDict(); diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp index 9580f2d9..4f1a4f7f 100644 --- a/kbabel/kbabeldict/kbabeldictbox.cpp +++ b/kbabel/kbabeldict/kbabeldictbox.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -74,10 +74,10 @@ using namespace KBabel; -class ResultListItem : public QListViewItem +class ResultListItem : public TQListViewItem { public: - ResultListItem(TQListView *parent, const SearchResult& result,bool richText); + ResultListItem(TQListView *tqparent, const SearchResult& result,bool richText); virtual TQString key(int column, bool ascending) const; const SearchResult* result() const; @@ -88,9 +88,9 @@ private: bool _richText; }; -ResultListItem::ResultListItem(TQListView *parent, const SearchResult& result +ResultListItem::ResultListItem(TQListView *tqparent, const SearchResult& result , bool richText) - : TQListViewItem(parent) + : TQListViewItem(tqparent) , _result(result) , _richText(richText) { @@ -109,7 +109,7 @@ ResultListItem::ResultListItem(TQListView *parent, const SearchResult& result tmp=result.found.first(); bool cutted=false; - int index=tmp.find('\n'); + int index=tmp.tqfind('\n'); if(index > 0) { tmp=tmp.left(index); @@ -132,7 +132,7 @@ ResultListItem::ResultListItem(TQListView *parent, const SearchResult& result tmp=result.translation; cutted=false; - index=tmp.find('\n'); + index=tmp.tqfind('\n'); if(index > 0) { tmp=tmp.left(index); @@ -179,11 +179,11 @@ const SearchResult *ResultListItem::result() const } /* - * Constructs a KBabelDictBox which is a child of 'parent', with the + * Constructs a KBabelDictBox which is a child of 'tqparent', with the * name 'name' and widget flags set to 'f' */ -KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl ) - : DCOPObject("KBabelDict"), TQWidget( parent, name, fl ) +KBabelDictBox::KBabelDictBox( TQWidget* tqparent, const char* name, WFlags fl ) + : DCOPObject("KBabelDict"), TQWidget( tqparent, name, fl ) { active=-1; currentResult=0; @@ -251,12 +251,12 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl ) hbox = new TQHBoxLayout; hbox->addStretch(1); - listButton = new TQToolButton(Qt::UpArrow,this); + listButton = new TQToolButton(TQt::UpArrow,this); listButton->setFixedSize(20,15); listButton->setAutoRepeat(false); connect(listButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(showListOnly())); hbox->addWidget(listButton); - detailButton = new TQToolButton(Qt::DownArrow,this); + detailButton = new TQToolButton(TQt::DownArrow,this); detailButton->setFixedSize(20,15); detailButton->setAutoRepeat(false); connect(detailButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(showDetailsOnly())); @@ -324,10 +324,10 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl ) mainLayout->addLayout(hbox); totalResultsLabel->setNum(100000); - totalResultsLabel->setFixedSize(totalResultsLabel->sizeHint()); + totalResultsLabel->setFixedSize(totalResultsLabel->tqsizeHint()); totalResultsLabel->setNum(0); currentLabel->setNum(100000); - currentLabel->setFixedSize(currentLabel->sizeHint()); + currentLabel->setFixedSize(currentLabel->tqsizeHint()); currentLabel->setNum(0); setRMBMenu(new TQPopupMenu(this)); @@ -347,7 +347,7 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl ) for ( TQStringList::Iterator fit = list.begin(); fit != list.end() ; ++fit ) { - if(!fileList.contains((*fit))) + if(!fileList.tqcontains((*fit))) { fileList.append((*fit)); } @@ -373,7 +373,7 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl ) TQStringList appList = rcConfig.readListEntry("Applications"); KInstance *inst = KGlobal::instance(); - if(inst && !appList.isEmpty() && !appList.contains(inst->instanceName())) + if(inst && !appList.isEmpty() && !appList.tqcontains(inst->instanceName())) { continue; } @@ -759,7 +759,7 @@ TQString KBabelDictBox::translate(const TQString text) if(!engine) { kdDebug(KBABELDICT) << "no module available" << endl; - return TQString::null; + return TQString(); } else { @@ -779,7 +779,7 @@ TQString KBabelDictBox::fuzzyTranslation(const TQString text, int &score) if(!engine) { kdDebug(KBABELDICT) << "no module available" << endl; - return TQString::null; + return TQString(); } else { @@ -799,7 +799,7 @@ TQString KBabelDictBox::searchTranslation(const TQString text, int &score) if(!engine) { kdDebug(KBABELDICT) << "no module available" << endl; - return TQString::null; + return TQString(); } else { @@ -929,7 +929,7 @@ TQPtrList<ModuleInfo> KBabelDictBox::moduleInfos() } -TQPtrList<PrefWidget> KBabelDictBox::modPrefWidgets(TQWidget *parent) +TQPtrList<PrefWidget> KBabelDictBox::modPrefWidgets(TQWidget *tqparent) { TQPtrList<PrefWidget> list; list.setAutoDelete(false); @@ -937,7 +937,7 @@ TQPtrList<PrefWidget> KBabelDictBox::modPrefWidgets(TQWidget *parent) for(e = moduleList.first(); e != 0; e = moduleList.next()) { - list.append(e->preferencesWidget(parent)); + list.append(e->preferencesWidget(tqparent)); } return list; @@ -1007,7 +1007,7 @@ void KBabelDictBox::showResult(TQListViewItem *item) if(!info->filePath.isEmpty()) { rmbPopup->changeItem(editFileIndex - ,i18n("Edit File %1").arg(info->location)); + ,i18n("Edit File %1").tqarg(info->location)); rmbPopup->setItemEnabled(editFileIndex,true); } else @@ -1182,7 +1182,7 @@ void KBabelDictBox::nextInfo() if(!info->filePath.isEmpty()) { rmbPopup->changeItem(editFileIndex - ,i18n("Edit File %1").arg(info->location)); + ,i18n("Edit File %1").tqarg(info->location)); rmbPopup->setItemEnabled(editFileIndex,true); } else @@ -1255,7 +1255,7 @@ void KBabelDictBox::about() if(aboutData->bugAddress() != "submit@bugs.kde.org") { text += "\n" + i18n("Send bugs to %1") - .arg(aboutData->bugAddress()) +"\n"; + .tqarg(aboutData->bugAddress()) +"\n"; } TQLabel *label = new TQLabel(text,0); @@ -1410,7 +1410,7 @@ void KBabelDictBox::copy() } else { - QClipboard *cb = KApplication::clipboard(); + TQClipboard *cb = KApplication::tqclipboard(); cb->setText(translation()); } } @@ -1502,7 +1502,7 @@ void KBabelDictBox::configure(const TQString& id, bool modal) { if(e->id() == id) { - TQString caption = i18n("Configure Dictionary %1").arg(e->name()); + TQString caption = i18n("Configure Dictionary %1").tqarg(e->name()); KDialogBase *dialog = new KDialogBase(this,"prefDialog" , modal, caption , KDialogBase::Ok|KDialogBase::Apply|KDialogBase::Cancel| @@ -1696,7 +1696,7 @@ void KBabelDictBox::editFile() { KMessageBox::sorry(this ,i18n("There was an error starting KBabel:\n%1") - .arg(error)); + .tqarg(error)); return; } } diff --git a/kbabel/kbabeldict/kbabeldictbox.h b/kbabel/kbabeldict/kbabeldictbox.h index e7bc86cd..0b850798 100644 --- a/kbabel/kbabeldict/kbabeldictbox.h +++ b/kbabel/kbabeldict/kbabeldictbox.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -63,9 +63,10 @@ struct ModuleInfo class KDE_EXPORT KBabelDictBox : public TQWidget, virtual public KBabelDictIFace { Q_OBJECT + TQ_OBJECT public: - KBabelDictBox( TQWidget* parent = 0, const char* name = 0 + KBabelDictBox( TQWidget* tqparent = 0, const char* name = 0 , WFlags fl = 0 ); ~KBabelDictBox(); @@ -82,7 +83,7 @@ public: TQPtrList<ModuleInfo> moduleInfos(); /** @returns preferencesWidgets of modules */ - TQPtrList<PrefWidget> modPrefWidgets(TQWidget* parent); + TQPtrList<PrefWidget> modPrefWidgets(TQWidget* tqparent); int activeModule(); bool activeModuleEditable(); diff --git a/kbabel/kbabeldict/kbabeldictiface.h b/kbabel/kbabeldict/kbabeldictiface.h index d576d4c5..c1250ad8 100644 --- a/kbabel/kbabeldict/kbabeldictiface.h +++ b/kbabel/kbabeldict/kbabeldictiface.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kbabel/kbabeldict/kbabeldictview.cpp b/kbabel/kbabeldict/kbabeldictview.cpp index b5be8399..5346e758 100644 --- a/kbabel/kbabeldict/kbabeldictview.cpp +++ b/kbabel/kbabeldict/kbabeldictview.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -61,11 +61,11 @@ #include <kiconloader.h> /* - * Constructs a KBabelDictView which is a child of 'parent', with the + * Constructs a KBabelDictView which is a child of 'tqparent', with the * name 'name' and widget flags set to 'f' */ -KBabelDictView::KBabelDictView( TQWidget* parent, const char* name, WFlags fl ) - : TQWidget( parent, name, fl ) +KBabelDictView::KBabelDictView( TQWidget* tqparent, const char* name, WFlags fl ) + : TQWidget( tqparent, name, fl ) { TQVBoxLayout *mainLayout = new TQVBoxLayout(this); mainLayout->setSpacing(KDialog::spacingHint()); @@ -184,7 +184,7 @@ KBabelDictView::KBabelDictView( TQWidget* parent, const char* name, WFlags fl ) */ KBabelDictView::~KBabelDictView() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us KConfig *config = KGlobal::config(); dictBox->saveSettings(config); } diff --git a/kbabel/kbabeldict/kbabeldictview.h b/kbabel/kbabeldict/kbabeldictview.h index b45e8650..fbde9928 100644 --- a/kbabel/kbabeldict/kbabeldictview.h +++ b/kbabel/kbabeldict/kbabeldictview.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -51,9 +51,10 @@ class KBabelDictBox; class KBabelDictView : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KBabelDictView( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + KBabelDictView( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~KBabelDictView(); bool prefVisible(); diff --git a/kbabel/kbabeldict/kbabelsplash.cpp b/kbabel/kbabeldict/kbabelsplash.cpp index 7b62f31e..eec450c6 100644 --- a/kbabel/kbabeldict/kbabelsplash.cpp +++ b/kbabel/kbabeldict/kbabelsplash.cpp @@ -15,11 +15,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -40,8 +40,8 @@ KBabelSplash* KBabelSplash::instance = 0; -KBabelSplash::KBabelSplash( TQWidget* parent, const char* name ) - : TQVBox( parent, name, WType_Dialog|WShowModal|WStyle_Customize|WStyle_NoBorder|WDestructiveClose ) +KBabelSplash::KBabelSplash( TQWidget* tqparent, const char* name ) + : TQVBox( tqparent, name, WType_Dialog|WShowModal|WStyle_Customize|WStyle_NoBorder|WDestructiveClose ) { setMargin( 0 ); setSpacing( 0 ); @@ -53,9 +53,9 @@ KBabelSplash::KBabelSplash( TQWidget* parent, const char* name ) picLabel->setFrameStyle(TQFrame::WinPanel | TQFrame::Raised); - // Set geometry, with support for Xinerama systems + // Set tqgeometry, with support for Xinerama systems TQRect r; - r.setSize(sizeHint()); + r.setSize(tqsizeHint()); int ps = TQApplication::desktop()->primaryScreen(); r.moveCenter( TQApplication::desktop()->screenGeometry(ps).center() ); setGeometry(r); diff --git a/kbabel/kbabeldict/kbabelsplash.h b/kbabel/kbabeldict/kbabelsplash.h index 208ea05c..22ed99d7 100644 --- a/kbabel/kbabeldict/kbabelsplash.h +++ b/kbabel/kbabeldict/kbabelsplash.h @@ -15,11 +15,11 @@ * * In addition, as a special exception, the copyright holders give * permission to link the code of this program with any edition of - * the Qt library by Trolltech AS, Norway (or with modified versions - * of Qt that use the same license as Qt), and distribute linked + * the TQt library by Trolltech AS, Norway (or with modified versions + * of TQt that use the same license as TQt), and distribute linked * combinations including the two. You must obey the GNU General * Public License in all respects for all of the code used other than - * Qt. If you modify this file, you may extend this exception to + * TQt. If you modify this file, you may extend this exception to * your version of the file, but you are not obligated to do so. If * you do not wish to do so, delete this exception statement from * your version. @@ -38,12 +38,13 @@ class TQPaintEvent; class TQString; -class KBabelSplash : public QVBox +class KBabelSplash : public TQVBox { Q_OBJECT + TQ_OBJECT public: - KBabelSplash( TQWidget* parent = 0, const char* name = 0 ); + KBabelSplash( TQWidget* tqparent = 0, const char* name = 0 ); ~KBabelSplash() { instance = 0; } static KBabelSplash* instance; diff --git a/kbabel/kbabeldict/main.cpp b/kbabel/kbabeldict/main.cpp index c327196b..a436eae3 100644 --- a/kbabel/kbabeldict/main.cpp +++ b/kbabel/kbabeldict/main.cpp @@ -23,11 +23,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp index 5c5c6a6d..3e658255 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp @@ -18,11 +18,11 @@ * * * In addition, as a special exception, the copyright holders give * * permission to link the code of this program with any edition of * - * the Qt library by Trolltech AS, Norway (or with modified versions * - * of Qt that use the same license as Qt), and distribute linked * + * the TQt library by Trolltech AS, Norway (or with modified versions * + * of TQt that use the same license as TQt), and distribute linked * * combinations including the two. You must obey the GNU General * * Public License in all respects for all of the code used other than * - * Qt. If you modify this file, you may extend this exception to * + * TQt. If you modify this file, you may extend this exception to * * your version of the file, but you are not obligated to do so. If * * you do not wish to do so, delete this exception statement from * * your version. * @@ -72,8 +72,8 @@ using namespace KBabel; -KDBSearchEngine::KDBSearchEngine (TQObject * parent, const char *name): -SearchEngine (parent, name) +KDBSearchEngine::KDBSearchEngine (TQObject * tqparent, const char *name): +SearchEngine (tqparent, name) { edited = "unknown"; dm = 0; //Database Manager @@ -124,7 +124,7 @@ KDBSearchEngine::loadDatabase (TQString database, bool noask = false) i18n ("Database folder does not exist:\n%1\n" "Do you want to create it now?"). - arg (database), TQString::null, i18n("Create Folder"), i18n("Do Not Create")) == + arg (database), TQString(), i18n("Create Folder"), i18n("Do Not Create")) == KMessageBox::Yes) { asked = true; @@ -255,7 +255,7 @@ KDBSearchEngine::loadDatabase (TQString database, bool noask = false) if (asked || KMessageBox::questionYesNo (0, i18n - ("Database files not found.\nDo you want to create them now?"), TQString::null, i18n("Create"), i18n("Do Not Create")) + ("Database files not found.\nDo you want to create them now?"), TQString(), i18n("Create"), i18n("Do Not Create")) == KMessageBox::Yes) { //fprintf(stderr,"SI\n"); @@ -559,7 +559,7 @@ KDBSearchEngine::repeat () bool ok = false; min = - QInputDialog::getInteger (i18n ("Minimum Repetition"), + TQInputDialog::getInteger (i18n ("Minimum Repetition"), i18n ("Insert the minimum number of repetitions for a string:"), 2, 1, 999999, 1, &ok); @@ -607,7 +607,7 @@ KDBSearchEngine::repeat () if (tot >= min && !inlibs) { id = item.key; - id = id.replace ("\n", "\"\n\""); + id = id.tqreplace ("\n", "\"\n\""); mle->append (txt.arg (tot).arg (ntra).arg (id)); } @@ -667,7 +667,7 @@ KDBSearchEngine::startSearchNow (int searchmode) bool allkey = (searchmode == MD_ALL_GOOD_KEYS); - bool equal, contains, contained, regexp, intra; + bool equal, tqcontains, contained, regexp, intra; intra = searchmode & MD_IN_TRANSLATION; @@ -700,12 +700,12 @@ KDBSearchEngine::startSearchNow (int searchmode) int pos; for (i = 0; i < len; i++) { - while ((pos = idMod->find (remchar.at (i))) != -1) + while ((pos = idMod->tqfind (remchar.at (i))) != -1) idMod->remove (pos, 1); } if (comm) - idMod->replace (TQRegExp ("\\_\\:.*\\\\n"), ""); //Read it from catalog !!! (NOT ONLY HERE) + idMod->tqreplace (TQRegExp ("\\_\\:.*\\\\n"), ""); //Read it from catalog !!! (NOT ONLY HERE) if (norm) @@ -773,7 +773,7 @@ KDBSearchEngine::startSearchNow (int searchmode) // Emit progress, process event and check stop now if (count % step == 0) { - emit progress (100 * count / /*QMAX( */ + emit progress (100 * count / /*TQMAX( */ totalprogress /*,1) */ ); kapp->processEvents (100); @@ -802,12 +802,12 @@ KDBSearchEngine::startSearchNow (int searchmode) //Remove character in list of character to be ignored for (i = 0; i < len; i++) - while ((pos = msgId.find (remchar.at (i))) != -1) + while ((pos = msgId.tqfind (remchar.at (i))) != -1) msgId.remove (pos, 1); //Remove context information from id found if (comm) - msgId.replace (TQRegExp ("\\_\\:.*\\\\n"), ""); + msgId.tqreplace (TQRegExp ("\\_\\:.*\\\\n"), ""); if (norm) @@ -838,14 +838,14 @@ KDBSearchEngine::startSearchNow (int searchmode) //Remove character in list of character to be ignored for (i = 0; i < len; i++) while ((pos = - msgId.find (remchar.at (i))) != + msgId.tqfind (remchar.at (i))) != -1) msgId.remove (pos, 1); //Remove context information from id found if (comm) msgId. - replace (TQRegExp ("\\_\\:.*\\\\n"), + tqreplace (TQRegExp ("\\_\\:.*\\\\n"), ""); @@ -867,12 +867,12 @@ KDBSearchEngine::startSearchNow (int searchmode) equal = false; if (rules & Contains) - contains = idMod->contains (msgId); + tqcontains = idMod->tqcontains (msgId); else - contains = false; + tqcontains = false; if (rules & Contained) - contained = msgId.contains (*idMod); + contained = msgId.tqcontains (*idMod); else contained = false; @@ -887,7 +887,7 @@ KDBSearchEngine::startSearchNow (int searchmode) } while (intra && nn < item.numTra); - if (equal || contains || contained || regexp || allkey) + if (equal || tqcontains || contained || regexp || allkey) { if (equal) @@ -1034,7 +1034,7 @@ KDBSearchEngine::startSingleSearch (TQString searchString, in = reg.search (searchString, in + len); len = reg.matchedLength (); TQString regToAdd = searchString; - regToAdd.replace (in, len, "[a-zA-Z0-9_%" + regaddchar + "]*"); + regToAdd.tqreplace (in, len, "[a-zA-Z0-9_%" + regaddchar + "]*"); regToAdd.append ("$"); regToAdd.prepend ("^"); // fprintf(stderr,"%s",(const char *)regToAdd.local8Bit()); @@ -1203,10 +1203,10 @@ KDBSearchEngine::readSettings (KConfigBase * config) } PrefWidget * -KDBSearchEngine::preferencesWidget (TQWidget * parent) +KDBSearchEngine::preferencesWidget (TQWidget * tqparent) { - pw = new PreferencesWidget (parent); + pw = new PreferencesWidget (tqparent); setSettings (); connect (pw, TQT_SIGNAL (restoreNow ()), this, TQT_SLOT (setSettings ())); connect (pw, TQT_SIGNAL (applyNow ()), this, TQT_SLOT (updateSettings ())); @@ -1406,19 +1406,19 @@ KDBSearchEngine::about () const } -QString +TQString KDBSearchEngine::name () const { return i18n ("Translation Database"); } -QString +TQString KDBSearchEngine::id () const { return TQString ("KDBSearchEngine"); } -QString +TQString KDBSearchEngine::lastError () { return lasterror; @@ -1552,11 +1552,11 @@ KDBSearchEngine::setLastError (const TQString & er) lasterror = er; } -QString +TQString KDBSearchEngine::translate (const TQString & text, const uint pluralForm) { if (!openDb ()) - return TQString::null; + return TQString(); /* if(!dbOpened) @@ -1566,7 +1566,7 @@ if(!dbOpened) { //emit anerror hasError(i18n("Database not opened")); - return TQString::null; + return TQString(); } } */ @@ -1574,7 +1574,7 @@ if(!dbOpened) DataBaseItem dbit = dm->getItem (text); if (dbit.isNull ()) - return TQString::null; + return TQString(); if (dbit.numTra == 1) return dbit.translations[0].translation; @@ -1744,9 +1744,9 @@ TQValueList < KeyAndScore > KDBSearchEngine::searchWords (TQString phrase, int in = 0, len = 0; - QString + TQString keyst = dm->getKey (min); - QRegExp + TQRegExp reg ("[a-zA-Z0-9_%" /*+remchar */ + regaddchar + "]+"); while ((in = reg.search (keyst, in + len)) != -1) { @@ -1798,7 +1798,7 @@ TQValueList < KeyAndScore > KDBSearchEngine::searchWords (TQString phrase, for (int j = 0; j < nres; j++) { - QString + TQString strkey = dm->getKey (resloc[j]); int stdscore = KDBSearchEngine::score (phrase, strkey); @@ -1811,7 +1811,7 @@ TQValueList < KeyAndScore > KDBSearchEngine::searchWords (TQString phrase, in = 0, len = 0, nword = 0; int remove = retnot ? common : 0; - QRegExp + TQRegExp reg ("[a-zA-Z0-9_%" /*+remchar */ + regaddchar + "]+"); while ((in = reg.search (strkey, in + len)) != -1) { diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.h b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.h index d948bbd4..d884f233 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.h +++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.h @@ -15,11 +15,11 @@ * * * In addition, as a special exception, the copyright holders give * * permission to link the code of this program with any edition of * - * the Qt library by Trolltech AS, Norway (or with modified versions * - * of Qt that use the same license as Qt), and distribute linked * + * the TQt library by Trolltech AS, Norway (or with modified versions * + * of TQt that use the same license as TQt), and distribute linked * * combinations including the two. You must obey the GNU General * * Public License in all respects for all of the code used other than * - * Qt. If you modify this file, you may extend this exception to * + * TQt. If you modify this file, you may extend this exception to * * your version of the file, but you are not obligated to do so. If * * you do not wish to do so, delete this exception statement from * * your version. * @@ -67,7 +67,7 @@ class SearchEntry int rules; }; -class KeyAndScore : public QString +class KeyAndScore : public TQString { public: KeyAndScore(); @@ -94,11 +94,12 @@ class CatalogDescription class KDBSearchEngine : public SearchEngine { Q_OBJECT + TQ_OBJECT public: - KDBSearchEngine(TQObject *parent=0,const char *name=0); + KDBSearchEngine(TQObject *tqparent=0,const char *name=0); ~KDBSearchEngine(); enum Rules {Equal = 1, Contains = 2, Contained = 4, RegExp = 8}; enum FormatRules { Dots = 1, Ampersand = 2, FirstWordUpper = 4, //Not yet used @@ -163,7 +164,7 @@ public: /* Sets the rules to decide when 2 string match (Uppercase and remove char are not set here) - 1 = EQUAL + 1 = ETQUAL 2 = SEARCH STRING IS CONTAINED IN DATABASE STRING (use with care, if you search nothing it will produce a dangerouse output) 4 = DATABASE STRING IS CONTAINED IN SEARCH STRING (it exclude msgid "") @@ -193,7 +194,7 @@ public: virtual void saveSettings(KConfigBase *config); virtual void readSettings(KConfigBase *config); - virtual PrefWidget *preferencesWidget(TQWidget *parent); + virtual PrefWidget *preferencesWidget(TQWidget *tqparent); virtual const KAboutData *about() const; diff --git a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp index 0847d594..cb5ebae1 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/database.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/database.cpp @@ -19,11 +19,11 @@ * * * In addition, as a special exception, the copyright holders give * * permission to link the code of this program with any edition of * - * the Qt library by Trolltech AS, Norway (or with modified versions * - * of Qt that use the same license as Qt), and distribute linked * + * the TQt library by Trolltech AS, Norway (or with modified versions * + * of TQt that use the same license as TQt), and distribute linked * * combinations including the two. You must obey the GNU General * * Public License in all respects for all of the code used other than * - * Qt. If you modify this file, you may extend this exception to * + * TQt. If you modify this file, you may extend this exception to * * your version of the file, but you are not obligated to do so. If * * you do not wish to do so, delete this exception statement from * * your version. * @@ -294,8 +294,8 @@ DataBaseItem::toRawData (char *_data) DataBaseManager::DataBaseManager (TQString directory, TQString lang, - TQObject * parent, const char *name): -TQObject (parent, name) + TQObject * tqparent, const char *name): +TQObject (tqparent, name) { TQString filename; @@ -782,7 +782,7 @@ DataBaseManager::createDataBase (TQString directory, rename (filename.local8Bit (), filename.local8Bit () + ",old"); -//kdDebug(0) << TQString("Creating %1").arg(filename) << endl; +//kdDebug(0) << TQString("Creating %1").tqarg(filename) << endl; iAmOk = true; @@ -889,7 +889,7 @@ DataBaseManager::getCatalogInfo (int n) return InfoItem (); } -// kdDebug(0) << TQString("Trad %1").arg(ret) << endl; +// kdDebug(0) << TQString("Trad %1").tqarg(ret) << endl; InfoItem it ((char *) data.data, language); //free(data.data); // Read docu for this!!!! @@ -1000,7 +1000,7 @@ DataBaseManager::loadInfo () TQValueList < TQString > DataBaseManager::wordsIn (TQString string) { - QString + TQString a; TQValueList < TQString > words; int @@ -1015,7 +1015,7 @@ TQValueList < TQString > DataBaseManager::wordsIn (TQString string) int c = 0; //words.setAutoDelete(true); //Not sure... check if it is en. - QString + TQString m; for (i = 0; i < l; i++) if (a[i].isLetterOrNumber ()) @@ -1324,7 +1324,7 @@ DataBaseManager::appendKey (TQString _key) else ret = *(uint32 *) key.data; -//kdDebug(0) << TQString("Append result %1,err = %1").arg(ret).arg(err) << endl; +//kdDebug(0) << TQString("Append result %1,err = %1").tqarg(ret).tqarg(err) << endl; free (data.data); @@ -1333,7 +1333,7 @@ DataBaseManager::appendKey (TQString _key) } -QString +TQString DataBaseManager::getKey (uint32 n) { @@ -1349,11 +1349,11 @@ DataBaseManager::getKey (uint32 n) //Check for errors int ret = indexDb->get (indexDb, 0, &key, &data, 0); //DB_SET_RECNO); if (ret) - return TQString::null; + return TQString(); return TQString::fromUtf8 ((char *) data.data); -// kdDebug(0) << TQString("Trad %1").arg(ret) << endl; +// kdDebug(0) << TQString("Trad %1").tqarg(ret) << endl; } @@ -1446,7 +1446,7 @@ DataBaseManager::putNewTranslation (TQString key, TQString tran, int catalog, isThisOne = (*ittr).translation == msgstr; // is there the catnum we are looking for? - if ((*ittr).infoRef.find (catnum) != (*ittr).infoRef.end ()) + if ((*ittr).infoRef.tqfind (catnum) != (*ittr).infoRef.end ()) { found_catalog_info = true; if (ow && !isThisOne) diff --git a/kbabel/kbabeldict/modules/dbsearchengine/database.h b/kbabel/kbabeldict/modules/dbsearchengine/database.h index 3e68e01d..05a09955 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/database.h +++ b/kbabel/kbabeldict/modules/dbsearchengine/database.h @@ -16,11 +16,11 @@ * * * In addition, as a special exception, the copyright holders give * * permission to link the code of this program with any edition of * - * the Qt library by Trolltech AS, Norway (or with modified versions * - * of Qt that use the same license as Qt), and distribute linked * + * the TQt library by Trolltech AS, Norway (or with modified versions * + * of TQt that use the same license as TQt), and distribute linked * * combinations including the two. You must obey the GNU General * * Public License in all respects for all of the code used other than * - * Qt. If you modify this file, you may extend this exception to * + * TQt. If you modify this file, you may extend this exception to * * your version of the file, but you are not obligated to do so. If * * you do not wish to do so, delete this exception statement from * * your version. * @@ -155,10 +155,11 @@ class DataBaseItem uint32 location; }; -class DataBaseManager : public QObject +class DataBaseManager : public TQObject { Q_OBJECT + TQ_OBJECT public: /* @@ -175,7 +176,7 @@ class DataBaseManager : public QObject */ - DataBaseManager(TQString directory,TQString lang,TQObject *parent=0,const char *name=0); + DataBaseManager(TQString directory,TQString lang,TQObject *tqparent=0,const char *name=0); ~DataBaseManager(); /* Create a new databse structure. diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp index 0ee1ba4b..fd3ed7f1 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp @@ -18,11 +18,11 @@ * * * In addition, as a special exception, the copyright holders give * * permission to link the code of this program with any edition of * - * the Qt library by Trolltech AS, Norway (or with modified versions * - * of Qt that use the same license as Qt), and distribute linked * + * the TQt library by Trolltech AS, Norway (or with modified versions * + * of TQt that use the same license as TQt), and distribute linked * * combinations including the two. You must obey the GNU General * * Public License in all respects for all of the code used other than * - * Qt. If you modify this file, you may extend this exception to * + * TQt. If you modify this file, you may extend this exception to * * your version of the file, but you are not obligated to do so. If * * you do not wish to do so, delete this exception statement from * * your version. * @@ -39,7 +39,7 @@ using namespace KBabel; PoScanner::PoScanner(DataBaseManager *dbm, - TQObject *parent,const char *name):TQObject(parent,name) + TQObject *tqparent,const char *name):TQObject(tqparent,name) { dm=dbm; removeOldCatalogTranslation=false; //Check if this flag do something. @@ -57,7 +57,7 @@ if (!called) { pb=true; count=0;} called=true; -kdDebug(0) << TQString("cat: %1, %2").arg(pathName).arg(pattern) << endl; +kdDebug(0) << TQString("cat: %1, %2").tqarg(pathName).tqarg(pattern) << endl; if(pb) {emit patternStarted(); @@ -65,7 +65,7 @@ emit patternProgress(0); } TQDir d(pathName,pattern); d.setMatchAllDirs(true); - const QFileInfoList* files = d.entryInfoList(); + const TQFileInfoList* files = d.entryInfoList(); tot=files->count(); TQPtrListIterator<TQFileInfo> it(*files); kdDebug(0) << tot << endl; @@ -120,7 +120,7 @@ InfoItem cinfo; Catalog * catalog=new Catalog(this,"ScanPoCatalog"); -TQString location=fileName.right(fileName.length()-fileName.findRev("/")-1); +TQString location=fileName.right(fileName.length()-fileName.tqfindRev("/")-1); connect(catalog,TQT_SIGNAL(signalProgress(int)),this,TQT_SIGNAL(fileLoading(int))); emit filename(location); emit fileProgress(0); @@ -128,7 +128,7 @@ emit fileLoading(0); KURL u(fileName); -ConversionStatus rr=catalog->openURL(u); +ConversiontqStatus rr=catalog->openURL(u); if(rr != OK && rr !=RECOVERED_PARSE_ERROR ) { delete catalog; @@ -149,7 +149,7 @@ tot=catalog->numberOfEntries(); bool fuzzy; bool untra; -//kdDebug(0) << TQString("Tot: %1").arg(tot) << endl; +//kdDebug(0) << TQString("Tot: %1").tqarg(tot) << endl; for (i=0;i<tot;i++) //Skip header = ???? { diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.h b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.h index 2390c3d1..c6212fbd 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.h +++ b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.h @@ -16,11 +16,11 @@ * * * In addition, as a special exception, the copyright holders give * * permission to link the code of this program with any edition of * - * the Qt library by Trolltech AS, Norway (or with modified versions * - * of Qt that use the same license as Qt), and distribute linked * + * the TQt library by Trolltech AS, Norway (or with modified versions * + * of TQt that use the same license as TQt), and distribute linked * * combinations including the two. You must obey the GNU General * * Public License in all respects for all of the code used other than * - * Qt. If you modify this file, you may extend this exception to * + * TQt. If you modify this file, you may extend this exception to * * your version of the file, but you are not obligated to do so. If * * you do not wish to do so, delete this exception statement from * * your version. * @@ -41,13 +41,14 @@ #include <catalog.h> #include "database.h" -class PoScanner : public QObject +class PoScanner : public TQObject { Q_OBJECT + TQ_OBJECT public: - PoScanner(DataBaseManager *dbm,TQObject *parent=0,const char *name=0); + PoScanner(DataBaseManager *dbm,TQObject *tqparent=0,const char *name=0); /* Scan a single PO file. diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp b/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp index 86975874..599ace4c 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp @@ -21,8 +21,8 @@ KInstance *DbSeFactory::s_instance = 0; KAboutData *DbSeFactory::s_about = 0; -DbSeFactory::DbSeFactory( TQObject *parent, const char *name) - : KLibFactory(parent,name) +DbSeFactory::DbSeFactory( TQObject *tqparent, const char *name) + : KLibFactory(tqparent,name) { } @@ -42,7 +42,7 @@ DbSeFactory::~DbSeFactory() } -TQObject *DbSeFactory::createObject( TQObject *parent, const char *name, +TQObject *DbSeFactory::createObject( TQObject *tqparent, const char *name, const char *classname, const TQStringList &) { if(TQCString(classname) != "SearchEngine") @@ -51,7 +51,7 @@ TQObject *DbSeFactory::createObject( TQObject *parent, const char *name, return 0; } - KDBSearchEngine *se = new KDBSearchEngine(parent,name); + KDBSearchEngine *se = new KDBSearchEngine(tqparent,name); emit objectCreated(se); return se; diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.h b/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.h index 7ae4f20b..b146b021 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.h +++ b/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.h @@ -8,12 +8,13 @@ class KAboutData; class DbSeFactory : public KLibFactory { Q_OBJECT + TQ_OBJECT public: - DbSeFactory( TQObject *parent=0, const char *name=0); + DbSeFactory( TQObject *tqparent=0, const char *name=0); ~DbSeFactory(); - virtual TQObject *createObject( TQObject *parent=0, const char *name=0, - const char *classname="TQObject", + virtual TQObject *createObject( TQObject *tqparent=0, const char *name=0, + const char *classname=TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); static KInstance *instance(); diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui b/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui index d18ecaef..73e15117 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui +++ b/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>DBSearchEnginePref</class> <author>Andrea Rizzi <rizzi@kde.org></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DBSEPrefWidget</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -23,14 +23,14 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>TabWidget6</cstring> </property> <property name="whatsThis" stdset="0"> <string></string> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Widget4</cstring> </property> @@ -47,7 +47,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>ButtonGroup2</cstring> </property> @@ -64,7 +64,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>allRB</cstring> </property> @@ -77,7 +77,7 @@ according to the rules defined in tabs <strong> Generic </strong> and <strong>Match</strong></string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>slistRB</cstring> </property> @@ -92,7 +92,7 @@ and <strong>Match</strong></string> This is the best way to search because the <em>good keys</em> list probably contains all the keys that match with your query. However, it is smaller than the whole database.</string> </property> </widget> - <widget class="QRadioButton" row="2" column="0"> + <widget class="TQRadioButton" row="2" column="0"> <property name="name"> <cstring>rlistRB</cstring> </property> @@ -105,7 +105,7 @@ This is the best way to search because the <em>good keys</em> list p </widget> </grid> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>caseSensitiveCB</cstring> </property> @@ -116,7 +116,7 @@ This is the best way to search because the <em>good keys</em> list p <string><qml>If it is checked the search will be case sensitive. It is ignored if you use <em>Return the list of "good keys"</em> search mode.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>normalizeCB</cstring> </property> @@ -131,7 +131,7 @@ This is the best way to search because the <em>good keys</em> list p It also substitutes groups of more than one space character with only one space character.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>removeContextCB</cstring> </property> @@ -145,7 +145,7 @@ It also substitutes groups of more than one space character with only one space <string>Remove, if exists, the _:comment</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout11</cstring> </property> @@ -159,7 +159,7 @@ It also substitutes groups of more than one space character with only one space <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -179,7 +179,7 @@ It also substitutes groups of more than one space character with only one space <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>20</height> @@ -201,7 +201,7 @@ It also substitutes groups of more than one space character with only one space </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Widget5</cstring> </property> @@ -218,7 +218,7 @@ It also substitutes groups of more than one space character with only one space <property name="spacing"> <number>6</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>ButtonGroup1</cstring> </property> @@ -245,7 +245,7 @@ It also substitutes groups of more than one space character with only one space <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -262,14 +262,14 @@ It also substitutes groups of more than one space character with only one space <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="2" column="1"> + <widget class="TQCheckBox" row="2" column="1"> <property name="name"> <cstring>containedCB</cstring> </property> @@ -280,18 +280,18 @@ It also substitutes groups of more than one space character with only one space <string>Match if query is contained in database string</string> </property> </widget> - <widget class="QCheckBox" row="3" column="1"> + <widget class="TQCheckBox" row="3" column="1"> <property name="name"> <cstring>containsCB</cstring> </property> <property name="text"> - <string>Query contains</string> + <string>Query tqcontains</string> </property> <property name="whatsThis" stdset="0"> <string>Match if query contains the database string</string> </property> </widget> - <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>normalTextRB</cstring> </property> @@ -305,7 +305,7 @@ It also substitutes groups of more than one space character with only one space <string>Consider the search string as normal text.</string> </property> </widget> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>equalCB</cstring> </property> @@ -332,14 +332,14 @@ It also substitutes groups of more than one space character with only one space <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QRadioButton" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>RegExpRB</cstring> </property> @@ -352,7 +352,7 @@ It also substitutes groups of more than one space character with only one space </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox3</cstring> </property> @@ -384,14 +384,14 @@ If you search for <em>My name is Andrea</em> and you have activated <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>oneWordSubCB</cstring> </property> @@ -415,14 +415,14 @@ If you search for <em>My name is Andrea</em> and you have activated <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -430,7 +430,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Max number of words in the query:</string> </property> </widget> - <widget class="QSpinBox" row="3" column="2"> + <widget class="TQSpinBox" row="3" column="2"> <property name="name"> <cstring>twoWordSubSB</cstring> </property> @@ -444,7 +444,7 @@ If you search for <em>My name is Andrea</em> and you have activated <number>10</number> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>twoWordSubCB</cstring> </property> @@ -458,7 +458,7 @@ If you search for <em>My name is Andrea</em> and you have activated <bool>true</bool> </property> </widget> - <widget class="QLabel" row="3" column="1"> + <widget class="TQLabel" row="3" column="1"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -466,7 +466,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Max number of words in the query:</string> </property> </widget> - <widget class="QLayoutWidget" row="5" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="5" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>Layout7</cstring> </property> @@ -480,14 +480,14 @@ If you search for <em>My name is Andrea</em> and you have activated <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel5_3</cstring> </property> <property name="text"> <string>[A-Za-z0-9_%</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -498,7 +498,7 @@ If you search for <em>My name is Andrea</em> and you have activated <cstring>regExpLE</cstring> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel6_2</cstring> </property> @@ -508,7 +508,7 @@ If you search for <em>My name is Andrea</em> and you have activated </widget> </hbox> </widget> - <widget class="QLabel" row="4" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="4" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -516,7 +516,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Local characters for regular expressions:</string> </property> </widget> - <widget class="QSpinBox" row="1" column="2"> + <widget class="TQSpinBox" row="1" column="2"> <property name="name"> <cstring>oneWordSubSB</cstring> </property> @@ -545,7 +545,7 @@ If you search for <em>My name is Andrea</em> and you have activated </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Widget6</cstring> </property> @@ -562,7 +562,7 @@ If you search for <em>My name is Andrea</em> and you have activated <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>TextLabel7_2</cstring> </property> @@ -575,7 +575,7 @@ If you search for <em>My name is Andrea</em> and you have activated <cstring>dirInput</cstring> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>autoAddCB_2</cstring> </property> @@ -592,7 +592,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Automatically add an entry to the database if a new translation is notified by someone (may be kbabel)</string> </property> </widget> - <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -606,7 +606,7 @@ If you search for <em>My name is Andrea</em> and you have activated <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_4</cstring> </property> @@ -614,7 +614,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Auto added entry author:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>authorLE</cstring> </property> @@ -624,7 +624,7 @@ If you search for <em>My name is Andrea</em> and you have activated </widget> </hbox> </widget> - <widget class="QPushButton" row="4" column="0" rowspan="1" colspan="3"> + <widget class="TQPushButton" row="4" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>scanFilePB</cstring> </property> @@ -632,7 +632,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Scan Single PO File...</string> </property> </widget> - <widget class="QPushButton" row="5" column="0" rowspan="1" colspan="3"> + <widget class="TQPushButton" row="5" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>scanPB_2</cstring> </property> @@ -640,7 +640,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Scan Folder...</string> </property> </widget> - <widget class="QPushButton" row="6" column="0" rowspan="1" colspan="3"> + <widget class="TQPushButton" row="6" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>scanrecPB</cstring> </property> @@ -648,7 +648,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Scan Folder && Subfolders...</string> </property> </widget> - <widget class="QLayoutWidget" row="8" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="8" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>Layout5</cstring> </property> @@ -662,7 +662,7 @@ If you search for <em>My name is Andrea</em> and you have activated <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>filenameLB</cstring> </property> @@ -670,7 +670,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Scanning file:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>entriesLB</cstring> </property> @@ -680,7 +680,7 @@ If you search for <em>My name is Andrea</em> and you have activated </widget> </vbox> </widget> - <widget class="QLayoutWidget" row="9" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="9" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -694,7 +694,7 @@ If you search for <em>My name is Andrea</em> and you have activated <property name="spacing"> <number>6</number> </property> - <widget class="QProgressBar" row="2" column="1"> + <widget class="TQProgressBar" row="2" column="1"> <property name="name"> <cstring>processPB</cstring> </property> @@ -711,7 +711,7 @@ If you search for <em>My name is Andrea</em> and you have activated <bool>false</bool> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1_3</cstring> </property> @@ -719,7 +719,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Total progress:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel3_3</cstring> </property> @@ -727,7 +727,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Processing file:</string> </property> </widget> - <widget class="QProgressBar" row="0" column="1"> + <widget class="TQProgressBar" row="0" column="1"> <property name="name"> <cstring>totalPB</cstring> </property> @@ -741,7 +741,7 @@ If you search for <em>My name is Andrea</em> and you have activated <bool>true</bool> </property> </widget> - <widget class="QProgressBar" row="1" column="1"> + <widget class="TQProgressBar" row="1" column="1"> <property name="name"> <cstring>loadingPB</cstring> </property> @@ -755,7 +755,7 @@ If you search for <em>My name is Andrea</em> and you have activated <bool>true</bool> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel2_3</cstring> </property> @@ -765,7 +765,7 @@ If you search for <em>My name is Andrea</em> and you have activated </widget> </grid> </widget> - <widget class="QPushButton" row="10" column="2"> + <widget class="TQPushButton" row="10" column="2"> <property name="name"> <cstring>exportPB</cstring> </property> @@ -776,7 +776,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Export...</string> </property> </widget> - <widget class="QPushButton" row="10" column="0"> + <widget class="TQPushButton" row="10" column="0"> <property name="name"> <cstring>statPB</cstring> </property> @@ -787,7 +787,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Statistics</string> </property> </widget> - <widget class="QPushButton" row="10" column="1"> + <widget class="TQPushButton" row="10" column="1"> <property name="name"> <cstring>repeatPB</cstring> </property> @@ -797,7 +797,7 @@ If you search for <em>My name is Andrea</em> and you have activated </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -814,7 +814,7 @@ If you search for <em>My name is Andrea</em> and you have activated <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox4</cstring> </property> @@ -838,7 +838,7 @@ Finally you can set the maximum number of entries in the list.</string> <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel3_2</cstring> </property> @@ -849,7 +849,7 @@ Finally you can set the maximum number of entries in the list.</string> <enum>RichText</enum> </property> </widget> - <widget class="QSlider" row="1" column="0"> + <widget class="TQSlider" row="1" column="0"> <property name="name"> <cstring>thresholdSL</cstring> </property> @@ -863,7 +863,7 @@ Finally you can set the maximum number of entries in the list.</string> <enum>Horizontal</enum> </property> </widget> - <widget class="QSpinBox" row="1" column="1"> + <widget class="TQSpinBox" row="1" column="1"> <property name="name"> <cstring>SpinBox5</cstring> </property> @@ -877,7 +877,7 @@ Finally you can set the maximum number of entries in the list.</string> <number>50</number> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel2_2</cstring> </property> @@ -885,7 +885,7 @@ Finally you can set the maximum number of entries in the list.</string> <string>Minimum number of query words in the key (%):</string> </property> </widget> - <widget class="QSpinBox" row="4" column="1"> + <widget class="TQSpinBox" row="4" column="1"> <property name="name"> <cstring>maxSB</cstring> </property> @@ -896,7 +896,7 @@ Finally you can set the maximum number of entries in the list.</string> <number>30</number> </property> </widget> - <widget class="QSpinBox" row="3" column="1"> + <widget class="TQSpinBox" row="3" column="1"> <property name="name"> <cstring>SpinBox6</cstring> </property> @@ -910,7 +910,7 @@ Finally you can set the maximum number of entries in the list.</string> <number>50</number> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>TextLabel4_2</cstring> </property> @@ -918,7 +918,7 @@ Finally you can set the maximum number of entries in the list.</string> <string>Max list length:</string> </property> </widget> - <widget class="QSlider" row="3" column="0"> + <widget class="TQSlider" row="3" column="0"> <property name="name"> <cstring>thresholdOrigSL</cstring> </property> @@ -934,7 +934,7 @@ Finally you can set the maximum number of entries in the list.</string> </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox3_2</cstring> </property> @@ -951,7 +951,7 @@ Finally you can set the maximum number of entries in the list.</string> <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -959,7 +959,7 @@ Finally you can set the maximum number of entries in the list.</string> <string>Discard words more frequent than:</string> </property> </widget> - <widget class="QSpinBox" row="0" column="1"> + <widget class="TQSpinBox" row="0" column="1"> <property name="name"> <cstring>freqSB</cstring> </property> @@ -976,7 +976,7 @@ Finally you can set the maximum number of entries in the list.</string> <number>100</number> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>nothingCB</cstring> </property> @@ -1032,5 +1032,5 @@ Finally you can set the maximum number of entries in the list.</string> <include location="local" impldecl="in declaration">klocale.h</include> <include location="global" impldecl="in declaration">kseparator.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kbabel/kbabeldict/modules/dbsearchengine/makemsgdb.C b/kbabel/kbabeldict/modules/dbsearchengine/makemsgdb.C index a83d947b..74a09037 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/makemsgdb.C +++ b/kbabel/kbabeldict/modules/dbsearchengine/makemsgdb.C @@ -116,9 +116,9 @@ nmax++; normalizestr(a); // printf("#%s#\n",a); -// while (st.find("#~")==0) +// while (st.tqfind("#~")==0) // st = st.right(st.length()-2); -// while (st.find(" ")==0) +// while (st.tqfind(" ")==0) // st = st.right(st.length()-1); if(isAMsgId) nextIsFuzzy=false; diff --git a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp index 562f0835..c81a8562 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp @@ -14,18 +14,18 @@ #include "dbseprefwidget.h" #include "preferenceswidget.h" -PreferencesWidget::PreferencesWidget(TQWidget *parent, const char* name) - : PrefWidget(parent,name) +PreferencesWidget::PreferencesWidget(TQWidget *tqparent, const char* name) + : PrefWidget(tqparent,name) { - TQVBoxLayout *layout = new TQVBoxLayout(this); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this); // TQLabel *label = new TQLabel(i18n("Settings for KDE database search engine"),this); -// layout->addWidget(label); +// tqlayout->addWidget(label); dbpw = new DBSearchEnginePref(this); dbpw->dirInput->setMode(KFile::Directory | KFile::LocalOnly); - layout->addWidget(dbpw); - resize(TQSize(200,200).expandedTo(minimumSizeHint())); + tqlayout->addWidget(dbpw); + resize(TQSize(200,200).expandedTo(tqminimumSizeHint())); // connect(dbpw->browseTB_3,TQT_SIGNAL(clicked()),TQT_SLOT(browse1())); @@ -99,12 +99,12 @@ TQString defaultDir; void PreferencesWidget::setName(TQString n) { -dbpw->filenameLB->setText(i18n("Scanning file: %1").arg(n)); +dbpw->filenameLB->setText(i18n("Scanning file: %1").tqarg(n)); } void PreferencesWidget::setEntries(int i) { -dbpw->entriesLB->setText(i18n("Entries added: %1").arg(i)); +dbpw->entriesLB->setText(i18n("Entries added: %1").tqarg(i)); } diff --git a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.h b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.h index 5cd1fed8..134c60bd 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.h +++ b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.h @@ -7,9 +7,10 @@ class PreferencesWidget : public PrefWidget { Q_OBJECT + TQ_OBJECT public: - PreferencesWidget(TQWidget *parent=0, const char* name=0); + PreferencesWidget(TQWidget *tqparent=0, const char* name=0); virtual ~PreferencesWidget(); virtual void apply(); diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp index 41f4319d..36f66fc1 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp @@ -18,11 +18,11 @@ * * * In addition, as a special exception, the copyright holders give * * permission to link the code of this program with any edition of * - * the Qt library by Trolltech AS, Norway (or with modified versions * - * of Qt that use the same license as Qt), and distribute linked * + * the TQt library by Trolltech AS, Norway (or with modified versions * + * of TQt that use the same license as TQt), and distribute linked * * combinations including the two. You must obey the GNU General * * Public License in all respects for all of the code used other than * - * Qt. If you modify this file, you may extend this exception to * + * TQt. If you modify this file, you may extend this exception to * * your version of the file, but you are not obligated to do so. If * * you do not wish to do so, delete this exception statement from * * your version. * @@ -47,8 +47,8 @@ #include <kdebug.h> #define i18n (const char *) -KDBSearchEngine2::KDBSearchEngine2(TQObject *parent,const char*name) - : SearchEngine(parent,name) +KDBSearchEngine2::KDBSearchEngine2(TQObject *tqparent,const char*name) + : SearchEngine(tqparent,name) { pw=0; dbDirectory="."; @@ -250,15 +250,15 @@ void KDBSearchEngine2::stringChanged( TQString orig, TQString translated if(!init()) return; //if(translated.isEmpty()) return; InputInfo ii; - if(description.find("fuzzy",false)==-1) + if(description.tqfind("fuzzy",false)==-1) di->addEntry(orig,translated,&ii); } -PrefWidget * KDBSearchEngine2::preferencesWidget(TQWidget *parent) +PrefWidget * KDBSearchEngine2::preferencesWidget(TQWidget *tqparent) { - pw = new KDB2PreferencesWidget(parent); + pw = new KDB2PreferencesWidget(tqparent); kdDebug(0) << "new KDB2 preferences widget" << endl; setSettings(); connect(pw,TQT_SIGNAL(restoreNow()),this,TQT_SLOT(setSettings())); @@ -499,7 +499,7 @@ void KDBSearchEngine2::scanNowPressed() TQString sourceName; sourceName=pw->dbpw->sourceList->currentText(); if(!init()) return; - if(sources.contains(sourceName)) + if(sources.tqcontains(sourceName)) { TQValueList<KURL> urls=sources[sourceName].urls(); PoScanner ps(di); @@ -538,7 +538,7 @@ void KDBSearchEngine2::editSource() TQString sourceName; sourceName=pw->dbpw->sourceList->currentText(); - if(sources.contains(sourceName)) + if(sources.tqcontains(sourceName)) { bool nameIsNew; TQString newName; @@ -554,7 +554,7 @@ void KDBSearchEngine2::editSource() { return; } - nameIsNew=sources.contains(newName); + nameIsNew=sources.tqcontains(newName); if(newName!=sourceName && !nameIsNew) { @@ -602,13 +602,13 @@ void KDBSearchEngine2::addSource() if(sd.exec()==TQDialog::Accepted) { newName= sd.sourceName->text(); - nameIsNew=!sources.contains(newName); + nameIsNew=!sources.tqcontains(newName); } else { return; } - // nameIsNew=sources.contains(newName); + // nameIsNew=sources.tqcontains(newName); if(!nameIsNew) { KMessageBox::error(0,i18n("The name you chose is already used.\nPlease change the source name."), diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.h b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.h index fb9cff70..89a32571 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.h +++ b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.h @@ -22,10 +22,11 @@ Andrea Rizzi class KDBSearchEngine2 : public SearchEngine { Q_OBJECT + TQ_OBJECT public: - KDBSearchEngine2(TQObject *parent=0, const char *name=0); + KDBSearchEngine2(TQObject *tqparent=0, const char *name=0); virtual ~KDBSearchEngine2(); //init if needed. @@ -77,9 +78,9 @@ class KDBSearchEngine2 : public SearchEngine * search engine. The returned widget should not be bigger than * 400x400. If you need more space, you maybe want to use * a tabbed widget. - * @param parent the parent of the returned widget + * @param tqparent the tqparent of the returned widget */ - virtual PrefWidget* preferencesWidget(TQWidget *parent); + virtual PrefWidget* preferencesWidget(TQWidget *tqparent); /** @returns information about this SearchEngine */ virtual const KAboutData *about() const; diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/algorithms.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/algorithms.cpp index 466b68e5..ab3d14b1 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/algorithms.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/algorithms.cpp @@ -145,7 +145,7 @@ DataBaseInterface::ResultList ChunkByChunkSearchAlgorithm::exec( const TQString for(ResultList::iterator it1=r.begin();it1!=r.end() &&!di->stopNow(); ++it1) { TQString chunkTranslation= (*it1).result(); - if(!translationUsed.contains(chunkTranslation)) + if(!translationUsed.tqcontains(chunkTranslation)) { translationUsed[chunkTranslation]=true; kdDebug(0) << "a translation is: " << chunkTranslation << endl; @@ -330,7 +330,7 @@ DataBaseInterface::ResultList FuzzyChunkSearchAlgorithm::exec( const TQString & TQString re=di->format(di->simple(*it,true),query); QueryResult r(re,ori,score); for(TQPtrListIterator<AbstractChunk> it(querychunks); it.current() && di->stopNow() ; ++it){ - ori=ori.replace(TQRegExp((*it)->chunkString(),false),"<font color=#000080><u><b>"+(*it)->chunkString()+"</b></u></font>"); + ori=ori.tqreplace(TQRegExp((*it)->chunkString(),false),"<font color=#000080><u><b>"+(*it)->chunkString()+"</b></u></font>"); } r.setRichOriginal(ori); if(!di->stopNow()) diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/algorithms.h b/kbabel/kbabeldict/modules/dbsearchengine2/algorithms.h index aa049f85..e2c5db67 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/algorithms.h +++ b/kbabel/kbabeldict/modules/dbsearchengine2/algorithms.h @@ -16,9 +16,10 @@ #include "chunk.h" #include <tqobject.h> -class AbstractSearchAlgorithm : public QObject +class AbstractSearchAlgorithm : public TQObject { Q_OBJECT + TQ_OBJECT public: typedef TQValueList<QueryResult> ResultList; @@ -47,6 +48,7 @@ class AbstractSearchAlgorithm : public QObject class ExactSearchAlgorithm : public AbstractSearchAlgorithm { Q_OBJECT + TQ_OBJECT public: ExactSearchAlgorithm(DataBaseInterface *dbi,DBSESettings *sets) : AbstractSearchAlgorithm(dbi,sets) {} @@ -56,6 +58,7 @@ class ExactSearchAlgorithm : public AbstractSearchAlgorithm class AlphaSearchAlgorithm : public AbstractSearchAlgorithm { Q_OBJECT + TQ_OBJECT public: AlphaSearchAlgorithm(DataBaseInterface *dbi,DBSESettings *sets) : AbstractSearchAlgorithm(dbi,sets) {} @@ -65,6 +68,7 @@ class AlphaSearchAlgorithm : public AbstractSearchAlgorithm class SentenceArchiveSearchAlgorithm : public AbstractSearchAlgorithm { Q_OBJECT + TQ_OBJECT public: SentenceArchiveSearchAlgorithm(DataBaseInterface *dbi,DBSESettings *sets) ; @@ -74,6 +78,7 @@ class SentenceArchiveSearchAlgorithm : public AbstractSearchAlgorithm class ChunkByChunkSearchAlgorithm : public AbstractSearchAlgorithm { Q_OBJECT + TQ_OBJECT public: ChunkByChunkSearchAlgorithm(DataBaseInterface *dbi,DBSESettings *sets); @@ -90,6 +95,7 @@ class ChunkByChunkSearchAlgorithm : public AbstractSearchAlgorithm class FuzzyChunkSearchAlgorithm : public AbstractSearchAlgorithm { Q_OBJECT + TQ_OBJECT public: FuzzyChunkSearchAlgorithm(DataBaseInterface *dbi,DBSESettings *sets); @@ -105,6 +111,7 @@ class FuzzyChunkSearchAlgorithm : public AbstractSearchAlgorithm class GenericSearchAlgorithm : public AbstractSearchAlgorithm { Q_OBJECT + TQ_OBJECT public: GenericSearchAlgorithm(DataBaseInterface *dbi,DBSESettings *sets) ; @@ -123,6 +130,7 @@ class GenericSearchAlgorithm : public AbstractSearchAlgorithm class CorrelationSearchAlgorithm : public AbstractSearchAlgorithm { Q_OBJECT + TQ_OBJECT public: CorrelationSearchAlgorithm(DataBaseInterface *dbi,DBSESettings *sets) : AbstractSearchAlgorithm(dbi,sets) {} virtual ResultList exec(const TQString& query); @@ -133,6 +141,7 @@ class CorrelationSearchAlgorithm : public AbstractSearchAlgorithm class SingleWordSearchAlgorithm : public GenericSearchAlgorithm { Q_OBJECT + TQ_OBJECT public: SingleWordSearchAlgorithm(DataBaseInterface *dbi,DBSESettings *sets); virtual DataBaseInterface::ResultList exec(const TQString& query); diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp index 0631f7ad..e5250274 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp @@ -174,7 +174,7 @@ DataBaseInterface::MainEntry DataBaseInterface::get(const TQString& query,Search // kdDebug(0) << "MAINDB->GET returned: " << r << endl; if(counter%5==0) kapp->processEvents(100); // kdDebug(0) << "events processed" << endl; - return qMakePair(k,d); + return tqMakePair(k,d); } @@ -282,7 +282,7 @@ bool DataBaseInterface::addEntry(TQString original,TQString translated,InputInfo TQStringList wt=words(*otIt); for(TQStringList::iterator it = wt.begin(); it!=wt.end(); ++it) { - if(correlationDiff.contains(*it)) + if(correlationDiff.tqcontains(*it)) correlationDiff[*it]--; else correlationDiff[*it]=-1; @@ -299,7 +299,7 @@ bool DataBaseInterface::addEntry(TQString original,TQString translated,InputInfo TQStringList wt=words(*otIt); for(TQStringList::iterator it = wt.begin(); it!=wt.end(); ++it) { - if(correlationDiff.contains(*it)) + if(correlationDiff.tqcontains(*it)) correlationDiff[*it]++; else correlationDiff[*it]=1; @@ -408,7 +408,7 @@ TQMap<TQString,float> DataBaseInterface::correlation(TQString word,SearchFilter MainEntry e=get(k->getString(),filter); TQStringList trad=e.second.getTranslations(); - nocck=words(k->getString()).contains(sword); + nocck=words(k->getString()).tqcontains(sword); for( TQStringList::iterator it2=trad.begin();it2!=trad.end();++it2) { @@ -465,7 +465,7 @@ TQStringList DataBaseInterface::words(TQString s) int pos; do { - pos=str.find(TQRegExp("\\s")); + pos=str.tqfind(TQRegExp("\\s")); // if(!simple(str.left(pos)).isEmpty()) // list.append(simple(str.left(pos))); if(!str.left(pos).isEmpty()) @@ -484,13 +484,13 @@ TQString DataBaseInterface::simple(TQString str,bool ck) else res=str.lower(); //lowercase //FIXME: uncoment the foll. line (check speed) - res=res.replace(TQRegExp("(<(.*)>)(.*)(</\\2>)"),"\\3"); //remove enclosing tags + res=res.tqreplace(TQRegExp("(<(.*)>)(.*)(</\\2>)"),"\\3"); //remove enclosing tags //Try to get rid of regexps. - // res=res.replace(TQRegExp("(('|-|_|\\s|[^\\w%])+)")," "); //strip non-word char - // res=res.replace(TQRegExp("(('|-|_)+)")," "); //strip non-word char - // res=res.replace(TQRegExp("[^\\w\\s%]"),""); //strip non-word char + // res=res.tqreplace(TQRegExp("(('|-|_|\\s|[^\\w%])+)")," "); //strip non-word char + // res=res.tqreplace(TQRegExp("(('|-|_)+)")," "); //strip non-word char + // res=res.tqreplace(TQRegExp("[^\\w\\s%]"),""); //strip non-word char TQString r; TQChar c; @@ -607,16 +607,16 @@ TQString DataBaseInterface::format(TQString _s,TQString t) //FIXME use regexp TQString s=_s; - TQString noTagT=t.replace(TQRegExp("(<(.*)>)(.*)(</\\2>)"),"\\3"); - TQChar first=noTagT[noTagT.find(TQRegExp("\\w"))]; + TQString noTagT=t.tqreplace(TQRegExp("(<(.*)>)(.*)(</\\2>)"),"\\3"); + TQChar first=noTagT[noTagT.tqfind(TQRegExp("\\w"))]; bool firstCapital=isUpper(first); /* -bool dotsAtEnd=(t.find("...")+3==t.length()); -bool gtgtAtEnd=(t.find(">>")+2==t.length()); -bool ltltAtEnd=(t.find("<<")==t.length()-2); +bool dotsAtEnd=(t.tqfind("...")+3==t.length()); +bool gtgtAtEnd=(t.tqfind(">>")+2==t.length()); +bool ltltAtEnd=(t.tqfind("<<")==t.length()-2); -bool columnAtEnd=(t.find(":")+1==t.length()); +bool columnAtEnd=(t.tqfind(":")+1==t.length()); */ bool allupper=(t.upper()==t); @@ -643,13 +643,13 @@ if(columnAtEnd) if(allupper) s=s.upper(); - int pos=t.find(TQRegExp("&")); + int pos=t.tqfind(TQRegExp("&")); if(pos>=0) { - TQChar accel=t[t.find(TQRegExp("&"))+1]; + TQChar accel=t[t.tqfind(TQRegExp("&"))+1]; if(accel!='&') { - pos=s.find(accel,false); + pos=s.tqfind(accel,false); if(pos<0) pos=0; s.insert(pos,"&"); @@ -685,8 +685,8 @@ TQString DataBaseInterface::formatRegExp(TQString _s, TQString t, TQString tre,T //kdDebug(0) << "phRegExp: " << phRegExp << endl; //kdDebug(0) << "cap[" << i << "]: "<< *capit<< endl; - stringReplace = stringReplace.replace(TQRegExp(phRegExp),*capit); - stringSearch = stringSearch.replace(TQRegExp(phRegExp),*capit); + stringReplace = stringReplace.tqreplace(TQRegExp(phRegExp),*capit); + stringSearch = stringSearch.tqreplace(TQRegExp(phRegExp),*capit); i++; } @@ -694,7 +694,7 @@ TQString DataBaseInterface::formatRegExp(TQString _s, TQString t, TQString tre,T // kdDebug(0) << "stringReplace " << stringReplace << endl; TQRegExp stringSearchRegExp = TQRegExp(stringSearch); // kdDebug(0) << "before: "<<s<<endl; - s = s.replace(stringSearchRegExp,stringReplace); + s = s.tqreplace(stringSearchRegExp,stringReplace); // kdDebug(0) << "after: "<<s<<endl; } @@ -727,7 +727,7 @@ DataBaseInterface::MainEntry DataBaseInterface::getSentence( const TQString & qu DBItemMainData d; sentence->get(&k,&d); if(counter%5==0) kapp->processEvents(100); - return qMakePair(k,d); + return tqMakePair(k,d); } @@ -748,5 +748,5 @@ DBItemMultiIndex::IndexList DataBaseInterface::getWordIndex( const TQString & qu -//#include "database.moc.cpp" +//#include "database.tqmoc.cpp" diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/database.h b/kbabel/kbabeldict/modules/dbsearchengine2/database.h index d6ed3482..113d7704 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/database.h +++ b/kbabel/kbabeldict/modules/dbsearchengine2/database.h @@ -153,13 +153,13 @@ class SearchFilter -class DataBaseInterface : public QObject +class DataBaseInterface : public TQObject { public: //move result list typedef to AbstractAlgorthm or somewhere else typedef TQValueList<QueryResult> ResultList; - typedef QPair<DBItemMainKey,DBItemMainData> MainEntry; + typedef TQPair<DBItemMainKey,DBItemMainData> MainEntry; DataBaseInterface( TQString dir, DBSESettings *sets); ~DataBaseInterface(); diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbentries.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/dbentries.cpp index efa7e44d..0958b801 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbentries.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbentries.cpp @@ -71,13 +71,13 @@ void DBItemMainData::read(TQDataStream *s) void DBItemMainData::write(TQDataStream *s) { - *s << (Q_UINT32)indexnumber << translations; + *s << (TQ_UINT32)indexnumber << translations; } void DBItemMainData::addTranslation(TQString str, unsigned int ref) { //get(); - if(translations[str].find(ref)==translations[str].end()) // If it do not exists + if(translations[str].tqfind(ref)==translations[str].end()) // If it do not exists translations[str].append(ref); //add a new reference. else { @@ -106,7 +106,7 @@ TQMapIterator<TQString,TQValueList<unsigned int> > it2; { //Dirty hack it2=it; it++; - if(it2.data().find(ref)!=it2.data().end()) + if(it2.data().tqfind(ref)!=it2.data().end()) removeTranslation(it2.key(),ref); } @@ -142,7 +142,7 @@ list.clear(); void DBItemMultiIndex::addEntry(unsigned int index) { // get(); - if(list.find(index)==list.end()) + if(list.tqfind(index)==list.end()) { list.append(index); qHeapSort(list); diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp index 7c2d8564..b7e64c2b 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp @@ -39,7 +39,7 @@ void MessagesSource::writeConfig(KConfigBase *config) config->writeEntry("LocationType",type); config->writeEntry("ProjectName",projectName); config->writeEntry("ProjectKeywords",projectKeywords); - config->writeEntry("Status",status); + config->writeEntry("tqStatus",status); } void MessagesSource::readConfig(KConfigBase *config) @@ -48,7 +48,7 @@ void MessagesSource::readConfig(KConfigBase *config) type=config->readNumEntry("LocationType",0); projectName=config->readEntry("ProjectName"); projectKeywords=config->readEntry("ProjectKeywords"); - status=config->readEntry("Status"); + status=config->readEntry("tqStatus"); } @@ -87,7 +87,7 @@ TQValueList<KURL> MessagesSource::filesInDir(KURL url,bool recursive) TQDir d(url.path()); d.setMatchAllDirs(true); kdDebug(0) << d.count() << " files in dir "<< url.path()<<endl; - const QFileInfoList* files = d.entryInfoList(); + const TQFileInfoList* files = d.entryInfoList(); kdDebug(0) << files << endl; // TQPtrListIterator<TQFileInfo> it(*files); @@ -120,7 +120,7 @@ TQValueList<KURL> MessagesSource::filesInDir(KURL url,bool recursive) //FIXME: clean this class PoScanner::PoScanner(DataBaseInterface *dbi, - TQObject *parent,const char *name):TQObject(parent,name) + TQObject *tqparent,const char *name):TQObject(tqparent,name) { di=dbi; removeOldCatalogTranslation=true; @@ -138,7 +138,7 @@ if (!called) { pb=true; count=0;} called=true; -kdDebug(0) << TQString("Scanning: %1, %2").arg(pathName).arg(pattern) << endl; +kdDebug(0) << TQString("Scanning: %1, %2").tqarg(pathName).tqarg(pattern) << endl; if(pb) { @@ -147,7 +147,7 @@ emit patternProgress(0); } TQDir d(pathName,pattern); d.setMatchAllDirs(true); - const QFileInfoList* files = d.entryInfoList(); + const TQFileInfoList* files = d.entryInfoList(); tot=files->count(); TQPtrListIterator<TQFileInfo> it(*files); kdDebug(0) << tot << endl; @@ -203,7 +203,7 @@ emit fileStarted(); Catalog * catalog=new Catalog(this,"ScanPoCatalog"); TQString pretty=u.prettyURL(); -TQString location=pretty.right(pretty.length()-pretty.findRev("/")-1); +TQString location=pretty.right(pretty.length()-pretty.tqfindRev("/")-1); connect(catalog,TQT_SIGNAL(signalProgress(int)),this,TQT_SIGNAL(fileLoading(int))); emit filename(location); @@ -212,7 +212,7 @@ emit fileLoading(0); bool error; -ConversionStatus rr=catalog->openURL(u); +ConversiontqStatus rr=catalog->openURL(u); if(rr != OK && rr !=RECOVERED_PARSE_ERROR ) { delete catalog; diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.h b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.h index e4cdf7da..3036f70c 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.h +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.h @@ -69,13 +69,13 @@ class MessagesSource }; -class PoScanner : public QObject +class PoScanner : public TQObject { - Q_OBJECT; + TQ_OBJECT; public: - PoScanner(DataBaseInterface *dbi,TQObject *parent=0,const char *name=0); + PoScanner(DataBaseInterface *dbi,TQObject *tqparent=0,const char *name=0); /* Scan a single PO file. diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui index 327a9d9d..348900e5 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>DBSearchEnginePrefWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -16,11 +16,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tabWidget2</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -31,7 +31,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -42,7 +42,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -55,7 +55,7 @@ <cstring>dbDirectory</cstring> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>autoUpdate</cstring> </property> @@ -65,7 +65,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -76,7 +76,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -84,7 +84,7 @@ <string>Author:</string> </property> </widget> - <widget class="QCheckBox" row="0" column="2"> + <widget class="TQCheckBox" row="0" column="2"> <property name="name"> <cstring>checkBox2</cstring> </property> @@ -109,7 +109,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -118,7 +118,7 @@ </spacer> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -129,7 +129,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -147,7 +147,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -168,7 +168,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQGroupBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -179,7 +179,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>textLabel3_2</cstring> </property> @@ -197,7 +197,7 @@ <cstring>scoreGlossary</cstring> </property> </widget> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>textLabel3_2_2</cstring> </property> @@ -205,7 +205,7 @@ <string>Score:</string> </property> </widget> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>useSentence</cstring> </property> @@ -213,7 +213,7 @@ <string>Fuzzy sentence archive</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>useGlossary</cstring> </property> @@ -221,7 +221,7 @@ <string>Glossary</string> </property> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>useExact</cstring> </property> @@ -244,7 +244,7 @@ <cstring>scoreSentence</cstring> </property> </widget> - <widget class="QCheckBox" row="4" column="0"> + <widget class="TQCheckBox" row="4" column="0"> <property name="name"> <cstring>useDivide</cstring> </property> @@ -252,7 +252,7 @@ <string>Sentence by sentence</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>useAlpha</cstring> </property> @@ -260,7 +260,7 @@ <string>Alphanumeric</string> </property> </widget> - <widget class="QLabel" row="3" column="1"> + <widget class="TQLabel" row="3" column="1"> <property name="name"> <cstring>textLabel3_2_3</cstring> </property> @@ -268,7 +268,7 @@ <string>Score:</string> </property> </widget> - <widget class="QLabel" row="4" column="1"> + <widget class="TQLabel" row="4" column="1"> <property name="name"> <cstring>textLabel3_2_4</cstring> </property> @@ -276,7 +276,7 @@ <string>Score:</string> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -289,7 +289,7 @@ <cstring>scoreAlpha</cstring> </property> </widget> - <widget class="QLabel" row="6" column="1"> + <widget class="TQLabel" row="6" column="1"> <property name="name"> <cstring>textLabel3_2_6</cstring> </property> @@ -297,7 +297,7 @@ <string>Score:</string> </property> </widget> - <widget class="QLabel" row="5" column="1"> + <widget class="TQLabel" row="5" column="1"> <property name="name"> <cstring>textLabel3_2_5</cstring> </property> @@ -305,7 +305,7 @@ <string>Score:</string> </property> </widget> - <widget class="QCheckBox" row="6" column="0"> + <widget class="TQCheckBox" row="6" column="0"> <property name="name"> <cstring>useWordByWord</cstring> </property> @@ -313,7 +313,7 @@ <string>Word by word</string> </property> </widget> - <widget class="QCheckBox" row="5" column="0"> + <widget class="TQCheckBox" row="5" column="0"> <property name="name"> <cstring>useDynamic</cstring> </property> @@ -328,7 +328,7 @@ </widget> </grid> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -348,7 +348,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -359,7 +359,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox4</cstring> </property> @@ -380,14 +380,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>firstCapital</cstring> </property> @@ -395,7 +395,7 @@ <string>First capital letter match</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>allCapital</cstring> </property> @@ -403,7 +403,7 @@ <string>All capital letter match</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>accelerator</cstring> </property> @@ -411,7 +411,7 @@ <string>Accelerator symbol (&&)</string> </property> </widget> - <widget class="QCheckBox" row="3" column="1"> + <widget class="TQCheckBox" row="3" column="1"> <property name="name"> <cstring>sameLetter</cstring> </property> @@ -421,7 +421,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox5</cstring> </property> @@ -432,7 +432,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -445,7 +445,7 @@ <cstring>kLineEdit1_2</cstring> </property> </widget> - <widget class="QListView" row="3" column="0" rowspan="3" colspan="2"> + <widget class="TQListView" row="3" column="0" rowspan="3" colspan="2"> <column> <property name="text"> <string>Enabled</string> @@ -496,7 +496,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -511,7 +511,7 @@ <string>Delete</string> </property> </widget> - <widget class="QPushButton" row="3" column="2"> + <widget class="TQPushButton" row="3" column="2"> <property name="name"> <cstring>addRule</cstring> </property> @@ -519,7 +519,7 @@ <string>Add</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel3_3</cstring> </property> @@ -537,7 +537,7 @@ <cstring>kLineEdit2</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -549,7 +549,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -560,18 +560,18 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox6</cstring> </property> <property name="title"> <string>Options</string> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>checkLang</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>20</x> <y>30</y> @@ -583,11 +583,11 @@ <string>Check language</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>useFilters</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>20</x> <y>60</y> @@ -599,11 +599,11 @@ <string>Use current filters</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>dateToday</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>20</x> <y>90</y> @@ -616,7 +616,7 @@ </property> </widget> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox7</cstring> </property> @@ -627,7 +627,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>editSource</cstring> </property> @@ -669,7 +669,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -684,7 +684,7 @@ <string>Scan All</string> </property> </widget> - <widget class="QListBox" row="0" column="0" rowspan="6" colspan="1"> + <widget class="TQListBox" row="0" column="0" rowspan="6" colspan="1"> <property name="name"> <cstring>sourceList</cstring> </property> @@ -693,7 +693,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -706,7 +706,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp index 55f6a16f..0c65710c 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp @@ -22,8 +22,8 @@ KInstance *DbSe2Factory::s_instance = 0; KAboutData *DbSe2Factory::s_about = 0; -DbSe2Factory::DbSe2Factory( TQObject *parent, const char *name) - : KLibFactory(parent,name) +DbSe2Factory::DbSe2Factory( TQObject *tqparent, const char *name) + : KLibFactory(tqparent,name) { } @@ -43,7 +43,7 @@ DbSe2Factory::~DbSe2Factory() } -TQObject *DbSe2Factory::createObject( TQObject *parent, const char *name, +TQObject *DbSe2Factory::createObject( TQObject *tqparent, const char *name, const char *classname, const TQStringList &) { if(TQCString(classname) != "SearchEngine") @@ -52,7 +52,7 @@ TQObject *DbSe2Factory::createObject( TQObject *parent, const char *name, return 0; } - KDBSearchEngine2 *se = new KDBSearchEngine2(parent,name); + KDBSearchEngine2 *se = new KDBSearchEngine2(tqparent,name); emit objectCreated(se); return se; diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.h b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.h index 2b70184a..2f1b98ca 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.h +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.h @@ -8,12 +8,13 @@ class KAboutData; class DbSe2Factory : public KLibFactory { Q_OBJECT + TQ_OBJECT public: - DbSe2Factory( TQObject *parent=0, const char *name=0); + DbSe2Factory( TQObject *tqparent=0, const char *name=0); ~DbSe2Factory(); - virtual TQObject *createObject( TQObject *parent=0, const char *name=0, - const char *classname="TQObject", + virtual TQObject *createObject( TQObject *tqparent=0, const char *name=0, + const char *classname=TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); static KInstance *instance(); diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui b/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui index c233265f..a9820329 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui @@ -1,11 +1,11 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>DBSearchEnginePref</class> <author>Andrea Rizzi <rizzi@kde.org></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DBSEPrefWidget</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -26,14 +26,14 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>TabWidget6</cstring> </property> <property name="whatsThis" stdset="0"> <string></string> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Widget4</cstring> </property> @@ -50,7 +50,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>ButtonGroup2</cstring> </property> @@ -67,7 +67,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>allRB</cstring> </property> @@ -80,7 +80,7 @@ according to the rules defined in tabs <strong> Generic </strong> and <strong>Match</strong></string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>slistRB</cstring> </property> @@ -95,7 +95,7 @@ and <strong>Match</strong></string> This is the best way to search because the <em>good keys</em> list probably contains all the keys that match with your query. However, it is smaller than the whole database.</string> </property> </widget> - <widget class="QRadioButton" row="2" column="0"> + <widget class="TQRadioButton" row="2" column="0"> <property name="name"> <cstring>rlistRB</cstring> </property> @@ -108,7 +108,7 @@ This is the best way to search because the <em>good keys</em> list p </widget> </grid> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>caseSensitiveCB</cstring> </property> @@ -119,7 +119,7 @@ This is the best way to search because the <em>good keys</em> list p <string><qml>If it is checked the search will be case sensitive. It is ignored if you use <em>Return the list of "good keys"</em> search mode.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>normalizeCB</cstring> </property> @@ -134,7 +134,7 @@ This is the best way to search because the <em>good keys</em> list p It also substitutes groups of more than one space character with only one space character.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>removeContextCB</cstring> </property> @@ -148,7 +148,7 @@ It also substitutes groups of more than one space character with only one space <string>Remove, if exists, the _:comment</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout11</cstring> </property> @@ -162,7 +162,7 @@ It also substitutes groups of more than one space character with only one space <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -182,7 +182,7 @@ It also substitutes groups of more than one space character with only one space <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>20</height> @@ -204,7 +204,7 @@ It also substitutes groups of more than one space character with only one space </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Widget5</cstring> </property> @@ -221,7 +221,7 @@ It also substitutes groups of more than one space character with only one space <property name="spacing"> <number>6</number> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>ButtonGroup1</cstring> </property> @@ -248,7 +248,7 @@ It also substitutes groups of more than one space character with only one space <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -265,14 +265,14 @@ It also substitutes groups of more than one space character with only one space <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="2" column="1"> + <widget class="TQCheckBox" row="2" column="1"> <property name="name"> <cstring>containedCB</cstring> </property> @@ -283,18 +283,18 @@ It also substitutes groups of more than one space character with only one space <string>Match if query is contained in database string</string> </property> </widget> - <widget class="QCheckBox" row="3" column="1"> + <widget class="TQCheckBox" row="3" column="1"> <property name="name"> <cstring>containsCB</cstring> </property> <property name="text"> - <string>Query contains</string> + <string>Query tqcontains</string> </property> <property name="whatsThis" stdset="0"> <string>Match if query contains the database string</string> </property> </widget> - <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>normalTextRB</cstring> </property> @@ -308,7 +308,7 @@ It also substitutes groups of more than one space character with only one space <string>Consider the search string as normal text.</string> </property> </widget> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>equalCB</cstring> </property> @@ -335,14 +335,14 @@ It also substitutes groups of more than one space character with only one space <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QRadioButton" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>RegExpRB</cstring> </property> @@ -355,7 +355,7 @@ It also substitutes groups of more than one space character with only one space </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox3</cstring> </property> @@ -387,14 +387,14 @@ If you search for <em>My name is Andrea</em> and you have activated <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>oneWordSubCB</cstring> </property> @@ -418,14 +418,14 @@ If you search for <em>My name is Andrea</em> and you have activated <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -433,7 +433,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Max number of words in the query:</string> </property> </widget> - <widget class="QSpinBox" row="3" column="2"> + <widget class="TQSpinBox" row="3" column="2"> <property name="name"> <cstring>twoWordSubSB</cstring> </property> @@ -447,7 +447,7 @@ If you search for <em>My name is Andrea</em> and you have activated <number>10</number> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>twoWordSubCB</cstring> </property> @@ -461,7 +461,7 @@ If you search for <em>My name is Andrea</em> and you have activated <bool>true</bool> </property> </widget> - <widget class="QLabel" row="3" column="1"> + <widget class="TQLabel" row="3" column="1"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -469,7 +469,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Max number of words in the query:</string> </property> </widget> - <widget class="QLayoutWidget" row="5" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="5" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>Layout7</cstring> </property> @@ -483,14 +483,14 @@ If you search for <em>My name is Andrea</em> and you have activated <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel5_3</cstring> </property> <property name="text"> <string>[A-Za-z0-9_%</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -501,7 +501,7 @@ If you search for <em>My name is Andrea</em> and you have activated <cstring>regExpLE</cstring> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel6_2</cstring> </property> @@ -511,7 +511,7 @@ If you search for <em>My name is Andrea</em> and you have activated </widget> </hbox> </widget> - <widget class="QLabel" row="4" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="4" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -519,7 +519,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Local characters for regular expressions:</string> </property> </widget> - <widget class="QSpinBox" row="1" column="2"> + <widget class="TQSpinBox" row="1" column="2"> <property name="name"> <cstring>oneWordSubSB</cstring> </property> @@ -548,7 +548,7 @@ If you search for <em>My name is Andrea</em> and you have activated </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>Widget6</cstring> </property> @@ -565,7 +565,7 @@ If you search for <em>My name is Andrea</em> and you have activated <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>TextLabel7_2</cstring> </property> @@ -578,7 +578,7 @@ If you search for <em>My name is Andrea</em> and you have activated <cstring>dirInput</cstring> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>autoAddCB_2</cstring> </property> @@ -595,7 +595,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Automatically add an entry to the database if a new translation is notified by someone (may be kbabel)</string> </property> </widget> - <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -609,7 +609,7 @@ If you search for <em>My name is Andrea</em> and you have activated <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_4</cstring> </property> @@ -617,7 +617,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Auto added entry author:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>authorLE</cstring> </property> @@ -627,7 +627,7 @@ If you search for <em>My name is Andrea</em> and you have activated </widget> </hbox> </widget> - <widget class="QPushButton" row="4" column="0" rowspan="1" colspan="3"> + <widget class="TQPushButton" row="4" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>scanFilePB</cstring> </property> @@ -635,7 +635,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Scan Single PO File</string> </property> </widget> - <widget class="QPushButton" row="5" column="0" rowspan="1" colspan="3"> + <widget class="TQPushButton" row="5" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>scanPB_2</cstring> </property> @@ -643,7 +643,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Scan Folder</string> </property> </widget> - <widget class="QPushButton" row="6" column="0" rowspan="1" colspan="3"> + <widget class="TQPushButton" row="6" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>scanrecPB</cstring> </property> @@ -651,7 +651,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Scan Folder && Subfolders</string> </property> </widget> - <widget class="QLayoutWidget" row="8" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="8" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>Layout5</cstring> </property> @@ -665,7 +665,7 @@ If you search for <em>My name is Andrea</em> and you have activated <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>filenameLB</cstring> </property> @@ -673,7 +673,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Scanning file:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>entriesLB</cstring> </property> @@ -683,7 +683,7 @@ If you search for <em>My name is Andrea</em> and you have activated </widget> </vbox> </widget> - <widget class="QLayoutWidget" row="9" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="9" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -697,7 +697,7 @@ If you search for <em>My name is Andrea</em> and you have activated <property name="spacing"> <number>6</number> </property> - <widget class="QProgressBar" row="2" column="1"> + <widget class="TQProgressBar" row="2" column="1"> <property name="name"> <cstring>processPB</cstring> </property> @@ -714,7 +714,7 @@ If you search for <em>My name is Andrea</em> and you have activated <bool>false</bool> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1_3</cstring> </property> @@ -722,7 +722,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Total progress:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel3_3</cstring> </property> @@ -730,7 +730,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Processing file:</string> </property> </widget> - <widget class="QProgressBar" row="0" column="1"> + <widget class="TQProgressBar" row="0" column="1"> <property name="name"> <cstring>totalPB</cstring> </property> @@ -744,7 +744,7 @@ If you search for <em>My name is Andrea</em> and you have activated <bool>true</bool> </property> </widget> - <widget class="QProgressBar" row="1" column="1"> + <widget class="TQProgressBar" row="1" column="1"> <property name="name"> <cstring>loadingPB</cstring> </property> @@ -758,7 +758,7 @@ If you search for <em>My name is Andrea</em> and you have activated <bool>true</bool> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel2_3</cstring> </property> @@ -768,7 +768,7 @@ If you search for <em>My name is Andrea</em> and you have activated </widget> </grid> </widget> - <widget class="QPushButton" row="10" column="2"> + <widget class="TQPushButton" row="10" column="2"> <property name="name"> <cstring>exportPB</cstring> </property> @@ -779,7 +779,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Export...</string> </property> </widget> - <widget class="QPushButton" row="10" column="0"> + <widget class="TQPushButton" row="10" column="0"> <property name="name"> <cstring>statPB</cstring> </property> @@ -790,7 +790,7 @@ If you search for <em>My name is Andrea</em> and you have activated <string>Statistics</string> </property> </widget> - <widget class="QPushButton" row="10" column="1"> + <widget class="TQPushButton" row="10" column="1"> <property name="name"> <cstring>repeatPB</cstring> </property> @@ -800,7 +800,7 @@ If you search for <em>My name is Andrea</em> and you have activated </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -817,7 +817,7 @@ If you search for <em>My name is Andrea</em> and you have activated <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox4</cstring> </property> @@ -841,7 +841,7 @@ Finally you can set the maximum number of entries in the list.</string> <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel3_2</cstring> </property> @@ -852,7 +852,7 @@ Finally you can set the maximum number of entries in the list.</string> <enum>RichText</enum> </property> </widget> - <widget class="QSlider" row="1" column="0"> + <widget class="TQSlider" row="1" column="0"> <property name="name"> <cstring>thresholdSL</cstring> </property> @@ -866,7 +866,7 @@ Finally you can set the maximum number of entries in the list.</string> <enum>Horizontal</enum> </property> </widget> - <widget class="QSpinBox" row="1" column="1"> + <widget class="TQSpinBox" row="1" column="1"> <property name="name"> <cstring>SpinBox5</cstring> </property> @@ -880,7 +880,7 @@ Finally you can set the maximum number of entries in the list.</string> <number>50</number> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel2_2</cstring> </property> @@ -888,7 +888,7 @@ Finally you can set the maximum number of entries in the list.</string> <string>Minimum number of query words in the key (%):</string> </property> </widget> - <widget class="QSpinBox" row="4" column="1"> + <widget class="TQSpinBox" row="4" column="1"> <property name="name"> <cstring>maxSB</cstring> </property> @@ -899,7 +899,7 @@ Finally you can set the maximum number of entries in the list.</string> <number>30</number> </property> </widget> - <widget class="QSpinBox" row="3" column="1"> + <widget class="TQSpinBox" row="3" column="1"> <property name="name"> <cstring>SpinBox6</cstring> </property> @@ -913,7 +913,7 @@ Finally you can set the maximum number of entries in the list.</string> <number>50</number> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>TextLabel4_2</cstring> </property> @@ -921,7 +921,7 @@ Finally you can set the maximum number of entries in the list.</string> <string>Max list length:</string> </property> </widget> - <widget class="QSlider" row="3" column="0"> + <widget class="TQSlider" row="3" column="0"> <property name="name"> <cstring>thresholdOrigSL</cstring> </property> @@ -937,7 +937,7 @@ Finally you can set the maximum number of entries in the list.</string> </widget> </grid> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox3_2</cstring> </property> @@ -954,7 +954,7 @@ Finally you can set the maximum number of entries in the list.</string> <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -962,7 +962,7 @@ Finally you can set the maximum number of entries in the list.</string> <string>Discard words more frequent than:</string> </property> </widget> - <widget class="QSpinBox" row="0" column="1"> + <widget class="TQSpinBox" row="0" column="1"> <property name="name"> <cstring>freqSB</cstring> </property> @@ -979,7 +979,7 @@ Finally you can set the maximum number of entries in the list.</string> <number>100</number> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>nothingCB</cstring> </property> @@ -1035,5 +1035,5 @@ Finally you can set the maximum number of entries in the list.</string> <include location="local" impldecl="in declaration">klocale.h</include> <include location="global" impldecl="in declaration">kseparator.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp index 76aef878..ba16327c 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp @@ -15,17 +15,17 @@ #include "dbse2.h" #include "preferenceswidget.h" -KDB2PreferencesWidget::KDB2PreferencesWidget(TQWidget *parent, const char* name) - : PrefWidget(parent,name) +KDB2PreferencesWidget::KDB2PreferencesWidget(TQWidget *tqparent, const char* name) + : PrefWidget(tqparent,name) { - TQVBoxLayout *layout = new TQVBoxLayout(this); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this); // TQLabel *label = new TQLabel(i18n("Settings for KDE Database Search Engine"),this); -// layout->addWidget(label); +// tqlayout->addWidget(label); dbpw = new DBSearchEnginePrefWidget(this); dbpw->dbDirectory->setMode(KFile::Directory | KFile::LocalOnly); dbpw->show(); - layout->addWidget(dbpw); + tqlayout->addWidget(dbpw); setMinimumSize(300,300); standard(); diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.h b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.h index 1f706902..68e283bd 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.h +++ b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.h @@ -7,9 +7,10 @@ class KDB2PreferencesWidget : public PrefWidget { Q_OBJECT + TQ_OBJECT public: - KDB2PreferencesWidget(TQWidget *parent=0, const char* name=0); + KDB2PreferencesWidget(TQWidget *tqparent=0, const char* name=0); virtual ~KDB2PreferencesWidget(); virtual void apply(); diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui b/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui index 3f4030a0..9447f794 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui +++ b/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>SourceDialog</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>SourceDialog</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -29,7 +29,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -52,18 +52,18 @@ <string>&Cancel</string> </property> </widget> - <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>groupBox1</cstring> </property> <property name="title"> <string>Additional Informations</string> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel6</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>11</x> <y>76</y> @@ -72,14 +72,14 @@ </rect> </property> <property name="text"> - <string>Status: </string> + <string>tqStatus: </string> </property> </widget> <widget class="KLineEdit"> <property name="name"> <cstring>projectName</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>125</x> <y>22</y> @@ -92,7 +92,7 @@ <property name="name"> <cstring>projectKeywords</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>125</x> <y>49</y> @@ -105,7 +105,7 @@ <property name="name"> <cstring>status</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>125</x> <y>76</y> @@ -117,11 +117,11 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel4</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>11</x> <y>22</y> @@ -133,11 +133,11 @@ <string>Project name:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel5</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>11</x> <y>49</y> @@ -150,7 +150,7 @@ </property> </widget> </widget> - <widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQGroupBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -186,7 +186,7 @@ <cstring>type</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -199,7 +199,7 @@ <cstring>sourceLocation</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -215,7 +215,7 @@ <string>Setup Filter...</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -223,7 +223,7 @@ <string>Location:</string> </property> </widget> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>useFilter</cstring> </property> @@ -251,7 +251,7 @@ <slot>reject()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp b/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp index c8d8c1db..730424f1 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp +++ b/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -54,8 +54,8 @@ KInstance *PaFactory::s_instance = 0; KAboutData *PaFactory::s_about = 0; -PaFactory::PaFactory( TQObject *parent, const char *name) - : KLibFactory(parent,name) +PaFactory::PaFactory( TQObject *tqparent, const char *name) + : KLibFactory(tqparent,name) { } @@ -75,7 +75,7 @@ PaFactory::~PaFactory() } -TQObject *PaFactory::createObject( TQObject *parent, const char *name +TQObject *PaFactory::createObject( TQObject *tqparent, const char *name , const char *classname, const TQStringList &) { if(TQCString(classname) != "SearchEngine") @@ -84,7 +84,7 @@ TQObject *PaFactory::createObject( TQObject *parent, const char *name return 0; } - return new PoAuxiliary(parent,name); + return new PoAuxiliary(tqparent,name); } diff --git a/kbabel/kbabeldict/modules/poauxiliary/pa_factory.h b/kbabel/kbabeldict/modules/poauxiliary/pa_factory.h index 901351c7..7c92e008 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/pa_factory.h +++ b/kbabel/kbabeldict/modules/poauxiliary/pa_factory.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -42,12 +42,13 @@ class KAboutData; class PaFactory : public KLibFactory { Q_OBJECT + TQ_OBJECT public: - PaFactory( TQObject *parent=0, const char *name=0); + PaFactory( TQObject *tqparent=0, const char *name=0); ~PaFactory(); - virtual TQObject *createObject( TQObject *parent=0, const char *name=0 - , const char *classname="TQObject" + virtual TQObject *createObject( TQObject *tqparent=0, const char *name=0 + , const char *classname=TQOBJECT_OBJECT_NAME_STRING , const TQStringList &args = TQStringList()); static KInstance *instance(); diff --git a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp index eae86d65..cc726ad8 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp +++ b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -50,8 +50,8 @@ using namespace KBabel; -PoAuxiliary::PoAuxiliary(TQObject *parent, const char *name) - : SearchEngine(parent, name) +PoAuxiliary::PoAuxiliary(TQObject *tqparent, const char *name) + : SearchEngine(tqparent, name) { catalog = new Catalog(this, "PoAuxiliary::catalog"); prefWidget=0; @@ -124,9 +124,9 @@ void PoAuxiliary::readSettings(KConfigBase *config) restoreSettings(); } -PrefWidget *PoAuxiliary::preferencesWidget(TQWidget *parent) +PrefWidget *PoAuxiliary::preferencesWidget(TQWidget *tqparent) { - prefWidget = new AuxiliaryPreferencesWidget(parent,"pocompendium_prefwidget"); + prefWidget = new AuxiliaryPreferencesWidget(tqparent,"pocompendium_prefwidget"); connect(prefWidget, TQT_SIGNAL(applySettings()), this, TQT_SLOT(applySettings())); connect(prefWidget, TQT_SIGNAL(restoreSettings()) , this, TQT_SLOT(restoreSettings())); @@ -184,7 +184,7 @@ bool PoAuxiliary::startSearch(const TQString& t, uint pluralForm, const SearchFi kapp->processEvents(100); - text.replace("\n",""); + text.tqreplace("\n",""); Entry *entry = msgidDict[text]; if(entry) @@ -358,27 +358,27 @@ void PoAuxiliary::loadAuxiliary() TQString path=url; - if(path.contains("@LANG@")) + if(path.tqcontains("@LANG@")) { - path.replace("@LANG@",langCode); + path.tqreplace("@LANG@",langCode); } - if(path.contains("@PACKAGE@")) + if(path.tqcontains("@PACKAGE@")) { - int pos=package.findRev("/"); + int pos=package.tqfindRev("/"); if( pos<0 ) pos=0; - path.replace("@PACKAGE@",package.mid(pos)); + path.tqreplace("@PACKAGE@",package.mid(pos)); } - if(path.contains("@PACKAGEDIR@")) + if(path.tqcontains("@PACKAGEDIR@")) { TQString packagedir; - int pos=package.findRev("/"); + int pos=package.tqfindRev("/"); if( pos > 0 ) packagedir=package.left(pos); else packagedir=""; - path.replace("@PACKAGEDIR@",packagedir); + path.tqreplace("@PACKAGEDIR@",packagedir); kdDebug(KBABEL_SEARCH) << "Packagedir found " << packagedir << endl; } TQRegExp reg("@DIR[0-9]+@"); - if(path.contains(reg)) + if(path.tqcontains(reg)) { int pos=reg.search(path); int len = reg.matchedLength(); @@ -393,7 +393,7 @@ void PoAuxiliary::loadAuxiliary() { TQString dir=directory(editedFile,number); TQString s("@DIR%1@"); - path.replace(s.arg(number),dir); + path.tqreplace(s.tqarg(number),dir); pos+=dir.length(); } @@ -427,7 +427,7 @@ void PoAuxiliary::loadAuxiliary() connect(catalog, TQT_SIGNAL(signalProgress(int)) , this, TQT_SIGNAL(progress(int))); - ConversionStatus stat = catalog->openURL(u); + ConversiontqStatus stat = catalog->openURL(u); if( stat != OK && stat != RECOVERED_PARSE_ERROR) { kdDebug(KBABEL_SEARCH) << "error while opening file " << u.prettyURL() << endl; @@ -436,7 +436,7 @@ void PoAuxiliary::loadAuxiliary() { error = true; errorMsg = i18n("Error while trying to open file for PO Auxiliary module:\n%1") - .arg(u.prettyURL()); + .tqarg(u.prettyURL()); emit hasError(errorMsg); } } @@ -461,7 +461,7 @@ void PoAuxiliary::loadAuxiliary() Entry *e = new Entry; // FIXME: should care about plural forms e->orig = catalog->msgid(i).first(); - e->orig.replace("\n",""); + e->orig.tqreplace("\n",""); kdWarning() << "PoAuxialiary does not support plural forms" << endl; e->translation = catalog->msgstr(i).first(); e->comment = catalog->comment(i); @@ -491,7 +491,7 @@ void PoAuxiliary::loadAuxiliary() void PoAuxiliary::setEditedFile(const TQString& file) { - if(initialized && (url.contains("@DIR") || KURL::isRelativeURL(url)) + if(initialized && (url.tqcontains("@DIR") || KURL::isRelativeURL(url)) && file!=editedFile && !loadTimer->isActive() ) { initialized=false; @@ -503,7 +503,7 @@ void PoAuxiliary::setEditedFile(const TQString& file) void PoAuxiliary::setEditedPackage(const TQString& pack) { - if(initialized && url.contains("@PACKAGE@") && pack!=package + if(initialized && url.tqcontains("@PACKAGE@") && pack!=package && !loadTimer->isActive() ) { initialized=false; @@ -515,7 +515,7 @@ void PoAuxiliary::setEditedPackage(const TQString& pack) void PoAuxiliary::setLanguageCode(const TQString& lang) { - if(initialized && url.contains("@LANG@") && lang!=langCode + if(initialized && url.tqcontains("@LANG@") && lang!=langCode && !loadTimer->isActive() ) { initialized=false; @@ -538,7 +538,7 @@ TQString PoAuxiliary::translate(const TQString& text, uint pluralForm) if(error) { - return TQString::null; + return TQString(); } Entry *entry = msgidDict[text]; @@ -547,7 +547,7 @@ TQString PoAuxiliary::translate(const TQString& text, uint pluralForm) return entry->translation; } - return TQString::null; + return TQString(); } diff --git a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.h b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.h index 7ada1d52..0ad4c635 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.h +++ b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -50,9 +50,10 @@ class AuxiliaryPreferencesWidget; class PoAuxiliary : public SearchEngine { Q_OBJECT + TQ_OBJECT public: - PoAuxiliary(TQObject *parent=0, const char *name=0); + PoAuxiliary(TQObject *tqparent=0, const char *name=0); virtual ~PoAuxiliary(); virtual bool isReady() const; @@ -64,7 +65,7 @@ public: virtual void saveSettings(KConfigBase *config); virtual void readSettings(KConfigBase *config); - virtual PrefWidget *preferencesWidget(TQWidget *parent); + virtual PrefWidget *preferencesWidget(TQWidget *tqparent); virtual const KAboutData *about() const; diff --git a/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp b/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp index 5a534ecf..2c984c46 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp +++ b/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -43,14 +43,14 @@ #include "preferenceswidget.h" #include "pwidget.h" -AuxiliaryPreferencesWidget::AuxiliaryPreferencesWidget(TQWidget *parent, const char* name) - : PrefWidget(parent,name) +AuxiliaryPreferencesWidget::AuxiliaryPreferencesWidget(TQWidget *tqparent, const char* name) + : PrefWidget(tqparent,name) , changed(false) { - TQVBoxLayout *layout = new TQVBoxLayout(this); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this); prefWidget = new PWidget(this); - layout->addWidget(prefWidget); + tqlayout->addWidget(prefWidget); connect(prefWidget->urlInput->lineEdit(),TQT_SIGNAL(textChanged(const TQString&)) diff --git a/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.h b/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.h index 3f0862b2..e967d958 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.h +++ b/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -42,9 +42,10 @@ class PWidget; class AuxiliaryPreferencesWidget : public PrefWidget { Q_OBJECT + TQ_OBJECT public: - AuxiliaryPreferencesWidget(TQWidget *parent=0, const char* name=0); + AuxiliaryPreferencesWidget(TQWidget *tqparent=0, const char* name=0); virtual ~AuxiliaryPreferencesWidget(); virtual void apply(); diff --git a/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui b/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui index 8179caed..aa9e6710 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui +++ b/kbabel/kbabeldict/modules/poauxiliary/pwidget.ui @@ -7,7 +7,7 @@ <cstring>PWidget</cstring> </property> <property stdset="1"> - <name>geometry</name> + <name>tqgeometry</name> <rect> <x>0</x> <y>0</y> @@ -92,14 +92,14 @@ The following variables will be replaced in the path if available: <enum>Expanding</enum> </property> <property> - <name>sizeHint</name> + <name>tqsizeHint</name> <size> <width>20</width> <height>20</height> </size> </property> <property> - <name>sizeHint</name> + <name>tqsizeHint</name> <size> <width>20</width> <height>20</height> diff --git a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp index 9eb816bd..f5c37dd5 100644 --- a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -42,8 +42,8 @@ using namespace KBabel; -CompendiumData::CompendiumData(TQObject *parent) - : TQObject(parent) +CompendiumData::CompendiumData(TQObject *tqparent) + : TQObject(tqparent) , _active(false) , _error(false) , _initialized(false) @@ -53,7 +53,7 @@ CompendiumData::CompendiumData(TQObject *parent) , _wordDict(9887) , _textonlyDict(9887) { - _catalog = new Catalog(this, "CompendiumData::catalog", TQString::null); + _catalog = new Catalog(this, "CompendiumData::catalog", TQString()); _exactDict.setAutoDelete(true); _allDict.setAutoDelete(true); _wordDict.setAutoDelete(true); @@ -79,7 +79,7 @@ bool CompendiumData::load(KURL url) emit progressStarts(i18n("Loading PO compendium")); connect(_catalog, TQT_SIGNAL(signalProgress(int)), this, TQT_SIGNAL(progress(int))); - ConversionStatus stat=_catalog->openURL(url); + ConversiontqStatus stat=_catalog->openURL(url); disconnect(_catalog, TQT_SIGNAL(signalProgress(int)) , this, TQT_SIGNAL(progress(int))); @@ -91,7 +91,7 @@ bool CompendiumData::load(KURL url) _error = true; _errorMsg = i18n("Error while trying to read file for PO Compendium module:\n%1") - .arg(url.prettyURL()); + .tqarg(url.prettyURL()); emit progressEnds(); diff --git a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.h b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.h index d5668b4a..6d229d74 100644 --- a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.h +++ b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -46,12 +46,13 @@ namespace KBabel class Catalog; } -class CompendiumData : public QObject +class CompendiumData : public TQObject { Q_OBJECT + TQ_OBJECT public: - CompendiumData(TQObject *parent=0); + CompendiumData(TQObject *tqparent=0); bool load(KURL url); diff --git a/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp b/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp index 37ae63a4..0d3d2d24 100644 --- a/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -54,8 +54,8 @@ KInstance *PcFactory::s_instance = 0; KAboutData *PcFactory::s_about = 0; -PcFactory::PcFactory( TQObject *parent, const char *name) - : KLibFactory(parent,name) +PcFactory::PcFactory( TQObject *tqparent, const char *name) + : KLibFactory(tqparent,name) { } @@ -75,7 +75,7 @@ PcFactory::~PcFactory() } -TQObject *PcFactory::createObject( TQObject *parent, const char *name +TQObject *PcFactory::createObject( TQObject *tqparent, const char *name , const char *classname, const TQStringList &) { if(TQCString(classname) != "SearchEngine") @@ -84,7 +84,7 @@ TQObject *PcFactory::createObject( TQObject *parent, const char *name return 0; } - return new PoCompendium(parent,name); + return new PoCompendium(tqparent,name); } diff --git a/kbabel/kbabeldict/modules/pocompendium/pc_factory.h b/kbabel/kbabeldict/modules/pocompendium/pc_factory.h index 1b0b8820..b92cfcb0 100644 --- a/kbabel/kbabeldict/modules/pocompendium/pc_factory.h +++ b/kbabel/kbabeldict/modules/pocompendium/pc_factory.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -42,12 +42,13 @@ class KAboutData; class PcFactory : public KLibFactory { Q_OBJECT + TQ_OBJECT public: - PcFactory( TQObject *parent=0, const char *name=0); + PcFactory( TQObject *tqparent=0, const char *name=0); ~PcFactory(); - virtual TQObject *createObject( TQObject *parent=0, const char *name=0 - , const char *classname="TQObject" + virtual TQObject *createObject( TQObject *tqparent=0, const char *name=0 + , const char *classname=TQOBJECT_OBJECT_NAME_STRING , const TQStringList &args = TQStringList()); static KInstance *instance(); diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp index 5220f88a..1911be72 100644 --- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -63,8 +63,8 @@ using namespace KBabel; static KStaticDeleter< TQDict<CompendiumData> > compDataDeleter; TQDict<CompendiumData> *PoCompendium::_compDict = 0; -PoCompendium::PoCompendium(TQObject *parent, const char *name) - : SearchEngine(parent, name) +PoCompendium::PoCompendium(TQObject *tqparent, const char *name) + : SearchEngine(tqparent, name) { prefWidget=0; data=0; @@ -160,9 +160,9 @@ void PoCompendium::readSettings(KConfigBase *config) restoreSettings(); } -PrefWidget *PoCompendium::preferencesWidget(TQWidget *parent) +PrefWidget *PoCompendium::preferencesWidget(TQWidget *tqparent) { - prefWidget = new CompendiumPreferencesWidget(parent,"pocompendium_prefwidget"); + prefWidget = new CompendiumPreferencesWidget(tqparent,"pocompendium_prefwidget"); kdDebug(KBABEL_SEARCH) << "PreferencesWidget is " << prefWidget << endl; connect(prefWidget, TQT_SIGNAL(applySettings()), this, TQT_SLOT(applySettings())); connect(prefWidget, TQT_SIGNAL(restoreSettings()) @@ -232,7 +232,7 @@ bool PoCompendium::searchCaseInsensitive(const TQString& text, uint pluralForm, TQValueList<int>::ConstIterator it; for( it = indexList->begin(); it != indexList->end(); ++it ) { - if(foundIndices.contains(*it)) + if(foundIndices.tqcontains(*it)) { continue; } @@ -288,7 +288,7 @@ bool PoCompendium::searchTextOnly(const TQString& text, uint pluralForm, TQPtrLi TQValueList<int>::ConstIterator it; for( it = indexList->begin(); it != indexList->end(); ++it ) { - if(foundIndices.contains(*it)) + if(foundIndices.tqcontains(*it)) { continue; } @@ -346,12 +346,12 @@ bool PoCompendium::searchWords(const TQString& searchStr, uint pluralForm, TQPtr if(stop) break; - if(foundIndices.contains(*it)) + if(foundIndices.tqcontains(*it)) { continue; } - if(checkedIndices.contains(*it)) + if(checkedIndices.tqcontains(*it)) { continue; } @@ -397,7 +397,7 @@ bool PoCompendium::searchWords(const TQString& searchStr, uint pluralForm, TQPtr s=" "+*wit+" "; o=" "+origStr+" "; } - if(o.contains(s)) + if(o.tqcontains(s)) { found=true; } @@ -421,7 +421,7 @@ bool PoCompendium::searchWords(const TQString& searchStr, uint pluralForm, TQPtr if(!found && matchContains && !wholeWords) { - TQString s=maskString(searchStr); + TQString s=tqmaskString(searchStr); TQRegExp searchReg(s); if(searchReg.search(origStr) >= 0) @@ -430,7 +430,7 @@ bool PoCompendium::searchWords(const TQString& searchStr, uint pluralForm, TQPtr if(!found && matchIsContained && !wholeWords) { - TQString s=maskString(origStr); + TQString s=tqmaskString(origStr); TQRegExp reg(s); if(reg.search(searchStr) >= 0) @@ -445,7 +445,7 @@ bool PoCompendium::searchWords(const TQString& searchStr, uint pluralForm, TQPtr for ( TQStringList::Iterator wit2 = list.begin() ; wit2 != list.end(); ++wit2 ) { - TQString s=maskString(*wit2); + TQString s=tqmaskString(*wit2); TQRegExp reg(s); if(reg.search(origStr) >= 0) @@ -491,7 +491,7 @@ bool PoCompendium::searchNGram(const TQString& searchStr, uint pluralForm, TQPtr TQRegExp searchReg; if(matchContains) { - TQString s=maskString(searchStr); + TQString s=tqmaskString(searchStr); searchReg.setPattern(s); } @@ -519,7 +519,7 @@ bool PoCompendium::searchNGram(const TQString& searchStr, uint pluralForm, TQPtr emit progress( 50+(50*(checkCounter+1))/catalogInfo.total); } - if(checkedIndices.contains(i)) + if(checkedIndices.tqcontains(i)) { continue; } @@ -532,7 +532,7 @@ bool PoCompendium::searchNGram(const TQString& searchStr, uint pluralForm, TQPtr continue; } - if(foundIndices.contains(i)) + if(foundIndices.tqcontains(i)) { continue; } @@ -564,7 +564,7 @@ bool PoCompendium::searchNGram(const TQString& searchStr, uint pluralForm, TQPtr if(!found && matchIsContained) { - TQString s=maskString(origStr); + TQString s=tqmaskString(origStr); TQRegExp reg(s); if(reg.search(searchStr) >= 0) @@ -580,7 +580,7 @@ bool PoCompendium::searchNGram(const TQString& searchStr, uint pluralForm, TQPtr for ( TQStringList::Iterator wit2 = list.begin() ; wit2 != list.end(); ++wit2 ) { - TQString s=maskString(*wit2); + TQString s=tqmaskString(*wit2); if(wholeWords) { @@ -689,7 +689,7 @@ bool PoCompendium::startSearch(const TQString& text, uint pluralForm, const Sear // search without whitespace searchTextOnly(searchStr, pluralForm, results, foundIndices, checkedIndices); - // now, search based on words (contains, is contained, etc) + // now, search based on words (tqcontains, is contained, etc) searchWords(searchStr, pluralForm, results, foundIndices, checkedIndices); @@ -797,9 +797,9 @@ void PoCompendium::slotLoadCompendium() TQString path=url; - if(path.contains("@LANG@")) + if(path.tqcontains("@LANG@")) { - path.replace("@LANG@",langCode); + path.tqreplace("@LANG@",langCode); } KURL u=KCmdLineArgs::makeURL(path.local8Bit()); realURL = u.url(); @@ -864,21 +864,21 @@ void PoCompendium::recheckData() loading=false; } -TQString PoCompendium::maskString(TQString s) +TQString PoCompendium::tqmaskString(TQString s) { - s.replace("\\","\\\\"); - s.replace("\?","\\?"); - s.replace("[","\\["); - s.replace(".","\\."); - s.replace("*","\\*"); - s.replace("+","\\+"); - s.replace("^","\\^"); - s.replace("$","\\$"); - s.replace("(","\\("); - s.replace(")","\\)"); - s.replace("{","\\{"); - s.replace("}","\\}"); - s.replace("|","\\|"); + s.tqreplace("\\","\\\\"); + s.tqreplace("\?","\\?"); + s.tqreplace("[","\\["); + s.tqreplace(".","\\."); + s.tqreplace("*","\\*"); + s.tqreplace("+","\\+"); + s.tqreplace("^","\\^"); + s.tqreplace("$","\\$"); + s.tqreplace("(","\\("); + s.tqreplace(")","\\)"); + s.tqreplace("{","\\{"); + s.tqreplace("}","\\}"); + s.tqreplace("|","\\|"); return s; } @@ -917,7 +917,7 @@ void PoCompendium::addResult(SearchResult *result, TQPtrList<SearchResult>& res) void PoCompendium::setLanguageCode(const TQString& lang) { - if(initialized && url.contains("@LANG@") && lang!=langCode + if(initialized && url.tqcontains("@LANG@") && lang!=langCode && !loadTimer->isActive() ) { initialized=false; @@ -938,7 +938,7 @@ TQString PoCompendium::translate(const TQString& text, uint pluralForm) if(error || !data || data->active()) { - return TQString::null; + return TQString(); } @@ -950,7 +950,7 @@ TQString PoCompendium::translate(const TQString& text, uint pluralForm) return data->catalog()->msgstr(*index).first(); } - return TQString::null; + return TQString(); } TQString PoCompendium::fuzzyTranslation(const TQString& text, int &score, const uint pluralForm) @@ -965,7 +965,7 @@ TQString PoCompendium::fuzzyTranslation(const TQString& text, int &score, const if(error || !data || data->active()) { - return TQString::null; + return TQString(); } // try to find fuzzy string @@ -1029,7 +1029,7 @@ TQString PoCompendium::fuzzyTranslation(const TQString& text, int &score, const return data->catalog()->msgstr(best_matching).first(); } - return TQString::null; + return TQString(); } @@ -1041,7 +1041,7 @@ TQString PoCompendium::searchTranslation(const TQString& text, int &sc, const ui } if(isSearching()) - return TQString::null; + return TQString(); clearResults(); stop = false; @@ -1058,13 +1058,13 @@ TQString PoCompendium::searchTranslation(const TQString& text, int &sc, const ui if(error || !data) { active = false; - return TQString::null; + return TQString(); } if(data->active()) { active = false; - return TQString::null; + return TQString(); } emit started(); @@ -1120,7 +1120,7 @@ TQString PoCompendium::searchTranslation(const TQString& text, int &sc, const ui return res.first()->translation; } - // now, search based on words (contains, is contained, etc) + // now, search based on words (tqcontains, is contained, etc) searchWords(searchStr, pluralForm, res, foundIndices, checkedIndices); if( matchNGram || @@ -1145,7 +1145,7 @@ TQString PoCompendium::searchTranslation(const TQString& text, int &sc, const ui sc = 0; - return TQString::null; + return TQString(); } @@ -1181,7 +1181,7 @@ void PoCompendium::unregisterData() void PoCompendium::registerData() { - data = compendiumDict()->find(realURL); + data = compendiumDict()->tqfind(realURL); if(!data) { data = new CompendiumData; diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.h b/kbabel/kbabeldict/modules/pocompendium/pocompendium.h index 50ef9428..70386572 100644 --- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.h +++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -51,9 +51,10 @@ class TQTimer; class PoCompendium : public SearchEngine { Q_OBJECT + TQ_OBJECT public: - PoCompendium(TQObject *parent=0, const char *name=0); + PoCompendium(TQObject *tqparent=0, const char *name=0); virtual ~PoCompendium(); virtual bool isReady() const; @@ -67,7 +68,7 @@ public: virtual void saveSettings(KConfigBase *config); virtual void readSettings(KConfigBase *config); - virtual PrefWidget *preferencesWidget(TQWidget *parent); + virtual PrefWidget *preferencesWidget(TQWidget *tqparent); virtual const KAboutData *about() const; @@ -98,7 +99,7 @@ protected slots: protected: void loadCompendium(); void addResult(SearchResult *, TQPtrList<SearchResult>& allResults); - TQString maskString(TQString string); + TQString tqmaskString(TQString string); void registerData(); void unregisterData(); diff --git a/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp b/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp index 1f3a8b37..9cbeb381 100644 --- a/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -44,14 +44,14 @@ #include "preferenceswidget.h" #include "pwidget.h" -CompendiumPreferencesWidget::CompendiumPreferencesWidget(TQWidget *parent, const char* name) - : PrefWidget(parent,name) +CompendiumPreferencesWidget::CompendiumPreferencesWidget(TQWidget *tqparent, const char* name) + : PrefWidget(tqparent,name) , changed(false) { - TQVBoxLayout *layout = new TQVBoxLayout(this); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this); prefWidget = new CompendiumPWidget(this); - layout->addWidget(prefWidget); + tqlayout->addWidget(prefWidget); connect(prefWidget->caseBtn, TQT_SIGNAL(toggled(bool)) , this, TQT_SLOT(setChanged())); diff --git a/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.h b/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.h index 3a22bc31..e67a00d9 100644 --- a/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.h +++ b/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -42,9 +42,10 @@ class CompendiumPWidget; class CompendiumPreferencesWidget : public PrefWidget { Q_OBJECT + TQ_OBJECT public: - CompendiumPreferencesWidget(TQWidget *parent=0, const char* name=0); + CompendiumPreferencesWidget(TQWidget *tqparent=0, const char* name=0); virtual ~CompendiumPreferencesWidget(); virtual void apply(); diff --git a/kbabel/kbabeldict/modules/pocompendium/pwidget.ui b/kbabel/kbabeldict/modules/pocompendium/pwidget.ui index 8f54b087..f1883a88 100644 --- a/kbabel/kbabeldict/modules/pocompendium/pwidget.ui +++ b/kbabel/kbabeldict/modules/pocompendium/pwidget.ui @@ -8,7 +8,7 @@ <cstring>PWidget</cstring> </property> <property stdset="1"> - <name>geometry</name> + <name>tqgeometry</name> <rect> <x>0</x> <y>0</y> @@ -236,14 +236,14 @@ <enum>Expanding</enum> </property> <property> - <name>sizeHint</name> + <name>tqsizeHint</name> <size> <width>20</width> <height>20</height> </size> </property> <property> - <name>sizeHint</name> + <name>tqsizeHint</name> <size> <width>20</width> <height>20</height> diff --git a/kbabel/kbabeldict/modules/tmx/pc_factory.cpp b/kbabel/kbabeldict/modules/tmx/pc_factory.cpp index eaea5194..772eae41 100644 --- a/kbabel/kbabeldict/modules/tmx/pc_factory.cpp +++ b/kbabel/kbabeldict/modules/tmx/pc_factory.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -54,8 +54,8 @@ KInstance *PcFactory::s_instance = 0; KAboutData *PcFactory::s_about = 0; -PcFactory::PcFactory( TQObject *parent, const char *name) - : KLibFactory(parent,name) +PcFactory::PcFactory( TQObject *tqparent, const char *name) + : KLibFactory(tqparent,name) { } @@ -75,7 +75,7 @@ PcFactory::~PcFactory() } -TQObject *PcFactory::createObject( TQObject *parent, const char *name +TQObject *PcFactory::createObject( TQObject *tqparent, const char *name , const char *classname, const TQStringList &) { if(TQCString(classname) != "SearchEngine") @@ -84,7 +84,7 @@ TQObject *PcFactory::createObject( TQObject *parent, const char *name return 0; } - return new TmxCompendium(parent,name); + return new TmxCompendium(tqparent,name); } diff --git a/kbabel/kbabeldict/modules/tmx/pc_factory.h b/kbabel/kbabeldict/modules/tmx/pc_factory.h index 74739e0a..f4337116 100644 --- a/kbabel/kbabeldict/modules/tmx/pc_factory.h +++ b/kbabel/kbabeldict/modules/tmx/pc_factory.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -44,12 +44,13 @@ class KAboutData; class PcFactory : public KLibFactory { Q_OBJECT + TQ_OBJECT public: - PcFactory( TQObject *parent=0, const char *name=0); + PcFactory( TQObject *tqparent=0, const char *name=0); ~PcFactory(); - virtual TQObject *createObject( TQObject *parent=0, const char *name=0 - , const char *classname="TQObject" + virtual TQObject *createObject( TQObject *tqparent=0, const char *name=0 + , const char *classname=TQOBJECT_OBJECT_NAME_STRING , const TQStringList &args = TQStringList()); static KInstance *instance(); diff --git a/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp b/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp index 85d38294..16200985 100644 --- a/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp +++ b/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -46,14 +46,14 @@ #include "preferenceswidget.h" #include "pwidget.h" -TmxCompendiumPreferencesWidget::TmxCompendiumPreferencesWidget(TQWidget *parent, const char* name) - : PrefWidget(parent,name) +TmxCompendiumPreferencesWidget::TmxCompendiumPreferencesWidget(TQWidget *tqparent, const char* name) + : PrefWidget(tqparent,name) , changed(false) { - TQVBoxLayout *layout = new TQVBoxLayout(this); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this); prefWidget = new TmxCompendiumPWidget(this); - layout->addWidget(prefWidget); + tqlayout->addWidget(prefWidget); connect(prefWidget->caseBtn, TQT_SIGNAL(toggled(bool)) , this, TQT_SLOT(setChanged())); diff --git a/kbabel/kbabeldict/modules/tmx/preferenceswidget.h b/kbabel/kbabeldict/modules/tmx/preferenceswidget.h index e2a4b900..a91aff42 100644 --- a/kbabel/kbabeldict/modules/tmx/preferenceswidget.h +++ b/kbabel/kbabeldict/modules/tmx/preferenceswidget.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -44,9 +44,10 @@ class TmxCompendiumPWidget; class TmxCompendiumPreferencesWidget : public PrefWidget { Q_OBJECT + TQ_OBJECT public: - TmxCompendiumPreferencesWidget(TQWidget *parent=0, const char* name=0); + TmxCompendiumPreferencesWidget(TQWidget *tqparent=0, const char* name=0); virtual ~TmxCompendiumPreferencesWidget(); virtual void apply(); diff --git a/kbabel/kbabeldict/modules/tmx/pwidget.ui b/kbabel/kbabeldict/modules/tmx/pwidget.ui index ef6c9967..15600c7d 100644 --- a/kbabel/kbabeldict/modules/tmx/pwidget.ui +++ b/kbabel/kbabeldict/modules/tmx/pwidget.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>TmxCompendiumPWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>TMXPWidget</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -22,7 +22,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox1</cstring> </property> @@ -46,7 +46,7 @@ </widget> </vbox> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>ButtonGroup1</cstring> </property> @@ -63,7 +63,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -77,7 +77,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QCheckBox" row="0" column="1"> + <widget class="TQCheckBox" row="0" column="1"> <property name="name"> <cstring>wholeBtn</cstring> </property> @@ -85,7 +85,7 @@ <string>Onl&y whole words</string> </property> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>caseBtn</cstring> </property> @@ -95,7 +95,7 @@ </widget> </grid> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -103,7 +103,7 @@ <string>A text matches if:</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -117,7 +117,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>equalBtn</cstring> </property> @@ -125,7 +125,7 @@ <string>E&qual to searched text</string> </property> </widget> - <widget class="QCheckBox" row="2" column="1"> + <widget class="TQCheckBox" row="2" column="1"> <property name="name"> <cstring>hasWordBtn</cstring> </property> @@ -133,7 +133,7 @@ <string>Contains a &word of searched text</string> </property> </widget> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>isContainedBtn</cstring> </property> @@ -141,7 +141,7 @@ <string>Co&ntained in searched text</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>ngramBtn</cstring> </property> @@ -149,7 +149,7 @@ <string>&Similar to searched text</string> </property> </widget> - <widget class="QCheckBox" row="0" column="1"> + <widget class="TQCheckBox" row="0" column="1"> <property name="name"> <cstring>containsBtn</cstring> </property> @@ -171,7 +171,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -209,7 +209,7 @@ <includes> <include location="global" impldecl="in declaration">kseparator.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> </includehints> diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp index 415992bf..fd5fcd29 100644 --- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp +++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -58,8 +58,8 @@ static KStaticDeleter< TQDict<TmxCompendiumData> > compDataDeleter; TQDict<TmxCompendiumData> *TmxCompendium::_compDict = 0; -TmxCompendium::TmxCompendium(TQObject *parent, const char *name) - : SearchEngine(parent, name) +TmxCompendium::TmxCompendium(TQObject *tqparent, const char *name) + : SearchEngine(tqparent, name) { prefWidget=0; data=0; @@ -152,9 +152,9 @@ void TmxCompendium::readSettings(KConfigBase *config) restoreSettings(); } -PrefWidget *TmxCompendium::preferencesWidget(TQWidget *parent) +PrefWidget *TmxCompendium::preferencesWidget(TQWidget *tqparent) { - prefWidget = new TmxCompendiumPreferencesWidget(parent,"tmxcompendium_prefwidget"); + prefWidget = new TmxCompendiumPreferencesWidget(tqparent,"tmxcompendium_prefwidget"); connect(prefWidget, TQT_SIGNAL(applySettings()), this, TQT_SLOT(applySettings())); connect(prefWidget, TQT_SIGNAL(restoreSettings()) , this, TQT_SLOT(restoreSettings())); @@ -240,8 +240,8 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea TranslationInfo *info = new TranslationInfo; info->location = directory(realURL,0); - info->translator = TQString::null; - info->description = TQString::null; + info->translator = TQString(); + info->description = TQString(); result->descriptions.append(info); results.append(result); @@ -267,7 +267,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea TQValueList<int>::ConstIterator it; for( it = indexList->begin(); it != indexList->end(); ++it ) { - if(foundIndices.contains(*it)) + if(foundIndices.tqcontains(*it)) { continue; } @@ -294,8 +294,8 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea TranslationInfo *info = new TranslationInfo; info->location = directory(realURL,0); - info->translator = TQString::null; - info->description = TQString::null; + info->translator = TQString(); + info->description = TQString(); result->descriptions.append(info); addResult(result); @@ -319,12 +319,12 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea if(stop) break; - if(foundIndices.contains(*it)) + if(foundIndices.tqcontains(*it)) { continue; } - if(checkedIndices.contains(*it)) + if(checkedIndices.tqcontains(*it)) { continue; } @@ -365,7 +365,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea s=" "+*wit+" "; o=" "+origStr+" "; } - if(o.contains(s)) + if(o.tqcontains(s)) { found=true; } @@ -389,7 +389,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea if(!found && matchContains && !wholeWords) { - TQString s=maskString(searchStr); + TQString s=tqmaskString(searchStr); TQRegExp searchReg(s); if(searchReg.search(origStr) >= 0) @@ -398,7 +398,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea if(!found && matchIsContained && !wholeWords) { - TQString s=maskString(origStr); + TQString s=tqmaskString(origStr); TQRegExp reg(s); if(reg.search(searchStr) >= 0) @@ -413,7 +413,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea for ( TQStringList::Iterator wit2 = list.begin() ; wit2 != list.end(); ++wit2 ) { - TQString s=maskString(*wit2); + TQString s=tqmaskString(*wit2); TQRegExp reg(s); if(reg.search(origStr) >= 0) @@ -436,8 +436,8 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea TranslationInfo *info = new TranslationInfo; info->location = directory(realURL,0); - info->translator = TQString::null; - info->description = TQString::null; + info->translator = TQString(); + info->description = TQString(); result->descriptions.append(info); addResult(result); @@ -454,7 +454,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea TQRegExp searchReg; if(matchContains) { - TQString s=maskString(searchStr); + TQString s=tqmaskString(searchStr); searchReg.setPattern(s); } @@ -471,7 +471,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea i++; - if(checkedIndices.contains(i)) + if(checkedIndices.tqcontains(i)) { continue; } @@ -479,7 +479,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea checkedIndices.append(i); checkCounter++; - if(foundIndices.contains(i)) + if(foundIndices.tqcontains(i)) { continue; } @@ -523,7 +523,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea if(!found && matchIsContained) { - TQString s=maskString(origStr); + TQString s=tqmaskString(origStr); TQRegExp reg(s); if(reg.search(searchStr) >= 0) @@ -538,7 +538,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea for ( TQStringList::Iterator wit2 = list.begin() ; wit2 != list.end(); ++wit2 ) { - TQString s=maskString(*wit2); + TQString s=tqmaskString(*wit2); if(wholeWords) { @@ -577,8 +577,8 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea TranslationInfo *info = new TranslationInfo; info->location = directory(realURL,0); - info->translator = TQString::null; - info->description = TQString::null; + info->translator = TQString(); + info->description = TQString(); result->descriptions.append(info); addResult(result); @@ -687,9 +687,9 @@ void TmxCompendium::slotLoadCompendium() TQString path=url; - if(path.contains("@LANG@")) + if(path.tqcontains("@LANG@")) { - path.replace("@LANG@",langCode); + path.tqreplace("@LANG@",langCode); } KURL u=KCmdLineArgs::makeURL(path.local8Bit()); realURL = u.url(); @@ -746,21 +746,21 @@ void TmxCompendium::recheckData() loading=false; } -TQString TmxCompendium::maskString(TQString s) const +TQString TmxCompendium::tqmaskString(TQString s) const { - s.replace('\\',"\\\\"); - s.replace('?',"\\?"); - s.replace('[',"\\["); - s.replace('.',"\\."); - s.replace('*',"\\*"); - s.replace('+',"\\+"); - s.replace('^',"\\^"); - s.replace('$',"\\$"); - s.replace('(',"\\("); - s.replace(')',"\\)"); - s.replace('{',"\\{"); - s.replace('}',"\\}"); - s.replace('|',"\\|"); + s.tqreplace('\\',"\\\\"); + s.tqreplace('?',"\\?"); + s.tqreplace('[',"\\["); + s.tqreplace('.',"\\."); + s.tqreplace('*',"\\*"); + s.tqreplace('+',"\\+"); + s.tqreplace('^',"\\^"); + s.tqreplace('$',"\\$"); + s.tqreplace('(',"\\("); + s.tqreplace(')',"\\)"); + s.tqreplace('{',"\\{"); + s.tqreplace('}',"\\}"); + s.tqreplace('|',"\\|"); return s; } @@ -797,7 +797,7 @@ void TmxCompendium::addResult(SearchResult *result) void TmxCompendium::setLanguageCode(const TQString& lang) { - if(initialized && url.contains("@LANG@") && lang!=langCode + if(initialized && url.tqcontains("@LANG@") && lang!=langCode && !loadTimer->isActive() ) { initialized=false; @@ -818,7 +818,7 @@ TQString TmxCompendium::translate(const TQString& text, uint pluralForm) if(error || !data || data->active()) { - return TQString::null; + return TQString(); } @@ -829,7 +829,7 @@ TQString TmxCompendium::translate(const TQString& text, uint pluralForm) return data->msgstr(*index); } - return TQString::null; + return TQString(); } TQString TmxCompendium::fuzzyTranslation(const TQString& text, int &score, uint pluralForm) @@ -844,7 +844,7 @@ TQString TmxCompendium::fuzzyTranslation(const TQString& text, int &score, uint if(error || !data || data->active()) { - return TQString::null; + return TQString(); } // try to find fuzzy string @@ -907,7 +907,7 @@ TQString TmxCompendium::fuzzyTranslation(const TQString& text, int &score, uint return data->msgstr(best_matching); } - return TQString::null; + return TQString(); } @@ -943,7 +943,7 @@ void TmxCompendium::unregisterData() void TmxCompendium::registerData() { - data = compendiumDict()->find(realURL); + data = compendiumDict()->tqfind(realURL); if(!data) { data = new TmxCompendiumData; diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.h b/kbabel/kbabeldict/modules/tmx/tmxcompendium.h index d09e81c9..e6b76f53 100644 --- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.h +++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -50,9 +50,10 @@ class TQTimer; class TmxCompendium : public SearchEngine { Q_OBJECT + TQ_OBJECT public: - TmxCompendium(TQObject *parent=0, const char *name=0); + TmxCompendium(TQObject *tqparent=0, const char *name=0); virtual ~TmxCompendium(); virtual bool isReady() const; @@ -65,7 +66,7 @@ public: virtual void saveSettings(KConfigBase *config); virtual void readSettings(KConfigBase *config); - virtual PrefWidget *preferencesWidget(TQWidget *parent); + virtual PrefWidget *preferencesWidget(TQWidget *tqparent); virtual const KAboutData *about() const; @@ -96,7 +97,7 @@ protected slots: protected: void loadCompendium(); void addResult(SearchResult *); - TQString maskString(TQString string) const; + TQString tqmaskString(TQString string) const; void registerData(); void unregisterData(); diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp index 7893e837..739379e1 100644 --- a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp +++ b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -47,8 +47,8 @@ using namespace KBabel; -TmxCompendiumData::TmxCompendiumData(TQObject *parent) - : TQObject(parent) +TmxCompendiumData::TmxCompendiumData(TQObject *tqparent) + : TQObject(tqparent) , _active(false) , _error(false) , _initialized(false) @@ -117,7 +117,7 @@ bool TmxCompendiumData::load(const KURL& url, const TQString& language) _errorMsg = i18n("Error while trying to read file for TMX Compendium module:\n" "%1\n" "Reason: %2") - .arg(url.prettyURL()).arg(_errorMsg); + .tqarg(url.prettyURL()).tqarg(_errorMsg); kdDebug(KBABEL_SEARCH) << "Error: " << _errorMsg << endl; diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.h b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.h index ce2692a1..325fb9b5 100644 --- a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.h +++ b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.h @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -44,12 +44,13 @@ #include <tqvaluevector.h> #include <tqptrlist.h> -class TmxCompendiumData : public QObject +class TmxCompendiumData : public TQObject { Q_OBJECT + TQ_OBJECT public: - TmxCompendiumData(TQObject *parent=0); + TmxCompendiumData(TQObject *tqparent=0); bool load(const KURL& url, const TQString& language); diff --git a/kbabel/kbabeldict/searchengine.cpp b/kbabel/kbabeldict/searchengine.cpp index 19112fe7..ac45c8b3 100644 --- a/kbabel/kbabeldict/searchengine.cpp +++ b/kbabel/kbabeldict/searchengine.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -62,8 +62,8 @@ SearchResult::SearchResult(const SearchResult& r) } -PrefWidget::PrefWidget(TQWidget *parent, const char *name) - : TQWidget(parent,name) +PrefWidget::PrefWidget(TQWidget *tqparent, const char *name) + : TQWidget(tqparent,name) { } @@ -72,8 +72,8 @@ PrefWidget::~PrefWidget() } -SearchEngine::SearchEngine(TQObject *parent, const char *name) - : TQObject(parent, name) +SearchEngine::SearchEngine(TQObject *tqparent, const char *name) + : TQObject(tqparent, name) { autoUpdate=false; results.setAutoDelete(true); @@ -202,9 +202,9 @@ void SearchEngine::stringChanged(const TQStringList&,const TQString&,unsigned in TQString SearchEngine::directory(const TQString& path, int n) { if(n<0) - return TQString::null; + return TQString(); - int begin=path.findRev('/'); + int begin=path.tqfindRev('/'); int end=path.length(); if(begin < 0) @@ -213,22 +213,22 @@ TQString SearchEngine::directory(const TQString& path, int n) if(n==0) return path; else - return TQString::null; + return TQString(); } for(int i=0; i < n; i++) { if(begin==0) { - return TQString::null; + return TQString(); } end = begin; - begin = path.findRev('/', end-1); + begin = path.tqfindRev('/', end-1); if(begin < 0) { - return TQString::null; + return TQString(); } } @@ -244,14 +244,14 @@ uint SearchEngine::score(const TQString& orig, const TQString& found) uint scoreA = ngramMatch(found, orig); uint scoreB = ngramMatch(orig,found); - uint score = QMIN(scoreA, scoreB); + uint score = TQMIN(scoreA, scoreB); TQString f = found.lower(); TQString o = orig.lower(); scoreA = ngramMatch(f, o); scoreB = ngramMatch(o, f); - score = (QMIN(scoreA, scoreB)+score)/2; + score = (TQMIN(scoreA, scoreB)+score)/2; return score; } @@ -266,7 +266,7 @@ uint SearchEngine::ngramMatch (const TQString& text1, const TQString& text2, uint ngram_cnt = text1.length() - ngram_len + 1; for (uint i = 0; i < ngram_cnt; i++) { - if (text2.find(text1.mid(i,ngram_len)) >= 0) + if (text2.tqfind(text1.mid(i,ngram_len)) >= 0) cnt++; } diff --git a/kbabel/kbabeldict/searchengine.h b/kbabel/kbabeldict/searchengine.h index a10e6193..f14baa1e 100644 --- a/kbabel/kbabeldict/searchengine.h +++ b/kbabel/kbabeldict/searchengine.h @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -91,7 +91,7 @@ public: TQString projectContext; /** - * Status of the translation, for example "approved", "spellchecked", "unknown" + * tqStatus of the translation, for example "approved", "spellchecked", "unknown" */ TQString status; @@ -167,13 +167,13 @@ class KDE_EXPORT SearchFilter public: SearchFilter() : _projects() - , _location( TQString::null ) - , _languageCode( TQString::null ) - , _origLanguageCode( TQString::null ) + , _location( TQString() ) + , _languageCode( TQString() ) + , _origLanguageCode( TQString() ) , _translators() , _projectKeywords() , _projectContexts() - , _translationStatus() + , _translationtqStatus() {} virtual ~SearchFilter() {} @@ -213,10 +213,10 @@ public: void setProjectContext( const TQStringList& projectContexts) { _projectContexts = projectContexts; } /** - * Status of the translation, for example "approved", "spellchecked", "unknown" + * tqStatus of the translation, for example "approved", "spellchecked", "unknown" */ - void setStatus( const TQString& translationStatus) { _translationStatus = translationStatus; } - void setStatus( const TQStringList& translationStati) { _translationStatus = translationStati; } + void settqStatus( const TQString& translationtqStatus) { _translationtqStatus = translationtqStatus; } + void settqStatus( const TQStringList& translationStati) { _translationtqStatus = translationStati; } /** * The key method of the class - check, if the argument @@ -232,7 +232,7 @@ private: TQStringList _translators; TQStringList _projectKeywords ; TQStringList _projectContexts; - TQStringList _translationStatus; + TQStringList _translationtqStatus; }; /** @@ -241,12 +241,13 @@ private: * necessary function. The widget should not be bigger than 400x400. * If you need more space, you maybe want to use a tabbed widget. */ -class KDE_EXPORT PrefWidget : public QWidget +class KDE_EXPORT PrefWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - PrefWidget(TQWidget *parent, const char* name=0); + PrefWidget(TQWidget *tqparent, const char* name=0); virtual ~PrefWidget(); public slots: @@ -265,12 +266,13 @@ public slots: }; -class KDE_EXPORT SearchEngine : public QObject +class KDE_EXPORT SearchEngine : public TQObject { Q_OBJECT + TQ_OBJECT public: - SearchEngine(TQObject *parent=0, const char *name=0); + SearchEngine(TQObject *tqparent=0, const char *name=0); virtual ~SearchEngine(); @@ -306,7 +308,7 @@ public: virtual TQString searchTranslation(const TQString&, int &score, const uint pluralForm = 0) { Q_UNUSED(pluralForm); - score = 0; return TQString::null; + score = 0; return TQString(); } /** @@ -316,7 +318,7 @@ public: virtual TQString fuzzyTranslation(const TQString& /*text*/, int &score, const uint pluralForm = 0) { Q_UNUSED(pluralForm); - score = 0; return TQString::null; }; + score = 0; return TQString(); }; /** @@ -352,9 +354,9 @@ public: * search engine. The returned widget should not be bigger than * 400x400. If you need more space, you maybe want to use * a tabbed widget. - * @param parent the parent of the returned widget + * @param tqparent the tqparent of the returned widget */ - virtual PrefWidget* preferencesWidget(TQWidget *parent)=0; + virtual PrefWidget* preferencesWidget(TQWidget *tqparent)=0; /** @returns information about this SearchEngine */ virtual const KAboutData *about() const= 0; diff --git a/kbugbuster/backend/bug.cpp b/kbugbuster/backend/bug.cpp index aaa61273..edb94744 100644 --- a/kbugbuster/backend/bug.cpp +++ b/kbugbuster/backend/bug.cpp @@ -23,7 +23,7 @@ Bug::Bug( const Bug &other ) Bug Bug::fromNumber( const TQString &bugNumber ) { - return new BugImpl( TQString::null, Person(), bugNumber, 0xFFFFFFFF, Normal, Person(), + return new BugImpl( TQString(), Person(), bugNumber, 0xFFFFFFFF, Normal, Person(), Unconfirmed, Bug::BugMergeList() ); } @@ -56,16 +56,16 @@ TQString Bug::severityLabel( Bug::Severity s ) TQString Bug::severityToString( Bug::Severity s ) { switch ( s ) { - case Critical: return TQString::fromLatin1( "critical" ); - case Grave: return TQString::fromLatin1( "grave" ); - case Major: return TQString::fromLatin1( "major" ); - case Crash: return TQString::fromLatin1( "crash" ); - case Normal: return TQString::fromLatin1( "normal" ); - case Minor: return TQString::fromLatin1( "minor" ); - case Wishlist: return TQString::fromLatin1( "wishlist" ); + case Critical: return TQString::tqfromLatin1( "critical" ); + case Grave: return TQString::tqfromLatin1( "grave" ); + case Major: return TQString::tqfromLatin1( "major" ); + case Crash: return TQString::tqfromLatin1( "crash" ); + case Normal: return TQString::tqfromLatin1( "normal" ); + case Minor: return TQString::tqfromLatin1( "minor" ); + case Wishlist: return TQString::tqfromLatin1( "wishlist" ); default: kdWarning() << "Bug::severityToString invalid severity " << s << endl; - return TQString::fromLatin1( "<invalid>" ); + return TQString::tqfromLatin1( "<invalid>" ); } } @@ -95,7 +95,7 @@ TQValueList<Bug::Severity> Bug::severities() return s; } -TQString Bug::statusLabel( Bug::Status s ) +TQString Bug::statusLabel( Bug::tqStatus s ) { switch ( s ) { @@ -109,21 +109,21 @@ TQString Bug::statusLabel( Bug::Status s ) } } -TQString Bug::statusToString( Bug::Status s ) +TQString Bug::statusToString( Bug::tqStatus s ) { switch ( s ) { - case Unconfirmed: return TQString::fromLatin1( "unconfirmed" ); - case New: return TQString::fromLatin1( "new" ); - case Assigned: return TQString::fromLatin1( "assigned" ); - case Reopened: return TQString::fromLatin1( "reopened" ); - case Closed: return TQString::fromLatin1( "closed" ); + case Unconfirmed: return TQString::tqfromLatin1( "unconfirmed" ); + case New: return TQString::tqfromLatin1( "new" ); + case Assigned: return TQString::tqfromLatin1( "assigned" ); + case Reopened: return TQString::tqfromLatin1( "reopened" ); + case Closed: return TQString::tqfromLatin1( "closed" ); default: kdWarning() << "Bug::statusToString invalid status " << s << endl; - return TQString::fromLatin1( "<invalid>" ); + return TQString::tqfromLatin1( "<invalid>" ); } } -Bug::Status Bug::stringToStatus( const TQString &s, bool *ok ) +Bug::tqStatus Bug::stringTotqStatus( const TQString &s, bool *ok ) { if ( ok ) *ok = true; @@ -134,7 +134,7 @@ Bug::Status Bug::stringToStatus( const TQString &s, bool *ok ) else if ( s == "reopened" ) return Reopened; else if ( s == "closed" ) return Closed; - kdWarning() << "Bug::stringToStatus: invalid status: " << s << endl; + kdWarning() << "Bug::stringTotqStatus: invalid status: " << s << endl; if ( ok ) *ok = false; return StatusUndefined; @@ -143,7 +143,7 @@ Bug::Status Bug::stringToStatus( const TQString &s, bool *ok ) TQString Bug::title() const { if ( !m_impl ) - return TQString::null; + return TQString(); return m_impl->title; } @@ -171,7 +171,7 @@ void Bug::setAge( uint age ) struct Person Bug::submitter() const { if ( !m_impl ) - return Person( TQString::null, TQString::null ); + return Person( TQString(), TQString() ); return m_impl->submitter; } @@ -179,7 +179,7 @@ struct Person Bug::submitter() const TQString Bug::number() const { if ( !m_impl ) - return TQString::null; + return TQString(); return m_impl->number; } @@ -207,7 +207,7 @@ Bug::BugMergeList Bug::mergedWith() const } -Bug::Status Bug::status() const +Bug::tqStatus Bug::status() const { if ( !m_impl ) return StatusUndefined; @@ -222,7 +222,7 @@ TQString Bug::severityAsString() const Person Bug::developerTODO() const { - return (m_impl == NULL) ? Person( TQString::null, TQString::null ) : + return (m_impl == NULL) ? Person( TQString(), TQString() ) : m_impl->developerTODO; } diff --git a/kbugbuster/backend/bug.h b/kbugbuster/backend/bug.h index 406179c8..e60b0e98 100644 --- a/kbugbuster/backend/bug.h +++ b/kbugbuster/backend/bug.h @@ -17,7 +17,7 @@ public: enum Severity { SeverityUndefined, Critical, Grave, Major, Crash, Normal, Minor, Wishlist }; - enum Status { StatusUndefined, Unconfirmed, New, Assigned, Reopened, + enum tqStatus { StatusUndefined, Unconfirmed, New, Assigned, Reopened, Closed }; Bug(); @@ -55,23 +55,23 @@ public: BugMergeList mergedWith() const; /** - * Status of a bug. Currently open or closed. + * tqStatus of a bug. Currently open or closed. * TODO: Should we add a status 'deleted' here ? */ - Status status() const; - void setStatus( Status newStatus ); + tqStatus status() const; + void settqStatus( tqStatus newtqStatus ); - static TQString statusLabel( Status s ); + static TQString statusLabel( tqStatus s ); /** Return string representation of status. This function is symmetric to - stringToStatus(). + stringTotqStatus(). */ - static TQString statusToString( Status s ); + static TQString statusToString( tqStatus s ); /** Return status code of string representation. This function is symmetric to statusToString(). */ - static Status stringToStatus( const TQString &, bool *ok = 0 ); + static tqStatus stringTotqStatus( const TQString &, bool *ok = 0 ); bool operator==( const Bug &rhs ); bool operator<( const Bug &rhs ) const; diff --git a/kbugbuster/backend/bugcache.cpp b/kbugbuster/backend/bugcache.cpp index a6ef25df..1ce73241 100644 --- a/kbugbuster/backend/bugcache.cpp +++ b/kbugbuster/backend/bugcache.cpp @@ -59,7 +59,7 @@ Package::List BugCache::loadPackageList() TQStringList::ConstIterator it; for( it = packages.begin(); it != packages.end(); ++it ) { if ((*it) == "<default>") continue; - if ((*it).contains("/")) continue; + if ((*it).tqcontains("/")) continue; m_cachePackages->setGroup(*it); @@ -75,7 +75,7 @@ Package::List BugCache::loadPackageList() return pkgs; } -void BugCache::invalidatePackageList() +void BugCache::tqinvalidatePackageList() { // Completely wipe out packages.cache TQStringList packages = m_cachePackages->groupList(); @@ -97,7 +97,7 @@ void BugCache::saveBugList( const Package &pkg, const TQString &component, const m_cacheBugs->setGroup( number ); m_cacheBugs->writeEntry( "Title", (*it).title() ); m_cacheBugs->writeEntry( "Severity", Bug::severityToString((*it).severity()) ); - m_cacheBugs->writeEntry( "Status", Bug::statusToString((*it).status()) ); + m_cacheBugs->writeEntry( "tqStatus", Bug::statusToString((*it).status()) ); m_cacheBugs->writeEntry( "MergedWith" , (*it).mergedWith() ); m_cacheBugs->writeEntry( "Age", ( *it ).age() ); writePerson( m_cacheBugs, "Submitter", (*it).submitter() ); @@ -137,7 +137,7 @@ Bug::List BugCache::loadBugList( const Package &pkg, const TQString &component, if ( !title.isEmpty() ) // dunno how I ended up with an all empty bug in the cache { Person submitter = readPerson( m_cacheBugs, "Submitter" ); - Bug::Status status = Bug::stringToStatus( m_cacheBugs->readEntry("Status") ); + Bug::tqStatus status = Bug::stringTotqStatus( m_cacheBugs->readEntry("tqStatus") ); Bug::Severity severity = Bug::stringToSeverity( m_cacheBugs->readEntry("Severity") ); Person developerTODO = readPerson( m_cacheBugs, "TODO" ); Bug::BugMergeList mergedWith = m_cacheBugs->readIntListEntry( "MergedWith" ); @@ -158,9 +158,9 @@ Bug::List BugCache::loadBugList( const Package &pkg, const TQString &component, return bugList; } -void BugCache::invalidateBugList( const Package& pkg, const TQString &component ) +void BugCache::tqinvalidateBugList( const Package& pkg, const TQString &component ) { - kdDebug() << "BugCache::invalidateBugList " << pkg.name() + kdDebug() << "BugCache::tqinvalidateBugList " << pkg.name() << " (" << component << ")" << endl; // Erase bug list for this package @@ -172,7 +172,7 @@ void BugCache::invalidateBugList( const Package& pkg, const TQString &component m_cachePackages->setGroup( pkg.name() + "/" + component ); } - m_cachePackages->writeEntry("bugList",TQString::null); + m_cachePackages->writeEntry("bugList",TQString()); } void BugCache::saveBugDetails( const Bug &bug, const BugDetails &details ) @@ -249,7 +249,7 @@ BugDetails BugCache::loadBugDetails( const Bug &bug ) parts ) ); } -void BugCache::invalidateBugDetails( const Bug& bug ) +void BugCache::tqinvalidateBugDetails( const Bug& bug ) { m_cacheBugs->deleteGroup( bug.number(), true ); } diff --git a/kbugbuster/backend/bugcache.h b/kbugbuster/backend/bugcache.h index bef22493..ec317ca8 100644 --- a/kbugbuster/backend/bugcache.h +++ b/kbugbuster/backend/bugcache.h @@ -15,15 +15,15 @@ class BugCache void savePackageList( const Package::List &pkgs ); Package::List loadPackageList(); - void invalidatePackageList(); + void tqinvalidatePackageList(); void saveBugList( const Package &pkg, const TQString &component, const Bug::List & ); Bug::List loadBugList( const Package &pkg, const TQString &component, bool disconnected ); - void invalidateBugList( const Package &pkg, const TQString &component ); + void tqinvalidateBugList( const Package &pkg, const TQString &component ); void saveBugDetails( const Bug &bug, const BugDetails & ); BugDetails loadBugDetails( const Bug &bug ); - void invalidateBugDetails( const Bug &bug ); + void tqinvalidateBugDetails( const Bug &bug ); bool hasBugDetails( const Bug& bug ) const; void clear(); diff --git a/kbugbuster/backend/bugcommand.cpp b/kbugbuster/backend/bugcommand.cpp index ab61afae..5aa4d522 100644 --- a/kbugbuster/backend/bugcommand.cpp +++ b/kbugbuster/backend/bugcommand.cpp @@ -11,7 +11,7 @@ TQString BugCommand::name() TQString BugCommand::details() { - return TQString::null; + return TQString(); } BugCommand *BugCommand::load( KConfig *config, const TQString &type ) @@ -56,7 +56,7 @@ TQString BugCommandClose::controlString() const if (m_message.isEmpty()) { return "close " + m_bug.number(); } else { - return TQString::null; + return TQString(); } } @@ -65,7 +65,7 @@ TQString BugCommandClose::mailAddress() const kdDebug() << "BugCommandClose::mailAddress(): number: " << m_bug.number() << endl; if (m_message.isEmpty()) { - return TQString::null; + return TQString(); } else { return m_bug.number() + "-done@bugs.kde.org"; } @@ -74,7 +74,7 @@ TQString BugCommandClose::mailAddress() const TQString BugCommandClose::mailText() const { if (m_message.isEmpty()) { - return TQString::null; + return TQString(); } else { return m_message; } @@ -204,7 +204,7 @@ TQString BugCommandReply::mailAddress() const case Quiet: return m_bug.number() + "-quiet@bugs.kde.org"; } - return TQString::null; + return TQString(); #endif } @@ -225,7 +225,7 @@ TQString BugCommandReply::name() case Quiet: return i18n("Reply (Quiet)"); } - return TQString::null; + return TQString(); #endif } diff --git a/kbugbuster/backend/bugcommand.h b/kbugbuster/backend/bugcommand.h index 38b2513f..bb53cdb4 100644 --- a/kbugbuster/backend/bugcommand.h +++ b/kbugbuster/backend/bugcommand.h @@ -18,10 +18,10 @@ class BugCommand { BugCommand( const Bug &bug, const Package &pkg ) : m_bug( bug ), m_package( pkg ) {} virtual ~BugCommand() {} - virtual TQString controlString() const { return TQString::null; } + virtual TQString controlString() const { return TQString(); } - virtual TQString mailAddress() const { return TQString::null; } - virtual TQString mailText() const { return TQString::null; } + virtual TQString mailAddress() const { return TQString(); } + virtual TQString mailText() const { return TQString(); } Bug bug() const { return m_bug; } Package package() const { return m_package; } @@ -29,7 +29,7 @@ class BugCommand { virtual TQString name(); virtual TQString details(); - virtual TQString type() const { return TQString::null; } + virtual TQString type() const { return TQString(); } virtual void save( KConfig * ) = 0; static BugCommand *load( KConfig *, const TQString &type ); @@ -51,7 +51,7 @@ class BugCommandClose : public BugCommand { TQString name(); TQString details() const; - TQString type() const { return TQString::fromLatin1("Close"); } + TQString type() const { return TQString::tqfromLatin1("Close"); } void save( KConfig * ); @@ -68,7 +68,7 @@ class BugCommandCloseSilently : public BugCommand { TQString name(); - TQString type() const { return TQString::fromLatin1("CloseSilently"); } + TQString type() const { return TQString::tqfromLatin1("CloseSilently"); } void save( KConfig * ); }; @@ -82,7 +82,7 @@ class BugCommandReopen : public BugCommand { TQString name(); - TQString type() const { return TQString::fromLatin1("Reopen"); } + TQString type() const { return TQString::tqfromLatin1("Reopen"); } void save( KConfig * ); }; @@ -97,7 +97,7 @@ class BugCommandRetitle : public BugCommand { TQString name(); TQString details() const; - TQString type() const { return TQString::fromLatin1("Retitle"); } + TQString type() const { return TQString::tqfromLatin1("Retitle"); } void save( KConfig * ); @@ -115,7 +115,7 @@ class BugCommandMerge : public BugCommand { TQString name(); TQString details() const; - TQString type() const { return TQString::fromLatin1("Merge"); } + TQString type() const { return TQString::tqfromLatin1("Merge"); } void save( KConfig * ); @@ -130,7 +130,7 @@ class BugCommandUnmerge : public BugCommand { TQString name(); - TQString type() const { return TQString::fromLatin1("Unmerge"); } + TQString type() const { return TQString::tqfromLatin1("Unmerge"); } void save( KConfig * ); @@ -148,7 +148,7 @@ class BugCommandReply : public BugCommand { TQString name(); TQString details() const; - TQString type() const { return TQString::fromLatin1("Reply"); } + TQString type() const { return TQString::tqfromLatin1("Reply"); } void save( KConfig * ); @@ -169,7 +169,7 @@ class BugCommandReplyPrivate : public BugCommand { TQString name(); TQString details() const; - TQString type() const { return TQString::fromLatin1("ReplyPrivate"); } + TQString type() const { return TQString::tqfromLatin1("ReplyPrivate"); } void save( KConfig * ); @@ -186,7 +186,7 @@ class BugCommandSeverity : public BugCommand { TQString name(); TQString details() const; - TQString type() const { return TQString::fromLatin1("Severity"); } + TQString type() const { return TQString::tqfromLatin1("Severity"); } TQString controlString() const; @@ -204,7 +204,7 @@ class BugCommandReassign : public BugCommand { TQString name(); TQString details() const; - TQString type() const { return TQString::fromLatin1("Reassign"); } + TQString type() const { return TQString::tqfromLatin1("Reassign"); } TQString controlString() const; diff --git a/kbugbuster/backend/bugdetails.cpp b/kbugbuster/backend/bugdetails.cpp index d1ce4666..5dcfbcd4 100644 --- a/kbugbuster/backend/bugdetails.cpp +++ b/kbugbuster/backend/bugdetails.cpp @@ -35,7 +35,7 @@ BugDetails::~BugDetails() TQString BugDetails::version() const { if ( !m_impl ) - return TQString::null; + return TQString(); return m_impl->version; } @@ -43,7 +43,7 @@ TQString BugDetails::version() const TQString BugDetails::source() const { if ( !m_impl ) - return TQString::null; + return TQString(); return m_impl->source; } @@ -51,7 +51,7 @@ TQString BugDetails::source() const TQString BugDetails::compiler() const { if ( !m_impl ) - return TQString::null; + return TQString(); return m_impl->compiler; } @@ -59,7 +59,7 @@ TQString BugDetails::compiler() const TQString BugDetails::os() const { if ( !m_impl ) - return TQString::null; + return TQString(); return m_impl->os; } @@ -79,7 +79,7 @@ int BugDetails::age() const if ( !m_impl ) return 0; - return submissionDate().daysTo( TQDateTime::currentDateTime() ); + return submissionDate().daysTo( TQDateTime::tqcurrentDateTime() ); } BugDetailsPart::List BugDetails::parts() const @@ -181,7 +181,7 @@ TQValueList<BugDetails::Attachment> BugDetails::extractAttachments( const TQStri kdDebug() << "BugDetails::extractAttachments found header " << *rit << endl; #endif // Taken from libkdenetwork/kmime_headers.cpp - int pos=header.find("filename=", 0, false); + int pos=header.tqfind("filename=", 0, false); TQString fn; if(pos>-1) { pos+=9; @@ -226,12 +226,12 @@ TQValueList<BugDetails::Attachment> BugDetails::extractAttachments( const TQStri break; if ( line == boundary+"--" ) // end of last attachment { - boundary = TQString::null; + boundary = TQString(); break; } contents += line; // no newline, because of linebreaking between <br and /> } - contents = contents.replace( TQRegExp("<br */>"), TQString::null ); + contents = contents.tqreplace( TQRegExp("<br */>"), TQString() ); #ifdef DEBUG_EXTRACT kdDebug() << "BugDetails::extractAttachments contents=***\n" << contents << "\n***" << endl; #endif @@ -241,7 +241,7 @@ TQValueList<BugDetails::Attachment> BugDetails::extractAttachments( const TQStri KCodecs::base64Decode( contents.local8Bit(), a.contents /*out*/ ); else //KCodecs::uudecode( contents.local8Bit(), a.contents /*out*/ ); - KMessageBox::information( 0, i18n("Attachment %1 could not be decoded.\nEncoding: %2").arg(filename).arg(encoding) ); + KMessageBox::information( 0, i18n("Attachment %1 could not be decoded.\nEncoding: %2").tqarg(filename).tqarg(encoding) ); #ifdef DEBUG_EXTRACT kdDebug() << "Result: ***\n" << TQCString( a.contents.data(), a.contents.size()+1 ) << "\n*+*" << endl; #endif diff --git a/kbugbuster/backend/bugdetailsjob.cpp b/kbugbuster/backend/bugdetailsjob.cpp index 1218023d..22ee31c7 100644 --- a/kbugbuster/backend/bugdetailsjob.cpp +++ b/kbugbuster/backend/bugdetailsjob.cpp @@ -36,8 +36,8 @@ void BugDetailsJob::process( const TQByteArray &data ) KBB::Error err = server()->processor()->parseBugDetails( data, bugDetails ); if ( err ) { - emit error( i18n("Bug %1: %2").arg( m_bug.number() ) - .arg( err.message() ) ); + emit error( i18n("Bug %1: %2").tqarg( m_bug.number() ) + .tqarg( err.message() ) ); } else { emit bugDetailsAvailable( m_bug, bugDetails ); } diff --git a/kbugbuster/backend/bugdetailsjob.h b/kbugbuster/backend/bugdetailsjob.h index 5b6a8887..946ea7a5 100644 --- a/kbugbuster/backend/bugdetailsjob.h +++ b/kbugbuster/backend/bugdetailsjob.h @@ -9,6 +9,7 @@ class BugDetailsJob : public BugJob { Q_OBJECT + TQ_OBJECT public: BugDetailsJob( BugServer * ); virtual ~BugDetailsJob(); diff --git a/kbugbuster/backend/bugimpl.h b/kbugbuster/backend/bugimpl.h index 7fefc53d..b1d94b2d 100644 --- a/kbugbuster/backend/bugimpl.h +++ b/kbugbuster/backend/bugimpl.h @@ -12,7 +12,7 @@ struct BugImpl : public KShared public: BugImpl( const TQString &_title, const Person &_submitter, TQString _number, uint _age, Bug::Severity _severity, Person _developerTODO, - Bug::Status _status, const Bug::BugMergeList& _mergedWith ) + Bug::tqStatus _status, const Bug::BugMergeList& _mergedWith ) : age( _age ), title( _title ), submitter( _submitter ), number( _number ), severity( _severity ), developerTODO( _developerTODO ), status( _status ), mergedWith( _mergedWith ) @@ -25,7 +25,7 @@ public: TQString number; Bug::Severity severity; Person developerTODO; - Bug::Status status; + Bug::tqStatus status; Bug::BugMergeList mergedWith; }; diff --git a/kbugbuster/backend/bugjob.h b/kbugbuster/backend/bugjob.h index 00ab7f8f..91103a99 100644 --- a/kbugbuster/backend/bugjob.h +++ b/kbugbuster/backend/bugjob.h @@ -8,6 +8,7 @@ class BugJob : public KIO::Job { Q_OBJECT + TQ_OBJECT public: BugJob( BugServer * ); virtual ~BugJob(); diff --git a/kbugbuster/backend/buglistjob.cpp b/kbugbuster/backend/buglistjob.cpp index 74fe5427..01910ea2 100644 --- a/kbugbuster/backend/buglistjob.cpp +++ b/kbugbuster/backend/buglistjob.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "buglistjob.h" @@ -60,8 +60,8 @@ void BugListJob::process( const TQByteArray &data ) KBB::Error err = server()->processor()->parseBugList( data, bugs ); if ( err ) { - emit error( i18n("Package %1: %2").arg( m_package.name() ) - .arg( err.message() ) ); + emit error( i18n("Package %1: %2").tqarg( m_package.name() ) + .tqarg( err.message() ) ); } else { emit bugListAvailable( m_package, m_component, bugs ); } diff --git a/kbugbuster/backend/buglistjob.h b/kbugbuster/backend/buglistjob.h index 4272325d..aa69c748 100644 --- a/kbugbuster/backend/buglistjob.h +++ b/kbugbuster/backend/buglistjob.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef BUGLISTJOB_H #define BUGLISTJOB_H @@ -33,6 +33,7 @@ class BugListJob : public BugJob { Q_OBJECT + TQ_OBJECT public: BugListJob( BugServer * ); virtual ~BugListJob(); diff --git a/kbugbuster/backend/bugmybugsjob.cpp b/kbugbuster/backend/bugmybugsjob.cpp index 87767a5b..869b0827 100644 --- a/kbugbuster/backend/bugmybugsjob.cpp +++ b/kbugbuster/backend/bugmybugsjob.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "bugmybugsjob.h" @@ -67,7 +67,7 @@ void BugMyBugsJob::process( const TQByteArray &data ) delete processor; if ( err ) - emit error( i18n( "My Bugs: %2" ).arg( err.message() ) ); + emit error( i18n( "My Bugs: %2" ).tqarg( err.message() ) ); else emit bugListAvailable( i18n( "My Bugs" ), bugs ); } diff --git a/kbugbuster/backend/bugmybugsjob.h b/kbugbuster/backend/bugmybugsjob.h index 92685593..7cd1851a 100644 --- a/kbugbuster/backend/bugmybugsjob.h +++ b/kbugbuster/backend/bugmybugsjob.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef BUGMYBUGSJOB_H @@ -32,6 +32,7 @@ class BugMyBugsJob : public BugJob { Q_OBJECT + TQ_OBJECT public: BugMyBugsJob( BugServer * ); diff --git a/kbugbuster/backend/bugserver.cpp b/kbugbuster/backend/bugserver.cpp index 768b76cd..a5d31bbf 100644 --- a/kbugbuster/backend/bugserver.cpp +++ b/kbugbuster/backend/bugserver.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "bugserver.h" @@ -152,7 +152,7 @@ KURL BugServer::attachmentEditLink( const TQString &id ) return url; } -Bug::Status BugServer::bugStatus( const TQString &str ) +Bug::tqStatus BugServer::bugtqStatus( const TQString &str ) { if ( str == "UNCONFIRMED" ) { return Bug::Unconfirmed; @@ -216,14 +216,14 @@ bool BugServer::queueCommand( BugCommand *cmd ) TQPtrList<BugCommand> BugServer::queryCommands( const Bug &bug ) const { - CommandsMap::ConstIterator it = mCommands.find( bug.number() ); + CommandsMap::ConstIterator it = mCommands.tqfind( bug.number() ); if (it == mCommands.end()) return TQPtrList<BugCommand>(); else return *it; } bool BugServer::hasCommandsFor( const Bug &bug ) const { - CommandsMap::ConstIterator it = mCommands.find( bug.number() ); + CommandsMap::ConstIterator it = mCommands.tqfind( bug.number() ); return it != mCommands.end(); } @@ -270,13 +270,13 @@ void BugServer::sendCommands( MailSender *mailer, const TQString &senderName, } if (!bug.isNull()) { mCommandsFile->deleteGroup( bug.number(), true ); // done, remove command - mCache->invalidateBugDetails( bug ); + mCache->tqinvalidateBugDetails( bug ); if ( !pkg.isNull() ) { - mCache->invalidateBugList( pkg, TQString::null ); // the status of the bug comes from the buglist... + mCache->tqinvalidateBugList( pkg, TQString() ); // the status of the bug comes from the buglist... TQStringList::ConstIterator it2; for (it2 = pkg.components().begin();it2 != pkg.components().end();++it2) { - mCache->invalidateBugList( pkg, (*it2) ); // the status of the bug comes from the buglist... + mCache->tqinvalidateBugList( pkg, (*it2) ); // the status of the bug comes from the buglist... } } } @@ -318,9 +318,9 @@ TQStringList BugServer::listCommands() const for ( ; cmdIt.current() ; ++cmdIt ) { BugCommand* cmd = cmdIt.current(); if (!cmd->controlString().isNull()) - result.append( i18n("Control command: %1").arg(cmd->controlString()) ); + result.append( i18n("Control command: %1").tqarg(cmd->controlString()) ); else - result.append( i18n("Mail to %1").arg(cmd->mailAddress()) ); + result.append( i18n("Mail to %1").tqarg(cmd->mailAddress()) ); } } return result; @@ -387,13 +387,13 @@ const Package::List &BugServer::packages() const void BugServer::setBugs( const Package &pkg, const TQString &component, const Bug::List &bugs ) { - QPair<Package, TQString> pkg_key = QPair<Package, TQString>(pkg, component); + TQPair<Package, TQString> pkg_key = TQPair<Package, TQString>(pkg, component); mBugs[ pkg_key ] = bugs; } const Bug::List &BugServer::bugs( const Package &pkg, const TQString &component ) { - QPair<Package, TQString> pkg_key = QPair<Package, TQString>(pkg, component); + TQPair<Package, TQString> pkg_key = TQPair<Package, TQString>(pkg, component); return mBugs[ pkg_key ]; } diff --git a/kbugbuster/backend/bugserver.h b/kbugbuster/backend/bugserver.h index b2095569..b865450f 100644 --- a/kbugbuster/backend/bugserver.h +++ b/kbugbuster/backend/bugserver.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef BUGSERVER_H #define BUGSERVER_H @@ -64,7 +64,7 @@ class BugServer KURL attachmentViewLink( const TQString &id ); KURL attachmentEditLink( const TQString &id ); - Bug::Status bugStatus( const TQString & ); + Bug::tqStatus bugtqStatus( const TQString & ); Bug::Severity bugSeverity( const TQString & ); @@ -133,7 +133,7 @@ class BugServer Package::List mPackages; // Map package -> list of bugs - typedef TQMap< QPair<Package, TQString>, Bug::List > BugListMap; + typedef TQMap< TQPair<Package, TQString>, Bug::List > BugListMap; BugListMap mBugs; // Map bug -> bug details (i.e. contents of the report) typedef TQMap< Bug, BugDetails > BugDetailsMap; diff --git a/kbugbuster/backend/bugserverconfig.cpp b/kbugbuster/backend/bugserverconfig.cpp index 91be1f0c..aca9d5cd 100644 --- a/kbugbuster/backend/bugserverconfig.cpp +++ b/kbugbuster/backend/bugserverconfig.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "bugserverconfig.h" diff --git a/kbugbuster/backend/bugserverconfig.h b/kbugbuster/backend/bugserverconfig.h index 2868a791..39a34463 100644 --- a/kbugbuster/backend/bugserverconfig.h +++ b/kbugbuster/backend/bugserverconfig.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef BUGSERVERCONFIG_H #define BUGSERVERCONFIG_H diff --git a/kbugbuster/backend/bugsystem.h b/kbugbuster/backend/bugsystem.h index c5c37d18..d24b011d 100644 --- a/kbugbuster/backend/bugsystem.h +++ b/kbugbuster/backend/bugsystem.h @@ -20,9 +20,10 @@ class BugServer; class BugServerConfig; class BugJob; -class BugSystem : public QObject +class BugSystem : public TQObject { Q_OBJECT + TQ_OBJECT friend class BugJob; public: BugSystem(); diff --git a/kbugbuster/backend/domprocessor.cpp b/kbugbuster/backend/domprocessor.cpp index bfef2ca6..9b5c2944 100644 --- a/kbugbuster/backend/domprocessor.cpp +++ b/kbugbuster/backend/domprocessor.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "domprocessor.h" @@ -170,7 +170,7 @@ KBB::Error DomProcessor::parseDomBugList( const TQDomElement &topElement, TQString submitterName; TQString submitterEmail; TQString bugNr; - Bug::Status status = Bug::StatusUndefined; + Bug::tqStatus status = Bug::StatusUndefined; Bug::Severity severity = Bug::SeverityUndefined; Person developerTodo; Bug::BugMergeList mergedList; @@ -184,7 +184,7 @@ KBB::Error DomProcessor::parseDomBugList( const TQDomElement &topElement, if ( e.tagName() == "bugid" ) bugNr = e.text(); else if ( e.tagName() == "status" ) - status = server()->bugStatus( e.text() ); + status = server()->bugtqStatus( e.text() ); else if ( e.tagName() == "descr" ) title = e.text(); else if ( e.tagName() == "reporter" ) @@ -194,7 +194,7 @@ KBB::Error DomProcessor::parseDomBugList( const TQDomElement &topElement, else if ( e.tagName() == "severity" ) severity = Bug::stringToSeverity( e.text() ); else if ( e.tagName() == "creationdate" ) - age = ( TQDateTime::fromString( e.text(), Qt::ISODate ) ).daysTo( TQDateTime::currentDateTime() ); + age = ( TQDateTime::fromString( e.text(), Qt::ISODate ) ).daysTo( TQDateTime::tqcurrentDateTime() ); } Person submitter( submitterName, submitterEmail ); @@ -250,7 +250,7 @@ KBB::Error DomProcessor::parseDomBugDetails( const TQDomElement &element, } else if ( e2.tagName() == "thetext" ) { TQString in; if ( encoding == "base64" ) { - in = KCodecs::base64Decode( e2.text().latin1() ); + in = KCodecs::base64Decode( TQCString(e2.text().latin1()) ); } else { in = e2.text(); } @@ -273,7 +273,7 @@ KBB::Error DomProcessor::parseDomBugDetails( const TQDomElement &element, text += raw; } TQString bugBaseURL = server()->serverConfig().baseUrl().htmlURL(); - text = "<pre>" + wrapLines( text ).replace( TQRegExp( "(Created an attachment \\(id=([0-9]+)\\))" ), + text = "<pre>" + wrapLines( text ).tqreplace( TQRegExp( "(Created an attachment \\(id=([0-9]+)\\))" ), "<a href=\"" + bugBaseURL + "/attachment.cgi?id=\\2&action=view\">\\1</a>" ) + "\n</pre>"; } } @@ -361,7 +361,7 @@ TQString DomProcessor::wrapLines( const TQString &text ) TQString wrappedLine; while ( line.length() > uint( wrap ) ) { - int breakPoint = line.findRev( ' ', wrap ); + int breakPoint = line.tqfindRev( ' ', wrap ); //kdDebug() << "Breaking at " << breakPoint << endl; if( breakPoint == -1 ) { wrappedLine += line.left( wrap ) + '\n'; diff --git a/kbugbuster/backend/domprocessor.h b/kbugbuster/backend/domprocessor.h index a561cbea..0ee5cc85 100644 --- a/kbugbuster/backend/domprocessor.h +++ b/kbugbuster/backend/domprocessor.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef DOMPROCESSOR_H #define DOMPROCESSOR_H diff --git a/kbugbuster/backend/error.h b/kbugbuster/backend/error.h index 595c070c..f0ba75af 100644 --- a/kbugbuster/backend/error.h +++ b/kbugbuster/backend/error.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KBB_ERROR_H #define KBB_ERROR_H @@ -28,7 +28,7 @@ namespace KBB { class Error { public: - Error( const TQString &msg = TQString::null ) : mMsg( msg ) {} + Error( const TQString &msg = TQString() ) : mMsg( msg ) {} operator bool() { return !mMsg.isEmpty(); } diff --git a/kbugbuster/backend/htmlparser.cpp b/kbugbuster/backend/htmlparser.cpp index 055b8d11..e9840e6b 100644 --- a/kbugbuster/backend/htmlparser.cpp +++ b/kbugbuster/backend/htmlparser.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "htmlparser.h" @@ -100,35 +100,35 @@ void HtmlParser::processResult( Package::List & ) TQString HtmlParser::getAttribute( const TQString &line, const TQString &name ) { - int pos1 = line.find( name + "=\"" ); - if ( pos1 < 1 ) return TQString::null; + int pos1 = line.tqfind( name + "=\"" ); + if ( pos1 < 1 ) return TQString(); pos1 += name.length() + 2; - int pos2 = line.find( "\"", pos1 ); - if ( pos2 < 1 ) return TQString::null; + int pos2 = line.tqfind( "\"", pos1 ); + if ( pos2 < 1 ) return TQString(); return line.mid( pos1, pos2 - pos1 ); } bool HtmlParser::getCpts( const TQString &line, TQString &key, TQStringList &values ) { - if ( !line.contains( TQRegExp( "\\s*cpts" ) ) ) return false; + if ( !line.tqcontains( TQRegExp( "\\s*cpts" ) ) ) return false; // kdDebug() << "LINE: " << line << endl; - int pos1 = line.find( "[" ); + int pos1 = line.tqfind( "[" ); if ( pos1 < 0 ) return false; - int pos2 = line.find( "]", ++pos1 ); + int pos2 = line.tqfind( "]", ++pos1 ); if ( pos2 < 0 ) return false; key = line.mid( pos1, pos2 - pos1 ); - int pos3 = key.find( "'" ); + int pos3 = key.tqfind( "'" ); if ( pos3 >= 0 ) { - int pos4 = key.find( "'", ++pos3 ); + int pos4 = key.tqfind( "'", ++pos3 ); if ( pos4 >= 0 ) key = key.mid( pos3, pos4 - pos3 ); } // kdDebug() << " KEY: " << key << endl; - pos1 = line.find( "'", ++pos2 ); - if ( pos1 >= 0 ) pos2 = line.find( "'", ++pos1 ); + pos1 = line.tqfind( "'", ++pos2 ); + if ( pos1 >= 0 ) pos2 = line.tqfind( "'", ++pos1 ); while ( pos1 >= 0 && pos2 >= 0 ) { TQString value = line.mid( pos1, pos2 - pos1 ); @@ -136,8 +136,8 @@ bool HtmlParser::getCpts( const TQString &line, TQString &key, values.append( value ); - pos1 = line.find( "'", ++pos2 ); - if ( pos1 >= 0 ) pos2 = line.find( "'", ++pos1 ); + pos1 = line.tqfind( "'", ++pos2 ); + if ( pos1 >= 0 ) pos2 = line.tqfind( "'", ++pos1 ); } return true; @@ -153,7 +153,7 @@ KBB::Error HtmlParser_2_10::parseLine( const TQString &line, Bug::List &bugs ) // kdDebug() << " NUMBER: " << number << endl; TQString summary; - int pos = line.findRev( "summary>" ); + int pos = line.tqfindRev( "summary>" ); if ( pos >= 0 ) summary = line.mid( pos + 8 ); Bug bug( new BugImpl( summary, Person(), number, 0xFFFFFFFF, Bug::SeverityUndefined, @@ -248,13 +248,13 @@ KBB::Error HtmlParser_2_17_1::parseLine( const TQString &line, Package::List & ) switch ( mState ) { case Idle: case SearchComponents: - if ( line.contains( "var cpts" ) ) mState = Components; + if ( line.tqcontains( "var cpts" ) ) mState = Components; break; case SearchProducts: - if ( line.contains( "onchange=\"selectProduct" ) ) mState = Products; + if ( line.tqcontains( "onchange=\"selectProduct" ) ) mState = Products; break; case Components: { - if ( line.contains( TQRegExp( "\\s*function" ) ) ) { + if ( line.tqcontains( TQRegExp( "\\s*function" ) ) ) { mState = SearchProducts; } TQString key; @@ -264,7 +264,7 @@ KBB::Error HtmlParser_2_17_1::parseLine( const TQString &line, Package::List & ) } } case Products: { - if ( line.contains( "</select>" ) ) mState = Finished; + if ( line.tqcontains( "</select>" ) ) mState = Finished; TQString product = getAttribute( line, "value" ); if ( !product.isEmpty() ) { kdDebug() << "PRODUCT: " << product << endl; diff --git a/kbugbuster/backend/htmlparser.h b/kbugbuster/backend/htmlparser.h index b8ad2c6f..fb4f7c2f 100644 --- a/kbugbuster/backend/htmlparser.h +++ b/kbugbuster/backend/htmlparser.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef HTMLPARSER_H #define HTMLPARSER_H diff --git a/kbugbuster/backend/kbbprefs.cpp b/kbugbuster/backend/kbbprefs.cpp index cfef3418..7b6dbb7b 100644 --- a/kbugbuster/backend/kbbprefs.cpp +++ b/kbugbuster/backend/kbbprefs.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqstring.h> @@ -54,7 +54,7 @@ KBBPrefs::KBBPrefs() : KConfigSkeleton() addItemBool("ShowVotes", mShowVoted, false); addItemInt("MinimumVotes", mMinVotes, 0); addItemBool("SendBCC",mSendBCC,false); - addItemString("OverrideRecipient",mOverrideRecipient,TQString::null); + addItemString("OverrideRecipient",mOverrideRecipient,TQString()); addItemInt("WrapColumn",mWrapColumn,90); diff --git a/kbugbuster/backend/kbbprefs.h b/kbugbuster/backend/kbbprefs.h index da70c959..87dfacd8 100644 --- a/kbugbuster/backend/kbbprefs.h +++ b/kbugbuster/backend/kbbprefs.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KBBPREFS_H #define KBBPREFS_H diff --git a/kbugbuster/backend/mailsender.cpp b/kbugbuster/backend/mailsender.cpp index 59f73db2..58ed6c93 100644 --- a/kbugbuster/backend/mailsender.cpp +++ b/kbugbuster/backend/mailsender.cpp @@ -1,5 +1,5 @@ -#ifndef QT_NO_ASCII_CAST -#define QT_NO_ASCII_CAST +#ifndef TQT_NO_ASCII_CAST +#define TQT_NO_ASCII_CAST #endif #include <unistd.h> @@ -39,7 +39,7 @@ bool MailSender::send(const TQString &fromName,const TQString &fromEmail,const T { TQString from( fromName ); if ( !fromEmail.isEmpty() ) - from += TQString::fromLatin1( " <%2>" ).arg( fromEmail ); + from += TQString::tqfromLatin1( " <%2>" ).tqarg( fromEmail ); kdDebug() << "MailSender::sendMail():\nFrom: " << from << "\nTo: " << to << "\nbccflag:" << bcc << "\nRecipient:" << recipient @@ -53,18 +53,18 @@ bool MailSender::send(const TQString &fromName,const TQString &fromEmail,const T bool needHeaders = true; - TQString command = KStandardDirs::findExe(TQString::fromLatin1("sendmail"), - TQString::fromLatin1("/sbin:/usr/sbin:/usr/lib")); - if (!command.isNull()) command += TQString::fromLatin1(" -oi -t"); + TQString command = KStandardDirs::findExe(TQString::tqfromLatin1("sendmail"), + TQString::tqfromLatin1("/sbin:/usr/sbin:/usr/lib")); + if (!command.isNull()) command += TQString::tqfromLatin1(" -oi -t"); else { - command = KStandardDirs::findExe(TQString::fromLatin1("mail")); + command = KStandardDirs::findExe(TQString::tqfromLatin1("mail")); if (command.isNull()) return false; // give up - command.append(TQString::fromLatin1(" -s ")); + command.append(TQString::tqfromLatin1(" -s ")); command.append(KProcess::quote(subject)); if (bcc) { - command.append(TQString::fromLatin1(" -b ")); + command.append(TQString::tqfromLatin1(" -b ")); command.append(KProcess::quote(from)); } @@ -85,11 +85,11 @@ bool MailSender::send(const TQString &fromName,const TQString &fromEmail,const T TQString textComplete; if (needHeaders) { - textComplete += TQString::fromLatin1("From: ") + from + '\n'; - textComplete += TQString::fromLatin1("To: ") + to + '\n'; - if (bcc) textComplete += TQString::fromLatin1("Bcc: ") + from + '\n'; - textComplete += TQString::fromLatin1("Subject: ") + subject + '\n'; - textComplete += TQString::fromLatin1("X-Mailer: KBugBuster") + '\n'; + textComplete += TQString::tqfromLatin1("From: ") + from + '\n'; + textComplete += TQString::tqfromLatin1("To: ") + to + '\n'; + if (bcc) textComplete += TQString::tqfromLatin1("Bcc: ") + from + '\n'; + textComplete += TQString::tqfromLatin1("Subject: ") + subject + '\n'; + textComplete += TQString::tqfromLatin1("X-Mailer: KBugBuster") + '\n'; } textComplete += '\n'; // end of headers textComplete += body; @@ -121,11 +121,11 @@ bool MailSender::send(const TQString &fromName,const TQString &fromEmail,const T else recipients << to; - TQString message = TQString::fromLatin1( "From: " ) + from + - TQString::fromLatin1( "\nTo: " ) + to + - TQString::fromLatin1( "\nSubject: " ) + subject + - TQString::fromLatin1( "\nX-Mailer: KBugBuster" ) + - TQString::fromLatin1( "\n\n" ) + body; + TQString message = TQString::tqfromLatin1( "From: " ) + from + + TQString::tqfromLatin1( "\nTo: " ) + to + + TQString::tqfromLatin1( "\nSubject: " ) + subject + + TQString::tqfromLatin1( "\nX-Mailer: KBugBuster" ) + + TQString::tqfromLatin1( "\n\n" ) + body; Smtp *smtp = new Smtp( fromEmail, recipients, message, m_smtpServer ); connect( smtp, TQT_SIGNAL( status( const TQString & ) ), @@ -151,29 +151,29 @@ bool MailSender::send(const TQString &fromName,const TQString &fromEmail,const T void MailSender::smtpSuccess() { - if ( parent() != sender() || !parent()->inherits( "Smtp" ) ) + if ( tqparent() != sender() || !tqparent()->inherits( "Smtp" ) ) return; - static_cast<Smtp *>( parent() )->quit(); + static_cast<Smtp *>( tqparent() )->quit(); emit finished(); } void MailSender::smtpError(const TQString &_command, const TQString &_response) { - if ( parent() != sender() || !parent()->inherits( "Smtp" ) ) + if ( tqparent() != sender() || !tqparent()->inherits( "Smtp" ) ) return; TQString command = _command; TQString response = _response; - Smtp *smtp = static_cast<Smtp *>( parent() ); + Smtp *smtp = static_cast<Smtp *>( tqparent() ); smtp->removeChild( this ); delete smtp; - KMessageBox::error( qApp->activeWindow(), + KMessageBox::error( TQT_TQWIDGET(tqApp->activeWindow()), i18n( "Error during SMTP transfer.\n" "command: %1\n" - "response: %2" ).arg( command ).arg( response ) ); + "response: %2" ).tqarg( command ).tqarg( response ) ); emit finished(); TQTimer::singleShot( 0, this, TQT_SLOT( deleteLater() ) ); diff --git a/kbugbuster/backend/mailsender.h b/kbugbuster/backend/mailsender.h index 5df42c2a..b8a40d18 100644 --- a/kbugbuster/backend/mailsender.h +++ b/kbugbuster/backend/mailsender.h @@ -7,13 +7,14 @@ class KURL; class Smtp; -class MailSender : public QObject +class MailSender : public TQObject { Q_OBJECT + TQ_OBJECT public: enum MailClient { Sendmail = 0, KMail = 1, Direct = 2 }; - MailSender(MailClient,const TQString &smtpServer=TQString::null); + MailSender(MailClient,const TQString &smtpServer=TQString()); virtual ~MailSender(); MailSender *clone() const; @@ -28,7 +29,7 @@ class MailSender : public QObject bool send(const TQString &fromName, const TQString &fromEmail, const TQString &to,const TQString &subject, const TQString &body,bool bcc=false, - const TQString &recipient = TQString::null); + const TQString &recipient = TQString()); signals: void status( const TQString &message ); diff --git a/kbugbuster/backend/package.cpp b/kbugbuster/backend/package.cpp index bc9bb6fe..0eed41db 100644 --- a/kbugbuster/backend/package.cpp +++ b/kbugbuster/backend/package.cpp @@ -30,7 +30,7 @@ Package::~Package() TQString Package::name() const { if ( !m_impl ) - return TQString::null; + return TQString(); return m_impl->name; } @@ -38,7 +38,7 @@ TQString Package::name() const TQString Package::description() const { if ( !m_impl ) - return TQString::null; + return TQString(); return m_impl->description; } diff --git a/kbugbuster/backend/packagelistjob.cpp b/kbugbuster/backend/packagelistjob.cpp index 8ebf077e..ce779c10 100644 --- a/kbugbuster/backend/packagelistjob.cpp +++ b/kbugbuster/backend/packagelistjob.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "packagelistjob.h" diff --git a/kbugbuster/backend/packagelistjob.h b/kbugbuster/backend/packagelistjob.h index 6267158a..c0176911 100644 --- a/kbugbuster/backend/packagelistjob.h +++ b/kbugbuster/backend/packagelistjob.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef __packagelistjob_h__ @@ -34,6 +34,7 @@ class PackageListJob : public BugJob { Q_OBJECT + TQ_OBJECT public: PackageListJob( BugServer * ); virtual ~PackageListJob(); diff --git a/kbugbuster/backend/person.cpp b/kbugbuster/backend/person.cpp index 40cf72b7..368ea07c 100644 --- a/kbugbuster/backend/person.cpp +++ b/kbugbuster/backend/person.cpp @@ -4,7 +4,7 @@ Person::Person( const TQString &fullName ) { - int emailPos = fullName.find( '<' ); + int emailPos = fullName.tqfind( '<' ); if ( emailPos < 0 ) { email = fullName; } else { @@ -41,10 +41,10 @@ Person Person::parseFromString( const TQString &_str ) TQString str = _str; - int ltPos = str.find( '<' ); + int ltPos = str.tqfind( '<' ); if ( ltPos != -1 ) { - int gtPos = str.find( '>', ltPos ); + int gtPos = str.tqfind( '>', ltPos ); if ( gtPos != -1 ) { res.name = str.left( ltPos - 1 ); @@ -52,16 +52,16 @@ Person Person::parseFromString( const TQString &_str ) } } - int atPos = str.find( '@' ); - int spacedAtPos = str.find( TQString::fromLatin1( " at " ) ); + int atPos = str.tqfind( '@' ); + int spacedAtPos = str.tqfind( TQString::tqfromLatin1( " at " ) ); if ( atPos == -1 && spacedAtPos != -1 ) - str.replace( spacedAtPos, 4, TQString::fromLatin1( "@" ) ); + str.tqreplace( spacedAtPos, 4, TQString::tqfromLatin1( "@" ) ); - int spacePos = str.find( ' ' ); + int spacePos = str.tqfind( ' ' ); while ( spacePos != -1 ) { str[ spacePos ] = '.'; - spacePos = str.find( ' ', spacePos ); + spacePos = str.tqfind( ' ', spacePos ); } res.email = str; diff --git a/kbugbuster/backend/processor.cpp b/kbugbuster/backend/processor.cpp index c030761d..b6023442 100644 --- a/kbugbuster/backend/processor.cpp +++ b/kbugbuster/backend/processor.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqstylesheet.h> diff --git a/kbugbuster/backend/processor.h b/kbugbuster/backend/processor.h index 8eee8ebf..d3d8eae0 100644 --- a/kbugbuster/backend/processor.h +++ b/kbugbuster/backend/processor.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KBB_PROCESSOR_H #define KBB_PROCESSOR_H diff --git a/kbugbuster/backend/rdfprocessor.cpp b/kbugbuster/backend/rdfprocessor.cpp index 3832e899..3beed42f 100644 --- a/kbugbuster/backend/rdfprocessor.cpp +++ b/kbugbuster/backend/rdfprocessor.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "rdfprocessor.h" @@ -54,7 +54,7 @@ KBB::Error RdfProcessor::parseDomBugList( const TQDomElement &element, TQString title; Person submitter; TQString bugNr; - Bug::Status status = Bug::StatusUndefined; + Bug::tqStatus status = Bug::StatusUndefined; Bug::Severity severity = Bug::SeverityUndefined; Person developerTodo; Bug::BugMergeList mergedList; @@ -68,7 +68,7 @@ KBB::Error RdfProcessor::parseDomBugList( const TQDomElement &element, if ( e.tagName() == "bz:id" ) { bugNr = e.text(); } else if ( e.tagName() == "bz:status" ) { - status = server()->bugStatus( e.text() ); + status = server()->bugtqStatus( e.text() ); } else if ( e.tagName() == "bz:severity" ) { severity = server()->bugSeverity( e.text() ); } else if ( e.tagName() == "bz:summary" ) { diff --git a/kbugbuster/backend/rdfprocessor.h b/kbugbuster/backend/rdfprocessor.h index 18406323..fcc8c5b7 100644 --- a/kbugbuster/backend/rdfprocessor.h +++ b/kbugbuster/backend/rdfprocessor.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef RDFPROCESSOR_H #define RDFPROCESSOR_H diff --git a/kbugbuster/backend/smtp.cpp b/kbugbuster/backend/smtp.cpp index b297af20..2496e57b 100644 --- a/kbugbuster/backend/smtp.cpp +++ b/kbugbuster/backend/smtp.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** This file is a modified version of part of an example program for Qt. +** This file is a modified version of part of an example program for TQt. ** This file may be used, distributed and modified without limitation. ** ** Don Sanders <sanders@kde.org> @@ -37,7 +37,7 @@ Smtp::Smtp( const TQString &from, const TQStringList &to, state = smtpInit; command = ""; - emit status( i18n( "Connecting to %1" ).arg( server ) ); + emit status( i18n( "Connecting to %1" ).tqarg( server ) ); mSocket->connectToHost( server, port ); t = new TQTextStream( mSocket ); @@ -79,7 +79,7 @@ void Smtp::quit() void Smtp::connected() { - emit status( i18n( "Connected to %1" ).arg( mSocket->peerName() ) ); + emit status( i18n( "Connected to %1" ).tqarg( mSocket->peerName() ) ); } void Smtp::socketError(int errorCode) @@ -149,8 +149,8 @@ void Smtp::readyRead() } else if ( state == smtpSuccess && responseLine[0] == '2' ) { TQTimer::singleShot( 0, this, TQT_SIGNAL(success()) ); } else if ( state == smtpQuit && responseLine[0] == '2' ) { - command = "QUIT"; - *t << "QUIT\r\n"; + command = "TQUIT"; + *t << "TQUIT\r\n"; // here, we just close. state = smtpClose; emit status( i18n( "Message sent" ) ); diff --git a/kbugbuster/backend/smtp.h b/kbugbuster/backend/smtp.h index f94e7660..be99d146 100644 --- a/kbugbuster/backend/smtp.h +++ b/kbugbuster/backend/smtp.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** This file is a modified version of part of an example program for Qt. +** This file is a modified version of part of an example program for TQt. ** This file may be used, distributed and modified without limitation. ** ** Don Sanders <sanders@kde.org> @@ -17,9 +17,10 @@ class TQSocket; class TQTextStream; -class Smtp : public QObject +class Smtp : public TQObject { Q_OBJECT + TQ_OBJECT public: Smtp( const TQString &from, const TQStringList &to, const TQString &message, diff --git a/kbugbuster/gui/buglvi.cpp b/kbugbuster/gui/buglvi.cpp index 18d7c064..320462ff 100644 --- a/kbugbuster/gui/buglvi.cpp +++ b/kbugbuster/gui/buglvi.cpp @@ -27,8 +27,8 @@ using namespace KBugBusterMainWindow; -BugLVI::BugLVI( KListView *parent , const Bug &bug ) -: KListViewItem( parent, bug.number() + " ", +BugLVI::BugLVI( KListView *tqparent , const Bug &bug ) +: KListViewItem( tqparent, bug.number() + " ", i18n( "1 day", "%n days", bug.age() ), bug.title(), //KStringHandler::csqueeze( bug.title(), 70 ), Bug::statusLabel( bug.status() ), @@ -45,7 +45,7 @@ BugLVI::BugLVI( KListView *parent , const Bug &bug ) Person developer = bug.developerTODO(); if ( !developer.name.isEmpty() ) - setText( 3, i18n( "%1 (%2)" ).arg( Bug::statusLabel( bug.status() ), developer.name ) ); + setText( 3, i18n( "%1 (%2)" ).tqarg( Bug::statusLabel( bug.status() ), developer.name ) ); } BugLVI::~BugLVI() diff --git a/kbugbuster/gui/buglvi.h b/kbugbuster/gui/buglvi.h index 5f66f398..94b91299 100644 --- a/kbugbuster/gui/buglvi.h +++ b/kbugbuster/gui/buglvi.h @@ -31,7 +31,7 @@ namespace KBugBusterMainWindow class BugLVI : public KListViewItem { public: - BugLVI( KListView *parent , const Bug &bug ); + BugLVI( KListView *tqparent , const Bug &bug ); ~BugLVI(); Bug& bug() { return m_bug; } diff --git a/kbugbuster/gui/centralwidget.cpp b/kbugbuster/gui/centralwidget.cpp index f90564f1..6ceebe0f 100644 --- a/kbugbuster/gui/centralwidget.cpp +++ b/kbugbuster/gui/centralwidget.cpp @@ -48,18 +48,18 @@ using namespace KBugBusterMainWindow; CentralWidget::CentralWidget( const TQCString &initialPackage, const TQCString &initialComponent, - const TQCString &initialBug, TQWidget *parent, + const TQCString &initialBug, TQWidget *tqparent, const char * name ) - : TQWidget( parent, name ) + : TQWidget( tqparent, name ) { - // Master layout + // Master tqlayout ( new TQVBoxLayout( this, 0, KDialog::spacingHint() ) )->setAutoAdd( true ); - // Create TQSplitter children - m_vertSplitter = new TQSplitter( TQSplitter::Vertical, this ); + // Create TQSplitter tqchildren + m_vertSplitter = new TQSplitter( Qt::Vertical, this ); m_listPane = new CWBugListContainer( m_vertSplitter ); - m_horSplitter = new TQSplitter( TQSplitter::Horizontal,m_vertSplitter ); + m_horSplitter = new TQSplitter( Qt::Horizontal,m_vertSplitter ); // The search pane isn't used. Should we remove the code? m_searchPane = new CWSearchWidget( m_horSplitter ); m_bugPane = new CWBugDetailsContainer( m_horSplitter ); @@ -67,7 +67,7 @@ CentralWidget::CentralWidget( const TQCString &initialPackage, m_searchPane->hide(); // m_listPane->hide(); - m_searchPane->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, + m_searchPane->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); m_horSplitter->setResizeMode( m_searchPane, TQSplitter::FollowSizeHint ); @@ -188,7 +188,7 @@ void CentralWidget::writeConfig() void CentralWidget::slotRetrieveBugList( const TQString &package ) { - slotRetrieveBugList( package, TQString::null ); + slotRetrieveBugList( package, TQString() ); } void CentralWidget::slotRetrieveBugList( const TQString &p, const TQString &component ) @@ -296,14 +296,14 @@ void CentralWidget::updateBugDetails( const Bug &bug, const BugDetails &bd ) void CentralWidget::slotReloadPackageList() { - BugSystem::self()->cache()->invalidatePackageList(); + BugSystem::self()->cache()->tqinvalidatePackageList(); BugSystem::self()->retrievePackageList(); } void CentralWidget::slotReloadPackage() { if (!m_currentPackage.isNull()) { - BugSystem::self()->cache()->invalidateBugList( m_currentPackage, m_currentComponent ); + BugSystem::self()->cache()->tqinvalidateBugList( m_currentPackage, m_currentComponent ); BugSystem::self()->retrieveBugList( m_currentPackage, m_currentComponent ); } } @@ -316,7 +316,7 @@ void CentralWidget::slotLoadMyBugs() void CentralWidget::slotReloadBug() { if (!m_currentBug.isNull()) { - BugSystem::self()->cache()->invalidateBugDetails( m_currentBug ); + BugSystem::self()->cache()->tqinvalidateBugDetails( m_currentBug ); BugSystem::self()->retrieveBugDetails( m_currentBug ); } } @@ -340,11 +340,11 @@ void CentralWidget::slotExtractAttachments() for ( TQValueList<BugDetails::Attachment>::Iterator it = attachments.begin() ; it != attachments.end() ; ++it ) { // Handle duplicates - if ( fileList.contains( (*it).filename ) ) + if ( fileList.tqcontains( (*it).filename ) ) { int n = 2; // looks stupid to have "blah" and "1-blah", start at 2 TQString fn = TQString::number(n) + '-' + (*it).filename; - while ( fileList.contains( fn ) ) + while ( fileList.tqcontains( fn ) ) { ++n; fn = TQString::number(n) + '-' + (*it).filename; @@ -356,10 +356,10 @@ void CentralWidget::slotExtractAttachments() int res = KMessageBox::questionYesNoList( this, i18n("Found the following attachments. Save?"), - fileList, TQString::null, KStdGuiItem::save(), KStdGuiItem::dontSave() ); + fileList, TQString(), KStdGuiItem::save(), KStdGuiItem::dontSave() ); if ( res == KMessageBox::No ) return; - TQString dir = KFileDialog::getExistingDirectory( TQString::null, this, i18n("Select Folder Where to Save Attachments") ); + TQString dir = KFileDialog::getExistingDirectory( TQString(), this, i18n("Select Folder Where to Save Attachments") ); if ( !dir.isEmpty() ) { if ( !dir.endsWith( "/" ) ) diff --git a/kbugbuster/gui/centralwidget.h b/kbugbuster/gui/centralwidget.h index a11d6d5f..9a4f3574 100644 --- a/kbugbuster/gui/centralwidget.h +++ b/kbugbuster/gui/centralwidget.h @@ -37,19 +37,20 @@ class CWBugDetails; /** * @author Martijn Klingens */ -class CentralWidget : public QWidget +class CentralWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: CentralWidget( const TQCString &initialPackage, const TQCString &initalComponent,const TQCString& initialBug, - TQWidget* parent = 0, const char* name = 0 ); + TQWidget* tqparent = 0, const char* name = 0 ); ~CentralWidget(); - void initialize( const TQString &initialPackage = TQString::null, - const TQString &initalComponent = TQString::null, - const TQString &initialBug = TQString::null ); + void initialize( const TQString &initialPackage = TQString(), + const TQString &initalComponent = TQString(), + const TQString &initialBug = TQString() ); void readConfig(); void writeConfig(); diff --git a/kbugbuster/gui/centralwidget_base.ui b/kbugbuster/gui/centralwidget_base.ui index d2f707de..c7e36fe2 100644 --- a/kbugbuster/gui/centralwidget_base.ui +++ b/kbugbuster/gui/centralwidget_base.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>CentralWidget_Base</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CentralWidget_Base</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -22,7 +22,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_searchGroup</cstring> </property> @@ -39,7 +39,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>m_searchContainer</cstring> </property> @@ -61,7 +61,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QWidgetStack"> + <widget class="TQWidgetStack"> <property name="name"> <cstring>m_searchStack</cstring> </property> @@ -74,7 +74,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel9</cstring> </property> @@ -85,7 +85,7 @@ <cstring>m_searchBugNumber</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout17</cstring> </property> @@ -99,7 +99,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_searchBugNumber</cstring> </property> @@ -112,7 +112,7 @@ </sizepolicy> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_searchBugNumberBtn</cstring> </property> @@ -133,7 +133,7 @@ </widget> </hbox> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel7</cstring> </property> @@ -144,7 +144,7 @@ <cstring>m_searchDesc</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout15</cstring> </property> @@ -158,7 +158,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_searchDesc</cstring> </property> @@ -171,7 +171,7 @@ </sizepolicy> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_searchDescBtn</cstring> </property> @@ -196,7 +196,7 @@ </widget> </vbox> </widget> - <widget class="QSplitter"> + <widget class="TQSplitter"> <property name="name"> <cstring>m_splitter</cstring> </property> @@ -209,7 +209,7 @@ <customwidgets> <customwidget> <class>QWidgetStack</class> - <header location="global">qwidgetstack.h</header> + <header location="global">tqwidgetstack.h</header> <sizehint> <width>-1</width> <height>-1</height> @@ -232,5 +232,5 @@ <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kbugbuster/gui/cwbugdetails.cpp b/kbugbuster/gui/cwbugdetails.cpp index eca64758..6c6115c1 100644 --- a/kbugbuster/gui/cwbugdetails.cpp +++ b/kbugbuster/gui/cwbugdetails.cpp @@ -35,8 +35,8 @@ using namespace KBugBusterMainWindow; -CWBugDetails::CWBugDetails( TQWidget *parent , const char * name ) - : TQWidget( parent, name ) +CWBugDetails::CWBugDetails( TQWidget *tqparent , const char * name ) + : TQWidget( tqparent, name ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); @@ -53,7 +53,7 @@ CWBugDetails::~CWBugDetails() void CWBugDetails::setBug( const Bug &bug, const BugDetails &details ) { - TQColorGroup cg = m_bugDesc->view()->palette().active(); + TQColorGroup cg = m_bugDesc->view()->tqpalette().active(); TQString text = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\">\n" "<html><head><title></title></head>\n" @@ -65,25 +65,25 @@ void CWBugDetails::setBug( const Bug &bug, const BugDetails &details ) "td.helpBod { border-bottom: 1px solid #9CF; border-top: 0px; border-left: 1px solid #9CF; border-right: 0px; text-align: center; text-indent: 10px; font-family: Verdana, sans-serif, Arial; font-weight: normal; font-size: 11px; color: #404040; background-color: #000000; }\n" "table.sofT { text-align: center; font-family: Verdana; font-weight: normal; font-size: 11px; color: #404040; width: 100%; background-color: #fafafa; border: 1px #000000 solid; border-collapse: collapse; border-spacing: 0px; }\n" "</style>\n" ) - .arg( cg.highlight().name() ) - .arg( cg.highlightedText().name() ) ); + .tqarg( cg.highlight().name() ) + .tqarg( cg.highlightedText().name() ) ); text.append( "<body style=\"margin: 0px\">\n" ); TQString highlightStyle = TQString( "background: %1; color: %2; " ) - .arg( cg.highlight().name() ) - .arg( cg.highlightedText().name() ); + .tqarg( cg.highlight().name() ) + .tqarg( cg.highlightedText().name() ); TQString borderBottomStyle = TQString( "border-bottom: solid %1 1px; " ) - .arg( cg.foreground().name() ); + .tqarg( cg.foreground().name() ); TQString borderTopStyle = TQString( "border-top: solid %1 1px; " ) - .arg( cg.foreground().name() ); + .tqarg( cg.foreground().name() ); TQString submitter = bug.submitter().fullName( true ); int age = details.age(); text.append( "<div style=\"" + highlightStyle + "padding: 8px; float: left\">" ); text.append( "<a href=\"" + BugSystem::self()->server()->bugLink( bug ).url() + "\">" + i18n("Bug Report</a> from <b>%1</b> " ) - .arg( submitter ) ); + .tqarg( submitter ) ); int replies = details.parts().count() - 1; if ( replies >= 1 ) text += i18n( "(1 reply)", "(%n replies)", replies ); text += "</div>"; @@ -97,8 +97,8 @@ void CWBugDetails::setBug( const Bug &bug, const BugDetails &details ) "border-bottom: solid %3 1px; " "padding: 4px\">" "<table cellspacing=\"0\" cellpadding=\"4\" width=\"100%\">" ) - .arg( cg.background().name() ) - .arg( cg.foreground().name() ) ); + .tqarg( cg.background().name() ) + .tqarg( cg.foreground().name() ) ); text.append( textBugDetailsAttribute( details.version(), i18n("Version") ) ); text.append( textBugDetailsAttribute( details.source(), i18n("Source") ) ); text.append( textBugDetailsAttribute( details.compiler(), i18n("Compiler") ) ); @@ -121,11 +121,11 @@ void CWBugDetails::setBug( const Bug &bug, const BugDetails &details ) if ( ++it2 == bdp.end() ) text.append( "<a href=\"" + BugSystem::self()->server()->bugLink( bug ).url() + "\">" + i18n("Bug Report</a> from <b>%1</b>") - .arg( sender ) ); + .tqarg( sender ) ); else { - text.append( "<a href=\"" + BugSystem::self()->server()->bugLink( bug ).url() + TQString("#c%1").arg( replies ) + text.append( "<a href=\"" + BugSystem::self()->server()->bugLink( bug ).url() + TQString("#c%1").tqarg( replies ) + "\">" + i18n("Reply #%1</a> from <b>%2</b>") - .arg( replies ).arg( sender ) ); + .tqarg( replies ).tqarg( sender ) ); replies--; } text.append( "</div>\n" ); @@ -148,16 +148,16 @@ void CWBugDetails::setBug( const Bug &bug, const BugDetails &details ) if ( atts.count() > 0 ) { text.append( "<table summary=\"Attachment data table\" class=\"sofT\" cellspacing=\"0\">" ); text.append( TQString( "<tr> <td colspan=\"4\" class=\"helpHed\">%1</td> </tr>") - .arg( i18n( "Attachment List") ) ); + .tqarg( i18n( "Attachment List") ) ); text.append( TQString("<tr> <td class=\"helpHed\">%1</td> <td class=\"helpHed\">%2</td> <td class=\"helpHed\">%3</td> <td class=\"helpHed\">%4</td> </tr>") - .arg( i18n("Description") ) - .arg( i18n("Date") ) - .arg( i18n("View") ) - .arg( i18n("Edit") ) ); + .tqarg( i18n("Description") ) + .tqarg( i18n("Date") ) + .tqarg( i18n("View") ) + .tqarg( i18n("Edit") ) ); TQValueList<BugDetailsImpl::AttachmentDetails>::iterator it; for ( it = atts.begin() ; it != atts.end() ; ++it ) { - text.append( TQString("<tr><td>%1</td>").arg( (*it).description ) ) ; - text.append( TQString("<td>%1</td>").arg( (*it).date ) ); + text.append( TQString("<tr><td>%1</td>").tqarg( (*it).description ) ) ; + text.append( TQString("<td>%1</td>").tqarg( (*it).date ) ); text.append( "<td><a href=\"" + BugSystem::self()->server()->attachmentViewLink( (*it).id ).url() + "\">" + i18n("View") + "</a></td>" ); diff --git a/kbugbuster/gui/cwbugdetails.h b/kbugbuster/gui/cwbugdetails.h index e80d340f..169899c3 100644 --- a/kbugbuster/gui/cwbugdetails.h +++ b/kbugbuster/gui/cwbugdetails.h @@ -32,12 +32,13 @@ namespace KBugBusterMainWindow /** * @author Martijn Klingens */ -class CWBugDetails : public QWidget +class CWBugDetails : public TQWidget { Q_OBJECT + TQ_OBJECT public: - CWBugDetails( TQWidget* parent = 0, const char* name = 0 ); + CWBugDetails( TQWidget* tqparent = 0, const char* name = 0 ); ~CWBugDetails(); void setBug( const Bug &, const BugDetails & ); diff --git a/kbugbuster/gui/cwbugdetailscontainer.cpp b/kbugbuster/gui/cwbugdetailscontainer.cpp index 7b57ec1b..89611ca0 100644 --- a/kbugbuster/gui/cwbugdetailscontainer.cpp +++ b/kbugbuster/gui/cwbugdetailscontainer.cpp @@ -36,8 +36,8 @@ using namespace KBugBusterMainWindow; -CWBugDetailsContainer::CWBugDetailsContainer( TQWidget *parent , const char * name ) -: CWBugDetailsContainer_Base( parent, name ) +CWBugDetailsContainer::CWBugDetailsContainer( TQWidget *tqparent , const char * name ) +: CWBugDetailsContainer_Base( tqparent, name ) { // Do some stuff Designer can't do: m_bugCloseBtn->setIconSet( BarIconSet( "edittrash" ) ); @@ -121,17 +121,17 @@ void CWBugDetailsContainer::setBug( const Bug &bug, const BugDetails &details ) list.truncate( list.length()-2 ); //Strip off the last ", " labelText = i18n("bug #number [Merged with: a list of bugs] (severity): title","Bug #%1 [Merged with: %2] (%3): %4") - .arg( bug.number() ) - .arg( list ) - .arg( bug.severityAsString() ) - .arg( bug.title() ); + .tqarg( bug.number() ) + .tqarg( list ) + .tqarg( bug.severityAsString() ) + .tqarg( bug.title() ); } else { labelText = i18n("bug #number (severity): title","Bug #%1 (%2): %3") - .arg( bug.number() ).arg( bug.severityAsString() ) - .arg( bug.title() ); + .tqarg( bug.number() ).tqarg( bug.severityAsString() ) + .tqarg( bug.title() ); } m_bugLabel->setText( KStringHandler::tagURLs( labelText ) ); @@ -158,7 +158,7 @@ void CWBugDetailsContainer::showCommands( const Bug& bug ) if (!first) cmdText += " | "; // separator in case of multiple commands first = false; - cmdText += TQString("<b>%1</b>").arg( cmd->name() ); + cmdText += TQString("<b>%1</b>").tqarg( cmd->name() ); if (!cmdDetails.isEmpty()) cmdDetails += " | "; // separator in case of multiple commands cmdDetails += cmd->details(); @@ -212,7 +212,7 @@ void CWBugDetailsContainer::setLoading( const Bug &bug ) showCommands( bug ); m_bugLoading->setText(i18n( "Retrieving Details for Bug %1\n\n(%2)" ) - .arg( bug.number() ).arg( bug.title() ) ); + .tqarg( bug.number() ).tqarg( bug.title() ) ); m_bugStack->raiseWidget( 1 ); } @@ -224,11 +224,11 @@ void CWBugDetailsContainer::setCacheMiss( const Bug &bug ) TQString msg; if( BugSystem::self()->disconnected() ) msg = i18n( "Bug #%1 (%2) is not available offline." ). - arg( bug.number() ).arg( bug.title() ); + tqarg( bug.number() ).tqarg( bug.title() ); else msg = i18n( "Retrieving details for bug #%1\n" "(%2)" ). - arg( bug.number() ).arg( bug.title() ); + tqarg( bug.number() ).tqarg( bug.title() ); m_bugLoading->setText( msg ); m_bugStack->raiseWidget( 1 ); } diff --git a/kbugbuster/gui/cwbugdetailscontainer.h b/kbugbuster/gui/cwbugdetailscontainer.h index 670d3593..8fedf8bb 100644 --- a/kbugbuster/gui/cwbugdetailscontainer.h +++ b/kbugbuster/gui/cwbugdetailscontainer.h @@ -36,9 +36,10 @@ class CWLoadingWidget; class CWBugDetailsContainer : public CWBugDetailsContainer_Base { Q_OBJECT + TQ_OBJECT public: - CWBugDetailsContainer( TQWidget* parent = 0, const char* name = 0 ); + CWBugDetailsContainer( TQWidget* tqparent = 0, const char* name = 0 ); ~CWBugDetailsContainer(); void setBug( const Bug &, const BugDetails & ); diff --git a/kbugbuster/gui/cwbugdetailscontainer_base.ui b/kbugbuster/gui/cwbugdetailscontainer_base.ui index c5ef87b7..61214c34 100644 --- a/kbugbuster/gui/cwbugdetailscontainer_base.ui +++ b/kbugbuster/gui/cwbugdetailscontainer_base.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>CWBugDetailsContainer_Base</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CWBugDetailsContainer_Base</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -22,7 +22,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QWidgetStack" row="1" column="0"> + <widget class="TQWidgetStack" row="1" column="0"> <property name="name"> <cstring>m_bugStack</cstring> </property> @@ -35,7 +35,7 @@ </sizepolicy> </property> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout5</cstring> </property> @@ -61,7 +61,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>20</height> @@ -71,7 +71,7 @@ <string>Bug Title</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_cmdLabel</cstring> </property> @@ -81,7 +81,7 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -95,7 +95,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_cmdClearBtn</cstring> </property> @@ -114,7 +114,7 @@ <enum>Expanding</enum> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_bugCloseBtn</cstring> </property> @@ -125,7 +125,7 @@ <string>C&lose...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_bugCloseSilentlyBtn</cstring> </property> @@ -136,7 +136,7 @@ <string>Close Silentl&y</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_bugReopenBtn</cstring> </property> @@ -147,7 +147,7 @@ <string>Re&open</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_bugReassignBtn</cstring> </property> @@ -158,7 +158,7 @@ <string>Re&assign...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_bugTitleBtn</cstring> </property> @@ -169,7 +169,7 @@ <string>Change &Title...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_bugSeverityBtn</cstring> </property> @@ -191,7 +191,7 @@ <enum>Expanding</enum> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_bugReplyBtn</cstring> </property> @@ -202,7 +202,7 @@ <string>&Reply...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_bugReplyPrivBtn</cstring> </property> @@ -220,7 +220,7 @@ <customwidgets> <customwidget> <class>QWidgetStack</class> - <header location="global">qwidgetstack.h</header> + <header location="global">tqwidgetstack.h</header> <sizehint> <width>-1</width> <height>-1</height> @@ -240,5 +240,5 @@ <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1ddec44f503c0ae2a154410f53d0ed20e2bf6bdb656dd6861dd23d9a66591b0587fd1654235ebded6f0edcd53e419d87ae7b1f4f9b8f906d0bfe012317426a70b07bdc2f3ec77f8ed6b89559061a0343d06a124cc105596482585094bc0ae599b04646c9018926491b2205e140c485cace25755c175d0a967b622ff900b8cc9c7d29af594ea722d589167f813aa852ba07d94b9dce296e883fe7bb163f23896753</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kbugbuster/gui/cwbuglistcontainer.cpp b/kbugbuster/gui/cwbuglistcontainer.cpp index 14a601be..edcc442d 100644 --- a/kbugbuster/gui/cwbuglistcontainer.cpp +++ b/kbugbuster/gui/cwbuglistcontainer.cpp @@ -41,8 +41,8 @@ using namespace KBugBusterMainWindow; -CWBugListContainer::CWBugListContainer( TQWidget *parent , const char * name ) - : TQWidget( parent, name ), m_find(0), m_findItem(0) +CWBugListContainer::CWBugListContainer( TQWidget *tqparent , const char * name ) + : TQWidget( tqparent, name ), m_tqfind(0), m_findItem(0) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); topLayout->setSpacing( KDialog::spacingHint() ); @@ -68,7 +68,7 @@ CWBugListContainer::CWBugListContainer( TQWidget *parent , const char * name ) m_listBugs->addColumn( i18n( "Number" ) ); m_listBugs->addColumn( i18n( "Age" ) ); m_listBugs->addColumn( i18n( "Title" ), 500 ); // so that the widthmode isn't "Maximum" - m_listBugs->addColumn( i18n( "Status" ) ); + m_listBugs->addColumn( i18n( "tqStatus" ) ); m_listBugs->addColumn( i18n( "Severity" ) ); m_listBugs->addColumn( i18n( "Sender" ), 150 ); // idem. hardcoded widths suck a bit, but... m_listBugs->setAllColumnsShowFocus( true ); @@ -114,7 +114,7 @@ CWBugListContainer::~CWBugListContainer() { m_listBugs->saveLayout( KBBPrefs::instance()->config(), "BugListLayout" ); KBBPrefs::instance()->writeConfig(); - delete m_find; + delete m_tqfind; } void CWBugListContainer::setBugList( const TQString &label, const Bug::List &bugs ) @@ -143,7 +143,7 @@ void CWBugListContainer::setBugList( const TQString &label, const Bug::List &bug } } - m_listLabel->setText( i18n( "%1 (%2 bugs, %3 wishes)" ).arg( label ).arg( noBugs ).arg( noWishes ) ); + m_listLabel->setText( i18n( "%1 (%2 bugs, %3 wishes)" ).tqarg( label ).tqarg( noBugs ).tqarg( noWishes ) ); m_listStack->raiseWidget( 0 ); } @@ -153,13 +153,13 @@ void CWBugListContainer::setBugList( const Package &package, const TQString &com if ( component.isEmpty() ) { if ( package.components().count() > 1 ) - listLabel = i18n( "Product '%1', all components" ).arg( package.name() ); + listLabel = i18n( "Product '%1', all components" ).tqarg( package.name() ); else - listLabel = i18n( "Product '%1'" ).arg( package.name() ); + listLabel = i18n( "Product '%1'" ).tqarg( package.name() ); } else { - listLabel = i18n( "Product '%1', component '%2'" ).arg( package.name(), component ); + listLabel = i18n( "Product '%1', component '%2'" ).tqarg( package.name(), component ); } setBugList( listLabel, bugs ); @@ -208,9 +208,9 @@ void CWBugListContainer::setNoList() void CWBugListContainer::setLoading( const Package &package, const TQString &component ) { if ( component.isEmpty() ) - setLoading( i18n( "Retrieving List of Outstanding Bugs for Product '%1'..." ).arg( package.name() ) ); + setLoading( i18n( "Retrieving List of Outstanding Bugs for Product '%1'..." ).tqarg( package.name() ) ); else - setLoading( i18n( "Retrieving List of Outstanding Bugs for Product '%1' (Component %2)..." ).arg( package.name(), component ) ); + setLoading( i18n( "Retrieving List of Outstanding Bugs for Product '%1' (Component %2)..." ).tqarg( package.name(), component ) ); } void CWBugListContainer::setLoading( const TQString &label ) @@ -221,12 +221,12 @@ void CWBugListContainer::setLoading( const TQString &label ) void CWBugListContainer::setCacheMiss( const Package &package ) { - setCacheMiss( i18n( "Package '%1'" ).arg( package.name() ) ); + setCacheMiss( i18n( "Package '%1'" ).tqarg( package.name() ) ); } void CWBugListContainer::setCacheMiss( const TQString &label ) { - m_listLoading->setText( i18n( "%1 is not available offline." ).arg( label ) ); + m_listLoading->setText( i18n( "%1 is not available offline." ).tqarg( label ) ); m_listStack->raiseWidget( 1 ); } @@ -258,12 +258,12 @@ void CWBugListContainer::clearCommand( const TQString &bug ) void CWBugListContainer::searchBugByTitle( int options, const TQString& pattern ) { - m_find = new KFind( pattern, options, this ); + m_tqfind = new KFind( pattern, options, this ); // Connect signals to code which handles highlighting // of found text. - connect(m_find, TQT_SIGNAL( highlight( const TQString &, int, int ) ), + connect(m_tqfind, TQT_SIGNAL( highlight( const TQString &, int, int ) ), this, TQT_SLOT( searchHighlight( const TQString &, int, int ) ) ); - connect(m_find, TQT_SIGNAL( findNext() ), this, TQT_SLOT( slotFindNext() ) ); + connect(m_tqfind, TQT_SIGNAL( findNext() ), this, TQT_SLOT( slotFindNext() ) ); m_findItem = (BugLVI *)m_listBugs->firstChild(); if ( options & KFindDialog::FromCursor && m_listBugs->currentItem() ) @@ -279,26 +279,26 @@ void CWBugListContainer::slotFindNext() KFind::Result res = KFind::NoMatch; while( res == KFind::NoMatch && m_findItem ) { - if ( m_find->needData() ) - m_find->setData( m_findItem->text(2) ); + if ( m_tqfind->needData() ) + m_tqfind->setData( m_findItem->text(2) ); // Let KFind inspect the text fragment, and display a dialog if a match is found - res = m_find->find(); + res = m_tqfind->find(); if ( res == KFind::NoMatch ) { - if ( m_find->options() & KFindDialog::FindBackwards ) + if ( m_tqfind->options() & KFindDialog::FindBackwards ) m_findItem = (BugLVI *)m_findItem->itemAbove(); else m_findItem = (BugLVI *)m_findItem->itemBelow(); } } if ( res == KFind::NoMatch ) // i.e. at end - if ( m_find->shouldRestart() ) { + if ( m_tqfind->shouldRestart() ) { m_findItem = (BugLVI *)m_listBugs->firstChild(); slotFindNext(); } else { - delete m_find; - m_find = 0L; + delete m_tqfind; + m_tqfind = 0L; } } diff --git a/kbugbuster/gui/cwbuglistcontainer.h b/kbugbuster/gui/cwbuglistcontainer.h index 9dd1d9bd..0144dd57 100644 --- a/kbugbuster/gui/cwbuglistcontainer.h +++ b/kbugbuster/gui/cwbuglistcontainer.h @@ -35,12 +35,13 @@ class CWLoadingWidget; /** * @author Martijn Klingens */ -class CWBugListContainer : public QWidget +class CWBugListContainer : public TQWidget { Q_OBJECT + TQ_OBJECT public: - CWBugListContainer( TQWidget* parent = 0, const char* name = 0 ); + CWBugListContainer( TQWidget* tqparent = 0, const char* name = 0 ); ~CWBugListContainer(); void setBugList( const Package &package, const TQString &component, const Bug::List &bugs ); @@ -85,7 +86,7 @@ private: TQWidgetStack *m_listStack; KListView *m_listBugs; - KFind *m_find; + KFind *m_tqfind; BugLVI *m_findItem; CWLoadingWidget *m_listLoading; diff --git a/kbugbuster/gui/cwloadingwidget.cpp b/kbugbuster/gui/cwloadingwidget.cpp index 24eb70b9..8bff359d 100644 --- a/kbugbuster/gui/cwloadingwidget.cpp +++ b/kbugbuster/gui/cwloadingwidget.cpp @@ -27,16 +27,16 @@ using namespace KBugBusterMainWindow; -CWLoadingWidget::CWLoadingWidget( WidgetMode mode, TQWidget *parent, +CWLoadingWidget::CWLoadingWidget( WidgetMode mode, TQWidget *tqparent, const char * name ) -: TQFrame( parent, name ) +: TQFrame( tqparent, name ) { init( mode ); } CWLoadingWidget::CWLoadingWidget( const TQString &text, WidgetMode mode, - TQWidget *parent, const char * name ) -: TQFrame( parent, name ) + TQWidget *tqparent, const char * name ) +: TQFrame( tqparent, name ) { init( mode ); setText( text ); @@ -107,7 +107,7 @@ void CWLoadingWidget::setText( const TQString &text ) { m_text = text; updatePixmap(); - repaint(); + tqrepaint(); } void CWLoadingWidget::updatePixmap() @@ -197,9 +197,9 @@ void CWLoadingWidget::updatePixmap() box.setHeight( box.height() + 2 * fheight ); box.setWidth( box.width() + 2 * 10 ); if( box.width() < cr.width() - 2 * boxX ) - box.setWidth( QMIN( cr.width() - 2 * boxX, 500 + 2 * 10 ) ); + box.setWidth( TQMIN( cr.width() - 2 * boxX, 500 + 2 * 10 ) ); if( box.height() < 100 ) - box.setHeight( QMIN( cr.height() - boxY - 2 * fheight - 10, 100 ) ); + box.setHeight( TQMIN( cr.height() - boxY - 2 * fheight - 10, 100 ) ); p.setClipRect( box ); p.fillRect( box, TQBrush( TQColor( 204, 222, 234 ) ) ); @@ -209,7 +209,7 @@ void CWLoadingWidget::updatePixmap() p.setWindow( 0, 0, box.width(), box.height() ); p.drawText( 10, fheight, br.width(), - QMAX( br.height(), box.height() - 2 * fheight ), + TQMAX( br.height(), box.height() - 2 * fheight ), AlignAuto | AlignVCenter | WordBreak, m_text ); } } diff --git a/kbugbuster/gui/cwloadingwidget.h b/kbugbuster/gui/cwloadingwidget.h index 1150f39e..b2f49710 100644 --- a/kbugbuster/gui/cwloadingwidget.h +++ b/kbugbuster/gui/cwloadingwidget.h @@ -30,22 +30,23 @@ namespace KBugBusterMainWindow /** * @author Martijn Klingens */ -class CWLoadingWidget : public QFrame +class CWLoadingWidget : public TQFrame { Q_OBJECT + TQ_OBJECT public: /** - * Use WidgetMode to specify the layout for the background images + * Use WidgetMode to specify the tqlayout for the background images * TopFrame loads and uses the logo and horizontal bars, * BottomFrame loads the tools and the translucent block. */ enum WidgetMode { TopFrame = 0, BottomFrame }; - CWLoadingWidget( WidgetMode mode = TopFrame, TQWidget* parent = 0, + CWLoadingWidget( WidgetMode mode = TopFrame, TQWidget* tqparent = 0, const char* name = 0 ); CWLoadingWidget( const TQString &text, WidgetMode mode = TopFrame, - TQWidget* parent = 0, const char* name = 0 ); + TQWidget* tqparent = 0, const char* name = 0 ); ~CWLoadingWidget(); TQString text() const { return m_text; } diff --git a/kbugbuster/gui/cwsearchwidget.cpp b/kbugbuster/gui/cwsearchwidget.cpp index 5a075bb8..7fa6fb48 100644 --- a/kbugbuster/gui/cwsearchwidget.cpp +++ b/kbugbuster/gui/cwsearchwidget.cpp @@ -26,8 +26,8 @@ using namespace KBugBusterMainWindow; -CWSearchWidget::CWSearchWidget( TQWidget *parent , const char * name ) -: CWSearchWidget_Base( parent, name ) +CWSearchWidget::CWSearchWidget( TQWidget *tqparent , const char * name ) +: CWSearchWidget_Base( tqparent, name ) { // Set fonts and margins CWSearchWidget_BaseLayout->setSpacing( KDialog::spacingHint() ); diff --git a/kbugbuster/gui/cwsearchwidget.h b/kbugbuster/gui/cwsearchwidget.h index 108a1872..5539a45a 100644 --- a/kbugbuster/gui/cwsearchwidget.h +++ b/kbugbuster/gui/cwsearchwidget.h @@ -28,9 +28,10 @@ namespace KBugBusterMainWindow class CWSearchWidget : public CWSearchWidget_Base { Q_OBJECT + TQ_OBJECT public: - CWSearchWidget( TQWidget* parent = 0, const char* name = 0 ); + CWSearchWidget( TQWidget* tqparent = 0, const char* name = 0 ); ~CWSearchWidget(); public slots: diff --git a/kbugbuster/gui/cwsearchwidget_base.ui b/kbugbuster/gui/cwsearchwidget_base.ui index c5e9b860..595ffb1c 100644 --- a/kbugbuster/gui/cwsearchwidget_base.ui +++ b/kbugbuster/gui/cwsearchwidget_base.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>CWSearchWidget_Base</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CWSearchWidget_Base</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -22,7 +22,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_searchLabel</cstring> </property> @@ -30,7 +30,7 @@ <string>Search</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -55,7 +55,7 @@ <enum>NoInsertion</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel9</cstring> </property> @@ -66,7 +66,7 @@ <cstring>m_searchBugNumber</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout17</cstring> </property> @@ -80,7 +80,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_searchBugNumber</cstring> </property> @@ -93,7 +93,7 @@ </sizepolicy> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_searchBugNumberBtn</cstring> </property> @@ -114,7 +114,7 @@ </widget> </hbox> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel7</cstring> </property> @@ -125,7 +125,7 @@ <cstring>m_searchDesc</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout15</cstring> </property> @@ -139,7 +139,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>m_searchDesc</cstring> </property> @@ -152,7 +152,7 @@ </sizepolicy> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_searchDescBtn</cstring> </property> @@ -194,5 +194,5 @@ <includes> <include location="global" impldecl="in declaration">kcombobox.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kbugbuster/gui/kbbbookmarkmanager.h b/kbugbuster/gui/kbbbookmarkmanager.h index af58a461..23763300 100644 --- a/kbugbuster/gui/kbbbookmarkmanager.h +++ b/kbugbuster/gui/kbbbookmarkmanager.h @@ -10,7 +10,7 @@ public: static KBookmarkManager * self() { if ( !s_bookmarkManager ) { - TQString bookmarksFile = locateLocal("data", TQString::fromLatin1("kbugbuster/bookmarks.xml")); + TQString bookmarksFile = locateLocal("data", TQString::tqfromLatin1("kbugbuster/bookmarks.xml")); s_bookmarkManager = KBookmarkManager::managerForFile( bookmarksFile ); } return s_bookmarkManager; diff --git a/kbugbuster/gui/kbbmainwindow.cpp b/kbugbuster/gui/kbbmainwindow.cpp index 24730fda..67b3388c 100644 --- a/kbugbuster/gui/kbbmainwindow.cpp +++ b/kbugbuster/gui/kbbmainwindow.cpp @@ -61,8 +61,8 @@ using namespace KBugBusterMainWindow; class TextViewer : public KDialogBase { public: - TextViewer( const TQString &title, TQWidget *parent = 0 ) - : KDialogBase( Plain, title, Ok, Ok, parent, 0, + TextViewer( const TQString &title, TQWidget *tqparent = 0 ) + : KDialogBase( Plain, title, Ok, Ok, tqparent, 0, false ) { TQFrame *topFrame = plainPage(); @@ -144,68 +144,68 @@ KBBMainWindow::~KBBMainWindow() void KBBMainWindow::initActions() { // Prepare and create XML GUI - fileQuit = KStdAction::quit( this, + fileQuit = KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); fileQuit->setToolTip( i18n( "Quit KBugBuster" ) ); - new KAction( i18n("See &Pending Changes"), "contents", 0, this, TQT_SLOT( slotListChanges() ), + new KAction( i18n("See &Pending Changes"), "contents", 0, TQT_TQOBJECT(this), TQT_SLOT( slotListChanges() ), actionCollection(), "file_seechanges" ); - new KAction( i18n("&Submit Changes"), "mail_send", 0, this, TQT_SLOT( slotSubmit() ), + new KAction( i18n("&Submit Changes"), "mail_send", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSubmit() ), actionCollection(), "file_submit" ); - reloadpacklist = new KAction( i18n("Reload &Product List"), "reload", CTRL+Qt::Key_F5, m_mainWidget, TQT_SLOT( slotReloadPackageList() ), + reloadpacklist = new KAction( i18n("Reload &Product List"), "reload", CTRL+TQt::Key_F5, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotReloadPackageList() ), actionCollection(), "reload_packagelist" ); - reloadpack= new KAction( i18n("Reload Bug &List (for current product)"), "reload", Qt::Key_F5, m_mainWidget, TQT_SLOT( slotReloadPackage() ), + reloadpack= new KAction( i18n("Reload Bug &List (for current product)"), "reload", TQt::Key_F5, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotReloadPackage() ), actionCollection(), "reload_package" ); - reloadbug = new KAction( i18n("Reload Bug &Details (for current bug)"), "reload", SHIFT+Qt::Key_F5, m_mainWidget, TQT_SLOT( slotReloadBug() ), + reloadbug = new KAction( i18n("Reload Bug &Details (for current bug)"), "reload", SHIFT+TQt::Key_F5, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotReloadBug() ), actionCollection(), "reload_bug" ); - loadMyBugs = new KAction( i18n( "Load &My Bugs List" ), 0, m_mainWidget, TQT_SLOT( slotLoadMyBugs() ), + loadMyBugs = new KAction( i18n( "Load &My Bugs List" ), 0, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotLoadMyBugs() ), actionCollection(), "load_my_bugs" ); - reloadall = new KAction( i18n("Load All Bug Details (for current product)"), Qt::Key_F6, m_mainWidget, TQT_SLOT( slotRetrieveAllBugDetails() ), actionCollection(), "load_allbugs" ); - new KAction( i18n("Extract &Attachments"), "filesave", Qt::Key_F4, m_mainWidget, TQT_SLOT( slotExtractAttachments() ), + reloadall = new KAction( i18n("Load All Bug Details (for current product)"), TQt::Key_F6, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotRetrieveAllBugDetails() ), actionCollection(), "load_allbugs" ); + new KAction( i18n("Extract &Attachments"), "filesave", TQt::Key_F4, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotExtractAttachments() ), actionCollection(), "extract_attachments" ); - new KAction( i18n("Clear Cache"), 0, this, TQT_SLOT( clearCache() ), + new KAction( i18n("Clear Cache"), 0, TQT_TQOBJECT(this), TQT_SLOT( clearCache() ), actionCollection(), "clear_cache" ); - new KAction( i18n("&Search by Product..."), "goto", CTRL+Qt::Key_P, this, + new KAction( i18n("&Search by Product..."), "goto", CTRL+TQt::Key_P, TQT_TQOBJECT(this), TQT_SLOT( searchPackage() ), actionCollection(), "search_package" ); - new KAction( i18n("Search by Bug &Number..."), "filefind", CTRL+Qt::Key_N, this, + new KAction( i18n("Search by Bug &Number..."), "filetqfind", CTRL+TQt::Key_N, TQT_TQOBJECT(this), TQT_SLOT( searchBugNumber() ), actionCollection(), "search_bugnumber" ); // For now "Description" searches by title. Maybe later we can have a // full-text search interfacing bugs.kde.org and rename the current one to "By Title". - new KAction( i18n("Search by &Description...") ,"find", CTRL+Qt::Key_D, this, + new KAction( i18n("Search by &Description...") ,"tqfind", CTRL+TQt::Key_D, TQT_TQOBJECT(this), TQT_SLOT( searchDescription() ), actionCollection(), "search_description" ); -// new KAction( i18n("&Merge"), "view_remove", CTRL+Qt::Key_M, m_mainWidget, +// new KAction( i18n("&Merge"), "view_remove", CTRL+TQt::Key_M, TQT_TQOBJECT(m_mainWidget), // TQT_SLOT( mergeBugs() ), actionCollection(), "cmd_merge" ); -// new KAction( i18n("&Unmerge"), "view_top_bottom", CTRL+SHIFT+Qt::Key_M, m_mainWidget, +// new KAction( i18n("&Unmerge"), "view_top_bottom", CTRL+SHIFT+TQt::Key_M, TQT_TQOBJECT(m_mainWidget), // TQT_SLOT( unmergeBugs() ), actionCollection(), "cmd_unmerge" ); - new KAction( i18n("C&lose..."), "edittrash", CTRL+Qt::Key_L, m_mainWidget, + new KAction( i18n("C&lose..."), "edittrash", CTRL+TQt::Key_L, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( closeBug() ), actionCollection(), "cmd_close" ); -// new KAction( i18n("Clos&e Silently"), "edittrash", CTRL+Qt::Key_E, m_mainWidget, +// new KAction( i18n("Clos&e Silently"), "edittrash", CTRL+TQt::Key_E, TQT_TQOBJECT(m_mainWidget), // TQT_SLOT( closeBugSilently() ), actionCollection(), "cmd_close_silently" ); - new KAction( i18n("Re&open"), "idea", CTRL+Qt::Key_O, m_mainWidget, + new KAction( i18n("Re&open"), "idea", CTRL+TQt::Key_O, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( reopenBug() ), actionCollection(), "cmd_reopen" ); -// new KAction( i18n("Re&assign..."), "folder_new", CTRL+Qt::Key_A, m_mainWidget, +// new KAction( i18n("Re&assign..."), "folder_new", CTRL+TQt::Key_A, TQT_TQOBJECT(m_mainWidget), // TQT_SLOT( reassignBug() ), actionCollection(), "cmd_reassign" ); -// new KAction( i18n("Change &Title..."), "text_under", CTRL+Qt::Key_T, m_mainWidget, +// new KAction( i18n("Change &Title..."), "text_under", CTRL+TQt::Key_T, TQT_TQOBJECT(m_mainWidget), // TQT_SLOT( titleBug() ), actionCollection(), "cmd_title" ); -// new KAction( i18n("Change &Severity..."), "edit", CTRL+Qt::Key_S, m_mainWidget, +// new KAction( i18n("Change &Severity..."), "edit", CTRL+TQt::Key_S, TQT_TQOBJECT(m_mainWidget), // TQT_SLOT( severityBug() ), actionCollection(), "cmd_severity" ); - new KAction( i18n("&Reply..."), "mail_replyall",CTRL+Qt::Key_R , m_mainWidget, + new KAction( i18n("&Reply..."), "mail_replyall",CTRL+TQt::Key_R , TQT_TQOBJECT(m_mainWidget), TQT_SLOT( replyBug() ), actionCollection(), "cmd_reply" ); - new KAction( i18n("Reply &Privately..."), "mail_reply", CTRL+Qt::Key_I, m_mainWidget, + new KAction( i18n("Reply &Privately..."), "mail_reply", CTRL+TQt::Key_I, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( replyPrivateBug() ), actionCollection(), "cmd_replyprivate" ); - KStdAction::showMenubar(this, TQT_SLOT( slotToggleMenubar() ), actionCollection() ); + KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT( slotToggleMenubar() ), actionCollection() ); #if KDE_IS_VERSION( 3, 1, 90 ) createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); #endif m_disconnectedAction = new KToggleAction( i18n("&Disconnected Mode"), 0, - this, + TQT_TQOBJECT(this), TQT_SLOT( slotDisconnectedAction() ), actionCollection(), "settings_disconnected" ); @@ -215,16 +215,16 @@ void KBBMainWindow::initActions() m_pamBookmarks = new KActionMenu( i18n( "&Bookmarks" ), "bookmark", actionCollection(), "bookmarks" ); m_pBookmarkMenu = new KBookmarkMenu( KBBBookmarkManager::self(), this, m_pamBookmarks->popupMenu(), actionCollection(), true ); - KStdAction::preferences( this, TQT_SLOT(preferences()), actionCollection() ); + KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(preferences()), actionCollection() ); - KToggleAction *toggleTmp = new KToggleAction( i18n("Show Closed Bugs"), "recycled", 0, this, TQT_SLOT( slotToggleDone() ), + KToggleAction *toggleTmp = new KToggleAction( i18n("Show Closed Bugs"), "recycled", 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleDone() ), actionCollection(), "cmd_toggle_done" ); #if KDE_IS_VERSION( 3, 2, 90 ) toggleTmp->setCheckedState(i18n("Hide Closed Bugs")); #endif toggleTmp->setChecked( KBBPrefs::instance()->mShowClosedBugs ); - toggleTmp =new KToggleAction( i18n("Show Wishes"), "bookmark", 0, this, TQT_SLOT( slotToggleWishes() ), + toggleTmp =new KToggleAction( i18n("Show Wishes"), "bookmark", 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleWishes() ), actionCollection(), "cmd_toggle_wishes" ); #if KDE_IS_VERSION( 3, 2, 90 ) toggleTmp->setCheckedState(i18n("Hide Wishes")); @@ -232,7 +232,7 @@ void KBBMainWindow::initActions() toggleTmp->setChecked(KBBPrefs::instance()->mShowWishes); mSelectServerAction = new KSelectAction( i18n( "Select Server" ), 0, 0, - this, + TQT_TQOBJECT(this), TQT_SLOT( slotSelectServer() ), actionCollection(), "select_server" ); @@ -240,10 +240,10 @@ void KBBMainWindow::initActions() setupSelectServerAction(); if ( KBBPrefs::instance()->mDebugMode ) { - new KAction( i18n("Show Last Server Response..."), 0 , this, + new KAction( i18n("Show Last Server Response..."), 0 , TQT_TQOBJECT(this), TQT_SLOT( showLastResponse() ), actionCollection(), "debug_lastresponse" ); - new KAction( i18n("Show Bug HTML Source..."), 0 , this, + new KAction( i18n("Show Bug HTML Source..."), 0 , TQT_TQOBJECT(this), TQT_SLOT( showBugSource() ), actionCollection(), "debug_showbugsource" ); } @@ -342,7 +342,7 @@ void KBBMainWindow::slotListChanges() if (list.count() > 0) { int ret = KMessageBox::questionYesNoList( this, i18n("List of pending commands:"), - list, TQString::null, KStdGuiItem::clear(), KStdGuiItem::close() ); + list, TQString(), KStdGuiItem::clear(), KStdGuiItem::close() ); if ( ret == KMessageBox::Yes ) { // Ask for confirmation, it's too easy to click the wrong button in the above dlg box @@ -391,7 +391,7 @@ void KBBMainWindow::searchBugNumber() bool ok = false; TQString result = KInputDialog::getText( i18n("Search for Bug Number"), i18n("Please enter a bug number:"), - TQString::null, &ok, this ); + TQString(), &ok, this ); if ( ok ) { //Strip whitespace and # if needed result = result.stripWhiteSpace(); @@ -420,7 +420,7 @@ bool KBBMainWindow::queryClose() if ( ! BugSystem::self()->server()->commandsPending() ) return true; int result = KMessageBox::warningYesNoCancel(this,i18n("There are unsent bug commands." - " Do you want to send them now?"), TQString::null, i18n("Send"), i18n("Do Not Send")); + " Do you want to send them now?"), TQString(), i18n("Send"), i18n("Do Not Send")); if ( result == KMessageBox::Cancel ) return false; if ( result == KMessageBox::Yes ) { BugSystem::self()->sendCommands(); diff --git a/kbugbuster/gui/kbbmainwindow.h b/kbugbuster/gui/kbbmainwindow.h index 2e86c596..9cb7d2f2 100644 --- a/kbugbuster/gui/kbbmainwindow.h +++ b/kbugbuster/gui/kbbmainwindow.h @@ -48,6 +48,7 @@ namespace KBugBusterMainWindow class KBBMainWindow : public KMainWindow, virtual public KBookmarkOwner { Q_OBJECT + TQ_OBJECT public: /** * construtor of KBugBusterApp, calls all init functions to create the application. @@ -55,7 +56,7 @@ class KBBMainWindow : public KMainWindow, virtual public KBookmarkOwner KBBMainWindow( const TQCString &initialPackage = "", const TQCString &initialCpomponent = "", const TQCString &initialBug = "", - TQWidget* parent = 0, const char* name = 0 ); + TQWidget* tqparent = 0, const char* name = 0 ); ~KBBMainWindow(); /// Overloaded functions of KBookmarkOwner @@ -119,7 +120,7 @@ class KBBMainWindow : public KMainWindow, virtual public KBookmarkOwner KToggleAction *m_disconnectedAction; /** - * Status bar label. We need this, because the default Qt version doesn't + * tqStatus bar label. We need this, because the default TQt version doesn't * support rich text in the messages */ TQLabel *m_statusLabel; diff --git a/kbugbuster/gui/loadallbugsdlg.cpp b/kbugbuster/gui/loadallbugsdlg.cpp index d6203c07..72212ccd 100644 --- a/kbugbuster/gui/loadallbugsdlg.cpp +++ b/kbugbuster/gui/loadallbugsdlg.cpp @@ -26,7 +26,7 @@ LoadAllBugsDlg::LoadAllBugsDlg( const Package& pkg, const TQString &component ) m_bugLoadingProgress = new KIO::DefaultProgress( this ); connect( m_bugLoadingProgress, TQT_SIGNAL( stopped() ), this, TQT_SLOT( slotStopped() ) ); - setCaption( i18n( "Loading All Bugs for Product %1" ).arg( pkg.name() ) ); + setCaption( i18n( "Loading All Bugs for Product %1" ).tqarg( pkg.name() ) ); connect( BugSystem::self(), TQT_SIGNAL( bugDetailsAvailable( const Bug &, const BugDetails & ) ), TQT_SLOT( slotBugDetailsAvailable( const Bug &, const BugDetails & ) ) ); @@ -45,7 +45,7 @@ LoadAllBugsDlg::LoadAllBugsDlg( const Package& pkg, const TQString &component ) void LoadAllBugsDlg::slotBugDetailsAvailable( const Bug &bug, const BugDetails & ) { kdDebug() << "LoadAllBugsDlg::slotBugDetailsAvailable " << bug.number() << endl; - m_bugLoadingProgress->slotInfoMessage( 0L, i18n( "Bug %1 loaded" ).arg(bug.number()) ); + m_bugLoadingProgress->slotInfoMessage( 0L, i18n( "Bug %1 loaded" ).tqarg(bug.number()) ); loadNextBug(); } diff --git a/kbugbuster/gui/loadallbugsdlg.h b/kbugbuster/gui/loadallbugsdlg.h index cc7c0661..6b37bbc1 100644 --- a/kbugbuster/gui/loadallbugsdlg.h +++ b/kbugbuster/gui/loadallbugsdlg.h @@ -22,9 +22,10 @@ class BugDetails; namespace KIO { class DefaultProgress; } -class LoadAllBugsDlg : public QDialog +class LoadAllBugsDlg : public TQDialog { Q_OBJECT + TQ_OBJECT public: LoadAllBugsDlg( const Package& pkg, const TQString &component ); diff --git a/kbugbuster/gui/messageeditor.cpp b/kbugbuster/gui/messageeditor.cpp index 865ec3da..5ef266ff 100644 --- a/kbugbuster/gui/messageeditor.cpp +++ b/kbugbuster/gui/messageeditor.cpp @@ -14,8 +14,8 @@ #include <tqpushbutton.h> #include "messageeditor.moc" -MessageEditor::MessageEditor( TQWidget *parent ) - : KDialogBase(Plain,i18n("Edit Message Buttons"),Ok|Cancel,Ok,parent,0, +MessageEditor::MessageEditor( TQWidget *tqparent ) + : KDialogBase(Plain,i18n("Edit Message Buttons"),Ok|Cancel,Ok,tqparent,0, true,true) { TQFrame *topFrame = plainPage(); @@ -63,7 +63,7 @@ void MessageEditor::addButton() { TQString txt; txt = KInputDialog::getText(i18n("Add Message Button"), - i18n("Enter button name:"), TQString::null, + i18n("Enter button name:"), TQString(), NULL, this ); if ( !txt.isNull() ) { @@ -79,7 +79,7 @@ void MessageEditor::addButton() void MessageEditor::removeButton() { int result = KMessageBox::warningContinueCancel(this, - i18n("Remove the button %1?").arg(mSelectionCombo->currentText()), + i18n("Remove the button %1?").tqarg(mSelectionCombo->currentText()), i18n("Remove"), KGuiItem( i18n("Delete"), "editdelete") ); if (result == KMessageBox::Continue) { @@ -105,7 +105,7 @@ void MessageEditor::updateMessage() void MessageEditor::saveMessage() { - mMessageButtons.replace(mCurrentButton,mMessageEdit->text()); + mMessageButtons.tqreplace(mCurrentButton,mMessageEdit->text()); } void MessageEditor::slotOk() diff --git a/kbugbuster/gui/messageeditor.h b/kbugbuster/gui/messageeditor.h index 306cc3d0..de004511 100644 --- a/kbugbuster/gui/messageeditor.h +++ b/kbugbuster/gui/messageeditor.h @@ -8,8 +8,9 @@ class KTextEdit; class MessageEditor : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - MessageEditor( TQWidget *parent ); + MessageEditor( TQWidget *tqparent ); protected slots: void slotOk(); diff --git a/kbugbuster/gui/msginputdialog.cpp b/kbugbuster/gui/msginputdialog.cpp index 8d12cc35..b84e269f 100644 --- a/kbugbuster/gui/msginputdialog.cpp +++ b/kbugbuster/gui/msginputdialog.cpp @@ -20,8 +20,8 @@ MsgInputDialog::MsgInputDialog(MsgInputDialog::MessageType type, const Bug &bug, const Package &package, const TQString "edMsg, - TQWidget *parent) - : KDialogBase(Plain,TQString::null,User1|User2|Ok|Cancel,Ok,parent,0,false, + TQWidget *tqparent) + : KDialogBase(Plain,TQString(),User1|User2|Ok|Cancel,Ok,tqparent,0,false, true,KStdGuiItem::clear(),i18n( "&Edit Presets..." )), mBug( bug ), mPackage( package ), @@ -29,7 +29,7 @@ MsgInputDialog::MsgInputDialog(MsgInputDialog::MessageType type, const Bug &bug, { switch ( mType ) { case Close: - setCaption( i18n("Close Bug %1").arg( mBug.number() ) ); + setCaption( i18n("Close Bug %1").tqarg( mBug.number() ) ); break; case Reply: setCaption( i18n("Reply to Bug") ); @@ -44,30 +44,30 @@ MsgInputDialog::MsgInputDialog(MsgInputDialog::MessageType type, const Bug &bug, TQFrame *topFrame = plainPage(); ( new TQHBoxLayout( topFrame ) )->setAutoAdd( true ); - mSplitter = new TQSplitter( TQSplitter::Horizontal, topFrame ); + mSplitter = new TQSplitter( Qt::Horizontal, topFrame ); TQWidget *w = new TQWidget( mSplitter ); ( new TQVBoxLayout( w, spacingHint(), -1 ) )->setAutoAdd( true ); if ( mType == Reply ) { TQWidget *r = new TQWidget( w ); - TQHBoxLayout* rlayout = new TQHBoxLayout( r ); + TQHBoxLayout* rtqlayout = new TQHBoxLayout( r ); TQLabel *rlabel = new TQLabel( i18n("&Recipient:"),r ); TQFont f = r->font(); f.setBold( true ); r->setFont( f ); - rlayout->add( rlabel ); + rtqlayout->add( rlabel ); mRecipient = new TQComboBox( r ); mRecipient->insertItem( i18n("Normal (bugs.kde.org & Maintainer & kde-bugs-dist)"), BugCommand::Normal ); mRecipient->insertItem( i18n("Maintonly (bugs.kde.org & Maintainer)"), BugCommand::Maintonly ); mRecipient->insertItem( i18n("Quiet (bugs.kde.org only)"), BugCommand::Quiet ); rlabel->setBuddy( mRecipient ); - rlayout->add( mRecipient ); + rtqlayout->add( mRecipient ); TQSpacerItem *rspacer= new TQSpacerItem( 1,1,TQSizePolicy::Expanding ); - rlayout->addItem( rspacer ); + rtqlayout->addItem( rspacer ); // Reply currently only replies to the bug tracking system r->hide(); diff --git a/kbugbuster/gui/msginputdialog.h b/kbugbuster/gui/msginputdialog.h index 0ba59008..996a46ef 100644 --- a/kbugbuster/gui/msginputdialog.h +++ b/kbugbuster/gui/msginputdialog.h @@ -13,11 +13,12 @@ class KListBox; class MsgInputDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: enum MessageType{ Close, Reply, ReplyPrivate }; MsgInputDialog( MessageType, const Bug &, const Package &, - const TQString &, TQWidget *parent=0); + const TQString &, TQWidget *tqparent=0); virtual ~MsgInputDialog(); TQString message() const; diff --git a/kbugbuster/gui/packagelvi.cpp b/kbugbuster/gui/packagelvi.cpp index 6374fe29..d432d312 100644 --- a/kbugbuster/gui/packagelvi.cpp +++ b/kbugbuster/gui/packagelvi.cpp @@ -16,15 +16,15 @@ #include "packagelvi.h" -PackageLVI::PackageLVI( TQListView *parent , const Package &pkg, const TQString &component ) -: TQListViewItem( parent, pkg.name(), pkg.description() ) +PackageLVI::PackageLVI( TQListView *tqparent , const Package &pkg, const TQString &component ) +: TQListViewItem( tqparent, pkg.name(), pkg.description() ) { m_package = pkg; m_component = component; } -PackageLVI::PackageLVI( TQListViewItem *parent , const Package &pkg, const TQString &component ) -: TQListViewItem( parent, component ) +PackageLVI::PackageLVI( TQListViewItem *tqparent , const Package &pkg, const TQString &component ) +: TQListViewItem( tqparent, component ) { m_package = pkg; m_component = component; diff --git a/kbugbuster/gui/packagelvi.h b/kbugbuster/gui/packagelvi.h index 5582e06e..435c1331 100644 --- a/kbugbuster/gui/packagelvi.h +++ b/kbugbuster/gui/packagelvi.h @@ -24,13 +24,13 @@ /** * @author Martijn Klingens */ -class PackageLVI : public QListViewItem +class PackageLVI : public TQListViewItem { public: // Top-level package - PackageLVI( TQListView *parent , const Package &pkg, const TQString &component ); + PackageLVI( TQListView *tqparent , const Package &pkg, const TQString &component ); // Child component - PackageLVI( TQListViewItem *parent , const Package &pkg, const TQString &component ); + PackageLVI( TQListViewItem *tqparent , const Package &pkg, const TQString &component ); ~PackageLVI(); diff --git a/kbugbuster/gui/packageselectdialog.cpp b/kbugbuster/gui/packageselectdialog.cpp index 31dfdcef..e3481c0b 100644 --- a/kbugbuster/gui/packageselectdialog.cpp +++ b/kbugbuster/gui/packageselectdialog.cpp @@ -14,10 +14,10 @@ #include "packageselectdialog.h" #include "packageselectdialog.moc" -PackageListView::PackageListView( TQWidget *parent ) : - TQListView( parent ) +PackageListView::PackageListView( TQWidget *tqparent ) : + TQListView( tqparent ) { - setFocusPolicy( TQWidget::StrongFocus ); + setFocusPolicy( TQ_StrongFocus ); } void PackageListView::resetTyped() @@ -39,14 +39,14 @@ void PackageListView::keyPressEvent( TQKeyEvent *e ) emit typed( mTyped ); } -PackageSelectDialog::PackageSelectDialog(TQWidget *parent,const char *name) : - KDialogBase( parent, name, true, i18n("Select Product"), Ok|Cancel ) +PackageSelectDialog::PackageSelectDialog(TQWidget *tqparent,const char *name) : + KDialogBase( tqparent, name, true, i18n("Select Product"), Ok|Cancel ) { TQWidget *topWidget = new TQWidget( this ); setMainWidget( topWidget ); TQBoxLayout *topLayout = new TQVBoxLayout( topWidget ); - TQSplitter *topSplitter = new TQSplitter( TQSplitter::Vertical, topWidget ); + TQSplitter *topSplitter = new TQSplitter( Qt::Vertical, topWidget ); topSplitter->setOpaqueResize( true ); topLayout->addWidget( topSplitter ); @@ -108,7 +108,7 @@ void PackageSelectDialog::setPackages( const Package::List &pkgs ) mCompletionDict.clear(); Package::List::ConstIterator it; for( it = pkgs.begin(); it != pkgs.end(); ++it ) { - PackageLVI *item = new PackageLVI( mCompleteList, (*it), TQString::null ); + PackageLVI *item = new PackageLVI( mCompleteList, (*it), TQString() ); TQStringList components = (*it).components(); if (components.count() > 1) { @@ -131,7 +131,7 @@ void PackageSelectDialog::recentSelected( int, TQListViewItem *item ) kdDebug() << "PackageSelectDialog::recentSelected()" << endl; if ( item ) { mCompleteList->clearSelection(); - // Why does a QLineEdit->setText() call emit the textChanged() signal? + // Why does a TQLineEdit->setText() call emit the textChanged() signal? mPackageEdit->blockSignals( true ); mPackageEdit->setText( item->text( 0 ) ); enableButtonOK(true); @@ -169,7 +169,7 @@ void PackageSelectDialog::slotOk() BugServer *server = BugSystem::self()->server(); TQStringList recent = server->serverConfig().recentPackages(); - if( !recent.contains( recent_key ) ) { + if( !recent.tqcontains( recent_key ) ) { recent.prepend( recent_key ); if ( int( recent.count() ) > KBBPrefs::instance()->mRecentPackagesCount ) { recent.remove( recent.last() ); diff --git a/kbugbuster/gui/packageselectdialog.h b/kbugbuster/gui/packageselectdialog.h index 471fe8b5..a3ab9b59 100644 --- a/kbugbuster/gui/packageselectdialog.h +++ b/kbugbuster/gui/packageselectdialog.h @@ -10,11 +10,12 @@ class KCompletion; class KLineEdit; -class PackageListView : public QListView +class PackageListView : public TQListView { Q_OBJECT + TQ_OBJECT public: - PackageListView( TQWidget *parent ); + PackageListView( TQWidget *tqparent ); void resetTyped(); @@ -31,8 +32,9 @@ class PackageListView : public QListView class PackageSelectDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - PackageSelectDialog(TQWidget *parent=0,const char *name=0); + PackageSelectDialog(TQWidget *tqparent=0,const char *name=0); ~PackageSelectDialog(); void setRecentPackages( const TQStringList & ); diff --git a/kbugbuster/gui/preferencesdialog.cpp b/kbugbuster/gui/preferencesdialog.cpp index 2af4879a..2b6f09ab 100644 --- a/kbugbuster/gui/preferencesdialog.cpp +++ b/kbugbuster/gui/preferencesdialog.cpp @@ -24,7 +24,7 @@ #include "preferencesdialog.h" -class ServerItem : public QListViewItem +class ServerItem : public TQListViewItem { public: ServerItem( TQListView *listView, const BugServerConfig &cfg ) @@ -48,10 +48,10 @@ class ServerItem : public QListViewItem BugServerConfig mServerConfig; }; -class ServerListView : public QListView +class ServerListView : public TQListView { public: - ServerListView( TQWidget *parent ) : TQListView( parent ) + ServerListView( TQWidget *tqparent ) : TQListView( tqparent ) { addColumn( i18n("Name") ); addColumn( i18n("Base URL") ); @@ -60,9 +60,9 @@ class ServerListView : public QListView } }; -PreferencesDialog::PreferencesDialog( TQWidget* parent, const char* name ) +PreferencesDialog::PreferencesDialog( TQWidget* tqparent, const char* name ) : KDialogBase ( IconList, i18n("Preferences"), Ok|Apply|Cancel, Ok, - parent, name, false, true ) + tqparent, name, false, true ) { setupServerPage(); setupAdvancedPage(); @@ -79,15 +79,15 @@ void PreferencesDialog::setupServerPage() TQFrame *topFrame = addPage( i18n("Servers"), 0, DesktopIcon( "gohome", KIcon::SizeMedium ) ); - TQBoxLayout *layout = new TQVBoxLayout( topFrame ); - layout->setSpacing( spacingHint() ); + TQBoxLayout *tqlayout = new TQVBoxLayout( topFrame ); + tqlayout->setSpacing( spacingHint() ); mServerList = new ServerListView( topFrame ); - layout->addWidget( mServerList ); + tqlayout->addWidget( mServerList ); TQHBox *buttonBox = new TQHBox( topFrame ); buttonBox->setSpacing( spacingHint() ); - layout->addWidget( buttonBox ); + tqlayout->addWidget( buttonBox ); TQPushButton *addButton = new TQPushButton( i18n("Add Server..."), buttonBox ); connect( addButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addServer() ) ); @@ -100,7 +100,7 @@ void PreferencesDialog::setupServerPage() TQPushButton *button = new TQPushButton( i18n("Select Server From List..."), topFrame ); - layout->addWidget( button ); + tqlayout->addWidget( button ); connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( selectServer() ) ); connect( mServerList, TQT_SIGNAL( doubleClicked ( TQListViewItem *)), this, TQT_SLOT( editServer())); } @@ -110,34 +110,34 @@ void PreferencesDialog::setupAdvancedPage() TQFrame *topFrame = addPage( i18n("Advanced"), 0, DesktopIcon( "misc", KIcon::SizeMedium ) ); - TQBoxLayout *layout = new TQVBoxLayout( topFrame ); - layout->setSpacing( spacingHint() ); + TQBoxLayout *tqlayout = new TQVBoxLayout( topFrame ); + tqlayout->setSpacing( spacingHint() ); - TQButtonGroup *mailGroup = new TQButtonGroup( 1, Horizontal, + TQButtonGroup *mailGroup = new TQButtonGroup( 1,Qt::Horizontal, i18n( "Mail Client" ), topFrame ); - layout->addWidget( mailGroup ); + tqlayout->addWidget( mailGroup ); mKMailButton = new TQRadioButton( i18n( "&KMail" ), mailGroup ); mDirectButton = new TQRadioButton( i18n( "D&irect" ), mailGroup ); mSendmailButton = new TQRadioButton( i18n( "&Sendmail" ), mailGroup ); mShowClosedCheckBox = new TQCheckBox( i18n( "Show closed bugs" ), topFrame ); - layout->addWidget( mShowClosedCheckBox ); + tqlayout->addWidget( mShowClosedCheckBox ); mShowWishesCheckBox = new TQCheckBox( i18n( "Show wishes" ), topFrame ); - layout->addWidget( mShowWishesCheckBox ); + tqlayout->addWidget( mShowWishesCheckBox ); mShowVotedCheckBox = new TQCheckBox( i18n( "Show bugs with number of votes greater than:" ), topFrame ); - layout->addWidget( mShowVotedCheckBox ); + tqlayout->addWidget( mShowVotedCheckBox ); mMinVotesInput = new KIntNumInput( topFrame ); mMinVotesInput->setMinValue( 0 ); connect( mShowVotedCheckBox, TQT_SIGNAL(toggled(bool)), mMinVotesInput, TQT_SLOT(setEnabled(bool)) ); - layout->addWidget( mMinVotesInput ); + tqlayout->addWidget( mMinVotesInput ); mSendBccCheckBox = new TQCheckBox( i18n( "Send BCC to myself" ), topFrame ); - layout->addWidget( mSendBccCheckBox ); + tqlayout->addWidget( mSendBccCheckBox ); } void PreferencesDialog::setDefaults() @@ -274,21 +274,21 @@ void PreferencesDialog::writeConfig() emit configChanged(); } -SelectServerDlg::SelectServerDlg(PreferencesDialog *parent, const char */*name*/ ) - :KDialogBase(parent, 0, true, i18n("Select Server"), +SelectServerDlg::SelectServerDlg(PreferencesDialog *tqparent, const char */*name*/ ) + :KDialogBase(tqparent, 0, true, i18n("Select Server"), KDialogBase::Ok | KDialogBase::Cancel) { list = new ServerListView(this ); setMainWidget( list ); - parent->createServerItem( list, "KDE", "http://bugs.kde.org", "KDE" ); - parent->createServerItem( list, "GNOME", "http://bugzilla.gnome.org", "2.10" ); - parent->createServerItem( list, "Mozilla", "http://bugzilla.mozilla.org", "2.17.1" ); - parent->createServerItem( list, "Apache", "http://nagoya.apache.org/bugzilla/", "2.14.2" ); - parent->createServerItem( list, "XFree86", "http://bugs.xfree86.org/cgi-bin/bugzilla/", "2.14.2" ); - parent->createServerItem( list, "Ximian", "http://bugzilla.ximian.com", "2.10" ); - parent->createServerItem( list, "RedHat", "http://bugzilla.redhat.com/bugzilla/", "2.17.1" ); - parent->createServerItem( list, "Mandriva", "http://qa.mandriva.com/", "2.17.4" ); + tqparent->createServerItem( list, "KDE", "http://bugs.kde.org", "KDE" ); + tqparent->createServerItem( list, "GNOME", "http://bugzilla.gnome.org", "2.10" ); + tqparent->createServerItem( list, "Mozilla", "http://bugzilla.mozilla.org", "2.17.1" ); + tqparent->createServerItem( list, "Apache", "http://nagoya.apache.org/bugzilla/", "2.14.2" ); + tqparent->createServerItem( list, "XFree86", "http://bugs.xfree86.org/cgi-bin/bugzilla/", "2.14.2" ); + tqparent->createServerItem( list, "Ximian", "http://bugzilla.ximian.com", "2.10" ); + tqparent->createServerItem( list, "RedHat", "http://bugzilla.redhat.com/bugzilla/", "2.17.1" ); + tqparent->createServerItem( list, "Mandriva", "http://qa.mandriva.com/", "2.17.4" ); connect( list, TQT_SIGNAL( doubleClicked ( TQListViewItem *)), this, TQT_SLOT( slotDoubleClicked( TQListViewItem *))); } diff --git a/kbugbuster/gui/preferencesdialog.h b/kbugbuster/gui/preferencesdialog.h index 89dd7512..209a084c 100644 --- a/kbugbuster/gui/preferencesdialog.h +++ b/kbugbuster/gui/preferencesdialog.h @@ -13,8 +13,9 @@ class ServerListView; class PreferencesDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - PreferencesDialog( TQWidget* parent = 0, const char* name = 0 ); + PreferencesDialog( TQWidget* tqparent = 0, const char* name = 0 ); ~PreferencesDialog(); void createServerItem( ServerListView *listView, const TQString &name, @@ -62,8 +63,9 @@ class ServerItem; class SelectServerDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - SelectServerDlg(PreferencesDialog *parent, const char */*name*/ ); + SelectServerDlg(PreferencesDialog *tqparent, const char */*name*/ ); ServerItem *serverSelected(); protected slots: void slotDoubleClicked( TQListViewItem *); diff --git a/kbugbuster/gui/serverconfigdialog.cpp b/kbugbuster/gui/serverconfigdialog.cpp index feaab83d..99cb28f3 100644 --- a/kbugbuster/gui/serverconfigdialog.cpp +++ b/kbugbuster/gui/serverconfigdialog.cpp @@ -12,8 +12,8 @@ #include <tqvbox.h> #include <tqcombobox.h> -ServerConfigDialog::ServerConfigDialog( TQWidget *parent, const char *name ) : - KDialogBase( parent, name, true, i18n("Edit Bugzilla Server"), Ok|Cancel ) +ServerConfigDialog::ServerConfigDialog( TQWidget *tqparent, const char *name ) : + KDialogBase( tqparent, name, true, i18n("Edit Bugzilla Server"), Ok|Cancel ) { TQWidget *topFrame = makeMainWidget(); diff --git a/kbugbuster/gui/serverconfigdialog.h b/kbugbuster/gui/serverconfigdialog.h index f4b3c2ba..39a0d596 100644 --- a/kbugbuster/gui/serverconfigdialog.h +++ b/kbugbuster/gui/serverconfigdialog.h @@ -11,8 +11,9 @@ class TQComboBox; class ServerConfigDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ServerConfigDialog( TQWidget *parent = 0 , const char *name = 0 ); + ServerConfigDialog( TQWidget *tqparent = 0 , const char *name = 0 ); void setServerConfig( const BugServerConfig & ); BugServerConfig serverConfig(); diff --git a/kbugbuster/gui/severityselectdialog.cpp b/kbugbuster/gui/severityselectdialog.cpp index 0ef4e2f7..c21a5383 100644 --- a/kbugbuster/gui/severityselectdialog.cpp +++ b/kbugbuster/gui/severityselectdialog.cpp @@ -10,10 +10,10 @@ #include "severityselectdialog.h" #include "severityselectdialog.moc" -SeveritySelectDialog::SeveritySelectDialog(TQWidget *parent,const char *name) : - KDialogBase( parent, name, true, i18n("Select Severity"), Ok|Cancel ) +SeveritySelectDialog::SeveritySelectDialog(TQWidget *tqparent,const char *name) : + KDialogBase( tqparent, name, true, i18n("Select Severity"), Ok|Cancel ) { - mButtonGroup = new TQButtonGroup( 1, Horizontal, i18n("Severity"), this ); + mButtonGroup = new TQButtonGroup( 1,Qt::Horizontal, i18n("Severity"), this ); setMainWidget( mButtonGroup ); TQValueList<Bug::Severity> severities = Bug::severities(); diff --git a/kbugbuster/gui/severityselectdialog.h b/kbugbuster/gui/severityselectdialog.h index 150123cd..778f2900 100644 --- a/kbugbuster/gui/severityselectdialog.h +++ b/kbugbuster/gui/severityselectdialog.h @@ -8,8 +8,9 @@ class SeveritySelectDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - SeveritySelectDialog(TQWidget *parent=0,const char *name=0); + SeveritySelectDialog(TQWidget *tqparent=0,const char *name=0); void setSeverity( Bug::Severity ); diff --git a/kbugbuster/kresources/kcalresource.cpp b/kbugbuster/kresources/kcalresource.cpp index 5af8b8be..dd858f18 100644 --- a/kbugbuster/kresources/kcalresource.cpp +++ b/kbugbuster/kresources/kcalresource.cpp @@ -212,7 +212,7 @@ void KCalResource::slotBugListAvailable( const Package &, const TQString &, newTodo = new KCal::Todo; newTodo->setUid( uid ); TQString uri = "http://bugs.kde.org/show_bug.cgi?id=%1"; - newTodo->addAttachment( new KCal::Attachment( uri.arg( bug.number() ) ) ); + newTodo->addAttachment( new KCal::Attachment( uri.tqarg( bug.number() ) ) ); todo = newTodo; } diff --git a/kbugbuster/kresources/kcalresource.h b/kbugbuster/kresources/kcalresource.h index b9683d7e..b852fa26 100644 --- a/kbugbuster/kresources/kcalresource.h +++ b/kbugbuster/kresources/kcalresource.h @@ -51,6 +51,7 @@ class ResourcePrefs; class KCalResource : public KCal::ResourceCached { Q_OBJECT + TQ_OBJECT friend class KCalResourceConfig; diff --git a/kbugbuster/kresources/kcalresourceconfig.cpp b/kbugbuster/kresources/kcalresourceconfig.cpp index 58466642..3ed92e54 100644 --- a/kbugbuster/kresources/kcalresourceconfig.cpp +++ b/kbugbuster/kresources/kcalresourceconfig.cpp @@ -34,8 +34,8 @@ #include "resourceprefs.h" #include "kcalresourceconfig.h" -KCalResourceConfig::KCalResourceConfig( TQWidget* parent, const char* name ) - : KRES::ConfigWidget( parent, name ) +KCalResourceConfig::KCalResourceConfig( TQWidget* tqparent, const char* name ) + : KRES::ConfigWidget( tqparent, name ) { resize( 245, 115 ); diff --git a/kbugbuster/kresources/kcalresourceconfig.h b/kbugbuster/kresources/kcalresourceconfig.h index 6a83ad67..de8eb4d2 100644 --- a/kbugbuster/kresources/kcalresourceconfig.h +++ b/kbugbuster/kresources/kcalresourceconfig.h @@ -34,8 +34,9 @@ class KLineEdit; class KCalResourceConfig : public KRES::ConfigWidget { Q_OBJECT + TQ_OBJECT public: - KCalResourceConfig( TQWidget *parent = 0, const char *name = 0 ); + KCalResourceConfig( TQWidget *tqparent = 0, const char *name = 0 ); public slots: virtual void loadSettings( KRES::Resource *resource ); diff --git a/kcachegrind/converters/hotshot2calltree b/kcachegrind/converters/hotshot2calltree index 4eb8f7de..e5c886a2 100644 --- a/kcachegrind/converters/hotshot2calltree +++ b/kcachegrind/converters/hotshot2calltree @@ -136,7 +136,7 @@ def return_from_call(caller_stack, call_dict, cost_now): call_dict[called[0]] = per_file_dict -def updateStatus(filecount): +def updatetqStatus(filecount): sys.stdout.write("reading File #%d \r" % filecount) sys.stdout.flush() def convertProfFiles(output, inputfilenames): @@ -153,7 +153,7 @@ def convertProfFiles(output, inputfilenames): filecount = 1 number_of_files = len(inputfilenames) for inputfilename in inputfilenames: - updateStatus(filecount) + updatetqStatus(filecount) cost, filecount = convertHandleFilename(inputfilename, caller_stack, call_dict, cost_per_pos, cost_per_function, filecount) total_cost += cost if (file_limit > 0) and (filecount > file_limit): @@ -164,7 +164,7 @@ def convertProfFiles(output, inputfilenames): dumpResults(output, call_dict, total_cost, cost_per_pos, cost_per_function) def convertHandleFilename(inputfilename, caller_stack, call_dict, cost_per_pos, cost_per_function, filecount): - updateStatus(filecount) + updatetqStatus(filecount) if not ((file_limit > 0) and (filecount > file_limit)): if os.path.isdir(inputfilename): cost, filecount = convertProfDir(inputfilename, caller_stack, call_dict, cost_per_pos, cost_per_function, filecount) diff --git a/kcachegrind/converters/memprof2calltree b/kcachegrind/converters/memprof2calltree index e82d6e85..a04eaa38 100755 --- a/kcachegrind/converters/memprof2calltree +++ b/kcachegrind/converters/memprof2calltree @@ -13,8 +13,8 @@ while(<>) { print "\nfn=$1\n"; next; } - if (/^ children:/) { - $next = 1; #children + if (/^ tqchildren:/) { + $next = 1; #tqchildren next; } if (/^ inherited:/) { diff --git a/kcachegrind/kcachegrind.spec.in b/kcachegrind/kcachegrind.spec.in index 060dd28e..5c786a47 100644 --- a/kcachegrind/kcachegrind.spec.in +++ b/kcachegrind/kcachegrind.spec.in @@ -42,9 +42,9 @@ make -j$numprocs make install-strip DESTDIR=$RPM_BUILD_ROOT cd $RPM_BUILD_ROOT -find . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > $RPM_BUILD_DIR/file.list.kcachegrind -find . -type f | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.kcachegrind -find . -type l | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.kcachegrind +tqfind . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > $RPM_BUILD_DIR/file.list.kcachegrind +tqfind . -type f | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.kcachegrind +tqfind . -type l | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.kcachegrind %clean rm -rf $RPM_BUILD_ROOT/* diff --git a/kcachegrind/kcachegrind/cachegrindloader.cpp b/kcachegrind/kcachegrind/cachegrindloader.cpp index 0a146de0..41bfa89e 100644 --- a/kcachegrind/kcachegrind/cachegrindloader.cpp +++ b/kcachegrind/kcachegrind/cachegrindloader.cpp @@ -149,7 +149,7 @@ bool CachegrindLoader::canLoadTrace(TQFile* file) if (!file->isOpen()) { if (!file->open( IO_ReadOnly ) ) { - kdDebug() << TQFile::encodeName(_filename) << ": " + kdDebug() << TQFile::encodeName(_filename).data() << ": " << strerror( errno ) << endl; return false; } @@ -167,7 +167,7 @@ bool CachegrindLoader::canLoadTrace(TQFile* file) TQCString s; s.setRawData(buf, read+1); - int pos = s.find("events:"); + int pos = s.tqfind("events:"); if (pos>0 && buf[pos-1] != '\n') pos = -1; s.resetRawData(buf, read+1); return (pos>=0); @@ -181,8 +181,8 @@ bool CachegrindLoader::loadTrace(TracePart* p) CachegrindLoader l; /* emit progress signals via the singleton loader */ - connect(&l, TQT_SIGNAL(updateStatus(TQString, int)), - this, TQT_SIGNAL(updateStatus(TQString, int))); + connect(&l, TQT_SIGNAL(updatetqStatus(TQString, int)), + this, TQT_SIGNAL(updatetqStatus(TQString, int))); return l.loadTraceInternal(p); } @@ -346,7 +346,7 @@ TraceObject* CachegrindLoader::compressedObject(const TQString& name) if ((name[0] != '(') || !name[1].isDigit()) return _data->object(checkUnknown(name)); // compressed format using _objectVector - int p = name.find(')'); + int p = name.tqfind(')'); if (p<2) { kdError() << _filename << ":" << _lineNo << " - Invalid compressed ELF object ('" @@ -400,7 +400,7 @@ TraceFile* CachegrindLoader::compressedFile(const TQString& name) if ((name[0] != '(') || !name[1].isDigit()) return _data->file(checkUnknown(name)); // compressed format using _fileVector - int p = name.find(')'); + int p = name.tqfind(')'); if (p<2) { kdError() << _filename << ":" << _lineNo << " - Invalid compressed file ('" @@ -457,7 +457,7 @@ TraceFunction* CachegrindLoader::compressedFunction(const TQString& name, return _data->function(checkUnknown(name), file, object); // compressed format using _functionVector - int p = name.find(')'); + int p = name.tqfind(')'); if (p<2) { kdError() << _filename << ":" << _lineNo << " - Invalid compressed function ('" @@ -735,9 +735,9 @@ bool CachegrindLoader::loadTraceInternal(TracePart* part) return false; } kdDebug() << "Loading " << _filename << " ..." << endl; - TQString statusMsg = i18n("Loading %1").arg(_filename); + TQString statusMsg = i18n("Loading %1").tqarg(_filename); int statusProgress = 0; - emit updateStatus(statusMsg,statusProgress); + emit updatetqStatus(statusMsg,statusProgress); #if USE_FIXCOST @@ -815,7 +815,7 @@ bool CachegrindLoader::loadTraceInternal(TracePart* part) * "long operations" (like file loading) are in progress, * this can temporarly switch to another operation. */ - emit updateStatus(statusMsg,statusProgress); + emit updatetqStatus(statusMsg,statusProgress); } continue; @@ -1030,8 +1030,8 @@ bool CachegrindLoader::loadTraceInternal(TracePart* part) // positions: if (line.stripPrefix("ositions:")) { TQString positions(line); - hasLineInfo = (positions.find("line")>=0); - hasAddrInfo = (positions.find("instr")>=0); + hasLineInfo = (positions.tqfind("line")>=0); + hasAddrInfo = (positions.tqfind("instr")>=0); continue; } break; @@ -1308,9 +1308,9 @@ bool CachegrindLoader::loadTraceInternal(TracePart* part) } - emit updateStatus(statusMsg,100); + emit updatetqStatus(statusMsg,100); - _part->invalidate(); + _part->tqinvalidate(); if (!totalsSet) { _part->totals()->clear(); _part->totals()->addCost(_part); diff --git a/kcachegrind/kcachegrind/callgraphview.cpp b/kcachegrind/kcachegrind/callgraphview.cpp index 990d4014..c66c5809 100644 --- a/kcachegrind/kcachegrind/callgraphview.cpp +++ b/kcachegrind/kcachegrind/callgraphview.cpp @@ -174,13 +174,13 @@ TraceCall* GraphNode::visibleCalling() void GraphNode::setCalling(GraphEdge* e) { - _lastCallingIndex = callings.findRef(e); + _lastCallingIndex = callings.tqfindRef(e); _lastFromCaller = false; } void GraphNode::setCaller(GraphEdge* e) { - _lastCallerIndex = callers.findRef(e); + _lastCallerIndex = callers.tqfindRef(e); _lastFromCaller = true; } @@ -303,8 +303,8 @@ GraphEdge::GraphEdge() TQString GraphEdge::prettyName() { if (_c) return _c->prettyName(); - if (_from) return i18n("Call(s) from %1").arg(_from->prettyName()); - if (_to) return i18n("Call(s) to %1").arg(_to->prettyName()); + if (_from) return i18n("Call(s) from %1").tqarg(_from->prettyName()); + if (_to) return i18n("Call(s) to %1").tqarg(_to->prettyName()); return i18n("(unknown call)"); } @@ -369,14 +369,14 @@ TraceCall* GraphEdge::priorVisible() // GraphOptions // -TQString GraphOptions::layoutString(Layout l) +TQString GraphOptions::tqlayoutString(Layout l) { if (l == Circular) return TQString("Circular"); if (l == LeftRight) return TQString("LeftRight"); return TQString("TopDown"); } -GraphOptions::Layout GraphOptions::layout(TQString s) +GraphOptions::Layout GraphOptions::tqlayout(TQString s) { if (s == TQString("Circular")) return Circular; if (s == TQString("LeftRight")) return LeftRight; @@ -413,7 +413,7 @@ GraphExporter::GraphExporter() _go = this; _tmpFile = 0; _item = 0; - reset(0, 0, 0, TraceItem::NoCostType, TQString::null); + reset(0, 0, 0, TraceItem::NoCostType, TQString()); } @@ -467,7 +467,7 @@ void GraphExporter::reset(TraceData*, TraceItem* i, TraceCostType* ct, if (!i) return; if (filename.isEmpty()) { - _tmpFile = new KTempFile(TQString::null, ".dot"); + _tmpFile = new KTempFile(TQString(), ".dot"); _dotName = _tmpFile->name(); _useBox = true; } @@ -519,7 +519,7 @@ void GraphExporter::createGraph() TraceFunction *caller, *called; caller = c->caller(false); called = c->called(false); - QPair<TraceFunction*,TraceFunction*> p(caller, called); + TQPair<TraceFunction*,TraceFunction*> p(caller, called); GraphEdge& e = _edgeMap[p]; e.setCall(c); e.setCaller(p.first); @@ -562,10 +562,10 @@ void GraphExporter::writeDot() *stream << "digraph \"callgraph\" {\n"; - if (_go->layout() == LeftRight) { + if (_go->tqlayout() == LeftRight) { *stream << TQString(" rankdir=LR;\n"); } - else if (_go->layout() == Circular) { + else if (_go->tqlayout() == Circular) { TraceFunction *f = 0; switch(_item->type()) { case TraceItem::Function: @@ -579,7 +579,7 @@ void GraphExporter::writeDot() break; } if (f) - *stream << TQString(" center=F%1;\n").arg((long)f, 0, 16); + *stream << TQString(" center=F%1;\n").tqarg((long)f, 0, 16); *stream << TQString(" overlap=false;\n splines=true;\n"); } @@ -619,7 +619,7 @@ void GraphExporter::writeDot() iabr = iabr.left(Configuration::maxSymbolLength()) + "..."; *stream << TQString("subgraph \"cluster%1\" { label=\"%2\";\n") - .arg(cluster).arg(iabr); + .tqarg(cluster).tqarg(iabr); } GraphNode* np; @@ -630,17 +630,17 @@ void GraphExporter::writeDot() if ((int)abr.length() > Configuration::maxSymbolLength()) abr = abr.left(Configuration::maxSymbolLength()) + "..."; - *stream << TQString(" F%1 [").arg((long)f, 0, 16); + *stream << TQString(" F%1 [").tqarg((long)f, 0, 16); if (_useBox) { // make label 3 lines for CallGraphView - *stream << TQString("shape=box,label=\"** %1 **\\n**\\n%2\"];\n") - .arg(abr) - .arg(SubCost(np->incl).pretty()); + *stream << TQString("tqshape=box,label=\"** %1 **\\n**\\n%2\"];\n") + .tqarg(abr) + .tqarg(SubCost(np->incl).pretty()); } else *stream << TQString("label=\"%1\\n%2\"];\n") - .arg(abr) - .arg(SubCost(np->incl).pretty()); + .tqarg(abr) + .tqarg(SubCost(np->incl).pretty()); } if (_go->clusterGroups() && i) @@ -675,17 +675,17 @@ void GraphExporter::writeDot() to.callerSet.remove(&e); *stream << TQString(" F%1 -> F%2 [weight=%3") - .arg((long)e.from(), 0, 16) - .arg((long)e.to(), 0, 16) - .arg((long)log(log(e.cost))); + .tqarg((long)e.from(), 0, 16) + .tqarg((long)e.to(), 0, 16) + .tqarg((long)log(log(e.cost))); if (_go->detailLevel() ==1) *stream << TQString(",label=\"%1\"") - .arg(SubCost(e.cost).pretty()); + .tqarg(SubCost(e.cost).pretty()); else if (_go->detailLevel() ==2) *stream << TQString(",label=\"%3\\n%4 x\"") - .arg(SubCost(e.cost).pretty()) - .arg(SubCost(e.count).pretty()); + .tqarg(SubCost(e.cost).pretty()) + .tqarg(SubCost(e.count).pretty()); *stream << TQString("];\n"); } @@ -707,20 +707,20 @@ void GraphExporter::writeDot() } if (costSum > _realCallLimit) { - QPair<TraceFunction*,TraceFunction*> p(0, n.function()); + TQPair<TraceFunction*,TraceFunction*> p(0, n.function()); e = &(_edgeMap[p]); e->setCalling(p.second); e->cost = costSum; e->count = countSum; - *stream << TQString(" R%1 [shape=point,label=\"\"];\n") - .arg((long)n.function(), 0, 16); + *stream << TQString(" R%1 [tqshape=point,label=\"\"];\n") + .tqarg((long)n.function(), 0, 16); *stream << TQString(" R%1 -> F%2 [label=\"%3\\n%4 x\",weight=%5];\n") - .arg((long)n.function(), 0, 16) - .arg((long)n.function(), 0, 16) - .arg(SubCost(costSum).pretty()) - .arg(SubCost(countSum).pretty()) - .arg((int)log(costSum)); + .tqarg((long)n.function(), 0, 16) + .tqarg((long)n.function(), 0, 16) + .tqarg(SubCost(costSum).pretty()) + .tqarg(SubCost(countSum).pretty()) + .tqarg((int)log(costSum)); } costSum = countSum = 0.0; @@ -730,20 +730,20 @@ void GraphExporter::writeDot() } if (costSum > _realCallLimit) { - QPair<TraceFunction*,TraceFunction*> p(n.function(), 0); + TQPair<TraceFunction*,TraceFunction*> p(n.function(), 0); e = &(_edgeMap[p]); e->setCaller(p.first); e->cost = costSum; e->count = countSum; - *stream << TQString(" S%1 [shape=point,label=\"\"];\n") - .arg((long)n.function(), 0, 16); + *stream << TQString(" S%1 [tqshape=point,label=\"\"];\n") + .tqarg((long)n.function(), 0, 16); *stream << TQString(" F%1 -> S%2 [label=\"%3\\n%4 x\",weight=%5];\n") - .arg((long)n.function(), 0, 16) - .arg((long)n.function(), 0, 16) - .arg(SubCost(costSum).pretty()) - .arg(SubCost(countSum).pretty()) - .arg((int)log(costSum)); + .tqarg((long)n.function(), 0, 16) + .tqarg((long)n.function(), 0, 16) + .tqarg(SubCost(costSum).pretty()) + .tqarg(SubCost(countSum).pretty()) + .tqarg((int)log(costSum)); } } } @@ -797,7 +797,7 @@ GraphNode* GraphExporter::node(TraceFunction* f) { if (!f) return 0; - GraphNodeMap::Iterator it = _nodeMap.find(f); + GraphNodeMap::Iterator it = _nodeMap.tqfind(f); if (it == _nodeMap.end()) return 0; return &(*it); @@ -805,7 +805,7 @@ GraphNode* GraphExporter::node(TraceFunction* f) GraphEdge* GraphExporter::edge(TraceFunction* f1, TraceFunction* f2) { - GraphEdgeMap::Iterator it = _edgeMap.find(qMakePair(f1, f2)); + GraphEdgeMap::Iterator it = _edgeMap.tqfind(tqMakePair(f1, f2)); if (it == _edgeMap.end()) return 0; return &(*it); @@ -890,7 +890,7 @@ void GraphExporter::buildGraph(TraceFunction* f, int d, // if (count>0.0 && (cost/count < 3)) continue; double oldCost = 0.0; - QPair<TraceFunction*,TraceFunction*> p(toCallings ? f:f2, + TQPair<TraceFunction*,TraceFunction*> p(toCallings ? f:f2, toCallings ? f2:f); GraphEdge& e = _edgeMap[p]; if (e.call() == 0) { @@ -910,7 +910,7 @@ void GraphExporter::buildGraph(TraceFunction* f, int d, if (f2->cycle() == f2) { TraceFunction* realF; realF = toCallings ? call->called(true) : call->caller(true); - QPair<TraceFunction*,TraceFunction*> realP(toCallings ? f:realF, + TQPair<TraceFunction*,TraceFunction*> realP(toCallings ? f:realF, toCallings ? realF:f); GraphEdge& e = _edgeMap[realP]; if (e.call() == 0) { @@ -927,14 +927,14 @@ void GraphExporter::buildGraph(TraceFunction* f, int d, if (call->isRecursion()) continue; if (toCallings) { - GraphEdgeSet::Iterator it = n.callingSet.find(&e); + GraphEdgeSet::Iterator it = n.callingSet.tqfind(&e); if (it == n.callingSet.end()) { n.callings.append(&e); n.callingSet.insert(&e, 1 ); } } else { - GraphEdgeSet::Iterator it = n.callerSet.find(&e); + GraphEdgeSet::Iterator it = n.callerSet.tqfind(&e); if (it == n.callerSet.end()) { n.callers.append(&e); n.callerSet.insert(&e, 1 ); @@ -963,14 +963,14 @@ void GraphExporter::buildGraph(TraceFunction* f, int d, // // PannerView // -PannerView::PannerView(TQWidget * parent, const char * name) - : TQCanvasView(parent, name, WNoAutoErase | WStaticContents) +PannerView::PannerView(TQWidget * tqparent, const char * name) + : TQCanvasView(tqparent, name, WNoAutoErase | WStaticContents) { _movingZoomRect = false; // why doesn't this avoid flicker ? - viewport()->setBackgroundMode(Qt::NoBackground); - setBackgroundMode(Qt::NoBackground); + viewport()->setBackgroundMode(TQt::NoBackground); + setBackgroundMode(TQt::NoBackground); } void PannerView::setZoomRect(TQRect r) @@ -1000,7 +1000,7 @@ void PannerView::drawContents(TQPainter * p, int clipx, int clipy, int clipw, in void PannerView::contentsMousePressEvent(TQMouseEvent* e) { if (_zoomRect.isValid()) { - if (!_zoomRect.contains(e->pos())) + if (!_zoomRect.tqcontains(e->pos())) emit zoomRectMoved(e->pos().x() - _zoomRect.center().x(), e->pos().y() - _zoomRect.center().y()); @@ -1057,15 +1057,15 @@ CanvasNode::CanvasNode(CallGraphView* v, GraphNode* n, totalCost = (TraceCost*) _view->activeItem(); } else - totalCost = _view->data(); + totalCost = _view->TraceItemView::data(); double total = totalCost->subCost(_view->costType()); double inclP = 100.0 * n->incl / total; if (_view->topLevel()->showPercentage()) setText(1, TQString("%1 %") - .arg(inclP, 0, 'f', Configuration::percentPrecision())); + .tqarg(inclP, 0, 'f', Configuration::percentPrecision())); else setText(1, SubCost(n->incl).pretty()); - setPixmap(1, percentagePixmap(25,10,(int)(inclP+.5), Qt::blue, true)); + setPixmap(1, percentagePixmap(25,10,(int)(inclP+.5), TQt::blue, true)); } void CanvasNode::setSelected(bool s) @@ -1095,8 +1095,8 @@ void CanvasNode::drawShape(TQPainter& p) r.setRect(r.x()+2, r.y()+2, r.width()-4, r.height()-4); if (StoredDrawParams::selected() && _view->hasFocus()) { - _view->style().drawPrimitive( TQStyle::PE_FocusRect, &p, r, - _view->colorGroup()); + _view->tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, r, + _view->tqcolorGroup()); } // draw afterwards to always get a frame even when zoomed @@ -1121,7 +1121,7 @@ CanvasEdgeLabel::CanvasEdgeLabel(CallGraphView* v, CanvasEdge* ce, if (!e) return; setPosition(1, DrawParams::TopCenter); - setText(1, TQString("%1 x").arg(SubCost(e->count).pretty())); + setText(1, TQString("%1 x").tqarg(SubCost(e->count).pretty())); setPosition(0, DrawParams::BottomCenter); @@ -1137,15 +1137,15 @@ CanvasEdgeLabel::CanvasEdgeLabel(CallGraphView* v, CanvasEdge* ce, totalCost = (TraceCost*) _view->activeItem(); } else - totalCost = _view->data(); + totalCost = _view->TraceItemView::data(); double total = totalCost->subCost(_view->costType()); double inclP = 100.0 * e->cost / total; if (_view->topLevel()->showPercentage()) setText(0, TQString("%1 %") - .arg(inclP, 0, 'f', Configuration::percentPrecision())); + .tqarg(inclP, 0, 'f', Configuration::percentPrecision())); else setText(0, SubCost(e->cost).pretty()); - setPixmap(0, percentagePixmap(25,10,(int)(inclP+.5), Qt::blue, true)); + setPixmap(0, percentagePixmap(25,10,(int)(inclP+.5), TQt::blue, true)); if (e->call() && (e->call()->isRecursion() || e->call()->inCycle())) { TQString icon = "undo"; @@ -1175,7 +1175,7 @@ CanvasEdgeArrow::CanvasEdgeArrow(CanvasEdge* ce, TQCanvas* c) void CanvasEdgeArrow::drawShape(TQPainter& p) { - if (_ce->isSelected()) p.setBrush(Qt::red); + if (_ce->isSelected()) p.setBrush(TQt::red); TQCanvasPolygon::drawShape(p); } @@ -1237,7 +1237,7 @@ TQPointArray CanvasEdge::areaPoints() const void CanvasEdge::drawShape(TQPainter& p) { - if (isSelected()) p.setPen(Qt::red); + if (isSelected()) p.setPen(TQt::red); p.drawPolyline(poly); } @@ -1265,9 +1265,9 @@ CanvasFrame::CanvasFrame(CanvasNode* n, TQCanvas* c) } _p = new TQPixmap(r.size()); - _p->fill(Qt::white); + _p->fill(TQt::white); TQPainter p(_p); - p.setPen(Qt::NoPen); + p.setPen(TQt::NoPen); r.moveBy(-r.x(), -r.y()); @@ -1302,7 +1302,7 @@ void CanvasFrame::drawShape(TQPainter& p) // Tooltips for CallGraphView // -class CallGraphTip: public QToolTip +class CallGraphTip: public TQToolTip { public: CallGraphTip( TQWidget* p ):TQToolTip(p) {} @@ -1313,8 +1313,8 @@ protected: void CallGraphTip::maybeTip( const TQPoint& pos ) { - if (!parentWidget()->inherits( "CallGraphView" )) return; - CallGraphView* cgv = (CallGraphView*)parentWidget(); + if (!tqparentWidget()->inherits( "CallGraphView" )) return; + CallGraphView* cgv = (CallGraphView*)tqparentWidget(); TQPoint cPos = cgv->viewportToContents(pos); @@ -1331,7 +1331,7 @@ void CallGraphTip::maybeTip( const TQPoint& pos ) if (0) qDebug("CallGraphTip: Mouse on Node '%s'", n->function()->prettyName().ascii()); - TQString tipStr = TQString("%1 (%2)").arg(cn->text(0)).arg(cn->text(1)); + TQString tipStr = TQString("%1 (%2)").tqarg(cn->text(0)).tqarg(cn->text(1)); TQPoint vPosTL = cgv->contentsToViewport(i->boundingRect().topLeft()); TQPoint vPosBR = cgv->contentsToViewport(i->boundingRect().bottomRight()); tip(TQRect(vPosTL, vPosBR), tipStr); @@ -1356,7 +1356,7 @@ void CallGraphTip::maybeTip( const TQPoint& pos ) tipStr = e->prettyName(); else tipStr = TQString("%1 (%2)") - .arg(ce->label()->text(0)).arg(ce->label()->text(1)); + .tqarg(ce->label()->text(0)).tqarg(ce->label()->text(1)); tip(TQRect(pos.x()-5,pos.y()-5,pos.x()+5,pos.y()+5), tipStr); } } @@ -1367,9 +1367,9 @@ void CallGraphTip::maybeTip( const TQPoint& pos ) // // CallGraphView // -CallGraphView::CallGraphView(TraceItemView* parentView, - TQWidget* parent, const char* name) - : TQCanvasView(parent, name), TraceItemView(parentView) +CallGraphView::CallGraphView(TraceItemView* tqparentView, + TQWidget* tqparent, const char* name) + : TQCanvasView(tqparent, name), TraceItemView(tqparentView) { _zoomPosition = DEFAULT_ZOOMPOS; _lastAutoPosition = TopLeft; @@ -1388,8 +1388,8 @@ CallGraphView::CallGraphView(TraceItemView* parentView, _completeView->raise(); _completeView->hide(); - setFocusPolicy(TQWidget::StrongFocus); - setBackgroundMode(Qt::NoBackground); + setFocusPolicy(TQ_StrongFocus); + setBackgroundMode(TQt::NoBackground); connect(this, TQT_SIGNAL(contentsMoving(int,int)), this, TQT_SLOT(contentsMovingSlot(int,int))); @@ -1589,7 +1589,7 @@ void CallGraphView::keyPressEvent(TQKeyEvent* e) TraceFunction* f = 0; TraceCall* c = 0; - // rotate arrow key meaning for LeftRight layout + // rotate arrow key meaning for LeftRight tqlayout int key = e->key(); if (_layout == LeftRight) { switch(key) { @@ -1745,7 +1745,7 @@ void CallGraphView::doUpdate(int changeType) } if (changeType & dataChanged) { - // invalidate old selection and graph part + // tqinvalidate old selection and graph part _exporter.reset(_data, _activeItem, _costType, _groupType); _selectedNode = 0; _selectedEdge = 0; @@ -1786,14 +1786,14 @@ void CallGraphView::showRenderWarning() TQString s; if (_renderProcess) - s =i18n("Warning: a long lasting graph layouting is in progress.\n" + s =i18n("Warning: a long lasting graph tqlayouting is in progress.\n" "Reduce node/edge limits for speedup.\n"); else s = i18n("Layouting stopped.\n"); s.append(i18n("The call graph has %1 nodes and %2 edges.\n") - .arg(_exporter.nodeCount()) - .arg(_exporter.edgeCount())); + .tqarg(_exporter.nodeCount()) + .tqarg(_exporter.edgeCount())); showText(s); } @@ -1805,7 +1805,7 @@ void CallGraphView::stopRendering() _renderProcess->kill(); delete _renderProcess; _renderProcess = 0; - _unparsedOutput = TQString::null; + _unparsedOutput = TQString(); _renderTimer.start(200, true); } @@ -1846,7 +1846,7 @@ void CallGraphView::refresh() _exporter.reset(_data, _activeItem, _costType, _groupType); _exporter.writeDot(); - _renderProcess = new TQProcess(this); + _renderProcess = new TQProcess(TQT_TQOBJECT(this)); if (_layout == GraphOptions::Circular) _renderProcess->addArgument( "twopi" ); else @@ -1866,7 +1866,7 @@ void CallGraphView::refresh() if ( !_renderProcess->start() ) { TQString e = i18n("No call graph is available because the following\n" "command cannot be run:\n'%1'\n") - .arg(_renderProcess->arguments().join(" ")); + .tqarg(_renderProcess->arguments().join(" ")); e += i18n("Please check that 'dot' is installed (package GraphViz)."); showText(e); @@ -1876,9 +1876,9 @@ void CallGraphView::refresh() return; } - _unparsedOutput = TQString::null; + _unparsedOutput = TQString(); - // layouting of more than seconds is dubious + // tqlayouting of more than seconds is dubious _renderTimer.start(1000, true); } @@ -2003,7 +2003,7 @@ void CallGraphView::dotExited() w = 10, h = 10; eItem = new TQCanvasEllipse(w, h, _canvas); eItem->move(xx, yy); - eItem->setBrush(Qt::gray); + eItem->setBrush(TQt::gray); eItem->setZ(1.0); eItem->show(); continue; @@ -2074,11 +2074,11 @@ void CallGraphView::dotExited() } // calls into/out of cycles are special: make them blue - TQColor arrowColor = Qt::black; + TQColor arrowColor = TQt::black; TraceFunction* caller = e->fromNode() ? e->fromNode()->function() : 0; TraceFunction* called = e->toNode() ? e->toNode()->function() : 0; if ( (caller && (caller->cycle() == caller)) || - (called && (called->cycle() == called)) ) arrowColor = Qt::blue; + (called && (called->cycle() == called)) ) arrowColor = TQt::blue; sItem = new CanvasEdge(e, _canvas); e->setCanvasEdge(sItem); @@ -2195,7 +2195,7 @@ void CallGraphView::dotExited() if (!_canvas) { _canvas = new TQCanvas(size().width(),size().height()); - TQString s = i18n("Error running the graph layouting tool.\n"); + TQString s = i18n("Error running the graph tqlayouting tool.\n"); s += i18n("Please check that 'dot' is installed (package GraphViz)."); TQCanvasText* t = new TQCanvasText(s, _canvas); t->move(5, 5); @@ -2206,8 +2206,8 @@ void CallGraphView::dotExited() TQString s = i18n("There is no call graph available for function\n" "\t'%1'\n" "because it has no cost of the selected event type."); - TQCanvasText* t = new TQCanvasText(s.arg(_activeItem->name()), _canvas); - // t->setTextFlags(Qt::AlignHCenter | Qt::AlignVCenter); + TQCanvasText* t = new TQCanvasText(s.tqarg(_activeItem->name()), _canvas); + // t->setTextFlags(TQt::AlignHCenter | TQt::AlignVCenter); t->move(5,5); t->show(); center(0,0); @@ -2394,10 +2394,10 @@ void CallGraphView::contentsContextMenuEvent(TQContextMenuEvent* e) TQString name = f->prettyName(); popup.insertItem(i18n("Go to '%1'") - .arg(Configuration::shortenSymbol(name)), 93); + .tqarg(Configuration::shortenSymbol(name)), 93); if (cycle && (cycle != f)) { name = Configuration::shortenSymbol(cycle->prettyName()); - popup.insertItem(i18n("Go to '%1'").arg(name), 94); + popup.insertItem(i18n("Go to '%1'").tqarg(name), 94); } popup.insertSeparator(); } @@ -2416,7 +2416,7 @@ void CallGraphView::contentsContextMenuEvent(TQContextMenuEvent* e) if (c) { TQString name = c->prettyName(); popup.insertItem(i18n("Go to '%1'") - .arg(Configuration::shortenSymbol(name)), 95); + .tqarg(Configuration::shortenSymbol(name)), 95); popup.insertSeparator(); } @@ -2457,7 +2457,7 @@ void CallGraphView::contentsContextMenuEvent(TQContextMenuEvent* e) case 10: gpopup1.setItemChecked(104,true); break; case 15: gpopup1.setItemChecked(105,true); break; default: - gpopup1.insertItem(i18n("< %1").arg(_maxCallerDepth), 106); + gpopup1.insertItem(i18n("< %1").tqarg(_maxCallerDepth), 106); gpopup1.setItemChecked(106,true); break; } @@ -2480,7 +2480,7 @@ void CallGraphView::contentsContextMenuEvent(TQContextMenuEvent* e) case 10: gpopup2.setItemChecked(114,true); break; case 15: gpopup2.setItemChecked(115,true); break; default: - gpopup2.insertItem(i18n("< %1").arg(_maxCallingDepth), 116); + gpopup2.insertItem(i18n("< %1").tqarg(_maxCallingDepth), 116); gpopup2.setItemChecked(116,true); break; } @@ -2584,7 +2584,7 @@ void CallGraphView::contentsContextMenuEvent(TQContextMenuEvent* e) TraceFunction* f = activeFunction(); if (!f) break; - GraphExporter ge(data(), f, costType(), groupType(), + GraphExporter ge(TraceItemView::data(), f, costType(), groupType(), TQString("callgraph.dot")); ge.setGraphOptions(this); ge.writeDot(); @@ -2701,8 +2701,8 @@ void CallGraphView::readViewConfig(KConfig* c, _clusterGroups = g->readBoolEntry("ClusterGroups", DEFAULT_CLUSTERGROUPS); _detailLevel = g->readNumEntry("DetailLevel", DEFAULT_DETAILLEVEL); - _layout = GraphOptions::layout(g->readEntry("Layout", - layoutString(DEFAULT_LAYOUT))); + _layout = GraphOptions::tqlayout(g->readEntry("Layout", + tqlayoutString(DEFAULT_LAYOUT))); _zoomPosition = zoomPos(g->readEntry("ZoomPosition", zoomPosString(DEFAULT_ZOOMPOS))); @@ -2724,7 +2724,7 @@ void CallGraphView::saveViewConfig(KConfig* c, DEFAULT_CLUSTERGROUPS); writeConfigEntry(&g, "DetailLevel", _detailLevel, DEFAULT_DETAILLEVEL); writeConfigEntry(&g, "Layout", - layoutString(_layout), layoutString(DEFAULT_LAYOUT).utf8().data()); + tqlayoutString(_layout), tqlayoutString(DEFAULT_LAYOUT).utf8().data()); writeConfigEntry(&g, "ZoomPosition", zoomPosString(_zoomPosition), zoomPosString(DEFAULT_ZOOMPOS).utf8().data()); diff --git a/kcachegrind/kcachegrind/callgraphview.h b/kcachegrind/kcachegrind/callgraphview.h index 47fee79b..2e15022d 100644 --- a/kcachegrind/kcachegrind/callgraphview.h +++ b/kcachegrind/kcachegrind/callgraphview.h @@ -150,7 +150,7 @@ public: typedef TQMap<TraceFunction*, GraphNode> GraphNodeMap; -typedef TQMap<QPair<TraceFunction*, TraceFunction*>, GraphEdge> GraphEdgeMap; +typedef TQMap<TQPair<TraceFunction*, TraceFunction*>, GraphEdge> GraphEdgeMap; /* Abstract Interface for graph options */ @@ -167,10 +167,10 @@ class GraphOptions virtual bool expandCycles() = 0; virtual bool clusterGroups() = 0; virtual int detailLevel() = 0; - virtual Layout layout() = 0; + virtual Layout tqlayout() = 0; - static TQString layoutString(Layout); - static Layout layout(TQString); + static TQString tqlayoutString(Layout); + static Layout tqlayout(TQString); }; /* Graph Options Storage */ @@ -188,7 +188,7 @@ class StorableGraphOptions: public GraphOptions virtual bool expandCycles() { return _expandCycles; } virtual bool clusterGroups() { return _clusterGroups; } virtual int detailLevel() { return _detailLevel; } - virtual Layout layout() { return _layout; } + virtual Layout tqlayout() { return _layout; } // setters void setMaxCallerDepth(int d) { _maxCallerDepth = d; } @@ -220,11 +220,11 @@ class GraphExporter: public StorableGraphOptions public: GraphExporter(); GraphExporter(TraceData*, TraceFunction*, TraceCostType*, - TraceItem::CostType, TQString filename = TQString::null); + TraceItem::CostType, TQString filename = TQString()); virtual ~GraphExporter(); void reset(TraceData*, TraceItem*, TraceCostType*, - TraceItem::CostType, TQString filename = TQString::null); + TraceItem::CostType, TQString filename = TQString()); TQString filename() { return _dotName; } int edgeCount() { return _edgeMap.count(); } @@ -240,7 +240,7 @@ public: // calls createGraph before dumping of not already created void writeDot(); - // to map back to structures when parsing a layouted graph + // to map back to structures when parsing a tqlayouted graph /* <toFunc> is a helper for node() and edge(). * Don't use the returned pointer directly, but only with @@ -279,14 +279,15 @@ private: }; /** - * A panner layed over a QCanvas + * A panner layed over a TQCanvas */ -class PannerView: public QCanvasView +class PannerView: public TQCanvasView { Q_OBJECT + TQ_OBJECT public: - PannerView(TQWidget * parent = 0, const char * name = 0); + PannerView(TQWidget * tqparent = 0, const char * name = 0); void setZoomRect(TQRect r); @@ -353,7 +354,7 @@ private: CallGraphView* _view; }; -class CanvasEdgeArrow: public QCanvasPolygon +class CanvasEdgeArrow: public TQCanvasPolygon { public: CanvasEdgeArrow(CanvasEdge*, TQCanvas*); @@ -368,7 +369,7 @@ private: }; -class CanvasEdge: public QCanvasSpline +class CanvasEdge: public TQCanvasSpline { public: CanvasEdge(GraphEdge*, TQCanvas*); @@ -392,7 +393,7 @@ private: }; -class CanvasFrame: public QCanvasRectangle +class CanvasFrame: public TQCanvasRectangle { public: CanvasFrame( CanvasNode*, TQCanvas *canvas ); @@ -416,12 +417,13 @@ class CallGraphView: public TQCanvasView, public TraceItemView, public StorableGraphOptions { Q_OBJECT + TQ_OBJECT public: enum ZoomPosition { TopLeft, TopRight, BottomLeft, BottomRight, Auto }; - CallGraphView(TraceItemView* parentView, - TQWidget* parent=0, const char* name=0); + CallGraphView(TraceItemView* tqparentView, + TQWidget* tqparent=0, const char* name=0); ~CallGraphView(); void readViewConfig(KConfig*, TQString prefix, TQString postfix, bool); diff --git a/kcachegrind/kcachegrind/callitem.cpp b/kcachegrind/kcachegrind/callitem.cpp index ebca4903..3667f668 100644 --- a/kcachegrind/kcachegrind/callitem.cpp +++ b/kcachegrind/kcachegrind/callitem.cpp @@ -34,8 +34,8 @@ // CallItem -CallItem::CallItem(CallView* view, TQListView* parent, TraceCall* c) - : TQListViewItem(parent) +CallItem::CallItem(CallView* view, TQListView* tqparent, TraceCall* c) + : TQListViewItem(tqparent) { _call = c; _view = view; @@ -110,7 +110,7 @@ void CallItem::updateCost() if (_view->topLevel()->showPercentage()) setText(0, TQString("%1") - .arg(sum, 0, 'f', Configuration::percentPrecision())); + .tqarg(sum, 0, 'f', Configuration::percentPrecision())); else setText(0, _call->prettySubCost(ct)); @@ -134,7 +134,7 @@ void CallItem::updateCost() if (_view->topLevel()->showPercentage()) setText(1, TQString("%1") - .arg(sum, 0, 'f', Configuration::percentPrecision())); + .tqarg(sum, 0, 'f', Configuration::percentPrecision())); else setText(1, _call->prettySubCost(ct2)); diff --git a/kcachegrind/kcachegrind/callitem.h b/kcachegrind/kcachegrind/callitem.h index 4eb0ebb0..94191b8f 100644 --- a/kcachegrind/kcachegrind/callitem.h +++ b/kcachegrind/kcachegrind/callitem.h @@ -28,7 +28,7 @@ class CallView; -class CallItem: public QListViewItem +class CallItem: public TQListViewItem { public: CallItem(CallView*, TQListView*, TraceCall* c); diff --git a/kcachegrind/kcachegrind/callmapview.cpp b/kcachegrind/kcachegrind/callmapview.cpp index 95930afe..53727a2d 100644 --- a/kcachegrind/kcachegrind/callmapview.cpp +++ b/kcachegrind/kcachegrind/callmapview.cpp @@ -50,9 +50,9 @@ #define DEFAULT_MAXAREA 100 -CallMapView::CallMapView(bool showCallers, TraceItemView* parentView, - TQWidget* parent, const char* name) - : TreeMapWidget(new CallMapBaseItem(), parent, name), TraceItemView(parentView) +CallMapView::CallMapView(bool showCallers, TraceItemView* tqparentView, + TQWidget* tqparent, const char* name) + : TreeMapWidget(new CallMapBaseItem(), tqparent, name), TraceItemView(tqparentView) { _showCallers = showCallers; @@ -115,12 +115,12 @@ TQString CallMapView::whatsThis() const "choose 'Hide incorrect borders'. As this mode can be " "<em>very</em> time consuming, you may want to limit " "the maximum drawn nesting level before. " - "'Best' determinates the split direction for children " - "from the aspect ratio of the parent. " + "'Best' determinates the split direction for tqchildren " + "from the aspect ratio of the tqparent. " "'Always Best' decides on remaining space for each " "sibling. " "'Ignore Proportions' takes space for function name " - "drawing <em>before</em> drawing children. Note that " + "drawing <em>before</em> drawing tqchildren. Note that " "size proportions can get <em>heavily</em> wrong.</p>" "<p>This is a <em>TreeMap</em> widget. " @@ -171,7 +171,7 @@ void CallMapView::context(TreeMapItem* i,const TQPoint & p) if ((int)name.length()>Configuration::maxSymbolLength()) name = name.left(Configuration::maxSymbolLength()) + "..."; fpopup.insertItem(name, 101+count); - item = item->parent(); + item = item->tqparent(); count++; } popup.insertSeparator(); @@ -196,13 +196,13 @@ void CallMapView::context(TreeMapItem* i,const TQPoint & p) if (i) { l1popup.insertSeparator(); l1popup.insertItem(i18n("Depth of '%1' (%2)") - .arg(shortCurrentName).arg(i->depth()), 55); + .tqarg(shortCurrentName).tqarg(i->depth()), 55); l1popup.setItemChecked(55, maxDepth == i->depth()); } if (maxDepth>0) { l1popup.insertSeparator(); - l1popup.insertItem(i18n("Decrement Depth (to %1)").arg(maxDepth-1), 56); - l1popup.insertItem(i18n("Increment Depth (to %1)").arg(maxDepth+1), 57); + l1popup.insertItem(i18n("Decrement Depth (to %1)").tqarg(maxDepth-1), 56); + l1popup.insertItem(i18n("Increment Depth (to %1)").tqarg(maxDepth+1), 57); } l2popup.setCheckable(true); @@ -223,7 +223,7 @@ void CallMapView::context(TreeMapItem* i,const TQPoint & p) l2popup.setItemChecked(201+count, true); foundStopName = true; } - item = item->parent(); + item = item->tqparent(); count++; } } @@ -256,15 +256,15 @@ void CallMapView::context(TreeMapItem* i,const TQPoint & p) currentArea = i->width() * i->height(); l3popup.insertSeparator(); l3popup.insertItem(i18n("Area of '%1' (%2)") - .arg(shortCurrentName).arg(currentArea), 67); + .tqarg(shortCurrentName).tqarg(currentArea), 67); l3popup.setItemChecked(67, mArea == currentArea); } if (mArea>0) { l3popup.insertSeparator(); l3popup.insertItem(i18n("Double Area Limit (to %1)") - .arg(mArea*2), 68); + .tqarg(mArea*2), 68); l3popup.insertItem(i18n("Half Area Limit (to %1)") - .arg(mArea/2), 69); + .tqarg(mArea/2), 69); } popup.insertSeparator(); @@ -326,7 +326,7 @@ void CallMapView::context(TreeMapItem* i,const TQPoint & p) if (r>100 && r<150) { r -= 100; while (i && (r>1)) { - i=i->parent(); + i=i->tqparent(); r--; } activatedSlot(i); @@ -336,7 +336,7 @@ void CallMapView::context(TreeMapItem* i,const TQPoint & p) if (r>200 && r<250) { r -= 200; while (i && (r>1)) { - i=i->parent(); + i=i->tqparent(); r--; } if (i) @@ -389,7 +389,7 @@ void CallMapView::context(TreeMapItem* i,const TQPoint & p) case 56: setMaxDrawingDepth(maxDepth-1); break; case 57: setMaxDrawingDepth(maxDepth+1); break; - case 200: setFieldStop(0, TQString::null); break; + case 200: setFieldStop(0, TQString()); break; case 60: setMinimalArea(-1); break; case 61: setMinimalArea(10); break; @@ -428,7 +428,7 @@ void CallMapView::selectedSlot(TreeMapItem* item, bool kbd) if (item->text(0).isEmpty()) return; if (kbd) { - TQString msg = i18n("Call Map: Current is '%1'").arg(item->text(0)); + TQString msg = i18n("Call Map: Current is '%1'").tqarg(item->text(0)); if (_topLevel) _topLevel->showMessage(msg, 5000); } @@ -531,7 +531,7 @@ void CallMapView::doUpdate(int changeType) TQColor CallMapView::groupColor(TraceFunction* f) const { if (!f) - return colorGroup().button(); + return tqcolorGroup().button(); return Configuration::functionColor(_groupType, f); } @@ -556,7 +556,7 @@ TQString CallMapView::tipString(TreeMapItem* i) const if (!tip.isEmpty()) tip += "\n"; tip += itemTip; - i = i->parent(); + i = i->tqparent(); count++; } if (count == Configuration::maxSymbolCount()) tip += "\n..."; @@ -601,11 +601,11 @@ TQString CallMapBaseItem::text(int textNo) const return _f->prettyName(); } - if (!_f) return TQString::null; + if (!_f) return TQString(); if (textNo == 2) return _f->prettyLocation(); if (textNo == 3) return _f->calledCount().pretty(); - if (textNo != 1) return TQString::null; + if (textNo != 1) return TQString(); TraceCostType* ct = ((CallMapView*)widget())->costType(); TraceCost* t = ((CallMapView*)widget())->totalCost(); @@ -618,7 +618,7 @@ TQString CallMapBaseItem::text(int textNo) const sum = 100.0 * _f->inclusive()->subCost(ct) / total; return TQString("%1 %") - .arg(sum, 0, 'f', Configuration::percentPrecision()); + .tqarg(sum, 0, 'f', Configuration::percentPrecision()); } return _f->inclusive()->prettySubCost(ct); } @@ -663,7 +663,7 @@ bool CallMapBaseItem::isMarked(int) const return ((CallMapView*)widget())->selectedItem() == _f; } -TreeMapItemList* CallMapBaseItem::children() +TreeMapItemList* CallMapBaseItem::tqchildren() { if (_f && !initialized()) { CallMapView* w = (CallMapView*)widget(); @@ -706,7 +706,7 @@ TreeMapItemList* CallMapBaseItem::children() setSorting(-2, false); } - return _children; + return _tqchildren; } TQColor CallMapBaseItem::backColor() const @@ -745,7 +745,7 @@ TQString CallMapCallingItem::text(int textNo) const if (textNo == 2) return _c->called()->prettyLocation(); if (textNo == 3) return SubCost(_factor * _c->callCount()).pretty(); - if (textNo != 1) return TQString::null; + if (textNo != 1) return TQString(); TraceCostType* ct; ct = ((CallMapView*)widget())->costType(); @@ -756,7 +756,7 @@ TQString CallMapCallingItem::text(int textNo) const TraceCost* t = ((CallMapView*)widget())->totalCost(); double p = 100.0 * _factor * _c->subCost(ct) / t->subCost(ct); return TQString("%1 %") - .arg(p, 0, 'f', Configuration::percentPrecision()); + .tqarg(p, 0, 'f', Configuration::percentPrecision()); } return val.pretty(); } @@ -792,7 +792,7 @@ bool CallMapCallingItem::isMarked(int) const } -TreeMapItemList* CallMapCallingItem::children() +TreeMapItemList* CallMapCallingItem::tqchildren() { if (!initialized()) { if (0) qDebug("Create Calling subitems (%s)", path(0).join("/").ascii()); @@ -832,7 +832,7 @@ TreeMapItemList* CallMapCallingItem::children() setSorting(-2, false); } - return _children; + return _tqchildren; } @@ -862,7 +862,7 @@ TQString CallMapCallerItem::text(int textNo) const if (textNo == 2) return _c->caller()->prettyLocation(); if (textNo == 3) return SubCost(_factor * _c->callCount()).pretty(); - if (textNo != 1) return TQString::null; + if (textNo != 1) return TQString(); TraceCostType* ct; ct = ((CallMapView*)widget())->costType(); @@ -872,7 +872,7 @@ TQString CallMapCallerItem::text(int textNo) const TraceCost* t = ((CallMapView*)widget())->totalCost(); double p = 100.0 * _factor * _c->subCost(ct) / t->subCost(ct); return TQString("%1 %") - .arg(p, 0, 'f', Configuration::percentPrecision()); + .tqarg(p, 0, 'f', Configuration::percentPrecision()); } return val.pretty(); } @@ -904,7 +904,7 @@ bool CallMapCallerItem::isMarked(int) const } -TreeMapItemList* CallMapCallerItem::children() +TreeMapItemList* CallMapCallerItem::tqchildren() { if (!initialized()) { //qDebug("Create Caller subitems (%s)", name().ascii()); @@ -939,7 +939,7 @@ TreeMapItemList* CallMapCallerItem::children() setSorting(-2, false); } - return _children; + return _tqchildren; } TQColor CallMapCallerItem::backColor() const diff --git a/kcachegrind/kcachegrind/callmapview.h b/kcachegrind/kcachegrind/callmapview.h index e0af71f4..4bff8857 100644 --- a/kcachegrind/kcachegrind/callmapview.h +++ b/kcachegrind/kcachegrind/callmapview.h @@ -30,11 +30,12 @@ class CallMapView: public TreeMapWidget, public TraceItemView { Q_OBJECT + TQ_OBJECT public: - CallMapView(bool showCallers, TraceItemView* parentView, - TQWidget* parent=0, const char* name=0); + CallMapView(bool showCallers, TraceItemView* tqparentView, + TQWidget* tqparent=0, const char* name=0); TQWidget* widget() { return this; } TQString whatsThis() const; @@ -77,7 +78,7 @@ public: bool isMarked(int) const; TQString text(int) const; TQPixmap pixmap(int) const; - TreeMapItemList* children(); + TreeMapItemList* tqchildren(); TQColor backColor() const; private: @@ -98,7 +99,7 @@ public: bool isMarked(int) const; TQString text(int) const; TQPixmap pixmap(int) const; - TreeMapItemList* children(); + TreeMapItemList* tqchildren(); TQColor backColor() const; private: @@ -117,7 +118,7 @@ public: bool isMarked(int) const; TQString text(int) const; TQPixmap pixmap(int) const; - TreeMapItemList* children(); + TreeMapItemList* tqchildren(); TQColor backColor() const; private: diff --git a/kcachegrind/kcachegrind/callview.cpp b/kcachegrind/kcachegrind/callview.cpp index 4f22b4e9..0329fefe 100644 --- a/kcachegrind/kcachegrind/callview.cpp +++ b/kcachegrind/kcachegrind/callview.cpp @@ -35,9 +35,9 @@ // -CallView::CallView(bool showCallers, TraceItemView* parentView, - TQWidget* parent, const char* name) - : TQListView(parent, name), TraceItemView(parentView) +CallView::CallView(bool showCallers, TraceItemView* tqparentView, + TQWidget* tqparent, const char* name) + : TQListView(tqparent, name), TraceItemView(tqparentView) { _showCallers = showCallers; @@ -53,9 +53,9 @@ CallView::CallView(bool showCallers, TraceItemView* parentView, } setSorting(0,false); - setColumnAlignment(0, Qt::AlignRight); - setColumnAlignment(1, Qt::AlignRight); - setColumnAlignment(2, Qt::AlignRight); + setColumnAlignment(0, TQt::AlignRight); + setColumnAlignment(1, TQt::AlignRight); + setColumnAlignment(2, TQt::AlignRight); setAllColumnsShowFocus(true); setResizeMode(TQListView::LastColumn); setMinimumHeight(50); @@ -121,11 +121,11 @@ void CallView::context(TQListViewItem* i, const TQPoint & p, int col) cycle = f->cycle(); popup.insertItem(i18n("Go to '%1'") - .arg(Configuration::shortenSymbol(name)), 93); + .tqarg(Configuration::shortenSymbol(name)), 93); if (cycle) { name = Configuration::shortenSymbol(cycle->prettyName()); - popup.insertItem(i18n("Go to '%1'").arg(name), 94); + popup.insertItem(i18n("Go to '%1'").tqarg(name), 94); } popup.insertSeparator(); diff --git a/kcachegrind/kcachegrind/callview.h b/kcachegrind/kcachegrind/callview.h index e8d09050..9d20d95f 100644 --- a/kcachegrind/kcachegrind/callview.h +++ b/kcachegrind/kcachegrind/callview.h @@ -30,10 +30,11 @@ class CallView: public TQListView, public TraceItemView { Q_OBJECT + TQ_OBJECT public: - CallView(bool showCallers, TraceItemView* parentView, - TQWidget* parent=0, const char* name=0); + CallView(bool showCallers, TraceItemView* tqparentView, + TQWidget* tqparent=0, const char* name=0); virtual TQWidget* widget() { return this; } TQString whatsThis() const; diff --git a/kcachegrind/kcachegrind/configdlg.cpp b/kcachegrind/kcachegrind/configdlg.cpp index 79b8b79c..b401c8be 100644 --- a/kcachegrind/kcachegrind/configdlg.cpp +++ b/kcachegrind/kcachegrind/configdlg.cpp @@ -38,8 +38,8 @@ ConfigDlg::ConfigDlg(Configuration* c, TraceData* data, - TQWidget* parent, const char* name) - :ConfigDlgBase(parent, name) + TQWidget* tqparent, const char* name) + :ConfigDlgBase(tqparent, name) { _config = c; _data = data; @@ -127,15 +127,15 @@ ConfigDlg::ConfigDlg(Configuration* c, TraceData* data, TQString n = it.currentKey(); if (n.startsWith(objectPrefix)) { n = n.remove(0, objectPrefix.length()+1); - if (oList.findIndex(n) == -1) oList.append(n); + if (oList.tqfindIndex(n) == -1) oList.append(n); } else if (n.startsWith(classPrefix)) { n = n.remove(0, classPrefix.length()+1); - if (cList.findIndex(n) == -1) cList.append(n); + if (cList.tqfindIndex(n) == -1) cList.append(n); } else if (n.startsWith(filePrefix)) { n = n.remove(0, filePrefix.length()+1); - if (fList.findIndex(n) == -1) fList.append(n); + if (fList.tqfindIndex(n) == -1) fList.append(n); } } @@ -210,7 +210,7 @@ bool ConfigDlg::configure(Configuration* c, TraceData* d, TQWidget* p) TQMessageBox::warning(p, i18n("KCachegrind Configuration"), i18n("The Maximum Number of List Items should be below 500." "The previous set value (%1) will still be used.") - .arg(TQString::number(c->_maxListCount)), + .tqarg(TQString::number(c->_maxListCount)), TQMessageBox::Ok, 0); c->_maxSymbolCount = dlg.symbolCount->text().toInt(); @@ -340,7 +340,7 @@ void ConfigDlg::dirsItemChanged(TQListViewItem* i) void ConfigDlg::dirsDeletePressed() { if (!_dirItem || (_dirItem->depth() == 0)) return; - TQListViewItem* p = _dirItem->parent(); + TQListViewItem* p = _dirItem->tqparent(); if (!p) return; Configuration* c = Configuration::config(); @@ -379,7 +379,7 @@ void ConfigDlg::dirsAddPressed() } TQString newDir; - newDir = KFileDialog::getExistingDirectory(TQString::null, + newDir = KFileDialog::getExistingDirectory(TQString(), this, i18n("Choose Source Folder")); if (newDir.isEmpty()) return; @@ -388,7 +388,7 @@ void ConfigDlg::dirsAddPressed() if (newDir.endsWith("/")) newDir = newDir.left(newDir.length()-1); - if (dirs->findIndex(newDir)>=0) return; + if (dirs->tqfindIndex(newDir)>=0) return; dirs->append(newDir); if (newDir.isEmpty()) newDir = TQString("/"); diff --git a/kcachegrind/kcachegrind/configdlg.h b/kcachegrind/kcachegrind/configdlg.h index 521caf15..58c9b80d 100644 --- a/kcachegrind/kcachegrind/configdlg.h +++ b/kcachegrind/kcachegrind/configdlg.h @@ -31,10 +31,11 @@ class TraceData; class ConfigDlg : public ConfigDlgBase { Q_OBJECT + TQ_OBJECT public: ConfigDlg(Configuration*, TraceData*, - TQWidget* parent = 0, const char* name = 0); + TQWidget* tqparent = 0, const char* name = 0); ~ConfigDlg(); static bool configure(Configuration*, TraceData*, TQWidget*); diff --git a/kcachegrind/kcachegrind/configdlgbase.ui b/kcachegrind/kcachegrind/configdlgbase.ui index bf2c1bd8..d6546b28 100644 --- a/kcachegrind/kcachegrind/configdlgbase.ui +++ b/kcachegrind/kcachegrind/configdlgbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>ConfigDlgBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>configDlgBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -25,11 +25,11 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget2</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -40,15 +40,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="3" column="2" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="3" column="2" rowspan="1" colspan="2"> <property name="name"> <cstring>precisionEdit</cstring> </property> @@ -61,7 +61,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -69,7 +69,7 @@ <string>Truncated when more/longer than:</string> </property> </widget> - <widget class="QLabel" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel4_3</cstring> </property> @@ -77,7 +77,7 @@ <string>Precision of percentage values:</string> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -85,7 +85,7 @@ <string>Symbols in tooltips and context menus</string> </property> </widget> - <widget class="QLineEdit" row="2" column="3"> + <widget class="TQLineEdit" row="2" column="3"> <property name="name"> <cstring>symbolLength</cstring> </property> @@ -108,19 +108,19 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QLineEdit" row="0" column="2" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="0" column="2" rowspan="1" colspan="2"> <property name="name"> <cstring>maxListEdit</cstring> </property> </widget> - <widget class="QLineEdit" row="2" column="2"> + <widget class="TQLineEdit" row="2" column="2"> <property name="name"> <cstring>symbolCount</cstring> </property> @@ -133,7 +133,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel5</cstring> </property> @@ -143,7 +143,7 @@ </widget> </grid> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -162,7 +162,7 @@ <string>Cost Item Colors</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout9</cstring> </property> @@ -186,7 +186,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -203,14 +203,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> <cstring>Layout9</cstring> </property> @@ -224,11 +224,11 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <property name="name"> <cstring>classCombo</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>300</width> <height>32767</height> @@ -238,7 +238,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="2" column="2"> + <widget class="TQCheckBox" row="2" column="2"> <property name="name"> <cstring>fileCheck</cstring> </property> @@ -246,7 +246,7 @@ <string>Automatic</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -254,7 +254,7 @@ <string>Object:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel4_2_2</cstring> </property> @@ -278,7 +278,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="1" column="2"> + <widget class="TQCheckBox" row="1" column="2"> <property name="name"> <cstring>classCheck</cstring> </property> @@ -294,7 +294,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="0" column="2"> + <widget class="TQCheckBox" row="0" column="2"> <property name="name"> <cstring>objectCheck</cstring> </property> @@ -302,7 +302,7 @@ <string>Automatic</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel4_2</cstring> </property> @@ -326,11 +326,11 @@ <string></string> </property> </widget> - <widget class="QComboBox" row="2" column="1"> + <widget class="TQComboBox" row="2" column="1"> <property name="name"> <cstring>fileCombo</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>300</width> <height>32767</height> @@ -340,7 +340,7 @@ <bool>true</bool> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>objectCombo</cstring> </property> @@ -352,7 +352,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>300</width> <height>32767</height> @@ -368,7 +368,7 @@ </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -379,15 +379,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel4_3_2</cstring> </property> @@ -395,7 +395,7 @@ <string>Context lines in annotations:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>contextEdit</cstring> </property> @@ -410,7 +410,7 @@ </widget> </hbox> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -423,9 +423,9 @@ <string>Source Folders</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <grid> <property name="name"> @@ -441,14 +441,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QListView" row="0" column="1"> + <widget class="TQListView" row="0" column="1"> <column> <property name="text"> <string>Object / Related Source Base</string> @@ -467,15 +467,15 @@ <bool>true</bool> </property> </widget> - <widget class="QLayoutWidget" row="0" column="2"> + <widget class="TQLayoutWidget" row="0" column="2"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>addDirButton</cstring> </property> @@ -493,14 +493,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>49</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>deleteDirButton</cstring> </property> @@ -520,7 +520,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -546,7 +546,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -570,14 +570,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>210</width> <height>0</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>PushButton2</cstring> </property> @@ -588,7 +588,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>PushButton1</cstring> </property> @@ -649,5 +649,5 @@ <include location="global" impldecl="in implementation">kcolorbutton.h</include> </includes> <pixmapinproject/> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kcachegrind/kcachegrind/configuration.cpp b/kcachegrind/kcachegrind/configuration.cpp index 1a6c4d58..66abd563 100644 --- a/kcachegrind/kcachegrind/configuration.cpp +++ b/kcachegrind/kcachegrind/configuration.cpp @@ -55,7 +55,7 @@ static TQString knownFormula(TQString name) if (name =="L2m") return TQString("I2mr + D2mr + D2mw"); if (name =="CEst") return TQString("Ir + 10 L1m + 100 L2m"); - return TQString::null; + return TQString(); } static TQString knownLongName(TQString name) @@ -76,7 +76,7 @@ static TQString knownLongName(TQString name) if (name =="L2m") return i18n("L2 Miss Sum"); if (name =="CEst") return i18n("Cycle Estimation"); - return TQString::null; + return TQString(); } @@ -132,9 +132,9 @@ void Configuration::saveOptions(KConfig* kconfig) int count = 1; for( ; it.current(); ++it ) { if ( !(*it)->automatic ) { - colorConfig.writeEntry( TQString("Name%1").arg(count), + colorConfig.writeEntry( TQString("Name%1").tqarg(count), it.currentKey()); - colorConfig.writeEntry( TQString("Color%1").arg(count), + colorConfig.writeEntry( TQString("Color%1").tqarg(count), (*it)->color); //qDebug("Written Color %s (%d)", it.currentKey().ascii(), count); @@ -149,9 +149,9 @@ void Configuration::saveOptions(KConfig* kconfig) TQDictIterator<TQStringList> it2( c->_objectSourceDirs ); count = 1; for( ; it2.current(); ++it2 ) { - sourceConfig.writeEntry( TQString("Object%1").arg(count), + sourceConfig.writeEntry( TQString("Object%1").tqarg(count), it2.currentKey()); - sourceConfig.writeEntry( TQString("Dirs%1").arg(count), + sourceConfig.writeEntry( TQString("Dirs%1").tqarg(count), *(*it2), ':'); count++; } @@ -176,15 +176,15 @@ void Configuration::saveOptions(KConfig* kconfig) ctConfig.writeEntry( "Count", ctCount); for (int i=0; i<ctCount; i++) { TraceCostType* t = TraceCostType::knownType(i); - ctConfig.writeEntry( TQString("Name%1").arg(i+1), t->name()); + ctConfig.writeEntry( TQString("Name%1").tqarg(i+1), t->name()); // Use localized key TraceItemView::writeConfigEntry(&ctConfig, - TQString("Longname%1").arg(i+1).ascii(), + TQString("Longname%1").tqarg(i+1).ascii(), t->longName(), knownLongName(t->name()).utf8().data() /*, true */ ); TraceItemView::writeConfigEntry(&ctConfig, - TQString("Formula%1").arg(i+1).ascii(), + TQString("Formula%1").tqarg(i+1).ascii(), t->formula(), knownFormula(t->name()).utf8().data()); } } @@ -217,8 +217,8 @@ void Configuration::readOptions(KConfig* kconfig) KConfigGroup colorConfig(kconfig, TQCString("CostColors")); count = colorConfig.readNumEntry("Count", 0); for (i=1;i<=count;i++) { - TQString n = colorConfig.readEntry(TQString("Name%1").arg(i)); - TQColor color = colorConfig.readColorEntry(TQString("Color%1").arg(i)); + TQString n = colorConfig.readEntry(TQString("Name%1").tqarg(i)); + TQColor color = colorConfig.readColorEntry(TQString("Color%1").tqarg(i)); if (n.isEmpty()) continue; @@ -241,8 +241,8 @@ void Configuration::readOptions(KConfig* kconfig) c->_objectSourceDirs.clear(); if (count>17) c->_objectSourceDirs.resize(count); for (i=1;i<=count;i++) { - TQString n = sourceConfig.readEntry(TQString("Object%1").arg(i)); - dirs = sourceConfig.readListEntry(TQString("Dirs%1").arg(i), ':'); + TQString n = sourceConfig.readEntry(TQString("Object%1").tqarg(i)); + dirs = sourceConfig.readListEntry(TQString("Dirs%1").tqarg(i), ':'); if (n.isEmpty() || (dirs.count()==0)) continue; @@ -271,10 +271,10 @@ void Configuration::readOptions(KConfig* kconfig) int ctCount = ctConfig.readNumEntry("Count", 0); if (ctCount>0) { for (int i=1;i<=ctCount;i++) { - TQString n = ctConfig.readEntry(TQString("Name%1").arg(i)); - TQString l = ctConfig.readEntry(TQString("Longname%1").arg(i)); + TQString n = ctConfig.readEntry(TQString("Name%1").tqarg(i)); + TQString l = ctConfig.readEntry(TQString("Longname%1").tqarg(i)); if (l.isEmpty()) l = knownLongName(n); - TQString f = ctConfig.readEntry(TQString("Formula%1").arg(i)); + TQString f = ctConfig.readEntry(TQString("Formula%1").tqarg(i)); if (f.isEmpty()) f = knownFormula(n); TraceCostType::add(new TraceCostType(n, l, f)); @@ -316,7 +316,7 @@ TQColor Configuration::costTypeColor(TraceCostType* t) if (!t) n = TQString("CostType-default"); else - n = TQString("CostType-%1").arg(t->name()); + n = TQString("CostType-%1").tqarg(t->name()); return color(n)->color; } diff --git a/kcachegrind/kcachegrind/costlistitem.cpp b/kcachegrind/kcachegrind/costlistitem.cpp index 1e777b05..91caea4b 100644 --- a/kcachegrind/kcachegrind/costlistitem.cpp +++ b/kcachegrind/kcachegrind/costlistitem.cpp @@ -33,9 +33,9 @@ // CostListItem -CostListItem::CostListItem(TQListView* parent, TraceCostItem* costItem, +CostListItem::CostListItem(TQListView* tqparent, TraceCostItem* costItem, TraceCostType* ct, int size) - :TQListViewItem(parent) + :TQListViewItem(tqparent) { _groupSize = size; _skipped = 0; @@ -49,9 +49,9 @@ CostListItem::CostListItem(TQListView* parent, TraceCostItem* costItem, } } -CostListItem::CostListItem(TQListView* parent, int skipped, +CostListItem::CostListItem(TQListView* tqparent, int skipped, TraceCostItem* costItem, TraceCostType* ct) - :TQListViewItem(parent) + :TQListViewItem(tqparent) { _skipped = skipped; _costItem = costItem; @@ -71,7 +71,7 @@ void CostListItem::updateName() if (!_costItem) return; TQString n = _costItem->prettyName(); - if (_groupSize>=0) n += TQString(" (%1)").arg(_groupSize); + if (_groupSize>=0) n += TQString(" (%1)").tqarg(_groupSize); setText(1, n); } @@ -98,13 +98,13 @@ void CostListItem::update() double pure = 100.0 * _pure / total; TQString str; if (Configuration::showPercentage()) - str = TQString("%1").arg(pure, 0, 'f', Configuration::percentPrecision()); + str = TQString("%1").tqarg(pure, 0, 'f', Configuration::percentPrecision()); else str = _costItem->prettySubCost(_costType); if (_skipped) { // special handling for skip entries... - setText(0, TQString("< %1").arg(str)); + setText(0, TQString("< %1").tqarg(str)); return; } diff --git a/kcachegrind/kcachegrind/costlistitem.h b/kcachegrind/kcachegrind/costlistitem.h index 6c1ccbc8..b5607ce6 100644 --- a/kcachegrind/kcachegrind/costlistitem.h +++ b/kcachegrind/kcachegrind/costlistitem.h @@ -22,13 +22,13 @@ #include <tqlistview.h> #include "tracedata.h" -class CostListItem: public QListViewItem +class CostListItem: public TQListViewItem { public: - CostListItem(TQListView* parent, TraceCostItem* cost, + CostListItem(TQListView* tqparent, TraceCostItem* cost, TraceCostType* ct, int size = -1); // entry with multiple skipped items - CostListItem(TQListView* parent, int skipped, TraceCostItem* cost, + CostListItem(TQListView* tqparent, int skipped, TraceCostItem* cost, TraceCostType* ct); int compare(TQListViewItem * i, int col, bool ascending ) const; @@ -45,7 +45,7 @@ private: TraceCostItem* _costItem; // >0 only for last item in list, if items are skipped int _skipped; - // number of items in group, is put in parenthesis after name + // number of items in group, is put in tqparenthesis after name int _groupSize; }; diff --git a/kcachegrind/kcachegrind/costtypeitem.cpp b/kcachegrind/kcachegrind/costtypeitem.cpp index dc35cb2b..cf71a3a9 100644 --- a/kcachegrind/kcachegrind/costtypeitem.cpp +++ b/kcachegrind/kcachegrind/costtypeitem.cpp @@ -31,9 +31,9 @@ // CostTypeItem -CostTypeItem::CostTypeItem(TQListView* parent, TraceCostItem* costItem, +CostTypeItem::CostTypeItem(TQListView* tqparent, TraceCostItem* costItem, TraceCostType* ct, TraceCost::CostType gt) - :TQListViewItem(parent) + :TQListViewItem(tqparent) { _costItem = costItem; _costType = ct; @@ -104,7 +104,7 @@ void CostTypeItem::update() double pure = 100.0 * _pure / selfTotal; if (Configuration::showPercentage()) { setText(2, TQString("%1") - .arg(pure, 0, 'f', Configuration::percentPrecision())); + .tqarg(pure, 0, 'f', Configuration::percentPrecision())); } else setText(2, _costItem->prettySubCost(_costType)); @@ -121,7 +121,7 @@ void CostTypeItem::update() double sum = 100.0 * _sum / total; if (Configuration::showPercentage()) { setText(1, TQString("%1") - .arg(sum, 0, 'f', Configuration::percentPrecision())); + .tqarg(sum, 0, 'f', Configuration::percentPrecision())); } else setText(1, _sum.pretty()); diff --git a/kcachegrind/kcachegrind/costtypeitem.h b/kcachegrind/kcachegrind/costtypeitem.h index 7593151e..6bf60fa8 100644 --- a/kcachegrind/kcachegrind/costtypeitem.h +++ b/kcachegrind/kcachegrind/costtypeitem.h @@ -27,10 +27,10 @@ #include "tracedata.h" -class CostTypeItem: public QListViewItem +class CostTypeItem: public TQListViewItem { public: - CostTypeItem(TQListView* parent, TraceCostItem* costItem, + CostTypeItem(TQListView* tqparent, TraceCostItem* costItem, TraceCostType* ct, TraceCost::CostType gt); int compare(TQListViewItem * i, int col, bool ascending ) const; diff --git a/kcachegrind/kcachegrind/costtypeview.cpp b/kcachegrind/kcachegrind/costtypeview.cpp index 6642e7af..28558f6c 100644 --- a/kcachegrind/kcachegrind/costtypeview.cpp +++ b/kcachegrind/kcachegrind/costtypeview.cpp @@ -35,22 +35,22 @@ // -CostTypeView::CostTypeView(TraceItemView* parentView, - TQWidget* parent, const char* name) - : TQListView(parent, name), TraceItemView(parentView) +CostTypeView::CostTypeView(TraceItemView* tqparentView, + TQWidget* tqparent, const char* name) + : TQListView(tqparent, name), TraceItemView(tqparentView) { addColumn( i18n( "Event Type" ) ); addColumn( i18n( "Incl." ) ); addColumn( i18n( "Self" ) ); addColumn( i18n( "Short" ) ); - addColumn( TQString::null ); + addColumn( TQString() ); addColumn( i18n( "Formula" ) ); setSorting(-1); setAllColumnsShowFocus(true); - setColumnAlignment(1, Qt::AlignRight); - setColumnAlignment(2, Qt::AlignRight); - setColumnAlignment(3, Qt::AlignRight); + setColumnAlignment(1, TQt::AlignRight); + setColumnAlignment(2, TQt::AlignRight); + setColumnAlignment(3, TQt::AlignRight); setMinimumHeight(50); connect( this, @@ -146,13 +146,13 @@ void CostTypeView::context(TQListViewItem* i, const TQPoint & p, int) else if (r == 97) { int i = 1; while(1) { - if (!TraceCostType::knownVirtualType(i18n("New%1").arg(i))) + if (!TraceCostType::knownVirtualType(i18n("New%1").tqarg(i))) break; i++; } // add same new cost type to this mapping and to known types - TQString shortName = i18n("New%1").arg(i); - TQString longName = i18n("New Cost Type %1").arg(i); + TQString shortName = i18n("New%1").tqarg(i); + TQString longName = i18n("New Cost Type %1").tqarg(i); TraceCostType::add(new TraceCostType(shortName, longName, "0")); _data->mapping()->add(new TraceCostType(shortName, longName, "0")); refresh(); diff --git a/kcachegrind/kcachegrind/costtypeview.h b/kcachegrind/kcachegrind/costtypeview.h index 63d95ea7..3a68a6c7 100644 --- a/kcachegrind/kcachegrind/costtypeview.h +++ b/kcachegrind/kcachegrind/costtypeview.h @@ -30,10 +30,11 @@ class CostTypeView: public TQListView, public TraceItemView { Q_OBJECT + TQ_OBJECT public: - CostTypeView(TraceItemView* parentView, - TQWidget* parent=0, const char* name=0); + CostTypeView(TraceItemView* tqparentView, + TQWidget* tqparent=0, const char* name=0); virtual TQWidget* widget() { return this; } TQString whatsThis() const; diff --git a/kcachegrind/kcachegrind/coverage.cpp b/kcachegrind/kcachegrind/coverage.cpp index 86e6f7ff..dc4a9764 100644 --- a/kcachegrind/kcachegrind/coverage.cpp +++ b/kcachegrind/kcachegrind/coverage.cpp @@ -81,7 +81,7 @@ int Coverage::selfMedian() TraceFunctionList Coverage::coverage(TraceFunction* f, CoverageMode m, TraceCostType* ct) { - invalidate(f->data(), Coverage::Rtti); + tqinvalidate(f->data(), Coverage::Rtti); _costType = ct; diff --git a/kcachegrind/kcachegrind/coverageitem.cpp b/kcachegrind/kcachegrind/coverageitem.cpp index 3c93a88e..ab872f71 100644 --- a/kcachegrind/kcachegrind/coverageitem.cpp +++ b/kcachegrind/kcachegrind/coverageitem.cpp @@ -32,11 +32,11 @@ // CallerCoverageItem -CallerCoverageItem::CallerCoverageItem(TQListView* parent, Coverage* c, +CallerCoverageItem::CallerCoverageItem(TQListView* tqparent, Coverage* c, TraceFunction* base, TraceCostType* ct, TraceCost::CostType gt) - : TQListViewItem(parent) + : TQListViewItem(tqparent) { _skipped = 0; _coverage = c; @@ -50,11 +50,11 @@ CallerCoverageItem::CallerCoverageItem(TQListView* parent, Coverage* c, setGroupType(gt); } -CallerCoverageItem::CallerCoverageItem(TQListView* parent, int skipped, Coverage* c, +CallerCoverageItem::CallerCoverageItem(TQListView* tqparent, int skipped, Coverage* c, TraceFunction* base, TraceCostType* ct, TraceCost::CostType gt) - : TQListViewItem(parent) + : TQListViewItem(tqparent) { _skipped = skipped; _coverage = c; @@ -87,8 +87,8 @@ void CallerCoverageItem::setCostType(TraceCostType* ct) void CallerCoverageItem::update() { if (!_coverage) { - setText(0, TQString::null); - setText(1, TQString::null); + setText(0, TQString()); + setText(1, TQString()); return; } @@ -97,12 +97,12 @@ void CallerCoverageItem::update() _sum = SubCost(realSum * _coverage->inclusive()); TQString str; if (Configuration::showPercentage()) - str = TQString("%1").arg(_pSum, 0, 'f', Configuration::percentPrecision()); + str = TQString("%1").tqarg(_pSum, 0, 'f', Configuration::percentPrecision()); else str = _sum.pretty(); if (_skipped) { - setText(0, TQString("< %1").arg(str)); + setText(0, TQString("< %1").tqarg(str)); return; } @@ -121,9 +121,9 @@ void CallerCoverageItem::update() distString = TQString::number(_distance); else distString = TQString("%1-%2 (%3)") - .arg(_coverage->minDistance()) - .arg(_coverage->maxDistance()) - .arg(_distance); + .tqarg(_coverage->minDistance()) + .tqarg(_coverage->maxDistance()) + .tqarg(_distance); setText(1, distString); } @@ -172,11 +172,11 @@ int CallerCoverageItem::compare(TQListViewItem * i, // CalleeCoverageItem -CalleeCoverageItem::CalleeCoverageItem(TQListView* parent, Coverage* c, +CalleeCoverageItem::CalleeCoverageItem(TQListView* tqparent, Coverage* c, TraceFunction* base, TraceCostType* ct, TraceCost::CostType gt) - : TQListViewItem(parent) + : TQListViewItem(tqparent) { _skipped = 0; _coverage = c; @@ -190,11 +190,11 @@ CalleeCoverageItem::CalleeCoverageItem(TQListView* parent, Coverage* c, setGroupType(gt); } -CalleeCoverageItem::CalleeCoverageItem(TQListView* parent, int skipped, Coverage* c, +CalleeCoverageItem::CalleeCoverageItem(TQListView* tqparent, int skipped, Coverage* c, TraceFunction* base, TraceCostType* ct, TraceCost::CostType gt) - : TQListViewItem(parent) + : TQListViewItem(tqparent) { _skipped = skipped; _coverage = c; @@ -227,9 +227,9 @@ void CalleeCoverageItem::setCostType(TraceCostType* ct) void CalleeCoverageItem::update() { if (!_coverage) { - setText(0, TQString::null); - setText(1, TQString::null); - setText(2, TQString::null); + setText(0, TQString()); + setText(1, TQString()); + setText(2, TQString()); return; } @@ -242,12 +242,12 @@ void CalleeCoverageItem::update() TQString str; if (Configuration::showPercentage()) - str = TQString("%1").arg(_pSum, 0, 'f', Configuration::percentPrecision()); + str = TQString("%1").tqarg(_pSum, 0, 'f', Configuration::percentPrecision()); else str = _sum.pretty(); if (_skipped) { - str = TQString("< %1").arg(str); + str = TQString("< %1").tqarg(str); setText(0, str); setText(1, str); return; @@ -259,7 +259,7 @@ void CalleeCoverageItem::update() if (Configuration::showPercentage()) { setText(1, TQString("%1") - .arg(_pSelf, 0, 'f', Configuration::percentPrecision())); + .tqarg(_pSelf, 0, 'f', Configuration::percentPrecision())); } else { setText(1, _self.pretty()); @@ -285,12 +285,12 @@ void CalleeCoverageItem::update() if (_distance == sMed) med = TQString::number(_distance); else - med = TQString("%1/%2").arg(_distance).arg(sMed); + med = TQString("%1/%2").tqarg(_distance).tqarg(sMed); distString = TQString("%1-%2 (%3)") - .arg(_coverage->minDistance()) - .arg(_coverage->maxDistance()) - .arg(med); + .tqarg(_coverage->minDistance()) + .tqarg(_coverage->maxDistance()) + .tqarg(med); } setText(2, distString); } diff --git a/kcachegrind/kcachegrind/coverageitem.h b/kcachegrind/kcachegrind/coverageitem.h index 29666890..04da4305 100644 --- a/kcachegrind/kcachegrind/coverageitem.h +++ b/kcachegrind/kcachegrind/coverageitem.h @@ -28,12 +28,12 @@ class Coverage; -class CallerCoverageItem: public QListViewItem +class CallerCoverageItem: public TQListViewItem { public: - CallerCoverageItem(TQListView* parent, Coverage* c, TraceFunction* base, + CallerCoverageItem(TQListView* tqparent, Coverage* c, TraceFunction* base, TraceCostType* ct, TraceCost::CostType gt); - CallerCoverageItem(TQListView* parent, int skipped, Coverage* c, TraceFunction* base, + CallerCoverageItem(TQListView* tqparent, int skipped, Coverage* c, TraceFunction* base, TraceCostType* ct, TraceCost::CostType gt); int compare(TQListViewItem * i, int col, bool ascending ) const; @@ -54,12 +54,12 @@ private: }; -class CalleeCoverageItem: public QListViewItem +class CalleeCoverageItem: public TQListViewItem { public: - CalleeCoverageItem(TQListView* parent, Coverage* c, TraceFunction* base, + CalleeCoverageItem(TQListView* tqparent, Coverage* c, TraceFunction* base, TraceCostType* ct, TraceCost::CostType gt); - CalleeCoverageItem(TQListView* parent, int skipped, Coverage* c, TraceFunction* base, + CalleeCoverageItem(TQListView* tqparent, int skipped, Coverage* c, TraceFunction* base, TraceCostType* ct, TraceCost::CostType gt); int compare(TQListViewItem * i, int col, bool ascending ) const; diff --git a/kcachegrind/kcachegrind/coverageview.cpp b/kcachegrind/kcachegrind/coverageview.cpp index 4452efca..460a4969 100644 --- a/kcachegrind/kcachegrind/coverageview.cpp +++ b/kcachegrind/kcachegrind/coverageview.cpp @@ -36,9 +36,9 @@ // -CoverageView::CoverageView(bool showCallers, TraceItemView* parentView, - TQWidget* parent, const char* name) - : TQListView(parent, name), TraceItemView(parentView) +CoverageView::CoverageView(bool showCallers, TraceItemView* tqparentView, + TQWidget* tqparent, const char* name) + : TQListView(tqparent, name), TraceItemView(tqparentView) { _showCallers = showCallers; @@ -54,13 +54,13 @@ CoverageView::CoverageView(bool showCallers, TraceItemView* parentView, addColumn( i18n( "Distance" ) ); addColumn( i18n( "Calling" ) ); addColumn( i18n( "Callee" ) ); - setColumnAlignment(3, Qt::AlignRight); + setColumnAlignment(3, TQt::AlignRight); } setSorting(0,false); - setColumnAlignment(0, Qt::AlignRight); - setColumnAlignment(1, Qt::AlignRight); - setColumnAlignment(2, Qt::AlignRight); + setColumnAlignment(0, TQt::AlignRight); + setColumnAlignment(1, TQt::AlignRight); + setColumnAlignment(2, TQt::AlignRight); setAllColumnsShowFocus(true); setResizeMode(TQListView::LastColumn); setMinimumHeight(50); @@ -108,7 +108,7 @@ TQString CoverageView::whatsThis() const "<p>As there can be many calls from the same function, " "the distance column sometimes shows " "the range of distances for all " - "calls happening; then, in parentheses, there is the " + "calls happening; then, in tqparentheses, there is the " "medium distance, i.e. the distance where most of the " "call costs happened.</p>" @@ -138,7 +138,7 @@ TQString CoverageView::whatsThis() const "<p>As there can be many calls to the same function, " "the distance column sometimes shows " "the range of distances for all " - "calls happening; then, in parentheses, there is the " + "calls happening; then, in tqparentheses, there is the " "medium distance, i.e. the distance where most of the " "call costs happened.</p>" @@ -163,7 +163,7 @@ void CoverageView::context(TQListViewItem* i, const TQPoint & p, int c) TQString name = f->name(); if ((int)name.length()>Configuration::maxSymbolLength()) name = name.left(Configuration::maxSymbolLength()) + "..."; - popup.insertItem(i18n("Go to '%1'").arg(name), 93); + popup.insertItem(i18n("Go to '%1'").tqarg(name), 93); popup.insertSeparator(); } diff --git a/kcachegrind/kcachegrind/coverageview.h b/kcachegrind/kcachegrind/coverageview.h index e0edeea5..64b56c4a 100644 --- a/kcachegrind/kcachegrind/coverageview.h +++ b/kcachegrind/kcachegrind/coverageview.h @@ -31,10 +31,11 @@ class CoverageView: public TQListView, public TraceItemView { Q_OBJECT + TQ_OBJECT public: - CoverageView(bool showCallers, TraceItemView* parentView, - TQWidget* parent=0, const char* name=0); + CoverageView(bool showCallers, TraceItemView* tqparentView, + TQWidget* tqparent=0, const char* name=0); virtual TQWidget* widget() { return this; } TQString whatsThis() const; diff --git a/kcachegrind/kcachegrind/dumpselection.cpp b/kcachegrind/kcachegrind/dumpselection.cpp index 4d812ef9..15027325 100644 --- a/kcachegrind/kcachegrind/dumpselection.cpp +++ b/kcachegrind/kcachegrind/dumpselection.cpp @@ -20,8 +20,8 @@ DumpSelection::DumpSelection( TopLevel* top, - TQWidget* parent, const char* name) - : DumpSelectionBase(parent, name), TraceItemView(0, top) + TQWidget* tqparent, const char* name) + : DumpSelectionBase(tqparent, name), TraceItemView(0, top) { } diff --git a/kcachegrind/kcachegrind/dumpselection.h b/kcachegrind/kcachegrind/dumpselection.h index 3bec46ae..b6bcddce 100644 --- a/kcachegrind/kcachegrind/dumpselection.h +++ b/kcachegrind/kcachegrind/dumpselection.h @@ -18,9 +18,10 @@ class DumpSelection : public DumpSelectionBase, public TraceItemView { Q_OBJECT + TQ_OBJECT public: - DumpSelection( TopLevel*, TQWidget* parent = 0, const char* name = 0); + DumpSelection( TopLevel*, TQWidget* tqparent = 0, const char* name = 0); virtual ~DumpSelection(); TQWidget* widget() { return this; } diff --git a/kcachegrind/kcachegrind/dumpselectionbase.ui b/kcachegrind/kcachegrind/dumpselectionbase.ui index 37bc1c46..a78b52ce 100644 --- a/kcachegrind/kcachegrind/dumpselectionbase.ui +++ b/kcachegrind/kcachegrind/dumpselectionbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>DumpSelectionBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DumpSelectionBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,14 +19,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSplitter"> + <widget class="TQSplitter"> <property name="name"> <cstring>splitter1</cstring> </property> <property name="orientation"> <enum>Vertical</enum> </property> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Target</string> @@ -75,11 +75,11 @@ <cstring>listView1</cstring> </property> </widget> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget2</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -90,7 +90,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -106,12 +106,12 @@ <string>Target command:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>lineEdit1</cstring> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -119,7 +119,7 @@ <string>Profiler options:</string> </property> </widget> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Option</string> @@ -454,7 +454,7 @@ <cstring>listView3</cstring> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -470,14 +470,14 @@ <string>Custom profiler options:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>lineEdit1_2</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -493,14 +493,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pushButton2</cstring> </property> @@ -512,7 +512,7 @@ </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -523,7 +523,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel8</cstring> </property> @@ -531,12 +531,12 @@ <string>Dump reason:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>lineEdit3</cstring> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -544,7 +544,7 @@ <string>Event summary:</string> </property> </widget> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Name</string> @@ -571,7 +571,7 @@ <cstring>listView4</cstring> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel7</cstring> </property> @@ -579,14 +579,14 @@ <string>Miscellaneous:</string> </property> </widget> - <widget class="QTextEdit"> + <widget class="TQTextEdit"> <property name="name"> <cstring>textEdit2</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> @@ -602,14 +602,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>50</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pushButton6</cstring> </property> @@ -617,7 +617,7 @@ <string>Show</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pushButton5</cstring> </property> @@ -629,7 +629,7 @@ </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -640,15 +640,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pushButton1</cstring> </property> @@ -656,7 +656,7 @@ <string>Update</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>checkBox1</cstring> </property> @@ -664,14 +664,14 @@ <string>Every [s]:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>lineEdit3_2</cstring> </property> </widget> </hbox> </widget> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Counter</string> @@ -866,15 +866,15 @@ <cstring>listView4_3</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -890,7 +890,7 @@ <string>Stack trace:</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>checkBox2</cstring> </property> @@ -900,7 +900,7 @@ </widget> </hbox> </widget> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>#</string> @@ -960,15 +960,15 @@ <cstring>listView7</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pushButton7</cstring> </property> @@ -986,14 +986,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pushButton6_2</cstring> </property> @@ -1001,7 +1001,7 @@ <string>Zero</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pushButton4</cstring> </property> @@ -1013,7 +1013,7 @@ </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -1024,20 +1024,20 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTextEdit"> + <widget class="TQTextEdit"> <property name="name"> <cstring>textEdit2_2</cstring> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pushButton9</cstring> </property> @@ -1055,14 +1055,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pushButton8</cstring> </property> @@ -1078,5 +1078,5 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kcachegrind/kcachegrind/functionitem.cpp b/kcachegrind/kcachegrind/functionitem.cpp index 3b694ddf..5b70fd2e 100644 --- a/kcachegrind/kcachegrind/functionitem.cpp +++ b/kcachegrind/kcachegrind/functionitem.cpp @@ -37,9 +37,9 @@ // FunctionItem -FunctionItem::FunctionItem(TQListView* parent, TraceFunction* f, +FunctionItem::FunctionItem(TQListView* tqparent, TraceFunction* f, TraceCostType* ct, TraceCost::CostType gt) - :TQListViewItem(parent) + :TQListViewItem(tqparent) { #if 0 _costPixValid = false; @@ -56,9 +56,9 @@ FunctionItem::FunctionItem(TQListView* parent, TraceFunction* f, setText(4, f->prettyLocation()); } -FunctionItem::FunctionItem(TQListView* parent, int skipped, +FunctionItem::FunctionItem(TQListView* tqparent, int skipped, TraceFunction* f, TraceCostType* ct) - :TQListViewItem(parent) + :TQListViewItem(tqparent) { #if 0 _costPixValid = false; @@ -103,7 +103,7 @@ void FunctionItem::setGroupType(TraceCost::CostType gt) #if 0 _groupPixValid = false; - viewList()->repaint(); + viewList()->tqrepaint(); #else TQColor c = Configuration::functionColor(_groupType, _function); setPixmap(3, colorPixmap(10, 10, c)); @@ -141,7 +141,7 @@ void FunctionItem::update() _sum = _function->inclusive()->subCost(_costType); double incl = 100.0 * _sum / inclTotal; if (Configuration::showPercentage()) - str = TQString("%1").arg(incl, 0, 'f', Configuration::percentPrecision()); + str = TQString("%1").tqarg(incl, 0, 'f', Configuration::percentPrecision()); else str = _function->inclusive()->prettySubCost(_costType); str = "< " + str; @@ -171,7 +171,7 @@ void FunctionItem::update() double incl = 100.0 * _sum / inclTotal; if (Configuration::showPercentage()) setText(0, TQString("%1") - .arg(incl, 0, 'f', Configuration::percentPrecision())); + .tqarg(incl, 0, 'f', Configuration::percentPrecision())); else setText(0, _function->inclusive()->prettySubCost(_costType)); @@ -189,7 +189,7 @@ void FunctionItem::update() if (Configuration::showPercentage()) setText(1, TQString("%1") - .arg(self, 0, 'f', Configuration::percentPrecision())); + .tqarg(self, 0, 'f', Configuration::percentPrecision())); else setText(1, _function->prettySubCost(_costType)); diff --git a/kcachegrind/kcachegrind/functionitem.h b/kcachegrind/kcachegrind/functionitem.h index 1c49e1be..fcf24123 100644 --- a/kcachegrind/kcachegrind/functionitem.h +++ b/kcachegrind/kcachegrind/functionitem.h @@ -26,13 +26,13 @@ #include <tqlistview.h> #include "tracedata.h" -class FunctionItem: public QListViewItem +class FunctionItem: public TQListViewItem { public: - FunctionItem(TQListView* parent, TraceFunction* function, + FunctionItem(TQListView* tqparent, TraceFunction* function, TraceCostType* ct, TraceCost::CostType gt); // constructor for a "Skipped ... " entry - FunctionItem(TQListView* parent, int skipped, + FunctionItem(TQListView* tqparent, int skipped, TraceFunction* function, TraceCostType* ct); int compare(TQListViewItem * i, int col, bool ascending ) const; @@ -44,7 +44,7 @@ public: #if 0 const TQPixmap* pixmap (int column) const; bool _costPixValid, _groupPixValid; - QPixMap _costPix, _groupPix; + TQPixMap _costPix, _groupPix; #endif private: diff --git a/kcachegrind/kcachegrind/functionselection.cpp b/kcachegrind/kcachegrind/functionselection.cpp index 212637ec..41390248 100644 --- a/kcachegrind/kcachegrind/functionselection.cpp +++ b/kcachegrind/kcachegrind/functionselection.cpp @@ -17,7 +17,7 @@ */ /* - * For function selection, to be put into a QDockWindow + * For function selection, to be put into a TQDockWindow */ #include <tqtimer.h> @@ -41,8 +41,8 @@ #include "toplevel.h" FunctionSelection::FunctionSelection( TopLevel* top, - TQWidget* parent, const char* name) - : FunctionSelectionBase(parent, name), TraceItemView(0, top) + TQWidget* tqparent, const char* name) + : FunctionSelectionBase(tqparent, name), TraceItemView(0, top) { _group = 0; _inSetGroup = false; @@ -72,9 +72,9 @@ FunctionSelection::FunctionSelection( TopLevel* top, // we start with desending cost sorting functionList->setSorting(0,false); - functionList->setColumnAlignment(0, Qt::AlignRight); - functionList->setColumnAlignment(1, Qt::AlignRight); - functionList->setColumnAlignment(2, Qt::AlignRight); + functionList->setColumnAlignment(0, TQt::AlignRight); + functionList->setColumnAlignment(1, TQt::AlignRight); + functionList->setColumnAlignment(2, TQt::AlignRight); functionList->setAllColumnsShowFocus(true); // functionList->setShowSortIndicator(true); // we can have very long function and location names @@ -84,7 +84,7 @@ FunctionSelection::FunctionSelection( TopLevel* top, functionList->setColumnWidth(4, 200); groupList->setSorting(0,false); - groupList->setColumnAlignment(0, Qt::AlignRight); + groupList->setColumnAlignment(0, TQt::AlignRight); groupList->setAllColumnsShowFocus(true); // groupList->setShowSortIndicator(true); groupList->setResizeMode(TQListView::LastColumn); @@ -173,7 +173,7 @@ void FunctionSelection::functionContext(TQListViewItem* i, if (i) { f = ((FunctionItem*) i)->function(); if (f) { - popup.insertItem(i18n("Go to %1").arg(f->prettyName()), 93); + popup.insertItem(i18n("Go to %1").tqarg(f->prettyName()), 93); popup.insertSeparator(); } } @@ -305,8 +305,8 @@ void FunctionSelection::doUpdate(int changeType) } // reset searchEdit (as not activated from this view) - _searchString = TQString::null; - query(TQString::null); + _searchString = TQString(); + query(TQString()); // select cost item group of function switch(_groupType) { @@ -368,8 +368,8 @@ void FunctionSelection::doUpdate(int changeType) } // reset searchEdit - _searchString = TQString::null; - query(TQString::null); + _searchString = TQString(); + query(TQString()); refresh(); } @@ -417,7 +417,7 @@ void FunctionSelection::refresh() if (!_data || _data->parts().count()==0) { functionList->clear(); groupList->setUpdatesEnabled(true); - groupList->repaint(); + groupList->tqrepaint(); // this clears all other lists functionList->setSelected(functionList->firstChild(), true); @@ -547,9 +547,9 @@ void FunctionSelection::refresh() functionList->clearSelection(); //functionList->setUpdatesEnabled(true); - //functionList->repaint(); + //functionList->tqrepaint(); groupList->setUpdatesEnabled(true); - groupList->repaint(); + groupList->tqrepaint(); return; } } @@ -581,7 +581,7 @@ void FunctionSelection::refresh() groupList->clearSelection(); groupList->setUpdatesEnabled(true); - groupList->repaint(); + groupList->tqrepaint(); } @@ -628,7 +628,7 @@ void FunctionSelection::groupSelected(TQListViewItem* i) #if 0 if (total == 0.0) { functionList->setUpdatesEnabled(true); - functionList->repaint(); + functionList->tqrepaint(); return; } #endif @@ -668,7 +668,7 @@ void FunctionSelection::groupSelected(TQListViewItem* i) } //functionList->setUpdatesEnabled(true); - //functionList->repaint(); + //functionList->tqrepaint(); // Don't emit signal if cost item was changed programatically if (!_inSetGroup) { @@ -738,7 +738,7 @@ void FunctionSelection::updateGroupSizes(bool hideEmpty) TQListViewItem* item = groupList->firstChild(); for (;item;item = item->nextSibling()) { CostListItem* i = (CostListItem*)item; - int size = (_groupSize.contains(i->costItem())) ? + int size = (_groupSize.tqcontains(i->costItem())) ? _groupSize[i->costItem()] : -1; i->setSize(size); i->setVisible(!hideEmpty || (size>0)); @@ -774,28 +774,28 @@ void FunctionSelection::query(TQString query) if (re.search(f->prettyName())>=0) { if (_group) { if (_groupType==TraceItem::Object) { - if (_groupSize.contains(f->object())) + if (_groupSize.tqcontains(f->object())) _groupSize[f->object()]++; else _groupSize[f->object()] = 1; if (f->object() != _group) continue; } else if (_groupType==TraceItem::Class) { - if (_groupSize.contains(f->cls())) + if (_groupSize.tqcontains(f->cls())) _groupSize[f->cls()]++; else _groupSize[f->cls()] = 1; if (f->cls() != _group) continue; } else if (_groupType==TraceItem::File) { - if (_groupSize.contains(f->file())) + if (_groupSize.tqcontains(f->file())) _groupSize[f->file()]++; else _groupSize[f->file()] = 1; if (f->file() != _group) continue; } else if (_groupType==TraceItem::FunctionCycle) { - if (_groupSize.contains(f->cycle())) + if (_groupSize.tqcontains(f->cycle())) _groupSize[f->cycle()]++; else _groupSize[f->cycle()] = 1; diff --git a/kcachegrind/kcachegrind/functionselection.h b/kcachegrind/kcachegrind/functionselection.h index c1c815d6..2aacbeba 100644 --- a/kcachegrind/kcachegrind/functionselection.h +++ b/kcachegrind/kcachegrind/functionselection.h @@ -17,7 +17,7 @@ */ /* - * For function selection, to be put into a QDockWindow + * For function selection, to be put into a TQDockWindow */ #ifndef FUNCTIONSELECTION_H @@ -38,9 +38,10 @@ class NestedAreaItem; class FunctionSelection : public FunctionSelectionBase, public TraceItemView { Q_OBJECT + TQ_OBJECT public: - FunctionSelection( TopLevel*, TQWidget* parent = 0, const char* name = 0); + FunctionSelection( TopLevel*, TQWidget* tqparent = 0, const char* name = 0); ~FunctionSelection(); TraceCostItem* group(TQString); diff --git a/kcachegrind/kcachegrind/functionselectionbase.ui b/kcachegrind/kcachegrind/functionselectionbase.ui index e59dc26c..5fbc7f96 100644 --- a/kcachegrind/kcachegrind/functionselectionbase.ui +++ b/kcachegrind/kcachegrind/functionselectionbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>FunctionSelectionBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>FunctionSelectionBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -25,15 +25,15 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>searchLabel</cstring> </property> @@ -44,19 +44,19 @@ <cstring>searchEdit</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>searchEdit</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>groupBox</cstring> </property> </widget> </hbox> </widget> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Self</string> @@ -90,14 +90,14 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>150</height> </size> </property> </widget> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Incl.</string> @@ -159,5 +159,5 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kcachegrind/kcachegrind/instritem.cpp b/kcachegrind/kcachegrind/instritem.cpp index 97c09661..3aa7d22d 100644 --- a/kcachegrind/kcachegrind/instritem.cpp +++ b/kcachegrind/kcachegrind/instritem.cpp @@ -37,9 +37,9 @@ // InstrItem // for messages -InstrItem::InstrItem(InstrView* iv, TQListView* parent, +InstrItem::InstrItem(InstrView* iv, TQListView* tqparent, Addr addr, const TQString& msg) - : TQListViewItem(parent) + : TQListViewItem(tqparent) { _view = iv; _addr = addr; @@ -56,11 +56,11 @@ InstrItem::InstrItem(InstrView* iv, TQListView* parent, } // for code lines -InstrItem::InstrItem(InstrView* iv, TQListView* parent, +InstrItem::InstrItem(InstrView* iv, TQListView* tqparent, Addr addr, bool inside, const TQString& code, const TQString& cmd, const TQString& args, TraceInstr* instr) - : TQListViewItem(parent) + : TQListViewItem(tqparent) { _view = iv; _addr = addr; @@ -86,9 +86,9 @@ InstrItem::InstrItem(InstrView* iv, TQListView* parent, } // for call lines -InstrItem::InstrItem(InstrView* iv, TQListViewItem* parent, Addr addr, +InstrItem::InstrItem(InstrView* iv, TQListViewItem* tqparent, Addr addr, TraceInstr* instr, TraceInstrCall* instrCall) - : TQListViewItem(parent) + : TQListViewItem(tqparent) { _view = iv; _addr = addr; @@ -107,7 +107,7 @@ InstrItem::InstrItem(InstrView* iv, TQListViewItem* parent, Addr addr, else templ += i18n("%n call to '%1'", "%n calls to '%1'", cc); - TQString callStr = templ.arg(_instrCall->call()->calledName()); + TQString callStr = templ.tqarg(_instrCall->call()->calledName()); TraceFunction* calledF = _instrCall->call()->called(); calledF->addPrettyLocation(callStr); @@ -118,9 +118,9 @@ InstrItem::InstrItem(InstrView* iv, TQListViewItem* parent, Addr addr, } // for jump lines -InstrItem::InstrItem(InstrView* iv, TQListViewItem* parent, Addr addr, +InstrItem::InstrItem(InstrView* iv, TQListViewItem* tqparent, Addr addr, TraceInstr* instr, TraceInstrJump* instrJump) - : TQListViewItem(parent) + : TQListViewItem(tqparent) { _view = iv; _addr = addr; @@ -135,13 +135,13 @@ InstrItem::InstrItem(InstrView* iv, TQListViewItem* parent, Addr addr, TQString jStr; if (_instrJump->isCondJump()) jStr = i18n("Jump %1 of %2 times to 0x%3") - .arg(_instrJump->followedCount().pretty()) - .arg(_instrJump->executedCount().pretty()) - .arg(_instrJump->instrTo()->addr().toString()); + .tqarg(_instrJump->followedCount().pretty()) + .tqarg(_instrJump->executedCount().pretty()) + .tqarg(_instrJump->instrTo()->addr().toString()); else jStr = i18n("Jump %1 times to 0x%2") - .arg(_instrJump->executedCount().pretty()) - .arg(_instrJump->instrTo()->addr().toString()); + .tqarg(_instrJump->executedCount().pretty()) + .tqarg(_instrJump->instrTo()->addr().toString()); setText(6, jStr); @@ -200,7 +200,7 @@ void InstrItem::updateCost() TraceCostType *ct = _view->costType(); _pure = ct ? instrCost->subCost(ct) : SubCost(0); if (_pure == 0) { - setText(1, TQString::null); + setText(1, TQString()); setPixmap(1, TQPixmap()); } else { @@ -209,7 +209,7 @@ void InstrItem::updateCost() if (Configuration::showPercentage()) setText(1, TQString("%1") - .arg(pure, 0, 'f', Configuration::percentPrecision())); + .tqarg(pure, 0, 'f', Configuration::percentPrecision())); else setText(1, _pure.pretty()); @@ -219,7 +219,7 @@ void InstrItem::updateCost() TraceCostType *ct2 = _view->costType2(); _pure2 = ct2 ? instrCost->subCost(ct2) : SubCost(0); if (_pure2 == 0) { - setText(2, TQString::null); + setText(2, TQString()); setPixmap(2, TQPixmap()); } else { @@ -228,7 +228,7 @@ void InstrItem::updateCost() if (Configuration::showPercentage()) setText(2, TQString("%1") - .arg(pure, 0, 'f', Configuration::percentPrecision())); + .tqarg(pure, 0, 'f', Configuration::percentPrecision())); else setText(2, _pure2.pretty()); @@ -297,7 +297,7 @@ int InstrItem::compare(TQListViewItem * i, int col, bool ascending ) const } void InstrItem::paintCell( TQPainter *p, const TQColorGroup &cg, - int column, int width, int alignment ) + int column, int width, int tqalignment ) { TQColorGroup _cg( cg ); @@ -309,7 +309,7 @@ void InstrItem::paintCell( TQPainter *p, const TQColorGroup &cg, if (column == 3) paintArrows(p, _cg, width); else - TQListViewItem::paintCell( p, _cg, column, width, alignment ); + TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); } void InstrItem::setJumpArray(const TQMemArray<TraceInstrJump*>& a) @@ -326,7 +326,7 @@ void InstrItem::paintArrows(TQPainter *p, const TQColorGroup &cg, int width) const BackgroundMode bgmode = lv->viewport()->backgroundMode(); const TQColorGroup::ColorRole crole = TQPalette::backgroundRoleFromMode( bgmode ); - if ( cg.brush( crole ) != lv->colorGroup().brush( crole ) ) + if ( cg.brush( crole ) != lv->tqcolorGroup().brush( crole ) ) p->fillRect( 0, 0, width, height(), cg.brush( crole ) ); else iv->paintEmptyArea( p, TQRect( 0, 0, width, height() ) ); @@ -373,7 +373,7 @@ void InstrItem::paintArrows(TQPainter *p, const TQColorGroup &cg, int width) p->fillRect( marg + 6*i-2, (y1==0) ? y1: y1-2, 8, (y2-y1==height())? y2:y2+2, cg.brush( TQColorGroup::Highlight ) ); - c = lv->colorGroup().highlightedText(); + c = lv->tqcolorGroup().highlightedText(); } #endif p->fillRect( marg + 6*i, y1, 4, y2, c); @@ -388,7 +388,7 @@ void InstrItem::paintArrows(TQPainter *p, const TQColorGroup &cg, int width) if (start >= 0) { #if 0 if (_jump[start] == ((TraceItemView*)_view)->selectedItem()) { - c = lv->colorGroup().highlightedText(); + c = lv->tqcolorGroup().highlightedText(); } #endif c = _jump[start]->isCondJump() ? red : blue; @@ -416,13 +416,13 @@ void InstrItem::paintArrows(TQPainter *p, const TQColorGroup &cg, int width) p->drawConvexPolygon(a); p->setPen(c.light()); - p->drawPolyline(a, 0, 5); + p->tqdrawPolyline(a, 0, 5); p->setPen(c.dark()); - p->drawPolyline(a, 4, 2); + p->tqdrawPolyline(a, 4, 2); p->setPen(c.light()); - p->drawPolyline(a, 5, 2); + p->tqdrawPolyline(a, 5, 2); p->setPen(c.dark()); - p->drawPolyline(a, 6, 2); + p->tqdrawPolyline(a, 6, 2); } // draw inner vertical line for start/stop diff --git a/kcachegrind/kcachegrind/instritem.h b/kcachegrind/kcachegrind/instritem.h index 8f04b47a..ab5467d9 100644 --- a/kcachegrind/kcachegrind/instritem.h +++ b/kcachegrind/kcachegrind/instritem.h @@ -28,26 +28,26 @@ class InstrView; -class InstrItem: public QListViewItem +class InstrItem: public TQListViewItem { public: // for messages - InstrItem(InstrView* iv, TQListView* parent, + InstrItem(InstrView* iv, TQListView* tqparent, Addr addr, const TQString&); // for instruction lines - InstrItem(InstrView* iv, TQListView* parent, + InstrItem(InstrView* iv, TQListView* tqparent, Addr addr, bool inside, const TQString&, const TQString&, const TQString&, TraceInstr* instr); // for call instr - InstrItem(InstrView* iv, TQListViewItem* parent, Addr addr, + InstrItem(InstrView* iv, TQListViewItem* tqparent, Addr addr, TraceInstr* instr, TraceInstrCall* instrCall); // for jump lines - InstrItem(InstrView* iv, TQListViewItem* parent, Addr addr, + InstrItem(InstrView* iv, TQListViewItem* tqparent, Addr addr, TraceInstr* instr, TraceInstrJump* instrJump); Addr addr() const { return _addr; } @@ -58,7 +58,7 @@ public: int compare(TQListViewItem * i, int col, bool ascending ) const; void paintCell(TQPainter *p, const TQColorGroup &cg, - int column, int width, int alignment ); + int column, int width, int tqalignment ); int width( const TQFontMetrics& fm, const TQListView* lv, int c ) const; diff --git a/kcachegrind/kcachegrind/instrview.cpp b/kcachegrind/kcachegrind/instrview.cpp index 8a67296e..24e83cf6 100644 --- a/kcachegrind/kcachegrind/instrview.cpp +++ b/kcachegrind/kcachegrind/instrview.cpp @@ -110,9 +110,9 @@ static bool parseLine(char* buf, Addr& addr, // -InstrView::InstrView(TraceItemView* parentView, - TQWidget* parent, const char* name) - : TQListView(parent, name), TraceItemView(parentView) +InstrView::InstrView(TraceItemView* tqparentView, + TQWidget* tqparent, const char* name) + : TQListView(tqparent, name), TraceItemView(tqparentView) { _showHexCode = DEFAULT_SHOWHEXCODE; _lastHexCodeWidth = 50; @@ -132,8 +132,8 @@ InstrView::InstrView(TraceItemView* parentView, addColumn( i18n( "Source Position" ) ); setAllColumnsShowFocus(true); - setColumnAlignment(1, Qt::AlignRight); - setColumnAlignment(2, Qt::AlignRight); + setColumnAlignment(1, TQt::AlignRight); + setColumnAlignment(2, TQt::AlignRight); connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)), @@ -188,11 +188,11 @@ void InstrView::context(TQListViewItem* i, const TQPoint & p, int c) TQString name = f->name(); if ((int)name.length()>Configuration::maxSymbolLength()) name = name.left(Configuration::maxSymbolLength()) + "..."; - popup.insertItem(i18n("Go to '%1'").arg(name), 93); + popup.insertItem(i18n("Go to '%1'").tqarg(name), 93); popup.insertSeparator(); } else if (instr) { - popup.insertItem(i18n("Go to Address %1").arg(instr->name()), 93); + popup.insertItem(i18n("Go to Address %1").tqarg(instr->name()), 93); popup.insertSeparator(); } @@ -615,11 +615,11 @@ bool InstrView::fillInstrRange(TraceFunction* function, // generate command TQString popencmd, objfile; objfile = function->object()->name(); - objfile = objfile.replace(TQRegExp("[\"']"), ""); // security... + objfile = objfile.tqreplace(TQRegExp("[\"']"), ""); // security... popencmd = TQString("objdump -C -d " "--start-address=0x%1 --stop-address=0x%2 \"%3\"") - .arg(dumpStartAddr.toString()).arg(dumpEndAddr.toString()) - .arg(objfile); + .tqarg(dumpStartAddr.toString()).tqarg(dumpEndAddr.toString()) + .tqarg(objfile); if (1) qDebug("Running '%s'...", popencmd.ascii()); // and run... @@ -875,7 +875,7 @@ bool InstrView::fillInstrRange(TraceFunction* function, "There are %n cost lines without assembler code.", noAssLines)); new InstrItem(this, this, 2, i18n("This happens because the code of")); - new InstrItem(this, this, 3, TQString(" %1").arg(objfile)); + new InstrItem(this, this, 3, TQString(" %1").tqarg(objfile)); new InstrItem(this, this, 4, i18n("does not seem to match the profile data file.")); new InstrItem(this, this, 5, ""); diff --git a/kcachegrind/kcachegrind/instrview.h b/kcachegrind/kcachegrind/instrview.h index c807a0a4..fa175ae4 100644 --- a/kcachegrind/kcachegrind/instrview.h +++ b/kcachegrind/kcachegrind/instrview.h @@ -33,10 +33,11 @@ class InstrView : public TQListView, public TraceItemView friend class InstrItem; Q_OBJECT + TQ_OBJECT public: - InstrView(TraceItemView* parentView, - TQWidget* parent = 0, const char* name = 0); + InstrView(TraceItemView* tqparentView, + TQWidget* tqparent = 0, const char* name = 0); virtual TQWidget* widget() { return this; } TQString whatsThis() const; diff --git a/kcachegrind/kcachegrind/listutils.cpp b/kcachegrind/kcachegrind/listutils.cpp index 5c4a838c..0053646d 100644 --- a/kcachegrind/kcachegrind/listutils.cpp +++ b/kcachegrind/kcachegrind/listutils.cpp @@ -85,14 +85,14 @@ TQPixmap percentagePixmap(int w, int h, int percent, TQColor c, bool framed) if (w<3) return TQPixmap(); TQPixmap pix(w, h); - pix.fill(Qt::white); + pix.fill(TQt::white); TQPainter p(&pix); - p.setPen(Qt::black); + p.setPen(TQt::black); if (framed) p.drawRect(0, 0, w, h); // inside - p.setPen(Qt::NoPen); + p.setPen(TQt::NoPen); p.setBrush(c); p.drawRect(ix1, iy1, filled-1,ih); @@ -144,9 +144,9 @@ TQPixmap partitionPixmap(int w, int h, if (w<3) return TQPixmap(); TQPixmap pix(w, h); - pix.fill(Qt::white); + pix.fill(TQt::white); TQPainter p(&pix); - p.setPen(Qt::black); + p.setPen(TQt::black); if (framed) p.drawRect(0, 0, w, h); @@ -173,7 +173,7 @@ TQPixmap partitionPixmap(int w, int h, if (x2>=iw) x2=iw-1; // inside - p.setPen(Qt::NoPen); + p.setPen(TQt::NoPen); p.setBrush(c); p.drawRect(x1, iy1, x2-x1+1, ih); diff --git a/kcachegrind/kcachegrind/loader.h b/kcachegrind/kcachegrind/loader.h index 2c9937b9..ee374054 100644 --- a/kcachegrind/kcachegrind/loader.h +++ b/kcachegrind/kcachegrind/loader.h @@ -46,9 +46,10 @@ typedef TQPtrList<Loader> LoaderList; * KCachegrind will use the first matching loader. */ -class Loader: public QObject +class Loader: public TQObject { Q_OBJECT + TQ_OBJECT public: Loader(TQString name, TQString desc); @@ -66,7 +67,7 @@ public: TQString description() const { return _description; } signals: - void updateStatus(TQString, int); + void updatetqStatus(TQString, int); private: TQString _name, _description; diff --git a/kcachegrind/kcachegrind/multiview.cpp b/kcachegrind/kcachegrind/multiview.cpp index 4288e2df..014276df 100644 --- a/kcachegrind/kcachegrind/multiview.cpp +++ b/kcachegrind/kcachegrind/multiview.cpp @@ -34,8 +34,8 @@ // MultiView // -MultiView::MultiView(TopLevel* top, TQWidget* parent, const char* name) - : TQSplitter(parent, name), TraceItemView(0, top) +MultiView::MultiView(TopLevel* top, TQWidget* tqparent, const char* name) + : TQSplitter(tqparent, name), TraceItemView(0, top) { // default setOrientation(Qt::Horizontal); @@ -65,7 +65,7 @@ void MultiView::appendView() int n = _views.count()+1; TabView* tv = new TabView(this, this, - TQString("TabView-%1").arg(n).ascii()); + TQString("TabView-%1").tqarg(n).ascii()); connect(tv, TQT_SIGNAL(activated(TabView*)), this, TQT_SLOT(tabActivated(TabView*)) ); _views.append(tv); @@ -128,7 +128,7 @@ void MultiView::selected(TraceItemView* sender, TraceItem* i) // we react only on selection changes of the active TabView if (sender != (TraceItemView*)_active) return; - _views.findRef(_active); + _views.tqfindRef(_active); TabView* next = _views.next(); if (!next) next = _views.first(); @@ -176,7 +176,7 @@ void MultiView::readViewConfig(KConfig* c, KConfigGroup* g = configGroup(c, prefix, postfix); int n = g->readNumEntry("Panels", 1); setChildCount(n); - setOrientation( (g->readEntry("Orientation") == TQString("Horizontal")) ? + setOrientation( (g->readEntry("Qt::Orientation") == TQString("Horizontal")) ? Qt::Horizontal : Qt::Vertical ); setSizes(g->readIntListEntry("PanelSizes")); @@ -187,7 +187,7 @@ void MultiView::readViewConfig(KConfig* c, TabView* tv, *activeTV = 0; for(tv=_views.first();tv;tv=_views.next()) { if (tv->name() == active) activeTV=tv; - tv->readViewConfig(c, TQString("%1-%2").arg(prefix).arg(tv->name()), + tv->readViewConfig(c, TQString("%1-%2").tqarg(prefix).tqarg(tv->name()), postfix, withOptions); } @@ -207,7 +207,7 @@ void MultiView::saveViewConfig(KConfig* c, KConfigGroup g(c, (prefix+postfix).ascii()); g.writeEntry("Panels", childCount()); - g.writeEntry("Orientation", + g.writeEntry("Qt::Orientation", (orientation() == Qt::Horizontal) ? "Horizontal" : "Vertical"); @@ -216,7 +216,7 @@ void MultiView::saveViewConfig(KConfig* c, TabView* tv; for(tv=_views.first();tv;tv=_views.next()) - tv->saveViewConfig(c, TQString("%1-%2").arg(prefix).arg(tv->name()), + tv->saveViewConfig(c, TQString("%1-%2").tqarg(prefix).tqarg(tv->name()), postfix, withOptions); } diff --git a/kcachegrind/kcachegrind/multiview.h b/kcachegrind/kcachegrind/multiview.h index b4b53928..393638ba 100644 --- a/kcachegrind/kcachegrind/multiview.h +++ b/kcachegrind/kcachegrind/multiview.h @@ -34,9 +34,10 @@ class MultiView : public TQSplitter, public TraceItemView { Q_OBJECT + TQ_OBJECT public: - MultiView(TopLevel* top, TQWidget* parent = 0, const char* name = 0); + MultiView(TopLevel* top, TQWidget* tqparent = 0, const char* name = 0); TQWidget* widget() { return this; } TabView* activeTabView() const { return _active; } diff --git a/kcachegrind/kcachegrind/partgraph.cpp b/kcachegrind/kcachegrind/partgraph.cpp index 11f4cd29..a7fd746a 100644 --- a/kcachegrind/kcachegrind/partgraph.cpp +++ b/kcachegrind/kcachegrind/partgraph.cpp @@ -29,8 +29,8 @@ // PartAreaWidget -PartAreaWidget::PartAreaWidget(TQWidget* parent, const char* name) - : TreeMapWidget(new BasePartItem(), parent, name) +PartAreaWidget::PartAreaWidget(TQWidget* tqparent, const char* name) + : TreeMapWidget(new BasePartItem(), tqparent, name) { _data = 0; _function = 0; @@ -90,7 +90,7 @@ void PartAreaWidget::refreshParts() { // rebuild only subparts to keep part selection state TreeMapItem* i; - TreeMapItemList* l = base()->children(); + TreeMapItemList* l = base()->tqchildren(); if (l) for (i=l->first();i;i=l->next()) i->refresh(); @@ -115,7 +115,7 @@ void PartAreaWidget::setGroupType(TraceCost::CostType gt) // rebuild hierarchy below parts. // thus, selected parts stay selected TreeMapItem* i; - TreeMapItemList* l = base()->children(); + TreeMapItemList* l = base()->tqchildren(); if (l) for (i=l->first();i;i=l->next()) i->refresh(); @@ -125,13 +125,13 @@ void PartAreaWidget::setGroupType(TraceCost::CostType gt) bool PartAreaWidget::isHidden(TracePart* part) const { - return (_hiddenParts.containsRef(part)>0); + return (_hiddenParts.tqcontainsRef(part)>0); } TQColor PartAreaWidget::groupColor(TraceFunction* f) const { if (!f) - return colorGroup().button(); + return tqcolorGroup().button(); return Configuration::functionColor(_groupType, f); } @@ -156,15 +156,15 @@ TQString PartAreaWidget::tipString(TreeMapItem* i) const itemTip += "\n"; tip = itemTip + tip; - i = i->parent(); + i = i->tqparent(); count++; } // skip to part - while (i && i->rtti()==3) i = i->parent(); + while (i && i->rtti()==3) i = i->tqparent(); if (i && i->rtti()==2) { - itemTip = i18n("Profile Part %1").arg(i->text(0)); + itemTip = i18n("Profile Part %1").tqarg(i->text(0)); if (!i->text(1).isEmpty()) itemTip += " (" + i->text(1) + ")"; @@ -201,9 +201,9 @@ void BasePartItem::setData(TraceData* data) refresh(); } -TreeMapItemList* BasePartItem::children() +TreeMapItemList* BasePartItem::tqchildren() { - if (!_data) return _children; + if (!_data) return _tqchildren; if (!initialized()) { // qDebug("Create Parts (%s)", name().ascii()); @@ -216,7 +216,7 @@ TreeMapItemList* BasePartItem::children() addItem(new PartItem(part)); } - return _children; + return _tqchildren; } TQString BasePartItem::text(int textNo) const @@ -228,13 +228,13 @@ TQString BasePartItem::text(int textNo) const if (_data->parts().count() == 0) return i18n("(no part)"); } - return TQString::null; + return TQString(); } TQColor BasePartItem::backColor() const { - return widget()->colorGroup().base(); + return widget()->tqcolorGroup().base(); } double BasePartItem::value() const @@ -263,7 +263,7 @@ TQString PartItem::text(int textNo) const return _p->prettyName(); if (textNo != 1) - return TQString::null; + return TQString(); TraceCostType* ct; PartAreaWidget* w = (PartAreaWidget*)widget(); @@ -276,7 +276,7 @@ TQString PartItem::text(int textNo) const TraceCost* t = _p->data()->totals(); double p = 100.0 * v / t->subCost(ct); return TQString("%1 %") - .arg(p, 0, 'f', Configuration::percentPrecision()); + .tqarg(p, 0, 'f', Configuration::percentPrecision()); } return v.pretty(); } @@ -324,9 +324,9 @@ double PartItem::sum() const return 0.0; } -TreeMapItemList* PartItem::children() +TreeMapItemList* PartItem::tqchildren() { - if (initialized()) return _children; + if (initialized()) return _tqchildren; TraceCost* c; // qDebug("Create Part subitems (%s)", name().ascii()); @@ -339,7 +339,7 @@ TreeMapItemList* PartItem::children() if (c) addItem(new SubPartItem(c)); } - return _children; + return _tqchildren; } @@ -397,7 +397,7 @@ TreeMapItemList* PartItem::children() break; } - return _children; + return _tqchildren; } @@ -426,7 +426,7 @@ TQString SubPartItem::text(int textNo) const } if (textNo != 1) - return TQString::null; + return TQString(); TraceCostType* ct; PartAreaWidget* w = (PartAreaWidget*)widget(); @@ -443,7 +443,7 @@ TQString SubPartItem::text(int textNo) const _partCostItem->part() : _partCostItem->part()->data()->totals(); double p = 100.0 * v / t->subCost(ct); return TQString("%1 %") - .arg(p, 0, 'f', Configuration::percentPrecision()); + .tqarg(p, 0, 'f', Configuration::percentPrecision()); } return v.pretty(); } @@ -491,7 +491,7 @@ double SubPartItem::sum() const return 0.0; } -TreeMapItemList* SubPartItem::children() +TreeMapItemList* SubPartItem::tqchildren() { if (!initialized()) { // qDebug("Create Part sub-subitems (%s)", name().ascii()); @@ -499,7 +499,7 @@ TreeMapItemList* SubPartItem::children() PartAreaWidget* w = (PartAreaWidget*)widget(); if (depth()-2 > w->callLevels()) - return _children; + return _tqchildren; if (w->visualisation() == PartAreaWidget::Inclusive) { TracePartCall* call; @@ -517,7 +517,7 @@ TreeMapItemList* SubPartItem::children() } } - return _children; + return _tqchildren; } diff --git a/kcachegrind/kcachegrind/partgraph.h b/kcachegrind/kcachegrind/partgraph.h index 7b8056a7..1477382e 100644 --- a/kcachegrind/kcachegrind/partgraph.h +++ b/kcachegrind/kcachegrind/partgraph.h @@ -29,12 +29,13 @@ class PartAreaWidget: public TreeMapWidget { Q_OBJECT + TQ_OBJECT public: // Visualisation inside of trace parts enum VisualisationMode { NoVisualisation, Partitioning, Inclusive }; - PartAreaWidget(TQWidget* parent=0, const char* name=0); + PartAreaWidget(TQWidget* tqparent=0, const char* name=0); void setData(TraceData* d); void setCostType(TraceCostType* ct); @@ -82,7 +83,7 @@ public: double value() const; TQString text(int) const; int borderWidth() const { return 0; } - TreeMapItemList* children(); + TreeMapItemList* tqchildren(); TQColor backColor() const; private: @@ -100,7 +101,7 @@ public: int borderWidth() const { return 0; } TQString text(int) const; TQPixmap pixmap(int) const; - TreeMapItemList* children(); + TreeMapItemList* tqchildren(); TQColor backColor() const; private: @@ -119,7 +120,7 @@ public: SplitMode splitMode() const { return Vertical; } TQString text(int) const; TQPixmap pixmap(int) const; - TreeMapItemList* children(); + TreeMapItemList* tqchildren(); TQColor backColor() const; private: diff --git a/kcachegrind/kcachegrind/partlistitem.cpp b/kcachegrind/kcachegrind/partlistitem.cpp index 40c2db36..f23db9a4 100644 --- a/kcachegrind/kcachegrind/partlistitem.cpp +++ b/kcachegrind/kcachegrind/partlistitem.cpp @@ -33,10 +33,10 @@ // PartListItem -PartListItem::PartListItem(TQListView* parent, TraceCostItem* costItem, +PartListItem::PartListItem(TQListView* tqparent, TraceCostItem* costItem, TraceCostType* ct, TraceCost::CostType gt, TracePart* part) - :TQListViewItem(parent) + :TQListViewItem(tqparent) { _partCostItem = costItem->findDepFromPart(part); _part = part; @@ -46,7 +46,7 @@ PartListItem::PartListItem(TQListView* parent, TraceCostItem* costItem, #if 0 TQString partName = TQString::number(part->partNumber()); if (part->data()->maxThreadID() >1) - partName += i18n(" (Thread %1)").arg(part->threadID()); + partName += i18n(" (Thread %1)").tqarg(part->threadID()); setText(0, partName); #else setText(0, _part->prettyName()); @@ -107,7 +107,7 @@ void PartListItem::update() double pure = 100.0 * _pure / selfTotal; if (Configuration::showPercentage()) { setText(2, TQString("%1") - .arg(pure, 0, 'f', Configuration::percentPrecision())); + .tqarg(pure, 0, 'f', Configuration::percentPrecision())); } else setText(2, _partCostItem->prettySubCost(_costType)); @@ -123,7 +123,7 @@ void PartListItem::update() double sum = 100.0 * _sum / total; if (Configuration::showPercentage()) { setText(1, TQString("%1") - .arg(sum, 0, 'f', Configuration::percentPrecision())); + .tqarg(sum, 0, 'f', Configuration::percentPrecision())); } else setText(1, _sum.pretty()); diff --git a/kcachegrind/kcachegrind/partlistitem.h b/kcachegrind/kcachegrind/partlistitem.h index 6704f51e..c395b239 100644 --- a/kcachegrind/kcachegrind/partlistitem.h +++ b/kcachegrind/kcachegrind/partlistitem.h @@ -29,10 +29,10 @@ * * Note: on a cost item / percentage change, the list is rebuild */ -class PartListItem: public QListViewItem +class PartListItem: public TQListViewItem { public: - PartListItem(TQListView* parent, TraceCostItem* costItem, + PartListItem(TQListView* tqparent, TraceCostItem* costItem, TraceCostType* ct, TraceCost::CostType gt, TracePart* part); int compare(TQListViewItem * i, int col, bool ascending ) const; diff --git a/kcachegrind/kcachegrind/partselection.cpp b/kcachegrind/kcachegrind/partselection.cpp index dfd1b096..3b1e6063 100644 --- a/kcachegrind/kcachegrind/partselection.cpp +++ b/kcachegrind/kcachegrind/partselection.cpp @@ -17,7 +17,7 @@ */ /* - * For part file selection, to be put into a QDockWindow + * For part file selection, to be put into a TQDockWindow */ #include <tqtimer.h> @@ -36,8 +36,8 @@ #include "partselection.h" #include "partgraph.h" -PartSelection::PartSelection( TQWidget* parent, const char* name) - : PartSelectionBase(parent, name) +PartSelection::PartSelection( TQWidget* tqparent, const char* name) + : PartSelectionBase(tqparent, name) { _data = 0; _costType = 0; @@ -148,7 +148,7 @@ void PartSelection::currentChangedSlot(TreeMapItem* i, bool kbd) TQString str = i->text(0); if (!i->text(1).isEmpty()) str += " (" + i->text(1) + ")"; - TQString msg = i18n("Profile Part Overview: Current is '%1'").arg(str); + TQString msg = i18n("Profile Part Overview: Current is '%1'").tqarg(str); emit showMessage(msg, 5000); if (_showInfo) fillInfo(); @@ -203,7 +203,7 @@ void PartSelection::selectionChanged() TracePart* part; // if nothing is selected, activate all parts - TreeMapItemList* list = partAreaWidget->base()->children(); + TreeMapItemList* list = partAreaWidget->base()->tqchildren(); if (!list) return; for (i=list->first();i;i=list->next()) @@ -235,11 +235,11 @@ void PartSelection::activePartsChangedSlot(const TracePartList& list) kdDebug() << "Entering PartSelection::activePartsChangedSlot" << endl; TreeMapItem* i; - TreeMapItemList l = *partAreaWidget->base()->children(); + TreeMapItemList l = *partAreaWidget->base()->tqchildren(); // first deselect inactive, then select active (makes current active) for (i=l.first();i;i=l.next()) { TracePart* part = ((PartItem*)i)->part(); - bool active = (list.containsRef(part)>0); + bool active = (list.tqcontainsRef(part)>0); if (!active && partAreaWidget->isSelected(i)) { #if 0 qDebug("PartSelection::partsChangedSlot: Part %s changed to unselected.", @@ -251,7 +251,7 @@ void PartSelection::activePartsChangedSlot(const TracePartList& list) } for (i=l.first();i;i=l.next()) { TracePart* part = ((PartItem*)i)->part(); - bool active = (list.containsRef(part)>0); + bool active = (list.tqcontainsRef(part)>0); if (active && !partAreaWidget->isSelected(i)) { #if 0 qDebug("PartSelection::partsChangedSlot: Part %s changed to selected.", @@ -310,7 +310,7 @@ void PartSelection::contextMenuRequested(TreeMapItem* i, str = i18n("Select") + " '" + ni->text(0) + "'"; popup.insertItem(str, id); - ni = ni->parent(); + ni = ni->tqparent(); id++; } } @@ -365,7 +365,7 @@ void PartSelection::contextMenuRequested(TreeMapItem* i, if (r>=100) { TreeMapItem* ci = i; while (ci && r>100) { - ci = ci->parent(); + ci = ci->tqparent(); r--; } doubleClicked(ci); @@ -381,7 +381,7 @@ void PartSelection::contextMenuRequested(TreeMapItem* i, case 2: // select all parts { - TreeMapItemList list = *partAreaWidget->base()->children(); + TreeMapItemList list = *partAreaWidget->base()->tqchildren(); partAreaWidget->setRangeSelection(list.first(), list.last(), true); } break; @@ -545,7 +545,7 @@ void PartSelection::fillInfo() TQString info = _data->activePartRange(); TreeMapItem* i = partAreaWidget->current(); - while (i && i->rtti()!=2) i = i->parent(); + while (i && i->rtti()!=2) i = i->tqparent(); if (i) { TracePart* part = ((PartItem*)i)->part(); diff --git a/kcachegrind/kcachegrind/partselection.h b/kcachegrind/kcachegrind/partselection.h index b3ea10ba..dfdeff17 100644 --- a/kcachegrind/kcachegrind/partselection.h +++ b/kcachegrind/kcachegrind/partselection.h @@ -18,7 +18,7 @@ /* * PartSelection for KCachegrind - * For part file selection, to be put into a QDockWindow + * For part file selection, to be put into a TQDockWindow */ #ifndef PARTSELECTION_H @@ -38,9 +38,10 @@ class TreeMapItem; class PartSelection: public PartSelectionBase { Q_OBJECT + TQ_OBJECT public: - PartSelection( TQWidget* parent = 0, const char* name = 0); + PartSelection( TQWidget* tqparent = 0, const char* name = 0); ~PartSelection(); TraceData* data() { return _data; } diff --git a/kcachegrind/kcachegrind/partselectionbase.ui b/kcachegrind/kcachegrind/partselectionbase.ui index 3267f49a..f3505368 100644 --- a/kcachegrind/kcachegrind/partselectionbase.ui +++ b/kcachegrind/kcachegrind/partselectionbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>PartSelectionBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>PartSelectionBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -37,14 +37,14 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>50</height> </size> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>rangeLabel</cstring> </property> @@ -85,5 +85,5 @@ <data format="XPM.GZ" length="5230">789c9597db4e1d4b0e86eff31428be8b46b5fb54dd551acd051020211c4320c0682eecaa5e9ccf90005bf3ee53cbbfe9d9c9c548a38ea27c2977b5cbfe6dd7fae3c3c2e1cee6c2873fde3d3cf2e3595a48a77cbff0213f5d5dbdfcf35ffff8f3ddfba65998fff161a179ffb777ef771f17d2c2d6cdf53807c705a889cdac6ee72c47736eebd637b5f2b672d70ecd30e744ca7d9b9a4ad7579587363433e527e5d072abefbb03636978ceb4a31c5bc13a91716ad41f89e0aec2fe74abcc6d6ad5f9e4945357375ef75f997357751dd61d19c71afb61bdef421b951f274ebaffb6716cb3f2b2f230f18d3183dd95b1b441d7d59f2e94757ccf1b27eceff69563618d0f5dcfd9d7beeb7a5dd7f3fac6fb4ee32b87c619f1168d976f7d6ff6df26d6ef4b301e1bac7f54f63e747a5e87f5c173276aff605c22a8fefc540e5e3af5972f956359577bf2c6d978cb78d6697edc9eb2f8b143fed7945359d778b0e6c3e7be81bf7465dce23cf4ac3c16567f19fecefaae53bd081b7baccbb131b7d05f679ca03f27c6b9d1f388c6bbaffab7f80dca4d1fed7bfafdbeedb9533d490f1e2ae8d5693ccacb83d77cd027e3d4416faa97beefa3d7f8f086f168f9d9020f43a3f5c5aa877e28eb88f74fe319becfaa873e0c15de775f95639f3dec37c143d361bf2be3cef4b76bdcb7d84ff5d2cbd0227facf1ecd360fa67d54b9f078ffcd10f636e11ff53e3847853ad3c1b668837e9fe43358c2df45a81430b3db2e6676842d368fd48abdc068b87e0fd2e788bf792b21f861e7afd0e0e5ce37dcdd7d0872218e5d789f57b3218a71ae7bb501eca3af67b510e21c05fd27a1b6218ac3ef17d0ed68fe8cb1be3fc6e5159863ca0bfed824340fe687d62c4838c23f677f0370de380fcdd2be7e03dfab1d6cf300bcd80fa80bfb358dbf9547fa18abe413d68fe421d63ade7737aded094cf63fdcc38f4d0bfee17dac2d08380a3a0dff24cb90bdc23ffaa87e0636c912fed87612e38d4df1e982bc4dbdd29872001f14aca319413eb793e83cbfbe8af27606e4c0f5f8d3bcb7763ec6b8da73b57e69083d61f9d82b9b5fada31f635fcaf8d7b7b5ffb41f16e34ff34fe214dfc0c8e1ef1a22330bfcdc345e31e4c33e3c1e6e181b1609e3ac43f8759803e8cd9f2e7e0ff18ab80ef5d8239e2fc0ef129f90ff0bf0773347fee8d13ce279bc6b34af5c61abf58157bf4b765b05435f4abfec726968c2b67e536fa80fe388279067f680d2c750dff75fe9766da07e44bc02521ba4e1d584c1fb261dcc23fd97f63f8c3af136bfc687362c4e76962ed8fac7a2ecdb7853f7c63ec6bf467bd3fc421c680780c60b6f9275fc045aea84fadaf18a2e0fc04ff0237bd9e8fefc0d236e8ef3f8d83c57fdd38daf94edeb886be74fec618b3ed7f3731e66b0fe67a403e76c0454ef8de9231dbfe9f8dc5fc47be38a6887ad2f950964d2fdc1a27d3c7b6710693f6ef9864b4fdb4ffc6cc5540fea0972c339c87afc1c9f4443a5fe2c84d40bd2f82cb3ae6c7b1716dbc37b1e68bf5be118b7e3dead78125d87d0bfa99bd7d8fb78c1bdb4fcfcfd51bcb9d716bebda3fb8966cf7cf57709103f2e327c6fe5a2fdc4ab4fb01deef5283fa65d50ffb54c13fd67ec37d61e845fb070f8571df7c341eec7e7a691c6ae453fb771937d1fa999ebfa43358bf573d3327c6fdd0a9de59b87414e59f60911ef3ff07380d16bf0b63b6fbb8ce0f4e523a80ee8ff8a5f21fe83f384f2e8cf9d419db7d4bb4bff32cb1dd871ae38c79417962dd9f8f2786bfaa3fa992ddbf68d5d8d6797d62dc27b4bf4a9bdeee5be7c619efbb169c2b9bb7aa67e972857a67d59bf8943cf4a6f5237dae3b9c3f4f8cef5713637e6a3c6548e546a7eb87e0b28e7cf7c68ddd2fb15f28acf166bd2f484c19f921f8cbc57de84ff52c397b8f7e178d7bbb7f7e9f18f743d593ccd210d12f9e8c05fd8417c1e5e704e2afefa7aa5cf850ff4fc6a1473debfc4d7561c4ebd3c48897f69fd4e4d8eb7e4efb736a0b23fe9adfd465bb3f388d6ff22933fa1df6f7597ad483c62371f6e6ff8671b6f89e198fb8cfb0ea3f49619c6f6562cc27d5474a7906e6b589d1df549f29e78479450fe0b1c2fc67d5731a0ba33ffc97a167fd7d92ebb1b1f9a87acdcdd8a23ff2e3c4a81fed0fb91bbb88f8e9f772f9b9c6b8bfac187bd41febbcc8c35831f4bb6edc227eeec8b847bc58ef0f398d91a1179d6f391746bdebfd60ac4716b0180bd8a97e473f8ea2dfdb7d9c3f8e1cff8f8760057b27e57f92cb6e743377e24efff29cb97377e12edd55b190c99eddb5bb71b7eeceddbb07f7e89edc0ff7d33dbb17f7ea16dd925b761fdd8a63d8174f52b15e756bee93fbecd6dd17b7e136dd96db763b6ed77d2dd67bee9bdb77078ed49e8b27b7c5fabb3b7447eed855ae768d6bcbd339ef7a37b8e022392a2734fbd1dd119350a24c23cde8844ee98ccee9c2f9c2977445d77443b793fd8ceee89e1ee8919ee807fdb4e7995ee8b5d82fd252b15ffe8bfd097da4155aa535fa34597fa6f5f2f717da28f69bb445dbb433d99fd22e7da53dfa3659efd3017da7c3f2af233aa68aeadfec1b6aa9236fd63d0d14ca15c0719913737b965fedcbf0c83cc29a677cc2a77cc6e77cc1977cc5d7c5fee637fbdbb2db9d5adff343b17ee427fec1737ee69762fffa9bfd222ff17259fdc82bbcca6bfc893ff33a7fe10ddee42ddee69ddfec77f92beff137dee703fece877cc4c7aee58a6b6ee8b8fc10ed7eb13f635f9a4bc5e54719477152ba671977a505c84845c57222a7bfd89fcb999ccb855cca955cbfc5546ee456ee68b14cf67b799047799aec2fdc92fc28999cef567224cff222afb2c85b32e36d599265f9282bb23ad95fba6559934f2593f3e798b74acc8fd5f6b3accb17d9904dd9926db3a7520d1fdd37d9915df95a72599e1291566df7e49beccb817c974339829eb55e56dc7e51ec0d2dcbb1545297a791563af1c5eff2d3beb4faf8562f568f0744745b9e9d5f1f7992d5e412a186ffef7afff7dfdffd077c99ae99</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kcachegrind/kcachegrind/partview.cpp b/kcachegrind/kcachegrind/partview.cpp index 470a8dea..24262885 100644 --- a/kcachegrind/kcachegrind/partview.cpp +++ b/kcachegrind/kcachegrind/partview.cpp @@ -37,9 +37,9 @@ // -PartView::PartView(TraceItemView* parentView, - TQWidget* parent, const char* name) - : TQListView(parent, name), TraceItemView(parentView) +PartView::PartView(TraceItemView* tqparentView, + TQWidget* tqparent, const char* name) + : TQListView(tqparent, name), TraceItemView(tqparentView) { _inSelectionUpdate = false; @@ -51,9 +51,9 @@ PartView::PartView(TraceItemView* parentView, addColumn( i18n( "Comment" ) ); setAllColumnsShowFocus(true); - setColumnAlignment(1, Qt::AlignRight); - setColumnAlignment(2, Qt::AlignRight); - setColumnAlignment(3, Qt::AlignRight); + setColumnAlignment(1, TQt::AlignRight); + setColumnAlignment(2, TQt::AlignRight); + setColumnAlignment(3, TQt::AlignRight); setMinimumHeight(50); setSelectionMode(Extended); @@ -103,8 +103,8 @@ void PartView::context(TQListViewItem* i, const TQPoint & pos, int) TracePart* p = i ? ((PartListItem*) i)->part() : 0; if (p) { - popup.insertItem(i18n("Select '%1'").arg(p->name()), 93); - popup.insertItem(i18n("Hide '%1'").arg(p->name()), 94); + popup.insertItem(i18n("Select '%1'").tqarg(p->name()), 93); + popup.insertItem(i18n("Hide '%1'").tqarg(p->name()), 94); popup.insertSeparator(); } @@ -138,8 +138,8 @@ void PartView::selectionChangedSlot() TraceItem* PartView::canShow(TraceItem* i) { - if (!data()) return 0; - if (data()->parts().count()>1) return i; + if (!TraceItemView::data()) return 0; + if (TraceItemView::data()->parts().count()>1) return i; return 0; } @@ -175,7 +175,7 @@ void PartView::doUpdate(int changeType) for(;item;item = item->nextSibling()) { part = ((PartListItem*)item)->part(); - if (_partList.containsRef(part)>0) { + if (_partList.tqcontainsRef(part)>0) { setSelected(item, true); ensureItemVisible(item); } @@ -214,7 +214,7 @@ void PartView::refresh() TQListViewItem* item = 0; for (part = allParts.first(); part; part = allParts.next()) { - if (hidden.findRef(part)>=0) continue; + if (hidden.tqfindRef(part)>=0) continue; item = new PartListItem(this, f, _costType, _groupType, part); if (part->isActive()) { diff --git a/kcachegrind/kcachegrind/partview.h b/kcachegrind/kcachegrind/partview.h index 03793e36..0d4e882c 100644 --- a/kcachegrind/kcachegrind/partview.h +++ b/kcachegrind/kcachegrind/partview.h @@ -30,10 +30,11 @@ class PartView: public TQListView, public TraceItemView { Q_OBJECT + TQ_OBJECT public: - PartView(TraceItemView* parentView, - TQWidget* parent=0, const char* name=0); + PartView(TraceItemView* tqparentView, + TQWidget* tqparent=0, const char* name=0); virtual TQWidget* widget() { return this; } TQString whatsThis() const; diff --git a/kcachegrind/kcachegrind/sourceitem.cpp b/kcachegrind/kcachegrind/sourceitem.cpp index 40a97ca3..1da4dafb 100644 --- a/kcachegrind/kcachegrind/sourceitem.cpp +++ b/kcachegrind/kcachegrind/sourceitem.cpp @@ -37,11 +37,11 @@ // SourceItem // for source lines -SourceItem::SourceItem(SourceView* sv, TQListView* parent, +SourceItem::SourceItem(SourceView* sv, TQListView* tqparent, int fileno, unsigned int lineno, bool inside, const TQString& src, TraceLine* line) - : TQListViewItem(parent) + : TQListViewItem(tqparent) { _view = sv; _lineno = lineno; @@ -57,17 +57,17 @@ SourceItem::SourceItem(SourceView* sv, TQListView* parent, setText(0, TQString::number(lineno)); TQString s = src; - setText(4, s.replace( TQRegExp("\t"), " " )); + setText(4, s.tqreplace( TQRegExp("\t"), " " )); updateGroup(); updateCost(); } // for call lines -SourceItem::SourceItem(SourceView* sv, TQListViewItem* parent, +SourceItem::SourceItem(SourceView* sv, TQListViewItem* tqparent, int fileno, unsigned int lineno, TraceLine* line, TraceLineCall* lineCall) - : TQListViewItem(parent) + : TQListViewItem(tqparent) { _view = sv; _lineno = lineno; @@ -87,7 +87,7 @@ SourceItem::SourceItem(SourceView* sv, TQListViewItem* parent, else templ += i18n("%n call to '%1'", "%n calls to '%1'", cc); - TQString callStr = templ.arg(_lineCall->call()->calledName()); + TQString callStr = templ.tqarg(_lineCall->call()->calledName()); TraceFunction* calledF = _lineCall->call()->called(); calledF->addPrettyLocation(callStr); @@ -98,10 +98,10 @@ SourceItem::SourceItem(SourceView* sv, TQListViewItem* parent, } // for jump lines -SourceItem::SourceItem(SourceView* sv, TQListViewItem* parent, +SourceItem::SourceItem(SourceView* sv, TQListViewItem* tqparent, int fileno, unsigned int lineno, TraceLine* line, TraceLineJump* lineJump) - : TQListViewItem(parent) + : TQListViewItem(tqparent) { _view = sv; _lineno = lineno; @@ -123,13 +123,13 @@ SourceItem::SourceItem(SourceView* sv, TQListViewItem* parent, TQString jStr; if (_lineJump->isCondJump()) jStr = i18n("Jump %1 of %2 times to %3") - .arg(_lineJump->followedCount().pretty()) - .arg(_lineJump->executedCount().pretty()) - .arg(to); + .tqarg(_lineJump->followedCount().pretty()) + .tqarg(_lineJump->executedCount().pretty()) + .tqarg(to); else jStr = i18n("Jump %1 times to %2") - .arg(_lineJump->executedCount().pretty()) - .arg(to); + .tqarg(_lineJump->executedCount().pretty()) + .tqarg(to); setText(4, jStr); } @@ -184,7 +184,7 @@ void SourceItem::updateCost() TraceCostType* ct = _view->costType(); _pure = ct ? lineCost->subCost(ct) : SubCost(0); if (_pure == 0) { - setText(1, TQString::null); + setText(1, TQString()); setPixmap(1, TQPixmap()); } else { @@ -193,7 +193,7 @@ void SourceItem::updateCost() if (Configuration::showPercentage()) setText(1, TQString("%1") - .arg(pure, 0, 'f', Configuration::percentPrecision())); + .tqarg(pure, 0, 'f', Configuration::percentPrecision())); else setText(1, _pure.pretty()); @@ -203,7 +203,7 @@ void SourceItem::updateCost() TraceCostType* ct2 = _view->costType2(); _pure2 = ct2 ? lineCost->subCost(ct2) : SubCost(0); if (_pure2 == 0) { - setText(2, TQString::null); + setText(2, TQString()); setPixmap(2, TQPixmap()); } else { @@ -212,7 +212,7 @@ void SourceItem::updateCost() if (Configuration::showPercentage()) setText(2, TQString("%1") - .arg(pure2, 0, 'f', Configuration::percentPrecision())); + .tqarg(pure2, 0, 'f', Configuration::percentPrecision())); else setText(2, _pure2.pretty()); @@ -285,7 +285,7 @@ int SourceItem::compare(TQListViewItem * i, int col, bool ascending ) const } void SourceItem::paintCell( TQPainter *p, const TQColorGroup &cg, - int column, int width, int alignment ) + int column, int width, int tqalignment ) { TQColorGroup _cg( cg ); @@ -297,7 +297,7 @@ void SourceItem::paintCell( TQPainter *p, const TQColorGroup &cg, if (column == 3) paintArrows(p, _cg, width); else - TQListViewItem::paintCell( p, _cg, column, width, alignment ); + TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); } void SourceItem::setJumpArray(const TQMemArray<TraceLineJump*>& a) @@ -314,7 +314,7 @@ void SourceItem::paintArrows(TQPainter *p, const TQColorGroup &cg, int width) const BackgroundMode bgmode = lv->viewport()->backgroundMode(); const TQColorGroup::ColorRole crole = TQPalette::backgroundRoleFromMode( bgmode ); - if ( cg.brush( crole ) != lv->colorGroup().brush( crole ) ) + if ( cg.brush( crole ) != lv->tqcolorGroup().brush( crole ) ) p->fillRect( 0, 0, width, height(), cg.brush( crole ) ); else sv->paintEmptyArea( p, TQRect( 0, 0, width, height() ) ); @@ -391,13 +391,13 @@ void SourceItem::paintArrows(TQPainter *p, const TQColorGroup &cg, int width) p->drawConvexPolygon(a); p->setPen(c.light()); - p->drawPolyline(a, 0, 5); + p->tqdrawPolyline(a, 0, 5); p->setPen(c.dark()); - p->drawPolyline(a, 4, 2); + p->tqdrawPolyline(a, 4, 2); p->setPen(c.light()); - p->drawPolyline(a, 5, 2); + p->tqdrawPolyline(a, 5, 2); p->setPen(c.dark()); - p->drawPolyline(a, 6, 2); + p->tqdrawPolyline(a, 6, 2); } // draw inner vertical line for start/stop diff --git a/kcachegrind/kcachegrind/sourceitem.h b/kcachegrind/kcachegrind/sourceitem.h index 5f32da4c..532811e0 100644 --- a/kcachegrind/kcachegrind/sourceitem.h +++ b/kcachegrind/kcachegrind/sourceitem.h @@ -28,22 +28,22 @@ class SourceView; -class SourceItem: public QListViewItem +class SourceItem: public TQListViewItem { public: // for source lines - SourceItem(SourceView* sv, TQListView* parent, + SourceItem(SourceView* sv, TQListView* tqparent, int fileno, unsigned int lineno, bool inside, const TQString& src, TraceLine* line = 0); // for call lines - SourceItem(SourceView* sv, TQListViewItem* parent, + SourceItem(SourceView* sv, TQListViewItem* tqparent, int fileno, unsigned int lineno, TraceLine* line, TraceLineCall* lineCall); // for jump lines - SourceItem(SourceView* sv, TQListViewItem* parent, + SourceItem(SourceView* sv, TQListViewItem* tqparent, int fileno, unsigned int lineno, TraceLine* line, TraceLineJump* lineJump); @@ -57,7 +57,7 @@ public: int compare(TQListViewItem * i, int col, bool ascending ) const; void paintCell( TQPainter *p, const TQColorGroup &cg, - int column, int width, int alignment ); + int column, int width, int tqalignment ); int width( const TQFontMetrics& fm, const TQListView* lv, int c ) const; void updateGroup(); diff --git a/kcachegrind/kcachegrind/sourceview.cpp b/kcachegrind/kcachegrind/sourceview.cpp index a3a301c6..cdd3589c 100644 --- a/kcachegrind/kcachegrind/sourceview.cpp +++ b/kcachegrind/kcachegrind/sourceview.cpp @@ -37,9 +37,9 @@ // -SourceView::SourceView(TraceItemView* parentView, - TQWidget* parent, const char* name) - : TQListView(parent, name), TraceItemView(parentView) +SourceView::SourceView(TraceItemView* tqparentView, + TQWidget* tqparent, const char* name) + : TQListView(tqparent, name), TraceItemView(tqparentView) { _inSelectionUpdate = false; @@ -54,9 +54,9 @@ SourceView::SourceView(TraceItemView* parentView, addColumn( i18n( "Source (unknown)" ) ); setAllColumnsShowFocus(true); - setColumnAlignment(0, Qt::AlignRight); - setColumnAlignment(1, Qt::AlignRight); - setColumnAlignment(2, Qt::AlignRight); + setColumnAlignment(0, TQt::AlignRight); + setColumnAlignment(1, TQt::AlignRight); + setColumnAlignment(2, TQt::AlignRight); setResizeMode(TQListView::LastColumn); connect(this, @@ -113,11 +113,11 @@ void SourceView::context(TQListViewItem* i, const TQPoint & p, int c) TQString name = f->name(); if ((int)name.length()>Configuration::maxSymbolLength()) name = name.left(Configuration::maxSymbolLength()) + "..."; - popup.insertItem(i18n("Go to '%1'").arg(name), 93); + popup.insertItem(i18n("Go to '%1'").tqarg(name), 93); popup.insertSeparator(); } else if (line) { - popup.insertItem(i18n("Go to Line %1").arg(line->name()), 93); + popup.insertItem(i18n("Go to Line %1").tqarg(line->name()), 93); popup.insertSeparator(); } @@ -513,7 +513,7 @@ void SourceView::fillSourceFile(TraceFunctionSource* sf, int fileno) new SourceItem(this, this, fileno, 1, false, i18n("with any source line of this function in file")); new SourceItem(this, this, fileno, 2, false, - TQString(" '%1'").arg(sf->function()->prettyName())); + TQString(" '%1'").tqarg(sf->function()->prettyName())); new SourceItem(this, this, fileno, 3, false, i18n("Thus, no annotated source can be shown.")); return; @@ -550,13 +550,13 @@ void SourceView::fillSourceFile(TraceFunctionSource* sf, int fileno) // do it here, because the source directory could have been set before if (childCount()==0) { setColumnText(4, validSourceFile ? - i18n("Source ('%1')").arg(filename) : + i18n("Source ('%1')").tqarg(filename) : i18n("Source (unknown)")); } else { new SourceItem(this, this, fileno, 0, true, validSourceFile ? - i18n("--- Inlined from '%1' ---").arg(filename) : + i18n("--- Inlined from '%1' ---").tqarg(filename) : i18n("--- Inlined from unknown source ---")); } @@ -564,7 +564,7 @@ void SourceView::fillSourceFile(TraceFunctionSource* sf, int fileno) new SourceItem(this, this, fileno, 0, false, i18n("There is no source available for the following function:")); new SourceItem(this, this, fileno, 1, false, - TQString(" '%1'").arg(sf->function()->prettyName())); + TQString(" '%1'").tqarg(sf->function()->prettyName())); if (sf->file()->name().isEmpty()) { new SourceItem(this, this, fileno, 2, false, i18n("This is because no debug information is present.")); @@ -575,14 +575,14 @@ void SourceView::fillSourceFile(TraceFunctionSource* sf, int fileno) i18n("The function is located in this ELF object:")); new SourceItem(this, this, fileno, 5, false, TQString(" '%1'") - .arg(sf->function()->object()->prettyName())); + .tqarg(sf->function()->object()->prettyName())); } } else { new SourceItem(this, this, fileno, 2, false, i18n("This is because its source file cannot be found:")); new SourceItem(this, this, fileno, 3, false, - TQString(" '%1'").arg(sf->file()->name())); + TQString(" '%1'").tqarg(sf->file()->name())); new SourceItem(this, this, fileno, 4, false, i18n("Add the folder of this file to the source folder list.")); new SourceItem(this, this, fileno, 5, false, diff --git a/kcachegrind/kcachegrind/sourceview.h b/kcachegrind/kcachegrind/sourceview.h index 6856eddb..4c40b13d 100644 --- a/kcachegrind/kcachegrind/sourceview.h +++ b/kcachegrind/kcachegrind/sourceview.h @@ -33,10 +33,11 @@ class SourceView : public TQListView, public TraceItemView friend class SourceItem; Q_OBJECT + TQ_OBJECT public: - SourceView(TraceItemView* parentView, - TQWidget* parent = 0, const char* name = 0); + SourceView(TraceItemView* tqparentView, + TQWidget* tqparent = 0, const char* name = 0); TQWidget* widget() { return this; } TQString whatsThis() const; diff --git a/kcachegrind/kcachegrind/stackbrowser.cpp b/kcachegrind/kcachegrind/stackbrowser.cpp index 78095eb2..843714a9 100644 --- a/kcachegrind/kcachegrind/stackbrowser.cpp +++ b/kcachegrind/kcachegrind/stackbrowser.cpp @@ -172,7 +172,7 @@ TraceFunction* Stack::called(TraceFunction* fn, bool extend) return 0; } -bool Stack::contains(TraceFunction* fn) +bool Stack::tqcontains(TraceFunction* fn) { // cycles are listed on there own if (fn->cycle() == fn) return false; @@ -337,7 +337,7 @@ HistoryItem* StackBrowser::select(TraceFunction* f) } Stack* s = _current->stack(); - if (!s->contains(f)) { + if (!s->tqcontains(f)) { s = s->split(f); if (!s) s = new Stack(f); diff --git a/kcachegrind/kcachegrind/stackbrowser.h b/kcachegrind/kcachegrind/stackbrowser.h index e7d6b802..7e7677fe 100644 --- a/kcachegrind/kcachegrind/stackbrowser.h +++ b/kcachegrind/kcachegrind/stackbrowser.h @@ -29,7 +29,7 @@ public: Stack(TraceFunction*); // extend the stack at top/bottom if possible - bool contains(TraceFunction*); + bool tqcontains(TraceFunction*); void extendBottom(); void extendTop(); diff --git a/kcachegrind/kcachegrind/stackitem.cpp b/kcachegrind/kcachegrind/stackitem.cpp index e3763ab4..3b41740a 100644 --- a/kcachegrind/kcachegrind/stackitem.cpp +++ b/kcachegrind/kcachegrind/stackitem.cpp @@ -31,8 +31,8 @@ // StackItem StackItem::StackItem(StackSelection* ss, - TQListView* parent, TraceFunction* f) - :TQListViewItem(parent) + TQListView* tqparent, TraceFunction* f) + :TQListViewItem(tqparent) { _view = ss; _function = f; @@ -46,8 +46,8 @@ StackItem::StackItem(StackSelection* ss, } StackItem::StackItem(StackSelection* ss, - TQListView* parent, TraceCall* call) - :TQListViewItem(parent) + TQListView* tqparent, TraceCall* call) + :TQListViewItem(tqparent) { _view = ss; _call = call; @@ -85,7 +85,7 @@ void StackItem::updateCost() if (Configuration::showPercentage()) setText(0, TQString("%1") - .arg(sum, 0, 'f', Configuration::percentPrecision())); + .tqarg(sum, 0, 'f', Configuration::percentPrecision())); else setText(0, _call->prettySubCost(ct)); @@ -107,7 +107,7 @@ void StackItem::updateCost() if (Configuration::showPercentage()) setText(1, TQString("%1") - .arg(sum, 0, 'f', Configuration::percentPrecision())); + .tqarg(sum, 0, 'f', Configuration::percentPrecision())); else setText(1, _call->prettySubCost(ct2)); diff --git a/kcachegrind/kcachegrind/stackitem.h b/kcachegrind/kcachegrind/stackitem.h index 1701f010..31e24b75 100644 --- a/kcachegrind/kcachegrind/stackitem.h +++ b/kcachegrind/kcachegrind/stackitem.h @@ -32,12 +32,12 @@ class StackSelection; // for the stack browser -class StackItem: public QListViewItem +class StackItem: public TQListViewItem { public: // for top - StackItem(StackSelection* ss, TQListView* parent, TraceFunction* f); - StackItem(StackSelection* ss, TQListView* parent, TraceCall* c); + StackItem(StackSelection* ss, TQListView* tqparent, TraceFunction* f); + StackItem(StackSelection* ss, TQListView* tqparent, TraceCall* c); TraceFunction* function() { return _function; } TraceCall* call() { return _call; } diff --git a/kcachegrind/kcachegrind/stackselection.cpp b/kcachegrind/kcachegrind/stackselection.cpp index 1080b860..fcba2ab9 100644 --- a/kcachegrind/kcachegrind/stackselection.cpp +++ b/kcachegrind/kcachegrind/stackselection.cpp @@ -19,7 +19,7 @@ /* * StackSelection for KCachegrind * For function selection of a most expected stack, - * to be put into a QDockWindow + * to be put into a TQDockWindow */ #include <tqtimer.h> @@ -35,8 +35,8 @@ #include "stackselection.h" #include "stackitem.h" -StackSelection::StackSelection( TQWidget* parent, const char* name) - : StackSelectionBase(parent, name) +StackSelection::StackSelection( TQWidget* tqparent, const char* name) + : StackSelectionBase(tqparent, name) { _data = 0; _browser = new StackBrowser(); @@ -49,9 +49,9 @@ StackSelection::StackSelection( TQWidget* parent, const char* name) stackList->setSorting(-1); stackList->setAllColumnsShowFocus(true); stackList->setResizeMode(TQListView::LastColumn); - stackList->setColumnAlignment(0, Qt::AlignRight); - stackList->setColumnAlignment(1, Qt::AlignRight); - stackList->setColumnAlignment(2, Qt::AlignRight); + stackList->setColumnAlignment(0, TQt::AlignRight); + stackList->setColumnAlignment(1, TQt::AlignRight); + stackList->setColumnAlignment(2, TQt::AlignRight); stackList->setColumnWidth(0, 50); // 2nd cost column hidden at first (_costType2 == 0) stackList->setColumnWidth(1, 0); diff --git a/kcachegrind/kcachegrind/stackselection.h b/kcachegrind/kcachegrind/stackselection.h index 5d34c7ac..6b71c2b8 100644 --- a/kcachegrind/kcachegrind/stackselection.h +++ b/kcachegrind/kcachegrind/stackselection.h @@ -19,7 +19,7 @@ /* * StackSelection for KCachegrind * For function selection of a most expected stack, - * to be put into a QDockWindow + * to be put into a TQDockWindow */ #ifndef STACKSELECTION_H @@ -36,9 +36,10 @@ class NestedAreaItem; class StackSelection : public StackSelectionBase { Q_OBJECT + TQ_OBJECT public: - StackSelection( TQWidget* parent = 0, const char* name = 0); + StackSelection( TQWidget* tqparent = 0, const char* name = 0); ~StackSelection(); TraceData* data() const { return _data; } diff --git a/kcachegrind/kcachegrind/stackselectionbase.ui b/kcachegrind/kcachegrind/stackselectionbase.ui index 291153bc..b034c85f 100644 --- a/kcachegrind/kcachegrind/stackselectionbase.ui +++ b/kcachegrind/kcachegrind/stackselectionbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>StackSelectionBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>StackSelectionBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -25,7 +25,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Cost</string> @@ -76,5 +76,5 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kcachegrind/kcachegrind/tabview.cpp b/kcachegrind/kcachegrind/tabview.cpp index 13ec85d4..d40b284e 100644 --- a/kcachegrind/kcachegrind/tabview.cpp +++ b/kcachegrind/kcachegrind/tabview.cpp @@ -43,16 +43,16 @@ // TabBar -TabBar::TabBar(TabView* v, TQTabWidget* parent, const char *name) - : TQTabBar(parent, name) +TabBar::TabBar(TabView* v, TQTabWidget* tqparent, const char *name) + : TQTabBar(tqparent, name) { - _tabWidget = parent; + _tabWidget = tqparent; _tabView = v; } void TabBar::mousePressEvent(TQMouseEvent *e) { - if (e->button() == RightButton) { + if (e->button() == Qt::RightButton) { TQTab *tab = selectTab( e->pos() ); TQWidget* page; page = tab ? _tabWidget->page( indexOf( tab->identifier() ) ) :0; @@ -114,8 +114,8 @@ void TabBar::mousePressEvent(TQMouseEvent *e) // Splitter // -Splitter::Splitter(Orientation o, TQWidget* parent, const char* name) - : TQSplitter(o, parent, name) +Splitter::Splitter(Qt::Orientation o, TQWidget* tqparent, const char* name) + : TQSplitter(o, tqparent, name) {} void Splitter::moveEvent(TQMoveEvent* e) @@ -128,8 +128,8 @@ void Splitter::moveEvent(TQMoveEvent* e) void Splitter::checkVisiblity() { - const TQObjectList *l = children(); - TQObjectListIt it( *l ); + const TQObjectList l = childrenListObject(); + TQObjectListIt it( l ); TQObject *obj; while ( (obj = it.current()) != 0 ) { ++it; @@ -145,9 +145,9 @@ void Splitter::checkVisiblity() // TabWidget // -TabWidget::TabWidget(TabView* v, TQWidget* parent, +TabWidget::TabWidget(TabView* v, TQWidget* tqparent, const char* name, WFlags f) - : TQTabWidget(parent, name, f) + : TQTabWidget(tqparent, name, f) { _hasVisibleRect = false; setTabBar(new TabBar(v, this)); @@ -228,11 +228,11 @@ void TabWidget::moveEvent(TQMoveEvent* e) * bottomSplitter mainSplitter */ -TabView::TabView(TraceItemView* parentView, - TQWidget* parent, const char* name) - : TQWidget(parent, name), TraceItemView(parentView) +TabView::TabView(TraceItemView* tqparentView, + TQWidget* tqparent, const char* name) + : TQWidget(tqparent, name), TraceItemView(tqparentView) { - setFocusPolicy(TQWidget::StrongFocus); + setFocusPolicy(TQ_StrongFocus); _isCollapsed = true; @@ -419,7 +419,7 @@ void TabView::updateVisibility() s.append(100); - // children of mainSplitter + // tqchildren of mainSplitter if (_rightTW->isHidden() != (r == 0)) { if (r == 0) { _rightTW->hide(); @@ -441,7 +441,7 @@ void TabView::updateVisibility() _leftSplitter->show(); } - // children of leftSplitter + // tqchildren of leftSplitter if (_topTW->isHidden() != (t == 0)) { if (t == 0) { _topTW->hide(); @@ -463,7 +463,7 @@ void TabView::updateVisibility() _bottomSplitter->show(); } - // children of bottomSplitter + // tqchildren of bottomSplitter if (_bottomTW->isHidden() != (b == 0)) { if (b == 0) { _bottomTW->hide(); @@ -700,11 +700,11 @@ void TabView::resizeEvent(TQResizeEvent* e) void TabView::selected(TraceItemView*, TraceItem* s) { - // we set selected item for our own children + // we set selected item for our own tqchildren select(s); updateView(); - // still forward to parent + // still forward to tqparent if (_parentView) _parentView->selected(this, s); } @@ -751,19 +751,19 @@ void TabView::readViewConfig(KConfig* c, ++it; TQString n = TQString(v->widget()->name()); - if (topTabs.contains(n)) { + if (topTabs.tqcontains(n)) { moveTab(v->widget(), TraceItemView::Top); if (n == activeT) activeTop = v; } - else if (bottomTabs.contains(n)) { + else if (bottomTabs.tqcontains(n)) { moveTab(v->widget(), TraceItemView::Bottom); if (n == activeB) activeBottom = v; } - else if (leftTabs.contains(n)) { + else if (leftTabs.tqcontains(n)) { moveTab(v->widget(), TraceItemView::Left); if (n == activeL) activeLeft = v; } - else if (rightTabs.contains(n)) { + else if (rightTabs.tqcontains(n)) { moveTab(v->widget(), TraceItemView::Right); if (n == activeR) activeRight = v; } @@ -771,7 +771,7 @@ void TabView::readViewConfig(KConfig* c, if (withOptions) v->readViewConfig(c, TQString("%1-%2") - .arg(prefix).arg(v->widget()->name()), + .tqarg(prefix).tqarg(v->widget()->name()), postfix, true); } if (activeTop) _topTW->showPage(activeTop->widget()); @@ -883,8 +883,8 @@ void TabView::saveViewConfig(KConfig* c, if (withOptions) for (v=_tabs.first();v;v=_tabs.next()) - v->saveViewConfig(c, TQString("%1-%2").arg(prefix) - .arg(v->widget()->name()), postfix, true); + v->saveViewConfig(c, TQString("%1-%2").tqarg(prefix) + .tqarg(v->widget()->name()), postfix, true); } #include "tabview.moc" diff --git a/kcachegrind/kcachegrind/tabview.h b/kcachegrind/kcachegrind/tabview.h index b312c03c..323464e9 100644 --- a/kcachegrind/kcachegrind/tabview.h +++ b/kcachegrind/kcachegrind/tabview.h @@ -37,12 +37,13 @@ class TabView; /** * Subclass of TQTabBar to enable context menu on tabs */ -class TabBar : public QTabBar +class TabBar : public TQTabBar { Q_OBJECT + TQ_OBJECT public: - TabBar(TabView*, TQTabWidget* parent, const char *name = 0); + TabBar(TabView*, TQTabWidget* tqparent, const char *name = 0); protected: void mousePressEvent(TQMouseEvent *e); @@ -54,16 +55,17 @@ class TabBar : public QTabBar /** * Own Splitter: - * Call checkVisiblity for all TabWidget children of the splitter + * Call checkVisiblity for all TabWidget tqchildren of the splitter * on a MoveEvent. This typically is produced when collapsing the widget * inside of another splitter. */ -class Splitter: public QSplitter +class Splitter: public TQSplitter { Q_OBJECT + TQ_OBJECT public: - Splitter(Orientation o, TQWidget* parent = 0, const char* name = 0); + Splitter(Qt::Orientation o, TQWidget* tqparent = 0, const char* name = 0); void checkVisiblity(); protected: @@ -77,13 +79,14 @@ protected: * This is needed to track if this widget is collapsed in a TQSplitter. * - Use own TabBar for context menu */ -class TabWidget: public QTabWidget +class TabWidget: public TQTabWidget { Q_OBJECT + TQ_OBJECT public: - TabWidget(TabView*, TQWidget* parent = 0, + TabWidget(TabView*, TQWidget* tqparent = 0, const char* name = 0, WFlags f = 0); bool hasVisibleRect() { return _hasVisibleRect; } @@ -107,11 +110,12 @@ private: class TabView : public TQWidget, public TraceItemView { Q_OBJECT + TQ_OBJECT public: - TabView(TraceItemView* parentView, - TQWidget* parent = 0, const char* name = 0); + TabView(TraceItemView* tqparentView, + TQWidget* tqparent = 0, const char* name = 0); virtual TQWidget* widget() { return this; } TQString whatsThis() const ; diff --git a/kcachegrind/kcachegrind/toplevel.cpp b/kcachegrind/kcachegrind/toplevel.cpp index 4749f604..cf06a75d 100644 --- a/kcachegrind/kcachegrind/toplevel.cpp +++ b/kcachegrind/kcachegrind/toplevel.cpp @@ -33,12 +33,7 @@ #include <tqsizepolicy.h> #include <tqprogressbar.h> #include <tqfile.h> - -// With Qt 3.1, we can disallow user interaction with long tasks. -// This needs TQEventLoop. Otherwise, TQApplication::processEvents is used. -#if (QT_VERSION-0 >= 0x030100) #include <tqeventloop.h> -#endif #include <kapplication.h> #include <klocale.h> @@ -88,16 +83,16 @@ TopLevel::TopLevel(const char *name) _functionDockShown->setChecked(!_functionDock->isHidden()); connect(_partDock, TQT_SIGNAL(visibilityChanged(bool)), - this, TQT_SLOT(partVisibilityChanged(bool))); + TQT_TQOBJECT(this), TQT_SLOT(partVisibilityChanged(bool))); connect(_stackDock, TQT_SIGNAL(visibilityChanged(bool)), - this, TQT_SLOT(stackVisibilityChanged(bool))); + TQT_TQOBJECT(this), TQT_SLOT(stackVisibilityChanged(bool))); connect(_functionDock, TQT_SIGNAL(visibilityChanged(bool)), - this, TQT_SLOT(functionVisibilityChanged(bool))); + TQT_TQOBJECT(this), TQT_SLOT(functionVisibilityChanged(bool))); #if ENABLE_DUMPDOCK _dumpDockShown->setChecked(!_dumpDock->isHidden()); connect(_dumpDock, TQT_SIGNAL(visibilityChanged(bool)), - this, TQT_SLOT(dumpVisibilityChanged(bool))); + TQT_TQOBJECT(this), TQT_SLOT(dumpVisibilityChanged(bool))); #endif _statusbar = statusBar(); @@ -105,8 +100,8 @@ TopLevel::TopLevel(const char *name) #if 0 // how to do avoid main window resizing on large statusbar label? TQSizePolicy p(TQSizePolicy::Fixed, TQSizePolicy::Expanding); - _statusLabel->setSizePolicy(p); - _statusbar->setSizePolicy(p); + _statusLabel->tqsetSizePolicy(p); + _statusbar->tqsetSizePolicy(p); #endif _statusbar->addWidget(_statusLabel, 1); @@ -135,11 +130,11 @@ TopLevel::TopLevel(const char *name) setAutoSaveSettings(); // restore current state settings (not configuration options) - restoreCurrentState(TQString::null); + restoreCurrentState(TQString()); // if this is the first toplevel, show tip of day if (memberList->count() == 1) - TQTimer::singleShot( 200, this, TQT_SLOT(slotShowTipOnStart()) ); + TQTimer::singleShot( 200, TQT_TQOBJECT(this), TQT_SLOT(slotShowTipOnStart()) ); } void TopLevel::init() @@ -179,19 +174,19 @@ void TopLevel::setupPartSelection(PartSelection* ps) // setup connections from the part selection widget connect(ps, TQT_SIGNAL(activePartsChanged(const TracePartList&)), - this, TQT_SLOT(activePartsChangedSlot(const TracePartList&))); + TQT_TQOBJECT(this), TQT_SLOT(activePartsChangedSlot(const TracePartList&))); connect(ps, TQT_SIGNAL(groupChanged(TraceCostItem*)), - this, TQT_SLOT(setGroupDelayed(TraceCostItem*))); + TQT_TQOBJECT(this), TQT_SLOT(setGroupDelayed(TraceCostItem*))); connect(ps, TQT_SIGNAL(functionChanged(TraceItem*)), - this, TQT_SLOT(setTraceItemDelayed(TraceItem*))); + TQT_TQOBJECT(this), TQT_SLOT(setTraceItemDelayed(TraceItem*))); connect(ps, TQT_SIGNAL(goBack()), _stackSelection, TQT_SLOT(browserBack())); connect(ps, TQT_SIGNAL(partsHideSelected()), - this, TQT_SLOT(partsHideSelectedSlotDelayed())); + TQT_TQOBJECT(this), TQT_SLOT(partsHideSelectedSlotDelayed())); connect(ps, TQT_SIGNAL(partsUnhideAll()), - this, TQT_SLOT(partsUnhideAllSlotDelayed())); + TQT_TQOBJECT(this), TQT_SLOT(partsUnhideAllSlotDelayed())); connect(ps, TQT_SIGNAL(showMessage(const TQString&, int)), _statusbar, TQT_SLOT(message(const TQString&, int))); @@ -231,22 +226,22 @@ void TopLevel::saveTraceSettings() TQString key = traceKey(); KConfigGroup pConfig(KGlobal::config(), TQCString("TracePositions")); - pConfig.writeEntry(TQString("CostType%1").arg(key), + pConfig.writeEntry(TQString("CostType%1").tqarg(key), _costType ? _costType->name() : TQString("?")); - pConfig.writeEntry(TQString("CostType2%1").arg(key), + pConfig.writeEntry(TQString("CostType2%1").tqarg(key), _costType2 ? _costType2->name() : TQString("?")); - pConfig.writeEntry(TQString("GroupType%1").arg(key), + pConfig.writeEntry(TQString("GroupType%1").tqarg(key), TraceItem::typeName(_groupType)); if (!_data) return; KConfigGroup aConfig(KGlobal::config(), TQCString("Layouts")); - aConfig.writeEntry(TQString("Count%1").arg(key), _layoutCount); - aConfig.writeEntry(TQString("Current%1").arg(key), _layoutCurrent); + aConfig.writeEntry(TQString("Count%1").tqarg(key), _layoutCount); + aConfig.writeEntry(TQString("Current%1").tqarg(key), _layoutCurrent); saveCurrentState(key); - pConfig.writeEntry(TQString("Group%1").arg(key), - _group ? _group->name() : TQString::null); + pConfig.writeEntry(TQString("Group%1").tqarg(key), + _group ? _group->name() : TQString()); } /** @@ -264,7 +259,7 @@ void TopLevel::restoreCurrentState(TQString postfix) // dock properties (not position, this should be have done before) TQCString group = TQCString("PartOverview"); - if (gList.contains(group+pf)) group += pf; + if (gList.tqcontains(group+pf)) group += pf; KConfigGroup psConfig(kconfig, group); _partSelection->readVisualisationConfig(&psConfig); @@ -327,7 +322,7 @@ void TopLevel::createDocks() "above.</p>")); connect(_stackSelection, TQT_SIGNAL(functionSelected(TraceItem*)), - this, TQT_SLOT(setTraceItemDelayed(TraceItem*))); + TQT_TQOBJECT(this), TQT_SLOT(setTraceItemDelayed(TraceItem*))); _functionDock = new TQDockWindow(TQDockWindow::InDock, this); _functionDock->setCaption(i18n("Flat Profile")); @@ -394,7 +389,7 @@ void TopLevel::createDocks() // Restore QT Dock positions... KConfigGroup dockConfig(KGlobal::config(), TQCString("Docks")); - TQString str = dockConfig.readEntry("Position", TQString::null); + TQString str = dockConfig.readEntry("Position", TQString()); if (0) qDebug("Docks/Position: '%s'", str.ascii()); if (str.isEmpty()) { // default positions @@ -421,7 +416,7 @@ void TopLevel::createDocks() setAppropriate(_functionDock, true); connect( _partDock, TQT_SIGNAL(contextMenuRequested(const TQPoint &)), - this, TQT_SLOT(showDockMenu(const TQPoint &))); + TQT_TQOBJECT(this), TQT_SLOT(showDockMenu(const TQPoint &))); #endif } @@ -454,42 +449,42 @@ void TopLevel::createLayoutActions() action = new KAction( i18n( "&Duplicate" ), KShortcut(KKey("Ctrl+Plus")), - this, TQT_SLOT(layoutDuplicate()), - actionCollection(), "layout_duplicate" ); + TQT_TQOBJECT(this), TQT_SLOT(tqlayoutDuplicate()), + actionCollection(), "tqlayout_duplicate" ); hint = i18n("<b>Duplicate Current Layout</b>" - "<p>Make a copy of the current layout.</p>"); + "<p>Make a copy of the current tqlayout.</p>"); action->setWhatsThis( hint ); action = new KAction( i18n( "&Remove" ), KShortcut(), - this, TQT_SLOT(layoutRemove()), - actionCollection(), "layout_remove" ); + TQT_TQOBJECT(this), TQT_SLOT(tqlayoutRemove()), + actionCollection(), "tqlayout_remove" ); hint = i18n("<b>Remove Current Layout</b>" - "<p>Delete current layout and make the previous active.</p>"); + "<p>Delete current tqlayout and make the previous active.</p>"); action->setWhatsThis( hint ); action = new KAction( i18n( "&Go to Next" ), KShortcut(KKey("Ctrl+Right")), - this, TQT_SLOT(layoutNext()), - actionCollection(), "layout_next" ); + TQT_TQOBJECT(this), TQT_SLOT(tqlayoutNext()), + actionCollection(), "tqlayout_next" ); hint = i18n("Go to Next Layout"); action->setWhatsThis( hint ); action = new KAction( i18n( "&Go to Previous" ), KShortcut(KKey("Ctrl+Left")), - this, TQT_SLOT(layoutPrevious()), - actionCollection(), "layout_previous" ); + TQT_TQOBJECT(this), TQT_SLOT(tqlayoutPrevious()), + actionCollection(), "tqlayout_previous" ); hint = i18n("Go to Previous Layout"); action->setWhatsThis( hint ); action = new KAction( i18n( "&Restore to Default" ), KShortcut(), - this, TQT_SLOT(layoutRestore()), - actionCollection(), "layout_restore" ); + TQT_TQOBJECT(this), TQT_SLOT(tqlayoutRestore()), + actionCollection(), "tqlayout_restore" ); hint = i18n("Restore Layouts to Default"); action->setWhatsThis( hint ); action = new KAction( i18n( "&Save as Default" ), KShortcut(), - this, TQT_SLOT(layoutSave()), - actionCollection(), "layout_save" ); + TQT_TQOBJECT(this), TQT_SLOT(tqlayoutSave()), + actionCollection(), "tqlayout_save" ); hint = i18n("Save Layouts as Default"); action->setWhatsThis( hint ); } @@ -500,12 +495,12 @@ void TopLevel::createMiscActions() TQString hint; KAction* action; - action = KStdAction::openNew(this, TQT_SLOT(newWindow()), actionCollection()); + action = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(newWindow()), actionCollection()); hint = i18n("<b>New</b><p>Open new empty KCachegrind window.</p>"); action->setWhatsThis( hint ); action = new KAction( i18n( "&Add..." ), KShortcut(), - this, TQT_SLOT(addTrace()), + TQT_TQOBJECT(this), TQT_SLOT(addTrace()), actionCollection(), "file_add" ); hint = i18n("<b>Add Profile Data</b>" "<p>This opens an additional profile data file in the current window.</p>"); @@ -518,13 +513,13 @@ void TopLevel::createMiscActions() #else KStdAccel::key(KStdAccel::Reload), #endif - this, TQT_SLOT( reload() ), actionCollection(), "reload" ); + TQT_TQOBJECT(this), TQT_SLOT( reload() ), actionCollection(), "reload" ); hint = i18n("<b>Reload Profile Data</b>" "<p>This loads any new created parts, too.</p>"); action->setWhatsThis( hint ); action = new KAction( i18n( "&Export Graph" ), KShortcut(), - this, TQT_SLOT(exportGraph()), + TQT_TQOBJECT(this), TQT_SLOT(exportGraph()), actionCollection(), "export" ); hint = i18n("<b>Export Call Graph</b>" @@ -540,7 +535,7 @@ void TopLevel::createMiscActions() #else KStdAccel::key(KStdAccel::Redo), #endif - this, TQT_SLOT( forceTrace() ), + TQT_TQOBJECT(this), TQT_SLOT( forceTrace() ), actionCollection(), "dump" ); hint = i18n("<b>Force Dump</b>" "<p>This forces a dump for a Callgrind profile run " @@ -566,20 +561,20 @@ void TopLevel::createMiscActions() "of the program.</p>"); _taDump->setWhatsThis( hint ); - action = KStdAction::open(this, TQT_SLOT(loadTrace()), actionCollection()); + action = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(loadTrace()), actionCollection()); hint = i18n("<b>Open Profile Data</b>" "<p>This opens a profile data file, with possible multiple parts</p>"); action->setToolTip( hint ); action->setWhatsThis( hint ); - _openRecent = KStdAction::openRecent(this, TQT_SLOT(loadTrace(const KURL&)), + _openRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(loadTrace(const KURL&)), actionCollection()); - KStdAction::showStatusbar(this, + KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(toggleStatusBar()), actionCollection()); _partDockShown = new KToggleAction(i18n("Parts Overview"), KShortcut(), - this, TQT_SLOT(togglePartDock()), + TQT_TQOBJECT(this), TQT_SLOT(togglePartDock()), actionCollection(), "settings_show_partdock"); @@ -588,7 +583,7 @@ void TopLevel::createMiscActions() _partDockShown->setWhatsThis( hint ); _stackDockShown = new KToggleAction(i18n("Call Stack"), KShortcut(), - this, TQT_SLOT(toggleStackDock()), + TQT_TQOBJECT(this), TQT_SLOT(toggleStackDock()), actionCollection(), "settings_show_stackdock"); @@ -597,7 +592,7 @@ void TopLevel::createMiscActions() _stackDockShown->setWhatsThis( hint ); _functionDockShown = new KToggleAction(i18n("Function Profile"), KShortcut(), - this, TQT_SLOT(toggleFunctionDock()), + TQT_TQOBJECT(this), TQT_SLOT(toggleFunctionDock()), actionCollection(), "settings_show_profiledock"); @@ -607,7 +602,7 @@ void TopLevel::createMiscActions() #if ENABLE_DUMPDOCK _dumpDockShown = new KToggleAction(i18n("Profile Dumps"), KShortcut(), - this, TQT_SLOT(toggleDumpDock()), + TQT_TQOBJECT(this), TQT_SLOT(toggleDumpDock()), actionCollection(), "settings_show_dumpdock"); @@ -618,7 +613,7 @@ void TopLevel::createMiscActions() _taPercentage = new KToggleAction(i18n("Show Relative Costs"), "percent", KShortcut(), - this, TQT_SLOT(togglePercentage()), + TQT_TQOBJECT(this), TQT_SLOT(togglePercentage()), actionCollection(), "view_percentage"); #if KDE_VERSION >= 0x030290 @@ -632,19 +627,19 @@ void TopLevel::createMiscActions() _taExpanded = new KToggleAction(i18n("Percentage Relative to Parent"), "move", KShortcut(), - this, TQT_SLOT(toggleExpanded()), + TQT_TQOBJECT(this), TQT_SLOT(toggleExpanded()), actionCollection(), "view_expanded"); - hint = i18n("Show percentage costs relative to parent"); + hint = i18n("Show percentage costs relative to tqparent"); _taExpanded->setToolTip( hint ); _taExpanded->setWhatsThis( hint ); - hint = i18n("<b>Show percentage costs relative to parent</b>" + hint = i18n("<b>Show percentage costs relative to tqparent</b>" "<p>If this is switched off, percentage costs are always shown " "relative to the total cost of the profile part(s) that are " "currently browsed. By turning on this option, percentage cost " - "of shown cost items will be relative to the parent cost item." + "of shown cost items will be relative to the tqparent cost item." "<ul><table>" "<tr><td><b>Cost Type</td><td><b>Parent Cost</td></tr>" "<tr><td>Function Cumulative</td><td>Total</td></tr>" @@ -657,7 +652,7 @@ void TopLevel::createMiscActions() _taCycles = new KToggleAction( i18n( "Do Cycle Detection" ), "undo", KShortcut(), - this, TQT_SLOT( toggleCycles() ), actionCollection(), + TQT_TQOBJECT(this), TQT_SLOT( toggleCycles() ), actionCollection(), "view_cycles" ); #if KDE_VERSION >= 0x030290 // for KDE 3.3: show another text instead of a checkmark @@ -678,10 +673,10 @@ void TopLevel::createMiscActions() "is the option to switch this off."); _taCycles->setWhatsThis( hint ); - KStdAction::quit(this, TQT_SLOT(close()), actionCollection()); - KStdAction::preferences(this, TQT_SLOT(configure()), actionCollection()); - KStdAction::keyBindings(this, TQT_SLOT(configureKeys()), actionCollection()); - KStdAction::configureToolbars(this,TQT_SLOT(configureToolbars()), + KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); + KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(configure()), actionCollection()); + KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configureKeys()), actionCollection()); + KStdAction::configureToolbars(TQT_TQOBJECT(this),TQT_SLOT(configureToolbars()), actionCollection()); #if 0 action = KStdAction::back(_stackSelection, TQT_SLOT(browserBack()), @@ -706,32 +701,32 @@ void TopLevel::createMiscActions() #else _paUp = new KToolBarPopupAction( i18n( "&Up" ), "up", ALT+Key_Up, - _stackSelection, TQT_SLOT( browserUp() ), + TQT_TQOBJECT(_stackSelection), TQT_SLOT( browserUp() ), actionCollection(), "go_up" ); connect( _paUp->popupMenu(), TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( upAboutToShow() ) ); + TQT_TQOBJECT(this), TQT_SLOT( upAboutToShow() ) ); connect( _paUp->popupMenu(), TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( upActivated( int ) ) ); + TQT_TQOBJECT(this), TQT_SLOT( upActivated( int ) ) ); hint = i18n("<b>Go Up</b>" "<p>Go to last selected caller of current function. " "If no caller was visited, use that with highest cost.</p>"); _paUp->setToolTip( hint ); _paUp->setWhatsThis( hint ); - QPair< KGuiItem, KGuiItem > backForward = KStdGuiItem::backAndForward(); + TQPair< KGuiItem, KGuiItem > backForward = KStdGuiItem::backAndForward(); _paBack = new KToolBarPopupAction( backForward.first, ALT+Key_Left, - _stackSelection, TQT_SLOT(browserBack()), + TQT_TQOBJECT(_stackSelection), TQT_SLOT(browserBack()), actionCollection(), "go_back" ); connect( _paBack->popupMenu(), TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( backAboutToShow() ) ); + TQT_TQOBJECT(this), TQT_SLOT( backAboutToShow() ) ); connect( _paBack->popupMenu(), TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( backActivated( int ) ) ); + TQT_TQOBJECT(this), TQT_SLOT( backActivated( int ) ) ); hint = i18n("Go back in function selection history"); _paBack->setToolTip( hint ); _paBack->setWhatsThis( hint ); _paForward = new KToolBarPopupAction( backForward.second, ALT+Key_Right, - _stackSelection, + TQT_TQOBJECT(_stackSelection), TQT_SLOT(browserForward()), actionCollection(), "go_forward" ); connect( _paForward->popupMenu(), TQT_SIGNAL( aboutToShow() ), @@ -753,7 +748,7 @@ void TopLevel::createMiscActions() // cost types are dependent on loaded data, thus KSelectAction // is filled in setData() connect( _saCost, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(costTypeSelected(const TQString&))); + TQT_TQOBJECT(this), TQT_SLOT(costTypeSelected(const TQString&))); _saCost2 = new KSelectAction( i18n("Secondary Event Type"), KShortcut(), actionCollection(), "view_cost_type2"); @@ -763,7 +758,7 @@ void TopLevel::createMiscActions() _saCost2->setWhatsThis( hint ); connect( _saCost2, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(costType2Selected(const TQString&))); + TQT_TQOBJECT(this), TQT_SLOT(costType2Selected(const TQString&))); saGroup = new KSelectAction( i18n("Grouping"), KShortcut(), actionCollection(), "view_group_type"); @@ -782,32 +777,32 @@ void TopLevel::createMiscActions() saGroup->setItems(args); connect( saGroup, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(groupTypeSelected(int))); + TQT_TQOBJECT(this), TQT_SLOT(groupTypeSelected(int))); _taSplit = new KToggleAction(i18n("Split"), "view_left_right", KShortcut(), - this, TQT_SLOT(splitSlot()), + TQT_TQOBJECT(this), TQT_SLOT(splitSlot()), actionCollection(), "view_split"); hint = i18n("Show two information panels"); _taSplit->setToolTip( hint ); _taSplit->setWhatsThis( hint ); - _taSplitDir = new KToggleAction(i18n("Split Horizontal"), + _taSplitDir = new KToggleAction(i18n("SplitQt::Horizontal"), "view_left_right", KShortcut(), - this, TQT_SLOT(splitDirSlot()), + TQT_TQOBJECT(this), TQT_SLOT(splitDirSlot()), actionCollection(), "view_split_dir"); - hint = i18n("Change Split Orientation when main window is split."); + hint = i18n("Change Split Qt::Orientation when main window is split."); _taSplitDir->setToolTip( hint ); _taSplitDir->setWhatsThis( hint ); // copied from KMail... #if KDE_VERSION >= 308 // KDE 3.1 - KStdAction::tipOfDay( this, TQT_SLOT( slotShowTip() ), actionCollection() ); + KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( slotShowTip() ), actionCollection() ); #else (void) new KAction( KGuiItem( i18n("Tip of the &Day..."), "idea", i18n("Show \"Tip of the Day\"") ), - 0, this, TQT_SLOT(slotShowTip()), + 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowTip()), actionCollection(), "help_show_tip" ); #endif } @@ -925,7 +920,7 @@ void TopLevel::toggleCycles() if (!_data) return; - _data->invalidateDynamicCost(); + _data->tqinvalidateDynamicCost(); _data->updateFunctionCycles(); _partSelection->refresh(); @@ -1057,7 +1052,7 @@ void TopLevel::loadTrace(TQString file) void TopLevel::addTrace() { - KURL url = KFileDialog::getOpenURL(TQString::null, + KURL url = KFileDialog::getOpenURL(TQString(), i18n("cachegrind.out* callgrind.out*|Callgrind Profile Data\n*|All Files"), this, i18n("Add Callgrind Profile Data")); @@ -1107,7 +1102,7 @@ void TopLevel::addTrace(TQString file) void TopLevel::loadDelayed(TQString file) { _loadTraceDelayed = file; - TQTimer::singleShot(0, this, TQT_SLOT(loadTraceDelayed())); + TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(loadTraceDelayed())); } void TopLevel::loadTraceDelayed() @@ -1115,7 +1110,7 @@ void TopLevel::loadTraceDelayed() if (_loadTraceDelayed.isEmpty()) return; loadTrace(_loadTraceDelayed); - _loadTraceDelayed = TQString::null; + _loadTraceDelayed = TQString(); } @@ -1142,7 +1137,7 @@ void TopLevel::exportGraph() ge.writeDot(); TQString cmd = TQString("(dot %1 -Tps > %2.ps; kghostview %3.ps)&") - .arg(n).arg(n).arg(n); + .tqarg(n).tqarg(n).tqarg(n); system(TQFile::encodeName( cmd )); } @@ -1386,13 +1381,13 @@ bool TopLevel::setFunction(TraceFunction* f) void TopLevel::setCostTypeDelayed(TraceCostType* ct) { _costTypeDelayed = ct; - TQTimer::singleShot (0, this, TQT_SLOT(setCostTypeDelayed())); + TQTimer::singleShot (0, TQT_TQOBJECT(this), TQT_SLOT(setCostTypeDelayed())); } void TopLevel::setCostType2Delayed(TraceCostType* ct) { _costType2Delayed = ct; - TQTimer::singleShot (0, this, TQT_SLOT(setCostType2Delayed())); + TQTimer::singleShot (0, TQT_TQOBJECT(this), TQT_SLOT(setCostType2Delayed())); } void TopLevel::setCostTypeDelayed() @@ -1408,7 +1403,7 @@ void TopLevel::setCostType2Delayed() void TopLevel::setGroupTypeDelayed(TraceItem::CostType gt) { _groupTypeDelayed = gt; - TQTimer::singleShot (0, this, TQT_SLOT(setGroupTypeDelayed())); + TQTimer::singleShot (0, TQT_TQOBJECT(this), TQT_SLOT(setGroupTypeDelayed())); } void TopLevel::setGroupTypeDelayed() @@ -1425,7 +1420,7 @@ void TopLevel::setGroupDelayed(TraceCostItem* g) #endif _groupDelayed = g; - TQTimer::singleShot (0, this, TQT_SLOT(setGroupDelayed())); + TQTimer::singleShot (0, TQT_TQOBJECT(this), TQT_SLOT(setGroupDelayed())); } void TopLevel::setGroupDelayed() @@ -1436,7 +1431,7 @@ void TopLevel::setGroupDelayed() void TopLevel::setDirectionDelayed(TraceItemView::Direction d) { _directionDelayed = d; - TQTimer::singleShot (0, this, TQT_SLOT(setDirectionDelayed())); + TQTimer::singleShot (0, TQT_TQOBJECT(this), TQT_SLOT(setDirectionDelayed())); } void TopLevel::setDirectionDelayed() @@ -1474,7 +1469,7 @@ void TopLevel::setTraceItemDelayed(TraceItem* i) // no need to select same item a 2nd time... if (_traceItemDelayed == i) return; _traceItemDelayed = i; - _lastSender = sender(); + _lastSender = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())); kdDebug() << "Selected " << (i ? i->prettyName() : "(none)") << endl; @@ -1484,7 +1479,7 @@ void TopLevel::setTraceItemDelayed(TraceItem* i) _lastSender ? _lastSender->name() :"0" ); #endif - TQTimer::singleShot (0, this, TQT_SLOT(setTraceItemDelayed())); + TQTimer::singleShot (0, TQT_TQOBJECT(this), TQT_SLOT(setTraceItemDelayed())); } void TopLevel::setTraceItemDelayed() @@ -1657,10 +1652,10 @@ void TopLevel::addCostMenu(TQPopupMenu* popup, bool withCost2) } if (_showPercentage) popup->insertItem(i18n("Show Absolute Cost"), - this, TQT_SLOT(setAbsoluteCost())); + TQT_TQOBJECT(this), TQT_SLOT(setAbsoluteCost())); else popup->insertItem(i18n("Show Relative Cost"), - this, TQT_SLOT(setRelativeCost())); + TQT_TQOBJECT(this), TQT_SLOT(setRelativeCost())); } bool TopLevel::setCostType(int id) @@ -1689,9 +1684,9 @@ bool TopLevel::setCostType2(int id) void TopLevel::addGoMenu(TQPopupMenu* popup) { - popup->insertItem(i18n("Go Back"), this, TQT_SLOT(goBack())); - popup->insertItem(i18n("Go Forward"), this, TQT_SLOT(goForward())); - popup->insertItem(i18n("Go Up"), this, TQT_SLOT(goUp())); + popup->insertItem(i18n("Go Back"), TQT_TQOBJECT(this), TQT_SLOT(goBack())); + popup->insertItem(i18n("Go Forward"), TQT_TQOBJECT(this), TQT_SLOT(goForward())); + popup->insertItem(i18n("Go Up"), TQT_TQOBJECT(this), TQT_SLOT(goUp())); } void TopLevel::goBack() @@ -1711,7 +1706,7 @@ void TopLevel::goUp() TQString TopLevel::traceKey() { - if (!_data || _data->command().isEmpty()) return TQString::null; + if (!_data || _data->command().isEmpty()) return TQString(); TQString name = _data->command(); TQString key; @@ -1730,9 +1725,9 @@ void TopLevel::restoreTraceTypes() KConfigGroup pConfig(KGlobal::config(), TQCString("TracePositions")); TQString groupType, costType, costType2; - groupType = pConfig.readEntry(TQString("GroupType%1").arg(key)); - costType = pConfig.readEntry(TQString("CostType%1").arg(key)); - costType2 = pConfig.readEntry(TQString("CostType2%1").arg(key)); + groupType = pConfig.readEntry(TQString("GroupType%1").tqarg(key)); + costType = pConfig.readEntry(TQString("CostType%1").tqarg(key)); + costType2 = pConfig.readEntry(TQString("CostType2%1").tqarg(key)); if (groupType.isEmpty()) groupType = cConfig.readEntry("GroupType"); if (costType.isEmpty()) costType = cConfig.readEntry("CostType"); @@ -1747,9 +1742,9 @@ void TopLevel::restoreTraceTypes() costTypeSelected(_saCost->items().first()); KConfigGroup aConfig(KGlobal::config(), TQCString("Layouts")); - _layoutCount = aConfig.readNumEntry(TQString("Count%1").arg(key), 0); - _layoutCurrent = aConfig.readNumEntry(TQString("Current%1").arg(key), 0); - if (_layoutCount == 0) layoutRestore(); + _layoutCount = aConfig.readNumEntry(TQString("Count%1").tqarg(key), 0); + _layoutCurrent = aConfig.readNumEntry(TQString("Current%1").tqarg(key), 0); + if (_layoutCount == 0) tqlayoutRestore(); updateLayoutActions(); } @@ -1766,7 +1761,7 @@ void TopLevel::restoreTraceSettings() TQString key = traceKey(); KConfigGroup pConfig(KGlobal::config(), TQCString("TracePositions")); - TQString group = pConfig.readEntry(TQString("Group%1").arg(key)); + TQString group = pConfig.readEntry(TQString("Group%1").tqarg(key)); if (!group.isEmpty()) setGroup(group); restoreCurrentState(key); @@ -1783,21 +1778,21 @@ void TopLevel::restoreTraceSettings() /* Layout */ -void TopLevel::layoutDuplicate() +void TopLevel::tqlayoutDuplicate() { // save current and allocate a new slot _multiView->saveViewConfig(KGlobal::config(), - TQString("Layout%1-MainView").arg(_layoutCurrent), + TQString("Layout%1-MainView").tqarg(_layoutCurrent), traceKey(), false); _layoutCurrent = _layoutCount; _layoutCount++; updateLayoutActions(); - kdDebug() << "TopLevel::layoutDuplicate: count " << _layoutCount << endl; + kdDebug() << "TopLevel::tqlayoutDuplicate: count " << _layoutCount << endl; } -void TopLevel::layoutRemove() +void TopLevel::tqlayoutRemove() { if (_layoutCount <2) return; @@ -1805,14 +1800,14 @@ void TopLevel::layoutRemove() if (_layoutCurrent == from) { _layoutCurrent--; from--; } // restore from last and decrement count _multiView->readViewConfig(KGlobal::config(), - TQString("Layout%1-MainView").arg(from), + TQString("Layout%1-MainView").tqarg(from), traceKey(), false); _layoutCount--; updateLayoutActions(); } -void TopLevel::layoutNext() +void TopLevel::tqlayoutNext() { if (_layoutCount <2) return; @@ -1820,20 +1815,20 @@ void TopLevel::layoutNext() TQString key = traceKey(); _multiView->saveViewConfig(config, - TQString("Layout%1-MainView").arg(_layoutCurrent), + TQString("Layout%1-MainView").tqarg(_layoutCurrent), key, false); _layoutCurrent++; if (_layoutCurrent == _layoutCount) _layoutCurrent = 0; _multiView->readViewConfig(config, - TQString("Layout%1-MainView").arg(_layoutCurrent), + TQString("Layout%1-MainView").tqarg(_layoutCurrent), key, false); - if (0) kdDebug() << "TopLevel::layoutNext: current " + if (0) kdDebug() << "TopLevel::tqlayoutNext: current " << _layoutCurrent << endl; } -void TopLevel::layoutPrevious() +void TopLevel::tqlayoutPrevious() { if (_layoutCount <2) return; @@ -1841,39 +1836,39 @@ void TopLevel::layoutPrevious() TQString key = traceKey(); _multiView->saveViewConfig(config, - TQString("Layout%1-MainView").arg(_layoutCurrent), + TQString("Layout%1-MainView").tqarg(_layoutCurrent), key, false); _layoutCurrent--; if (_layoutCurrent <0) _layoutCurrent = _layoutCount-1; _multiView->readViewConfig(config, - TQString("Layout%1-MainView").arg(_layoutCurrent), + TQString("Layout%1-MainView").tqarg(_layoutCurrent), key, false); - if (0) kdDebug() << "TopLevel::layoutPrevious: current " + if (0) kdDebug() << "TopLevel::tqlayoutPrevious: current " << _layoutCurrent << endl; } -void TopLevel::layoutSave() +void TopLevel::tqlayoutSave() { KConfig* config = KGlobal::config(); TQString key = traceKey(); _multiView->saveViewConfig(config, - TQString("Layout%1-MainView").arg(_layoutCurrent), + TQString("Layout%1-MainView").tqarg(_layoutCurrent), key, false); for(int i=0;i<_layoutCount;i++) { _multiView->readViewConfig(config, - TQString("Layout%1-MainView").arg(i), + TQString("Layout%1-MainView").tqarg(i), key, false); _multiView->saveViewConfig(config, - TQString("Layout%1-MainView").arg(i), + TQString("Layout%1-MainView").tqarg(i), TQString(), false); } _multiView->readViewConfig(config, - TQString("Layout%1-MainView").arg(_layoutCurrent), + TQString("Layout%1-MainView").tqarg(_layoutCurrent), key, false); KConfigGroup aConfig(config, TQCString("Layouts")); @@ -1881,7 +1876,7 @@ void TopLevel::layoutSave() aConfig.writeEntry("DefaultCurrent", _layoutCurrent); } -void TopLevel::layoutRestore() +void TopLevel::tqlayoutRestore() { KConfig* config = KGlobal::config(); KConfigGroup aConfig(config, TQCString("Layouts")); @@ -1895,15 +1890,15 @@ void TopLevel::layoutRestore() TQString key = traceKey(); for(int i=0;i<_layoutCount;i++) { _multiView->readViewConfig(config, - TQString("Layout%1-MainView").arg(i), + TQString("Layout%1-MainView").tqarg(i), TQString(), false); _multiView->saveViewConfig(config, - TQString("Layout%1-MainView").arg(i), + TQString("Layout%1-MainView").tqarg(i), key, false); } _multiView->readViewConfig(config, - TQString("Layout%1-MainView").arg(_layoutCurrent), + TQString("Layout%1-MainView").tqarg(_layoutCurrent), key, false); updateLayoutActions(); @@ -1914,16 +1909,16 @@ void TopLevel::updateLayoutActions() { KAction* ka; - ka = actionCollection()->action("layout_next"); + ka = actionCollection()->action("tqlayout_next"); if (ka) ka->setEnabled(_layoutCount>1); - ka = actionCollection()->action("layout_previous"); + ka = actionCollection()->action("tqlayout_previous"); if (ka) ka->setEnabled(_layoutCount>1); - ka = actionCollection()->action("layout_remove"); + ka = actionCollection()->action("tqlayout_remove"); if (ka) ka->setEnabled(_layoutCount>1); - _statusbar->message(i18n("Layout Count: %1").arg(_layoutCount), 1000); + _statusbar->message(i18n("Layout Count: %1").tqarg(_layoutCount), 1000); } @@ -1935,19 +1930,19 @@ void TopLevel::updateStatusBar() } TQString status = TQString("%1 [%2] - ") - .arg(_data->shortTraceName()) - .arg(_data->activePartRange()); + .tqarg(_data->shortTraceName()) + .tqarg(_data->activePartRange()); if (_costType) { status += i18n("Total %1 Cost: %2") - .arg(_costType->longName()) - .arg(_data->prettySubCost(_costType)); + .tqarg(_costType->longName()) + .tqarg(_data->prettySubCost(_costType)); /* this gets too long... if (_costType2 && (_costType2 != _costType)) status += i18n(", %1 Cost: %2") - .arg(_costType2->longName()) - .arg(_data->prettySubCost(_costType2)); + .tqarg(_costType2->longName()) + .tqarg(_data->prettySubCost(_costType2)); */ } else @@ -1957,8 +1952,8 @@ void TopLevel::updateStatusBar() if (_groupType != TraceItem::Function) { status += TQString(" - %1 '%2'") - .arg(TraceItem::i18nTypeName(_groupType)) - .arg(_group ? _group->prettyName() : i18n("(None)")); + .tqarg(TraceItem::i18nTypeName(_groupType)) + .tqarg(_group ? _group->prettyName() : i18n("(None)")); } */ @@ -1991,7 +1986,7 @@ bool TopLevel::queryExit() Configuration::setShowCycles(_showCycles); Configuration::saveOptions(KGlobal::config()); - saveCurrentState(TQString::null); + saveCurrentState(TQString()); // save QT dock positions... @@ -2053,7 +2048,7 @@ void TopLevel::configChanged() //qDebug("TopLevel::configChanged"); //_showPercentage->setChecked(Configuration::showPercentage()); - // invalidate found/cached dirs of source files + // tqinvalidate found/cached dirs of source files _data->resetSourceDirs(); _partSelection->refresh(); @@ -2071,7 +2066,7 @@ void TopLevel::slotShowTipOnStart() { } void TopLevel::slotShowTip() { - KTipDialog::showTip( this, TQString::null, true ); + KTipDialog::showTip( this, TQString(), true ); } void TopLevel::dummySlot() @@ -2103,7 +2098,7 @@ void TopLevel::activePartsChangedSlot(const TracePartList& list) void TopLevel::partsHideSelectedSlotDelayed() { - TQTimer::singleShot( 0, this, TQT_SLOT(partsHideSelectedSlot()) ); + TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(partsHideSelectedSlot()) ); } // this puts selected parts into hidden list, @@ -2116,8 +2111,8 @@ void TopLevel::partsHideSelectedSlot() TracePartList newHidden, newActive; TracePartList l = _data->parts(); for (part=l.first();part;part=l.next()) { - if ((_activeParts.findRef(part)>=0) || - (_hiddenParts.findRef(part)>=0)) + if ((_activeParts.tqfindRef(part)>=0) || + (_hiddenParts.tqfindRef(part)>=0)) newHidden.append(part); else newActive.append(part); @@ -2136,7 +2131,7 @@ void TopLevel::partsHideSelectedSlot() void TopLevel::partsUnhideAllSlotDelayed() { - TQTimer::singleShot( 0, this, TQT_SLOT(partsUnhideAllSlot()) ); + TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(partsUnhideAllSlot()) ); } // this unhides all hidden parts. Does NOT change selection @@ -2164,7 +2159,7 @@ void TopLevel::forceTrace() cmd.close(); } if (_taDump->isChecked()) - TQTimer::singleShot( 1000, this, TQT_SLOT(forceTraceReload()) ); + TQTimer::singleShot( 1000, TQT_TQOBJECT(this), TQT_SLOT(forceTraceReload()) ); else { // cancel request cmd.remove(); @@ -2179,7 +2174,7 @@ void TopLevel::forceTraceReload() TQFile cmd("callgrind.cmd"); if (cmd.exists()) { if (_taDump->isChecked()) - TQTimer::singleShot( 1000, this, TQT_SLOT(forceTraceReload()) ); + TQTimer::singleShot( 1000, TQT_TQOBJECT(this), TQT_SLOT(forceTraceReload()) ); return; } _taDump->setChecked(false); @@ -2345,7 +2340,7 @@ void TopLevel::showMessage(const TQString& msg, int ms) _statusbar->message(msg, ms); } -void TopLevel::showStatus(TQString msg, int progress) +void TopLevel::showtqStatus(TQString msg, int progress) { static bool msgUpdateNeeded = true; @@ -2387,13 +2382,8 @@ void TopLevel::showStatus(TQString msg, int progress) _progressBar->setProgress(progress); // let the progress bar update itself -#if (QT_VERSION-0 >= 0x030100) - TQEventLoop* l = qApp->eventLoop(); + TQEventLoop* l = tqApp->eventLoop(); if (l) l->processEvents(TQEventLoop::ExcludeUserInput); -#else - // for Qt 3.0.x. This allows user input and thus potentially races - qApp->processEvents(); -#endif } #include "toplevel.moc" diff --git a/kcachegrind/kcachegrind/toplevel.h b/kcachegrind/kcachegrind/toplevel.h index c12fe773..c24b27d3 100644 --- a/kcachegrind/kcachegrind/toplevel.h +++ b/kcachegrind/kcachegrind/toplevel.h @@ -33,7 +33,7 @@ class MultiView; class TQLineEdit; -class QDockWidget; +class TQDockWidget; class TQLabel; class TQProgressBar; class TQPopupMenu; @@ -55,6 +55,7 @@ class TraceFunction; class TopLevel : public KMainWindow, public DCOPObject { Q_OBJECT + TQ_OBJECT public: TopLevel(const char *name = 0); @@ -103,13 +104,13 @@ public slots: void querySlot(); void dummySlot(); - // layouts - void layoutDuplicate(); - void layoutRemove(); - void layoutNext(); - void layoutPrevious(); - void layoutSave(); - void layoutRestore(); + // tqlayouts + void tqlayoutDuplicate(); + void tqlayoutRemove(); + void tqlayoutNext(); + void tqlayoutPrevious(); + void tqlayoutSave(); + void tqlayoutRestore(); void updateLayoutActions(); void updateStatusBar(); @@ -195,7 +196,7 @@ public slots: void slotShowTip(); // progress in status bar, empty message disables progress display - void showStatus(TQString msg, int progress); + void showtqStatus(TQString msg, int progress); void showMessage(const TQString&, int msec); private: @@ -215,7 +216,7 @@ private: TQLabel* _statusLabel; KRecentFilesAction* _openRecent; bool _twoMainWidgets; - Orientation _spOrientation; + Qt::Orientation _spOrientation; MultiView* _multiView; FunctionSelection* _functionSelection; @@ -250,7 +251,7 @@ private: TracePartList _activeParts; // hidden parts TracePartList _hiddenParts; - // layouts + // tqlayouts int _layoutCurrent, _layoutCount; // for delayed slots diff --git a/kcachegrind/kcachegrind/tracedata.cpp b/kcachegrind/kcachegrind/tracedata.cpp index 4e6a625c..83cc1488 100644 --- a/kcachegrind/kcachegrind/tracedata.cpp +++ b/kcachegrind/kcachegrind/tracedata.cpp @@ -76,9 +76,7 @@ TQString Addr::toString() const uint64 n = _v; TQString hex; -#if (QT_VERSION-0 >= 0x030200) hex.reserve(16); -#endif while(n>0) { int d = (n & 15); @@ -96,9 +94,7 @@ TQString Addr::pretty() const uint64 n = _v; int p = 0; TQString hex; -#if (QT_VERSION-0 >= 0x030200) hex.reserve(20); -#endif while(n>0) { int d = (n & 15); @@ -230,7 +226,7 @@ TraceItem::CostType TraceItem::i18nCostType(TQString s) void TraceItem::clear() { - invalidate(); + tqinvalidate(); } @@ -243,8 +239,8 @@ TQString TraceItem::name() const { if (part()) { return i18n("%1 from %2") - .arg(_dep->name()) - .arg(part()->name()); + .tqarg(_dep->name()) + .tqarg(part()->name()); } if (_dep) @@ -263,21 +259,21 @@ TQString TraceItem::prettyName() const TQString TraceItem::fullName() const { return TQString("%1 %2") - .arg(typeName(type())).arg(prettyName()); + .tqarg(typeName(type())).tqarg(prettyName()); } TQString TraceItem::toString() { - return TQString("%1\n [%3]").arg(fullName()).arg(costString(0)); + return TQString("%1\n [%3]").tqarg(fullName()).tqarg(costString(0)); } -void TraceItem::invalidate() +void TraceItem::tqinvalidate() { if (_dirty) return; _dirty = true; if (_dep) - _dep->invalidate(); + _dep->tqinvalidate(); } void TraceItem::update() @@ -364,7 +360,7 @@ void TraceCost::set(TraceSubMapping* sm, const char* s) _count = maxIndex; } // a cost change has to be propagated (esp. in subclasses) - invalidate(); + tqinvalidate(); } void TraceCost::set(TraceSubMapping* sm, FixString & s) @@ -395,7 +391,7 @@ void TraceCost::set(TraceSubMapping* sm, FixString & s) _cost[i] = 0; _count = maxIndex+1; } - invalidate(); + tqinvalidate(); } @@ -440,13 +436,13 @@ void TraceCost::addCost(TraceSubMapping* sm, const char* s) } // a cost change has to be propagated (esp. in subclasses) - invalidate(); + tqinvalidate(); #if TRACE_DEBUG _dirty = false; // don't recurse ! qDebug("%s\n now %s", fullName().ascii(), TraceCost::costString(0).ascii()); - _dirty = true; // because of invalidate() + _dirty = true; // because of tqinvalidate() #endif } @@ -492,13 +488,13 @@ void TraceCost::addCost(TraceSubMapping* sm, FixString & s) } } - invalidate(); + tqinvalidate(); #if TRACE_DEBUG _dirty = false; // don't recurse ! qDebug("%s\n now %s", fullName().ascii(), TraceCost::costString(0).ascii()); - _dirty = true; // because of invalidate() + _dirty = true; // because of tqinvalidate() #endif } @@ -548,13 +544,13 @@ void TraceCost::maxCost(TraceSubMapping* sm, FixString & s) } } - invalidate(); + tqinvalidate(); #if TRACE_DEBUG _dirty = false; // don't recurse ! qDebug("%s\n now %s", fullName().ascii(), TraceCost::costString(0).ascii()); - _dirty = true; // because of invalidate() + _dirty = true; // because of tqinvalidate() #endif } @@ -582,14 +578,14 @@ void TraceCost::addCost(TraceCost* item) } // a cost change has to be propagated (esp. in subclasses) - invalidate(); + tqinvalidate(); #if TRACE_DEBUG _dirty = false; // don't recurse ! qDebug("%s added cost item\n %s\n now %s", fullName().ascii(), item->fullName().ascii(), TraceCost::costString(0).ascii()); - _dirty = true; // because of invalidate() + _dirty = true; // because of tqinvalidate() #endif } @@ -616,14 +612,14 @@ void TraceCost::maxCost(TraceCost* item) } // a cost change has to be propagated (esp. in subclasses) - invalidate(); + tqinvalidate(); #if TRACE_DEBUG _dirty = false; // don't recurse ! qDebug("%s added cost item\n %s\n now %s", fullName().ascii(), item->fullName().ascii(), TraceCost::costString(0).ascii()); - _dirty = true; // because of invalidate() + _dirty = true; // because of tqinvalidate() #endif } @@ -640,7 +636,7 @@ void TraceCost::addCost(int type, SubCost value) } // a cost change has to be propagated (esp. in subclasses) - invalidate(); + tqinvalidate(); } void TraceCost::maxCost(int type, SubCost value) @@ -657,7 +653,7 @@ void TraceCost::maxCost(int type, SubCost value) } // a cost change has to be propagated (esp. in subclasses) - invalidate(); + tqinvalidate(); } @@ -695,14 +691,14 @@ TQString TraceCost::costString(TraceCostMapping* m) } -void TraceCost::invalidate() +void TraceCost::tqinvalidate() { if (_dirty) return; _dirty = true; _cachedType = 0; // cached value is invalid, too if (_dep) - _dep->invalidate(); + _dep->tqinvalidate(); } void TraceCost::update() @@ -771,8 +767,8 @@ TQString TraceJumpCost::costString(TraceCostMapping*) if (_dirty) update(); return TQString("%1/%2") - .arg(_followedCount.pretty()) - .arg(_executedCount.pretty()); + .tqarg(_followedCount.pretty()) + .tqarg(_executedCount.pretty()); } void TraceJumpCost::clear() @@ -830,7 +826,7 @@ void TraceCostType::setRealIndex(int i) i=TraceCost::InvalidIndex; _realIndex = i; - _formula = TQString::null; + _formula = TQString(); } // checks for existing types and sets coefficients @@ -917,7 +913,7 @@ TQString TraceCostType::parsedFormula() if (!t) continue; if (!t->name().isEmpty()) - res += TQString(" * %1").arg(t->name()); + res += TQString(" * %1").tqarg(t->name()); } return res; @@ -1366,8 +1362,8 @@ TraceCallCost::~TraceCallCost() TQString TraceCallCost::costString(TraceCostMapping* m) { return TQString("%1, Calls %2") - .arg(TraceCost::costString(m)) - .arg(_callCount.pretty()); + .tqarg(TraceCost::costString(m)) + .tqarg(_callCount.pretty()); } TQString TraceCallCost::prettyCallCount() @@ -1392,7 +1388,7 @@ void TraceCallCost::addCallCount(SubCost c) { _callCount += c; - invalidate(); + tqinvalidate(); } @@ -1408,8 +1404,8 @@ TraceInclusiveCost::~TraceInclusiveCost() TQString TraceInclusiveCost::costString(TraceCostMapping* m) { return TQString("%1, Inclusive %2") - .arg(TraceCost::costString(m)) - .arg(_inclusive.costString(m)); + .tqarg(TraceCost::costString(m)) + .tqarg(_inclusive.costString(m)); } void TraceInclusiveCost::clear() @@ -1429,7 +1425,7 @@ void TraceInclusiveCost::addInclusive(TraceCost* c) { _inclusive.addCost(c); - invalidate(); + tqinvalidate(); } @@ -1447,7 +1443,7 @@ TraceListCost::~TraceListCost() void TraceListCost::addDep(TraceCost* dep) { #if TRACE_ASSERTIONS - if (_deps.findRef(dep)>=0) { + if (_deps.tqfindRef(dep)>=0) { qDebug("addDep: %s already in list!", dep->fullName().ascii()); return; @@ -1456,7 +1452,7 @@ void TraceListCost::addDep(TraceCost* dep) _deps.append(dep); _lastDep = dep; - invalidate(); + tqinvalidate(); #if TRACE_DEBUG qDebug("%s added\n %s (now %d)", @@ -1521,7 +1517,7 @@ TraceJumpListCost::~TraceJumpListCost() void TraceJumpListCost::addDep(TraceJumpCost* dep) { #if TRACE_ASSERTIONS - if (_deps.findRef(dep)>=0) { + if (_deps.tqfindRef(dep)>=0) { qDebug("addDep: %s already in list!", dep->fullName().ascii()); return; @@ -1530,7 +1526,7 @@ void TraceJumpListCost::addDep(TraceJumpCost* dep) _deps.append(dep); _lastDep = dep; - invalidate(); + tqinvalidate(); #if TRACE_DEBUG qDebug("%s added\n %s (now %d)", @@ -1595,7 +1591,7 @@ TraceCallListCost::~TraceCallListCost() void TraceCallListCost::addDep(TraceCallCost* dep) { #if TRACE_ASSERTIONS - if (_deps.findRef(dep)>=0) { + if (_deps.tqfindRef(dep)>=0) { qDebug("addDep: %s already in list!", dep->fullName().ascii()); return; @@ -1604,7 +1600,7 @@ void TraceCallListCost::addDep(TraceCallCost* dep) _deps.append(dep); _lastDep = dep; - invalidate(); + tqinvalidate(); #if TRACE_DEBUG qDebug("%s added\n %s (now %d)", @@ -1674,7 +1670,7 @@ TraceInclusiveListCost::~TraceInclusiveListCost() void TraceInclusiveListCost::addDep(TraceInclusiveCost* dep) { #if TRACE_ASSERTIONS - if (_deps.findRef(dep)>=0) { + if (_deps.tqfindRef(dep)>=0) { qDebug("addDep: %s already in list!", dep->fullName().ascii()); return; @@ -1683,7 +1679,7 @@ void TraceInclusiveListCost::addDep(TraceInclusiveCost* dep) _deps.append(dep); _lastDep = dep; - invalidate(); + tqinvalidate(); #if TRACE_DEBUG qDebug("%s added\n %s (now %d)", @@ -1901,9 +1897,9 @@ TQString TracePartFunction::costString(TraceCostMapping* m) TQString res = TraceInclusiveCost::costString(m); res += TQString(", called from %1: %2") - .arg(_calledContexts).arg(prettyCalledCount()); + .tqarg(_calledContexts).tqarg(prettyCalledCount()); res += TQString(", calling from %1: %2") - .arg(_callingContexts).arg(prettyCallingCount()); + .tqarg(_callingContexts).tqarg(prettyCallingCount()); return res; } @@ -1912,7 +1908,7 @@ TQString TracePartFunction::costString(TraceCostMapping* m) void TracePartFunction::addPartInstr(TracePartInstr* ref) { #if TRACE_ASSERTIONS - if (_partInstr.findRef(ref)>=0) { + if (_partInstr.tqfindRef(ref)>=0) { qDebug("TracePartFunction::addPartInstr: %s already in list!", ref->name().ascii()); return; @@ -1920,7 +1916,7 @@ void TracePartFunction::addPartInstr(TracePartInstr* ref) #endif _partInstr.append(ref); - invalidate(); + tqinvalidate(); #if TRACE_DEBUG qDebug("%s added\n %s (now %d)", @@ -1933,7 +1929,7 @@ void TracePartFunction::addPartInstr(TracePartInstr* ref) void TracePartFunction::addPartLine(TracePartLine* ref) { #if TRACE_ASSERTIONS - if (_partLines.findRef(ref)>=0) { + if (_partLines.tqfindRef(ref)>=0) { qDebug("TracePartFunction::addPartLine: %s already in list!", ref->name().ascii()); return; @@ -1941,7 +1937,7 @@ void TracePartFunction::addPartLine(TracePartLine* ref) #endif _partLines.append(ref); - invalidate(); + tqinvalidate(); #if TRACE_DEBUG qDebug("%s added\n %s (now %d)", @@ -1954,7 +1950,7 @@ void TracePartFunction::addPartLine(TracePartLine* ref) void TracePartFunction::addPartCaller(TracePartCall* ref) { #if TRACE_ASSERTIONS - if (_partCallers.findRef(ref)>=0) { + if (_partCallers.tqfindRef(ref)>=0) { qDebug("TracePartFunction::addPartCaller: %s already in list!", ref->name().ascii()); return; @@ -1962,7 +1958,7 @@ void TracePartFunction::addPartCaller(TracePartCall* ref) #endif _partCallers.append(ref); - invalidate(); + tqinvalidate(); #if TRACE_DEBUG qDebug("%s added Caller\n %s (now %d)", @@ -1975,7 +1971,7 @@ void TracePartFunction::addPartCaller(TracePartCall* ref) void TracePartFunction::addPartCalling(TracePartCall* ref) { #if TRACE_ASSERTIONS - if (_partCallings.findRef(ref)>=0) { + if (_partCallings.tqfindRef(ref)>=0) { qDebug("TracePartFunction::addPartCalling: %s already in list!", ref->name().ascii()); return; @@ -1983,7 +1979,7 @@ void TracePartFunction::addPartCalling(TracePartCall* ref) #endif _partCallings.append(ref); - invalidate(); + tqinvalidate(); #if TRACE_DEBUG qDebug("%s added Calling\n %s (now %d)", @@ -2140,8 +2136,8 @@ TracePartClass::~TracePartClass() TQString TracePartClass::prettyName() const { return TQString("%1 from %2") - .arg( _dep->name().isEmpty() ? TQString("(global)") : _dep->name()) - .arg(part()->name()); + .tqarg( _dep->name().isEmpty() ? TQString("(global)") : _dep->name()) + .tqarg(part()->name()); } //--------------------------------------------------- @@ -2237,8 +2233,8 @@ void TraceInstrJump::update() TQString TraceInstrJump::name() const { return TQString("jump at 0x%1 to 0x%2") - .arg(_instrFrom->addr().toString()) - .arg(_instrTo->addr().toString()); + .tqarg(_instrFrom->addr().toString()) + .tqarg(_instrTo->addr().toString()); } @@ -2320,8 +2316,8 @@ TracePartLineJump* TraceLineJump::partLineJump(TracePart* part) TQString TraceLineJump::name() const { return TQString("jump at %1 to %2") - .arg(_lineFrom->prettyName()) - .arg(_lineTo->prettyName()); + .tqarg(_lineFrom->prettyName()) + .tqarg(_lineTo->prettyName()); } @@ -2399,7 +2395,7 @@ TracePartInstrCall* TraceInstrCall::partInstrCall(TracePart* part, TQString TraceInstrCall::name() const { - return TQString("%1 at %2").arg(_call->name()).arg(_instr->name()); + return TQString("%1 at %2").tqarg(_call->name()).tqarg(_instr->name()); } @@ -2435,7 +2431,7 @@ TracePartLineCall* TraceLineCall::partLineCall(TracePart* part, TQString TraceLineCall::name() const { - return TQString("%1 at %2").arg(_call->name()).arg(_line->name()); + return TQString("%1 at %2").tqarg(_call->name()).tqarg(_line->name()); } @@ -2482,7 +2478,7 @@ TraceInstrCall* TraceCall::instrCall(TraceInstr* i) icall = new TraceInstrCall(this, i); _instrCalls.append(icall); - invalidate(); + tqinvalidate(); #if TRACE_DEBUG qDebug("Created %s [TraceCall::instrCall]", icall->fullName().ascii()); @@ -2504,7 +2500,7 @@ TraceLineCall* TraceCall::lineCall(TraceLine* l) lcall = new TraceLineCall(this, l); _lineCalls.append(lcall); - invalidate(); + tqinvalidate(); #if TRACE_DEBUG qDebug("Created %s [TraceCall::lineCall]", lcall->fullName().ascii()); @@ -2515,25 +2511,25 @@ TraceLineCall* TraceCall::lineCall(TraceLine* l) } -void TraceCall::invalidateDynamicCost() +void TraceCall::tqinvalidateDynamicCost() { TraceLineCall* lc; for (lc=_lineCalls.first();lc;lc=_lineCalls.next()) - lc->invalidate(); + lc->tqinvalidate(); TraceInstrCall* ic; for (ic=_instrCalls.first();ic;ic=_instrCalls.next()) - ic->invalidate(); + ic->tqinvalidate(); - invalidate(); + tqinvalidate(); } TQString TraceCall::name() const { return TQString("%1 => %2") - .arg(_caller->name()) - .arg(_called->name()); + .tqarg(_caller->name()) + .tqarg(_called->name()); } int TraceCall::inCycle() @@ -2591,7 +2587,7 @@ TQString TraceCall::callerName(bool skipCycle) const TraceFunctionCycle* c = _called->cycle(); if (c && _caller && (_caller->cycle() != c)) { TQString via = _called->prettyName(); - return i18n("%1 via %2").arg(_caller->prettyName()).arg(via); + return i18n("%1 via %2").tqarg(_caller->prettyName()).tqarg(via); } } @@ -2610,7 +2606,7 @@ TQString TraceCall::calledName(bool skipCycle) const _called->setCycle(0); TQString via = _called->prettyName(); _called->setCycle(c); - return i18n("%1 via %2").arg(c->name()).arg(via); + return i18n("%1 via %2").tqarg(c->name()).tqarg(via); } } return _called->prettyName(); @@ -2687,7 +2683,7 @@ TraceInstrJump* TraceInstr::instrJump(TraceInstr* to, bool isJmpCond) void TraceInstr::addInstrCall(TraceInstrCall* instrCall) { #if TRACE_ASSERTIONS - if (_instrCalls.findRef(instrCall)>=0) return; + if (_instrCalls.tqfindRef(instrCall)>=0) return; if (instrCall->instr() != this) { qDebug("Can't add instruction call to another instruction!"); @@ -2696,7 +2692,7 @@ void TraceInstr::addInstrCall(TraceInstrCall* instrCall) #endif _instrCalls.append(instrCall); - invalidate(); + tqinvalidate(); #if TRACE_DEBUG qDebug("%s added\n %s (now %d)", @@ -2708,12 +2704,12 @@ void TraceInstr::addInstrCall(TraceInstrCall* instrCall) TQString TraceInstr::name() const { - return TQString("0x%1").arg(_addr.toString()); + return TQString("0x%1").tqarg(_addr.toString()); } TQString TraceInstr::prettyName() const { - return TQString("0x%1").arg(_addr.toString()); + return TQString("0x%1").tqarg(_addr.toString()); } @@ -2787,7 +2783,7 @@ TraceLineJump* TraceLine::lineJump(TraceLine* to, bool isJmpCond) void TraceLine::addLineCall(TraceLineCall* lineCall) { #if TRACE_ASSERTIONS - if (_lineCalls.findRef(lineCall)>=0) return; + if (_lineCalls.tqfindRef(lineCall)>=0) return; if (lineCall->line() != this) { qDebug("Can't add line call to another line!"); @@ -2811,7 +2807,7 @@ void TraceLine::addLineCall(TraceLineCall* lineCall) } _lineCalls.append(lineCall); - invalidate(); + tqinvalidate(); #if TRACE_DEBUG qDebug("%s added\n %s (now %d)", @@ -2828,13 +2824,13 @@ TQString TraceLine::name() const return i18n("(unknown)"); return TQString("%1:%2") - .arg(fileShortName).arg(_lineno); + .tqarg(fileShortName).tqarg(_lineno); } TQString TraceLine::prettyName() const { return TQString("%1 [%2]") - .arg(name()).arg(_sourceFile->function()->prettyName()); + .tqarg(name()).tqarg(_sourceFile->function()->prettyName()); } //--------------------------------------------------- @@ -2873,7 +2869,7 @@ TraceFunctionSource::~TraceFunctionSource() TQString TraceFunctionSource::name() const { - return TQString("%1 for %2").arg(_file->name()).arg(_function->name()); + return TQString("%1 for %2").tqarg(_file->name()).tqarg(_function->name()); } uint TraceFunctionSource::firstLineno() @@ -2912,7 +2908,7 @@ TraceLine* TraceFunctionSource::line(uint lineno, bool createNew) if (!createNew) { if (!_lineMap) return 0; - TraceLineMap::Iterator it = _lineMap->find(lineno); + TraceLineMap::Iterator it = _lineMap->tqfind(lineno); if (it == _lineMap->end()) return 0; return &(it.data()); } @@ -2949,17 +2945,17 @@ void TraceFunctionSource::update() _dirty = false; } -void TraceFunctionSource::invalidateDynamicCost() +void TraceFunctionSource::tqinvalidateDynamicCost() { // no need to create lineMap if not already created if (_lineMap) { TraceLineMap::Iterator lit; for ( lit = _lineMap->begin(); lit != _lineMap->end(); ++lit ) - (*lit).invalidate(); + (*lit).tqinvalidate(); } - invalidate(); + tqinvalidate(); } TraceLineMap* TraceFunctionSource::lineMap() @@ -3129,12 +3125,12 @@ void TraceAssoziation::clear(TraceData* d, int rtti) (*it).removeAssoziation(rtti); } -void TraceAssoziation::invalidate(TraceData* d, int rtti) +void TraceAssoziation::tqinvalidate(TraceData* d, int rtti) { TraceFunctionMap::Iterator it; for ( it = d->functionMap().begin(); it != d->functionMap().end(); ++it ) - (*it).invalidateAssoziation(rtti); + (*it).tqinvalidateAssoziation(rtti); } @@ -3202,12 +3198,12 @@ void TraceFunction::removeAssoziation(int rtti, bool reallyDelete) } } -void TraceFunction::invalidateAssoziation(int rtti) +void TraceFunction::tqinvalidateAssoziation(int rtti) { TraceAssoziation* a; for (a=_assoziations.first();a;a=_assoziations.next()) if ((rtti==0) || (a->rtti() == rtti)) - a->invalidate(); + a->tqinvalidate(); } TraceAssoziation* TraceFunction::assoziation(int rtti) @@ -3244,7 +3240,7 @@ TQString TraceFunction::prettyName() const if (_name.isEmpty()) return i18n("(unknown)"); - int p = _name.find('('); + int p = _name.tqfind('('); if (p>0) { // handle C++ "operator()" correct if ((_name[p+1] == ')') && (_name[p+2] == '(')) p+=2; @@ -3258,9 +3254,9 @@ TQString TraceFunction::prettyName() const // cycle members if (_cycle) { if (_cycle != this) - res = TQString("%1 <cycle %2>").arg(res).arg(_cycle->cycleNo()); + res = TQString("%1 <cycle %2>").tqarg(res).tqarg(_cycle->cycleNo()); else - res = TQString("<cycle %2>").arg(_cycle->cycleNo()); + res = TQString("<cycle %2>").tqarg(_cycle->cycleNo()); } @@ -3283,9 +3279,9 @@ TQString TraceFunction::location(int maxFiles) const uint to = lastAddress(); if (from != 0 && to != 0) { if (from == to) - loc += TQString(" (0x%1)").arg(to, 0, 16); + loc += TQString(" (0x%1)").tqarg(to, 0, 16); else - loc += TQString(" (0x%1-0x%2)").arg(from, 0, 16).arg(to, 0, 16); + loc += TQString(" (0x%1-0x%2)").tqarg(from, 0, 16).tqarg(to, 0, 16); } #endif } @@ -3314,9 +3310,9 @@ TQString TraceFunction::location(int maxFiles) const to = sourceFile->lastLineno(); if (from != 0 && to != 0) { if (from == to) - loc += TQString(" (%1)").arg(to); + loc += TQString(" (%1)").tqarg(to); else - loc += TQString(" (%1-%2)").arg(from).arg(to); + loc += TQString(" (%1-%2)").tqarg(from).tqarg(to); } #endif } @@ -3338,7 +3334,7 @@ void TraceFunction::addPrettyLocation(TQString& s, int maxFiles) const TQString l = location(maxFiles); if (l.isEmpty()) return; - s += TQString(" (%1)").arg(l); + s += TQString(" (%1)").tqarg(l); } TQString TraceFunction::prettyNameWithLocation(int maxFiles) const @@ -3346,17 +3342,17 @@ TQString TraceFunction::prettyNameWithLocation(int maxFiles) const TQString l = location(maxFiles); if (l.isEmpty()) return prettyName(); - return TQString("%1 (%2)").arg(prettyName()).arg(l); + return TQString("%1 (%2)").tqarg(prettyName()).tqarg(l); } TQString TraceFunction::info() const { TQString l = location(); if (l.isEmpty()) - return TQString("Function %1").arg(name()); + return TQString("Function %1").tqarg(name()); return TQString("Function %1 (location %2)") - .arg(name()).arg(l); + .tqarg(name()).tqarg(l); } @@ -3385,7 +3381,7 @@ TraceInstr* TraceFunction::instr(Addr addr, bool createNew) if (!createNew) { if (!_instrMap) return 0; - TraceInstrMap::Iterator it = _instrMap->find(addr); + TraceInstrMap::Iterator it = _instrMap->tqfind(addr); if (it == _instrMap->end()) return 0; return &(it.data()); @@ -3414,11 +3410,11 @@ void TraceFunction::addCaller(TraceCall* caller) return; } - if (_callers.findRef(caller)>=0) return; + if (_callers.tqfindRef(caller)>=0) return; #endif _callers.append(caller); - invalidate(); + tqinvalidate(); #if TRACE_DEBUG qDebug("%s added Caller\n %s (now %d)", @@ -3430,7 +3426,7 @@ void TraceFunction::addCaller(TraceCall* caller) TraceCall* TraceFunction::calling(TraceFunction* called) { - TraceCallMap::Iterator it = _callingMap.find(called); + TraceCallMap::Iterator it = _callingMap.tqfind(called); TraceCall* calling = (it == _callingMap.end()) ? 0 : it.data(); if (!calling) { @@ -3439,8 +3435,8 @@ TraceCall* TraceFunction::calling(TraceFunction* called) _callingMap.insert(called, calling); _callings.append(calling); - // we have to invalidate ourself so invalidations from item propagate up - invalidate(); + // we have to tqinvalidate ourself so invalidations from item propagate up + tqinvalidate(); #if TRACE_DEBUG qDebug("Created %s [TraceFunction::calling]", calling->fullName().ascii()); @@ -3464,8 +3460,8 @@ TraceFunctionSource* TraceFunction::sourceFile(TraceFile* file, _sourceFiles.append(sourceFile); - // we have to invalidate ourself so invalidations from item propagate up - invalidate(); + // we have to tqinvalidate ourself so invalidations from item propagate up + tqinvalidate(); #if TRACE_DEBUG qDebug("Created SourceFile %s [TraceFunction::line]", @@ -3591,24 +3587,24 @@ const TraceCallList& TraceFunction::callings(bool /* skipCycle */) const return _callings; } -void TraceFunction::invalidateDynamicCost() +void TraceFunction::tqinvalidateDynamicCost() { TraceCall* c; for (c=_callings.first();c;c=_callings.next()) - c->invalidateDynamicCost(); + c->tqinvalidateDynamicCost(); TraceFunctionSource* sf; for (sf=_sourceFiles.first();sf;sf=_sourceFiles.next()) - sf->invalidateDynamicCost(); + sf->tqinvalidateDynamicCost(); if (_instrMap) { TraceInstrMap::Iterator iit; for ( iit = _instrMap->begin(); iit != _instrMap->end(); ++iit ) - (*iit).invalidate(); + (*iit).tqinvalidate(); } - invalidate(); + tqinvalidate(); } void TraceFunction::update() @@ -3955,7 +3951,7 @@ TraceFunctionCycle::TraceFunctionCycle(TraceFunction* f, int n) _cycle = this; setPosition(f->data()); - setName(TQString("<cycle %1>").arg(n)); + setName(TQString("<cycle %1>").tqarg(n)); // reset to attributes of base function setFile(_base->file()); @@ -3971,7 +3967,7 @@ void TraceFunctionCycle::init() // this deletes all TraceCall's to members _callings.clear(); - invalidate(); + tqinvalidate(); } void TraceFunctionCycle::add(TraceFunction* f) @@ -3991,19 +3987,19 @@ void TraceFunctionCycle::setup() TraceCall *call; TraceCallList l = f->callers(); for (call=l.first();call;call=l.next()) { - if ( _memberSet.contains(call->caller()) ) continue; + if ( _memberSet.tqcontains(call->caller()) ) continue; _callers.append(call); } // the cycle has a call to each member call = new TraceCall(this, f); - call->invalidate(); + call->tqinvalidate(); _callings.append(call); // now do some faking... f->setCycle(this); } - invalidate(); + tqinvalidate(); } @@ -4045,12 +4041,12 @@ void TraceClass::addFunction(TraceFunction* function) return; } - if (_functions.findRef(function)>=0) return; + if (_functions.tqfindRef(function)>=0) return; #endif _functions.append(function); - invalidate(); + tqinvalidate(); #if TRACE_DEBUG qDebug("%s added\n %s (now %d)", @@ -4092,12 +4088,12 @@ void TraceFile::addFunction(TraceFunction* function) return; } - if (_functions.findRef(function)>=0) return; + if (_functions.tqfindRef(function)>=0) return; #endif _functions.append(function); - invalidate(); + tqinvalidate(); #if TRACE_DEBUG qDebug("%s added\n %s (now %d)", @@ -4118,7 +4114,7 @@ void TraceFile::addSourceFile(TraceFunctionSource* sourceFile) _sourceFiles.append(sourceFile); // not truely needed, as we don't use the sourceFiles for cost update - invalidate(); + tqinvalidate(); #if TRACE_DEBUG qDebug("%s \n added SourceFile %s (now %d)", @@ -4142,10 +4138,10 @@ TQString TraceFile::directory() if (!_dir.isEmpty()) return _dir; int lastIndex = 0, index; - while ( (index=_name.find("/", lastIndex)) >=0) + while ( (index=_name.tqfind("/", lastIndex)) >=0) lastIndex = index+1; - if (lastIndex==0) return TQString::null; + if (lastIndex==0) return TQString(); // without ending "/" return _name.left(lastIndex-1); @@ -4155,7 +4151,7 @@ TQString TraceFile::directory() TQString TraceFile::shortName() const { int lastIndex = 0, index; - while ( (index=_name.find("/", lastIndex)) >=0) + while ( (index=_name.tqfind("/", lastIndex)) >=0) lastIndex = index+1; return _name.mid(lastIndex); @@ -4210,12 +4206,12 @@ void TraceObject::addFunction(TraceFunction* function) return; } - if (_functions.findRef(function)>=0) return; + if (_functions.tqfindRef(function)>=0) return; #endif _functions.append(function); - invalidate(); + tqinvalidate(); #if TRACE_DEBUG qDebug("%s added\n %s (now %d)", @@ -4230,7 +4226,7 @@ void TraceObject::setName(const TQString& name) _name = name; int lastIndex = 0, index; - while ( (index=_name.find("/", lastIndex)) >=0) + while ( (index=_name.tqfind("/", lastIndex)) >=0) lastIndex = index+1; _shortName = _name.mid(lastIndex); @@ -4294,7 +4290,7 @@ void TracePart::setProcessID(int pid) TQString TracePart::shortName() const { int lastIndex = 0, index; - while ( (index=_name.find("/", lastIndex)) >=0) + while ( (index=_name.tqfind("/", lastIndex)) >=0) lastIndex = index+1; return _name.mid(lastIndex); @@ -4302,9 +4298,9 @@ TQString TracePart::shortName() const TQString TracePart::prettyName() const { - TQString name = TQString("%1.%2").arg(_pid).arg(_number); + TQString name = TQString("%1.%2").tqarg(_pid).tqarg(_number); if (data()->maxThreadID()>1) - name += TQString("-%3").arg(_tid); + name += TQString("-%3").tqarg(_tid); return name; } @@ -4314,7 +4310,7 @@ bool TracePart::activate(bool active) _active = active; // to be done by the client of this function - // data()->invalidateDynamicCost(); + // data()->tqinvalidateDynamicCost(); // So better use the TraceData functions... return true; @@ -4393,7 +4389,7 @@ TraceData::~TraceData() TQString TraceData::shortTraceName() const { int lastIndex = 0, index; - while ( (index=_traceName.find("/", lastIndex)) >=0) + while ( (index=_traceName.tqfind("/", lastIndex)) >=0) lastIndex = index+1; return _traceName.mid(lastIndex); @@ -4502,7 +4498,7 @@ void TraceData::load(const TQString& base) if ((str.length() > pos) && (str[pos] == '.')) { pos++; while(str.length()>pos) { - if (str[pos] < '0' || str[pos] > '9') break; + if ((int)str.tqat(pos) < '0' || (int)str.tqat(pos) > '9') break; n = 10*n + (str[pos++] - '0'); } } @@ -4512,7 +4508,7 @@ void TraceData::load(const TQString& base) if ((str.length() > pos) && (str[pos] == '-')) { pos++; while(str.length()>pos) { - if (str[pos] < '0' || str[pos] > '9') break; + if ((int)str.tqat(pos) < '0' || (int)str.tqat(pos) > '9') break; t = 10*t + (str[pos++] - '0'); } } @@ -4531,16 +4527,16 @@ void TraceData::load(const TQString& base) } _parts.sort(); - invalidateDynamicCost(); + tqinvalidateDynamicCost(); updateFunctionCycles(); // clear loading messages from status bar - if (_topLevel) _topLevel->showStatus(TQString::null, 0); + if (_topLevel) _topLevel->showtqStatus(TQString(), 0); } TracePart* TraceData::addPart(const TQString& dir, const TQString& name) { - TQString filename = TQString("%1/%2").arg(dir).arg(name); + TQString filename = TQString("%1/%2").tqarg(dir).tqarg(name); #if TRACE_DEBUG qDebug("TraceData::addPart('%s')", filename.ascii()); #endif @@ -4551,8 +4547,8 @@ TracePart* TraceData::addPart(const TQString& dir, const TQString& name) if (!l) return 0; if (_topLevel) - _topLevel->connect(l, TQT_SIGNAL(updateStatus(TQString, int)), - TQT_SLOT(showStatus(TQString, int))); + _topLevel->connect(l, TQT_SIGNAL(updatetqStatus(TQString, int)), + TQT_SLOT(showtqStatus(TQString, int))); TracePart* part = new TracePart(this, file); @@ -4572,13 +4568,13 @@ bool TraceData::activateParts(const TracePartList& l) TracePart* part; for (part=_parts.first();part;part=_parts.next()) - if (part->activate(l.containsRef(part)>0)) + if (part->activate(l.tqcontainsRef(part)>0)) changed = true; if (changed) { // because active parts have changed, throw away calculated // costs... - invalidateDynamicCost(); + tqinvalidateDynamicCost(); updateFunctionCycles(); } @@ -4592,12 +4588,12 @@ bool TraceData::activateParts(TracePartList l, bool active) TracePart* part; for (part=l.first();part;part=l.next()) - if (_parts.findRef(part)>=0) + if (_parts.tqfindRef(part)>=0) if (part->activate(active)) changed = true; if (changed) { - invalidateDynamicCost(); + tqinvalidateDynamicCost(); updateFunctionCycles(); } @@ -4636,45 +4632,45 @@ TQString TraceData::activePartRange() else { if (!res.isEmpty()) res += ";"; if (r1==r2) res += TQString::number(r1); - else res += TQString("%1-%2").arg(r1).arg(r2); + else res += TQString("%1-%2").tqarg(r1).tqarg(r2); r1 = r2 = count; } } if (r1>=0) { if (!res.isEmpty()) res += ";"; if (r1==r2) res += TQString::number(r1); - else res += TQString("%1-%2").arg(r1).arg(r2); + else res += TQString("%1-%2").tqarg(r1).tqarg(r2); } return res; } -void TraceData::invalidateDynamicCost() +void TraceData::tqinvalidateDynamicCost() { - // invalidate all dynamic costs + // tqinvalidate all dynamic costs TraceObjectMap::Iterator oit; for ( oit = _objectMap.begin(); oit != _objectMap.end(); ++oit ) - (*oit).invalidate(); + (*oit).tqinvalidate(); TraceClassMap::Iterator cit; for ( cit = _classMap.begin(); cit != _classMap.end(); ++cit ) - (*cit).invalidate(); + (*cit).tqinvalidate(); TraceFileMap::Iterator fit; for ( fit = _fileMap.begin(); fit != _fileMap.end(); ++fit ) - (*fit).invalidate(); + (*fit).tqinvalidate(); TraceFunctionMap::Iterator it; for ( it = _functionMap.begin(); it != _functionMap.end(); ++it ) { - (*it).invalidateDynamicCost(); + (*it).tqinvalidateDynamicCost(); } - invalidate(); + tqinvalidate(); } @@ -4719,21 +4715,21 @@ TraceClass* TraceData::cls(const TQString& fnName, TQString& shortName) int lastIndex = 0, index, pIndex; // we ignore any "::" after a '(' or a space - pIndex=fnName.find("(", 0); + pIndex=fnName.tqfind("(", 0); #if 0 - int sIndex=fnName.find(" ", 0); + int sIndex=fnName.tqfind(" ", 0); if (sIndex>=0) if ((pIndex == -1) || (sIndex < pIndex)) pIndex = sIndex; #endif - while ((index=fnName.find("::", lastIndex)) >=0) { + while ((index=fnName.tqfind("::", lastIndex)) >=0) { if (pIndex>=0 && pIndex<index) break; lastIndex = index+2; } - TQString clsName = (lastIndex < 3) ? TQString::null : + TQString clsName = (lastIndex < 3) ? TQString() : fnName.left(lastIndex-2); shortName = fnName.mid(lastIndex); @@ -4770,7 +4766,7 @@ TraceFunction* TraceData::function(const TQString& name, TQString key = name + object->shortName(); TraceFunctionMap::Iterator it; - it = _functionMap.find(key); + it = _functionMap.tqfind(key); if (it == _functionMap.end()) { it = _functionMap.insert(key, TraceFunction()); TraceFunction& f = it.data(); @@ -4807,7 +4803,7 @@ TraceFunctionMap::Iterator TraceData::functionIterator(TraceFunction* f) key += f->name(); key += f->object()->shortName(); - return _functionMap.find(key); + return _functionMap.tqfind(key); } TraceFunctionMap::ConstIterator TraceData::functionBeginIterator() const @@ -4847,10 +4843,10 @@ void TraceData::update() } TraceCost* TraceData::search(TraceItem::CostType t, TQString name, - TraceCostType* ct, TraceCost* parent) + TraceCostType* ct, TraceCost* tqparent) { TraceCost* result = 0; - TraceItem::CostType pt = parent ? parent->type() : NoCostType; + TraceItem::CostType pt = tqparent ? tqparent->type() : NoCostType; SubCost sc, scTop = 0; switch(t) { @@ -4864,9 +4860,9 @@ TraceCost* TraceData::search(TraceItem::CostType t, TQString name, if (f->name() != name) continue; - if ((pt == Class) && (parent != f->cls())) continue; - if ((pt == File) && (parent != f->file())) continue; - if ((pt == Object) && (parent != f->object())) continue; + if ((pt == Class) && (tqparent != f->cls())) continue; + if ((pt == File) && (tqparent != f->file())) continue; + if ((pt == Object) && (tqparent != f->object())) continue; if (ct) { sc = f->inclusive()->subCost(ct); @@ -4935,7 +4931,7 @@ TraceCost* TraceData::search(TraceItem::CostType t, TQString name, case Instr: if (pt == Function) { - TraceInstrMap* instrMap = ((TraceFunction*)parent)->instrMap(); + TraceInstrMap* instrMap = ((TraceFunction*)tqparent)->instrMap(); if (!instrMap) break; TraceInstr *instr; @@ -4953,9 +4949,9 @@ TraceCost* TraceData::search(TraceItem::CostType t, TQString name, { TraceFunctionSourceList sList; if (pt == Function) - sList = ((TraceFunction*)parent)->sourceFiles(); + sList = ((TraceFunction*)tqparent)->sourceFiles(); else if (pt == FunctionSource) - sList.append((TraceFunctionSource*) parent); + sList.append((TraceFunctionSource*) tqparent); else break; TraceLineMap* lineMap; @@ -5019,7 +5015,7 @@ void TraceData::updateFunctionCycles() #if 0 int fCount = _functionMap.size(), fNo = 0, progress=0, p; TQString msg = i18n("Recalculating Function Cycles..."); - if (_topLevel) _topLevel->showStatus(msg,0); + if (_topLevel) _topLevel->showtqStatus(msg,0); #endif // DFS and collapse strong connected components (Tarjan) @@ -5033,7 +5029,7 @@ void TraceData::updateFunctionCycles() p = 100*fNo/fCount; if (p> progress) { progress = p; - _topLevel->showStatus(msg, p); + _topLevel->showtqStatus(msg, p); } } #endif @@ -5047,11 +5043,11 @@ void TraceData::updateFunctionCycles() cycle->setup(); _inFunctionCycleUpdate = false; - // we have to invalidate costs because cycles are now taken into account - invalidateDynamicCost(); + // we have to tqinvalidate costs because cycles are now taken into account + tqinvalidateDynamicCost(); #if 0 - if (0) if (_topLevel) _topLevel->showStatus(TQString::null,0); + if (0) if (_topLevel) _topLevel->showtqStatus(TQString(),0); #endif } diff --git a/kcachegrind/kcachegrind/tracedata.h b/kcachegrind/kcachegrind/tracedata.h index 3ebe1310..1b57d297 100644 --- a/kcachegrind/kcachegrind/tracedata.h +++ b/kcachegrind/kcachegrind/tracedata.h @@ -64,7 +64,7 @@ class TQFile; * * For cost items, which are sums over all trace files read in, the * summed cost metrics change when e.g. a new trace file is read. - * Thus, their cached costs are invalidated, and again recalculated + * Thus, their cached costs are tqinvalidated, and again recalculated * only on demand. In the following list, theses cost items are called * "dynamic", the other "fixed" (but neverless calculated lazy). * @@ -301,16 +301,16 @@ public: virtual void clear(); /** Invalidate the cost attributes. - * An invalidated object needs to be recalculated when a cost + * An tqinvalidated object needs to be recalculated when a cost * attribute is requested (e.g. by subCost()). * Has to be overwritten by subclasses when the cost influences costs of * other cost items. If only one item depends on the cost of this item, * it can by set with setDependant() without a need for overwriting. */ - virtual void invalidate(); + virtual void tqinvalidate(); /** - * Sets a dependant to be invalidated when this cost is invalidated. + * Sets a dependant to be tqinvalidated when this cost is tqinvalidated. * Call this function directly after the constructor. */ void setDependant(TraceItem* d) { _dep = d; } @@ -388,7 +388,7 @@ public: void maxCost(int index, SubCost value); TraceCost diff(TraceCost* item); - virtual void invalidate(); + virtual void tqinvalidate(); /** Returns a sub cost. This automatically triggers * a call to update() if needed. @@ -443,8 +443,8 @@ public: * <formula> uses short names to reference other types */ TraceCostType(TQString name, - TQString longName = TQString::null, - TQString formula = TQString::null); + TQString longName = TQString(), + TQString formula = TQString()); void setName(TQString n) { _name = n; } void setLongName(TQString n) { _longName = n; } @@ -1303,7 +1303,7 @@ class TraceCall: public TraceCallListCost // we need some special handling for cycle calls void update(); - void invalidateDynamicCost(); + void tqinvalidateDynamicCost(); // factories TracePartCall* partCall(TracePart*, @@ -1502,7 +1502,7 @@ public: uint lastLineno(); TraceLineMap* lineMap(); - void invalidateDynamicCost(); + void tqinvalidateDynamicCost(); /* factories */ TraceLine* line(uint lineno, bool createNew = true); @@ -1549,7 +1549,7 @@ class TraceAssoziation bool setFunction(TraceFunction*); TraceFunction* function() { return _function; } - void invalidate() { _valid = false; } + void tqinvalidate() { _valid = false; } bool isValid() { return _valid; } /** @@ -1562,7 +1562,7 @@ class TraceAssoziation * Invalidate all assoziations in TraceFunctions of data with * rtti runtime info. rtti = 0: Invalidate ALL assoziations. */ - static void invalidate(TraceData* data, int rtti); + static void tqinvalidate(TraceData* data, int rtti); protected: TraceFunction* _function; @@ -1590,9 +1590,9 @@ class TraceFunction: public TraceCostItem virtual CostType type() const { return Function; } virtual void update(); - // this invalidate all subcosts of function depending on + // this tqinvalidate all subcosts of function depending on // active status of parts - void invalidateDynamicCost(); + void tqinvalidateDynamicCost(); void addCaller(TraceCall*); @@ -1651,7 +1651,7 @@ class TraceFunction: public TraceCostItem void addAssoziation(TraceAssoziation* a); void removeAssoziation(TraceAssoziation* a); void removeAssoziation(int rtti, bool reallyDelete = true); - void invalidateAssoziation(int rtti); + void tqinvalidateAssoziation(int rtti); TraceAssoziation* assoziation(int rtti); // cycles @@ -1764,7 +1764,7 @@ class TraceFile: public TraceCostItem virtual CostType type() const { return File; } void setDirectory(const TQString& dir); - void resetDirectory() { _dir = TQString::null; } + void resetDirectory() { _dir = TQString(); } TQString directory(); void addFunction(TraceFunction*); @@ -1841,10 +1841,10 @@ class TraceData: public TraceCost void load(const TQString&); /** returns true if something changed. These do NOT - * invalidate the dynamic costs on a activation change, + * tqinvalidate the dynamic costs on a activation change, * i.e. all cost items dependend on active parts. * This has to be done by the caller when true is returned by - * calling invalidateDynamicCost(). + * calling tqinvalidateDynamicCost(). */ bool activateParts(const TracePartList&); bool activateParts(TracePartList, bool active); @@ -1879,13 +1879,13 @@ class TraceData: public TraceCost /** * Search for item with given name and highest subcost of given cost type. * - * For some items, they will only be found if the parent cost is given: - * Instr, Line, Call => need parent of type Function - * For Function, a parent of type Obj/File/Class can be given, but + * For some items, they will only be found if the tqparent cost is given: + * Instr, Line, Call => need tqparent of type Function + * For Function, a tqparent of type Obj/File/Class can be given, but * isn't needed. */ TraceCost* search(TraceItem::CostType, TQString, - TraceCostType* ct = 0, TraceCost* parent = 0); + TraceCostType* ct = 0, TraceCost* tqparent = 0); // for pretty function names without signature if unique... TraceFunctionMap::Iterator functionIterator(TraceFunction*); @@ -1914,8 +1914,8 @@ class TraceData: public TraceCost virtual void update(); - // invalidates all cost items dependant on active state of parts - void invalidateDynamicCost(); + // tqinvalidates all cost items dependant on active state of parts + void tqinvalidateDynamicCost(); // cycle detection void updateFunctionCycles(); diff --git a/kcachegrind/kcachegrind/traceitemview.cpp b/kcachegrind/kcachegrind/traceitemview.cpp index d11f02b6..1d612ac3 100644 --- a/kcachegrind/kcachegrind/traceitemview.cpp +++ b/kcachegrind/kcachegrind/traceitemview.cpp @@ -30,10 +30,10 @@ #define TRACE_UPDATES 0 -TraceItemView::TraceItemView(TraceItemView* parentView, TopLevel* top) +TraceItemView::TraceItemView(TraceItemView* tqparentView, TopLevel* top) { - _parentView = parentView; - _topLevel = top ? top : parentView->topLevel(); + _parentView = tqparentView; + _topLevel = top ? top : tqparentView->topLevel(); _data = _newData = 0; // _partList and _newPartList is empty @@ -62,7 +62,7 @@ KConfigGroup* TraceItemView::configGroup(KConfig* c, TQString group, TQString post) { TQStringList gList = c->groupList(); - if (gList.contains((group+post).ascii()) ) group += post; + if (gList.tqcontains((group+post).ascii()) ) group += post; return new KConfigGroup(c, group); } @@ -178,7 +178,7 @@ void TraceItemView::setData(TraceData* d) { _newData = d; - // invalidate all pointers to old data + // tqinvalidate all pointers to old data _activeItem = _newActiveItem = 0; _selectedItem = _newSelectedItem = 0; _costType = _newCostType = 0; diff --git a/kcachegrind/kcachegrind/traceitemview.h b/kcachegrind/kcachegrind/traceitemview.h index f83aa896..a842a1d2 100644 --- a/kcachegrind/kcachegrind/traceitemview.h +++ b/kcachegrind/kcachegrind/traceitemview.h @@ -66,10 +66,10 @@ public: enum Direction { None, Back, Forward, Up }; - // a TraceItemView can have a position in a parent container + // a TraceItemView can have a position in a tqparent container enum Position { Hidden, Top, Right, Left, Bottom }; - TraceItemView(TraceItemView* parentView, TopLevel* top = 0); + TraceItemView(TraceItemView* tqparentView, TopLevel* top = 0); virtual ~TraceItemView() {} virtual TQString whatsThis() const; @@ -94,7 +94,7 @@ public: // Overwrite in container views to also set new data for all members. virtual void setData(TraceData* d); - // change from parent, call updateView() to update lazily (only if visible) + // change from tqparent, call updateView() to update lazily (only if visible) void setCostType(TraceCostType* t) { _newCostType = t; } void setCostType2(TraceCostType* t) { _newCostType2 = t; } void set(TraceItem::CostType g) { _newGroupType = g; } @@ -113,7 +113,7 @@ public: /** * Notification from child views. - * Default implementation notifies parent + * Default implementation notifies tqparent */ virtual void selected(TraceItemView* sender, TraceItem*); virtual void selected(TraceItemView* sender, const TracePartList&); @@ -165,7 +165,7 @@ public: void addGoMenu(TQPopupMenu*); protected: - // helpers to call selected()/activated() of parentView + // helpers to call selected()/activated() of tqparentView void selected(TraceItem*); void selected(const TracePartList&); void activated(TraceItem*); diff --git a/kcachegrind/kcachegrind/treemap.cpp b/kcachegrind/kcachegrind/treemap.cpp index fe01c796..cdc48cc8 100644 --- a/kcachegrind/kcachegrind/treemap.cpp +++ b/kcachegrind/kcachegrind/treemap.cpp @@ -51,7 +51,7 @@ StoredDrawParams::StoredDrawParams() _shaded = true; _rotated = false; - _backColor = Qt::white; + _backColor = TQt::white; // field array has size 0 } @@ -73,7 +73,7 @@ StoredDrawParams::StoredDrawParams(TQColor c, TQString StoredDrawParams::text(int f) const { if ((f<0) || (f >= (int)_field.size())) - return TQString::null; + return TQString(); return _field[f].text; } @@ -269,7 +269,7 @@ void RectDrawing::drawBack(TQPainter* p, DrawParams* dp) if (dp->shaded()) { // some shading - bool goDark = qGray(normal.rgb())>128; + bool goDark = tqGray(normal.rgb())>128; int rBase, gBase, bBase; normal.rgb(&rBase, &gBase, &bBase); p->setBrush(TQBrush::NoBrush); @@ -528,7 +528,7 @@ bool RectDrawing::drawField(TQPainter* p, int f, DrawParams* dp) } p->save(); - p->setPen( (qGray(dp->backColor().rgb())>100) ? Qt::black : Qt::white); + p->setPen( (tqGray(dp->backColor().rgb())>100) ? TQt::black : TQt::white); p->setFont(dp->font()); if (rotate) { //p->translate(r.x()+2, r.y()+r.height()); @@ -619,7 +619,7 @@ bool RectDrawing::drawField(TQPainter* p, int f, DrawParams* dp) } } else - remaining = TQString::null; + remaining = TQString(); /* truncate and add ... if needed */ if (w>width) { @@ -658,7 +658,7 @@ bool RectDrawing::drawField(TQPainter* p, int f, DrawParams* dp) p->drawText( x+pixW, y, width - pixW, h, - Qt::AlignLeft, name); + TQt::AlignLeft, name); y = isBottom ? (y-h) : (y+h); lines--; @@ -720,11 +720,11 @@ int TreeMapItemList::compareItems ( Item item1, Item item2 ) bool ascending; int result; - TreeMapItem* parent = ((TreeMapItem*)item1)->parent(); + TreeMapItem* tqparent = ((TreeMapItem*)item1)->tqparent(); // shouldn't happen - if (!parent) return 0; + if (!tqparent) return 0; - int textNo = parent->sorting(&ascending); + int textNo = tqparent->sorting(&ascending); if (textNo < 0) { double diff = ((TreeMapItem*)item1)->value() - @@ -741,25 +741,25 @@ int TreeMapItemList::compareItems ( Item item1, Item item2 ) TreeMapItem* TreeMapItemList::commonParent() { - TreeMapItem* parent, *item; - parent = first(); - if (parent) + TreeMapItem* tqparent, *item; + tqparent = first(); + if (tqparent) while( (item = next()) != 0) - parent = parent->commonParent(item); + tqparent = tqparent->commonParent(item); - return parent; + return tqparent; } // TreeMapItem -TreeMapItem::TreeMapItem(TreeMapItem* parent, double value) +TreeMapItem::TreeMapItem(TreeMapItem* tqparent, double value) { _value = value; - _parent = parent; + _parent = tqparent; _sum = 0; - _children = 0; + _tqchildren = 0; _widget = 0; _index = -1; _depth = -1; // not set @@ -767,7 +767,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value) _freeRects = 0; if (_parent) { - // take sorting from parent + // take sorting from tqparent _sortTextNo = _parent->sorting(&_sortAscending); _parent->addItem(this); } @@ -778,12 +778,12 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value) } -TreeMapItem::TreeMapItem(TreeMapItem* parent, double value, +TreeMapItem::TreeMapItem(TreeMapItem* tqparent, double value, TQString text1, TQString text2, TQString text3, TQString text4) { _value = value; - _parent = parent; + _parent = tqparent; // this resizes the text vector only if needed if (!text4.isEmpty()) setText(3, text4); @@ -792,7 +792,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value, setText(0, text1); _sum = 0; - _children = 0; + _tqchildren = 0; _widget = 0; _index = -1; _depth = -1; // not set @@ -804,7 +804,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* parent, double value, TreeMapItem::~TreeMapItem() { - if (_children) delete _children; + if (_tqchildren) delete _tqchildren; if (_freeRects) delete _freeRects; // finally, notify widget about deletion @@ -832,7 +832,7 @@ bool TreeMapItem::isChildOf(TreeMapItem* item) TreeMapItem* TreeMapItem::commonParent(TreeMapItem* item) { while (item && !isChildOf(item)) { - item = item->parent(); + item = item->tqparent(); } return item; } @@ -845,18 +845,18 @@ void TreeMapItem::redraw() void TreeMapItem::clear() { - if (_children) { + if (_tqchildren) { // delete selected items below this item from selection if (_widget) _widget->clearSelection(this); - delete _children; - _children = 0; + delete _tqchildren; + _tqchildren = 0; } } -// invalidates current children and forces redraw -// this is only usefull when children are created on demand in items() +// tqinvalidates current tqchildren and forces redraw +// this is only usefull when tqchildren are created on demand in items() void TreeMapItem::refresh() { clear(); @@ -890,9 +890,9 @@ int TreeMapItem::depth() const bool TreeMapItem::initialized() { - if (!_children) { - _children = new TreeMapItemList; - _children->setAutoDelete(true); + if (!_tqchildren) { + _tqchildren = new TreeMapItemList; + _tqchildren->setAutoDelete(true); return false; } return true; @@ -902,16 +902,16 @@ void TreeMapItem::addItem(TreeMapItem* i) { if (!i) return; - if (!_children) { - _children = new TreeMapItemList; - _children->setAutoDelete(true); + if (!_tqchildren) { + _tqchildren = new TreeMapItemList; + _tqchildren->setAutoDelete(true); } i->setParent(this); if (sorting(0) == -1) - _children->append(i); // preserve insertion order + _tqchildren->append(i); // preserve insertion order else - _children->inSort(i); + _tqchildren->inSort(i); } @@ -977,17 +977,17 @@ void TreeMapItem::setSorting(int textNo, bool ascending) _sortAscending = ascending; _sortTextNo = textNo; - if (_children && _sortTextNo != -1) _children->sort(); + if (_tqchildren && _sortTextNo != -1) _tqchildren->sort(); } void TreeMapItem::resort(bool recursive) { - if (!_children) return; + if (!_tqchildren) return; - if (_sortTextNo != -1) _children->sort(); + if (_sortTextNo != -1) _tqchildren->sort(); if (recursive) - for (TreeMapItem* i=_children->first(); i; i=_children->next()) + for (TreeMapItem* i=_tqchildren->first(); i; i=_tqchildren->next()) i->resort(recursive); } @@ -1005,13 +1005,13 @@ int TreeMapItem::rtti() const return 0; } -TreeMapItemList* TreeMapItem::children() +TreeMapItemList* TreeMapItem::tqchildren() { - if (!_children) { - _children = new TreeMapItemList; - _children->setAutoDelete(true); + if (!_tqchildren) { + _tqchildren = new TreeMapItemList; + _tqchildren->setAutoDelete(true); } - return _children; + return _tqchildren; } void TreeMapItem::clearItemRect() @@ -1075,7 +1075,7 @@ void TreeMapItem::addFreeRect(const TQRect& r) // Tooltips for TreeMapWidget -class TreeMapTip: public QToolTip +class TreeMapTip: public TQToolTip { public: TreeMapTip( TQWidget* p ):TQToolTip(p) {} @@ -1086,17 +1086,17 @@ protected: void TreeMapTip::maybeTip( const TQPoint& pos ) { - if ( !parentWidget()->inherits( "TreeMapWidget" ) ) + if ( !tqparentWidget()->inherits( "TreeMapWidget" ) ) return; - TreeMapWidget* p = (TreeMapWidget*)parentWidget(); + TreeMapWidget* p = (TreeMapWidget*)tqparentWidget(); TreeMapItem* i; i = p->item(pos.x(), pos.y()); TQPtrList<TQRect>* rList = i ? i->freeRects() : 0; if (rList) { TQRect* r; for(r=rList->first();r;r=rList->next()) - if (r->contains(pos)) + if (r->tqcontains(pos)) tip(*r, p->tipString(i)); } } @@ -1106,8 +1106,8 @@ void TreeMapTip::maybeTip( const TQPoint& pos ) // TreeMapWidget TreeMapWidget::TreeMapWidget(TreeMapItem* base, - TQWidget* parent, const char* name) - : TQWidget(parent, name) + TQWidget* tqparent, const char* name) + : TQWidget(tqparent, name) { _base = base; _base->setWidget(this); @@ -1147,8 +1147,8 @@ TreeMapWidget::TreeMapWidget(TreeMapItem* base, _lastOver = 0; _needsRefresh = _base; - setBackgroundMode(Qt::NoBackground); - setFocusPolicy(TQWidget::StrongFocus); + setBackgroundMode(TQt::NoBackground); + setFocusPolicy(TQ_StrongFocus); _tip = new TreeMapTip(this); } @@ -1278,7 +1278,7 @@ void TreeMapWidget::setMaxDrawingDepth(int d) TQString TreeMapWidget::defaultFieldType(int f) const { - return i18n("Text %1").arg(f+1); + return i18n("Text %1").tqarg(f+1); } TQString TreeMapWidget::defaultFieldStop(int) const @@ -1459,10 +1459,10 @@ void TreeMapWidget::setMinimalArea(int area) void TreeMapWidget::deletingItem(TreeMapItem* i) { // remove any references to the item to be deleted - while(_selection.findRef(i) > -1) + while(_selection.tqfindRef(i) > -1) _selection.remove(); - while(_tmpSelection.findRef(i) > -1) + while(_tmpSelection.tqfindRef(i) > -1) _tmpSelection.remove(); if (_current == i) _current = 0; @@ -1472,9 +1472,9 @@ void TreeMapWidget::deletingItem(TreeMapItem* i) // don't redraw a deleted item if (_needsRefresh == i) { - // we can savely redraw the parent, as deleting order is - // from child to parent; i.e. i->parent() is existing. - _needsRefresh = i->parent(); + // we can savely redraw the tqparent, as deleting order is + // from child to tqparent; i.e. i->tqparent() is existing. + _needsRefresh = i->tqparent(); } } @@ -1494,7 +1494,7 @@ TQString TreeMapWidget::tipString(TreeMapItem* i) const tip += itemTip; } - i = i->parent(); + i = i->tqparent(); } return tip; } @@ -1504,11 +1504,11 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const TreeMapItem* p = _base; TreeMapItem* i; - if (!rect().contains(x, y)) return 0; + if (!TQT_TQRECT_OBJECT(rect()).tqcontains(x, y)) return 0; if (DEBUG_DRAWING) kdDebug(90100) << "item(" << x << "," << y << "):" << endl; while (1) { - TreeMapItemList* list = p->children(); + TreeMapItemList* list = p->tqchildren(); if (!list) i = 0; else { @@ -1517,11 +1517,11 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const if (DEBUG_DRAWING) kdDebug(90100) << " Checking " << i->path(0).join("/") << " (" - << i->itemRect().x() << "/" << i->itemRect().y() - << "-" << i->itemRect().width() - << "x" << i->itemRect().height() << ")" << endl; + << i->tqitemRect().x() << "/" << i->tqitemRect().y() + << "-" << i->tqitemRect().width() + << "x" << i->tqitemRect().height() << ")" << endl; - if (i->itemRect().contains(x, y)) { + if (i->tqitemRect().tqcontains(x, y)) { if (DEBUG_DRAWING) kdDebug(90100) << " .. Got. Index " << idx << endl; @@ -1539,7 +1539,7 @@ TreeMapItem* TreeMapWidget::item(int x, int y) const if (DEBUG_DRAWING) kdDebug(90100) << "item(" << x << "," << y << "): Got " << p->path(0).join("/") << " (Size " - << p->itemRect().width() << "x" << p->itemRect().height() + << p->tqitemRect().width() << "x" << p->tqitemRect().height() << ", Val " << p->value() << ")" << endl; } @@ -1556,7 +1556,7 @@ TreeMapItem* TreeMapWidget::possibleSelection(TreeMapItem* i) const if (_maxSelectDepth>=0) { int depth = i->depth(); while(i && depth > _maxSelectDepth) { - i = i->parent(); + i = i->tqparent(); depth--; } } @@ -1568,16 +1568,16 @@ TreeMapItem* TreeMapWidget::visibleItem(TreeMapItem* i) const { if (i) { /* Must have a visible area */ - while(i && ((i->itemRect().width() <1) || - (i->itemRect().height() <1))) { - TreeMapItem* p = i->parent(); + while(i && ((i->tqitemRect().width() <1) || + (i->tqitemRect().height() <1))) { + TreeMapItem* p = i->tqparent(); if (!p) break; - int idx = p->children()->findRef(i); + int idx = p->tqchildren()->tqfindRef(i); idx--; if (idx<0) i = p; else - i = p->children()->at(idx); + i = p->tqchildren()->at(idx); } } return i; @@ -1622,12 +1622,12 @@ TreeMapItemList TreeMapWidget::diff(TreeMapItemList& l1, TreeMapItem* item; while ( (item = it1.current()) != 0 ) { ++it1; - if (l2.containsRef(item) > 0) continue; + if (l2.tqcontainsRef(item) > 0) continue; l.append(item); } while ( (item = it2.current()) != 0 ) { ++it2; - if (l1.containsRef(item) > 0) continue; + if (l1.tqcontainsRef(item) > 0) continue; l.append(item); } @@ -1670,13 +1670,13 @@ TreeMapItem* TreeMapWidget::setTmpSelected(TreeMapItem* item, bool selected) } -bool TreeMapWidget::clearSelection(TreeMapItem* parent) +bool TreeMapWidget::clearSelection(TreeMapItem* tqparent) { TreeMapItemList old = _selection; TreeMapItem* i=_selection.first(); while (i) { - if (i->isChildOf(parent)) { + if (i->isChildOf(tqparent)) { _selection.remove(); i = _selection.current(); } @@ -1694,12 +1694,12 @@ bool TreeMapWidget::clearSelection(TreeMapItem* parent) bool TreeMapWidget::isSelected(TreeMapItem* i) const { - return _selection.containsRef(i)>0; + return _selection.tqcontainsRef(i)>0; } bool TreeMapWidget::isTmpSelected(TreeMapItem* i) { - return _tmpSelection.containsRef(i)>0; + return _tmpSelection.tqcontainsRef(i)>0; } @@ -1764,14 +1764,14 @@ TreeMapItem* TreeMapWidget::setTmpRangeSelection(TreeMapItem* i1, TreeMapItem* commonParent = i1; while (commonParent && !i2->isChildOf(commonParent)) { i1 = commonParent; - commonParent = commonParent->parent(); + commonParent = commonParent->tqparent(); } if (!commonParent) return changed; - while (i2 && i2->parent() != commonParent) - i2 = i2->parent(); + while (i2 && i2->tqparent() != commonParent) + i2 = i2->tqparent(); if (!i2) return changed; - TreeMapItemList* list = commonParent->children(); + TreeMapItemList* list = commonParent->tqchildren(); if (!list) return changed; TreeMapItem* i = list->first(); @@ -1794,11 +1794,11 @@ void TreeMapWidget::contextMenuEvent( TQContextMenuEvent* e ) { //kdDebug(90100) << "TreeMapWidget::contextMenuEvent" << endl; - if ( receivers( TQT_SIGNAL(contextMenuRequested(TreeMapItem*, const TQPoint &)) ) ) + if ( tqreceivers( TQT_SIGNAL(contextMenuRequested(TreeMapItem*, const TQPoint &)) ) ) e->accept(); if ( e->reason() == TQContextMenuEvent::Keyboard ) { - TQRect r = (_current) ? _current->itemRect() : _base->itemRect(); + TQRect r = (_current) ? _current->tqitemRect() : _base->tqitemRect(); TQPoint p = TQPoint(r.left() + r.width()/2, r.top() + r.height()/2); emit contextMenuRequested(_current, p); } @@ -1852,7 +1852,7 @@ void TreeMapWidget::mousePressEvent( TQMouseEvent* e ) } // item under mouse always selected on right button press - if (e->button() == RightButton) { + if (e->button() == Qt::RightButton) { TreeMapItem* changed2 = setTmpSelected(item, true); if (changed2) changed = changed2->commonParent(changed); } @@ -1862,7 +1862,7 @@ void TreeMapWidget::mousePressEvent( TQMouseEvent* e ) if (changed) redraw(changed); - if (e->button() == RightButton) { + if (e->button() == Qt::RightButton) { // emit selection change if (! (_tmpSelection == _selection)) { @@ -1961,15 +1961,15 @@ void TreeMapWidget::mouseDoubleClickEvent( TQMouseEvent* e ) /* returns -1 if nothing visible found */ int nextVisible(TreeMapItem* i) { - TreeMapItem* p = i->parent(); - if (!p || p->itemRect().isEmpty()) return -1; + TreeMapItem* p = i->tqparent(); + if (!p || p->tqitemRect().isEmpty()) return -1; - int idx = p->children()->findRef(i); + int idx = p->tqchildren()->tqfindRef(i); if (idx<0) return -1; - while (idx < (int)p->children()->count()-1) { + while (idx < (int)p->tqchildren()->count()-1) { idx++; - TQRect r = p->children()->at(idx)->itemRect(); + TQRect r = p->tqchildren()->at(idx)->tqitemRect(); if (r.width()>1 && r.height()>1) return idx; } @@ -1979,15 +1979,15 @@ int nextVisible(TreeMapItem* i) /* returns -1 if nothing visible found */ int prevVisible(TreeMapItem* i) { - TreeMapItem* p = i->parent(); - if (!p || p->itemRect().isEmpty()) return -1; + TreeMapItem* p = i->tqparent(); + if (!p || p->tqitemRect().isEmpty()) return -1; - int idx = p->children()->findRef(i); + int idx = p->tqchildren()->tqfindRef(i); if (idx<0) return -1; while (idx > 0) { idx--; - TQRect r = p->children()->at(idx)->itemRect(); + TQRect r = p->tqchildren()->at(idx)->tqitemRect(); if (r.width()>1 && r.height()>1) return idx; } @@ -2050,7 +2050,7 @@ void TreeMapWidget::keyPressEvent( TQKeyEvent* e ) } TreeMapItem* old = _current, *newItem; - TreeMapItem* p = _current->parent(); + TreeMapItem* p = _current->tqparent(); bool goBack; if (_current->sorting(&goBack) == -1) { @@ -2068,24 +2068,24 @@ void TreeMapWidget::keyPressEvent( TQKeyEvent* e ) int newIdx = goBack ? nextVisible(_current) : prevVisible(_current); if (p && newIdx>=0) { p->setIndex(newIdx); - setCurrent(p->children()->at(newIdx), true); + setCurrent(p->tqchildren()->at(newIdx), true); } } else if (e->key() == Key_Right) { int newIdx = goBack ? prevVisible(_current) : nextVisible(_current); if (p && newIdx>=0) { p->setIndex(newIdx); - setCurrent(p->children()->at(newIdx), true); + setCurrent(p->tqchildren()->at(newIdx), true); } } else if (e->key() == Key_Down) { - if (_current->children() && _current->children()->count()>0) { + if (_current->tqchildren() && _current->tqchildren()->count()>0) { int newIdx = _current->index(); if (newIdx<0) - newIdx = goBack ? (_current->children()->count()-1) : 0; - if (newIdx>=(int)_current->children()->count()) - newIdx = _current->children()->count()-1; - newItem = visibleItem(_current->children()->at(newIdx)); + newIdx = goBack ? (_current->tqchildren()->count()-1) : 0; + if (newIdx>=(int)_current->tqchildren()->count()) + newIdx = _current->tqchildren()->count()-1; + newItem = visibleItem(_current->tqchildren()->at(newIdx)); setCurrent(newItem, true); } } @@ -2162,7 +2162,7 @@ void TreeMapWidget::drawTreeMap() } else { // only subitem - if (!_needsRefresh->itemRect().isValid()) return; + if (!_needsRefresh->tqitemRect().isValid()) return; } // reset cached font object; it could have been changed @@ -2173,14 +2173,14 @@ void TreeMapWidget::drawTreeMap() _needsRefresh = 0; } - bitBlt( this, 0, 0, &_pixmap, 0, 0, + bitBlt( TQT_TQPAINTDEVICE(this), 0, 0, TQT_TQPAINTDEVICE(&_pixmap), 0, 0, TQWidget::width(), TQWidget::height(), CopyROP, true); if (hasFocus()) { TQPainter p(this); - style().drawPrimitive( TQStyle::PE_FocusRect, &p, + tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, TQRect(0, 0, TQWidget::width(), TQWidget::height()), - colorGroup() ); + tqcolorGroup() ); } } @@ -2210,7 +2210,7 @@ void TreeMapWidget::drawItem(TQPainter* p, TreeMapItem* i; if (_markNo>0) { - for(i = item;i;i=i->parent()) + for(i = item;i;i=i->tqparent()) if (i->isMarked(_markNo)) break; isSelected = (i!=0); @@ -2226,7 +2226,7 @@ void TreeMapWidget::drawItem(TQPainter* p, int dd = item->depth(); if (isTransparent(dd)) return; - RectDrawing d(item->itemRect()); + RectDrawing d(item->tqitemRect()); item->setSelected(isSelected); item->setCurrent(isCurrent); item->setShaded(_shading); @@ -2261,25 +2261,25 @@ void TreeMapWidget::drawItems(TQPainter* p, { if (DEBUG_DRAWING) kdDebug(90100) << "+drawItems(" << item->path(0).join("/") << ", " - << item->itemRect().x() << "/" << item->itemRect().y() - << "-" << item->itemRect().width() << "x" - << item->itemRect().height() << "), Val " << item->value() + << item->tqitemRect().x() << "/" << item->tqitemRect().y() + << "-" << item->tqitemRect().width() << "x" + << item->tqitemRect().height() << "), Val " << item->value() << ", Sum " << item->sum() << endl; drawItem(p, item); item->clearFreeRects(); - TQRect origRect = item->itemRect(); + TQRect origRect = item->tqitemRect(); int bw = item->borderWidth(); TQRect r = TQRect(origRect.x()+bw, origRect.y()+bw, origRect.width()-2*bw, origRect.height()-2*bw); - TreeMapItemList* list = item->children(); + TreeMapItemList* list = item->tqchildren(); TreeMapItem* i; bool stopDrawing = false; - // only subdivide if there are children + // only subdivide if there are tqchildren if (!list || list->count()==0) stopDrawing = true; @@ -2312,12 +2312,12 @@ void TreeMapWidget::drawItems(TQPainter* p, if (stopDrawing) { if (list) { - // invalidate rects + // tqinvalidate rects for (i=list->first();i;i=list->next()) i->clearItemRect(); } // tooltip apears on whole item rect - item->addFreeRect(item->itemRect()); + item->addFreeRect(item->tqitemRect()); // if we have space for text... if ((r.height() < _fontHeight) || (r.width() < _fontHeight)) return; @@ -2428,7 +2428,7 @@ void TreeMapWidget::drawItems(TQPainter* p, r.setRect(r.x(), r.y()+sr.height(), r.width(), r.height()-sr.height()); } - // set selfRect (not occupied by children) for tooltip + // set selfRect (not occupied by tqchildren) for tooltip item->addFreeRect(sr); if (0) kdDebug(90100) << "Item " << item->path(0).join("/") << ": SelfR " @@ -2566,16 +2566,16 @@ void TreeMapWidget::drawItems(TQPainter* p, kdDebug(90100) << "-drawItems(" << item->path(0).join("/") << ")" << endl; } -// fills area with a pattern if to small to draw children +// fills area with a pattern if to small to draw tqchildren void TreeMapWidget::drawFill(TreeMapItem* i, TQPainter* p, TQRect& r) { - p->setBrush(Qt::Dense4Pattern); - p->setPen(Qt::NoPen); + p->setBrush(TQt::Dense4Pattern); + p->setPen(TQt::NoPen); p->drawRect(r); i->addFreeRect(r); } -// fills area with a pattern if to small to draw children +// fills area with a pattern if to small to draw tqchildren void TreeMapWidget::drawFill(TreeMapItem* i, TQPainter* p, TQRect& r, TreeMapItemListIterator it, int len, bool goBack) { @@ -2584,8 +2584,8 @@ void TreeMapWidget::drawFill(TreeMapItem* i, TQPainter* p, TQRect& r, << "-" << r.width() << "x" << r.height() << ", len " << len << ")" << endl; - p->setBrush(Qt::Dense4Pattern); - p->setPen(Qt::NoPen); + p->setBrush(TQt::Dense4Pattern); + p->setPen(TQt::NoPen); p->drawRect(r); i->addFreeRect(r); @@ -2874,10 +2874,10 @@ void TreeMapWidget::addVisualizationItems(TQPopupMenu* popup, int id) popup->insertItem(i18n("Border"), bpopup, id+1); bpopup->insertItem(i18n("Correct Borders Only"), id+2); bpopup->insertSeparator(); - bpopup->insertItem(i18n("Width %1").arg(0), id+3); - bpopup->insertItem(i18n("Width %1").arg(1), id+4); - bpopup->insertItem(i18n("Width %1").arg(2), id+5); - bpopup->insertItem(i18n("Width %1").arg(3), id+6); + bpopup->insertItem(i18n("Width %1").tqarg(0), id+3); + bpopup->insertItem(i18n("Width %1").tqarg(1), id+4); + bpopup->insertItem(i18n("Width %1").tqarg(2), id+5); + bpopup->insertItem(i18n("Width %1").tqarg(3), id+6); bpopup->setItemChecked(id+2, skipIncorrectBorder()); bpopup->setItemChecked(id+3, borderWidth()==0); bpopup->setItemChecked(id+4, borderWidth()==1); @@ -2935,7 +2935,7 @@ void TreeMapWidget::selectionActivated(int id) TreeMapItem* i = _menuItem; id -= _selectionID; while (id>0 && i) { - i=i->parent(); + i=i->tqparent(); id--; } if (i) @@ -2957,18 +2957,18 @@ void TreeMapWidget::addSelectionItems(TQPopupMenu* popup, TQString name = i->text(0); if (name.isEmpty()) break; popup->insertItem(i->text(0), id++); - i = i->parent(); + i = i->tqparent(); } } void TreeMapWidget::fieldStopActivated(int id) { - if (id == _fieldStopID) setFieldStop(0, TQString::null); + if (id == _fieldStopID) setFieldStop(0, TQString()); else { TreeMapItem* i = _menuItem; id -= _fieldStopID+1; while (id>0 && i) { - i=i->parent(); + i=i->tqparent(); id--; } if (i) @@ -2984,7 +2984,7 @@ void TreeMapWidget::addFieldStopItems(TQPopupMenu* popup, connect(popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(fieldStopActivated(int))); - popup->insertItem(i18n("No %1 Limit").arg(fieldType(0)), id); + popup->insertItem(i18n("No %1 Limit").tqarg(fieldType(0)), id); popup->setItemChecked(id, fieldStop(0).isEmpty()); _menuItem = i; bool foundFieldStop = false; @@ -3000,7 +3000,7 @@ void TreeMapWidget::addFieldStopItems(TQPopupMenu* popup, popup->setItemChecked(id, true); foundFieldStop = true; } - i = i->parent(); + i = i->tqparent(); } } @@ -3043,7 +3043,7 @@ void TreeMapWidget::addAreaStopItems(TQPopupMenu* popup, int area = i->width() * i->height(); popup->insertSeparator(); popup->insertItem(i18n("Area of '%1' (%2)") - .arg(i->text(0)).arg(area), id+1); + .tqarg(i->text(0)).tqarg(area), id+1); if (area == minimalArea()) { popup->setItemChecked(id+1, true); foundArea = true; @@ -3069,9 +3069,9 @@ void TreeMapWidget::addAreaStopItems(TQPopupMenu* popup, } popup->insertItem(i18n("Double Area Limit (to %1)") - .arg(minimalArea()*2), id+5); + .tqarg(minimalArea()*2), id+5); popup->insertItem(i18n("Halve Area Limit (to %1)") - .arg(minimalArea()/2), id+6); + .tqarg(minimalArea()/2), id+6); } } @@ -3105,7 +3105,7 @@ void TreeMapWidget::addDepthStopItems(TQPopupMenu* popup, int d = i->depth(); popup->insertSeparator(); popup->insertItem(i18n("Depth of '%1' (%2)") - .arg(i->text(0)).arg(d), id+1); + .tqarg(i->text(0)).tqarg(d), id+1); if (d == maxDrawingDepth()) { popup->setItemChecked(id+1, true); foundDepth = true; @@ -3115,14 +3115,14 @@ void TreeMapWidget::addDepthStopItems(TQPopupMenu* popup, if (maxDrawingDepth()>1) { popup->insertSeparator(); if (!foundDepth) { - popup->insertItem(i18n("Depth %1").arg(maxDrawingDepth()), id+10); + popup->insertItem(i18n("Depth %1").tqarg(maxDrawingDepth()), id+10); popup->setItemChecked(id+10, true); } popup->insertItem(i18n("Decrement (to %1)") - .arg(maxDrawingDepth()-1), id+2); + .tqarg(maxDrawingDepth()-1), id+2); popup->insertItem(i18n("Increment (to %1)") - .arg(maxDrawingDepth()+1), id+3); + .tqarg(maxDrawingDepth()+1), id+3); } } @@ -3145,13 +3145,13 @@ void TreeMapWidget::saveOptions(KConfigGroup* config, TQString prefix) int f, fCount = _attr.size(); config->writeEntry(prefix+"FieldCount", fCount); for (f=0;f<fCount;f++) { - config->writeEntry(TQString(prefix+"FieldVisible%1").arg(f), + config->writeEntry(TQString(prefix+"FieldVisible%1").tqarg(f), _attr[f].visible); - config->writeEntry(TQString(prefix+"FieldForced%1").arg(f), + config->writeEntry(TQString(prefix+"FieldForced%1").tqarg(f), _attr[f].forced); - config->writeEntry(TQString(prefix+"FieldStop%1").arg(f), + config->writeEntry(TQString(prefix+"FieldStop%1").tqarg(f), _attr[f].stop); - config->writeEntry(TQString(prefix+"FieldPosition%1").arg(f), + config->writeEntry(TQString(prefix+"FieldPosition%1").tqarg(f), fieldPositionString(f)); } } @@ -3195,18 +3195,18 @@ void TreeMapWidget::restoreOptions(KConfigGroup* config, TQString prefix) int f; for (f=0;f<num;f++) { - str = TQString(prefix+"FieldVisible%1").arg(f); + str = TQString(prefix+"FieldVisible%1").tqarg(f); if (config->hasKey(str)) setFieldVisible(f, config->readBoolEntry(str)); - str = TQString(prefix+"FieldForced%1").arg(f); + str = TQString(prefix+"FieldForced%1").tqarg(f); if (config->hasKey(str)) setFieldForced(f, config->readBoolEntry(str)); - str = config->readEntry(TQString(prefix+"FieldStop%1").arg(f)); + str = config->readEntry(TQString(prefix+"FieldStop%1").tqarg(f)); setFieldStop(f, str); - str = config->readEntry(TQString(prefix+"FieldPosition%1").arg(f)); + str = config->readEntry(TQString(prefix+"FieldPosition%1").tqarg(f)); if (!str.isEmpty()) setFieldPosition(f, str); } } diff --git a/kcachegrind/kcachegrind/treemap.h b/kcachegrind/kcachegrind/treemap.h index 289610bb..9c936cbd 100644 --- a/kcachegrind/kcachegrind/treemap.h +++ b/kcachegrind/kcachegrind/treemap.h @@ -81,7 +81,7 @@ public: virtual int maxLines(int) const { return 0; } virtual int fieldCount() const { return 0; } - virtual TQColor backColor() const { return Qt::white; } + virtual TQColor backColor() const { return TQt::white; } virtual const TQFont& font() const = 0; virtual bool selected() const { return false; } @@ -222,7 +222,7 @@ typedef TQPtrListIterator<TreeMapItem> TreeMapItemListIterator; * * If you want more flexibility, reimplement TreeMapItem and * override the corresponding methods. For dynamic creation of child - * items on demand, reimplement children(). + * items on demand, reimplement tqchildren(). */ class TreeMapItem: public StoredDrawParams { @@ -234,20 +234,20 @@ public: * longest side of rectangle left for drawing * Best: Choose split direction for all subitems of an area * depending on longest side - * HAlternate: Horizontal at top; alternate direction on depth step - * VAlternate: Vertical at top; alternate direction on depth step - * Horizontal: Always horizontal split direction - * Vertical: Always vertical split direction + * HAlternate:Qt::Horizontal at top; alternate direction on depth step + * VAlternate:Qt::Vertical at top; alternate direction on depth step + * Qt::Horizontal: Always horizontal split direction + * Qt::Vertical: Always vertical split direction */ enum SplitMode { Bisection, Columns, Rows, AlwaysBest, Best, HAlternate, VAlternate, Horizontal, Vertical }; - TreeMapItem(TreeMapItem* parent = 0, double value = 1.0 ); - TreeMapItem(TreeMapItem* parent, double value, - TQString text1, TQString text2 = TQString::null, - TQString text3 = TQString::null, TQString text4 = TQString::null); + TreeMapItem(TreeMapItem* tqparent = 0, double value = 1.0 ); + TreeMapItem(TreeMapItem* tqparent, double value, + TQString text1, TQString text2 = TQString(), + TQString text3 = TQString(), TQString text4 = TQString()); virtual ~TreeMapItem(); bool isChildOf(TreeMapItem*); @@ -257,7 +257,7 @@ public: // force a redraw of this item void redraw(); - // delete all children + // delete all tqchildren void clear(); // force new child generation & refresh @@ -268,9 +268,9 @@ public: bool initialized(); /** - * Adds an item to a parent. + * Adds an item to a tqparent. * When no sorting is used, the item is appended (drawn at bottom). - * This is only needed if the parent was not already specified in the + * This is only needed if the tqparent was not already specified in the * construction of the item. */ void addItem(TreeMapItem*); @@ -289,7 +289,7 @@ public: /** * Parent Item */ - TreeMapItem* parent() const { return _parent; } + TreeMapItem* tqparent() const { return _parent; } /** * Temporary rectangle used for drawing this item the last time. @@ -297,7 +297,7 @@ public: */ void setItemRect(const TQRect& r) { _rect = r; } void clearItemRect(); - const TQRect& itemRect() const { return _rect; } + const TQRect& tqitemRect() const { return _rect; } int width() const { return _rect.width(); } int height() const { return _rect.height(); } @@ -328,7 +328,7 @@ public: virtual double sum() const; virtual double value() const; - // replace "Default" position with setting from TreeMapWidget + // tqreplace "Default" position with setting from TreeMapWidget virtual Position position(int) const; virtual const TQFont& font() const; virtual bool isMarked(int) const; @@ -350,7 +350,7 @@ public: * For value() sorting, use <textNo> = -2 * * For fast sorting, set this to -1 before child insertions and call - * again after inserting all children. + * again after inserting all tqchildren. */ void setSorting(int textNo, bool ascending = true); @@ -358,18 +358,18 @@ public: * Resort according to the already set sorting. * * This has to be done if the sorting base changes (e.g. text or values - * change). If this is only true for the children of this item, you can + * change). If this is only true for the tqchildren of this item, you can * set the recursive parameter to false. */ void resort(bool recursive = true); virtual SplitMode splitMode() const; virtual int rtti() const; - // not const as this can create children on demand - virtual TreeMapItemList* children(); + // not const as this can create tqchildren on demand + virtual TreeMapItemList* tqchildren(); protected: - TreeMapItemList* _children; + TreeMapItemList* _tqchildren; double _sum, _value; private: @@ -379,7 +379,7 @@ private: int _sortTextNo; bool _sortAscending; - // temporary layout + // temporary tqlayout TQRect _rect; TQPtrList<TQRect>* _freeRects; int _depth; @@ -396,19 +396,20 @@ private: * Class for visualization of a metric of hierarchically * nested items as 2D areas. */ -class TreeMapWidget: public QWidget +class TreeMapWidget: public TQWidget { Q_OBJECT + TQ_OBJECT public: /** - * Same as in QListBox/QListView + * Same as in TQListBox/TQListView */ enum SelectionMode { Single, Multi, Extended, NoSelection }; /* The widget becomes owner of the base item */ - TreeMapWidget(TreeMapItem* base, TQWidget* parent=0, const char* name=0); + TreeMapWidget(TreeMapItem* base, TQWidget* tqparent=0, const char* name=0); ~TreeMapWidget(); /** @@ -435,7 +436,7 @@ public: /** * Returns the item possible for selection. this returns the - * given item itself or a parent thereof, + * given item itself or a tqparent thereof, * depending on setting of maxSelectDepth(). */ TreeMapItem* possibleSelection(TreeMapItem*) const; @@ -443,7 +444,7 @@ public: /** * Selects or unselects an item. * In multiselection mode, the constrain that a selected item - * has no selected children or parents stays true. + * has no selected tqchildren or tqparents stays true. */ void setSelected(TreeMapItem*, bool selected = true); @@ -459,19 +460,19 @@ public: void setMarked(int markNo = 1, bool redraw = true); /** - * Clear selection of all selected items which are children of - * parent. When parent == 0, clears whole selection + * Clear selection of all selected items which are tqchildren of + * tqparent. When tqparent == 0, clears whole selection * Returns true if selection changed. */ - bool clearSelection(TreeMapItem* parent = 0); + bool clearSelection(TreeMapItem* tqparent = 0); /** * Selects or unselects items in a range. * This is needed internally for Shift-Click in Extented mode. * Range means for a hierarchical widget: * - select/unselect i1 and i2 according selected - * - search common parent of i1 and i2, and select/unselect the - * range of direct children between but excluding the child + * - search common tqparent of i1 and i2, and select/unselect the + * range of direct tqchildren between but excluding the child * leading to i1 and the child leading to i2. */ void setRangeSelection(TreeMapItem* i1, @@ -531,15 +532,15 @@ public: void setVisibleWidth(int width, bool reuseSpace = false); /** - * If a children value() is almost the parents sum(), + * If a tqchildren value() is almost the tqparents sum(), * it can happen that the border to be drawn for visibilty of * nesting relations takes to much space, and the - * parent/child size relation can not be mapped to a correct + * tqparent/child size relation can not be mapped to a correct * area size relation. * * Either * (1) Ignore the incorrect drawing, or - * (2) Skip drawing of the parent level alltogether. + * (2) Skip drawing of the tqparent level alltogether. */ void setSkipIncorrectBorder(bool enable = true); bool skipIncorrectBorder() const { return _skipIncorrectBorder; } @@ -613,8 +614,8 @@ public: /** * Save/restore options. */ - void saveOptions(KConfigGroup*, TQString prefix = TQString::null); - void restoreOptions(KConfigGroup*, TQString prefix = TQString::null); + void saveOptions(KConfigGroup*, TQString prefix = TQString()); + void restoreOptions(KConfigGroup*, TQString prefix = TQString()); /** * These functions populate given popup menus. @@ -643,7 +644,7 @@ public: virtual TQString tipString(TreeMapItem* i) const; /** - * Redraws an item with all children. + * Redraws an item with all tqchildren. * This takes changed values(), sums(), colors() and text() into account. */ void redraw(TreeMapItem*); diff --git a/kcachegrind/kcachegrind/utils.h b/kcachegrind/kcachegrind/utils.h index 7256f054..06052a61 100644 --- a/kcachegrind/kcachegrind/utils.h +++ b/kcachegrind/kcachegrind/utils.h @@ -86,7 +86,7 @@ class FixString { bool stripInt64(int64&, bool stripSpaces = true); operator TQString() const - { return TQString::fromLatin1(_str,_len); } + { return TQString::tqfromLatin1(_str,_len); } private: const char* _str; diff --git a/kdeaccounts-plugin/kdeaccountsformat.cpp b/kdeaccounts-plugin/kdeaccountsformat.cpp index fc9f2cb3..8641fc2f 100644 --- a/kdeaccounts-plugin/kdeaccountsformat.cpp +++ b/kdeaccounts-plugin/kdeaccountsformat.cpp @@ -54,12 +54,12 @@ bool KDEAccountsFormat::loadAll( KABC::AddressBook *book, TQString name; TQString email; - int firstSpace = line.find( delim ); + int firstSpace = line.tqfind( delim ); if ( firstSpace > 0 ) { nickName = line.left( firstSpace ); - int lastSpace = line.findRev( delim ); + int lastSpace = line.tqfindRev( delim ); if ( lastSpace > firstSpace ) { email = line.mid( lastSpace +1 ); diff --git a/kfile-plugins/c++/kfile_cpp.cpp b/kfile-plugins/c++/kfile_cpp.cpp index 0840ab7f..59f4fa7e 100644 --- a/kfile-plugins/c++/kfile_cpp.cpp +++ b/kfile-plugins/c++/kfile_cpp.cpp @@ -31,9 +31,9 @@ typedef KGenericFactory<KCppPlugin> CppFactory; K_EXPORT_COMPONENT_FACTORY(kfile_cpp, CppFactory("kfile_cpp")) -KCppPlugin::KCppPlugin(TQObject *parent, const char *name, +KCppPlugin::KCppPlugin(TQObject *tqparent, const char *name, const TQStringList &args) - : KFilePlugin(parent, name, args) + : KFilePlugin(tqparent, name, args) { kdDebug(7034) << "c++ plugin\n"; makeMimeTypeInfo("text/x-c++src"); @@ -94,25 +94,25 @@ bool KCppPlugin::readInfo( KFileMetaInfo& info, uint ) continue; } - if (line.contains("/*")) inComment = true; + if (line.tqcontains("/*")) inComment = true; if (!inComment) { codeLines++; - if (line.contains(TQRegExp("^\\s*#\\s*include"))) Includes++; + if (line.tqcontains(TQRegExp("^\\s*#\\s*include"))) Includes++; - int pos = line.find("//"); + int pos = line.tqfind("//"); if (pos>=0) commentLines++; // truncate the comment - we don't want to count strings in it line.truncate(pos); - Strings+=line.contains(TQRegExp("\".*\"")); - Stringsi18n+=line.contains(TQRegExp("(?:i18n|I18N_NOOP)\\s*\\(")); + Strings+=line.tqcontains(TQRegExp("\".*\"")); + Stringsi18n+=line.tqcontains(TQRegExp("(?:i18n|I18N_NOOP)\\s*\\(")); } else commentLines++; - if (line.contains("*/")) inComment = false; + if (line.tqcontains("*/")) inComment = false; } KFileMetaInfoGroup group = appendGroup(info, "General"); diff --git a/kfile-plugins/c++/kfile_cpp.h b/kfile-plugins/c++/kfile_cpp.h index ef0c2083..40072797 100644 --- a/kfile-plugins/c++/kfile_cpp.h +++ b/kfile-plugins/c++/kfile_cpp.h @@ -28,9 +28,10 @@ class TQStringList; class KCppPlugin: public KFilePlugin { Q_OBJECT + TQ_OBJECT public: - KCppPlugin(TQObject *parent, const char *name, const TQStringList& args); + KCppPlugin(TQObject *tqparent, const char *name, const TQStringList& args); virtual bool readInfo(KFileMetaInfo& info, uint what); private: diff --git a/kfile-plugins/diff/kfile_diff.cpp b/kfile-plugins/diff/kfile_diff.cpp index 957d0574..1d8b832e 100644 --- a/kfile-plugins/diff/kfile_diff.cpp +++ b/kfile-plugins/diff/kfile_diff.cpp @@ -44,9 +44,9 @@ K_EXPORT_COMPONENT_FACTORY(kfile_diff, KGenericFactory<KDiffPlugin>("kfile_diff")) -KDiffPlugin::KDiffPlugin(TQObject *parent, const char *name, +KDiffPlugin::KDiffPlugin(TQObject *tqparent, const char *name, const TQStringList &preferredItems) - : KFilePlugin(parent, name, preferredItems) + : KFilePlugin(tqparent, name, preferredItems) { kdDebug(7034) << "diff plugin" << endl; @@ -210,25 +210,25 @@ enum KDiffPlugin::Format KDiffPlugin::determineDiffFormat( const TQStringList li while ( it != lines.end() ) { line = (*it); - if ( line.find( TQRegExp( "^[0-9]+[0-9,]*[acd][0-9]+[0-9,]*$" ), 0 ) == 0 ) + if ( line.tqfind( TQRegExp( "^[0-9]+[0-9,]*[acd][0-9]+[0-9,]*$" ), 0 ) == 0 ) { return KDiffPlugin::Normal; } - else if ( line.find( TQRegExp( "^--- " ), 0 ) == 0 ) + else if ( line.tqfind( TQRegExp( "^--- " ), 0 ) == 0 ) { // unified has first a '^--- ' line, then a '^+++ ' line return KDiffPlugin::Unified; } - else if ( line.find( TQRegExp( "^\\*\\*\\* [^\\t]+\\t" ), 0 ) == 0 ) + else if ( line.tqfind( TQRegExp( "^\\*\\*\\* [^\\t]+\\t" ), 0 ) == 0 ) { // context has first a '^*** ' line, then a '^--- ' line return KDiffPlugin::Context; } - else if ( line.find( TQRegExp( "^[acd][0-9]+ [0-9]+" ), 0 ) == 0 ) + else if ( line.tqfind( TQRegExp( "^[acd][0-9]+ [0-9]+" ), 0 ) == 0 ) { return KDiffPlugin::RCS; } - else if ( line.find( TQRegExp( "^[0-9]+[0-9,]*[acd]" ), 0 ) == 0 ) + else if ( line.tqfind( TQRegExp( "^[0-9]+[0-9,]*[acd]" ), 0 ) == 0 ) { return KDiffPlugin::Ed; } diff --git a/kfile-plugins/diff/kfile_diff.h b/kfile-plugins/diff/kfile_diff.h index a53d89bb..36b9f13b 100644 --- a/kfile-plugins/diff/kfile_diff.h +++ b/kfile-plugins/diff/kfile_diff.h @@ -25,9 +25,10 @@ class TQStringList; class KDiffPlugin: public KFilePlugin { Q_OBJECT + TQ_OBJECT public: - KDiffPlugin( TQObject *parent, const char *name, + KDiffPlugin( TQObject *tqparent, const char *name, const TQStringList& preferredItems ); diff --git a/kfile-plugins/ts/kfile_ts.cpp b/kfile-plugins/ts/kfile_ts.cpp index 0d6f5dc1..e027fda6 100644 --- a/kfile-plugins/ts/kfile_ts.cpp +++ b/kfile-plugins/ts/kfile_ts.cpp @@ -29,8 +29,8 @@ typedef KGenericFactory<KTsPlugin> TsFactory; K_EXPORT_COMPONENT_FACTORY(kfile_ts, TsFactory("kfile_ts")) -KTsPlugin::KTsPlugin(TQObject *parent, const char *name, - const TQStringList &args) : KFilePlugin(parent, name, args) +KTsPlugin::KTsPlugin(TQObject *tqparent, const char *name, + const TQStringList &args) : KFilePlugin(tqparent, name, args) { makeMimeTypeInfo( "application/x-linguist" ); } @@ -66,18 +66,18 @@ bool KTsPlugin::readInfo(KFileMetaInfo& info, uint) TQString line = stream.readLine(); // is it really a linguist file? - if (!line.contains("<!DOCTYPE TS>", false)) + if (!line.tqcontains("<!DOCTYPE TS>", false)) return false; while (!stream.eof()) { line = stream.readLine(); - if (line.contains("type=\"obsolete\"")) obsolete++; + if (line.tqcontains("type=\"obsolete\"")) obsolete++; - if (line.contains("<source>")) messages++; + if (line.tqcontains("<source>")) messages++; - if (line.contains("type=\"unfinished\"")) untranslated++; + if (line.tqcontains("type=\"unfinished\"")) untranslated++; } diff --git a/kfile-plugins/ts/kfile_ts.h b/kfile-plugins/ts/kfile_ts.h index 930de46e..65941e47 100644 --- a/kfile-plugins/ts/kfile_ts.h +++ b/kfile-plugins/ts/kfile_ts.h @@ -27,9 +27,10 @@ class TQStringList; class KTsPlugin: public KFilePlugin { Q_OBJECT + TQ_OBJECT public: - KTsPlugin(TQObject *parent, const char *name, const TQStringList& args); + KTsPlugin(TQObject *tqparent, const char *name, const TQStringList& args); virtual bool readInfo(KFileMetaInfo& info, uint what); private: diff --git a/kioslave/svn/ksvnd/commitdlg.ui b/kioslave/svn/ksvnd/commitdlg.ui index 7425e5c9..da6f4978 100644 --- a/kioslave/svn/ksvnd/commitdlg.ui +++ b/kioslave/svn/ksvnd/commitdlg.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>CommitDlg</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>CommitDlg</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,9 +19,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <vbox> <property name="name"> @@ -40,9 +40,9 @@ <bool>true</bool> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -58,14 +58,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>220</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pushButton1</cstring> </property> @@ -73,7 +73,7 @@ <string>&OK</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pushButton2</cstring> </property> @@ -105,10 +105,10 @@ <include location="local" impldecl="in implementation">commitdlg.ui.h</include> </includes> <functions> - <function>setLog( const QString & comment )</function> - <function returnType="QString">logMessage() const</function> + <function>setLog( const TQString & comment )</function> + <function returnType="TQString">logMessage() const</function> </functions> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>ktextedit.h</includehint> <includehint>ktextedit.h</includehint> diff --git a/kioslave/svn/ksvnd/ksvnd.cpp b/kioslave/svn/ksvnd/ksvnd.cpp index 5da4d9d9..82777818 100644 --- a/kioslave/svn/ksvnd/ksvnd.cpp +++ b/kioslave/svn/ksvnd/ksvnd.cpp @@ -50,7 +50,7 @@ TQString KSvnd::commitDialog(TQString modifiedFiles) { if ( result == TQDialog::Accepted ) { return commitDlg.logMessage(); } else - return TQString::null; + return TQString(); } bool KSvnd::AreAnyFilesInSvn( const KURL::List& wclist ) { @@ -196,9 +196,9 @@ bool KSvnd::anyValidWorkingCopy( const KURL::List& wclist ) { return false; } -int KSvnd::getStatus( const KURL::List& list ) { +int KSvnd::gettqStatus( const KURL::List& list ) { int result = 0; - uint files = 0, folders = 0, parentsentries = 0, parentshavesvn = 0, subdirhavesvn = 0, external = 0; + uint files = 0, folders = 0, tqparentsentries = 0, tqparentshavesvn = 0, subdirhavesvn = 0, external = 0; for ( TQValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) { if ( isFolder ( ( *it ) ) ) { folders++; @@ -206,7 +206,7 @@ int KSvnd::getStatus( const KURL::List& list ) { files++; } if ( isFileInSvnEntries ( (*it).filename(),( *it ).directory() + "/.svn/entries" ) ) { // normal subdir known in the working copy - parentsentries++; + tqparentsentries++; } else if ( isFolder( *it ) ) { // other subfolders (either another module checkouted or an external, or something not known at all) if ( TQFile::exists( ( *it ).path() + "/.svn/entries" ) ) subdirhavesvn++; @@ -214,8 +214,8 @@ int KSvnd::getStatus( const KURL::List& list ) { external++; } } - if ( ( isFolder( ( *it ) ) && TQFile::exists( ( *it ).directory() + "../.svn/entries" ) ) || TQFile::exists( ( *it ).directory() + "/.svn/entries" ) ) //parent has a .svn ? - parentshavesvn++; + if ( ( isFolder( ( *it ) ) && TQFile::exists( ( *it ).directory() + "../.svn/entries" ) ) || TQFile::exists( ( *it ).directory() + "/.svn/entries" ) ) //tqparent has a .svn ? + tqparentshavesvn++; } if ( files > 0 ) result |= SomeAreFiles; @@ -225,15 +225,15 @@ int KSvnd::getStatus( const KURL::List& list ) { } if ( folders > 0 ) result |= SomeAreFolders; - if ( parentsentries == list.count() ) { + if ( tqparentsentries == list.count() ) { result |= AllAreInParentsEntries; result |= SomeAreInParentsEntries; - } else if ( parentsentries != 0 ) + } else if ( tqparentsentries != 0 ) result |= SomeAreInParentsEntries; - if ( parentshavesvn == list.count() ) { + if ( tqparentshavesvn == list.count() ) { result |= AllParentsHaveSvn; result |= SomeParentsHaveSvn; - } else if ( parentshavesvn > 0 ) + } else if ( tqparentshavesvn > 0 ) result |= SomeParentsHaveSvn; if ( subdirhavesvn == list.count() ) { result |= AllHaveSvn; @@ -256,18 +256,18 @@ bool KSvnd::isFolder( const KURL& url ) { TQStringList KSvnd::getActionMenu ( const KURL::List &list ) { TQStringList result; - int listStatus = getStatus( list ); + int listtqStatus = gettqStatus( list ); - if ( !(listStatus & SomeAreInParentsEntries) && - !(listStatus & SomeAreExternalToParent) && - !(listStatus & SomeHaveSvn)) { - if( list.size() == 1 && listStatus & SomeAreFolders) { + if ( !(listtqStatus & SomeAreInParentsEntries) && + !(listtqStatus & SomeAreExternalToParent) && + !(listtqStatus & SomeHaveSvn)) { + if( list.size() == 1 && listtqStatus & SomeAreFolders) { result << "Checkout"; result << "Export"; // result << "CreateRepository"; result << "Import"; } - } else if ( (listStatus & AllAreInParentsEntries) ) { + } else if ( (listtqStatus & AllAreInParentsEntries) ) { result << "Diff"; //In SVN // result << "ShowLog"; @@ -277,7 +277,7 @@ TQStringList KSvnd::getActionMenu ( const KURL::List &list ) { // result << "Update to revision..." result << "Rename"; result << "Delete"; - if( listStatus & SomeAreFolders && !(listStatus & SomeAreFiles)) { + if( listtqStatus & SomeAreFolders && !(listtqStatus & SomeAreFiles)) { result << "Revert"; // result << "Cleanup"; } @@ -285,19 +285,19 @@ TQStringList KSvnd::getActionMenu ( const KURL::List &list ) { // result << "BranchTag"; result << "Switch"; result << "Merge"; - if( listStatus & SomeAreFolders && !(listStatus & SomeAreFiles)) { + if( listtqStatus & SomeAreFolders && !(listtqStatus & SomeAreFiles)) { // result << "Export"; // result << "Relocate"; result << "_SEPARATOR_"; result << "Add"; } result << "_SEPARATOR_"; - if( listStatus & SomeAreFiles && !(listStatus & SomeAreFolders)) { + if( listtqStatus & SomeAreFiles && !(listtqStatus & SomeAreFolders)) { result << "Blame"; } result << "CreatePatch"; - if( list.size() == 1 && listStatus & SomeAreFolders) { + if( list.size() == 1 && listtqStatus & SomeAreFolders) { // result << "ApplyPatchToFolder"; } } @@ -306,12 +306,12 @@ TQStringList KSvnd::getActionMenu ( const KURL::List &list ) { TQStringList KSvnd::getTopLevelActionMenu ( const KURL::List &list ) { TQStringList result; - int listStatus = getStatus( list ); + int listtqStatus = gettqStatus( list ); - if ( ( listStatus & AllParentsHaveSvn && - ( ( listStatus & SomeAreExternalToParent ) || ( listStatus & SomeAreInParentsEntries ) ) - || ( listStatus & SomeHaveSvn ) ) + if ( ( listtqStatus & AllParentsHaveSvn && + ( ( listtqStatus & SomeAreExternalToParent ) || ( listtqStatus & SomeAreInParentsEntries ) ) + || ( listtqStatus & SomeHaveSvn ) ) ) { result << "Update"; result << "Commit"; @@ -339,7 +339,7 @@ void KSvnd::status(const TQString& path, int text_status, int prop_status, int r TQDataStream stream(params, IO_WriteOnly); stream << path << text_status << prop_status << repos_text_status << repos_prop_status << rev; - emitDCOPSignal( "subversionStatus(TQString,int,int,int,int,long int)", params ); + emitDCOPSignal( "subversiontqStatus(TQString,int,int,int,int,long int)", params ); } void KSvnd::popupMessage( const TQString& message ) { diff --git a/kioslave/svn/ksvnd/ksvnd.h b/kioslave/svn/ksvnd/ksvnd.h index edb1073e..78583e02 100644 --- a/kioslave/svn/ksvnd/ksvnd.h +++ b/kioslave/svn/ksvnd/ksvnd.h @@ -29,9 +29,10 @@ class KSvnd : public KDEDModule { Q_OBJECT +// TQ_OBJECT K_DCOP - //note: InSVN means parent is added. InRepos means itself is added + //note: InSVN means tqparent is added. InRepos means itself is added enum { SomeAreFiles = 1, SomeAreFolders = 2, SomeAreInParentsEntries = 4, SomeParentsHaveSvn = 8, SomeHaveSvn = 16, SomeAreExternalToParent = 32, AllAreInParentsEntries = 64, AllParentsHaveSvn = 128, AllHaveSvn = 256, AllAreExternalToParent = 512, AllAreFolders = 1024 }; public: KSvnd(const TQCString &); @@ -55,7 +56,7 @@ k_dcop: k_dcop_signals: //emitted whenever something happens using subversion ;) // void subversionNotify(const TQString&, int ,int, const TQString& , int , int, long int, const TQString&); -// void subversionStatus(const TQString&,int,int,int,int,long int); +// void subversiontqStatus(const TQString&,int,int,int,int,long int); public slots: @@ -63,7 +64,7 @@ protected: bool isFileInSvnEntries ( const TQString filename, const TQString entfile ); bool isFileInExternals ( const TQString filename, const TQString propfile ); bool isFolder( const KURL& url ); - int getStatus( const KURL::List& list ); + int gettqStatus( const KURL::List& list ); }; #endif diff --git a/kioslave/svn/svn.cpp b/kioslave/svn/svn.cpp index b7341df0..871b2ba0 100644 --- a/kioslave/svn/svn.cpp +++ b/kioslave/svn/svn.cpp @@ -232,7 +232,7 @@ void kio_svnProtocol::get(const KURL& url ){ kdDebug(7128) << "kio_svn::get(const KURL& url)" << endl ; TQString remoteServer = url.host(); - infoMessage(i18n("Looking for %1...").arg( remoteServer ) ); + infoMessage(i18n("Looking for %1...").tqarg( remoteServer ) ); apr_pool_t *subpool = svn_pool_create (pool); kbaton *bt = (kbaton*)apr_pcalloc(subpool, sizeof(*bt)); @@ -247,7 +247,7 @@ void kio_svnProtocol::get(const KURL& url ){ //find the requested revision svn_opt_revision_t rev; svn_opt_revision_t endrev; - int idx = target.findRev( "?rev=" ); + int idx = target.tqfindRev( "?rev=" ); if ( idx != -1 ) { TQString revstr = target.mid( idx+5 ); #if 0 @@ -309,7 +309,7 @@ void kio_svnProtocol::stat(const KURL & url){ //find the requested revision svn_opt_revision_t rev; svn_opt_revision_t endrev; - int idx = target.findRev( "?rev=" ); + int idx = target.tqfindRev( "?rev=" ); if ( idx != -1 ) { TQString revstr = target.mid( idx+5 ); #if 0 @@ -414,7 +414,7 @@ void kio_svnProtocol::listDir(const KURL& url){ //find the requested revision svn_opt_revision_t rev; svn_opt_revision_t endrev; - int idx = target.findRev( "?rev=" ); + int idx = target.tqfindRev( "?rev=" ); if ( idx != -1 ) { TQString revstr = target.mid( idx+5 ); svn_opt_parse_revision( &rev, &endrev, revstr.utf8(), subpool ); @@ -530,7 +530,7 @@ void kio_svnProtocol::copy(const KURL & src, const KURL& dest, int /*permissions //find the requested revision svn_opt_revision_t rev; - int idx = srcsvn.findRev( "?rev=" ); + int idx = srcsvn.tqfindRev( "?rev=" ); if ( idx != -1 ) { TQString revstr = srcsvn.mid( idx+5 ); kdDebug(7128) << "revision string found " << revstr << endl; @@ -650,7 +650,7 @@ void kio_svnProtocol::rename(const KURL& src, const KURL& dest, bool /*overwrite //find the requested revision svn_opt_revision_t rev; - int idx = srcsvn.findRev( "?rev=" ); + int idx = srcsvn.tqfindRev( "?rev=" ); if ( idx != -1 ) { TQString revstr = srcsvn.mid( idx+5 ); kdDebug(7128) << "revision string found " << revstr << endl; @@ -1087,7 +1087,7 @@ void kio_svnProtocol::commit(const KURL::List& wc) { TQString userstring = i18n ( "Nothing to commit." ); if ( SVN_IS_VALID_REVNUM( commit_info->revision ) ) - userstring = i18n( "Committed revision %1." ).arg(commit_info->revision); + userstring = i18n( "Committed revision %1." ).tqarg(commit_info->revision); setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "path", nurl.path() ); setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "action", "0" ); setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "kind", "0" ); @@ -1234,7 +1234,7 @@ TQString kio_svnProtocol::makeSvnURL ( const KURL& url ) const { tpURL.setProtocol("file"); svnUrl = tpURL.url(-1); //hack : add one more / after file:/ - int idx = svnUrl.find("/"); + int idx = svnUrl.tqfind("/"); svnUrl.insert( idx, "//" ); return svnUrl; } @@ -1320,7 +1320,7 @@ svn_error_t *kio_svnProtocol::commitLogPrompt( const char **log_msg, const char return SVN_NO_ERROR; } - if ( replyType != "TQString" ) { + if ( replyType != TQSTRING_OBJECT_NAME_STRING ) { kdWarning() << "Unexpected reply type" << endl; return SVN_NO_ERROR; } @@ -1349,41 +1349,41 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action switch ( action ) { case svn_wc_notify_add : //add if (mime_type && (svn_mime_type_is_binary (mime_type))) - userstring = i18n( "A (bin) %1" ).arg( path ); + userstring = i18n( "A (bin) %1" ).tqarg( path ); else - userstring = i18n( "A %1" ).arg( path ); + userstring = i18n( "A %1" ).tqarg( path ); break; case svn_wc_notify_copy: //copy break; case svn_wc_notify_delete: //delete nb->received_some_change = TRUE; - userstring = i18n( "D %1" ).arg( path ); + userstring = i18n( "D %1" ).tqarg( path ); break; case svn_wc_notify_restore : //restore - userstring=i18n( "Restored %1." ).arg( path ); + userstring=i18n( "Restored %1." ).tqarg( path ); break; case svn_wc_notify_revert : //revert - userstring=i18n( "Reverted %1." ).arg( path ); + userstring=i18n( "Reverted %1." ).tqarg( path ); break; case svn_wc_notify_failed_revert: //failed revert - userstring=i18n( "Failed to revert %1.\nTry updating instead." ).arg( path ); + userstring=i18n( "Failed to revert %1.\nTry updating instead." ).tqarg( path ); break; case svn_wc_notify_resolved: //resolved - userstring=i18n( "Resolved conflicted state of %1." ).arg( path ); + userstring=i18n( "Resolved conflicted state of %1." ).tqarg( path ); break; case svn_wc_notify_skip: //skip if ( content_state == svn_wc_notify_state_missing ) - userstring=i18n("Skipped missing target %1.").arg( path ); + userstring=i18n("Skipped missing target %1.").tqarg( path ); else - userstring=i18n("Skipped %1.").arg( path ); + userstring=i18n("Skipped %1.").tqarg( path ); break; case svn_wc_notify_update_delete: //update_delete nb->received_some_change = TRUE; - userstring=i18n( "D %1" ).arg( path ); + userstring=i18n( "D %1" ).tqarg( path ); break; case svn_wc_notify_update_add: //update_add nb->received_some_change = TRUE; - userstring=i18n( "A %1" ).arg( path ); + userstring=i18n( "A %1" ).tqarg( path ); break; case svn_wc_notify_update_update: //update_update { @@ -1428,25 +1428,25 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action if (SVN_IS_VALID_REVNUM (revision)) { if (nb->is_export) { if ( nb->in_external ) - userstring = i18n("Exported external at revision %1.").arg( revision ); + userstring = i18n("Exported external at revision %1.").tqarg( revision ); else - userstring = i18n("Exported revision %1.").arg( revision ); + userstring = i18n("Exported revision %1.").tqarg( revision ); } else if (nb->is_checkout) { if ( nb->in_external ) - userstring = i18n("Checked out external at revision %1.").arg( revision ); + userstring = i18n("Checked out external at revision %1.").tqarg( revision ); else - userstring = i18n("Checked out revision %1.").arg( revision); + userstring = i18n("Checked out revision %1.").tqarg( revision); } else { if (nb->received_some_change) { if ( nb->in_external ) - userstring=i18n("Updated external to revision %1.").arg( revision ); + userstring=i18n("Updated external to revision %1.").tqarg( revision ); else - userstring = i18n("Updated to revision %1.").arg( revision); + userstring = i18n("Updated to revision %1.").tqarg( revision); } else { if ( nb->in_external ) - userstring = i18n("External at revision %1.").arg( revision ); + userstring = i18n("External at revision %1.").tqarg( revision ); else - userstring = i18n("At revision %1.").arg( revision); + userstring = i18n("At revision %1.").tqarg( revision); } } } else /* no revision */ { @@ -1474,30 +1474,30 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action break; case svn_wc_notify_update_external: //update_external nb->in_external = TRUE; - userstring = i18n("Fetching external item into %1." ).arg( path ); + userstring = i18n("Fetching external item into %1." ).tqarg( path ); break; case svn_wc_notify_status_completed: //status_completed if (SVN_IS_VALID_REVNUM (revision)) - userstring = i18n( "Status against revision: %1.").arg( revision ); + userstring = i18n( "tqStatus against revision: %1.").tqarg( revision ); break; case svn_wc_notify_status_external: //status_external - userstring = i18n("Performing status on external item at %1.").arg( path ); + userstring = i18n("Performing status on external item at %1.").tqarg( path ); break; case svn_wc_notify_commit_modified: //commit_modified - userstring = i18n( "Sending %1").arg( path ); + userstring = i18n( "Sending %1").tqarg( path ); break; case svn_wc_notify_commit_added: //commit_added if (mime_type && svn_mime_type_is_binary (mime_type)) { - userstring = i18n( "Adding (bin) %1.").arg( path ); + userstring = i18n( "Adding (bin) %1.").tqarg( path ); } else { - userstring = i18n( "Adding %1.").arg( path ); + userstring = i18n( "Adding %1.").tqarg( path ); } break; case svn_wc_notify_commit_deleted: //commit_deleted - userstring = i18n( "Deleting %1.").arg( path ); + userstring = i18n( "Deleting %1.").tqarg( path ); break; case svn_wc_notify_commit_replaced: //commit_replaced - userstring = i18n( "Replacing %1.").arg( path ); + userstring = i18n( "Replacing %1.").tqarg( path ); break; case svn_wc_notify_commit_postfix_txdelta: //commit_postfix_txdelta if (! nb->sent_first_txdelta) { diff --git a/kioslave/svn/svnhelper/kio_svn_helper.cpp b/kioslave/svn/svnhelper/kio_svn_helper.cpp index e58fb410..3456b3fd 100644 --- a/kioslave/svn/svnhelper/kio_svn_helper.cpp +++ b/kioslave/svn/svnhelper/kio_svn_helper.cpp @@ -48,7 +48,7 @@ SvnHelper::SvnHelper():KApplication() { KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); - KWinModule wm ( this ); + KWinModule wm ( TQT_TQOBJECT(this) ); m_id = wm.activeWindow(); KURL::List list; diff --git a/kioslave/svn/svnhelper/kio_svn_helper.h b/kioslave/svn/svnhelper/kio_svn_helper.h index 7f4eb626..c7f5007b 100644 --- a/kioslave/svn/svnhelper/kio_svn_helper.h +++ b/kioslave/svn/svnhelper/kio_svn_helper.h @@ -27,6 +27,7 @@ class SvnHelper:public KApplication { Q_OBJECT + TQ_OBJECT public: SvnHelper(); diff --git a/kioslave/svn/svnhelper/subversioncheckout.ui b/kioslave/svn/svnhelper/subversioncheckout.ui index 5b320eee..721cb1ad 100644 --- a/kioslave/svn/svnhelper/subversioncheckout.ui +++ b/kioslave/svn/svnhelper/subversioncheckout.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>SubversionCheckout</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>SubversionCheckout</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -30,15 +30,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -52,7 +52,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonHelp</cstring> </property> @@ -76,14 +76,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -100,7 +100,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -129,15 +129,15 @@ </sizepolicy> </property> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -155,14 +155,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>121</width> <height>20</height> </size> </property> </spacer> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>revision</cstring> </property> @@ -195,7 +195,7 @@ <slot>reject()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kioslave/svn/svnhelper/subversiondiff.ui b/kioslave/svn/svnhelper/subversiondiff.ui index dab4ca0e..ec8132cf 100644 --- a/kioslave/svn/svnhelper/subversiondiff.ui +++ b/kioslave/svn/svnhelper/subversiondiff.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>Subversion_Diff</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>Subversion_Diff</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTextBrowser"> + <widget class="TQTextBrowser"> <property name="name"> <cstring>text</cstring> </property> @@ -36,7 +36,7 @@ <set>AutoAll</set> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -60,14 +60,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -96,5 +96,5 @@ <slot>accept()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kioslave/svn/svnhelper/subversionlog.ui b/kioslave/svn/svnhelper/subversionlog.ui index 2c167d5b..8f206e0a 100644 --- a/kioslave/svn/svnhelper/subversionlog.ui +++ b/kioslave/svn/svnhelper/subversionlog.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>Subversion_Log</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>Subversion_Log</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTextBrowser"> + <widget class="TQTextBrowser"> <property name="name"> <cstring>text</cstring> </property> @@ -36,7 +36,7 @@ <set>AutoAll</set> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -60,14 +60,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -96,5 +96,5 @@ <slot>accept()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kioslave/svn/svnhelper/subversionswitch.ui b/kioslave/svn/svnhelper/subversionswitch.ui index 8ee1a37c..66aaba23 100644 --- a/kioslave/svn/svnhelper/subversionswitch.ui +++ b/kioslave/svn/svnhelper/subversionswitch.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>SubversionSwitch</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>SubversionSwitch</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -30,15 +30,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -52,7 +52,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonHelp</cstring> </property> @@ -76,14 +76,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -100,7 +100,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -129,15 +129,15 @@ </sizepolicy> </property> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -155,14 +155,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>121</width> <height>20</height> </size> </property> </spacer> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>revision</cstring> </property> @@ -195,7 +195,7 @@ <slot>reject()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kmtrace/kmtrace.cpp b/kmtrace/kmtrace.cpp index 5acf9e69..f4c11e1f 100644 --- a/kmtrace/kmtrace.cpp +++ b/kmtrace/kmtrace.cpp @@ -120,9 +120,9 @@ void parseLine(const TQCString &_line, char operation) maxBytes = totalBytes; if (count > maxCount) maxCount = count; - if (entryDict->find(entry->base)) + if (entryDict->tqfind(entry->base)) fprintf(stderr, "\rAllocated twice: 0x%08x \n", entry->base); - entryDict->replace(entry->base, entry); + entryDict->tqreplace(entry->base, entry); } break; case '-': { @@ -155,7 +155,7 @@ void sortBlocks() entryList->append(entry); for(int i = 0; entry->backtrace[i]; i++) { - if (!symbolDict->find(entry->backtrace[i])) + if (!symbolDict->tqfind(entry->backtrace[i])) symbolDict->insert(entry->backtrace[i], unknown); } } @@ -170,7 +170,7 @@ void collectDupes() { Entry *entry = it.current(); ++it; - Entry *entry2 = dupeDict.find(entry->signature); + Entry *entry2 = dupeDict.tqfind(entry->signature); if (entry2) { entry2->count++; @@ -223,7 +223,7 @@ int lookupSymbols(FILE *stream) if (addr) { long i_addr = fromHex(addr); - const char* str = symbolDict->find(i_addr); + const char* str = symbolDict->tqfind(i_addr); if (str == unknown) { *addr = 0; @@ -232,7 +232,7 @@ int lookupSymbols(FILE *stream) str = qstrdup(rindex(line2, '/')+1); else str = qstrdup(line2); - symbolDict->replace(i_addr, str); + symbolDict->tqreplace(i_addr, str); symbols++; } } @@ -285,7 +285,7 @@ void lookupUnknownSymbols(const char *appname) TQCString symbol; symbol.sprintf("%s(%s)", buffer2, buffer1); if(*buffer1 != '?') - symbolDict->replace(it2.currentKey(),qstrdup(symbol.data())); + symbolDict->tqreplace(it2.currentKey(),qstrdup(symbol.data())); } fclose(fInputFile); } @@ -308,9 +308,9 @@ int match(const char *s1, const char *s2) const char *lookupAddress(int addr) { - char *str = formatDict->find(addr); + char *str = formatDict->tqfind(addr); if (str) return str; - TQCString s = symbolDict->find(addr); + TQCString s = symbolDict->tqfind(addr); if (s.isEmpty()) { fprintf(stderr, "Error!\n"); @@ -318,15 +318,15 @@ fprintf(stderr, "Error!\n"); } else { - int start = s.find('('); - int end = s.findRev('+'); + int start = s.tqfind('('); + int end = s.tqfindRev('+'); if (end < 0) - end = s.findRev(')'); + end = s.tqfindRev(')'); if ((start > 0) && (end > start)) { TQCString symbol = s.mid(start+1, end-start-1); char *res = 0; - if (symbol.find(')') == -1) + if (symbol.tqfind(')') == -1) res = cplus_demangle(symbol.data(), DMGL_PARAMS | DMGL_AUTO | DMGL_ANSI ); if (res) @@ -344,7 +344,7 @@ fprintf(stderr, "Error!\n"); return excluded; } } - s.replace(start+1, end-start-1, symbol); + s.tqreplace(start+1, end-start-1, symbol); } } str = qstrdup(s.data()); @@ -406,7 +406,7 @@ inline TreeEntry::TreeEntry (int adr, int size, int count, TreeList * sub) } inline bool TreeEntry::operator == (const TreeEntry & r) const -{ // this one is for QValueList +{ // this one is for TQValueList return address == r.address; } @@ -439,12 +439,12 @@ void buildTree () ; // find last (topmost) backtrace entry for (--i; i >= 0; --i) { - TreeList::Iterator pos = list->find (entry->backtrace[i]); + TreeList::Iterator pos = list->tqfind (entry->backtrace[i]); if (pos == list->end ()) { list->prepend (TreeEntry (entry->backtrace[i], entry->total_size, entry->count)); - pos = list->find (entry->backtrace[i]); + pos = list->tqfind (entry->backtrace[i]); } else *pos = TreeEntry (entry->backtrace[i], @@ -642,7 +642,7 @@ int main(int argc, char *argv[]) exe = app.stripWhiteSpace(); fprintf(stderr, "ktrace.out: malloc trace of %s\n", exe.data()); } - else if(!app.contains(exe.data())) + else if(!app.tqcontains(exe.data())) { fprintf(stderr, "trace file was for application '%s', not '%s'\n", app.data(), exe.data()); exit(1); diff --git a/kmtrace/ktrace.c b/kmtrace/ktrace.c index 21fca376..cf3c55c0 100644 --- a/kmtrace/ktrace.c +++ b/kmtrace/ktrace.c @@ -495,14 +495,14 @@ addAllocationToTree(void) int i, j; void *bt[TR_BT_SIZE + 1]; CallerNode* cn = CallTree; - CallerNode** parent = &CallTree; + CallerNode** tqparent = &CallTree; bt_size = backtrace(bt, TR_BT_SIZE); for (i = bt_size - 1; i >= 4; i--) { if (cn == NULL) { - *parent = cn = (CallerNode*) malloc(sizeof(CallerNode)); + *tqparent = cn = (CallerNode*) malloc(sizeof(CallerNode)); cn->funcAdr = bt[i]; cn->mallocs = 0; cn->noCallees = 0; @@ -517,7 +517,7 @@ addAllocationToTree(void) for (j = 0; j < cn->noCallees; j++) if (bt[i - 1] == cn->callees[j]->funcAdr) { - parent = &cn->callees[j]; + tqparent = &cn->callees[j]; cn = cn->callees[j]; knownCallee = 1; break; @@ -541,7 +541,7 @@ addAllocationToTree(void) (newSize - cn->maxCallees) * sizeof(CallerNode*)); cn->maxCallees = newSize; } - parent = &cn->callees[cn->noCallees++]; + tqparent = &cn->callees[cn->noCallees++]; cn = 0; } } diff --git a/kmtrace/match.cpp b/kmtrace/match.cpp index afa83bc1..d4c5545a 100644 --- a/kmtrace/match.cpp +++ b/kmtrace/match.cpp @@ -39,7 +39,7 @@ int main(int argc, char **argv) while(!feof(map_file)) { fgets(buf, 1024, map_file); - TQString line = TQString::fromLatin1(buf).stripWhiteSpace(); + TQString line = TQString::tqfromLatin1(buf).stripWhiteSpace(); TQStringList split = TQStringList::split(' ', line); if (split.count() <= 1) return 1; @@ -61,8 +61,8 @@ int main(int argc, char **argv) while(!feof(call_file)) { fgets(buf, 1024, call_file); - TQString line = TQString::fromLatin1(buf).stripWhiteSpace(); - if (dict.find(line)) + TQString line = TQString::tqfromLatin1(buf).stripWhiteSpace(); + if (dict.tqfind(line)) { qWarning("%s", line.latin1()); } diff --git a/kompare/DESIGN b/kompare/DESIGN index fde8a5c9..9f1ddafd 100644 --- a/kompare/DESIGN +++ b/kompare/DESIGN @@ -10,7 +10,7 @@ The diffmodel is comparable to a document and the view part is comparable to the view and the komparemodellist is comparable to a documentmanager. The navtree can be viewed as a document view manager. The model is fully separated from the view and all communication goes -through signals and slots. The view gets a model that contains all differences +through Q_SIGNALS and Q_SLOTS. The view gets a model that contains all differences for the compared files A and B. The view gets this model from the modellist, the central entity in the part. diff --git a/kompare/kompare_shell.cpp b/kompare/kompare_shell.cpp index 66bf89d2..3af1af3b 100644 --- a/kompare/kompare_shell.cpp +++ b/kompare/kompare_shell.cpp @@ -61,7 +61,7 @@ KompareShell::KompareShell() setupStatusBar(); KTrader::OfferList offers = KTrader::self()->query( "text/x-diff", - "Kompare/ViewPart", TQString::null, TQString::null ); + "Kompare/ViewPart", TQString(), TQString() ); #ifdef NDEBUG for( int i = 0; i < offers.count(); i++ ) { @@ -86,7 +86,7 @@ KompareShell::KompareShell() m_mainViewDock = createDockWidget( "View", kapp->icon() ); // now that the Part is loaded, we cast it to a KomparePart to get // our hands on it - m_viewPart = static_cast<KomparePart*>(mainViewFactory->create(m_mainViewDock, + m_viewPart = static_cast<KomparePart*>(mainViewFactory->create(TQT_TQOBJECT(m_mainViewDock), "kompare_part", "KParts::ReadWritePart" )); if ( m_viewPart ) @@ -108,7 +108,7 @@ KompareShell::KompareShell() } offers.clear(); - offers = KTrader::self()->query( "text/x-diff", "KParts/ReadOnlyPart", "'Kompare/NavigationPart' in ServiceTypes", TQString::null ); + offers = KTrader::self()->query( "text/x-diff", "KParts/ReadOnlyPart", "'Kompare/NavigationPart' in ServiceTypes", TQString() ); if ( offers.count() == 0 ) { KMessageBox::error(this, i18n( "Could not find our KompareNavigationPart." ) ); @@ -122,7 +122,7 @@ KompareShell::KompareShell() { m_navTreeDock = createDockWidget( "Navigation", kapp->icon() ); - m_navTreePart = static_cast<KompareNavTreePart*>(navTreeFactory->create(m_navTreeDock, + m_navTreePart = static_cast<KompareNavTreePart*>(navTreeFactory->create(TQT_TQOBJECT(m_navTreeDock), "komparenavtreepart", "KParts::ReadOnlyPart" )); if ( m_navTreePart ) @@ -171,9 +171,9 @@ KompareShell::KompareShell() // Hook up the KomparePart -> KompareShell communication connect( m_viewPart, TQT_SIGNAL( setStatusBarModelInfo( int, int, int, int, int ) ), - this, TQT_SLOT( slotUpdateStatusBar( int, int, int, int, int ) ) ); + TQT_TQOBJECT(this), TQT_SLOT( slotUpdateStatusBar( int, int, int, int, int ) ) ); connect( m_viewPart, TQT_SIGNAL( setStatusBarText(const TQString&) ), - this, TQT_SLOT( slotSetStatusBarText(const TQString&) ) ); + TQT_TQOBJECT(this), TQT_SLOT( slotSetStatusBarText(const TQString&) ) ); // Read basic main-view settings, and set to autosave setAutoSaveSettings( "General Options" ); @@ -228,26 +228,26 @@ void KompareShell::blend( const KURL& url1, const KURL& diff ) void KompareShell::setupActions() { - KAction* open = KStdAction::open(this, TQT_SLOT(slotFileOpen()), actionCollection()); + KAction* open = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection()); open->setText( i18n( "&Open Diff..." ) ); - new KAction( i18n("&Compare Files..."), "fileopen", Qt::CTRL + Qt::Key_C, - this, TQT_SLOT(slotFileCompareFiles()), + new KAction( i18n("&Compare Files..."), "fileopen", TQt::CTRL + TQt::Key_C, + TQT_TQOBJECT(this), TQT_SLOT(slotFileCompareFiles()), actionCollection(), "file_compare_files" ); - new KAction( i18n("&Blend URL with Diff..."), "fileblend", Qt::CTRL + Qt::Key_B, - this, TQT_SLOT(slotFileBlendURLAndDiff()), + new KAction( i18n("&Blend URL with Diff..."), "fileblend", TQt::CTRL + TQt::Key_B, + TQT_TQOBJECT(this), TQT_SLOT(slotFileBlendURLAndDiff()), actionCollection(), "file_blend_url" ); - KStdAction::quit( this, TQT_SLOT( slotFileClose() ), actionCollection() ); + KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotFileClose() ), actionCollection() ); #if KDE_VERSION >= KDE_MAKE_VERSION(3,1,90) createStandardStatusBarAction(); #endif setStandardToolBarMenuEnabled(true); - m_showTextView = new KToggleAction( i18n("Show T&ext View"), 0, this, TQT_SLOT(slotShowTextView()), + m_showTextView = new KToggleAction( i18n("Show T&ext View"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowTextView()), actionCollection(), "options_show_text_view" ); m_showTextView->setCheckedState(i18n("Hide T&ext View")); - KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); } void KompareShell::setupStatusBar() @@ -258,7 +258,7 @@ void KompareShell::setupStatusBar() m_generalLabel = new KSqueezedTextLabel( "", 0, "general_statusbar_label" ); statusBar()->addWidget( m_generalLabel, 1, false ); - m_generalLabel->setAlignment( Qt::AlignLeft ); + m_generalLabel->tqsetAlignment( TQt::AlignLeft ); } void KompareShell::slotUpdateStatusBar( int modelIndex, int differenceIndex, int modelCount, int differenceCount, int appliedCount ) @@ -269,13 +269,13 @@ void KompareShell::slotUpdateStatusBar( int modelIndex, int differenceIndex, int TQString diffStr; if ( modelIndex >= 0 ) - fileStr = i18n( " %1 of %n file ", " %1 of %n files ", modelCount ).arg( modelIndex + 1 ); + fileStr = i18n( " %1 of %n file ", " %1 of %n files ", modelCount ).tqarg( modelIndex + 1 ); else fileStr = i18n( " %n file ", " %n files ", modelCount ); if ( differenceIndex >= 0 ) diffStr = i18n( " %1 of %n difference, %2 applied ", " %1 of %n differences, %2 applied ", differenceCount ) - .arg( differenceIndex + 1 ).arg( appliedCount ); + .tqarg( differenceIndex + 1 ).tqarg( appliedCount ); else diffStr = i18n( " %n difference ", " %n differences ", differenceCount ); @@ -352,7 +352,7 @@ void KompareShell::readProperties(KConfig* config) void KompareShell::slotFileOpen() { // FIXME: use different filedialog which gets encoding - KURL url = KFileDialog::getOpenURL( TQString::null, "text/x-diff", this ); + KURL url = KFileDialog::getOpenURL( TQString(), "text/x-diff", this ); if( !url.isEmpty() ) { KompareShell* shell = new KompareShell(); kapp->ref(); @@ -369,7 +369,7 @@ void KompareShell::slotFileBlendURLAndDiff() dialog->setFirstGroupBoxTitle( i18n( "File/Folder" ) ); dialog->setSecondGroupBoxTitle( i18n( "Diff Output" ) ); - KGuiItem blendGuiItem( i18n( "Blend" ), TQString::null, i18n( "Blend this file or folder with the diff output" ), i18n( "If you have entered a file or folder name and a file that contains diff output in the fields in this dialog then this button will be enabled and pressing it will open kompare's main view where the output of the entered file or files from the folder are mixed with the diff output so you can then apply the difference(s) to a file or to the files. " ) ); + KGuiItem blendGuiItem( i18n( "Blend" ), TQString(), i18n( "Blend this file or folder with the diff output" ), i18n( "If you have entered a file or folder name and a file that contains diff output in the fields in this dialog then this button will be enabled and pressing it will open kompare's main view where the output of the entered file or files from the folder are mixed with the diff output so you can then apply the difference(s) to a file or to the files. " ) ); dialog->setButtonOK( blendGuiItem ); dialog->setGroup( "Recent Blend Files" ); @@ -398,7 +398,7 @@ void KompareShell::slotFileCompareFiles() dialog->setFirstGroupBoxTitle( i18n( "Source" ) ); dialog->setSecondGroupBoxTitle( i18n( "Destination" ) ); - KGuiItem compareGuiItem( i18n( "Compare" ), TQString::null, i18n( "Compare these files or folders" ), i18n( "If you have entered 2 filenames or 2 folders in the fields in this dialog then this button will be enabled and pressing it will start a comparison of the entered files or folders. " ) ); + KGuiItem compareGuiItem( i18n( "Compare" ), TQString(), i18n( "Compare these files or folders" ), i18n( "If you have entered 2 filenames or 2 folders in the fields in this dialog then this button will be enabled and pressing it will start a comparison of the entered files or folders. " ) ); dialog->setButtonOK( compareGuiItem ); dialog->setGroup( "Recent Compare Files" ); @@ -438,15 +438,15 @@ void KompareShell::slotShowTextView() // FIXME: proper error checking m_textViewWidget = createDockWidget( i18n("Text View"), SmallIcon( "text") ); m_textViewPart = KParts::ComponentFactory::createPartInstanceFromQuery<KTextEditor::Document>( - TQString::fromLatin1("KTextEditor/Document"), - TQString::null, (TQWidget*)this, 0, (TQWidget*)this, 0, TQStringList(), &errCode ); + TQString::tqfromLatin1("KTextEditor/Document"), + TQString(), TQT_TQWIDGET(this), 0, TQT_TQOBJECT(this), 0, TQStringList(), &errCode ); if ( m_textViewPart ) { m_textView = m_textViewPart->createView( this, 0 ); m_textViewWidget->setWidget( static_cast<TQWidget*>(m_textView) ); m_textEditIface = editInterface( m_textViewPart ); connect( m_viewPart, TQT_SIGNAL(diffString(const TQString&)), - this, TQT_SLOT(slotSetDiffString(const TQString&)) ); + TQT_TQOBJECT(this), TQT_SLOT(slotSetDiffString(const TQString&)) ); } } diff --git a/kompare/kompare_shell.h b/kompare/kompare_shell.h index f1fd87d2..4855c148 100644 --- a/kompare/kompare_shell.h +++ b/kompare/kompare_shell.h @@ -51,6 +51,7 @@ namespace KTextEditor { class KompareShell : public KParts::DockMainWindow { Q_OBJECT + TQ_OBJECT public: /** * Default Constructor diff --git a/kompare/komparenavtreepart/komparenavtreepart.cpp b/kompare/komparenavtreepart/komparenavtreepart.cpp index 31b0388f..1fe65b4f 100644 --- a/kompare/komparenavtreepart/komparenavtreepart.cpp +++ b/kompare/komparenavtreepart/komparenavtreepart.cpp @@ -37,8 +37,8 @@ using namespace Diff2; -KompareNavTreePart::KompareNavTreePart( TQWidget* parent, const char* name ) - : KParts::ReadOnlyPart( parent, name ), +KompareNavTreePart::KompareNavTreePart( TQWidget* tqparent, const char* name ) + : KParts::ReadOnlyPart( TQT_TQOBJECT(tqparent), name ), m_splitter( 0 ), m_modelList( 0 ), m_srcDirTree( 0 ), @@ -453,7 +453,7 @@ void KChangeLVI::setDifferenceText() setText( 2, text ); } -KChangeLVI::KChangeLVI( KListView* parent, Difference* diff ) : KListViewItem( parent ) +KChangeLVI::KChangeLVI( KListView* tqparent, Difference* diff ) : KListViewItem( tqparent ) { m_difference = diff; @@ -487,7 +487,7 @@ KChangeLVI::~KChangeLVI() { } -KFileLVI::KFileLVI( KListView* parent, DiffModel* model ) : KListViewItem( parent ) +KFileLVI::KFileLVI( KListView* tqparent, DiffModel* model ) : KListViewItem( tqparent ) { m_model = model; @@ -519,7 +519,7 @@ KFileLVI::~KFileLVI() { } -KDirLVI::KDirLVI( KListView* parent, TQString& dir ) : KListViewItem( parent ) +KDirLVI::KDirLVI( KListView* tqparent, TQString& dir ) : KListViewItem( tqparent ) { // kdDebug(8105) << "KDirLVI (KListView) constructor called with dir = " << dir << endl; m_rootItem = true; @@ -533,7 +533,7 @@ KDirLVI::KDirLVI( KListView* parent, TQString& dir ) : KListViewItem( parent ) setText( 0, m_dirName ); } -KDirLVI::KDirLVI( KDirLVI* parent, TQString& dir ) : KListViewItem( parent ) +KDirLVI::KDirLVI( KDirLVI* tqparent, TQString& dir ) : KListViewItem( tqparent ) { // kdDebug(8105) << "KDirLVI (KDirLVI) constructor called with dir = " << dir << endl; m_rootItem = false; @@ -551,8 +551,8 @@ void KDirLVI::addModel( TQString& path, DiffModel* model, TQPtrDict<KDirLVI>* mo if ( !m_dirName.isEmpty() ) { - if ( path.find( m_dirName ) > -1 ) - path = path.replace( path.find( m_dirName ), m_dirName.length(), "" ); + if ( path.tqfind( m_dirName ) > -1 ) + path = path.tqreplace( path.tqfind( m_dirName ), m_dirName.length(), "" ); } // kdDebug(8105) << "Path after removal of own dir (\"" << m_dirName << "\") = " << path << endl; @@ -565,7 +565,7 @@ void KDirLVI::addModel( TQString& path, DiffModel* model, TQPtrDict<KDirLVI>* mo KDirLVI* child; - TQString dir = path.mid( 0, path.find( "/", 0 ) + 1 ); + TQString dir = path.mid( 0, path.tqfind( "/", 0 ) + 1 ); child = findChild( dir ); if ( !child ) { @@ -582,7 +582,7 @@ KDirLVI* KDirLVI::findChild( TQString dir ) // kdDebug(8105) << "KDirLVI::findChild called with dir = " << dir << endl; KDirLVI* child; if ( ( child = static_cast<KDirLVI*>(this->firstChild()) ) != 0L ) - { // has children, check if dir already exists, if so addModel + { // has tqchildren, check if dir already exists, if so addModel do { if ( dir == child->dirName() ) return child; @@ -619,7 +619,7 @@ TQString KDirLVI::fullPath( TQString& path ) path = path.prepend( m_dirName ); - KDirLVI* lviParent = dynamic_cast<KDirLVI*>( parent() ); + KDirLVI* lviParent = dynamic_cast<KDirLVI*>( tqparent() ); if ( lviParent ) { path = lviParent->fullPath( path ); @@ -675,12 +675,12 @@ KompareNavTreePartFactory::~KompareNavTreePartFactory() s_instance = 0L; } -KParts::Part* KompareNavTreePartFactory::createPartObject( TQWidget* parentWidget, const char* widgetName, - TQObject* /*parent*/, const char* /*name*/, +KParts::Part* KompareNavTreePartFactory::createPartObject( TQWidget* tqparentWidget, const char* widgetName, + TQObject* /*tqparent*/, const char* /*name*/, const char* /*classname*/, const TQStringList & /*args*/ ) { // Create an instance of our Part - KompareNavTreePart* obj = new KompareNavTreePart( parentWidget, widgetName ); + KompareNavTreePart* obj = new KompareNavTreePart( tqparentWidget, widgetName ); KGlobal::locale()->insertCatalogue("kompare"); diff --git a/kompare/komparenavtreepart/komparenavtreepart.h b/kompare/komparenavtreepart/komparenavtreepart.h index a126cfe5..6fa0667b 100644 --- a/kompare/komparenavtreepart/komparenavtreepart.h +++ b/kompare/komparenavtreepart/komparenavtreepart.h @@ -47,9 +47,10 @@ class KChangeLVI; class KompareNavTreePart : public KParts::ReadOnlyPart { Q_OBJECT + TQ_OBJECT public: - KompareNavTreePart( TQWidget* parent = 0L, const char* name = 0L ); + KompareNavTreePart( TQWidget* tqparent = 0L, const char* name = 0L ); virtual ~KompareNavTreePart(); public: @@ -87,7 +88,7 @@ private: TQString compareFromEndAndReturnSame( const TQString& string1, const TQString& string2 ); void addDirToTreeView( enum Kompare::Target, const TQString& filename ); - KListViewItem* findDirInDirTree( const KListViewItem* parent, const TQString& dir ); + KListViewItem* findDirInDirTree( const KListViewItem* tqparent, const TQString& dir ); // KListViewItem* firstItem(); // KListViewItem* lastItem(); @@ -124,7 +125,7 @@ private: class KChangeLVI : public KListViewItem { public: - KChangeLVI( KListView* parent, Diff2::Difference* diff ); + KChangeLVI( KListView* tqparent, Diff2::Difference* diff ); ~KChangeLVI(); public: Diff2::Difference* difference() { return m_difference; }; @@ -138,7 +139,7 @@ private: class KFileLVI : public KListViewItem { public: - KFileLVI( KListView* parent, Diff2::DiffModel* model ); + KFileLVI( KListView* tqparent, Diff2::DiffModel* model ); ~KFileLVI(); public: Diff2::DiffModel* model() { return m_model; }; @@ -150,8 +151,8 @@ private: class KDirLVI : public KListViewItem { public: - KDirLVI( KDirLVI* parent, TQString& dir ); - KDirLVI( KListView* parent, TQString& dir ); + KDirLVI( KDirLVI* tqparent, TQString& dir ); + KDirLVI( KListView* tqparent, TQString& dir ); ~KDirLVI(); public: void addModel( TQString& dir, Diff2::DiffModel* model, TQPtrDict<KDirLVI>* modelToDirItemDict ); @@ -175,11 +176,12 @@ class KAboutData; class KompareNavTreePartFactory : public KParts::Factory { Q_OBJECT + TQ_OBJECT public: KompareNavTreePartFactory(); virtual ~KompareNavTreePartFactory(); - virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name, + virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name, const char *classname, const TQStringList &args ); static KInstance* instance(); diff --git a/kompare/komparepart/kompare_part.cpp b/kompare/komparepart/kompare_part.cpp index bf15bb4d..24c23ffe 100644 --- a/kompare/komparepart/kompare_part.cpp +++ b/kompare/komparepart/kompare_part.cpp @@ -56,9 +56,9 @@ K_EXPORT_COMPONENT_FACTORY( libkomparepart, KomparePartFactory ) ViewSettings* KomparePart::m_viewSettings = 0L; DiffSettings* KomparePart::m_diffSettings = 0L; -KomparePart::KomparePart( TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name, const TQStringList & /*args*/ ) : - KParts::ReadWritePart(parent, name), +KomparePart::KomparePart( TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name, const TQStringList & /*args*/ ) : + KParts::ReadWritePart(tqparent, name), m_tempDiff( 0 ), m_info() { @@ -76,8 +76,8 @@ KomparePart::KomparePart( TQWidget *parentWidget, const char *widgetName, // This creates the "Model creator" and connects the signals and slots m_modelList = new Diff2::KompareModelList( m_diffSettings, m_info, this, "komparemodellist" ); - connect( m_modelList, TQT_SIGNAL(status( Kompare::Status )), - this, TQT_SLOT(slotSetStatus( Kompare::Status )) ); + connect( m_modelList, TQT_SIGNAL(status( Kompare::tqStatus )), + this, TQT_SLOT(slotSettqStatus( Kompare::tqStatus )) ); connect( m_modelList, TQT_SIGNAL(setStatusBarModelInfo( int, int, int, int, int )), this, TQT_SIGNAL(setStatusBarModelInfo( int, int, int, int, int )) ); connect( m_modelList, TQT_SIGNAL(error( TQString )), @@ -116,7 +116,7 @@ KomparePart::KomparePart( TQWidget *parentWidget, const char *widgetName, this, TQT_SIGNAL(applyDifference(const Diff2::Difference*, bool)) ); // This creates the splitterwidget and connects the signals and slots - m_splitter = new KompareSplitter ( m_viewSettings, parentWidget, widgetName ); + m_splitter = new KompareSplitter ( m_viewSettings, tqparentWidget, widgetName ); connect( m_modelList, TQT_SIGNAL(setSelection(const Diff2::DiffModel*, const Diff2::Difference*)), m_splitter, TQT_SLOT(slotSetSelection(const Diff2::DiffModel*, const Diff2::Difference*)) ); @@ -136,7 +136,7 @@ KomparePart::KomparePart( TQWidget *parentWidget, const char *widgetName, connect( this, TQT_SIGNAL(configChanged()), m_splitter, TQT_SIGNAL(configChanged()) ); // notify the part that this is our internal widget - setWidget( m_splitter->parentWidget() ); + setWidget( m_splitter->tqparentWidget() ); setupActions(); @@ -208,7 +208,7 @@ bool KomparePart::openDiff( const KURL& url ) result = m_modelList->openDiff( m_info.localSource ); updateActions(); updateCaption(); - updateStatus(); + updatetqStatus(); } else { @@ -232,7 +232,7 @@ bool KomparePart::openDiff( const TQString& diffOutput ) m_modelList->show(); updateActions(); updateCaption(); - updateStatus(); + updatetqStatus(); } return value; @@ -266,7 +266,7 @@ const TQString KomparePart::fetchURL( const KURL& url ) { if ( ! KIO::NetAccess::download( url, tempFileName, widget() ) ) { - slotShowError( i18n( "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" ).arg( url.prettyURL() ) ); + slotShowError( i18n( "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" ).tqarg( url.prettyURL() ) ); tempFileName = ""; } return tempFileName; @@ -278,7 +278,7 @@ const TQString KomparePart::fetchURL( const KURL& url ) return url.path(); else { - slotShowError( i18n( "<qt>The URL <b>%1</b> does not exist on your system.</qt>" ).arg( url.prettyURL() ) ); + slotShowError( i18n( "<qt>The URL <b>%1</b> does not exist on your system.</qt>" ).tqarg( url.prettyURL() ) ); return tempFileName; } } @@ -308,7 +308,7 @@ void KomparePart::compare( const KURL& source, const KURL& destination ) m_modelList->compare( m_info.localSource, m_info.localDestination ); updateActions(); updateCaption(); - updateStatus(); + updatetqStatus(); } } @@ -329,7 +329,7 @@ void KomparePart::compareFiles( const KURL& sourceFile, const KURL& destinationF m_modelList->compareFiles( m_info.localSource, m_info.localDestination ); updateActions(); updateCaption(); - updateStatus(); + updatetqStatus(); } } @@ -350,7 +350,7 @@ void KomparePart::compareDirs( const KURL& sourceDirectory, const KURL& destinat m_modelList->compareDirs( m_info.localSource, m_info.localDestination ); updateActions(); updateCaption(); - updateStatus(); + updatetqStatus(); } } @@ -359,7 +359,7 @@ void KomparePart::compare3Files( const KURL& /*originalFile*/, const KURL& /*cha // FIXME: actually implement this some day :) updateActions(); updateCaption(); - updateStatus(); + updatetqStatus(); } void KomparePart::openFileAndDiff( const KURL& file, const KURL& diffFile ) @@ -378,7 +378,7 @@ void KomparePart::openFileAndDiff( const KURL& file, const KURL& diffFile ) m_modelList->openFileAndDiff( m_info.localSource, m_info.localDestination ); updateActions(); updateCaption(); - updateStatus(); + updatetqStatus(); } } @@ -398,7 +398,7 @@ void KomparePart::openDirAndDiff ( const KURL& dir, const KURL& diffFile ) m_modelList->openDirAndDiff( m_info.localSource, m_info.localDestination ); updateActions(); updateCaption(); - updateStatus(); + updatetqStatus(); } } @@ -415,7 +415,7 @@ bool KomparePart::saveAll() bool result = m_modelList->saveAll(); updateActions(); updateCaption(); - updateStatus(); + updatetqStatus(); return result; } @@ -484,7 +484,7 @@ KAboutData *KomparePart::createAboutData() return about; } -void KomparePart::slotSetStatus( enum Kompare::Status status ) +void KomparePart::slotSettqStatus( enum Kompare::tqStatus status ) { updateActions(); @@ -496,10 +496,10 @@ void KomparePart::slotSetStatus( enum Kompare::Status status ) emit setStatusBarText( i18n( "Parsing diff output..." ) ); break; case Kompare::FinishedParsing: - updateStatus(); + updatetqStatus(); break; case Kompare::FinishedWritingDiff: - updateStatus(); + updatetqStatus(); emit diffURLChanged(); break; default: @@ -532,7 +532,7 @@ void KomparePart::updateCaption() emit setWindowCaption( text ); } -void KomparePart::updateStatus() +void KomparePart::updatetqStatus() { TQString source = m_info.source.prettyURL(); TQString destination = m_info.destination.prettyURL(); @@ -543,26 +543,26 @@ void KomparePart::updateStatus() { case Kompare::ComparingFiles : text = i18n( "Comparing file %1 with file %2" ) - .arg( source ) - .arg( destination ); + .tqarg( source ) + .tqarg( destination ); break; case Kompare::ComparingDirs : text = i18n( "Comparing files in %1 with files in %2" ) - .arg( source ) - .arg( destination ); + .tqarg( source ) + .tqarg( destination ); break; case Kompare::ShowingDiff : - text = i18n( "Viewing diff output from %1" ).arg( source ); + text = i18n( "Viewing diff output from %1" ).tqarg( source ); break; case Kompare::BlendingFile : text = i18n( "Blending diff output from %1 into file %2" ) - .arg( source ) - .arg( destination ); + .tqarg( source ) + .tqarg( destination ); break; case Kompare::BlendingDir : text = i18n( "Blending diff output from %1 into folder %2" ) - .arg( m_info.source.prettyURL() ) - .arg( m_info.destination.prettyURL() ); + .tqarg( m_info.source.prettyURL() ) + .tqarg( m_info.destination.prettyURL() ); break; default: break; @@ -608,7 +608,7 @@ void KomparePart::slotSwap() // Update window caption and statusbar text updateCaption(); - updateStatus(); + updatetqStatus(); m_modelList->swap(); } @@ -666,7 +666,7 @@ void KomparePart::slotShowDiffstats( void ) KMessageBox::information( 0L, i18n( "No diff file, or no 2 files have been diffed. " "Therefore no stats are available."), - i18n("Diff Statistics"), TQString::null, false ); + i18n("Diff Statistics"), TQString(), false ); } else if ( m_modelList->modelCount() == 1 ) { // 1 file in diff, or 2 files compared KMessageBox::information( 0L, i18n( @@ -678,9 +678,9 @@ void KomparePart::slotShowDiffstats( void ) "Format: %3\n" "Number of hunks: %4\n" "Number of differences: %5") - .arg(oldFile).arg(newFile).arg(diffFormat) - .arg(noOfHunks).arg(noOfDiffs), - i18n("Diff Statistics"), TQString::null, false ); + .tqarg(oldFile).tqarg(newFile).tqarg(diffFormat) + .tqarg(noOfHunks).tqarg(noOfDiffs), + i18n("Diff Statistics"), TQString(), false ); } else { // more than 1 file in diff, or 2 directories compared KMessageBox::information( 0L, i18n( "Statistics:\n" @@ -693,9 +693,9 @@ void KomparePart::slotShowDiffstats( void ) "\n" "Number of hunks: %5\n" "Number of differences: %6") - .arg(filesInDiff).arg(diffFormat).arg(oldFile) - .arg(newFile).arg(noOfHunks).arg(noOfDiffs), - i18n("Diff Statistics"), TQString::null, false ); + .tqarg(filesInDiff).tqarg(diffFormat).tqarg(oldFile) + .tqarg(newFile).tqarg(noOfHunks).tqarg(noOfDiffs), + i18n("Diff Statistics"), TQString(), false ); } } diff --git a/kompare/komparepart/kompare_part.h b/kompare/komparepart/kompare_part.h index bd8d5621..33c19a64 100644 --- a/kompare/komparepart/kompare_part.h +++ b/kompare/komparepart/kompare_part.h @@ -60,12 +60,13 @@ class KomparePart : public KParts::ReadWritePart, public KompareInterface { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - KomparePart( TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name, const TQStringList & /*args*/); + KomparePart( TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name, const TQStringList & /*args*/); /** * Destructor @@ -182,7 +183,7 @@ protected: bool patchDir(); protected slots: - void slotSetStatus( Kompare::Status status ); + void slotSettqStatus( Kompare::tqStatus status ); void slotShowError( TQString error ); void slotSwap(); @@ -190,7 +191,7 @@ protected slots: void optionsPreferences(); void updateActions(); void updateCaption(); - void updateStatus(); + void updatetqStatus(); private: void cleanUpTemporaryFiles(); diff --git a/kompare/komparepart/kompare_qsplitter.h b/kompare/komparepart/kompare_qsplitter.h index 84585405..3c9345c7 100644 --- a/kompare/komparepart/kompare_qsplitter.h +++ b/kompare/komparepart/kompare_qsplitter.h @@ -1,13 +1,13 @@ /**************************************************************************** ** ** -** Definition of TQSplitter class +** Definition of QSplitter class ** ** Created : 980105 ** ** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. ** -** This file is part of the widgets module of the Qt GUI Toolkit. +** This file is part of the widgets module of the TQt GUI Toolkit. ** ** 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 @@ -21,16 +21,15 @@ ** **********************************************************************/ -#ifndef QSPLITTER_H -#define QSPLITTER_H +#ifndef KOMPARE_TQSPLITTER_H +#define KOMPARE_TQSPLITTER_H -#ifndef QT_H +#ifndef TQT_H #include "tqframe.h" #include "tqvaluelist.h" -#endif // QT_H - -#ifndef QT_NO_SPLITTER +#endif // TQT_H +#ifndef TQT_NO_SPLITTER //class QSplitterHandle; class QSplitterLayoutStruct; @@ -40,39 +39,40 @@ class QSplitterPrivate { public: QSplitterPrivate() - : opaque( FALSE ), firstShow( TRUE ), childrenCollapsible( TRUE ), + : opaque( FALSE ), firstShow( TRUE ), tqchildrenCollapsible( TRUE ), handleWidth( 0 ) { } TQPtrList<QSplitterLayoutStruct> list; bool opaque : 8; bool firstShow : 8; - bool childrenCollapsible : 8; + bool tqchildrenCollapsible : 8; int handleWidth; }; -class Q_EXPORT TQSplitter : public QFrame +class TQ_EXPORT QSplitter : public TQFrame { Q_OBJECT - Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation ) - Q_PROPERTY( bool opaqueResize READ opaqueResize WRITE setOpaqueResize ) - Q_PROPERTY( int handleWidth READ handleWidth WRITE setHandleWidth ) - Q_PROPERTY( bool childrenCollapsible READ childrenCollapsible WRITE setChildrenCollapsible ) + TQ_OBJECT + TQ_PROPERTY( Qt::Orientation orientation READ orientation WRITE setOrientation ) + TQ_PROPERTY( bool opaqueResize READ opaqueResize WRITE setOpaqueResize ) + TQ_PROPERTY( int handleWidth READ handleWidth WRITE setHandleWidth ) + TQ_PROPERTY( bool tqchildrenCollapsible READ tqchildrenCollapsible WRITE setChildrenCollapsible ) public: - // ### Qt 4.0: remove Auto from public API + // ### TQt 4.0: remove Auto from public API enum ResizeMode { Stretch, KeepSize, FollowSizeHint, Auto }; - TQSplitter( TQWidget* parent = 0, const char* name = 0 ); - TQSplitter( Orientation, TQWidget* parent = 0, const char* name = 0 ); - ~TQSplitter(); + QSplitter( TQWidget* tqparent = 0, const char* name = 0 ); + QSplitter( Qt::Orientation, TQWidget* tqparent = 0, const char* name = 0 ); + ~QSplitter(); - virtual void setOrientation( Orientation ); - Orientation orientation() const { return orient; } + virtual void setOrientation( Qt::Orientation ); + Qt::Orientation orientation() const { return orient; } - // ### Qt 4.0: make setChildrenCollapsible() and setCollapsible() virtual + // ### TQt 4.0: make setChildrenCollapsible() and setCollapsible() virtual void setChildrenCollapsible( bool ); - bool childrenCollapsible() const; + bool tqchildrenCollapsible() const; void setCollapsible( TQWidget *w, bool ); virtual void setResizeMode( TQWidget *w, ResizeMode ); @@ -83,8 +83,8 @@ public: void moveToLast( TQWidget * ); void refresh() { recalc( TRUE ); } - TQSize sizeHint() const; - TQSize minimumSizeHint() const; + TQSize tqsizeHint() const; + TQSize tqminimumSizeHint() const; TQValueList<int> sizes() const; void setSizes( TQValueList<int> ); @@ -100,9 +100,9 @@ protected: int idAfter( TQWidget* ) const; - void moveSplitter( QCOORD pos, int id ); - virtual void drawSplitter( TQPainter*, QCOORD x, QCOORD y, - QCOORD w, QCOORD h ); + void moveSplitter( TQCOORD pos, int id ); + virtual void drawSplitter( TQPainter*, TQCOORD x, TQCOORD y, + TQCOORD w, TQCOORD h ); void styleChange( TQStyle& ); int adjustPos( int, int ); virtual void setRubberband( int ); @@ -129,51 +129,52 @@ public: // private (: int findWidgetJustBeforeOrJustAfter( int id, int delta, int &collapsibleSize ); void updateHandles(); - inline QCOORD pick( const TQPoint &p ) const - { return orient == Horizontal ? p.x() : p.y(); } - inline QCOORD pick( const TQSize &s ) const - { return orient == Horizontal ? s.width() : s.height(); } + inline TQCOORD pick( const TQPoint &p ) const + { return orient ==Qt::Horizontal ? p.x() : p.y(); } + inline TQCOORD pick( const TQSize &s ) const + { return orient ==Qt::Horizontal ? s.width() : s.height(); } - inline QCOORD trans( const TQPoint &p ) const - { return orient == Vertical ? p.x() : p.y(); } - inline QCOORD trans( const TQSize &s ) const - { return orient == Vertical ? s.width() : s.height(); } + inline TQCOORD trans( const TQPoint &p ) const + { return orient ==Qt::Vertical ? p.x() : p.y(); } + inline TQCOORD trans( const TQSize &s ) const + { return orient ==Qt::Vertical ? s.width() : s.height(); } QSplitterPrivate *d; - Orientation orient; + Qt::Orientation orient; friend class QSplitterHandle; -#ifndef QT_NO_TEXTSTREAM -// moc doesn't like these. -// friend Q_EXPORT TQTextStream& operator<<( TQTextStream&, const TQSplitter& ); -// friend Q_EXPORT TQTextStream& operator>>( TQTextStream&, TQSplitter& ); +#ifndef TQT_NO_TEXTSTREAM +// tqmoc doesn't like these. +// friend TQ_EXPORT TQTextStream& operator<<( TQTextStream&, const QSplitter& ); +// friend TQ_EXPORT TQTextStream& operator>>( TQTextStream&, QSplitter& ); #endif public: -#if defined(Q_DISABLE_COPY) - TQSplitter( const TQSplitter & ); - TQSplitter& operator=( const TQSplitter & ); +#if defined(TQ_DISABLE_COPY) + QSplitter( const QSplitter & ); + QSplitter& operator=( const QSplitter & ); #endif }; -#ifndef QT_NO_TEXTSTREAM -Q_EXPORT TQTextStream& operator<<( TQTextStream&, const TQSplitter& ); -Q_EXPORT TQTextStream& operator>>( TQTextStream&, TQSplitter& ); +#ifndef TQT_NO_TEXTSTREAM +TQ_EXPORT TQTextStream& operator<<( TQTextStream&, const QSplitter& ); +TQ_EXPORT TQTextStream& operator>>( TQTextStream&, QSplitter& ); #endif -class QSplitterHandle : public QWidget +class QSplitterHandle : public TQWidget { Q_OBJECT + TQ_OBJECT public: - QSplitterHandle( Orientation o, - TQSplitter *parent, const char* name=0 ); - void setOrientation( Orientation o ); - Orientation orientation() const { return orient; } + QSplitterHandle( Qt::Orientation o, + QSplitter *tqparent, const char* name=0 ); + void setOrientation( Qt::Orientation o ); + Qt::Orientation orientation() const { return orient; } bool opaque() const { return s->opaqueResize(); } - TQSize sizeHint() const; + TQSize tqsizeHint() const; int id() const { return myId; } // d->list.at(id())->wid == this void setId( int i ) { myId = i; } @@ -185,19 +186,19 @@ protected: void mouseReleaseEvent( TQMouseEvent * ); public: // private (: - Orientation orient; + Qt::Orientation orient; bool opaq; int myId; - TQSplitter *s; + QSplitter *s; }; const uint Default = 2; -class QSplitterLayoutStruct : public Qt +class QSplitterLayoutStruct : public TQt { public: - QCOORD sizer; + TQCOORD sizer; uint isHandle : 1; uint collapsible : 2; uint resizeMode : 2; @@ -205,9 +206,9 @@ public: QSplitterLayoutStruct() : sizer( -1 ), collapsible( Default ) { } - QCOORD getSizer( Orientation orient ); + TQCOORD getSizer( Qt::Orientation orient ); }; -#endif // QT_NO_SPLITTER +#endif // TQT_NO_SPLITTER -#endif // QSPLITTER_H +#endif // KOMPARE_TQSPLITTER_H diff --git a/kompare/komparepart/kompareconnectwidget.cpp b/kompare/komparepart/kompareconnectwidget.cpp index 57185e5a..b0f4ab78 100644 --- a/kompare/komparepart/kompareconnectwidget.cpp +++ b/kompare/komparepart/kompareconnectwidget.cpp @@ -39,21 +39,21 @@ using namespace Diff2; KompareConnectWidgetFrame::KompareConnectWidgetFrame( KompareListView* left, KompareListView* right, ViewSettings* settings, - KompareSplitter* parent, + KompareSplitter* tqparent, const char* name ) : - QSplitterHandle(Horizontal, (TQSplitter *)parent, name), + QSplitterHandle(Qt::Horizontal, (QSplitter *)tqparent, name), m_wid ( left, right, settings, this, name ), m_label ( "", this ), m_layout ( this ) { - setSizePolicy ( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Ignored) ); - m_wid.setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored) ); - m_label.setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) ); + tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Ignored) ); + m_wid.tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored) ); + m_label.tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) ); m_label.setMargin(3); TQFrame* bottomLine = new TQFrame(this); bottomLine->setFrameShape(TQFrame::HLine); bottomLine->setFrameShadow ( TQFrame::Plain ); - bottomLine->setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) ); + bottomLine->tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) ); bottomLine->setFixedHeight(1); m_layout.setSpacing(0); m_layout.setMargin(0); @@ -66,19 +66,19 @@ KompareConnectWidgetFrame::~KompareConnectWidgetFrame() { } -TQSize KompareConnectWidgetFrame::sizeHint() const +TQSize KompareConnectWidgetFrame::tqsizeHint() const { - return TQSize(50, style().pixelMetric( TQStyle::PM_ScrollBarExtent ) ); + return TQSize(50, tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent ) ); } static int kMouseOffset; void KompareConnectWidgetFrame::mouseMoveEvent( TQMouseEvent *e ) { - if ( !(e->state()&LeftButton) ) + if ( !(e->state()&Qt::LeftButton) ) return; - QCOORD pos = s->pick( parentWidget()->mapFromGlobal(e->globalPos()) ) + TQCOORD pos = s->pick( tqparentWidget()->mapFromGlobal(e->globalPos()) ) - kMouseOffset; ((KompareSplitter*)s)->moveSplitter( pos, id() ); @@ -86,23 +86,23 @@ void KompareConnectWidgetFrame::mouseMoveEvent( TQMouseEvent *e ) void KompareConnectWidgetFrame::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() == LeftButton ) + if ( e->button() == Qt::LeftButton ) kMouseOffset = s->pick( e->pos() ); QSplitterHandle::mousePressEvent(e); } void KompareConnectWidgetFrame::mouseReleaseEvent( TQMouseEvent *e ) { - if ( !opaque() && e->button() == LeftButton ) { - QCOORD pos = s->pick( parentWidget()->mapFromGlobal(e->globalPos()) ) + if ( !opaque() && e->button() == Qt::LeftButton ) { + TQCOORD pos = s->pick( tqparentWidget()->mapFromGlobal(e->globalPos()) ) - kMouseOffset; ((KompareSplitter*)s)->moveSplitter( pos, id() ); } } KompareConnectWidget::KompareConnectWidget( KompareListView* left, KompareListView* right, - ViewSettings* settings, TQWidget* parent, const char* name ) - : TQWidget(parent, name), + ViewSettings* settings, TQWidget* tqparent, const char* name ) + : TQWidget(tqparent, name), m_settings( settings ), m_leftView( left ), m_rightView( right ), @@ -111,8 +111,8 @@ KompareConnectWidget::KompareConnectWidget( KompareListView* left, KompareListVi { // connect( m_settings, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT( slotDelayedRepaint() ) ); setBackgroundMode( NoBackground ); - setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) ); - setFocusProxy( parent->parentWidget() ); + tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) ); + setFocusProxy( tqparent->tqparentWidget() ); } KompareConnectWidget::~KompareConnectWidget() @@ -139,7 +139,7 @@ void KompareConnectWidget::slotSetSelection( const DiffModel* model, const Diffe void KompareConnectWidget::slotDelayedRepaint() { - TQTimer::singleShot( 0, this, TQT_SLOT( repaint() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( tqrepaint() ) ); } void KompareConnectWidget::slotSetSelection( const Difference* diff ) @@ -169,8 +169,8 @@ void KompareConnectWidget::paintEvent( TQPaintEvent* /* e */ ) int lastL = m_leftView->lastVisibleDifference(); int lastR = m_rightView->lastVisibleDifference(); - int first = firstL < 0 ? firstR : QMIN( firstL, firstR ); - int last = lastL < 0 ? lastR : QMAX( lastL, lastR ); + int first = firstL < 0 ? firstR : TQMIN( firstL, firstR ); + int last = lastL < 0 ? lastR : TQMAX( lastL, lastR ); // kdDebug(8106) << " left: " << firstL << " - " << lastL << endl; // kdDebug(8106) << " right: " << firstR << " - " << lastR << endl; @@ -190,13 +190,13 @@ void KompareConnectWidget::paintEvent( TQPaintEvent* /* e */ ) if ( TQApplication::reverseLayout() ) { - leftRect = m_rightView->itemRect( i ); - rightRect = m_leftView->itemRect( i ); + leftRect = m_rightView->tqitemRect( i ); + rightRect = m_leftView->tqitemRect( i ); } else { - leftRect = m_leftView->itemRect( i ); - rightRect = m_rightView->itemRect( i ); + leftRect = m_leftView->tqitemRect( i ); + rightRect = m_rightView->tqitemRect( i ); } int tl = leftRect.top(); diff --git a/kompare/komparepart/kompareconnectwidget.h b/kompare/komparepart/kompareconnectwidget.h index 5287552f..8282463b 100644 --- a/kompare/komparepart/kompareconnectwidget.h +++ b/kompare/komparepart/kompareconnectwidget.h @@ -32,13 +32,14 @@ class ViewSettings; class KompareListView; class KompareSplitter; -class KompareConnectWidget : public QWidget +class KompareConnectWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: KompareConnectWidget( KompareListView* left, KompareListView* right, - ViewSettings* settings, TQWidget* parent, const char* name = 0 ); + ViewSettings* settings, TQWidget* tqparent, const char* name = 0 ); ~KompareConnectWidget(); public slots: @@ -69,17 +70,18 @@ private: class KompareConnectWidgetFrame : public QSplitterHandle { Q_OBJECT + TQ_OBJECT public: KompareConnectWidgetFrame( KompareListView* left, KompareListView* right, - ViewSettings* settings, KompareSplitter* parent, const char* name = 0 ); + ViewSettings* settings, KompareSplitter* tqparent, const char* name = 0 ); ~KompareConnectWidgetFrame(); - TQSize sizeHint() const; + TQSize tqsizeHint() const; KompareConnectWidget* wid() { return &m_wid; } protected: - // stop the parent QSplitterHandle painting + // stop the tqparent QSplitterHandle painting void paintEvent( TQPaintEvent* /* e */ ) { } void mouseMoveEvent( TQMouseEvent * ); diff --git a/kompare/komparepart/komparelistview.cpp b/kompare/komparepart/komparelistview.cpp index 7e3ee953..7dd21845 100644 --- a/kompare/komparepart/komparelistview.cpp +++ b/kompare/komparepart/komparelistview.cpp @@ -47,19 +47,19 @@ using namespace Diff2; KompareListViewFrame::KompareListViewFrame( bool isSource, ViewSettings* settings, - KompareSplitter* parent, + KompareSplitter* tqparent, const char* name ): - TQFrame ( parent, name ), + TQFrame ( tqparent, name ), m_view ( isSource, settings, this, name ), m_label ( isSource?"Source":"Dest", this ), m_layout ( this ) { - setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored) ); - m_label.setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) ); + tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored) ); + m_label.tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) ); TQFrame *bottomLine = new TQFrame(this); bottomLine->setFrameShape(TQFrame::HLine); bottomLine->setFrameShadow ( TQFrame::Plain ); - bottomLine->setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) ); + bottomLine->tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) ); bottomLine->setFixedHeight(1); m_label.setMargin(3); m_layout.setSpacing(0); @@ -69,11 +69,11 @@ KompareListViewFrame::KompareListViewFrame( bool isSource, m_layout.addWidget(&m_view); connect( &m_view, TQT_SIGNAL(differenceClicked(const Diff2::Difference*)), - parent, TQT_SLOT(slotDifferenceClicked(const Diff2::Difference*)) ); + tqparent, TQT_SLOT(slotDifferenceClicked(const Diff2::Difference*)) ); - connect( parent, TQT_SIGNAL(scrollViewsToId(int)), &m_view, TQT_SLOT(scrollToId(int)) ); - connect( parent, TQT_SIGNAL(setXOffset(int)), &m_view, TQT_SLOT(setXOffset(int)) ); - connect( &m_view, TQT_SIGNAL(resized()), parent, TQT_SLOT(slotUpdateScrollBars()) ); + connect( tqparent, TQT_SIGNAL(scrollViewsToId(int)), &m_view, TQT_SLOT(scrollToId(int)) ); + connect( tqparent, TQT_SIGNAL(setXOffset(int)), &m_view, TQT_SLOT(setXOffset(int)) ); + connect( &m_view, TQT_SIGNAL(resized()), tqparent, TQT_SLOT(slotUpdateScrollBars()) ); } void KompareListViewFrame::slotSetModel( const DiffModel* model ) @@ -92,14 +92,14 @@ void KompareListViewFrame::slotSetModel( const DiffModel* model ) m_label.setText( model->destinationFile() ); } } else { - m_label.setText( TQString::null ); + m_label.setText( TQString() ); } } KompareListView::KompareListView( bool isSource, ViewSettings* settings, - TQWidget* parent, const char* name ) : - KListView( parent, name ), + TQWidget* tqparent, const char* name ) : + KListView( tqparent, name ), m_isSource( isSource ), m_settings( settings ), m_scrollId( -1 ), @@ -122,10 +122,10 @@ KompareListView::KompareListView( bool isSource, setFrameStyle( TQFrame::NoFrame ); setVScrollBarMode( TQScrollView::AlwaysOff ); setHScrollBarMode( TQScrollView::AlwaysOff ); - setFocusPolicy( TQWidget::NoFocus ); + setFocusPolicy( TQ_NoFocus ); setFont( m_settings->m_font ); setSpaces( m_settings->m_tabToNumberOfSpaces ); - setFocusProxy( parent->parentWidget() ); + setFocusProxy( tqparent->tqparentWidget() ); } KompareListView::~KompareListView() @@ -154,7 +154,7 @@ int KompareListView::firstVisibleDifference() } if( item ) - return m_items.findIndex( ((KompareListViewLineItem*)item)->diffItemParent() ); + return m_items.tqfindIndex( ((KompareListViewLineItem*)item)->diffItemParent() ); return -1; } @@ -177,12 +177,12 @@ int KompareListView::lastVisibleDifference() } if( item ) - return m_items.findIndex( ((KompareListViewLineItem*)item)->diffItemParent() ); + return m_items.tqfindIndex( ((KompareListViewLineItem*)item)->diffItemParent() ); return -1; } -TQRect KompareListView::itemRect( int i ) +TQRect KompareListView::tqitemRect( int i ) { TQListViewItem* item = itemAtIndex( i ); int x = 0; @@ -390,7 +390,7 @@ void KompareListView::slotApplyAllDifferences( bool apply ) TQPtrDictIterator<KompareListViewDiffItem> it ( m_itemDict ); for( ; it.current(); ++it ) it.current()->applyDifference( apply ); - repaint(); + tqrepaint(); } void KompareListView::slotApplyDifference( const Difference* diff, bool apply ) @@ -410,7 +410,7 @@ void KompareListView::setSpaces( int spaces ) void KompareListView::wheelEvent( TQWheelEvent* e ) { - e->ignore(); // we want the parent to catch wheel events + e->ignore(); // we want the tqparent to catch wheel events } void KompareListView::resizeEvent( TQResizeEvent* e ) @@ -420,28 +420,28 @@ void KompareListView::resizeEvent( TQResizeEvent* e ) kdDebug() << "resizeEvent " << endl; } -KompareListViewItem::KompareListViewItem( KompareListView* parent ) - : TQListViewItem( parent ), +KompareListViewItem::KompareListViewItem( KompareListView* tqparent ) + : TQListViewItem( tqparent ), m_scrollId( 0 ) { // kdDebug(8104) << "Created KompareListViewItem with scroll id " << m_scrollId << endl; } -KompareListViewItem::KompareListViewItem( KompareListView* parent, KompareListViewItem* after ) - : TQListViewItem( parent, after ), +KompareListViewItem::KompareListViewItem( KompareListView* tqparent, KompareListViewItem* after ) + : TQListViewItem( tqparent, after ), m_scrollId( after->scrollId() + after->maxHeight() ) { // kdDebug(8104) << "Created KompareListViewItem with scroll id " << m_scrollId << endl; } -KompareListViewItem::KompareListViewItem( KompareListViewItem* parent ) - : TQListViewItem( parent ), +KompareListViewItem::KompareListViewItem( KompareListViewItem* tqparent ) + : TQListViewItem( tqparent ), m_scrollId( 0 ) { } -KompareListViewItem::KompareListViewItem( KompareListViewItem* parent, KompareListViewItem* /*after*/ ) - : TQListViewItem( parent ), +KompareListViewItem::KompareListViewItem( KompareListViewItem* tqparent, KompareListViewItem* /*after*/ ) + : TQListViewItem( tqparent ), m_scrollId( 0 ) { } @@ -456,8 +456,8 @@ void KompareListViewItem::paintFocus( TQPainter* /* p */, const TQColorGroup& /* // Don't paint anything } -KompareListViewDiffItem::KompareListViewDiffItem( KompareListView* parent, Difference* difference ) - : KompareListViewItem( parent ), +KompareListViewDiffItem::KompareListViewDiffItem( KompareListView* tqparent, Difference* difference ) + : KompareListViewItem( tqparent ), m_difference( difference ), m_sourceItem( 0L ), m_destItem( 0L ) @@ -465,8 +465,8 @@ KompareListViewDiffItem::KompareListViewDiffItem( KompareListView* parent, Diffe init(); } -KompareListViewDiffItem::KompareListViewDiffItem( KompareListView* parent, KompareListViewItem* after, Difference* difference ) - : KompareListViewItem( parent, after ), +KompareListViewDiffItem::KompareListViewDiffItem( KompareListView* tqparent, KompareListViewItem* after, Difference* difference ) + : KompareListViewItem( tqparent, after ), m_difference( difference ), m_sourceItem( 0L ), m_destItem( 0L ) @@ -500,12 +500,12 @@ void KompareListViewDiffItem::applyDifference( bool apply ) kdDebug(8104) << "KompareListViewDiffItem::applyDifference( " << apply << " )" << endl; setVisibility(); setup(); - repaint(); + tqrepaint(); } int KompareListViewDiffItem::maxHeight() { - int lines = QMAX( m_difference->sourceLineCount(), m_difference->destinationLineCount() ); + int lines = TQMAX( m_difference->sourceLineCount(), m_difference->destinationLineCount() ); if( lines == 0 ) return BLANK_LINE_HEIGHT; else @@ -520,13 +520,13 @@ void KompareListViewDiffItem::setSelected( bool b ) m_sourceItem->firstChild() : m_destItem->firstChild(); while( item && item->isVisible() ) { - item->repaint(); + item->tqrepaint(); item = item->nextSibling(); } } -KompareListViewLineContainerItem::KompareListViewLineContainerItem( KompareListViewDiffItem* parent, bool isSource ) - : KompareListViewItem( parent ), +KompareListViewLineContainerItem::KompareListViewLineContainerItem( KompareListViewDiffItem* tqparent, bool isSource ) + : KompareListViewItem( tqparent ), m_isSource( isSource ) { // kdDebug(8104) << "isSource ? " << (isSource ? " Yes!" : " No!") << endl; @@ -554,7 +554,7 @@ void KompareListViewLineContainerItem::setup() KompareListViewDiffItem* KompareListViewLineContainerItem::diffItemParent() const { - return (KompareListViewDiffItem*)parent(); + return (KompareListViewDiffItem*)tqparent(); } int KompareListViewLineContainerItem::lineCount() const @@ -575,8 +575,8 @@ DifferenceString* KompareListViewLineContainerItem::lineAt( int i ) const diffItemParent()->difference()->destinationLineAt( i ); } -KompareListViewLineItem::KompareListViewLineItem( KompareListViewLineContainerItem* parent, int line, DifferenceString* text ) - : KompareListViewItem( parent ) +KompareListViewLineItem::KompareListViewLineItem( KompareListViewLineContainerItem* tqparent, int line, DifferenceString* text ) + : KompareListViewItem( tqparent ) { setText( COL_LINE_NO, TQString::number( line ) ); setText( COL_MAIN, text->string() ); @@ -618,7 +618,7 @@ void KompareListViewLineItem::paintCell( TQPainter * p, const TQColorGroup & cg, if ( diffItemParent()->isSelected() ) { p->setPen( bg.dark(135) ); - if ( this == parent()->firstChild() ) + if ( this == tqparent()->firstChild() ) p->drawLine( 0, 0, width, 0 ); if ( nextSibling() == 0 ) p->drawLine( 0, height() - 1, width, height() - 1 ); @@ -658,14 +658,14 @@ void KompareListViewLineItem::paintText( TQPainter* p, const TQColor& bg, int co // kdDebug(8104) << "TextChunk = \"" << textChunk << "\"" << endl; // kdDebug(8104) << "c->offset() = " << c->offset() << endl; // kdDebug(8104) << "prevValue = " << prevValue << endl; - textChunk.replace( TQChar('\t'), kompareListView()->spaces() ); + textChunk.tqreplace( TQChar('\t'), kompareListView()->spaces() ); prevValue = m->offset(); if ( m->type() == Marker::End ) { TQFont font( p->font() ); font.setBold( true ); p->setFont( font ); -// p->setPen( Qt::blue ); +// p->setPen( TQt::blue ); brush = changeBrush; } else @@ -673,7 +673,7 @@ void KompareListViewLineItem::paintText( TQPainter* p, const TQColor& bg, int co TQFont font( p->font() ); font.setBold( false ); p->setFont( font ); -// p->setPen( Qt::black ); +// p->setPen( TQt::black ); brush = normalBrush; } chunkWidth = p->fontMetrics().width( textChunk ); @@ -688,7 +688,7 @@ void KompareListViewLineItem::paintText( TQPainter* p, const TQColor& bg, int co { // Still have to draw some string without changes textChunk = m_text->string().mid( prevValue, kMax( ( unsigned int )1, m_text->string().length() - prevValue ) ); - textChunk.replace( TQChar('\t'), kompareListView()->spaces() ); + textChunk.tqreplace( TQChar('\t'), kompareListView()->spaces() ); // kdDebug(8104) << "TextChunk = \"" << textChunk << "\"" << endl; TQFont font( p->font() ); font.setBold( false ); @@ -713,12 +713,12 @@ void KompareListViewLineItem::paintText( TQPainter* p, const TQColor& bg, int co KompareListViewDiffItem* KompareListViewLineItem::diffItemParent() const { - KompareListViewLineContainerItem* p = (KompareListViewLineContainerItem*)parent(); + KompareListViewLineContainerItem* p = (KompareListViewLineContainerItem*)tqparent(); return p->diffItemParent(); } -KompareListViewBlankLineItem::KompareListViewBlankLineItem( KompareListViewLineContainerItem* parent ) - : KompareListViewLineItem( parent, 0, new DifferenceString() ) +KompareListViewBlankLineItem::KompareListViewBlankLineItem( KompareListViewLineContainerItem* tqparent ) + : KompareListViewLineItem( tqparent, 0, new DifferenceString() ) { } @@ -737,16 +737,16 @@ void KompareListViewBlankLineItem::paintText( TQPainter* p, const TQColor& bg, i } } -KompareListViewHunkItem::KompareListViewHunkItem( KompareListView* parent, DiffHunk* hunk, bool zeroHeight ) - : KompareListViewItem( parent ), +KompareListViewHunkItem::KompareListViewHunkItem( KompareListView* tqparent, DiffHunk* hunk, bool zeroHeight ) + : KompareListViewItem( tqparent ), m_zeroHeight( zeroHeight ), m_hunk( hunk ) { setSelectable( false ); } -KompareListViewHunkItem::KompareListViewHunkItem( KompareListView* parent, KompareListViewItem* after, DiffHunk* hunk, bool zeroHeight ) - : KompareListViewItem( parent, after ), +KompareListViewHunkItem::KompareListViewHunkItem( KompareListView* tqparent, KompareListViewItem* after, DiffHunk* hunk, bool zeroHeight ) + : KompareListViewItem( tqparent, after ), m_zeroHeight( zeroHeight ), m_hunk( hunk ) { diff --git a/kompare/komparepart/komparelistview.h b/kompare/komparepart/komparelistview.h index d617fafd..7c10ff6d 100644 --- a/kompare/komparepart/komparelistview.h +++ b/kompare/komparepart/komparelistview.h @@ -46,15 +46,16 @@ class KompareListViewLineContainerItem; class KompareListView : public KListView { Q_OBJECT + TQ_OBJECT public: - KompareListView( bool isSource, ViewSettings* settings, TQWidget* parent, const char* name = 0 ); + KompareListView( bool isSource, ViewSettings* settings, TQWidget* tqparent, const char* name = 0 ); virtual ~KompareListView(); KompareListViewItem* itemAtIndex( int i ); int firstVisibleDifference(); int lastVisibleDifference(); - TQRect itemRect( int i ); + TQRect tqitemRect( int i ); int minScrollId(); int maxScrollId(); int contentsWidth(); @@ -102,12 +103,13 @@ private: TQString m_spaces; }; -class KompareListViewFrame : public QFrame +class KompareListViewFrame : public TQFrame { Q_OBJECT + TQ_OBJECT public: - KompareListViewFrame( bool isSource, ViewSettings* settings, KompareSplitter* parent, const char* name = 0 ); + KompareListViewFrame( bool isSource, ViewSettings* settings, KompareSplitter* tqparent, const char* name = 0 ); virtual ~KompareListViewFrame() {}; KompareListView* view() { return &m_view; }; @@ -120,13 +122,13 @@ private: TQVBoxLayout m_layout; }; -class KompareListViewItem : public QListViewItem +class KompareListViewItem : public TQListViewItem { public: - KompareListViewItem( KompareListView* parent ); - KompareListViewItem( KompareListView* parent, KompareListViewItem* after ); - KompareListViewItem( KompareListViewItem* parent ); - KompareListViewItem( KompareListViewItem* parent, KompareListViewItem* after ); + KompareListViewItem( KompareListView* tqparent ); + KompareListViewItem( KompareListView* tqparent, KompareListViewItem* after ); + KompareListViewItem( KompareListViewItem* tqparent ); + KompareListViewItem( KompareListViewItem* tqparent, KompareListViewItem* after ); void paintFocus( TQPainter* p, const TQColorGroup& cg, const TQRect& r ); int scrollId() { return m_scrollId; }; @@ -142,8 +144,8 @@ private: class KompareListViewDiffItem : public KompareListViewItem { public: - KompareListViewDiffItem( KompareListView* parent, Diff2::Difference* difference ); - KompareListViewDiffItem( KompareListView* parent, KompareListViewItem* after, Diff2::Difference* difference ); + KompareListViewDiffItem( KompareListView* tqparent, Diff2::Difference* difference ); + KompareListViewDiffItem( KompareListView* tqparent, KompareListViewItem* after, Diff2::Difference* difference ); void setup(); void setSelected( bool b ); @@ -165,7 +167,7 @@ private: class KompareListViewLineContainerItem : public KompareListViewItem { public: - KompareListViewLineContainerItem( KompareListViewDiffItem* parent, bool isSource ); + KompareListViewLineContainerItem( KompareListViewDiffItem* tqparent, bool isSource ); void setup(); int maxHeight() { return 0; } @@ -182,7 +184,7 @@ private: class KompareListViewLineItem : public KompareListViewItem { public: - KompareListViewLineItem( KompareListViewLineContainerItem* parent, int line, Diff2::DifferenceString* text ); + KompareListViewLineItem( KompareListViewLineContainerItem* tqparent, int line, Diff2::DifferenceString* text ); virtual void setup(); int maxHeight() { return 0; } @@ -199,7 +201,7 @@ private: class KompareListViewBlankLineItem : public KompareListViewLineItem { public: - KompareListViewBlankLineItem( KompareListViewLineContainerItem* parent ); + KompareListViewBlankLineItem( KompareListViewLineContainerItem* tqparent ); void setup(); @@ -209,8 +211,8 @@ public: class KompareListViewHunkItem : public KompareListViewItem { public: - KompareListViewHunkItem( KompareListView* parent, Diff2::DiffHunk* hunk, bool zeroHeight = false ); - KompareListViewHunkItem( KompareListView* parent, KompareListViewItem* after, Diff2::DiffHunk* hunk, bool zeroHeight= false ); + KompareListViewHunkItem( KompareListView* tqparent, Diff2::DiffHunk* hunk, bool zeroHeight = false ); + KompareListViewHunkItem( KompareListView* tqparent, KompareListViewItem* after, Diff2::DiffHunk* hunk, bool zeroHeight= false ); void setup(); void paintCell( TQPainter* p, const TQColorGroup& cg, int column, int width, int align ); diff --git a/kompare/komparepart/kompareprefdlg.h b/kompare/komparepart/kompareprefdlg.h index e81da90c..5a8d969a 100644 --- a/kompare/komparepart/kompareprefdlg.h +++ b/kompare/komparepart/kompareprefdlg.h @@ -30,6 +30,7 @@ class ViewSettings; class KomparePrefDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: KomparePrefDlg( ViewSettings*, DiffSettings* ); ~KomparePrefDlg(); diff --git a/kompare/komparepart/komparesaveoptionsbase.ui b/kompare/komparepart/komparesaveoptionsbase.ui index 4c49b018..05b9be51 100644 --- a/kompare/komparepart/komparesaveoptionsbase.ui +++ b/kompare/komparepart/komparesaveoptionsbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>KompareSaveOptionsBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KompareSaveOptionsBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -22,7 +22,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>GroupBox2</cstring> </property> @@ -65,7 +65,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>m_CommandLineGB</cstring> </property> @@ -83,7 +83,7 @@ <property name="title"> <string>Command Line</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignLeft</set> </property> <property name="hAlign" stdset="0"> @@ -100,7 +100,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_CommandLineLabel</cstring> </property> @@ -110,7 +110,7 @@ </widget> </hbox> </widget> - <widget class="QButtonGroup" row="0" column="1"> + <widget class="TQButtonGroup" row="0" column="1"> <property name="name"> <cstring>m_OptionsGB</cstring> </property> @@ -127,7 +127,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_SmallerChangesCB</cstring> </property> @@ -138,7 +138,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_LargeFilesCB</cstring> </property> @@ -149,7 +149,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_IgnoreCaseCB</cstring> </property> @@ -157,7 +157,7 @@ <string>Ignore changes in case</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_ExpandTabsCB</cstring> </property> @@ -165,7 +165,7 @@ <string>Expand tabs to spaces</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_IgnoreEmptyLinesCB</cstring> </property> @@ -173,7 +173,7 @@ <string>Ignore added or removed empty lines</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_IgnoreWhiteSpaceCB</cstring> </property> @@ -181,7 +181,7 @@ <string>Ignore changes in whitespace</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_FunctionNamesCB</cstring> </property> @@ -192,7 +192,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_RecursiveCB</cstring> </property> @@ -203,7 +203,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_NewFilesCB</cstring> </property> @@ -219,7 +219,7 @@ </widget> </vbox> </widget> - <widget class="QButtonGroup" row="0" column="0"> + <widget class="TQButtonGroup" row="0" column="0"> <property name="name"> <cstring>m_FormatBG</cstring> </property> @@ -236,7 +236,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_ContextRB</cstring> </property> @@ -244,7 +244,7 @@ <string>Context</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_EdRB</cstring> </property> @@ -252,7 +252,7 @@ <string>Ed</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_NormalRB</cstring> </property> @@ -260,7 +260,7 @@ <string>Normal</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_RCSRB</cstring> </property> @@ -268,7 +268,7 @@ <string>RCS</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_UnifiedRB</cstring> </property> @@ -279,7 +279,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_SideBySideRB</cstring> </property> @@ -290,7 +290,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>m_ContextLinesLayout</cstring> </property> @@ -304,7 +304,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_ContextLinesLabel</cstring> </property> @@ -312,7 +312,7 @@ <string>Number of context lines:</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>m_ContextLinesSB</cstring> </property> @@ -332,5 +332,5 @@ </widget> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kompare/komparepart/komparesaveoptionswidget.cpp b/kompare/komparepart/komparesaveoptionswidget.cpp index 723093ac..cf6e9bf7 100644 --- a/kompare/komparepart/komparesaveoptionswidget.cpp +++ b/kompare/komparepart/komparesaveoptionswidget.cpp @@ -31,8 +31,8 @@ #include "komparesaveoptionswidget.h" KompareSaveOptionsWidget::KompareSaveOptionsWidget( TQString source, TQString destination, - DiffSettings * settings, TQWidget * parent ) - : KompareSaveOptionsBase( parent, "save options" ) + DiffSettings * settings, TQWidget * tqparent ) + : KompareSaveOptionsBase( tqparent, "save options" ) , m_source( source ) , m_destination( destination ) { diff --git a/kompare/komparepart/komparesaveoptionswidget.h b/kompare/komparepart/komparesaveoptionswidget.h index 905dcaa4..3618a2b2 100644 --- a/kompare/komparepart/komparesaveoptionswidget.h +++ b/kompare/komparepart/komparesaveoptionswidget.h @@ -30,8 +30,9 @@ class DiffSettings; class KompareSaveOptionsWidget : public KompareSaveOptionsBase, public KompareFunctions { Q_OBJECT + TQ_OBJECT public: - KompareSaveOptionsWidget( TQString source, TQString destination, DiffSettings* settings, TQWidget* parent ); + KompareSaveOptionsWidget( TQString source, TQString destination, DiffSettings* settings, TQWidget* tqparent ); ~KompareSaveOptionsWidget(); void saveOptions(); diff --git a/kompare/komparepart/komparesplitter.cpp b/kompare/komparepart/komparesplitter.cpp index 59106ffb..e962730a 100644 --- a/kompare/komparepart/komparesplitter.cpp +++ b/kompare/komparepart/komparesplitter.cpp @@ -34,37 +34,37 @@ using namespace Diff2; -KompareSplitter::KompareSplitter( ViewSettings *settings, TQWidget * parent, +KompareSplitter::KompareSplitter( ViewSettings *settings, TQWidget * tqparent, const char *name) : - TQSplitter( Horizontal, parent, name ), + QSplitter(Qt::Horizontal, tqparent, name ), m_settings( settings ) { - TQFrame *scrollFrame = new TQFrame( parent, "scrollFrame" ); + TQFrame *scrollFrame = new TQFrame( tqparent, "scrollFrame" ); reparent( scrollFrame, *(new TQPoint()), false ); // Set up the scrollFrame scrollFrame->setFrameStyle( TQFrame::NoFrame | TQFrame::Plain ); - scrollFrame->setLineWidth(scrollFrame->style().pixelMetric(TQStyle::PM_DefaultFrameWidth)); - TQGridLayout *pairlayout = new TQGridLayout(scrollFrame, 2, 2, 0); - m_vScroll = new TQScrollBar( TQScrollBar::Vertical, scrollFrame ); - pairlayout->addWidget( m_vScroll, 0, 1 ); - m_hScroll = new TQScrollBar( TQScrollBar::Horizontal, scrollFrame ); - pairlayout->addWidget( m_hScroll, 1, 0 ); + scrollFrame->setLineWidth(scrollFrame->tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth)); + TQGridLayout *pairtqlayout = new TQGridLayout(scrollFrame, 2, 2, 0); + m_vScroll = new TQScrollBar( Qt::Vertical, scrollFrame ); + pairtqlayout->addWidget( m_vScroll, 0, 1 ); + m_hScroll = new TQScrollBar( Qt::Horizontal, scrollFrame ); + pairtqlayout->addWidget( m_hScroll, 1, 0 ); new KompareListViewFrame(true, m_settings, this, "source"); new KompareListViewFrame(false, m_settings, this, "destination"); - pairlayout->addWidget( this, 0, 0 ); + pairtqlayout->addWidget( this, 0, 0 ); // set up our looks setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); - setLineWidth( style().pixelMetric( TQStyle::PM_DefaultFrameWidth ) ); + setLineWidth( tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) ); setHandleWidth(50); setChildrenCollapsible( false ); setFrameStyle( TQFrame::NoFrame ); - setSizePolicy( TQSizePolicy (TQSizePolicy::Ignored, TQSizePolicy::Ignored )); + tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Ignored, TQSizePolicy::Ignored )); setOpaqueResize( true ); - setFocusPolicy( TQWidget::WheelFocus ); + setFocusPolicy( TQ_WheelFocus ); connect( this, TQT_SIGNAL(configChanged()), TQT_SLOT(slotConfigChanged()) ); connect( this, TQT_SIGNAL(configChanged()), TQT_SLOT(slotDelayedRepaintHandles()) ); @@ -121,7 +121,7 @@ QSplitterLayoutStruct *KompareSplitter::addWidget( KompareListViewFrame *w, bool s->wid = newHandle; newHandle->setId( d->list.count() ); s->isHandle = TRUE; - s->sizer = pick( newHandle->sizeHint() ); + s->sizer = pick( newHandle->tqsizeHint() ); if ( prepend ) d->list.prepend( s ); else @@ -184,7 +184,7 @@ void KompareSplitter::childEvent( TQChildEvent *c ) } } -// This is from a private qt header (kernel/qlayoutengine_p.h). sorry. +// This is from a private qt header (kernel/qtqlayoutengine_p.h). sorry. TQSize qSmartMinSize( TQWidget *w ); static TQPoint toggle( TQWidget *w, TQPoint pos ) @@ -212,11 +212,11 @@ static TQPoint bottomRight( TQWidget *w ) if ( isCollapsed(w) ) { return toggle( w, w->pos() ) - TQPoint( 1, 1 ); } else { - return w->geometry().bottomRight(); + return w->tqgeometry().bottomRight(); } } -void KompareSplitter::moveSplitter( QCOORD p, int id ) +void KompareSplitter::moveSplitter( TQCOORD p, int id ) { QSplitterLayoutStruct *s = d->list.at( id ); int farMin; @@ -229,7 +229,7 @@ void KompareSplitter::moveSplitter( QCOORD p, int id ) int* ws = new int[d->list.count()]; TQWidget *w = 0; bool upLeft; - if ( TQApplication::reverseLayout() && orient == Horizontal ) { + if ( TQApplication::reverseLayout() && orient ==Qt::Horizontal ) { int q = p + s->wid->width(); doMove( FALSE, q, id - 1, -1, (p > max), poss, ws ); doMove( TRUE, q, id, -1, (p < min), poss, ws ); @@ -278,8 +278,8 @@ void KompareSplitter::doMove( bool backwards, int pos, int id, int delta, int dd = backwards ? pos - pick( topLeft(w) ) : pick( bottomRight(w) ) - pos + 1; if ( dd > 0 || (!isCollapsed(w) && !mayCollapse) ) { - dd = QMAX( pick(qSmartMinSize(w)), - QMIN(dd, pick(w->maximumSize())) ); + dd = TQMAX( pick(qSmartMinSize(w)), + TQMIN(dd, pick(w->tqmaximumSize())) ); } else { dd = 0; } @@ -391,12 +391,12 @@ void KompareSplitter::slotDelayedRepaintHandles() ((KompareConnectWidgetFrame*)curr->wid)->wid()->slotDelayedRepaint(); } -void KompareSplitter::repaintHandles() +void KompareSplitter::tqrepaintHandles() { QSplitterLayoutStruct *curr; for ( curr = d->list.first(); curr; curr = d->list.next() ) if ( curr->isHandle ) - ((KompareConnectWidgetFrame*)curr->wid)->wid()->repaint(); + ((KompareConnectWidgetFrame*)curr->wid)->wid()->tqrepaint(); } // Scrolling stuff @@ -410,7 +410,7 @@ void KompareSplitter::wheelEvent( TQWheelEvent* e ) // scroll lines... if ( e->orientation() == Qt::Vertical ) { - if ( e->state() & Qt::ControlButton ) + if ( e->state() & TQt::ControlButton ) if ( e->delta() < 0 ) // scroll down one page m_vScroll->addPage(); else // scroll up one page @@ -423,7 +423,7 @@ void KompareSplitter::wheelEvent( TQWheelEvent* e ) } else { - if ( e->state() & Qt::ControlButton ) + if ( e->state() & TQt::ControlButton ) if ( e->delta() < 0 ) // scroll right one page m_hScroll->addPage(); else // scroll left one page @@ -435,7 +435,7 @@ void KompareSplitter::wheelEvent( TQWheelEvent* e ) m_hScroll->subtractLine(); } e->accept(); - repaintHandles(); + tqrepaintHandles(); } void KompareSplitter::keyPressEvent( TQKeyEvent* e ) @@ -466,7 +466,7 @@ void KompareSplitter::keyPressEvent( TQKeyEvent* e ) break; } e->accept(); - repaintHandles(); + tqrepaintHandles(); } void KompareSplitter::timerTimeout() diff --git a/kompare/komparepart/komparesplitter.h b/kompare/komparepart/komparesplitter.h index 08d9d94d..e6dd8ae9 100644 --- a/kompare/komparepart/komparesplitter.h +++ b/kompare/komparepart/komparesplitter.h @@ -38,9 +38,10 @@ class ViewSettings; class KompareSplitter : public QSplitter { Q_OBJECT + TQ_OBJECT public: - KompareSplitter(ViewSettings *settings, TQWidget *parent=0, const char *name = 0); + KompareSplitter(ViewSettings *settings, TQWidget *tqparent=0, const char *name = 0); ~KompareSplitter(); signals: @@ -75,7 +76,7 @@ protected: void wheelEvent( TQWheelEvent* e ); void keyPressEvent( TQKeyEvent* e ); - void moveSplitter( QCOORD pos, int id ); + void moveSplitter( TQCOORD pos, int id ); private slots: void slotDelayedRepaintHandles(); @@ -88,7 +89,7 @@ private: void doMove( bool backwards, int pos, int id, int delta, bool mayCollapse, int* positions, int* widths ); - void repaintHandles(); + void tqrepaintHandles(); TQTimer* m_scrollTimer; bool restartTimer; diff --git a/kompare/kompareurldialog.cpp b/kompare/kompareurldialog.cpp index d24abaf9..be28295c 100644 --- a/kompare/kompareurldialog.cpp +++ b/kompare/kompareurldialog.cpp @@ -32,8 +32,8 @@ #include "kompareurldialog.h" -KompareURLDialog::KompareURLDialog( TQWidget *parent, const char *name ) - : KDialogBase( IconList, "", Ok|Cancel, Ok, parent, name ) +KompareURLDialog::KompareURLDialog( TQWidget *tqparent, const char *name ) + : KDialogBase( IconList, "", Ok|Cancel, Ok, tqparent, name ) { setIconListAllVisible(true); diff --git a/kompare/kompareurldialog.h b/kompare/kompareurldialog.h index 32bf450f..2bc2a929 100644 --- a/kompare/kompareurldialog.h +++ b/kompare/kompareurldialog.h @@ -41,9 +41,10 @@ class ViewSettings; class KompareURLDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KompareURLDialog( TQWidget* parent = 0, const char* name = 0 ); + KompareURLDialog( TQWidget* tqparent = 0, const char* name = 0 ); ~KompareURLDialog(); KURL getFirstURL() const; diff --git a/kompare/libdialogpages/diffpage.cpp b/kompare/libdialogpages/diffpage.cpp index 0423f1a5..e8cd73fd 100644 --- a/kompare/libdialogpages/diffpage.cpp +++ b/kompare/libdialogpages/diffpage.cpp @@ -42,7 +42,7 @@ #include "diffpage.h" -DiffPage::DiffPage( TQWidget* parent ) : PageBase( parent ), +DiffPage::DiffPage( TQWidget* tqparent ) : PageBase( tqparent ), m_ignoreRegExpDialog( 0 ) { addDiffTab(); @@ -146,7 +146,7 @@ void DiffPage::setDefaults() m_ignoreTabExpansionCheckBox->setChecked( false ); m_ignoreRegExpCheckBox->setChecked( false ); - m_ignoreRegExpEdit->setText( TQString::null ); + m_ignoreRegExpEdit->setText( TQString() ); m_locSpinBox->setValue( 3 ); @@ -160,7 +160,7 @@ void DiffPage::setDefaults() void DiffPage::slotShowRegExpEditor() { if ( ! m_ignoreRegExpDialog ) - m_ignoreRegExpDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString::null, this ); + m_ignoreRegExpDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) ); KRegExpEditorInterface *iface = static_cast<KRegExpEditorInterface *>( m_ignoreRegExpDialog->qt_cast( "KRegExpEditorInterface" ) ); @@ -203,20 +203,20 @@ void DiffPage::slotExcludeFileToggled( bool on ) void DiffPage::addDiffTab() { TQWidget* page = new TQWidget( this ); - TQVBoxLayout* layout = new TQVBoxLayout( page ); - layout->setSpacing( KDialog::spacingHint() ); - layout->setMargin( KDialog::marginHint() ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( page ); + tqlayout->setSpacing( KDialog::spacingHint() ); + tqlayout->setMargin( KDialog::marginHint() ); // add diff program selector m_diffProgramGroup = new TQVButtonGroup( i18n( "Diff Program" ), page ); - layout->addWidget( m_diffProgramGroup ); + tqlayout->addWidget( m_diffProgramGroup ); m_diffProgramGroup->setMargin( KDialog::marginHint() ); m_diffURLRequester = new KURLRequester( m_diffProgramGroup, "diffURLRequester" ); TQWhatsThis::add( m_diffURLRequester, i18n( "You can select a different diff program here. On Solaris the standard diff program does not support all the options that the GNU version does. This way you can select that version." ) ); - layout->addStretch( 1 ); - page->setMinimumSize( sizeHintForWidget( page ) ); + tqlayout->addStretch( 1 ); + page->setMinimumSize( tqsizeHintForWidget( page ) ); addTab( page, i18n( "&Diff" ) ); } @@ -224,14 +224,14 @@ void DiffPage::addDiffTab() void DiffPage::addFormatTab() { TQWidget* page = new TQWidget( this ); - TQVBoxLayout* layout = new TQVBoxLayout( page ); - layout->setSpacing( KDialog::spacingHint() ); - layout->setMargin( KDialog::marginHint() ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( page ); + tqlayout->setSpacing( KDialog::spacingHint() ); + tqlayout->setMargin( KDialog::marginHint() ); // add diff modes m_modeButtonGroup = new TQVButtonGroup( i18n( "Output Format" ), page ); TQWhatsThis::add( m_modeButtonGroup, i18n( "Select the format of the output generated by diff. Unified is the one that is used most frequently because it is very readable. The KDE developers like this format the best so use it for sending patches." ) ); - layout->addWidget( m_modeButtonGroup ); + tqlayout->addWidget( m_modeButtonGroup ); m_modeButtonGroup->setMargin( KDialog::marginHint() ); TQRadioButton* radioButton; @@ -245,7 +245,7 @@ void DiffPage::addFormatTab() // #lines of context (loc) TQHGroupBox* groupBox = new TQHGroupBox( i18n( "Lines of Context" ), page ); - layout->addWidget( groupBox ); + tqlayout->addWidget( groupBox ); groupBox->setMargin( KDialog::marginHint() ); TQLabel* label = new TQLabel( i18n( "Number of context lines:" ), groupBox ); @@ -253,8 +253,8 @@ void DiffPage::addFormatTab() TQWhatsThis::add( m_locSpinBox, i18n( "The number of context lines is normally 2 or 3. This makes the diff readable and applicable in most cases. More than 3 lines will only bloat the diff unnecessarily." ) ); label->setBuddy( m_locSpinBox ); - layout->addStretch( 1 ); - page->setMinimumSize( sizeHintForWidget( page ) ); + tqlayout->addStretch( 1 ); + page->setMinimumSize( tqsizeHintForWidget( page ) ); addTab( page, i18n( "&Format" ) ); } @@ -262,13 +262,13 @@ void DiffPage::addFormatTab() void DiffPage::addOptionsTab() { TQWidget* page = new TQWidget( this ); - TQVBoxLayout* layout = new TQVBoxLayout( page ); - layout->setSpacing( KDialog::spacingHint() ); - layout->setMargin( KDialog::marginHint() ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( page ); + tqlayout->setSpacing( KDialog::spacingHint() ); + tqlayout->setMargin( KDialog::marginHint() ); // add diff options TQVButtonGroup* optionButtonGroup = new TQVButtonGroup( i18n( "General" ), page ); - layout->addWidget( optionButtonGroup ); + tqlayout->addWidget( optionButtonGroup ); optionButtonGroup->setMargin( KDialog::marginHint() ); m_smallerCheckBox = new TQCheckBox( i18n( "&Look for smaller changes" ), optionButtonGroup ); @@ -278,13 +278,13 @@ void DiffPage::addOptionsTab() m_caseCheckBox = new TQCheckBox( i18n( "&Ignore changes in case" ), optionButtonGroup ); TQToolTip::add( m_caseCheckBox, i18n( "This corresponds to the -i diff option." ) ); - TQHBoxLayout* groupLayout = new TQHBoxLayout( layout, -1, "regexp_horizontal_layout" ); + TQHBoxLayout* groupLayout = new TQHBoxLayout( tqlayout, -1, "regexp_horizontal_layout" ); groupLayout->setMargin( KDialog::marginHint() ); m_ignoreRegExpCheckBox = new TQCheckBox( i18n( "Ignore regexp:" ), page ); TQToolTip::add( m_ignoreRegExpCheckBox, i18n( "This option corresponds to the -I diff option." ) ); groupLayout->addWidget( m_ignoreRegExpCheckBox ); - m_ignoreRegExpEdit = new KLineEdit( TQString::null, page, "regexplineedit" ); + m_ignoreRegExpEdit = new KLineEdit( TQString(), page, "regexplineedit" ); TQToolTip::add( m_ignoreRegExpEdit, i18n( "Add the regular expression here that you want to use\nto ignore lines that match it." ) ); groupLayout->addWidget( m_ignoreRegExpEdit ); @@ -298,7 +298,7 @@ void DiffPage::addOptionsTab() } TQVButtonGroup* moreOptionButtonGroup = new TQVButtonGroup( i18n( "Whitespace" ), page ); - layout->addWidget( moreOptionButtonGroup ); + tqlayout->addWidget( moreOptionButtonGroup ); moreOptionButtonGroup->setMargin( KDialog::marginHint() ); m_tabsCheckBox = new TQCheckBox( i18n( "E&xpand tabs to spaces in output" ), moreOptionButtonGroup ); @@ -312,8 +312,8 @@ void DiffPage::addOptionsTab() m_ignoreTabExpansionCheckBox = new TQCheckBox( i18n( "Igno&re changes due to tab expansion" ), moreOptionButtonGroup ); TQToolTip::add( m_ignoreTabExpansionCheckBox, i18n( "This option corresponds to the -E diff option." ) ); - layout->addStretch( 1 ); - page->setMinimumSize( sizeHintForWidget( page ) ); + tqlayout->addStretch( 1 ); + page->setMinimumSize( tqsizeHintForWidget( page ) ); addTab( page, i18n( "O&ptions" ) ); } @@ -321,16 +321,16 @@ void DiffPage::addOptionsTab() void DiffPage::addExcludeTab() { TQWidget* page = new TQWidget( this ); - TQVBoxLayout* layout = new TQVBoxLayout( page ); - layout->setSpacing( KDialog::spacingHint() ); - layout->setMargin( KDialog::marginHint() ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( page ); + tqlayout->setSpacing( KDialog::spacingHint() ); + tqlayout->setMargin( KDialog::marginHint() ); TQHGroupBox* excludeFilePatternGroupBox = new TQHGroupBox( i18n( "File Pattern to Exclude" ), page ); m_excludeFilePatternCheckBox = new TQCheckBox( "", excludeFilePatternGroupBox ); TQToolTip::add( m_excludeFilePatternCheckBox, i18n( "If this is checked you can enter a shell pattern in the text box on the right or select entries from the list." ) ); m_excludeFilePatternEditListBox = new KEditListBox( excludeFilePatternGroupBox, "exclude_file_pattern_editlistbox", false, KEditListBox::Add|KEditListBox::Remove ); TQToolTip::add( m_excludeFilePatternEditListBox, i18n( "Here you can enter or remove a shell pattern or select one or more entries from the list." ) ); - layout->addWidget( excludeFilePatternGroupBox ); + tqlayout->addWidget( excludeFilePatternGroupBox ); connect( m_excludeFilePatternCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotExcludeFilePatternToggled(bool))); @@ -342,12 +342,12 @@ void DiffPage::addExcludeTab() TQToolTip::add( m_excludeFileURLComboBox, i18n( "Here you can enter the URL of a file with shell patterns to ignore during the comparison of the folders." ) ); m_excludeFileURLRequester = new KURLRequester( m_excludeFileURLComboBox, excludeFileNameGroupBox, "exclude_file_name_urlrequester" ); TQToolTip::add( m_excludeFileURLRequester, i18n( "Any file you select in the dialog that pops up when you click it will be put in the dialog to the left of this button." ) ); - layout->addWidget( excludeFileNameGroupBox ); + tqlayout->addWidget( excludeFileNameGroupBox ); connect( m_excludeFileCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotExcludeFileToggled(bool))); - layout->addStretch( 1 ); - page->setMinimumSize( sizeHintForWidget( page ) ); + tqlayout->addStretch( 1 ); + page->setMinimumSize( tqsizeHintForWidget( page ) ); addTab( page, i18n( "&Exclude" ) ); } diff --git a/kompare/libdialogpages/diffpage.h b/kompare/libdialogpages/diffpage.h index 425d06df..eb0c85c0 100644 --- a/kompare/libdialogpages/diffpage.h +++ b/kompare/libdialogpages/diffpage.h @@ -40,6 +40,7 @@ class DiffSettings; class DiffPage : public PageBase { Q_OBJECT + TQ_OBJECT public: DiffPage( TQWidget* ); ~DiffPage(); diff --git a/kompare/libdialogpages/diffsettings.cpp b/kompare/libdialogpages/diffsettings.cpp index 6c2186f5..3f7cb1be 100644 --- a/kompare/libdialogpages/diffsettings.cpp +++ b/kompare/libdialogpages/diffsettings.cpp @@ -19,8 +19,8 @@ #include "diffsettings.h" -DiffSettings::DiffSettings( TQWidget* parent ) - : SettingsBase( parent ), +DiffSettings::DiffSettings( TQWidget* tqparent ) + : SettingsBase( tqparent ), m_linesOfContext( 0 ), m_format( Kompare::Unified ), m_largeFiles( false ), diff --git a/kompare/libdialogpages/diffsettings.h b/kompare/libdialogpages/diffsettings.h index a41308c0..3d219c96 100644 --- a/kompare/libdialogpages/diffsettings.h +++ b/kompare/libdialogpages/diffsettings.h @@ -29,8 +29,9 @@ class DiffSettings : public SettingsBase { Q_OBJECT + TQ_OBJECT public: - DiffSettings( TQWidget* parent ); + DiffSettings( TQWidget* tqparent ); virtual ~DiffSettings(); public: // some virtual functions that will be overloaded from the base class diff --git a/kompare/libdialogpages/filespage.cpp b/kompare/libdialogpages/filespage.cpp index f326bbde..606f38fe 100644 --- a/kompare/libdialogpages/filespage.cpp +++ b/kompare/libdialogpages/filespage.cpp @@ -31,12 +31,12 @@ #include "filessettings.h" #include "filespage.h" -FilesPage::FilesPage( TQWidget* parent ) : PageBase( parent ), m_URLChanged( false ) +FilesPage::FilesPage( TQWidget* tqparent ) : PageBase( tqparent ), m_URLChanged( false ) { TQWidget* page = new TQWidget( this ); - TQVBoxLayout* layout = new TQVBoxLayout( page ); - layout->setSpacing( KDialog::spacingHint() ); - layout->setMargin( KDialog::marginHint() ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( page ); + tqlayout->setSpacing( KDialog::spacingHint() ); + tqlayout->setMargin( KDialog::marginHint() ); m_firstGB = new TQGroupBox( 1, Qt::Vertical, "You have to set this moron :)", page ); m_firstURLComboBox = new KURLComboBox( KURLComboBox::Both, true, m_firstGB, "SourceURLComboBox" ); @@ -54,12 +54,12 @@ FilesPage::FilesPage( TQWidget* parent ) : PageBase( parent ), m_URLChanged( fal m_encodingComboBox = new TQComboBox( false, m_thirdGB, "encoding_combobox" ); m_encodingComboBox->insertStringList( KGlobal::charsets()->availableEncodingNames() ); - layout->addWidget( m_firstGB ); - layout->addWidget( m_secondGB ); - layout->addWidget( m_thirdGB ); + tqlayout->addWidget( m_firstGB ); + tqlayout->addWidget( m_secondGB ); + tqlayout->addWidget( m_thirdGB ); - layout->addStretch( 1 ); - page->setMinimumSize( sizeHintForWidget( page ) ); + tqlayout->addStretch( 1 ); + page->setMinimumSize( tqsizeHintForWidget( page ) ); addTab( page, i18n( "&Files" ) ); } diff --git a/kompare/libdialogpages/filespage.h b/kompare/libdialogpages/filespage.h index 08db4238..24380f7c 100644 --- a/kompare/libdialogpages/filespage.h +++ b/kompare/libdialogpages/filespage.h @@ -36,8 +36,9 @@ class FilesSettings; class FilesPage : PageBase { Q_OBJECT + TQ_OBJECT public: - FilesPage( TQWidget* parent ); + FilesPage( TQWidget* tqparent ); virtual ~FilesPage(); public: diff --git a/kompare/libdialogpages/filessettings.cpp b/kompare/libdialogpages/filessettings.cpp index 01b70076..fa982a12 100644 --- a/kompare/libdialogpages/filessettings.cpp +++ b/kompare/libdialogpages/filessettings.cpp @@ -21,8 +21,8 @@ #include "filessettings.h" -FilesSettings::FilesSettings( TQWidget* parent ) - : SettingsBase( parent ) +FilesSettings::FilesSettings( TQWidget* tqparent ) + : SettingsBase( tqparent ) { } diff --git a/kompare/libdialogpages/filessettings.h b/kompare/libdialogpages/filessettings.h index e38fff6d..a2e5898b 100644 --- a/kompare/libdialogpages/filessettings.h +++ b/kompare/libdialogpages/filessettings.h @@ -28,8 +28,9 @@ class KConfig; class FilesSettings : public SettingsBase { Q_OBJECT + TQ_OBJECT public: - FilesSettings( TQWidget* parent ); + FilesSettings( TQWidget* tqparent ); virtual ~FilesSettings(); public: diff --git a/kompare/libdialogpages/pagebase.cpp b/kompare/libdialogpages/pagebase.cpp index ef9aa1ea..4feda39b 100644 --- a/kompare/libdialogpages/pagebase.cpp +++ b/kompare/libdialogpages/pagebase.cpp @@ -22,7 +22,7 @@ #include "pagebase.h" -PageBase::PageBase( TQWidget* parent ) : KTabCtl( parent ) +PageBase::PageBase( TQWidget* tqparent ) : KTabCtl( tqparent ) { } @@ -33,12 +33,12 @@ PageBase::~PageBase() } /** No descriptions */ -TQSize PageBase::sizeHintForWidget( TQWidget* widget ) +TQSize PageBase::tqsizeHintForWidget( TQWidget* widget ) { // - // The size is computed by adding the sizeHint().height() of all - // widget children and taking the width of the widest child and adding - // layout()->margin() and layout()->spacing() + // The size is computed by adding the tqsizeHint().height() of all + // widget tqchildren and taking the width of the widest child and adding + // tqlayout()->margin() and tqlayout()->spacing() // // this code in this method has been ripped out of a file in kbabel @@ -47,17 +47,17 @@ TQSize PageBase::sizeHintForWidget( TQWidget* widget ) TQSize size; int numChild = 0; - TQObjectList *l = (TQObjectList*)(widget->children()); + TQObjectList l = widget->childrenListObject(); - for( uint i=0; i < l->count(); i++ ) + for( uint i=0; i < l.count(); i++ ) { - TQObject *o = l->at(i); + TQObject *o = l.at(i); if( o->isWidgetType() ) { numChild += 1; TQWidget *w=((TQWidget*)o); - TQSize s = w->sizeHint(); + TQSize s = w->tqsizeHint(); if( s.isEmpty() == true ) { s = TQSize( 50, 100 ); // Default size @@ -72,8 +72,8 @@ TQSize PageBase::sizeHintForWidget( TQWidget* widget ) if( numChild > 0 ) { - size.setHeight( size.height() + widget->layout()->spacing()*(numChild-1) ); - size += TQSize( widget->layout()->margin()*2, widget->layout()->margin()*2 + 1 ); + size.setHeight( size.height() + widget->tqlayout()->spacing()*(numChild-1) ); + size += TQSize( widget->tqlayout()->margin()*2, widget->tqlayout()->margin()*2 + 1 ); } else { diff --git a/kompare/libdialogpages/pagebase.h b/kompare/libdialogpages/pagebase.h index 0f188b36..32d4bca3 100644 --- a/kompare/libdialogpages/pagebase.h +++ b/kompare/libdialogpages/pagebase.h @@ -31,13 +31,14 @@ class PageBase : public KTabCtl { Q_OBJECT + TQ_OBJECT public: PageBase( TQWidget* ); ~PageBase(); public: /** No descriptions */ - TQSize sizeHintForWidget( TQWidget* widget ); + TQSize tqsizeHintForWidget( TQWidget* widget ); /** No descriptions */ virtual void restore(); /** No descriptions */ diff --git a/kompare/libdialogpages/settingsbase.cpp b/kompare/libdialogpages/settingsbase.cpp index 6e347719..36f70a1b 100644 --- a/kompare/libdialogpages/settingsbase.cpp +++ b/kompare/libdialogpages/settingsbase.cpp @@ -21,7 +21,7 @@ #include "settingsbase.h" -SettingsBase::SettingsBase( TQWidget* parent ) : TQObject( parent ) +SettingsBase::SettingsBase( TQWidget* tqparent ) : TQObject( tqparent ) { } diff --git a/kompare/libdialogpages/settingsbase.h b/kompare/libdialogpages/settingsbase.h index 4bbe13b5..79e556cc 100644 --- a/kompare/libdialogpages/settingsbase.h +++ b/kompare/libdialogpages/settingsbase.h @@ -27,11 +27,12 @@ class TQWidget; class KConfig; -class SettingsBase : public QObject +class SettingsBase : public TQObject { Q_OBJECT + TQ_OBJECT public: - SettingsBase( TQWidget* parent ); + SettingsBase( TQWidget* tqparent ); ~SettingsBase(); public: diff --git a/kompare/libdialogpages/viewpage.cpp b/kompare/libdialogpages/viewpage.cpp index 1deb9e21..d78f6b9a 100644 --- a/kompare/libdialogpages/viewpage.cpp +++ b/kompare/libdialogpages/viewpage.cpp @@ -33,48 +33,48 @@ #include "viewpage.h" #include "viewsettings.h" -ViewPage::ViewPage( TQWidget* parent ) : PageBase( parent ) +ViewPage::ViewPage( TQWidget* tqparent ) : PageBase( tqparent ) { TQWidget* page; - TQVBoxLayout* layout; - TQGroupBox* colorGroupBox; + TQVBoxLayout* tqlayout; + TQGroupBox* tqcolorGroupBox; TQHGroupBox* snolGroupBox; TQHGroupBox* tabGroupBox; TQLabel* label; page = new TQWidget( this ); - layout = new TQVBoxLayout( page ); - layout->setSpacing( KDialog::spacingHint() ); - layout->setMargin( KDialog::marginHint() ); + tqlayout = new TQVBoxLayout( page ); + tqlayout->setSpacing( KDialog::spacingHint() ); + tqlayout->setMargin( KDialog::marginHint() ); // add a groupbox - colorGroupBox = new TQGroupBox( 2, Qt::Horizontal, i18n( "Colors" ), page ); - layout->addWidget( colorGroupBox ); - colorGroupBox->setMargin( KDialog::marginHint() ); + tqcolorGroupBox = new TQGroupBox( 2, Qt::Horizontal, i18n( "Colors" ), page ); + tqlayout->addWidget( tqcolorGroupBox ); + tqcolorGroupBox->setMargin( KDialog::marginHint() ); // add the removeColor - label = new TQLabel( i18n( "Removed color:" ), colorGroupBox ); - m_removedColorButton = new KColorButton( colorGroupBox ); + label = new TQLabel( i18n( "Removed color:" ), tqcolorGroupBox ); + m_removedColorButton = new KColorButton( tqcolorGroupBox ); label->setBuddy( m_removedColorButton ); // add the changeColor - label = new TQLabel( i18n( "Changed color:" ), colorGroupBox ); - m_changedColorButton = new KColorButton( colorGroupBox ); + label = new TQLabel( i18n( "Changed color:" ), tqcolorGroupBox ); + m_changedColorButton = new KColorButton( tqcolorGroupBox ); label->setBuddy( m_changedColorButton ); // add the addColor - label = new TQLabel( i18n( "Added color:" ), colorGroupBox ); - m_addedColorButton = new KColorButton( colorGroupBox ); + label = new TQLabel( i18n( "Added color:" ), tqcolorGroupBox ); + m_addedColorButton = new KColorButton( tqcolorGroupBox ); label->setBuddy( m_addedColorButton ); // add the appliedColor - label = new TQLabel( i18n( "Applied color:" ), colorGroupBox ); - m_appliedColorButton = new KColorButton( colorGroupBox ); + label = new TQLabel( i18n( "Applied color:" ), tqcolorGroupBox ); + m_appliedColorButton = new KColorButton( tqcolorGroupBox ); label->setBuddy( m_appliedColorButton ); // scroll number of lines (snol) snolGroupBox = new TQHGroupBox( i18n( "Mouse Wheel" ), page ); - layout->addWidget( snolGroupBox ); + tqlayout->addWidget( snolGroupBox ); snolGroupBox->setMargin( KDialog::marginHint() ); label = new TQLabel( i18n( "Number of lines:" ), snolGroupBox ); @@ -84,25 +84,25 @@ ViewPage::ViewPage( TQWidget* parent ) : PageBase( parent ) // Temporarily here for testing... // number of spaces for a tab character stuff tabGroupBox = new TQHGroupBox( i18n( "Tabs to Spaces" ), page ); - layout->addWidget( tabGroupBox ); + tqlayout->addWidget( tabGroupBox ); tabGroupBox->setMargin( KDialog::marginHint() ); label = new TQLabel( i18n( "Number of spaces to convert a tab character to:" ), tabGroupBox ); m_tabSpinBox = new TQSpinBox( 1, 16, 1, tabGroupBox ); label->setBuddy( m_tabSpinBox ); - layout->addStretch( 1 ); - page->setMinimumSize( sizeHintForWidget( page ) ); + tqlayout->addStretch( 1 ); + page->setMinimumSize( tqsizeHintForWidget( page ) ); addTab( page, i18n( "A&ppearance" ) ); page = new TQWidget( this ); - layout = new TQVBoxLayout( page ); - layout->setSpacing( KDialog::spacingHint() ); - layout->setMargin( KDialog::marginHint() ); + tqlayout = new TQVBoxLayout( page ); + tqlayout->setSpacing( KDialog::spacingHint() ); + tqlayout->setMargin( KDialog::marginHint() ); TQHGroupBox* gb = new TQHGroupBox( i18n( "Text Font" ), page ); - layout->addWidget( gb ); + tqlayout->addWidget( gb ); gb->setMargin( KDialog::marginHint() ); label = new TQLabel( i18n( "Font:" ), gb ); @@ -113,8 +113,8 @@ ViewPage::ViewPage( TQWidget* parent ) : PageBase( parent ) m_fontSizeSpinBox = new TQSpinBox( 6, 24, 1, gb, "fontsize" ); label->setBuddy( m_fontSizeSpinBox ); - layout->addStretch( 1 ); - page->setMinimumSize( sizeHintForWidget( page ) ); + tqlayout->addStretch( 1 ); + page->setMinimumSize( tqsizeHintForWidget( page ) ); addTab( page, i18n( "&Fonts" ) ); } diff --git a/kompare/libdialogpages/viewpage.h b/kompare/libdialogpages/viewpage.h index 8682f268..75a6e335 100644 --- a/kompare/libdialogpages/viewpage.h +++ b/kompare/libdialogpages/viewpage.h @@ -33,6 +33,7 @@ class ViewSettings; class ViewPage : public PageBase { Q_OBJECT + TQ_OBJECT public: ViewPage( TQWidget* ); ~ViewPage(); diff --git a/kompare/libdialogpages/viewsettings.cpp b/kompare/libdialogpages/viewsettings.cpp index 403746b1..8e61117e 100644 --- a/kompare/libdialogpages/viewsettings.cpp +++ b/kompare/libdialogpages/viewsettings.cpp @@ -31,8 +31,8 @@ const TQColor ViewSettings::default_changeColor (237, 190, 190); const TQColor ViewSettings::default_addColor (190, 190, 237); const TQColor ViewSettings::default_appliedColor(237, 237, 190); -ViewSettings::ViewSettings( TQWidget* parent ) - : SettingsBase( parent ), +ViewSettings::ViewSettings( TQWidget* tqparent ) + : SettingsBase( tqparent ), m_removeColor( 0, 0, 0 ), m_changeColor( 0, 0, 0), m_addColor( 0, 0, 0), diff --git a/kompare/libdialogpages/viewsettings.h b/kompare/libdialogpages/viewsettings.h index 24bf8e9a..c7a2cfd5 100644 --- a/kompare/libdialogpages/viewsettings.h +++ b/kompare/libdialogpages/viewsettings.h @@ -29,13 +29,14 @@ class ViewSettings : public SettingsBase { Q_OBJECT + TQ_OBJECT public: static const TQColor default_removeColor; static const TQColor default_changeColor; static const TQColor default_addColor; static const TQColor default_appliedColor; - ViewSettings( TQWidget* parent ); + ViewSettings( TQWidget* tqparent ); ~ViewSettings(); public: // some virtual functions that will be overloaded from the base class diff --git a/kompare/libdiff2/cvsdiffparser.cpp b/kompare/libdiff2/cvsdiffparser.cpp index 47c79a0f..f29e422c 100644 --- a/kompare/libdiff2/cvsdiffparser.cpp +++ b/kompare/libdiff2/cvsdiffparser.cpp @@ -53,27 +53,27 @@ enum Kompare::Format CVSDiffParser::determineFormat() while( it != m_diffLines.end() ) { - if( (*it).find( normalRE, 0 ) == 0 ) + if( (*it).tqfind( normalRE, 0 ) == 0 ) { // kdDebug(8101) << "Difflines are from a Normal diff..." << endl; return Kompare::Normal; } - else if( (*it).find( unifiedRE, 0 ) == 0 ) + else if( (*it).tqfind( unifiedRE, 0 ) == 0 ) { // kdDebug(8101) << "Difflines are from a Unified diff..." << endl; return Kompare::Unified; } - else if( (*it).find( contextRE, 0 ) == 0 ) + else if( (*it).tqfind( contextRE, 0 ) == 0 ) { // kdDebug(8101) << "Difflines are from a Context diff..." << endl; return Kompare::Context; } - else if( (*it).find( rcsRE, 0 ) == 0 ) + else if( (*it).tqfind( rcsRE, 0 ) == 0 ) { // kdDebug(8101) << "Difflines are from a RCS diff..." << endl; return Kompare::RCS; } - else if( (*it).find( edRE, 0 ) == 0 ) + else if( (*it).tqfind( edRE, 0 ) == 0 ) { // kdDebug(8101) << "Difflines are from an ED diff..." << endl; return Kompare::Ed; diff --git a/kompare/libdiff2/difference.h b/kompare/libdiff2/difference.h index 87b8f556..4e440222 100644 --- a/kompare/libdiff2/difference.h +++ b/kompare/libdiff2/difference.h @@ -130,7 +130,7 @@ public: protected: void calculateHash() { - unsigned short const* str = reinterpret_cast<unsigned short const*>( m_string.unicode() ); + unsigned short const* str = reinterpret_cast<unsigned short const*>( m_string.tqunicode() ); const unsigned int len = m_string.length(); m_hash = 1315423911; diff --git a/kompare/libdiff2/diffhunk.cpp b/kompare/libdiff2/diffhunk.cpp index 3b48d796..efa7e12d 100644 --- a/kompare/libdiff2/diffhunk.cpp +++ b/kompare/libdiff2/diffhunk.cpp @@ -97,16 +97,16 @@ TQString DiffHunk::recreateHunk() const } // recreate header - hunk += TQString::fromLatin1( "@@ -%1,%3 +%2,%4 @@" ) - .arg( m_sourceLine ) - .arg( m_destinationLine ) - .arg( slc ) - .arg( dlc ); + hunk += TQString::tqfromLatin1( "@@ -%1,%3 +%2,%4 @@" ) + .tqarg( m_sourceLine ) + .tqarg( m_destinationLine ) + .tqarg( slc ) + .tqarg( dlc ); if ( !m_function.isEmpty() ) hunk += " " + m_function; - hunk += TQString::fromLatin1( "\n" ); + hunk += TQString::tqfromLatin1( "\n" ); hunk += differences; diff --git a/kompare/libdiff2/diffhunk.h b/kompare/libdiff2/diffhunk.h index a4194a3a..f71a6a84 100644 --- a/kompare/libdiff2/diffhunk.h +++ b/kompare/libdiff2/diffhunk.h @@ -33,7 +33,7 @@ public: enum Type { Normal, AddedByBlend }; public: - DiffHunk( int sourceLine, int destinationLine, TQString function = TQString::null, Type type = Normal ); + DiffHunk( int sourceLine, int destinationLine, TQString function = TQString(), Type type = Normal ); ~DiffHunk(); const DifferenceList& differences() const { return m_differences; }; diff --git a/kompare/libdiff2/diffmodel.cpp b/kompare/libdiff2/diffmodel.cpp index 1b3822b0..438055c6 100644 --- a/kompare/libdiff2/diffmodel.cpp +++ b/kompare/libdiff2/diffmodel.cpp @@ -79,10 +79,10 @@ void DiffModel::splitSourceInPathAndFileName() { int pos; - if( ( pos = m_source.findRev( "/" ) ) >= 0 ) + if( ( pos = m_source.tqfindRev( "/" ) ) >= 0 ) m_sourcePath = m_source.mid( 0, pos+1 ); - if( ( pos = m_source.findRev( "/" ) ) >= 0 ) + if( ( pos = m_source.tqfindRev( "/" ) ) >= 0 ) m_sourceFile = m_source.mid( pos+1, m_source.length() - pos ); else m_sourceFile = m_source; @@ -94,10 +94,10 @@ void DiffModel::splitDestinationInPathAndFileName() { int pos; - if( ( pos = m_destination.findRev( "/" ) )>= 0 ) + if( ( pos = m_destination.tqfindRev( "/" ) )>= 0 ) m_destinationPath = m_destination.mid( 0, pos+1 ); - if( ( pos = m_destination.findRev( "/" ) ) >= 0 ) + if( ( pos = m_destination.tqfindRev( "/" ) ) >= 0 ) m_destinationFile = m_destination.mid( pos+1, m_destination.length() - pos ); else m_destinationFile = m_source; @@ -152,13 +152,13 @@ TQString DiffModel::recreateDiff() const TQString diff; // recreate header - TQString tab = TQString::fromLatin1( "\t" ); - TQString nl = TQString::fromLatin1( "\n" ); - diff += TQString::fromLatin1( "--- %1\t%2" ).arg( m_source ).arg( m_sourceTimestamp ); + TQString tab = TQString::tqfromLatin1( "\t" ); + TQString nl = TQString::tqfromLatin1( "\n" ); + diff += TQString::tqfromLatin1( "--- %1\t%2" ).tqarg( m_source ).tqarg( m_sourceTimestamp ); if ( !m_sourceRevision.isEmpty() ) diff += tab + m_sourceRevision; diff += nl; - diff += TQString::fromLatin1( "+++ %1\t%2" ).arg( m_destination ).arg( m_destinationTimestamp ); + diff += TQString::tqfromLatin1( "+++ %1\t%2" ).tqarg( m_destination ).tqarg( m_destinationTimestamp ); if ( !m_destinationRevision.isEmpty() ) diff += tab + m_destinationRevision; diff += nl; @@ -393,10 +393,10 @@ bool DiffModel::setSelectedDifference( Difference* diff ) if ( diff != m_selectedDifference ) { - if ( ( m_differences.findIndex( diff ) ) == -1 ) + if ( ( m_differences.tqfindIndex( diff ) ) == -1 ) return false; // Dont set m_diffIndex if it cant be found - m_diffIndex = m_differences.findIndex( diff ); + m_diffIndex = m_differences.tqfindIndex( diff ); kdDebug( 8101 ) << "m_diffIndex = " << m_diffIndex << endl; m_selectedDifference = diff; } diff --git a/kompare/libdiff2/diffmodel.h b/kompare/libdiff2/diffmodel.h index 3b957b89..3467b55b 100644 --- a/kompare/libdiff2/diffmodel.h +++ b/kompare/libdiff2/diffmodel.h @@ -32,9 +32,10 @@ namespace Diff2 class DiffHunk; class Difference; -class DiffModel : public QObject +class DiffModel : public TQObject { Q_OBJECT + TQ_OBJECT public: DiffModel( const TQString& srcBaseURL, const TQString& destBaseURL ); @@ -60,7 +61,7 @@ public: DifferenceList* allDifferences(); - int findDifference( Difference* diff ) const { return m_differences.findIndex( diff ); } + int findDifference( Difference* diff ) const { return m_differences.tqfindIndex( diff ); } Difference* firstDifference(); Difference* lastDifference(); diff --git a/kompare/libdiff2/diffparser.cpp b/kompare/libdiff2/diffparser.cpp index d85256d2..b077ec20 100644 --- a/kompare/libdiff2/diffparser.cpp +++ b/kompare/libdiff2/diffparser.cpp @@ -49,27 +49,27 @@ enum Kompare::Format DiffParser::determineFormat() while( it != m_diffLines.end() ) { kdDebug(8101) << (*it) << endl; - if( (*it).find( normalRE, 0 ) == 0 ) + if( (*it).tqfind( normalRE, 0 ) == 0 ) { kdDebug(8101) << "Difflines are from a Normal diff..." << endl; return Kompare::Normal; } - else if( (*it).find( unifiedRE, 0 ) == 0 ) + else if( (*it).tqfind( unifiedRE, 0 ) == 0 ) { kdDebug(8101) << "Difflines are from a Unified diff..." << endl; return Kompare::Unified; } - else if( (*it).find( contextRE, 0 ) == 0 ) + else if( (*it).tqfind( contextRE, 0 ) == 0 ) { kdDebug(8101) << "Difflines are from a Context diff..." << endl; return Kompare::Context; } - else if( (*it).find( rcsRE, 0 ) == 0 ) + else if( (*it).tqfind( rcsRE, 0 ) == 0 ) { kdDebug(8101) << "Difflines are from an RCS diff..." << endl; return Kompare::RCS; } - else if( (*it).find( edRE, 0 ) == 0 ) + else if( (*it).tqfind( edRE, 0 ) == 0 ) { kdDebug(8101) << "Difflines are from an ED diff..." << endl; return Kompare::Ed; diff --git a/kompare/libdiff2/kompare.h b/kompare/libdiff2/kompare.h index 8f6b7fe5..1c21db07 100644 --- a/kompare/libdiff2/kompare.h +++ b/kompare/libdiff2/kompare.h @@ -63,7 +63,7 @@ namespace Kompare UnknownDiffMode // Use to initialize the Info struct }; - enum Status { + enum tqStatus { RunningDiff, Parsing, FinishedParsing, @@ -135,7 +135,7 @@ public: relative += "../"; } - relative += TQString( to ).replace( 0, root.path(1).length(), "" ); + relative += TQString( to ).tqreplace( 0, root.path(1).length(), "" ); return relative; } diff --git a/kompare/libdiff2/komparemodellist.cpp b/kompare/libdiff2/komparemodellist.cpp index db10f4c3..dc39c1bc 100644 --- a/kompare/libdiff2/komparemodellist.cpp +++ b/kompare/libdiff2/komparemodellist.cpp @@ -46,8 +46,8 @@ using namespace Diff2; -KompareModelList::KompareModelList( DiffSettings* diffSettings, struct Kompare::Info& info, TQObject* parent, const char* name ) - : TQObject( parent, name ), +KompareModelList::KompareModelList( DiffSettings* diffSettings, struct Kompare::Info& info, TQObject* tqparent, const char* name ) + : TQObject( tqparent, name ), m_diffProcess( 0 ), m_diffSettings( diffSettings ), m_models( 0 ), @@ -58,34 +58,34 @@ KompareModelList::KompareModelList( DiffSettings* diffSettings, struct Kompare:: m_info( info ), m_textCodec( 0 ) { - m_applyDifference = new KAction( i18n("&Apply Difference"), "1rightarrow", Qt::Key_Space, + m_applyDifference = new KAction( i18n("&Apply Difference"), "1rightarrow", TQt::Key_Space, this, TQT_SLOT(slotActionApplyDifference()), - (( KomparePart* )parent)->actionCollection(), "difference_apply" ); - m_unApplyDifference = new KAction( i18n("Un&apply Difference"), "1leftarrow", Qt::Key_BackSpace, + (( KomparePart* )tqparent)->actionCollection(), "difference_apply" ); + m_unApplyDifference = new KAction( i18n("Un&apply Difference"), "1leftarrow", TQt::Key_BackSpace, this, TQT_SLOT(slotActionUnApplyDifference()), - (( KomparePart* )parent)->actionCollection(), "difference_unapply" ); - m_applyAll = new KAction( i18n("App&ly All"), "2rightarrow", Qt::CTRL + Qt::Key_A, + (( KomparePart* )tqparent)->actionCollection(), "difference_unapply" ); + m_applyAll = new KAction( i18n("App&ly All"), "2rightarrow", TQt::CTRL + TQt::Key_A, this, TQT_SLOT(slotActionApplyAllDifferences()), - (( KomparePart* )parent)->actionCollection(), "difference_applyall" ); - m_unapplyAll = new KAction( i18n("&Unapply All"), "2leftarrow", Qt::CTRL + Qt::Key_U, + (( KomparePart* )tqparent)->actionCollection(), "difference_applyall" ); + m_unapplyAll = new KAction( i18n("&Unapply All"), "2leftarrow", TQt::CTRL + TQt::Key_U, this, TQT_SLOT(slotActionUnapplyAllDifferences()), - (( KomparePart* )parent)->actionCollection(), "difference_unapplyall" ); - m_previousFile = new KAction( i18n("P&revious File"), "2uparrow", Qt::CTRL + Qt::Key_PageUp, + (( KomparePart* )tqparent)->actionCollection(), "difference_unapplyall" ); + m_previousFile = new KAction( i18n("P&revious File"), "2uparrow", TQt::CTRL + TQt::Key_PageUp, this, TQT_SLOT(slotPreviousModel()), - (( KomparePart* )parent)->actionCollection(), "difference_previousfile" ); - m_nextFile = new KAction( i18n("N&ext File"), "2downarrow", Qt::CTRL + Qt::Key_PageDown, + (( KomparePart* )tqparent)->actionCollection(), "difference_previousfile" ); + m_nextFile = new KAction( i18n("N&ext File"), "2downarrow", TQt::CTRL + TQt::Key_PageDown, this, TQT_SLOT(slotNextModel()), - (( KomparePart* )parent)->actionCollection(), "difference_nextfile" ); - m_previousDifference = new KAction( i18n("&Previous Difference"), "1uparrow", Qt::CTRL + Qt::Key_Up, + (( KomparePart* )tqparent)->actionCollection(), "difference_nextfile" ); + m_previousDifference = new KAction( i18n("&Previous Difference"), "1uparrow", TQt::CTRL + TQt::Key_Up, this, TQT_SLOT(slotPreviousDifference()), - (( KomparePart* )parent)->actionCollection(), "difference_previous" ); - m_nextDifference = new KAction( i18n("&Next Difference"), "1downarrow", Qt::CTRL + Qt::Key_Down, + (( KomparePart* )tqparent)->actionCollection(), "difference_previous" ); + m_nextDifference = new KAction( i18n("&Next Difference"), "1downarrow", TQt::CTRL + TQt::Key_Down, this, TQT_SLOT(slotNextDifference()), - (( KomparePart* )parent)->actionCollection(), "difference_next" ); + (( KomparePart* )tqparent)->actionCollection(), "difference_next" ); m_previousDifference->setEnabled( false ); m_nextDifference->setEnabled( false ); - m_save = KStdAction::save( this, TQT_SLOT(slotSaveDestination()), ((KomparePart*)parent)->actionCollection() ); + m_save = KStdAction::save( this, TQT_SLOT(slotSaveDestination()), ((KomparePart*)tqparent)->actionCollection() ); m_save->setEnabled( false ); updateModelListActions(); @@ -235,7 +235,7 @@ bool KompareModelList::openFileAndDiff( const TQString& file, const TQString& di if ( parseDiffOutput( readFile( diff ) ) != 0 ) { - emit error( i18n( "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff file.</qt>" ).arg( diff ) ); + emit error( i18n( "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff file.</qt>" ).tqarg( diff ) ); return false; } @@ -243,7 +243,7 @@ bool KompareModelList::openFileAndDiff( const TQString& file, const TQString& di if ( !blendOriginalIntoModelList( file ) ) { kdDebug(8101) << "Oops cant blend original file into modellist : " << file << endl; - emit( i18n( "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</qt>" ).arg( diff ).arg( file ) ); + emit( i18n( "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</qt>" ).tqarg( diff ).tqarg( file ) ); return false; } @@ -259,7 +259,7 @@ bool KompareModelList::openDirAndDiff( const TQString& dir, const TQString& diff if ( parseDiffOutput( readFile( diff ) ) != 0 ) { - emit error( i18n( "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff file.</qt>" ).arg( diff ) ); + emit error( i18n( "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff file.</qt>" ).tqarg( diff ) ); return false; } @@ -268,7 +268,7 @@ bool KompareModelList::openDirAndDiff( const TQString& dir, const TQString& diff { // Trouble blending the original into the model kdDebug(8101) << "Oops cant blend original dir into modellist : " << dir << endl; - emit error( i18n( "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>.</qt>" ).arg( diff ).arg( dir ) ); + emit error( i18n( "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>.</qt>" ).tqarg( diff ).tqarg( dir ) ); return false; } @@ -347,7 +347,7 @@ bool KompareModelList::saveDestination( DiffModel* model ) temp->close(); if( temp->status() != 0 ) { - emit error( i18n( "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" ).arg( temp->name() ) ); + emit error( i18n( "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" ).tqarg( temp->name() ) ); temp->unlink(); delete temp; return false; @@ -361,26 +361,26 @@ bool KompareModelList::saveDestination( DiffModel* model ) kdDebug(8101) << "Tempfilename : " << temp->name() << endl; kdDebug(8101) << "DestinationURL : " << destination << endl; KIO::UDSEntry entry; - if ( !KIO::NetAccess::stat( KURL( destination ).path(), entry, (TQWidget*)parent() ) ) + if ( !KIO::NetAccess::stat( KURL( destination ).path(), entry, (TQWidget*)tqparent() ) ) { - if ( !KIO::NetAccess::mkdir( KURL( destination ).path(), (TQWidget*)parent() ) ) + if ( !KIO::NetAccess::mkdir( KURL( destination ).path(), (TQWidget*)tqparent() ) ) { emit error( i18n( "<qt>Could not create destination directory <b>%1</b>.\nThe file has not been saved.</qt>" ) ); return false; } } - result = KIO::NetAccess::upload( temp->name(), KURL( destination ), (TQWidget*)parent() ); + result = KIO::NetAccess::upload( temp->name(), KURL( destination ), (TQWidget*)tqparent() ); } else { kdDebug(8101) << "Tempfilename : " << temp->name() << endl; kdDebug(8101) << "DestinationURL : " << m_destination << endl; - result = KIO::NetAccess::upload( temp->name(), KURL( m_destination ), (TQWidget*)parent() ); + result = KIO::NetAccess::upload( temp->name(), KURL( m_destination ), (TQWidget*)tqparent() ); } if ( !result ) { - emit error( i18n( "<qt>Could not upload the temporary file to the destination location <b>%1</b>. The temporary file is still available under: <b>%2</b>. You can manually copy it to the right place.</qt>" ).arg( m_destination ).arg( temp->name() ) ); + emit error( i18n( "<qt>Could not upload the temporary file to the destination location <b>%1</b>. The temporary file is still available under: <b>%2</b>. You can manually copy it to the right place.</qt>" ).tqarg( m_destination ).tqarg( temp->name() ) ); } else { @@ -489,12 +489,12 @@ TQStringList KompareModelList::split( const TQString& fileContents ) int pos = 0; unsigned int oldpos = 0; // split that does not strip the split char -#ifdef QT_OS_MAC +#ifdef TQT_OS_MAC const char split = '\r'; #else const char split = '\n'; #endif - while ( ( pos = contents.find( split, oldpos ) ) >= 0 ) + while ( ( pos = contents.tqfind( split, oldpos ) ) >= 0 ) { list.append( contents.mid( oldpos, pos - oldpos + 1 ) ); oldpos = pos + 1; @@ -613,7 +613,7 @@ void KompareModelList::slotWriteDiffOutput( bool success ) emit error( i18n( "Could not write to the temporary file." ) ); } - KIO::NetAccess::upload( m_diffTemp->name(), KURL( m_diffURL ), (TQWidget*)parent() ); + KIO::NetAccess::upload( m_diffTemp->name(), KURL( m_diffURL ), (TQWidget*)tqparent() ); emit status( Kompare::FinishedWritingDiff ); } @@ -633,11 +633,11 @@ void KompareModelList::slotSelectionChanged( const Diff2::DiffModel* model, cons // This method will signal all the other objects about a change in selection, // it will emit setSelection( const DiffModel*, const Difference* ) to all who are connected kdDebug(8101) << "KompareModelList::slotSelectionChanged( " << model << ", " << diff << " )" << endl; - kdDebug(8101) << "Sender is : " << sender()->className() << endl; + kdDebug(8101) << "Sender is : " << TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->className() << endl; // kdDebug(8101) << kdBacktrace() << endl; m_selectedModel = const_cast<DiffModel*>(model); - m_modelIndex = m_models->findIndex( m_selectedModel ); + m_modelIndex = m_models->tqfindIndex( m_selectedModel ); kdDebug( 8101 ) << "m_modelIndex = " << m_modelIndex << endl; m_selectedDifference = const_cast<Difference*>(diff); @@ -668,7 +668,7 @@ void KompareModelList::slotSelectionChanged( const Diff2::Difference* diff ) // This method will emit setSelection( const Difference* ) to whomever is listening // when for instance in kompareview the selection has changed kdDebug(8101) << "KompareModelList::slotSelectionChanged( " << diff << " )" << endl; - kdDebug(8101) << "Sender is : " << sender()->className() << endl; + kdDebug(8101) << "Sender is : " << TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->className() << endl; m_selectedDifference = const_cast<Difference*>(diff); @@ -901,7 +901,7 @@ bool KompareModelList::blendOriginalIntoModelList( const TQString& localURL ) if ( fi.isDir() ) { // is a dir kdDebug() << "Blend Dir" << endl; -// TQDir dir( localURL, TQString::null, TQDir::Name|TQDir::DirsFirst, TQDir::All ); +// TQDir dir( localURL, TQString(), TQDir::Name|TQDir::DirsFirst, TQDir::All ); DiffModelListIterator modelIt = m_models->begin(); DiffModelListIterator mEnd = m_models->end(); for ( ; modelIt != mEnd; ++modelIt ) @@ -1086,7 +1086,7 @@ bool KompareModelList::blendFile( DiffModel* model, const TQString& fileContents case Difference::Change: kdDebug(8101) << "Change" << endl; - //QStringListConstIterator saveIt = linesIt; + //TQStringListConstIterator saveIt = linesIt; for ( int i = 0; i < diff->sourceLineCount(); i++ ) { @@ -1255,10 +1255,10 @@ bool KompareModelList::setSelectedModel( DiffModel* model ) if ( model != m_selectedModel ) { - if ( m_models->findIndex( model ) == -1 ) + if ( m_models->tqfindIndex( model ) == -1 ) return false; kdDebug(8101) << "m_selectedModel (was) = " << m_selectedModel << endl; - m_modelIndex = m_models->findIndex( model ); + m_modelIndex = m_models->tqfindIndex( model ); kdDebug(8101) << "m_selectedModel (is) = " << m_selectedModel << endl; m_selectedModel = model; } @@ -1272,7 +1272,7 @@ void KompareModelList::updateModelListActions() { if ( m_models && m_selectedModel && m_selectedDifference ) { - if ( ( ( KomparePart* )parent() )->isReadWrite() ) + if ( ( ( KomparePart* )tqparent() )->isReadWrite() ) { if ( m_selectedModel->appliedCount() != m_selectedModel->differenceCount() ) m_applyAll->setEnabled( true ); diff --git a/kompare/libdiff2/komparemodellist.h b/kompare/libdiff2/komparemodellist.h index afeb770f..3b7b6bff 100644 --- a/kompare/libdiff2/komparemodellist.h +++ b/kompare/libdiff2/komparemodellist.h @@ -38,11 +38,12 @@ class KompareProcess; namespace Diff2 { -class KompareModelList : public QObject +class KompareModelList : public TQObject { Q_OBJECT + TQ_OBJECT public: - KompareModelList( DiffSettings* diffSettings, struct Kompare::Info& info, TQObject* parent = 0, const char* name = 0 ); + KompareModelList( DiffSettings* diffSettings, struct Kompare::Info& info, TQObject* tqparent = 0, const char* name = 0 ); ~KompareModelList(); public: @@ -87,11 +88,11 @@ public: int appliedCount() const; const DiffModel* modelAt( int i ) const { return *( m_models->at( i ) ); }; - int findModel( DiffModel* model ) const { return m_models->findIndex( model ); }; + int findModel( DiffModel* model ) const { return m_models->tqfindIndex( model ); }; bool isModified() const; - int currentModel() const { return m_models->findIndex( m_selectedModel ); }; + int currentModel() const { return m_models->tqfindIndex( m_selectedModel ); }; int currentDifference() const { return m_selectedModel ? m_selectedModel->findDifference( m_selectedDifference ) : -1; }; const DiffModel* selectedModel() const { return m_selectedModel; }; @@ -113,7 +114,7 @@ protected: bool blendFile( DiffModel* model, const TQString& lines ); signals: - void status( Kompare::Status status ); + void status( Kompare::tqStatus status ); void setStatusBarModelInfo( int modelIndex, int differenceIndex, int modelCount, int differenceCount, int appliedCount ); void error( TQString error ); void modelsChanged( const Diff2::DiffModelList* models ); diff --git a/kompare/libdiff2/kompareprocess.h b/kompare/libdiff2/kompareprocess.h index 079e24cf..aea920c2 100644 --- a/kompare/libdiff2/kompareprocess.h +++ b/kompare/libdiff2/kompareprocess.h @@ -31,9 +31,10 @@ class DiffSettings; class KompareProcess : public KProcess, public KompareFunctions { Q_OBJECT + TQ_OBJECT public: - KompareProcess( DiffSettings* diffSettings, enum Kompare::DiffMode mode, TQString source, TQString destination, TQString directory = TQString::null ); + KompareProcess( DiffSettings* diffSettings, enum Kompare::DiffMode mode, TQString source, TQString destination, TQString directory = TQString() ); ~KompareProcess(); bool start(); diff --git a/kompare/libdiff2/levenshteintable.cpp b/kompare/libdiff2/levenshteintable.cpp index 7e4ddbbe..c031ee61 100644 --- a/kompare/libdiff2/levenshteintable.cpp +++ b/kompare/libdiff2/levenshteintable.cpp @@ -113,8 +113,8 @@ unsigned int LevenshteinTable::createTable( DifferenceString* source, Difference unsigned int m = s.length(); unsigned int n = d.length(); - const TQChar* sq = s.unicode(); - const TQChar* dq = d.unicode(); + const TQChar* sq = s.tqunicode(); + const TQChar* dq = d.tqunicode(); if ( m == 1 ) return --n; diff --git a/kompare/libdiff2/parser.cpp b/kompare/libdiff2/parser.cpp index 1e3efc8a..67386508 100644 --- a/kompare/libdiff2/parser.cpp +++ b/kompare/libdiff2/parser.cpp @@ -50,7 +50,7 @@ int Parser::cleanUpCrap( TQStringList& diffLines ) // correcting the advance of the iterator because of the remove --it; TQString temp( *it ); - temp.truncate( temp.find( '\n' ) ); + temp.truncate( temp.tqfind( '\n' ) ); *it = temp; ++nol; } diff --git a/kompare/libdiff2/parserbase.cpp b/kompare/libdiff2/parserbase.cpp index ca19d232..8a503019 100644 --- a/kompare/libdiff2/parserbase.cpp +++ b/kompare/libdiff2/parserbase.cpp @@ -456,7 +456,7 @@ bool ParserBase::parseNormalHunkBody() { // kdDebug(8101) << "ParserBase::parseNormalHunkBody" << endl; - TQString type = TQString::null; + TQString type = TQString(); int linenoA = 0, linenoB = 0; diff --git a/kompare/libdiff2/perforceparser.cpp b/kompare/libdiff2/perforceparser.cpp index 0e0a2aef..59a2dae2 100644 --- a/kompare/libdiff2/perforceparser.cpp +++ b/kompare/libdiff2/perforceparser.cpp @@ -53,22 +53,22 @@ enum Kompare::Format PerforceParser::determineFormat() while( it != m_diffLines.end() ) { - if( (*it).find( unifiedRE, 0 ) == 0 ) + if( (*it).tqfind( unifiedRE, 0 ) == 0 ) { kdDebug(8101) << "Difflines are from a Unified diff..." << endl; return Kompare::Unified; } - else if( (*it).find( contextRE, 0 ) == 0 ) + else if( (*it).tqfind( contextRE, 0 ) == 0 ) { kdDebug(8101) << "Difflines are from a Context diff..." << endl; return Kompare::Context; } - else if( (*it).find( normalRE, 0 ) == 0 ) + else if( (*it).tqfind( normalRE, 0 ) == 0 ) { kdDebug(8101) << "Difflines are from a Normal diff..." << endl; return Kompare::Normal; } - else if( (*it).find( rcsRE, 0 ) == 0 ) + else if( (*it).tqfind( rcsRE, 0 ) == 0 ) { kdDebug(8101) << "Difflines are from a RCS diff..." << endl; return Kompare::RCS; @@ -103,8 +103,8 @@ bool PerforceParser::parseContextDiffHeader() destinationFileRE.exactMatch( m_contextDiffHeader1.cap( 2 ) ); kdDebug(8101) << "Matched length = " << sourceFileRE.matchedLength() << endl; kdDebug(8101) << "Matched length = " << destinationFileRE.matchedLength() << endl; - kdDebug(8101) << "Captured texts = " << sourceFileRE.capturedTexts() << endl; - kdDebug(8101) << "Captured texts = " << destinationFileRE.capturedTexts() << endl; + kdDebug(8101) << "Captured texts = " << sourceFileRE.tqcapturedTexts() << endl; + kdDebug(8101) << "Captured texts = " << destinationFileRE.tqcapturedTexts() << endl; kdDebug(8101) << "Source File : " << sourceFileRE.cap( 1 ) << endl; kdDebug(8101) << "Destination File : " << destinationFileRE.cap( 1 ) << endl; m_currentModel->setSourceFile ( sourceFileRE.cap( 1 ) ); @@ -117,7 +117,7 @@ bool PerforceParser::parseContextDiffHeader() else { kdDebug(8101) << "Matched length = " << m_contextDiffHeader1.matchedLength() << endl; - kdDebug(8101) << "Captured texts = " << m_contextDiffHeader1.capturedTexts() << endl; + kdDebug(8101) << "Captured texts = " << m_contextDiffHeader1.tqcapturedTexts() << endl; } } @@ -149,8 +149,8 @@ bool PerforceParser::parseNormalDiffHeader() destinationFileRE.exactMatch( m_normalDiffHeader.cap( 2 ) ); kdDebug(8101) << "Matched length = " << sourceFileRE.matchedLength() << endl; kdDebug(8101) << "Matched length = " << destinationFileRE.matchedLength() << endl; - kdDebug(8101) << "Captured texts = " << sourceFileRE.capturedTexts() << endl; - kdDebug(8101) << "Captured texts = " << destinationFileRE.capturedTexts() << endl; + kdDebug(8101) << "Captured texts = " << sourceFileRE.tqcapturedTexts() << endl; + kdDebug(8101) << "Captured texts = " << destinationFileRE.tqcapturedTexts() << endl; kdDebug(8101) << "Source File : " << sourceFileRE.cap( 1 ) << endl; kdDebug(8101) << "Destination File : " << destinationFileRE.cap( 1 ) << endl; m_currentModel->setSourceFile ( sourceFileRE.cap( 1 ) ); @@ -163,7 +163,7 @@ bool PerforceParser::parseNormalDiffHeader() else { kdDebug(8101) << "Matched length = " << m_normalDiffHeader.matchedLength() << endl; - kdDebug(8101) << "Captured texts = " << m_normalDiffHeader.capturedTexts() << endl; + kdDebug(8101) << "Captured texts = " << m_normalDiffHeader.tqcapturedTexts() << endl; } } @@ -200,8 +200,8 @@ bool PerforceParser::parseUnifiedDiffHeader() destinationFileRE.exactMatch( m_unifiedDiffHeader1.cap( 2 ) ); // kdDebug(8101) << "Matched length = " << sourceFileRE.matchedLength() << endl; // kdDebug(8101) << "Matched length = " << destinationFileRE.matchedLength() << endl; -// kdDebug(8101) << "Captured texts = " << sourceFileRE.capturedTexts() << endl; -// kdDebug(8101) << "Captured texts = " << destinationFileRE.capturedTexts() << endl; +// kdDebug(8101) << "Captured texts = " << sourceFileRE.tqcapturedTexts() << endl; +// kdDebug(8101) << "Captured texts = " << destinationFileRE.tqcapturedTexts() << endl; // kdDebug(8101) << "Source File : " << sourceFileRE.cap( 1 ) << endl; // kdDebug(8101) << "Destination File : " << destinationFileRE.cap( 1 ) << endl; m_currentModel->setSourceFile ( sourceFileRE.cap( 1 ) ); @@ -214,7 +214,7 @@ bool PerforceParser::parseUnifiedDiffHeader() else { // kdDebug(8101) << "Matched length = " << m_unifiedDiffHeader1.matchedLength() << endl; -// kdDebug(8101) << "Captured texts = " << m_unifiedDiffHeader1.capturedTexts() << endl; +// kdDebug(8101) << "Captured texts = " << m_unifiedDiffHeader1.tqcapturedTexts() << endl; } } diff --git a/kompare/main.cpp b/kompare/main.cpp index 4e776e9d..86e1c5ef 100644 --- a/kompare/main.cpp +++ b/kompare/main.cpp @@ -186,7 +186,7 @@ int main(int argc, char *argv[]) dialog->setFirstGroupBoxTitle( i18n( "Source" ) ); dialog->setSecondGroupBoxTitle( i18n( "Destination" ) ); - KGuiItem compareGuiItem( i18n( "Compare" ), TQString::null, i18n( "Compare these files or folder" ), i18n( "If you have entered 2 filenames or 2 folders in the fields in this dialog then this button will be enabled and pressing it will start a comparison of the entered files or folders. " ) ); + KGuiItem compareGuiItem( i18n( "Compare" ), TQString(), i18n( "Compare these files or folder" ), i18n( "If you have entered 2 filenames or 2 folders in the fields in this dialog then this button will be enabled and pressing it will start a comparison of the entered files or folders. " ) ); dialog->setButtonOK( compareGuiItem ); dialog->setGroup( "Recent Compare Files" ); diff --git a/kompare/tests/cvsdiff/context.diff b/kompare/tests/cvsdiff/context.diff index c9a7f855..eab790d0 100644 --- a/kompare/tests/cvsdiff/context.diff +++ b/kompare/tests/cvsdiff/context.diff @@ -12,16 +12,16 @@ diff -c -r1.2 dcopfind.cpp ! bool findObject( const char* app, const char* obj, const char* func, int argc, char** args ) { - QString f = func; // Qt is better with unicode strings, so use one. - int left = f.find( '(' ); + QString f = func; // Qt is better with tqunicode strings, so use one. + int left = f.tqfind( '(' ); --- 36,42 ---- static bool bAppIdOnly = 0; static bool bLaunchApp = 0; ! bool findObject( const char* app, const char* obj, const char* func, QCStringList args ) { - QString f = func; // Qt is better with unicode strings, so use one. - int left = f.find( '(' ); + QString f = func; // Qt is better with tqunicode strings, so use one. + int left = f.tqfind( '(' ); *************** *** 118,124 **** f = fc; diff --git a/kompare/tests/cvsdiff/contextm.diff b/kompare/tests/cvsdiff/contextm.diff index ef20ec4c..cde99b5e 100644 --- a/kompare/tests/cvsdiff/contextm.diff +++ b/kompare/tests/cvsdiff/contextm.diff @@ -82,18 +82,18 @@ diff -c -r1.26 dcop.cpp ! void callFunction( const char* app, const char* obj, const char* func, int argc, char** args ) { - - QString f = func; // Qt is better with unicode strings, so use one. - int left = f.find( '(' ); - int right = f.find( ')' ); + QString f = func; // Qt is better with tqunicode strings, so use one. + int left = f.tqfind( '(' ); + int right = f.tqfind( ')' ); --- 146,153 ---- } } ! void callFunction( const char* app, const char* obj, const char* func, const QCStringList args ) { - QString f = func; // Qt is better with unicode strings, so use one. - int left = f.find( '(' ); - int right = f.find( ')' ); + QString f = func; // Qt is better with tqunicode strings, so use one. + int left = f.tqfind( '(' ); + int right = f.tqfind( ')' ); *************** *** 136,142 **** bool ok = false; @@ -116,7 +116,7 @@ diff -c -r1.26 dcop.cpp if ( l > 0 && (*it).mid( s, l - s ) == func ) { realfunc = (*it).mid( s ); -! int a = (*it).contains(','); +! int a = (*it).tqcontains(','); ! if ( ( a == 0 && argc == 0) || ( a > 0 && a + 1 == argc ) ) break; } @@ -127,12 +127,12 @@ diff -c -r1.26 dcop.cpp ! exit(1); } f = realfunc; - left = f.find( '(' ); + left = f.tqfind( '(' ); --- 180,195 ---- if ( l > 0 && (*it).mid( s, l - s ) == func ) { realfunc = (*it).mid( s ); -! uint a = (*it).contains(','); +! uint a = (*it).tqcontains(','); ! if ( ( a == 0 && args.isEmpty() ) || ( a > 0 && a + 1 == args.count() ) ) break; } @@ -144,7 +144,7 @@ diff -c -r1.26 dcop.cpp ! return; } f = realfunc; - left = f.find( '(' ); + left = f.tqfind( '(' ); *************** *** 243,253 **** QCString replyType; @@ -363,13 +363,13 @@ diff -c -r1.26 dcop.cpp QCString function; ! QCStringList params; ! DCOPClient *client = 0L; -! if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 ) +! if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 ) { ! // WARNING: This part (until the closing '}') could very ! // well be broken now. As I don't know how to trigger and test ! // dcoprefs this code is *not* tested. It compiles and it looks ! // ok to me, but that's all I can say - Martijn (2001/12/24) -! int delimPos = args[ 0 ].findRev( ',' ); +! int delimPos = args[ 0 ].tqfindRev( ',' ); ! if( delimPos == -1 ) ! { ! cerr << "Error: '" << args[ 0 ] @@ -747,16 +747,16 @@ diff -c -r1.2 dcopfind.cpp ! bool findObject( const char* app, const char* obj, const char* func, int argc, char** args ) { - QString f = func; // Qt is better with unicode strings, so use one. - int left = f.find( '(' ); + QString f = func; // Qt is better with tqunicode strings, so use one. + int left = f.tqfind( '(' ); --- 36,42 ---- static bool bAppIdOnly = 0; static bool bLaunchApp = 0; ! bool findObject( const char* app, const char* obj, const char* func, QCStringList args ) { - QString f = func; // Qt is better with unicode strings, so use one. - int left = f.find( '(' ); + QString f = func; // Qt is better with tqunicode strings, so use one. + int left = f.tqfind( '(' ); *************** *** 118,124 **** f = fc; @@ -830,7 +830,7 @@ diff -c -r1.3 marshall.cpp ! void marshall(QDataStream &arg, int argc, char **argv, int &i, QString type) { -! if (type == "QStringList") +! if (type == TQSTRINGLIST_OBJECT_NAME_STRING) ! type = "QValueList<QString>"; ! if (type == "QCStringList") ! type = "QValueList<QCString>"; @@ -863,13 +863,13 @@ diff -c -r1.3 marshall.cpp ! arg << s.toDouble(); ! else if ( type == "bool" ) ! arg << mkBool( s ); -! else if ( type == "QString" ) +! else if ( type == TQSTRING_OBJECT_NAME_STRING ) ! arg << s; ! else if ( type == "QCString" ) ! arg << QCString( argv[i] ); ! else if ( type == "QColor" ) ! arg << mkColor( s ); -! else if ( type == "QPoint" ) +! else if ( type == TQPOINT_OBJECT_NAME_STRING ) ! arg << mkPoint( s ); ! else if ( type == "QSize" ) ! arg << mkSize( s ); @@ -939,7 +939,7 @@ diff -c -r1.3 marshall.cpp ! void marshall( QDataStream &arg, QCStringList args, uint &i, QString type ) { -! if (type == "QStringList") +! if (type == TQSTRINGLIST_OBJECT_NAME_STRING) ! type = "QValueList<QString>"; ! if (type == "QCStringList") ! type = "QValueList<QCString>"; @@ -972,13 +972,13 @@ diff -c -r1.3 marshall.cpp ! arg << s.toDouble(); ! else if ( type == "bool" ) ! arg << mkBool( s ); -! else if ( type == "QString" ) +! else if ( type == TQSTRING_OBJECT_NAME_STRING ) ! arg << s; ! else if ( type == "QCString" ) ! arg << QCString( args[ i ] ); ! else if ( type == "QColor" ) ! arg << mkColor( s ); -! else if ( type == "QPoint" ) +! else if ( type == TQPOINT_OBJECT_NAME_STRING ) ! arg << mkPoint( s ); ! else if ( type == "QSize" ) ! arg << mkSize( s ); diff --git a/kompare/tests/cvsdiff/edm.diff b/kompare/tests/cvsdiff/edm.diff index 0fb04575..a5672a1c 100644 --- a/kompare/tests/cvsdiff/edm.diff +++ b/kompare/tests/cvsdiff/edm.diff @@ -352,7 +352,7 @@ int main( int argc, char** argv ) // well be broken now. As I don't know how to trigger and test // dcoprefs this code is *not* tested. It compiles and it looks // ok to me, but that's all I can say - Martijn (2001/12/24) - int delimPos = args[ 0 ].findRev( ',' ); + int delimPos = args[ 0 ].tqfindRev( ',' ); if( delimPos == -1 ) { cerr << "Error: '" << args[ 0 ] @@ -376,7 +376,7 @@ int main( int argc, char** argv ) 286,287c QCStringList params; DCOPClient *client = 0L; - if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 ) + if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 ) . 282a /** @@ -498,7 +498,7 @@ void showHelp( int exitCode = 0 ) return; . 156,157c - uint a = (*it).contains(','); + uint a = (*it).tqcontains(','); if ( ( a == 0 && args.isEmpty() ) || ( a > 0 && a + 1 == args.count() ) ) . 139c @@ -639,13 +639,13 @@ diff -e -r1.3 marshall.cpp arg << s.toDouble(); else if ( type == "bool" ) arg << mkBool( s ); - else if ( type == "QString" ) + else if ( type == TQSTRING_OBJECT_NAME_STRING ) arg << s; else if ( type == "QCString" ) arg << QCString( args[ i ] ); else if ( type == "QColor" ) arg << mkColor( s ); - else if ( type == "QPoint" ) + else if ( type == TQPOINT_OBJECT_NAME_STRING ) arg << mkPoint( s ); else if ( type == "QSize" ) arg << mkSize( s ); @@ -676,7 +676,7 @@ diff -e -r1.3 marshall.cpp delim = ")"; . 247,317c - if (type == "QStringList") + if (type == TQSTRINGLIST_OBJECT_NAME_STRING) type = "QValueList<QString>"; if (type == "QCStringList") type = "QValueList<QCString>"; diff --git a/kompare/tests/cvsdiff/normalm.diff b/kompare/tests/cvsdiff/normalm.diff index 935763a0..b191cb2c 100644 --- a/kompare/tests/cvsdiff/normalm.diff +++ b/kompare/tests/cvsdiff/normalm.diff @@ -60,10 +60,10 @@ diff -r1.26 dcop.cpp --- > if ( !ok && args.isEmpty() ) 156,157c183,184 -< int a = (*it).contains(','); +< int a = (*it).tqcontains(','); < if ( ( a == 0 && argc == 0) || ( a > 0 && a + 1 == argc ) ) --- -> uint a = (*it).contains(','); +> uint a = (*it).tqcontains(','); > if ( ( a == 0 && args.isEmpty() ) || ( a > 0 && a + 1 == args.count() ) ) 164c191,192 < exit(1); @@ -201,7 +201,7 @@ diff -r1.26 dcop.cpp --- > QCStringList params; > DCOPClient *client = 0L; -> if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 ) +> if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 ) 289,304c406,429 < char *delim = strchr(argv[1], ','); < if (!delim) @@ -224,7 +224,7 @@ diff -r1.26 dcop.cpp > // well be broken now. As I don't know how to trigger and test > // dcoprefs this code is *not* tested. It compiles and it looks > // ok to me, but that's all I can say - Martijn (2001/12/24) -> int delimPos = args[ 0 ].findRev( ',' ); +> int delimPos = args[ 0 ].tqfindRev( ',' ); > if( delimPos == -1 ) > { > cerr << "Error: '" << args[ 0 ] @@ -655,7 +655,7 @@ diff -r1.3 marshall.cpp --- > void marshall( QDataStream &arg, QCStringList args, uint &i, QString type ) 247,317c247,256 -< if (type == "QStringList") +< if (type == TQSTRINGLIST_OBJECT_NAME_STRING) < type = "QValueList<QString>"; < if (type == "QCStringList") < type = "QValueList<QCString>"; @@ -688,13 +688,13 @@ diff -r1.3 marshall.cpp < arg << s.toDouble(); < else if ( type == "bool" ) < arg << mkBool( s ); -< else if ( type == "QString" ) +< else if ( type == TQSTRING_OBJECT_NAME_STRING ) < arg << s; < else if ( type == "QCString" ) < arg << QCString( argv[i] ); < else if ( type == "QColor" ) < arg << mkColor( s ); -< else if ( type == "QPoint" ) +< else if ( type == TQPOINT_OBJECT_NAME_STRING ) < arg << mkPoint( s ); < else if ( type == "QSize" ) < arg << mkSize( s ); @@ -727,7 +727,7 @@ diff -r1.3 marshall.cpp < QByteArray dummy_data; < QDataStream dummy_arg(dummy_data, IO_WriteOnly); --- -> if (type == "QStringList") +> if (type == TQSTRINGLIST_OBJECT_NAME_STRING) > type = "QValueList<QString>"; > if (type == "QCStringList") > type = "QValueList<QCString>"; @@ -789,13 +789,13 @@ diff -r1.3 marshall.cpp > arg << s.toDouble(); > else if ( type == "bool" ) > arg << mkBool( s ); -> else if ( type == "QString" ) +> else if ( type == TQSTRING_OBJECT_NAME_STRING ) > arg << s; > else if ( type == "QCString" ) > arg << QCString( args[ i ] ); > else if ( type == "QColor" ) > arg << mkColor( s ); -> else if ( type == "QPoint" ) +> else if ( type == TQPOINT_OBJECT_NAME_STRING ) > arg << mkPoint( s ); > else if ( type == "QSize" ) > arg << mkSize( s ); diff --git a/kompare/tests/cvsdiff/rcsm.diff b/kompare/tests/cvsdiff/rcsm.diff index c690b2a7..a67d7e54 100644 --- a/kompare/tests/cvsdiff/rcsm.diff +++ b/kompare/tests/cvsdiff/rcsm.diff @@ -53,7 +53,7 @@ a139 1 if ( !ok && args.isEmpty() ) d156 2 a157 2 - uint a = (*it).contains(','); + uint a = (*it).tqcontains(','); if ( ( a == 0 && args.isEmpty() ) || ( a > 0 && a + 1 == args.count() ) ) d164 1 a164 2 @@ -175,14 +175,14 @@ d286 2 a287 3 QCStringList params; DCOPClient *client = 0L; - if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 ) + if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 ) d289 16 a304 24 // WARNING: This part (until the closing '}') could very // well be broken now. As I don't know how to trigger and test // dcoprefs this code is *not* tested. It compiles and it looks // ok to me, but that's all I can say - Martijn (2001/12/24) - int delimPos = args[ 0 ].findRev( ',' ); + int delimPos = args[ 0 ].tqfindRev( ',' ); if( delimPos == -1 ) { cerr << "Error: '" << args[ 0 ] @@ -577,7 +577,7 @@ a245 1 void marshall( QDataStream &arg, QCStringList args, uint &i, QString type ) d247 71 a317 10 - if (type == "QStringList") + if (type == TQSTRINGLIST_OBJECT_NAME_STRING) type = "QValueList<QString>"; if (type == "QCStringList") type = "QValueList<QCString>"; @@ -611,13 +611,13 @@ a346 57 arg << s.toDouble(); else if ( type == "bool" ) arg << mkBool( s ); - else if ( type == "QString" ) + else if ( type == TQSTRING_OBJECT_NAME_STRING ) arg << s; else if ( type == "QCString" ) arg << QCString( args[ i ] ); else if ( type == "QColor" ) arg << mkColor( s ); - else if ( type == "QPoint" ) + else if ( type == TQPOINT_OBJECT_NAME_STRING ) arg << mkPoint( s ); else if ( type == "QSize" ) arg << mkSize( s ); diff --git a/kompare/tests/cvsdiff/unified.diff b/kompare/tests/cvsdiff/unified.diff index 562dee43..ab69a295 100644 --- a/kompare/tests/cvsdiff/unified.diff +++ b/kompare/tests/cvsdiff/unified.diff @@ -12,8 +12,8 @@ diff -u -r1.2 dcopfind.cpp -bool findObject( const char* app, const char* obj, const char* func, int argc, char** args ) +bool findObject( const char* app, const char* obj, const char* func, QCStringList args ) { - QString f = func; // Qt is better with unicode strings, so use one. - int left = f.find( '(' ); + QString f = func; // Qt is better with tqunicode strings, so use one. + int left = f.tqfind( '(' ); @@ -118,7 +118,7 @@ f = fc; } diff --git a/kompare/tests/cvsdiff/unifiedm.diff b/kompare/tests/cvsdiff/unifiedm.diff index 1de79f8f..b4e8b2a1 100644 --- a/kompare/tests/cvsdiff/unifiedm.diff +++ b/kompare/tests/cvsdiff/unifiedm.diff @@ -66,9 +66,9 @@ diff -u -r1.26 dcop.cpp +void callFunction( const char* app, const char* obj, const char* func, const QCStringList args ) { - - QString f = func; // Qt is better with unicode strings, so use one. - int left = f.find( '(' ); - int right = f.find( ')' ); + QString f = func; // Qt is better with tqunicode strings, so use one. + int left = f.tqfind( '(' ); + int right = f.tqfind( ')' ); @@ -136,7 +163,7 @@ bool ok = false; QCStringList funcs = dcop->remoteFunctions( app, obj, &ok ); @@ -82,9 +82,9 @@ diff -u -r1.26 dcop.cpp if ( l > 0 && (*it).mid( s, l - s ) == func ) { realfunc = (*it).mid( s ); -- int a = (*it).contains(','); +- int a = (*it).tqcontains(','); - if ( ( a == 0 && argc == 0) || ( a > 0 && a + 1 == argc ) ) -+ uint a = (*it).contains(','); ++ uint a = (*it).tqcontains(','); + if ( ( a == 0 && args.isEmpty() ) || ( a > 0 && a + 1 == args.count() ) ) break; } @@ -97,7 +97,7 @@ diff -u -r1.26 dcop.cpp + return; } f = realfunc; - left = f.find( '(' ); + left = f.tqfind( '(' ); @@ -243,11 +271,12 @@ QCString replyType; QDataStream arg(data, IO_WriteOnly); @@ -237,7 +237,7 @@ diff -u -r1.26 dcop.cpp - if ((argc > 1) && (strncmp(argv[1], "DCOPRef(", 8)) == 0) + QCStringList params; + DCOPClient *client = 0L; -+ if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 ) ++ if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 ) { - char *delim = strchr(argv[1], ','); - if (!delim) @@ -259,7 +259,7 @@ diff -u -r1.26 dcop.cpp + // well be broken now. As I don't know how to trigger and test + // dcoprefs this code is *not* tested. It compiles and it looks + // ok to me, but that's all I can say - Martijn (2001/12/24) -+ int delimPos = args[ 0 ].findRev( ',' ); ++ int delimPos = args[ 0 ].tqfindRev( ',' ); + if( delimPos == -1 ) + { + cerr << "Error: '" << args[ 0 ] @@ -668,8 +668,8 @@ diff -u -r1.2 dcopfind.cpp -bool findObject( const char* app, const char* obj, const char* func, int argc, char** args ) +bool findObject( const char* app, const char* obj, const char* func, QCStringList args ) { - QString f = func; // Qt is better with unicode strings, so use one. - int left = f.find( '(' ); + QString f = func; // Qt is better with tqunicode strings, so use one. + int left = f.tqfind( '(' ); @@ -118,7 +118,7 @@ f = fc; } @@ -718,7 +718,7 @@ diff -u -r1.3 marshall.cpp -void marshall(QDataStream &arg, int argc, char **argv, int &i, QString type) +void marshall( QDataStream &arg, QCStringList args, uint &i, QString type ) { -- if (type == "QStringList") +- if (type == TQSTRINGLIST_OBJECT_NAME_STRING) - type = "QValueList<QString>"; - if (type == "QCStringList") - type = "QValueList<QCString>"; @@ -751,13 +751,13 @@ diff -u -r1.3 marshall.cpp - arg << s.toDouble(); - else if ( type == "bool" ) - arg << mkBool( s ); -- else if ( type == "QString" ) +- else if ( type == TQSTRING_OBJECT_NAME_STRING ) - arg << s; - else if ( type == "QCString" ) - arg << QCString( argv[i] ); - else if ( type == "QColor" ) - arg << mkColor( s ); -- else if ( type == "QPoint" ) +- else if ( type == TQPOINT_OBJECT_NAME_STRING ) - arg << mkPoint( s ); - else if ( type == "QSize" ) - arg << mkSize( s ); @@ -789,7 +789,7 @@ diff -u -r1.3 marshall.cpp - i++; - QByteArray dummy_data; - QDataStream dummy_arg(dummy_data, IO_WriteOnly); -+ if (type == "QStringList") ++ if (type == TQSTRINGLIST_OBJECT_NAME_STRING) + type = "QValueList<QString>"; + if (type == "QCStringList") + type = "QValueList<QCString>"; @@ -850,13 +850,13 @@ diff -u -r1.3 marshall.cpp + arg << s.toDouble(); + else if ( type == "bool" ) + arg << mkBool( s ); -+ else if ( type == "QString" ) ++ else if ( type == TQSTRING_OBJECT_NAME_STRING ) + arg << s; + else if ( type == "QCString" ) + arg << QCString( args[ i ] ); + else if ( type == "QColor" ) + arg << mkColor( s ); -+ else if ( type == "QPoint" ) ++ else if ( type == TQPOINT_OBJECT_NAME_STRING ) + arg << mkPoint( s ); + else if ( type == "QSize" ) + arg << mkSize( s ); diff --git a/kompare/tests/diff/contextm.diff b/kompare/tests/diff/contextm.diff index 0b1bba5a..1833fa06 100644 --- a/kompare/tests/diff/contextm.diff +++ b/kompare/tests/diff/contextm.diff @@ -78,18 +78,18 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp ! void callFunction( const char* app, const char* obj, const char* func, int argc, char** args ) { - - QString f = func; // Qt is better with unicode strings, so use one. - int left = f.find( '(' ); - int right = f.find( ')' ); + QString f = func; // Qt is better with tqunicode strings, so use one. + int left = f.tqfind( '(' ); + int right = f.tqfind( ')' ); --- 146,153 ---- } } ! void callFunction( const char* app, const char* obj, const char* func, const QCStringList args ) { - QString f = func; // Qt is better with unicode strings, so use one. - int left = f.find( '(' ); - int right = f.find( ')' ); + QString f = func; // Qt is better with tqunicode strings, so use one. + int left = f.tqfind( '(' ); + int right = f.tqfind( ')' ); *************** *** 136,142 **** bool ok = false; @@ -112,7 +112,7 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp if ( l > 0 && (*it).mid( s, l - s ) == func ) { realfunc = (*it).mid( s ); -! int a = (*it).contains(','); +! int a = (*it).tqcontains(','); ! if ( ( a == 0 && argc == 0) || ( a > 0 && a + 1 == argc ) ) break; } @@ -123,12 +123,12 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp ! exit(1); } f = realfunc; - left = f.find( '(' ); + left = f.tqfind( '(' ); --- 180,195 ---- if ( l > 0 && (*it).mid( s, l - s ) == func ) { realfunc = (*it).mid( s ); -! uint a = (*it).contains(','); +! uint a = (*it).tqcontains(','); ! if ( ( a == 0 && args.isEmpty() ) || ( a > 0 && a + 1 == args.count() ) ) break; } @@ -140,7 +140,7 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp ! return; } f = realfunc; - left = f.find( '(' ); + left = f.tqfind( '(' ); *************** *** 243,253 **** QCString replyType; @@ -357,13 +357,13 @@ diff -cr dcop/client/dcop.cpp dcop2/client/dcop.cpp QCString function; ! QCStringList params; ! DCOPClient *client = 0L; -! if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 ) +! if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 ) { ! // WARNING: This part (until the closing '}') could very ! // well be broken now. As I don't know how to trigger and test ! // dcoprefs this code is *not* tested. It compiles and it looks ! // ok to me, but that's all I can say - Martijn (2001/12/24) -! int delimPos = args[ 0 ].findRev( ',' ); +! int delimPos = args[ 0 ].tqfindRev( ',' ); ! if( delimPos == -1 ) ! { ! cerr << "Error: '" << args[ 0 ] @@ -737,16 +737,16 @@ diff -cr dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp ! bool findObject( const char* app, const char* obj, const char* func, int argc, char** args ) { - QString f = func; // Qt is better with unicode strings, so use one. - int left = f.find( '(' ); + QString f = func; // Qt is better with tqunicode strings, so use one. + int left = f.tqfind( '(' ); --- 36,42 ---- static bool bAppIdOnly = 0; static bool bLaunchApp = 0; ! bool findObject( const char* app, const char* obj, const char* func, QCStringList args ) { - QString f = func; // Qt is better with unicode strings, so use one. - int left = f.find( '(' ); + QString f = func; // Qt is better with tqunicode strings, so use one. + int left = f.tqfind( '(' ); *************** *** 118,124 **** f = fc; @@ -816,7 +816,7 @@ diff -cr dcop/client/marshall.cpp dcop2/client/marshall.cpp ! void marshall(QDataStream &arg, int argc, char **argv, int &i, QString type) { -! if (type == "QStringList") +! if (type == TQSTRINGLIST_OBJECT_NAME_STRING) ! type = "QValueList<QString>"; ! if (type == "QCStringList") ! type = "QValueList<QCString>"; @@ -849,13 +849,13 @@ diff -cr dcop/client/marshall.cpp dcop2/client/marshall.cpp ! arg << s.toDouble(); ! else if ( type == "bool" ) ! arg << mkBool( s ); -! else if ( type == "QString" ) +! else if ( type == TQSTRING_OBJECT_NAME_STRING ) ! arg << s; ! else if ( type == "QCString" ) ! arg << QCString( argv[i] ); ! else if ( type == "QColor" ) ! arg << mkColor( s ); -! else if ( type == "QPoint" ) +! else if ( type == TQPOINT_OBJECT_NAME_STRING ) ! arg << mkPoint( s ); ! else if ( type == "QSize" ) ! arg << mkSize( s ); @@ -925,7 +925,7 @@ diff -cr dcop/client/marshall.cpp dcop2/client/marshall.cpp ! void marshall( QDataStream &arg, QCStringList args, uint &i, QString type ) { -! if (type == "QStringList") +! if (type == TQSTRINGLIST_OBJECT_NAME_STRING) ! type = "QValueList<QString>"; ! if (type == "QCStringList") ! type = "QValueList<QCString>"; @@ -958,13 +958,13 @@ diff -cr dcop/client/marshall.cpp dcop2/client/marshall.cpp ! arg << s.toDouble(); ! else if ( type == "bool" ) ! arg << mkBool( s ); -! else if ( type == "QString" ) +! else if ( type == TQSTRING_OBJECT_NAME_STRING ) ! arg << s; ! else if ( type == "QCString" ) ! arg << QCString( args[ i ] ); ! else if ( type == "QColor" ) ! arg << mkColor( s ); -! else if ( type == "QPoint" ) +! else if ( type == TQPOINT_OBJECT_NAME_STRING ) ! arg << mkPoint( s ); ! else if ( type == "QSize" ) ! arg << mkSize( s ); diff --git a/kompare/tests/diff/edm.diff b/kompare/tests/diff/edm.diff index 0df2abc1..e2ad0672 100644 --- a/kompare/tests/diff/edm.diff +++ b/kompare/tests/diff/edm.diff @@ -348,7 +348,7 @@ int main( int argc, char** argv ) // well be broken now. As I don't know how to trigger and test // dcoprefs this code is *not* tested. It compiles and it looks // ok to me, but that's all I can say - Martijn (2001/12/24) - int delimPos = args[ 0 ].findRev( ',' ); + int delimPos = args[ 0 ].tqfindRev( ',' ); if( delimPos == -1 ) { cerr << "Error: '" << args[ 0 ] @@ -372,7 +372,7 @@ int main( int argc, char** argv ) 286,287c QCStringList params; DCOPClient *client = 0L; - if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 ) + if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 ) . 282a /** @@ -494,7 +494,7 @@ void showHelp( int exitCode = 0 ) return; . 156,157c - uint a = (*it).contains(','); + uint a = (*it).tqcontains(','); if ( ( a == 0 && args.isEmpty() ) || ( a > 0 && a + 1 == args.count() ) ) . 139c @@ -627,13 +627,13 @@ diff -er dcop/client/marshall.cpp dcop2/client/marshall.cpp arg << s.toDouble(); else if ( type == "bool" ) arg << mkBool( s ); - else if ( type == "QString" ) + else if ( type == TQSTRING_OBJECT_NAME_STRING ) arg << s; else if ( type == "QCString" ) arg << QCString( args[ i ] ); else if ( type == "QColor" ) arg << mkColor( s ); - else if ( type == "QPoint" ) + else if ( type == TQPOINT_OBJECT_NAME_STRING ) arg << mkPoint( s ); else if ( type == "QSize" ) arg << mkSize( s ); @@ -664,7 +664,7 @@ diff -er dcop/client/marshall.cpp dcop2/client/marshall.cpp delim = ")"; . 247,317c - if (type == "QStringList") + if (type == TQSTRINGLIST_OBJECT_NAME_STRING) type = "QValueList<QString>"; if (type == "QCStringList") type = "QValueList<QCString>"; diff --git a/kompare/tests/diff/normalm.diff b/kompare/tests/diff/normalm.diff index 3db667ba..c08da23b 100644 --- a/kompare/tests/diff/normalm.diff +++ b/kompare/tests/diff/normalm.diff @@ -56,10 +56,10 @@ diff -r dcop/client/dcop.cpp dcop2/client/dcop.cpp --- > if ( !ok && args.isEmpty() ) 156,157c183,184 -< int a = (*it).contains(','); +< int a = (*it).tqcontains(','); < if ( ( a == 0 && argc == 0) || ( a > 0 && a + 1 == argc ) ) --- -> uint a = (*it).contains(','); +> uint a = (*it).tqcontains(','); > if ( ( a == 0 && args.isEmpty() ) || ( a > 0 && a + 1 == args.count() ) ) 164c191,192 < exit(1); @@ -197,7 +197,7 @@ diff -r dcop/client/dcop.cpp dcop2/client/dcop.cpp --- > QCStringList params; > DCOPClient *client = 0L; -> if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 ) +> if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 ) 289,304c406,429 < char *delim = strchr(argv[1], ','); < if (!delim) @@ -220,7 +220,7 @@ diff -r dcop/client/dcop.cpp dcop2/client/dcop.cpp > // well be broken now. As I don't know how to trigger and test > // dcoprefs this code is *not* tested. It compiles and it looks > // ok to me, but that's all I can say - Martijn (2001/12/24) -> int delimPos = args[ 0 ].findRev( ',' ); +> int delimPos = args[ 0 ].tqfindRev( ',' ); > if( delimPos == -1 ) > { > cerr << "Error: '" << args[ 0 ] @@ -643,7 +643,7 @@ diff -r dcop/client/marshall.cpp dcop2/client/marshall.cpp --- > void marshall( QDataStream &arg, QCStringList args, uint &i, QString type ) 247,317c247,256 -< if (type == "QStringList") +< if (type == TQSTRINGLIST_OBJECT_NAME_STRING) < type = "QValueList<QString>"; < if (type == "QCStringList") < type = "QValueList<QCString>"; @@ -676,13 +676,13 @@ diff -r dcop/client/marshall.cpp dcop2/client/marshall.cpp < arg << s.toDouble(); < else if ( type == "bool" ) < arg << mkBool( s ); -< else if ( type == "QString" ) +< else if ( type == TQSTRING_OBJECT_NAME_STRING ) < arg << s; < else if ( type == "QCString" ) < arg << QCString( argv[i] ); < else if ( type == "QColor" ) < arg << mkColor( s ); -< else if ( type == "QPoint" ) +< else if ( type == TQPOINT_OBJECT_NAME_STRING ) < arg << mkPoint( s ); < else if ( type == "QSize" ) < arg << mkSize( s ); @@ -715,7 +715,7 @@ diff -r dcop/client/marshall.cpp dcop2/client/marshall.cpp < QByteArray dummy_data; < QDataStream dummy_arg(dummy_data, IO_WriteOnly); --- -> if (type == "QStringList") +> if (type == TQSTRINGLIST_OBJECT_NAME_STRING) > type = "QValueList<QString>"; > if (type == "QCStringList") > type = "QValueList<QCString>"; @@ -777,13 +777,13 @@ diff -r dcop/client/marshall.cpp dcop2/client/marshall.cpp > arg << s.toDouble(); > else if ( type == "bool" ) > arg << mkBool( s ); -> else if ( type == "QString" ) +> else if ( type == TQSTRING_OBJECT_NAME_STRING ) > arg << s; > else if ( type == "QCString" ) > arg << QCString( args[ i ] ); > else if ( type == "QColor" ) > arg << mkColor( s ); -> else if ( type == "QPoint" ) +> else if ( type == TQPOINT_OBJECT_NAME_STRING ) > arg << mkPoint( s ); > else if ( type == "QSize" ) > arg << mkSize( s ); diff --git a/kompare/tests/diff/rcsm.diff b/kompare/tests/diff/rcsm.diff index 0c4222f9..9df85d76 100644 --- a/kompare/tests/diff/rcsm.diff +++ b/kompare/tests/diff/rcsm.diff @@ -49,7 +49,7 @@ a139 1 if ( !ok && args.isEmpty() ) d156 2 a157 2 - uint a = (*it).contains(','); + uint a = (*it).tqcontains(','); if ( ( a == 0 && args.isEmpty() ) || ( a > 0 && a + 1 == args.count() ) ) d164 1 a164 2 @@ -171,14 +171,14 @@ d286 2 a287 3 QCStringList params; DCOPClient *client = 0L; - if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 ) + if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 ) d289 16 a304 24 // WARNING: This part (until the closing '}') could very // well be broken now. As I don't know how to trigger and test // dcoprefs this code is *not* tested. It compiles and it looks // ok to me, but that's all I can say - Martijn (2001/12/24) - int delimPos = args[ 0 ].findRev( ',' ); + int delimPos = args[ 0 ].tqfindRev( ',' ); if( delimPos == -1 ) { cerr << "Error: '" << args[ 0 ] @@ -565,7 +565,7 @@ a245 1 void marshall( QDataStream &arg, QCStringList args, uint &i, QString type ) d247 71 a317 10 - if (type == "QStringList") + if (type == TQSTRINGLIST_OBJECT_NAME_STRING) type = "QValueList<QString>"; if (type == "QCStringList") type = "QValueList<QCString>"; @@ -599,13 +599,13 @@ a346 57 arg << s.toDouble(); else if ( type == "bool" ) arg << mkBool( s ); - else if ( type == "QString" ) + else if ( type == TQSTRING_OBJECT_NAME_STRING ) arg << s; else if ( type == "QCString" ) arg << QCString( args[ i ] ); else if ( type == "QColor" ) arg << mkColor( s ); - else if ( type == "QPoint" ) + else if ( type == TQPOINT_OBJECT_NAME_STRING ) arg << mkPoint( s ); else if ( type == "QSize" ) arg << mkSize( s ); diff --git a/kompare/tests/diff/unifiedm.diff b/kompare/tests/diff/unifiedm.diff index 4a30c6b4..e4fbd157 100644 --- a/kompare/tests/diff/unifiedm.diff +++ b/kompare/tests/diff/unifiedm.diff @@ -62,9 +62,9 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp +void callFunction( const char* app, const char* obj, const char* func, const QCStringList args ) { - - QString f = func; // Qt is better with unicode strings, so use one. - int left = f.find( '(' ); - int right = f.find( ')' ); + QString f = func; // Qt is better with tqunicode strings, so use one. + int left = f.tqfind( '(' ); + int right = f.tqfind( ')' ); @@ -136,7 +163,7 @@ bool ok = false; QCStringList funcs = dcop->remoteFunctions( app, obj, &ok ); @@ -78,9 +78,9 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp if ( l > 0 && (*it).mid( s, l - s ) == func ) { realfunc = (*it).mid( s ); -- int a = (*it).contains(','); +- int a = (*it).tqcontains(','); - if ( ( a == 0 && argc == 0) || ( a > 0 && a + 1 == argc ) ) -+ uint a = (*it).contains(','); ++ uint a = (*it).tqcontains(','); + if ( ( a == 0 && args.isEmpty() ) || ( a > 0 && a + 1 == args.count() ) ) break; } @@ -93,7 +93,7 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp + return; } f = realfunc; - left = f.find( '(' ); + left = f.tqfind( '(' ); @@ -243,11 +271,12 @@ QCString replyType; QDataStream arg(data, IO_WriteOnly); @@ -232,7 +232,7 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp - if ((argc > 1) && (strncmp(argv[1], "DCOPRef(", 8)) == 0) + QCStringList params; + DCOPClient *client = 0L; -+ if ( !args.isEmpty() && args[ 0 ].find( "DCOPRef(" ) == 0 ) ++ if ( !args.isEmpty() && args[ 0 ].tqfind( "DCOPRef(" ) == 0 ) { - char *delim = strchr(argv[1], ','); - if (!delim) @@ -254,7 +254,7 @@ diff -aur dcop/client/dcop.cpp dcop2/client/dcop.cpp + // well be broken now. As I don't know how to trigger and test + // dcoprefs this code is *not* tested. It compiles and it looks + // ok to me, but that's all I can say - Martijn (2001/12/24) -+ int delimPos = args[ 0 ].findRev( ',' ); ++ int delimPos = args[ 0 ].tqfindRev( ',' ); + if( delimPos == -1 ) + { + cerr << "Error: '" << args[ 0 ] @@ -659,8 +659,8 @@ diff -aur dcop/client/dcopfind.cpp dcop2/client/dcopfind.cpp -bool findObject( const char* app, const char* obj, const char* func, int argc, char** args ) +bool findObject( const char* app, const char* obj, const char* func, QCStringList args ) { - QString f = func; // Qt is better with unicode strings, so use one. - int left = f.find( '(' ); + QString f = func; // Qt is better with tqunicode strings, so use one. + int left = f.tqfind( '(' ); @@ -118,7 +118,7 @@ f = fc; } @@ -705,7 +705,7 @@ diff -aur dcop/client/marshall.cpp dcop2/client/marshall.cpp -void marshall(QDataStream &arg, int argc, char **argv, int &i, QString type) +void marshall( QDataStream &arg, QCStringList args, uint &i, QString type ) { -- if (type == "QStringList") +- if (type == TQSTRINGLIST_OBJECT_NAME_STRING) - type = "QValueList<QString>"; - if (type == "QCStringList") - type = "QValueList<QCString>"; @@ -738,13 +738,13 @@ diff -aur dcop/client/marshall.cpp dcop2/client/marshall.cpp - arg << s.toDouble(); - else if ( type == "bool" ) - arg << mkBool( s ); -- else if ( type == "QString" ) +- else if ( type == TQSTRING_OBJECT_NAME_STRING ) - arg << s; - else if ( type == "QCString" ) - arg << QCString( argv[i] ); - else if ( type == "QColor" ) - arg << mkColor( s ); -- else if ( type == "QPoint" ) +- else if ( type == TQPOINT_OBJECT_NAME_STRING ) - arg << mkPoint( s ); - else if ( type == "QSize" ) - arg << mkSize( s ); @@ -776,7 +776,7 @@ diff -aur dcop/client/marshall.cpp dcop2/client/marshall.cpp - i++; - QByteArray dummy_data; - QDataStream dummy_arg(dummy_data, IO_WriteOnly); -+ if (type == "QStringList") ++ if (type == TQSTRINGLIST_OBJECT_NAME_STRING) + type = "QValueList<QString>"; + if (type == "QCStringList") + type = "QValueList<QCString>"; @@ -837,13 +837,13 @@ diff -aur dcop/client/marshall.cpp dcop2/client/marshall.cpp + arg << s.toDouble(); + else if ( type == "bool" ) + arg << mkBool( s ); -+ else if ( type == "QString" ) ++ else if ( type == TQSTRING_OBJECT_NAME_STRING ) + arg << s; + else if ( type == "QCString" ) + arg << QCString( args[ i ] ); + else if ( type == "QColor" ) + arg << mkColor( s ); -+ else if ( type == "QPoint" ) ++ else if ( type == TQPOINT_OBJECT_NAME_STRING ) + arg << mkPoint( s ); + else if ( type == "QSize" ) + arg << mkSize( s ); diff --git a/kspy/classinfoview.cpp b/kspy/classinfoview.cpp index b8b12167..02de2773 100644 --- a/kspy/classinfoview.cpp +++ b/kspy/classinfoview.cpp @@ -25,7 +25,7 @@ #include "classinfoview.h" -ClassInfoView::ClassInfoView(TQWidget *parent, const char *name ) : KListView(parent,name) +ClassInfoView::ClassInfoView(TQWidget *tqparent, const char *name ) : KListView(tqparent,name) { addColumn( i18n( "Name" ) ); addColumn( i18n( "Value" ) ); @@ -41,11 +41,11 @@ ClassInfoView::~ClassInfoView() void ClassInfoView::buildList( TQObject *o ) { - TQMetaObject *mo = o->metaObject(); + TQMetaObject *mo = o->tqmetaObject(); for (int index = 0; index < mo->numClassInfo(true); index++) { - const QClassInfo * classInfo = mo->classInfo(index, true); - new KListViewItem( this, classInfo->name, classInfo->value ); + const TQClassInfo * classInfo = mo->classInfo(index, true); + new KListViewItem( this, classInfo->tqt_mo_ci_name, classInfo->tqt_mo_ci_value ); } } diff --git a/kspy/classinfoview.h b/kspy/classinfoview.h index eca9e719..0526cc35 100644 --- a/kspy/classinfoview.h +++ b/kspy/classinfoview.h @@ -27,8 +27,9 @@ class ClassInfoView : public KListView { Q_OBJECT + TQ_OBJECT public: - ClassInfoView(TQWidget *parent=0, const char *name=0); + ClassInfoView(TQWidget *tqparent=0, const char *name=0); ~ClassInfoView(); void buildList( TQObject *o ); diff --git a/kspy/kspy.h b/kspy/kspy.h index 007c0d10..e6b79618 100644 --- a/kspy/kspy.h +++ b/kspy/kspy.h @@ -8,7 +8,7 @@ /** * Loader for the TQObject debugging tool. The usage is simple, just call * KSpy::invoke(), then use the spy window to examine the state of your - * QObjects. + * TQObjects. * * @author Richard Moore, rich@kde.org * @version $Id$ diff --git a/kspy/navview.cpp b/kspy/navview.cpp index 338922d5..388e6bb5 100644 --- a/kspy/navview.cpp +++ b/kspy/navview.cpp @@ -23,7 +23,7 @@ #include "navview.h" #include "navviewitem.h" -NavView::NavView(TQWidget *parent, const char *name ) : KListView(parent,name) +NavView::NavView(TQWidget *tqparent, const char *name ) : KListView(tqparent,name) { addColumn( i18n( "Name" ) ); addColumn( i18n( "Type" ) ); @@ -70,17 +70,17 @@ void NavView::selectItem( TQListViewItem *item ) emit selected( navItem->data ); } -void NavView::createSubTree( NavViewItem *parent ) +void NavView::createSubTree( NavViewItem *tqparent ) { - const TQObjectList *kids = parent->data->children(); - if ( !kids ) + const TQObjectList kids = tqparent->data->childrenListObject(); + if ( kids.isEmpty() ) return; TQObject * obj; - TQObjectListIt it( *kids ); + TQObjectListIt it( kids ); while ( (obj=it.current()) != 0 ) { ++it; - NavViewItem *item = new NavViewItem( parent, obj ); + NavViewItem *item = new NavViewItem( tqparent, obj ); createSubTree( item ); } } diff --git a/kspy/navview.h b/kspy/navview.h index 947c3572..29ebf842 100644 --- a/kspy/navview.h +++ b/kspy/navview.h @@ -29,9 +29,10 @@ class NavViewItem; class NavView : public KListView { Q_OBJECT + TQ_OBJECT public: - NavView( TQWidget *parent = 0, const char *name = 0 ); + NavView( TQWidget *tqparent = 0, const char *name = 0 ); ~NavView(); /** diff --git a/kspy/navviewitem.cpp b/kspy/navviewitem.cpp index 641332ac..596ba7ed 100644 --- a/kspy/navviewitem.cpp +++ b/kspy/navviewitem.cpp @@ -20,15 +20,15 @@ #include "navview.h" #include "navviewitem.h" -NavViewItem::NavViewItem(NavView *parent, TQObject *obj ) - : KListViewItem(parent, obj->name(), obj->className() ) +NavViewItem::NavViewItem(NavView *tqparent, TQObject *obj ) + : KListViewItem(tqparent, obj->name(), obj->className() ) { data = obj; setExpandable( true ); } -NavViewItem::NavViewItem(NavViewItem *parent, TQObject *obj ) - : KListViewItem(parent, obj->name(), obj->className() ) +NavViewItem::NavViewItem(NavViewItem *tqparent, TQObject *obj ) + : KListViewItem(tqparent, obj->name(), obj->className() ) { data = obj; setExpandable( true ); diff --git a/kspy/navviewitem.h b/kspy/navviewitem.h index d9b7ba23..a6c0e888 100644 --- a/kspy/navviewitem.h +++ b/kspy/navviewitem.h @@ -28,8 +28,8 @@ class NavView; class NavViewItem : public KListViewItem { public: - NavViewItem(NavView *parent, TQObject *item ); - NavViewItem(NavViewItem *parent, TQObject *item ); + NavViewItem(NavView *tqparent, TQObject *item ); + NavViewItem(NavViewItem *tqparent, TQObject *item ); ~NavViewItem(); TQObject *data; diff --git a/kspy/propsview.cpp b/kspy/propsview.cpp index 50f60bed..a59903d5 100644 --- a/kspy/propsview.cpp +++ b/kspy/propsview.cpp @@ -29,26 +29,26 @@ class KSpyItem : KListViewItem { public: - KSpyItem( TQListView * parent, TQString label1, TQString label2 = TQString::null, TQString label3 = TQString::null, TQString label4 = TQString::null, TQString label5 = TQString::null, TQString label6 = TQString::null ) - : KListViewItem(parent, label1, label2, label3, label4, label5, label6) + KSpyItem( TQListView * tqparent, TQString label1, TQString label2 = TQString(), TQString label3 = TQString(), TQString label4 = TQString(), TQString label5 = TQString(), TQString label6 = TQString() ) + : KListViewItem(tqparent, label1, label2, label3, label4, label5, label6) { } protected: void paintCell( TQPainter * p, const TQColorGroup & cg, - int column, int width, int alignment ) + int column, int width, int tqalignment ) { if (column == 1 && text(2) == "TQColor") { TQColorGroup color_cg( cg.foreground(), cg.background(), cg.light(), cg.dark(), cg.mid(), TQColor(text(1)), TQColor(text(1)) ); - TQListViewItem::paintCell(p, color_cg, column, width, alignment); + TQListViewItem::paintCell(p, color_cg, column, width, tqalignment); } else { - KListViewItem::paintCell(p, cg, column, width, alignment); + KListViewItem::paintCell(p, cg, column, width, tqalignment); } } }; -PropsView::PropsView(TQWidget *parent, const char *name ) : KListView(parent,name) +PropsView::PropsView(TQWidget *tqparent, const char *name ) : KListView(tqparent,name) { addColumn( i18n( "Name" ) ); addColumn( i18n( "Value" ) ); @@ -69,13 +69,13 @@ PropsView::~PropsView() void PropsView::buildList( TQObject *o ) { - TQMetaObject *mo = o->metaObject(); + TQMetaObject *mo = o->tqmetaObject(); TQStrList names = mo->propertyNames( true ); for ( uint i = 0; i < names.count(); i++ ) { char *prop = names.at( i ); TQVariant v = o->property( prop ); - const TQMetaProperty *mp = mo->property( mo->findProperty(prop, true), true ); + const TQMetaProperty *mp = mo->property( mo->tqfindProperty(prop, true), true ); TQString val( "????" ); switch( v.type() ) { @@ -95,55 +95,60 @@ void PropsView::buildList( TQObject *o ) case TQVariant::Cursor: { TQCursor c = v.toCursor(); - val = TQString("shape=%1").arg(c.shape()); + val = TQString("tqshape=%1").tqarg(c.tqshape()); break; } case TQVariant::Font: { TQFont f = v.toFont(); val = TQString("family=%1, pointSize=%2, weight=%3, italic=%4, bold=%5, underline=%6, strikeOut=%7") - .arg(f.family()) - .arg(f.pointSize()) - .arg(f.weight()) - .arg(f.italic()) - .arg(f.bold()) - .arg(f.underline()) - .arg(f.strikeOut()); + .tqarg(f.family()) + .tqarg(f.pointSize()) + .tqarg(f.weight()) + .tqarg(f.italic()) + .tqarg(f.bold()) + .tqarg(f.underline()) + .tqarg(f.strikeOut()); break; } case TQVariant::Int: val.setNum( v.toInt() ); if (mp->isEnumType()) { - TQMetaObject * metaObject = *(mp->meta); - val = TQString("%1::%2").arg(metaObject->className()).arg(mp->valueToKey(val.toInt())); +#ifdef USE_QT4 +// TQMetaObject * tqmetaObject = *(mp->meta); // FIXME + val = TQString("%1::%2").tqarg("QT4_CANNOT_FIND_TQMETAOBJECT_FOR_TQMETAPROPERTY").tqarg(mp->valueToKey(val.toInt())); // FIXME +#else // USE_QT4 + TQMetaObject * tqmetaObject = *(mp->meta); + val = TQString("%1::%2").tqarg(tqmetaObject->className()).tqarg(mp->valueToKey(val.toInt())); +#endif // USE_QT4 } break; case TQVariant::Point: { TQPoint p = v.toPoint(); - val = TQString("x=%1, y=%2").arg(p.x()).arg(p.y()); + val = TQString("x=%1, y=%2").tqarg(p.x()).tqarg(p.y()); break; } case TQVariant::Rect: { TQRect r = v.toRect(); val = TQString("left=%1, right=%2, top=%3, bottom=%4") - .arg(r.left()) - .arg(r.right()) - .arg(r.top()) - .arg(r.bottom()); + .tqarg(r.left()) + .tqarg(r.right()) + .tqarg(r.top()) + .tqarg(r.bottom()); break; } case TQVariant::Size: { TQSize s = v.toSize(); - val = TQString("width=%1, height=%2").arg(s.width()).arg(s.height()); + val = TQString("width=%1, height=%2").tqarg(s.width()).tqarg(s.height()); break; } case TQVariant::SizePolicy: { TQSizePolicy s = v.toSizePolicy(); - val = TQString("horData=%1, verData=%2").arg(s.horData()).arg(s.verData()); + val = TQString("horData=%1, verData=%2").tqarg(s.horData()).tqarg(s.verData()); break; } case TQVariant::Double: @@ -161,8 +166,8 @@ void PropsView::buildList( TQObject *o ) TQString no("No"); TQString writable = ( mp->writable() ? rw : ro ); - TQString setType = ( mp->isSetType() ? st : TQString::null ); - TQString enumType = ( mp->isEnumType() ? et : TQString::null ); + TQString setType = ( mp->isSetType() ? st : TQString() ); + TQString enumType = ( mp->isEnumType() ? et : TQString() ); TQString designable = ( mp->designable(o) ? yes : no ); TQString flags; diff --git a/kspy/propsview.h b/kspy/propsview.h index 3d0afe80..6cc1285d 100644 --- a/kspy/propsview.h +++ b/kspy/propsview.h @@ -27,8 +27,9 @@ class PropsView : public KListView { Q_OBJECT + TQ_OBJECT public: - PropsView(TQWidget *parent=0, const char *name=0); + PropsView(TQWidget *tqparent=0, const char *name=0); ~PropsView(); void buildList( TQObject *o ); diff --git a/kspy/receiversview.cpp b/kspy/receiversview.cpp index 36582640..2b04303a 100644 --- a/kspy/receiversview.cpp +++ b/kspy/receiversview.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - receiversview.cpp - description + tqreceiversview.cpp - description ------------------- begin : Tue Jan 11 2005 copyright : (C) 2005 by Richard Dale @@ -26,12 +26,12 @@ #include "receiversview.h" -class UnencapsulatedQObject : public TQObject { +class UnencapsulatedTQObject : public TQObject { public: - TQConnectionList *public_receivers(int signal) const { return receivers(signal); } + TQConnectionList *public_tqreceivers(int signal) const { return tqreceivers(signal); } }; -ReceiversView::ReceiversView(TQWidget *parent, const char *name ) : KListView(parent,name) +ReceiversView::ReceiversView(TQWidget *tqparent, const char *name ) : KListView(tqparent,name) { addColumn( i18n( "Object" ) ); addColumn( i18n( "Type" ) ); @@ -48,13 +48,13 @@ ReceiversView::~ReceiversView() void ReceiversView::buildList( TQObject *o ) { - TQMetaObject *mo = o->metaObject(); + TQMetaObject *mo = o->tqmetaObject(); - UnencapsulatedQObject * qobject = (UnencapsulatedQObject *) o; + UnencapsulatedTQObject * qobject = (UnencapsulatedTQObject *) o; TQStrList signalNames = mo->signalNames(true); for (int sig = 0; sig < mo->numSignals(true); sig++) { - TQConnectionList * clist = qobject->public_receivers(sig); + TQConnectionList * clist = qobject->public_tqreceivers(sig); if (clist != 0) { KListViewItem *conn = new KListViewItem( this, signalNames.at(sig) ); diff --git a/kspy/receiversview.h b/kspy/receiversview.h index b654687a..07a18188 100644 --- a/kspy/receiversview.h +++ b/kspy/receiversview.h @@ -1,5 +1,5 @@ /*************************************************************************** - receiversview.h - description + tqreceiversview.h - description ------------------- begin : Tue Jan 11 2005 copyright : (C) 2005 by Richard Dale @@ -27,8 +27,9 @@ class ReceiversView : public KListView { Q_OBJECT + TQ_OBJECT public: - ReceiversView(TQWidget *parent=0, const char *name=0); + ReceiversView(TQWidget *tqparent=0, const char *name=0); ~ReceiversView(); void buildList( TQObject *o ); diff --git a/kspy/sigslotview.cpp b/kspy/sigslotview.cpp index d6fdba24..98400ed7 100644 --- a/kspy/sigslotview.cpp +++ b/kspy/sigslotview.cpp @@ -25,7 +25,7 @@ #include "sigslotview.h" -SigSlotView::SigSlotView(TQWidget *parent, const char *name ) : KListView(parent,name) +SigSlotView::SigSlotView(TQWidget *tqparent, const char *name ) : KListView(tqparent,name) { addColumn( i18n( "Signals/Slots" ) ); @@ -40,7 +40,7 @@ SigSlotView::~SigSlotView() void SigSlotView::buildList( TQObject *o ) { - TQMetaObject *mo = o->metaObject(); + TQMetaObject *mo = o->tqmetaObject(); KListViewItem *sigs = new KListViewItem( this, "Signals" ); TQStrList sigList = mo->signalNames( true ); diff --git a/kspy/sigslotview.h b/kspy/sigslotview.h index 723069cc..a1184771 100644 --- a/kspy/sigslotview.h +++ b/kspy/sigslotview.h @@ -27,8 +27,9 @@ class SigSlotView : public KListView { Q_OBJECT + TQ_OBJECT public: - SigSlotView(TQWidget *parent=0, const char *name=0); + SigSlotView(TQWidget *tqparent=0, const char *name=0); ~SigSlotView(); void buildList( TQObject *o ); diff --git a/kspy/spy.cpp b/kspy/spy.cpp index 3aa18be4..6607e484 100644 --- a/kspy/spy.cpp +++ b/kspy/spy.cpp @@ -44,13 +44,13 @@ extern "C" } } -Spy::Spy( TQWidget *parent, const char *name ) - : TQWidget( parent, name ) +Spy::Spy( TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ) { - TQVBoxLayout *layout = new TQVBoxLayout( this, 11, 6 ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 11, 6 ); TQSplitter *div = new TQSplitter( this ); - layout->addWidget( div ); + tqlayout->addWidget( div ); TQVBox *leftPane = new TQVBox( div ); @@ -66,7 +66,7 @@ Spy::Spy( TQWidget *parent, const char *name ) mSigSlotView = new SigSlotView( tabs, "signals and slots view" ); tabs->addTab( mSigSlotView, i18n( "Signals && Slots" ) ); - mReceiversView = new ReceiversView( tabs, "receivers view" ); + mReceiversView = new ReceiversView( tabs, "tqreceivers view" ); tabs->addTab( mReceiversView, i18n( "Receivers" ) ); mClassInfoView = new ClassInfoView( tabs, "class info view" ); @@ -92,21 +92,21 @@ Spy::~Spy() void Spy::setTarget( TQWidget *target ) { mTarget = target; - mPropsView->buildList( mTarget ); - mSigSlotView->buildList( mTarget ); - mReceiversView->buildList( mTarget ); - mClassInfoView->buildList( mTarget ); + mPropsView->buildList( TQT_TQOBJECT(mTarget) ); + mSigSlotView->buildList( TQT_TQOBJECT(mTarget) ); + mReceiversView->buildList( TQT_TQOBJECT(mTarget) ); + mClassInfoView->buildList( TQT_TQOBJECT(mTarget) ); } void Spy::keyPressEvent( TQKeyEvent *event ) { - if ( event->key() == Qt::Key_Up ) { + if ( event->key() == TQt::Key_Up ) { event->accept(); - TQApplication::postEvent( mNavView, new TQKeyEvent( TQEvent::KeyPress, Qt::Key_Up, 0, 0 ) ); - } else if ( event->key() == Qt::Key_Down ) { + TQApplication::postEvent( mNavView, new TQKeyEvent( TQEvent::KeyPress, TQt::Key_Up, 0, 0 ) ); + } else if ( event->key() == TQt::Key_Down ) { event->accept(); - TQApplication::postEvent( mNavView, new TQKeyEvent( TQEvent::KeyPress, Qt::Key_Down, 0, 0 ) ); - } else if ( event->key() == Qt::Key_Return ) { + TQApplication::postEvent( mNavView, new TQKeyEvent( TQEvent::KeyPress, TQt::Key_Down, 0, 0 ) ); + } else if ( event->key() == TQt::Key_Return ) { event->accept(); mNavView->expandVisibleTree(); } @@ -34,12 +34,13 @@ class ClassInfoView; /** Spy is the main window class of the project. */ -class Spy : public QWidget +class Spy : public TQWidget { - Q_OBJECT + Q_OBJECT + TQ_OBJECT public: - Spy( TQWidget *parent = 0, const char *name = 0 ); + Spy( TQWidget *tqparent = 0, const char *name = 0 ); ~Spy(); void setTarget( TQWidget *target ); diff --git a/kstartperf/kstartperf.cpp b/kstartperf/kstartperf.cpp index 80655dac..eb5152ca 100644 --- a/kstartperf/kstartperf.cpp +++ b/kstartperf/kstartperf.cpp @@ -35,7 +35,7 @@ static KCmdLineOptions options[] = TQString libkstartperf() { - TQString lib = TQString::null; + TQString lib = TQString(); TQString la_file = locate("lib", "libkstartperf.la"); if (la_file.isEmpty()) @@ -54,7 +54,7 @@ TQString libkstartperf() if (line.left(15) == "library_names='") { lib = line.mid(15); - int pos = lib.find(" "); + int pos = lib.tqfind(" "); if (pos > 0) lib = lib.left(pos); } diff --git a/kuiviewer/kuiviewer.cpp b/kuiviewer/kuiviewer.cpp index fab228b7..b710ce95 100644 --- a/kuiviewer/kuiviewer.cpp +++ b/kuiviewer/kuiviewer.cpp @@ -60,7 +60,7 @@ KUIViewer::KUIViewer() { // now that the Part is loaded, we cast it to a Part to get // our hands on it - m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(this, + m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(TQT_TQOBJECT(this), "kuiviewer_part", "KParts::ReadOnlyPart" )); if (m_part) @@ -97,8 +97,8 @@ void KUIViewer::load(const KURL& url) void KUIViewer::setupActions() { - KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); + KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); } void KUIViewer::saveProperties(KConfig* /*config*/) @@ -122,7 +122,7 @@ void KUIViewer::fileOpen() // the Open shortcut is pressed (usually CTRL+O) or the Open toolbar // button is clicked KURL file_name = - KFileDialog::getOpenURL( TQString::null, i18n("*.ui *.UI|User Interface Files"), this ); + KFileDialog::getOpenURL( TQString(), i18n("*.ui *.UI|User Interface Files"), this ); if (file_name.isEmpty() == false) { @@ -153,11 +153,11 @@ void KUIViewer::takeScreenshot(const TQCString &filename, int w, int h){ // resize widget to the desired size m_part->widget()->setMinimumSize(w, h); m_part->widget()->setMaximumSize(w, h); - m_part->widget()->repaint(); + m_part->widget()->tqrepaint(); // resize app to be as large as desired size adjustSize(); // Disable the saving of the size - setAutoSaveSettings(TQString::fromLatin1("MainWindow"), false); + setAutoSaveSettings(TQString::tqfromLatin1("MainWindow"), false); } TQPixmap pixmap = TQPixmap::grabWidget( m_part->widget() ); pixmap.save( filename, "PNG" ); diff --git a/kuiviewer/kuiviewer.h b/kuiviewer/kuiviewer.h index 9ae71b37..415e712d 100644 --- a/kuiviewer/kuiviewer.h +++ b/kuiviewer/kuiviewer.h @@ -49,6 +49,7 @@ class ReadOnlyPart; class KUIViewer : public KParts::MainWindow { Q_OBJECT + TQ_OBJECT public: /** * Default Constructor diff --git a/kuiviewer/kuiviewer_part.cpp b/kuiviewer/kuiviewer_part.cpp index 5f231361..2ff58821 100644 --- a/kuiviewer/kuiviewer_part.cpp +++ b/kuiviewer/kuiviewer_part.cpp @@ -51,10 +51,10 @@ typedef KParts::GenericFactory<KUIViewerPart> KUIViewerPartFactory; K_EXPORT_COMPONENT_FACTORY( libkuiviewerpart, KUIViewerPartFactory ) -KUIViewerPart::KUIViewerPart( TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name, +KUIViewerPart::KUIViewerPart( TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name, const TQStringList & /*args*/ ) - : KParts::ReadOnlyPart(parent, name) + : KParts::ReadOnlyPart(tqparent, name) { // we need an instance setInstance( KUIViewerPartFactory::instance() ); @@ -62,7 +62,7 @@ KUIViewerPart::KUIViewerPart( TQWidget *parentWidget, const char *widgetName, KGlobal::locale()->insertCatalogue("kuiviewer"); // this should be your custom internal widget - m_widget = new TQVBox( parentWidget, widgetName ); + m_widget = new TQVBox( tqparentWidget, widgetName ); // notify the part that this is our internal widget setWidget(m_widget); @@ -72,7 +72,7 @@ KUIViewerPart::KUIViewerPart( TQWidget *parentWidget, const char *widgetName, m_style = new KListAction( i18n("Style"), CTRL + Key_S, - this, + TQT_TQOBJECT(this), TQT_SLOT(slotStyle(int)), actionCollection(), "change_style"); @@ -152,7 +152,7 @@ bool KUIViewerPart::openURL( const KURL& url) emit setWindowCaption( url.prettyURL() ); m_url = url; - m_file = TQString::null; + m_file = TQString(); if (KIO::NetAccess::download(url, m_file)) return openFile(); else @@ -187,7 +187,7 @@ void KUIViewerPart::slotStyle(int) TQObjectList *l = m_widget->queryList( TQWIDGET_OBJECT_NAME_STRING ); for ( TQObject *o = l->first(); o; o = l->next() ) - ( static_cast<TQWidget *>(o) )->setStyle( style ); + ( TQT_TQWIDGET(o) )->setStyle( style ); delete l; m_widget->show(); @@ -205,7 +205,7 @@ void KUIViewerPart::slotGrab() return; } - QClipboard *clipboard = TQApplication::clipboard(); + TQClipboard *clipboard = TQApplication::tqclipboard(); clipboard->setPixmap(TQPixmap::grabWidget(m_widget)); } diff --git a/kuiviewer/kuiviewer_part.h b/kuiviewer/kuiviewer_part.h index 4966923f..09a2a882 100644 --- a/kuiviewer/kuiviewer_part.h +++ b/kuiviewer/kuiviewer_part.h @@ -43,12 +43,13 @@ class KListView; class KUIViewerPart : public KParts::ReadOnlyPart { Q_OBJECT + TQ_OBJECT public: /** * Default constructor */ - KUIViewerPart(TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name, const TQStringList &args); + KUIViewerPart(TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name, const TQStringList &args); /** * Destructor diff --git a/kuiviewer/quicreator.cpp b/kuiviewer/quicreator.cpp index 0dc6da3e..c7a9e996 100644 --- a/kuiviewer/quicreator.cpp +++ b/kuiviewer/quicreator.cpp @@ -47,7 +47,7 @@ img) if ( w ) { TQPixmap p = TQPixmap::grabWidget(w); - img = p.convertToImage().smoothScale(width,height,TQImage::ScaleMin); + img = p.convertToImage().smoothScale(width,height,TQ_ScaleMin); return true; } else diff --git a/kunittest/example/module/sampletests.h b/kunittest/example/module/sampletests.h index 3cd30211..9bbd5d78 100644 --- a/kunittest/example/module/sampletests.h +++ b/kunittest/example/module/sampletests.h @@ -31,6 +31,7 @@ class SlotSampleTester : public KUnitTest::SlotTester { Q_OBJECT + TQ_OBJECT public slots: void setUp(); diff --git a/kunittest/runnergui.cpp b/kunittest/runnergui.cpp index ded28e57..8b4969a8 100644 --- a/kunittest/runnergui.cpp +++ b/kunittest/runnergui.cpp @@ -70,7 +70,7 @@ namespace KUnitTest */ bool addDebugInfo(const TQString &name, const TQString &info) { - Tester *tester = Runner::self()->registry().find(name.local8Bit()); + Tester *tester = Runner::self()->registry().tqfind(name.local8Bit()); if ( tester == 0L ) return false; tester->results()->addDebugInfo(info); @@ -80,7 +80,7 @@ namespace KUnitTest bool addSlotDebugInfo(const TQString &name, const TQString &slt, const TQString &info) { - Tester *tester = Runner::self()->registry().find(name.local8Bit()); + Tester *tester = Runner::self()->registry().tqfind(name.local8Bit()); if ( tester == 0L ) return false; if ( ! tester->inherits("KUnitTest::SlotTester") ) return false; @@ -95,7 +95,7 @@ namespace KUnitTest RunnerGUI *m_rg; }; - RunnerGUI::RunnerGUI(TQWidget *parent) : TQHBox(parent) + RunnerGUI::RunnerGUI(TQWidget *tqparent) : TQHBox(tqparent) { m_dcop = new RunnerGUIDCOPImpl(this); @@ -113,10 +113,10 @@ namespace KUnitTest addTester(it.currentKey(), it.current()); TQString test = it.currentKey(); - int index = test.find("::"); + int index = test.tqfind("::"); if ( index != -1 ) test = test.left(index); - if ( suites.contains(test) == 0 ) + if ( suites.tqcontains(test) == 0 ) suites.append(test); } @@ -127,12 +127,12 @@ namespace KUnitTest m_testerWidget->resultList()->setAllColumnsShowFocus(true); m_testerWidget->resultList()->setSelectionMode(TQListView::Extended); m_testerWidget->resultList()->setRootIsDecorated(true); - m_testerWidget->resultList()->setColumnAlignment(g_finishedColumn, Qt::AlignHCenter); - m_testerWidget->resultList()->setColumnAlignment(g_skippedColumn, Qt::AlignHCenter); - m_testerWidget->resultList()->setColumnAlignment(g_failedColumn, Qt::AlignHCenter); - m_testerWidget->resultList()->setColumnAlignment(g_xfailedColumn, Qt::AlignHCenter); - m_testerWidget->resultList()->setColumnAlignment(g_passedColumn, Qt::AlignHCenter); - m_testerWidget->resultList()->setColumnAlignment(g_xpassedColumn, Qt::AlignHCenter); + m_testerWidget->resultList()->setColumnAlignment(g_finishedColumn, TQt::AlignHCenter); + m_testerWidget->resultList()->setColumnAlignment(g_skippedColumn, TQt::AlignHCenter); + m_testerWidget->resultList()->setColumnAlignment(g_failedColumn, TQt::AlignHCenter); + m_testerWidget->resultList()->setColumnAlignment(g_xfailedColumn, TQt::AlignHCenter); + m_testerWidget->resultList()->setColumnAlignment(g_passedColumn, TQt::AlignHCenter); + m_testerWidget->resultList()->setColumnAlignment(g_xpassedColumn, TQt::AlignHCenter); // set the text in the results label fillResultsLabel(); @@ -162,13 +162,13 @@ namespace KUnitTest if ( Runner::self()->numberOfTests() > 0 ) m_testerWidget->resultsLabel()->setText( TQString("Test cases: %1 | Tests performed: %5, Skipped: <font color=\"#f7a300\">%4</font> | Passed: <font color=\"#009900\">%2</font>, Failed: <font color=\"#990000\">%3</font>") - .arg(Runner::self()->numberOfTestCases()) - .arg(Runner::self()->numberOfPassedTests()) - .arg(Runner::self()->numberOfFailedTests()) - .arg(Runner::self()->numberOfSkippedTests()) - .arg(Runner::self()->numberOfTests()) ); + .tqarg(Runner::self()->numberOfTestCases()) + .tqarg(Runner::self()->numberOfPassedTests()) + .tqarg(Runner::self()->numberOfFailedTests()) + .tqarg(Runner::self()->numberOfSkippedTests()) + .tqarg(Runner::self()->numberOfTests()) ); else - m_testerWidget->resultsLabel()->setText(TQString("Test cases: %1").arg(Runner::self()->numberOfTestCases())); + m_testerWidget->resultsLabel()->setText(TQString("Test cases: %1").tqarg(Runner::self()->numberOfTestCases())); } void RunnerGUI::addTestResult(const char *name, Tester *test) @@ -211,7 +211,7 @@ namespace KUnitTest if ( test->inherits("KUnitTest::SlotTester") ) { - TQStrList allSlots = test->metaObject()->slotNames(); + TQStrList allSlots = test->tqmetaObject()->slotNames(); for ( char *sl = allSlots.first(); sl; sl = allSlots.next() ) { if ( TQString(sl).startsWith("test") ) @@ -222,7 +222,7 @@ namespace KUnitTest TQListViewItem *RunnerGUI::getItem(const TQString &name, TQListViewItem *item /*= 0L*/) { - TQListViewItem *parent = item; + TQListViewItem *tqparent = item; if ( item == 0L ) item = m_testerWidget->resultList()->firstChild(); else item = item->firstChild(); @@ -233,10 +233,10 @@ namespace KUnitTest // item not found, create it if ( item == 0L ) { - if ( parent == 0L ) + if ( tqparent == 0L ) item = new TQListViewItem(m_testerWidget->resultList()); else - item = new TQListViewItem(parent); + item = new TQListViewItem(tqparent); item->setText(g_nameColumn, name); } @@ -288,13 +288,13 @@ namespace KUnitTest bool passed = (item->text(g_failedColumn).toInt(&ok) + item->text(g_xfailedColumn).toInt(&ok)) == 0; item->setPixmap(g_nameColumn, passed ? SmallIcon("button_ok") : SmallIcon("button_cancel") ); - setSummary(item->parent(), res); + setSummary(item->tqparent(), res); } TQString RunnerGUI::fullName(TQListViewItem *item) { TQString name = item->text(g_nameColumn); - while ( (item = item->parent()) != 0L ) + while ( (item = item->tqparent()) != 0L ) name = item->text(g_nameColumn) + "::" + name; return name; @@ -322,7 +322,7 @@ namespace KUnitTest TQString prefix = fullName(item); if ( prefix.endsWith("()") ) { - int index = prefix.findRev("::"); + int index = prefix.tqfindRev("::"); prefix = prefix.left(index); } prefixes << prefix; @@ -358,9 +358,9 @@ namespace KUnitTest if ( item == 0L ) return; TQString name = fullName(item); - if ( name.endsWith("()") ) name = fullName(item->parent()); + if ( name.endsWith("()") ) name = fullName(item->tqparent()); - Tester *tester = Runner::self()->registry().find(name.local8Bit()); + Tester *tester = Runner::self()->registry().tqfind(name.local8Bit()); if ( tester == 0L ) return; @@ -423,7 +423,7 @@ namespace KUnitTest bool ok; arg << TQString(reFileAndLine.cap(1)) << (reFileAndLine.cap(2).toInt(&ok) - 1); client.send("kdevelop-*", "KDevPartController", "editDocument(TQString,int)", data); - client.send("kdevelop-*", "MainWindow", "raise()", ""); + client.send("kdevelop-*", "MainWindow", "raise()", TQString("")); client.detach(); } diff --git a/kunittest/runnergui.h b/kunittest/runnergui.h index 07c4ff8d..6d996849 100644 --- a/kunittest/runnergui.h +++ b/kunittest/runnergui.h @@ -41,12 +41,13 @@ namespace KUnitTest { class RunnerGUIDCOPImpl; - class KDE_EXPORT RunnerGUI : public QHBox + class KDE_EXPORT RunnerGUI : public TQHBox { Q_OBJECT + TQ_OBJECT public: - RunnerGUI(TQWidget *parent); + RunnerGUI(TQWidget *tqparent); ~RunnerGUI(); private slots: diff --git a/kunittest/testerwidget.ui b/kunittest/testerwidget.ui index 61f74337..197eddd4 100644 --- a/kunittest/testerwidget.ui +++ b/kunittest/testerwidget.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>TesterWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>TesterWidget</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -25,7 +25,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="0" column="2"> + <widget class="TQPushButton" row="0" column="2"> <property name="name"> <cstring>m_pshRun</cstring> </property> @@ -33,12 +33,12 @@ <string>Run</string> </property> </widget> - <widget class="QProgressBar" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQProgressBar" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>m_pbProgress</cstring> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>m_cbSelect</cstring> </property> @@ -51,7 +51,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>m_lbSelect</cstring> </property> @@ -59,7 +59,7 @@ <string>Select a suite or module:</string> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>m_lbResults</cstring> </property> @@ -67,7 +67,7 @@ <string></string> </property> </widget> - <widget class="QListView" row="3" column="0" rowspan="1" colspan="3"> + <widget class="TQListView" row="3" column="0" rowspan="1" colspan="3"> <column> <property name="text"> <string>Test</string> @@ -156,18 +156,18 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>200</height> </size> </property> </widget> - <widget class="QTextEdit" row="4" column="0" rowspan="1" colspan="3"> + <widget class="TQTextEdit" row="4" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>m_teDetails</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>600</width> <height>200</height> @@ -182,16 +182,16 @@ <includes> <include location="local" impldecl="in implementation">testerwidget.ui.h</include> </includes> -<signals> +<Q_SIGNALS> <signal>run()</signal> -</signals> +</Q_SIGNALS> <functions> <function access="private" specifier="non virtual">init()</function> - <function returnType="QListView *">resultList()</function> - <function returnType="QTextEdit *">details()</function> - <function returnType="QProgressBar *">progressBar()</function> - <function returnType="QLabel *">resultsLabel()</function> - <function returnType="QComboBox *">selectCombo()</function> + <function returnType="TQListView *">resultList()</function> + <function returnType="TQTextEdit *">details()</function> + <function returnType="TQProgressBar *">progressBar()</function> + <function returnType="TQLabel *">resultsLabel()</function> + <function returnType="TQComboBox *">selectCombo()</function> </functions> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kunittest/testerwidget.ui.h b/kunittest/testerwidget.ui.h index fd79eb96..f80a248d 100644 --- a/kunittest/testerwidget.ui.h +++ b/kunittest/testerwidget.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you want to add, delete, or rename functions or slots, use -** Qt Designer to update this file, preserving your code. +** TQt Designer to update this file, preserving your code. ** ** You should not define a constructor or destructor in this file. ** Instead, write your code in functions called init() and destroy(). diff --git a/poxml/antlr/antlr/AST.hpp b/poxml/antlr/antlr/AST.hpp index a36ffd15..7eb883c2 100644 --- a/poxml/antlr/antlr/AST.hpp +++ b/poxml/antlr/antlr/AST.hpp @@ -59,7 +59,7 @@ public: virtual ANTLR_USE_NAMESPACE(std)vector<RefAST> findAll(RefAST t)=0; virtual ANTLR_USE_NAMESPACE(std)vector<RefAST> findAllPartial(RefAST t)=0; - /** Get the first child of this node; null if no children */ + /** Get the first child of this node; null if no tqchildren */ virtual RefAST getFirstChild() const=0; /** Get the next sibling in line after this one */ virtual RefAST getNextSibling() const=0; diff --git a/poxml/antlr/antlr/ASTFactory.hpp b/poxml/antlr/antlr/ASTFactory.hpp index 584cee6d..f83bec10 100644 --- a/poxml/antlr/antlr/ASTFactory.hpp +++ b/poxml/antlr/antlr/ASTFactory.hpp @@ -90,7 +90,7 @@ public: RefAST dupTree(RefAST t); /** Make a tree from a list of nodes. The first element in the * array is the root. If the root is null, then the tree is - * a simple list not a tree. Handles null children nodes correctly. + * a simple list not a tree. Handles null tqchildren nodes correctly. * For example, build(a, b, null, c) yields tree (a b c). build(null,a,b) * yields tree (nil a b). */ diff --git a/poxml/antlr/antlr/BaseAST.hpp b/poxml/antlr/antlr/BaseAST.hpp index 7b93c1ef..bf1e1629 100644 --- a/poxml/antlr/antlr/BaseAST.hpp +++ b/poxml/antlr/antlr/BaseAST.hpp @@ -70,7 +70,7 @@ public: virtual ANTLR_USE_NAMESPACE(std)vector<RefAST> findAll(RefAST t); virtual ANTLR_USE_NAMESPACE(std)vector<RefAST> findAllPartial(RefAST t); - /** Get the first child of this node; null if no children */ + /** Get the first child of this node; null if no tqchildren */ virtual RefAST getFirstChild() const; /** Get the next sibling in line after this one */ virtual RefAST getNextSibling() const; @@ -80,7 +80,7 @@ public: /** Get the token type for this node */ virtual int getType() const; - /** Remove all children */ + /** Remove all tqchildren */ virtual void removeChildren(); /** Set the first child of a node. */ diff --git a/poxml/antlr/antlr/TokenStreamBasicFilter.hpp b/poxml/antlr/antlr/TokenStreamBasicFilter.hpp index 5438878b..9857a122 100644 --- a/poxml/antlr/antlr/TokenStreamBasicFilter.hpp +++ b/poxml/antlr/antlr/TokenStreamBasicFilter.hpp @@ -25,7 +25,7 @@ public: void discard(int ttype); - void discard(const BitSet& mask); + void discard(const BitSet& tqmask); RefToken nextToken(); }; diff --git a/poxml/antlr/antlr/TokenStreamHiddenTokenFilter.hpp b/poxml/antlr/antlr/TokenStreamHiddenTokenFilter.hpp index 47aad001..b7904ce3 100644 --- a/poxml/antlr/antlr/TokenStreamHiddenTokenFilter.hpp +++ b/poxml/antlr/antlr/TokenStreamHiddenTokenFilter.hpp @@ -60,7 +60,7 @@ public: void hide(int m); - void hide(const BitSet& mask); + void hide(const BitSet& tqmask); protected: RefToken LA(int i); diff --git a/poxml/antlr/src/ASTFactory.cpp b/poxml/antlr/src/ASTFactory.cpp index e44386f7..66902522 100644 --- a/poxml/antlr/src/ASTFactory.cpp +++ b/poxml/antlr/src/ASTFactory.cpp @@ -144,7 +144,7 @@ RefAST ASTFactory::dupList(RefAST t) RefAST ASTFactory::dupTree(RefAST t) { RefAST result = dup(t); // make copy of root - // copy all children of root. + // copy all tqchildren of root. if (t) { result->setFirstChild( dupList(t->getFirstChild()) ); } @@ -152,7 +152,7 @@ RefAST ASTFactory::dupTree(RefAST t) } /** Make a tree from a list of nodes. The first element in the * array is the root. If the root is null, then the tree is - * a simple list not a tree. Handles null children nodes correctly. + * a simple list not a tree. Handles null tqchildren nodes correctly. * For example, build(a, b, null, c) yields tree (a b c). build(null,a,b) * yields tree (nil a b). */ @@ -165,7 +165,7 @@ RefAST ASTFactory::make(ANTLR_USE_NAMESPACE(std)vector<RefAST> nodes) if (root) { root->setFirstChild(RefAST(nullASTptr)); // don't leave any old pointers set } - // link in children; + // link in tqchildren; for (unsigned int i=1; i<nodes.size(); i++) { if ( !nodes[i] ) continue; // ignore null nodes if ( !root ) { diff --git a/poxml/antlr/src/BaseAST.cpp b/poxml/antlr/src/BaseAST.cpp index 4080e0e8..d4b7368b 100644 --- a/poxml/antlr/src/BaseAST.cpp +++ b/poxml/antlr/src/BaseAST.cpp @@ -64,7 +64,7 @@ void BaseAST::doWorkForFindAll( (!partialMatch && sibling->equalsTree(target)) ) { v.push_back(sibling); } - // regardless of match or not, check any children for matches + // regardless of match or not, check any tqchildren for matches if ( sibling->getFirstChild() ) { RefBaseAST(sibling->getFirstChild())->doWorkForFindAll(v, target, partialMatch); } @@ -96,7 +96,7 @@ bool BaseAST::equalsList(RefAST t) const // as a quick optimization, check roots first. if (!sibling->equals(t)) return false; - // if roots match, do full list match test on children. + // if roots match, do full list match test on tqchildren. if (sibling->getFirstChild()) { if (!sibling->getFirstChild()->equalsList(t->getFirstChild())) return false; @@ -129,7 +129,7 @@ bool BaseAST::equalsListPartial(RefAST sub) const // as a quick optimization, check roots first. if (!sibling->equals(sub)) return false; - // if roots match, do partial list match test on children. + // if roots match, do partial list match test on tqchildren. if (sibling->getFirstChild()) if (!sibling->getFirstChild()->equalsListPartial(sub->getFirstChild())) return false; @@ -151,7 +151,7 @@ bool BaseAST::equalsTree(RefAST t) const // check roots first if (!equals(t)) return false; - // if roots match, do full list match test on children. + // if roots match, do full list match test on tqchildren. if (getFirstChild()) { if (!getFirstChild()->equalsList(t->getFirstChild())) return false; @@ -175,7 +175,7 @@ bool BaseAST::equalsTreePartial(RefAST sub) const // check roots first if (!equals(sub)) return false; - // if roots match, do full list partial match test on children. + // if roots match, do full list partial match test on tqchildren. if (getFirstChild()) if (!getFirstChild()->equalsListPartial(sub->getFirstChild())) return false; diff --git a/poxml/antlr/src/CharScanner.cpp b/poxml/antlr/src/CharScanner.cpp index ff40138d..93080338 100644 --- a/poxml/antlr/src/CharScanner.cpp +++ b/poxml/antlr/src/CharScanner.cpp @@ -55,7 +55,7 @@ ANTLR_C_USING(exit) ANTLR_C_USING(tolower) #ifdef ANTLR_REALLY_NO_STRCASECMP -// Apparently, neither strcasecmp nor stricmp is standard, and Codewarrior +// Aptqparently, neither strcasecmp nor stricmp is standard, and Codewarrior // on the mac has neither... inline int strcasecmp(const char *s1, const char *s2) { diff --git a/poxml/antlr/src/Makefile.am b/poxml/antlr/src/Makefile.am index 7a5d2426..99008d3b 100644 --- a/poxml/antlr/src/Makefile.am +++ b/poxml/antlr/src/Makefile.am @@ -1,6 +1,6 @@ # Make #include <antlr/xxx> work.. -INCLUDES=-I$(srcdir)/.. +INCLUDES=-I$(srcdir)/.. $(all_includes) KDE_CXXFLAGS = $(USE_EXCEPTIONS) noinst_LTLIBRARIES = libantlr.la diff --git a/poxml/antlr/src/TokenStreamBasicFilter.cpp b/poxml/antlr/src/TokenStreamBasicFilter.cpp index 71257f46..82922967 100644 --- a/poxml/antlr/src/TokenStreamBasicFilter.cpp +++ b/poxml/antlr/src/TokenStreamBasicFilter.cpp @@ -16,9 +16,9 @@ void TokenStreamBasicFilter::discard(int ttype) discardMask.add(ttype); } -void TokenStreamBasicFilter::discard(const BitSet& mask) +void TokenStreamBasicFilter::discard(const BitSet& tqmask) { - discardMask = mask; + discardMask = tqmask; } RefToken TokenStreamBasicFilter::nextToken() diff --git a/poxml/antlr/src/TokenStreamHiddenTokenFilter.cpp b/poxml/antlr/src/TokenStreamHiddenTokenFilter.cpp index 827ca382..5325fed2 100644 --- a/poxml/antlr/src/TokenStreamHiddenTokenFilter.cpp +++ b/poxml/antlr/src/TokenStreamHiddenTokenFilter.cpp @@ -86,9 +86,9 @@ void TokenStreamHiddenTokenFilter::hide(int m) hideMask.add(m); } -void TokenStreamHiddenTokenFilter::hide(const BitSet& mask) +void TokenStreamHiddenTokenFilter::hide(const BitSet& tqmask) { - hideMask = mask; + hideMask = tqmask; } RefToken TokenStreamHiddenTokenFilter::LA(int i) diff --git a/poxml/lauri.po b/poxml/lauri.po index 9dd0d025..553253d5 100644 --- a/poxml/lauri.po +++ b/poxml/lauri.po @@ -299,7 +299,7 @@ msgstr "Der schlimme Teil" msgid "Ending Text:" msgstr "Ende:" -#. Tag: literallayout +#. Tag: literaltqlayout #: lauri.xml:143 #, no-c-format msgid "" @@ -407,7 +407,7 @@ msgid "" "-> int penWidth()\n" "-> { return pen.width(); }\n" "\n" -" public slots:\n" +" public Q_SLOTS:\n" " void updateAllViews(KScribbleView *sender);\n" " \n" " protected:\n" @@ -429,7 +429,7 @@ msgstr "" " \n" "-> int penWidth()\n" "-> { return pen.width(); }\n" -" public slots:\n" +" public Q_SLOTS:\n" " void updateAllViews(KScribbleView *sender);\n" " \n" " protected:\n" diff --git a/poxml/lauri.xml b/poxml/lauri.xml index 27715981..35448f0c 100644 --- a/poxml/lauri.xml +++ b/poxml/lauri.xml @@ -165,7 +165,7 @@ editor.</action></para> <para> Ending Text: -<literallayout> +<literaltqlayout> Matthias Hoelzer KDE-Verein i.G. Account-Nr. 2798296 @@ -180,7 +180,7 @@ SWIFT-Address: BYLA DE 77 print "$b4 /path/to/KDE/libs/libpng.a $af\n"; \ you see it here whereever -</literallayout> +</literaltqlayout> </para> <para> <screen> @@ -221,7 +221,7 @@ Send ppp -> int penWidth() -> { return pen.width(); } - public slots: + public Q_SLOTS: void updateAllViews(KScribbleView *sender); protected: diff --git a/poxml/parser.cpp b/poxml/parser.cpp index 2f0f7e16..80810eeb 100644 --- a/poxml/parser.cpp +++ b/poxml/parser.cpp @@ -44,7 +44,7 @@ static const char *cuttingtags[] = {"bridgehead", "trans_comment", "para", "titl "revdescription", "glossentry", "partinfo", "segmentedlist", "segtitle", "seg", "seglistitem", "screenco", 0}; -static const char *literaltags[] = {"literallayout", "synopsis", "screen", +static const char *literaltags[] = {"literaltqlayout", "synopsis", "screen", "programlisting", 0}; bool StructureParser::fatalError ( const TQXmlParseException &e ) @@ -99,7 +99,7 @@ bool StructureParser::isLiteralTag(const TQString &qName) bool StructureParser::skippedEntity ( const TQString & name ) { if (inside) - message += TQString("&%1;").arg(name); + message += TQString("&%1;").tqarg(name); return true; } @@ -113,7 +113,7 @@ bool StructureParser::startElement( const TQString& , const TQString& , if (isCuttingTag(tname)) { if (!inside) { - message = TQString::null; + message = TQString(); list.pc.increasePara(); startline = locator->lineNumber(); startcol = locator->columnNumber(); @@ -126,10 +126,10 @@ bool StructureParser::startElement( const TQString& , const TQString& , { TQString tmp = "<" + tname; for (int i = 0; i < attr.length(); i++) { - tmp += TQString(" %1=\"%2\"").arg(attr.qName(i)).arg(attr.value(i)); + tmp += TQString(" %1=\"%2\"").tqarg(attr.qName(i)).tqarg(attr.value(i)); } - tmp += TQString(" poxml_line=\"%1\"").arg(locator->lineNumber()); - tmp += TQString(" poxml_col=\"%1\"").arg(locator->columnNumber()); + tmp += TQString(" poxml_line=\"%1\"").tqarg(locator->lineNumber()); + tmp += TQString(" poxml_col=\"%1\"").tqarg(locator->columnNumber()); if (isSingleTag(qName)) tmp += "/>"; @@ -180,8 +180,8 @@ bool StructureParser::closureTag(const TQString& message, const TQString &tag) uint index = 0; while (true) { - int nextclose = message.find(TQRegExp(TQString::fromLatin1("</%1[\\s>]").arg(tag)), index); - int nextstart = message.find(TQRegExp(TQString::fromLatin1("<%1[>\\s]").arg(tag)), index); + int nextclose = message.tqfind(TQRegExp(TQString::tqfromLatin1("</%1[\\s>]").tqarg(tag)), index); + int nextstart = message.tqfind(TQRegExp(TQString::tqfromLatin1("<%1[>\\s]").tqarg(tag)), index); // qDebug("finding %d %d %d %d", nextstart, nextclose, index, inside); if (nextclose == -1) { #ifdef POXML_DEBUG @@ -223,7 +223,7 @@ void StructureParser::descape(TQString &message) bool lastws = false; while (index < message.length()) { - switch (message.at(index).latin1()) { + switch (message.tqat(index).latin1()) { case '\n': case '\t': case '\r': @@ -254,7 +254,7 @@ void StructureParser::descape(TQString &message) index++; } - message.replace(TQRegExp("\010"), ""); + message.tqreplace(TQRegExp("\010"), ""); } bool StructureParser::formatMessage(MsgBlock &msg) const @@ -278,7 +278,7 @@ bool StructureParser::formatMessage(MsgBlock &msg) const { int slen = strlen(singletags[index]); - if (msg.msgid.left(slen + 1) == TQString::fromLatin1("<%1").arg(singletags[index]) && + if (msg.msgid.left(slen + 1) == TQString::tqfromLatin1("<%1").tqarg(singletags[index]) && !msg.msgid.at( slen + 1 ).isLetterOrNumber() ) { #ifdef POXML_DEBUG @@ -327,8 +327,8 @@ bool StructureParser::formatMessage(MsgBlock &msg) const TQString orig = msg.msgid; TQString endtag = msg.msgid.mid(endindex + 2, msg.msgid.length() - (endindex + 2) - 1); - TQString endtag_attr = endtag.mid(endtag.find(' '), endtag.length()); - endtag.replace(infos_reg, ""); + TQString endtag_attr = endtag.mid(endtag.tqfind(' '), endtag.length()); + endtag.tqreplace(infos_reg, ""); if (endtag == starttag) { if (!closureTag(msg.msgid, starttag)) break; @@ -418,9 +418,9 @@ MsgList StructureParser::splitMessage(const MsgBlock &mb) #endif // the exception for poxml_* attributes is made in the closing tag - int closing_index = message.find(TQRegExp(TQString::fromLatin1("</%1[\\s>]").arg(tag)), + int closing_index = message.tqfind(TQRegExp(TQString::tqfromLatin1("</%1[\\s>]").tqarg(tag)), strindex); - int starting_index = message.find(TQRegExp(TQString::fromLatin1("<%1[\\s>]").arg(tag)), + int starting_index = message.tqfind(TQRegExp(TQString::tqfromLatin1("<%1[\\s>]").tqarg(tag)), strindex); #ifdef POXML_DEBUG @@ -510,8 +510,8 @@ MsgList StructureParser::splitMessage(const MsgBlock &mb) while (endindex >= 0 && (message.at(endindex) != '<' || message.at(endindex + 1) != '/')) endindex--; TQString tag = message.mid(endindex + 2, message.length() - endindex - 3); - if (tag.find(' ') > 0 ) { - tag = tag.left(tag.find(' ')); + if (tag.tqfind(' ') > 0 ) { + tag = tag.left(tag.tqfind(' ')); } #ifdef POXML_DEBUG qDebug("behind tag %s", tag.latin1()); @@ -529,9 +529,9 @@ MsgList StructureParser::splitMessage(const MsgBlock &mb) qDebug("inside %s %d", message.mid(strindex, 35).latin1(), inside); #endif - int closing_index = message.findRev(TQRegExp(TQString::fromLatin1("</%1[\\s>]").arg(tag)), + int closing_index = message.tqfindRev(TQRegExp(TQString::tqfromLatin1("</%1[\\s>]").tqarg(tag)), strindex - 1); - int starting_index = message.findRev(TQRegExp(TQString::fromLatin1("<%1[\\s>]").arg(tag)), + int starting_index = message.tqfindRev(TQRegExp(TQString::tqfromLatin1("<%1[\\s>]").tqarg(tag)), strindex - 1); #ifdef POXML_DEBUG @@ -601,9 +601,9 @@ bool StructureParser::endElement( const TQString& , const TQString&, const TQStr if (inside) { if (!isSingleTag(qName)) { - message += TQString("</%1").arg(tname); - message += TQString(" poxml_line=\"%1\"").arg(locator->lineNumber()); - message += TQString(" poxml_col=\"%1\"").arg(locator->columnNumber()); + message += TQString("</%1").tqarg(tname); + message += TQString(" poxml_line=\"%1\"").tqarg(locator->lineNumber()); + message += TQString(" poxml_col=\"%1\"").tqarg(locator->columnNumber()); message += ">"; } } @@ -640,7 +640,7 @@ bool StructureParser::endElement( const TQString& , const TQString&, const TQStr (*it).lines.first().offset = 0; } } - (*it).msgid.replace(infos_reg, TQString::null); + (*it).msgid.tqreplace(infos_reg, TQString()); if (!(*it).msgid.isEmpty()) list.append(*it); @@ -663,11 +663,11 @@ bool StructureParser::comment ( const TQString &c ) TQString StructureParser::escapeLiterals( const TQString &_contents) { TQString contents = _contents; - contents.replace(TQRegExp("\n"), "&POXML_LINEFEED;"); - contents.replace(TQRegExp("<"), "&POXML_LT;"); - contents.replace(TQRegExp(">"), "&POXML_GT;"); - contents.replace(TQRegExp("\t"), " "); - contents.replace(TQRegExp(" "), "&POXML_SPACE;"); + contents.tqreplace(TQRegExp("\n"), "&POXML_LINEFEED;"); + contents.tqreplace(TQRegExp("<"), "&POXML_LT;"); + contents.tqreplace(TQRegExp(">"), "&POXML_GT;"); + contents.tqreplace(TQRegExp("\t"), " "); + contents.tqreplace(TQRegExp(" "), "&POXML_SPACE;"); return contents; } @@ -675,11 +675,11 @@ TQString StructureParser::escapeLiterals( const TQString &_contents) { TQString StructureParser::descapeLiterals( const TQString &_contents) { TQString contents = _contents; - contents.replace(TQRegExp("&POXML_LINEFEED;"), "\n"); - contents.replace(TQRegExp("&POXML_LT;"), "<"); - contents.replace(TQRegExp("&POXML_GT;"), ">"); - contents.replace(TQRegExp("&POXML_SPACE;"), " "); - contents.replace(TQRegExp("!POXML_AMP!"), "&"); + contents.tqreplace(TQRegExp("&POXML_LINEFEED;"), "\n"); + contents.tqreplace(TQRegExp("&POXML_LT;"), "<"); + contents.tqreplace(TQRegExp("&POXML_GT;"), ">"); + contents.tqreplace(TQRegExp("&POXML_SPACE;"), " "); + contents.tqreplace(TQRegExp("!POXML_AMP!"), "&"); return contents; } @@ -710,23 +710,23 @@ void StructureParser::stripWhiteSpace( TQString &contents) void StructureParser::cleanupTags( TQString &contents ) { - contents.replace(TQRegExp("&"), "!POXML_AMP!"); + contents.tqreplace(TQRegExp("&"), "!POXML_AMP!"); for (int index = 0; literaltags[index]; index++) { - TQRegExp start(TQString("<%1[\\s>]").arg(literaltags[index])); - TQRegExp end(TQString("</%1[\\s>]").arg(literaltags[index])); + TQRegExp start(TQString("<%1[\\s>]").tqarg(literaltags[index])); + TQRegExp end(TQString("</%1[\\s>]").tqarg(literaltags[index])); int strindex = 0; while (true) { - strindex = contents.find(start, strindex); + strindex = contents.tqfind(start, strindex); if (strindex < 0) break; while (contents.at(strindex) != '>') strindex++; strindex++; // one more - int endindex = contents.find(end, strindex); + int endindex = contents.tqfind(end, strindex); TQString part = contents.mid(strindex, endindex - strindex); TQString newpart = escapeLiterals(part); - contents.replace(strindex, part.length(), newpart); + contents.tqreplace(strindex, part.length(), newpart); // this assumes that literal tags to not overlap strindex = strindex + newpart.length(); } @@ -739,7 +739,7 @@ void StructureParser::cleanupTags( TQString &contents ) if (index < 0) break; TQString tag = unclosed.cap(1); - contents.replace(index, unclosed.matchedLength(), TQString("</%1>").arg(tag)); + contents.tqreplace(index, unclosed.matchedLength(), TQString("</%1>").tqarg(tag)); } TQRegExp start("<((\\s*[^<>\\s])*)\\s\\s*(/*)>"); @@ -753,7 +753,7 @@ void StructureParser::cleanupTags( TQString &contents ) TQString tag = start.cap(1); TQString cut = start.capturedTexts().last(); // qDebug("UNCLO %s %d -%s- -%s-", start.cap(0).latin1(), index, tag.latin1(), cut.latin1()); - contents.replace(index, start.matchedLength(), TQString("<%1%2>").arg(tag).arg(cut)); + contents.tqreplace(index, start.matchedLength(), TQString("<%1%2>").tqarg(tag).tqarg(cut)); } TQRegExp singletag("<(\\w*)\\s([^><]*)/>"); @@ -764,7 +764,7 @@ void StructureParser::cleanupTags( TQString &contents ) break; TQString tag = singletag.cap(1); if (!StructureParser::isSingleTag(tag)) { - contents.replace(index, singletag.matchedLength(), TQString("<%1 %2></%3>").arg(tag).arg(singletag.cap(2)).arg(tag)); + contents.tqreplace(index, singletag.matchedLength(), TQString("<%1 %2></%3>").tqarg(tag).tqarg(singletag.cap(2)).tqarg(tag)); } } @@ -775,7 +775,7 @@ void StructureParser::cleanupTags( TQString &contents ) if (index < 0) break; TQString msgid = trans_comment.cap(1); - contents.replace(index, trans_comment.matchedLength(), TQString("<trans_comment>%1</trans_comment>").arg(msgid)); + contents.tqreplace(index, trans_comment.matchedLength(), TQString("<trans_comment>%1</trans_comment>").tqarg(msgid)); } #ifdef POXML_DEBUG @@ -788,14 +788,14 @@ static bool removeEmptyTag( TQString &contents, const TQString & tag) { // qDebug("cont %s %s", contents.latin1(), tag.latin1()); - TQRegExp empty(TQString("<%1[^>]*>[\\s\n][\\s\n]*</%2\\s*>").arg(tag).arg(tag)); + TQRegExp empty(TQString("<%1[^>]*>[\\s\n][\\s\n]*</%2\\s*>").tqarg(tag).tqarg(tag)); int strindex = 0; while (true) { - strindex = contents.find(empty, strindex); + strindex = contents.tqfind(empty, strindex); if (strindex < 0) break; qDebug("found empty tag %s", tag.latin1()); - contents.replace(strindex, empty.matchedLength(), " "); + contents.tqreplace(strindex, empty.matchedLength(), " "); strindex++; return true; } @@ -831,8 +831,8 @@ bool StructureParser::characters(const TQString &ch) TQString escape(TQString message) { - message.replace(TQRegExp("\\\\"), "\\\\"); - message.replace(TQRegExp("\""), "\\\""); + message.tqreplace(TQRegExp("\\\\"), "\\\\"); + message.tqreplace(TQRegExp("\""), "\\\""); return message; } @@ -871,46 +871,46 @@ TQString escapePO(TQString msgid) { int index = 0; while (true) { - index = msgid.find("\\n", index); + index = msgid.tqfind("\\n", index); if (index == -1) break; if (index >= 1 && msgid.at(index - 1) == '\\' && msgid.at(index - 2) != '\\') { - msgid.replace(index - 1, 3, "&POXML_LITERALLINEFEED;"); + msgid.tqreplace(index - 1, 3, "&POXML_LITERALLINEFEED;"); index += 3; } else - msgid.replace(index, 2, "\n"); + msgid.tqreplace(index, 2, "\n"); } index = 0; while (true) { - index = msgid.find("\\\"", index); + index = msgid.tqfind("\\\"", index); if (index == -1) break; if (index > 1 && msgid.at(index - 1) == '\\' && msgid.at(index - 2) != '\\') - msgid.replace(index - 1, 3, "&POXML_LITERALQUOTE;"); + msgid.tqreplace(index - 1, 3, "&POXML_LITERALTQUOTE;"); else - msgid.replace(index, 2, "\""); + msgid.tqreplace(index, 2, "\""); } index = 0; while (true) { - index = msgid.find("\\t", index); + index = msgid.tqfind("\\t", index); if (index == -1) break; if (msgid.at(index - 1) == '\\') - msgid.replace(index - 1, 3, "\\t"); + msgid.tqreplace(index - 1, 3, "\\t"); else - msgid.replace(index, 2, "\t"); + msgid.tqreplace(index, 2, "\t"); } index = 0; while (true) { - index = msgid.find("\\\\", index); + index = msgid.tqfind("\\\\", index); if (index == -1) break; - msgid.replace(index, 2, "\\"); + msgid.tqreplace(index, 2, "\\"); index += 1; } - msgid.replace(TQRegExp("&POXML_LITERALLINEFEED;"), "\\n"); - msgid.replace(TQRegExp("&POXML_LITERALQUOTE;"), "\\"); + msgid.tqreplace(TQRegExp("&POXML_LITERALLINEFEED;"), "\\n"); + msgid.tqreplace(TQRegExp("&POXML_LITERALTQUOTE;"), "\\"); return msgid; } @@ -930,7 +930,7 @@ MsgList parseXML(const char *filename) StructureParser::cleanupTags(contents); while (true) { - int index = contents.find("<!ENTITY"); + int index = contents.tqfind("<!ENTITY"); if (index < 0) break; int inside = 0; @@ -938,7 +938,7 @@ MsgList parseXML(const char *filename) TQString replacement = ""; while (contents.at(endindex) != '>' || inside) { - switch (contents.at(endindex).latin1()) { + switch (contents.tqat(endindex).latin1()) { case '<': inside++; break; case '>': @@ -952,7 +952,7 @@ MsgList parseXML(const char *filename) endindex++; } endindex++; - contents.replace(index, endindex - index, replacement); + contents.tqreplace(index, endindex - index, replacement); } TQTextStream ts(contents.utf8(), IO_ReadOnly); @@ -975,10 +975,10 @@ MsgList parseXML(const char *filename) for (MsgList::Iterator it = english.begin(); it != english.end(); it++) { - TQMap<TQString,TQString>::Iterator found = msgids.find((*it).msgid); + TQMap<TQString,TQString>::Iterator found = msgids.tqfind((*it).msgid); if ((*it).msgid.length() < 4) { - (*it).msgid = TQString("<%1>").arg((*it).tag) + (*it).msgid + - TQString("</%1>").arg((*it).tag); + (*it).msgid = TQString("<%1>").tqarg((*it).tag) + (*it).msgid + + TQString("</%1>").tqarg((*it).tag); changed = true; break; } @@ -993,7 +993,7 @@ MsgList parseXML(const char *filename) it2 != english.end(); it2++) { if ((*it2).msgid == msgid) - (*it2).msgid = TQString("<%1>").arg((*it2).tag) + msgid + TQString("</%1>").arg((*it2).tag); + (*it2).msgid = TQString("<%1>").tqarg((*it2).tag) + msgid + TQString("</%1>").tqarg((*it2).tag); } break; } diff --git a/poxml/parser.h b/poxml/parser.h index 923723c5..2a2ebab0 100644 --- a/poxml/parser.h +++ b/poxml/parser.h @@ -73,7 +73,7 @@ public: ParaCounter pc; }; -class StructureParser : public QXmlDefaultHandler +class StructureParser : public TQXmlDefaultHandler { public: bool startDocument(); diff --git a/poxml/po2xml.cpp b/poxml/po2xml.cpp index c30a340f..314b0b5b 100644 --- a/poxml/po2xml.cpp +++ b/poxml/po2xml.cpp @@ -19,7 +19,7 @@ TQString translate(TQString xml, TQString orig, TQString translation) TQString prefix; while (xml.at(0) == '<' && orig.at(0) != '<') { // a XML tag as prefix - int index = xml.find('>'); + int index = xml.tqfind('>'); assert(index != -1); index++; while (xml.at(index) == ' ') @@ -28,13 +28,13 @@ TQString translate(TQString xml, TQString orig, TQString translation) xml = xml.mid(index, xml.length()); } - int index = xml.find(orig); + int index = xml.tqfind(orig); if (index == -1) { - qWarning("can't find\n%s\nin\n%s", orig.latin1(), xml.latin1()); + qWarning("can't tqfind\n%s\nin\n%s", orig.latin1(), xml.latin1()); exit(1); } if (!translation.isEmpty()) - xml.replace(index, orig.length(), translation); + xml.tqreplace(index, orig.length(), translation); return prefix + xml; } @@ -65,7 +65,7 @@ int main( int argc, char **argv ) { TQString msgstr; TQString msgid = escapePO((*it).msgid); - if ((*it).comment.find("fuzzy") < 0) + if ((*it).comment.tqfind("fuzzy") < 0) msgstr = escapePO((*it).msgstr); #ifdef POXML_DEBUG @@ -88,7 +88,7 @@ int main( int argc, char **argv ) line_offsets.append(0); int index = 0; while (true) { - index = xml_text.find('\n', index) + 1; + index = xml_text.tqfind('\n', index) + 1; if (index <= 0) break; line_offsets.append(index); @@ -137,7 +137,7 @@ int main( int argc, char **argv ) TQString xml = xml_text.mid(start_pos, end_pos - start_pos); int index = 0; while (true) { - index = xml.find("<!--"); + index = xml.tqfind("<!--"); if (index == -1) break; int end_index = index + 4; @@ -147,13 +147,13 @@ int main( int argc, char **argv ) { end_index++; } - xml.replace(index, end_index + 1 - index, " "); + xml.tqreplace(index, end_index + 1 - index, " "); index = end_index; } StructureParser::descape(xml); TQString descaped = StructureParser::descapeLiterals((*it).msgid); - if (translations.contains(descaped)) + if (translations.tqcontains(descaped)) descaped = translations[descaped]; #ifdef POXML_DEBUG @@ -236,21 +236,21 @@ int main( int argc, char **argv ) ts << xml_text.mid(old_pos); - output.replace(TQRegExp("<trans_comment\\s*>"), ""); - output.replace(TQRegExp("</trans_comment\\s*>"), ""); + output.tqreplace(TQRegExp("<trans_comment\\s*>"), ""); + output.tqreplace(TQRegExp("</trans_comment\\s*>"), ""); StructureParser::removeEmptyTags(output); index = 0; while (true) { - index = output.find(TQRegExp(">[^\n]"), index ); + index = output.tqfind(TQRegExp(">[^\n]"), index ); if ( index == -1 ) break; if ( output.at( index - 1 ) == '/' || output.at( index - 1 ) == '-' || output.at( index - 1 ) == ']' || output.at( index - 1 ) == '?' ) index = index + 1; else { - output.replace( index, 1, "\n>" ); + output.tqreplace( index, 1, "\n>" ); index = index + 2; } } diff --git a/poxml/split.cpp b/poxml/split.cpp index 29104d3e..fa8faab1 100644 --- a/poxml/split.cpp +++ b/poxml/split.cpp @@ -36,7 +36,7 @@ int main( int argc, char **argv ) if (report_mismatches && errors.count()) { for (TQMap<int, TQString>::ConstIterator it = errors.begin(); it != errors.end(); ++it) { - if (translated.pc.anchors.contains(it.data())) + if (translated.pc.anchors.tqcontains(it.data())) fprintf(stderr, "id=\"%s\" not in the same paragraphs (%d vs %d)\n", it.data().latin1(), english.pc.anchors[it.data()], translated.pc.anchors[it.data()]); else { @@ -65,7 +65,7 @@ int main( int argc, char **argv ) it != english.end(); ) { if ((*it).msgid == "ROLES_OF_TRANSLATORS") { - if ((*it).msgstr.length() && !(*it).msgstr.contains("ROLES_OF_TRANSLATORS")) { + if ((*it).msgstr.length() && !(*it).msgstr.tqcontains("ROLES_OF_TRANSLATORS")) { have_roles_of_translators = true; } else { @@ -77,7 +77,7 @@ int main( int argc, char **argv ) } if ((*it).msgid == "CREDIT_FOR_TRANSLATORS") { - if ((*it).msgstr.length() && !(*it).msgstr.contains("CREDIT_FOR_TRANSLATORS")) { + if ((*it).msgstr.length() && !(*it).msgstr.tqcontains("CREDIT_FOR_TRANSLATORS")) { have_credit_for_translators = true; } else { @@ -88,7 +88,7 @@ int main( int argc, char **argv ) continue; } - if (msgids.contains((*it).msgid)) { + if (msgids.tqcontains((*it).msgid)) { english[msgids[(*it).msgid]].lines += (*it).lines; if (english[msgids[(*it).msgid]].msgstr != (*it).msgstr) { fprintf(stderr, "two different translations for \"%s\" (\"%s\" and \"%s\") - choosing first one\n", @@ -112,7 +112,7 @@ int main( int argc, char **argv ) while (tit != translated.end()) { MsgBlock mb; - mb.msgid = TQString::fromLatin1("appended paragraph %1").arg(counter++); + mb.msgid = TQString::tqfromLatin1("appended paragraph %1").tqarg(counter++); mb.msgstr = (*tit).msgid; mb.lines += (*tit).lines; english.append(mb); diff --git a/poxml/transxx.cpp b/poxml/transxx.cpp index d876d56c..92004372 100644 --- a/poxml/transxx.cpp +++ b/poxml/transxx.cpp @@ -42,7 +42,7 @@ int main(int argc, char **argv) return 1; } - const bool is_desktop = filename.find( "desktop_") >= 0; + const bool is_desktop = filename.tqfind( "desktop_") >= 0; // The header is the last item (due too the sorting) MsgList::const_iterator header = --translated.end(); @@ -62,7 +62,7 @@ int main(int argc, char **argv) headerLines.gres( TQRegExp( "^Last-Translator:.*" ), "Last-Translator: transxx program <null@kde.org>" ); headerLines.gres( TQRegExp( "^Language-Team:.*" ), "Language-Team: Test Language <kde-i18n-doc@kde.org>" ); TQString revisionDate ( "PO-Revision-Date: " ); - const TQDateTime dt = TQDateTime::currentDateTime( Qt::UTC ); + const TQDateTime dt = TQDateTime::tqcurrentDateTime( Qt::UTC ); revisionDate += dt.toString( "yyyy-MM-dd hh:mm+0000" ); headerLines.gres( TQRegExp( "^PO-Revision-Date:.*" ), revisionDate ); headerLines << "Plural-Forms: nplurals=1; plural=0;"; @@ -85,22 +85,22 @@ int main(int argc, char **argv) TQString msgstr; - if ( msgid.find( "Definition of PluralForm" ) != -1 ) { + if ( msgid.tqfind( "Definition of PluralForm" ) != -1 ) { outputMsg("msgstr", "NoPlural"); cout << "\n"; continue; } if ( is_desktop ) { - msgstr = msgid.left( msgid.find( '=' ) + 1); - msgstr += translation + msgid.mid( msgid.find( '=' ) + 1) + translation; + msgstr = msgid.left( msgid.tqfind( '=' ) + 1); + msgstr += translation + msgid.mid( msgid.tqfind( '=' ) + 1) + translation; outputMsg( "msgstr", escapePO(msgstr) ); cout << "\n"; continue; } if (msgid.startsWith("_n: ") || msgid.startsWith("_: ") ) { // KDE extentions - msgid = msgid.mid(msgid.find("\\n") + 2, msgid.length()); + msgid = msgid.mid(msgid.tqfind("\\n") + 2, msgid.length()); } if (msgid.endsWith("%")) diff --git a/poxml/xml2pot.cpp b/poxml/xml2pot.cpp index 340d4689..d73542d7 100644 --- a/poxml/xml2pot.cpp +++ b/poxml/xml2pot.cpp @@ -21,7 +21,7 @@ int main( int argc, char **argv ) for (MsgList::Iterator it = english.begin(); it != english.end(); ) { - if (msgids.contains((*it).msgid)) { + if (msgids.tqcontains((*it).msgid)) { english[msgids[(*it).msgid]].lines += (*it).lines; MsgList::Iterator tmp = it; it++; @@ -33,7 +33,7 @@ int main( int argc, char **argv ) } } - const TQDateTime now = TQDateTime::currentDateTime( Qt::UTC ); + const TQDateTime now = TQDateTime::tqcurrentDateTime( Qt::UTC ); cout << "# SOME DESCRIPTIVE TITLE.\n"; cout << "# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.\n"; @@ -57,7 +57,7 @@ int main( int argc, char **argv ) for (MsgList::ConstIterator it = english.begin(); it != english.end(); ++it) { - cout << "#. Tag: " << (*it).tag.utf8() << endl; + cout << "#. Tag: " << (*it).tag.utf8().data() << endl; cout << "#: "; for (TQValueList<BlockInfo>::ConstIterator it2 = (*it).lines.begin(); it2 != (*it).lines.end(); it2++) { diff --git a/scheck/bitmaps.h b/scheck/bitmaps.h index 43e96bd8..ec3829e0 100644 --- a/scheck/bitmaps.h +++ b/scheck/bitmaps.h @@ -22,7 +22,7 @@ static const unsigned char radiooff_center_bits[] = { 0xfc, 0x07, 0xfc, 0x07, 0xfc, 0x07, 0xf8, 0x03, 0xf0, 0x01, 0x00, 0x00, 0x00, 0x00}; -static const unsigned char radiomask_bits[] = { +static const unsigned char radiotqmask_bits[] = { 0xf0, 0x01, 0xfc, 0x07, 0xfe, 0x0b, 0xfe, 0x0b, 0xff, 0x17, 0xff, 0x17, 0xff, 0x17, 0xff, 0x17, 0xff, 0x17, 0xfe, 0x0b, 0xf2, 0x09, 0x0c, 0x06, 0xf0, 0x01}; @@ -31,22 +31,22 @@ static const unsigned char radiomask_bits[] = { static const unsigned char x_bits[] = {0x63, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x63}; // Arrow bitmaps -static const QCOORD u_arrow[]={-1,-3, 0,-3, -2,-2, 1,-2, -3,-1, 2,-1, -4,0, 3,0, -4,1, 3,1}; -static const QCOORD d_arrow[]={-4,-2, 3,-2, -4,-1, 3,-1, -3,0, 2,0, -2,1, 1,1, -1,2, 0,2}; -static const QCOORD l_arrow[]={-3,-1, -3,0, -2,-2, -2,1, -1,-3, -1,2, 0,-4, 0,3, 1,-4, 1,3}; -static const QCOORD r_arrow[]={-2,-4, -2,3, -1,-4, -1,3, 0,-3, 0,2, 1,-2, 1,1, 2,-1, 2,0}; +static const TQCOORD u_arrow[]={-1,-3, 0,-3, -2,-2, 1,-2, -3,-1, 2,-1, -4,0, 3,0, -4,1, 3,1}; +static const TQCOORD d_arrow[]={-4,-2, 3,-2, -4,-1, 3,-1, -3,0, 2,0, -2,1, 1,1, -1,2, 0,2}; +static const TQCOORD l_arrow[]={-3,-1, -3,0, -2,-2, -2,1, -1,-3, -1,2, 0,-4, 0,3, 1,-4, 1,3}; +static const TQCOORD r_arrow[]={-2,-4, -2,3, -1,-4, -1,3, 0,-3, 0,2, 1,-2, 1,1, 2,-1, 2,0}; namespace B3 { - const QCOORD u_arrow[]={ 0,-2, 0,-2, -1,-1, 1,-1, -2,0, 2,0, -3,1, 3,1 }; - const QCOORD d_arrow[]={ -3,-2, 3,-2, -2,-1, 2,-1, -1,0, 1,0, 0,1, 0,1 }; - const QCOORD l_arrow[]={ 1,-3, 1,-3, 0,-2, 1,-2, -1,-1, 1,-1, -2,0, 1,0, -1,1, 1,1, 0,2, 1,2, 1,3, 1,3 }; - const QCOORD r_arrow[]={ -2,-3, -2,-3, -2,-2, -1,-2, -2,-1, 0,-1, -2,0, 1,0, -2,1, 0,1, -2,2, -1,2, -2,3, -2,3 }; + const TQCOORD u_arrow[]={ 0,-2, 0,-2, -1,-1, 1,-1, -2,0, 2,0, -3,1, 3,1 }; + const TQCOORD d_arrow[]={ -3,-2, 3,-2, -2,-1, 2,-1, -1,0, 1,0, 0,1, 0,1 }; + const TQCOORD l_arrow[]={ 1,-3, 1,-3, 0,-2, 1,-2, -1,-1, 1,-1, -2,0, 1,0, -1,1, 1,1, 0,2, 1,2, 1,3, 1,3 }; + const TQCOORD r_arrow[]={ -2,-3, -2,-3, -2,-2, -1,-2, -2,-1, 0,-1, -2,0, 1,0, -2,1, 0,1, -2,2, -1,2, -2,3, -2,3 }; } -#define QCOORDARRLEN(x) sizeof(x)/(sizeof(QCOORD)*2) +#define TQCOORDARRLEN(x) sizeof(x)/(sizeof(TQCOORD)*2) -// Fix Qt's wacky image positions +// Fix TQt's wacky image positions static const char * const hc_minimize_xpm[] = { "12 12 2 1", "# c #000000", diff --git a/scheck/scheck.cpp b/scheck/scheck.cpp index 263a77ce..4e4dd724 100644 --- a/scheck/scheck.cpp +++ b/scheck/scheck.cpp @@ -8,14 +8,14 @@ * * Based on the KDE3 HighColor Style (version 1.0): * Copyright (C) 2001-2002 Karol Szwed <gallium@kde.org> - * (C) 2001-2002 Fredrik Höglund <fredrik@kde.org> + * (C) 2001-2002 Fredrik H�glund <fredrik@kde.org> * * Drawing routines adapted from the KDE2 HCStyle, * Copyright (C) 2000 Daniel M. Duley <mosfet@kde.org> * (C) 2000 Dirk Mueller <mueller@kde.org> * (C) 2001 Martijn Klingens <klingens@kde.org> * - * Portions of code are from the Qt GUI Toolkit, Copyright (C) 1992-2003 Trolltech AS. + * Portions of code are from the TQt GUI Toolkit, Copyright (C) 1992-2003 Trolltech AS. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public @@ -74,7 +74,7 @@ #include "bitmaps.h" // -- Style Plugin Interface ------------------------- -class StyleCheckStylePlugin : public QStylePlugin +class StyleCheckStylePlugin : public TQStylePlugin { public: StyleCheckStylePlugin() {} @@ -104,7 +104,7 @@ static TQBitmap lightBmp; static TQBitmap grayBmp; static TQBitmap dgrayBmp; static TQBitmap centerBmp; -static TQBitmap maskBmp; +static TQBitmap tqmaskBmp; static TQBitmap xBmp; static const int itemFrame = 1; @@ -269,7 +269,7 @@ namespace m_words->insert( "ctrl", "Ctrl"); m_words->insert( "java", "Java"); m_words->insert( "javascript", "JavaScript"); - m_words->insert( "qt", "Qt"); + m_words->insert( "qt", "TQt"); m_words->insert( "doxygen", "Doxygen"); m_words->insert( "linux", "Linux"); m_words->insert( "unix", "UNIX"); @@ -306,7 +306,7 @@ static TQColor severityColor(int severity) { if (severity == StyleGuideViolation::Error) { - return Qt::red; + return TQt::red; } else if (severity == StyleGuideViolation::AccelConflict) { @@ -314,7 +314,7 @@ static TQColor severityColor(int severity) } else if (severity == StyleGuideViolation::AccelSuggestion) { - return Qt::green; + return TQt::green; } else if (severity == StyleGuideViolation::Untranslated) { @@ -322,7 +322,7 @@ static TQColor severityColor(int severity) } else { - return Qt::yellow; + return TQt::yellow; } } @@ -343,7 +343,7 @@ static void removeAccelerators(TQString &str) static void removeXX(TQString &str) { - str.replace("xx",""); // simple but atm best working + str.tqreplace("xx",""); // simple but atm best working } static TQString removedXX(TQString str) @@ -355,13 +355,13 @@ static TQString removedXX(TQString str) static TQString stripAccelViolations(TQString str) { - int conflict_pos = str.find("(&&)"); + int conflict_pos = str.tqfind("(&&)"); if (conflict_pos >= 0) { str = str.mid(0, conflict_pos) + str.mid(conflict_pos+4); } - int suggestion_pos = str.find("(!)"); + int suggestion_pos = str.tqfind("(!)"); if (suggestion_pos >= 0) { str = str.mid(0, suggestion_pos) + str.mid(suggestion_pos+3); @@ -373,12 +373,12 @@ static TQString stripAccelViolations(TQString str) // Must be passed a string with its accelerators removed TQString findAccelViolations(TQString str, TQValueVector<StyleGuideViolation> &violations) { - int conflict_pos = str.find("(&)"); + int conflict_pos = str.tqfind("(&)"); if (conflict_pos >= 0) str = str.mid(0, conflict_pos) + str.mid(conflict_pos+3); - int suggestion_pos = str.find("(!)"); + int suggestion_pos = str.tqfind("(!)"); if (suggestion_pos >= 0) { str = str.mid(0, suggestion_pos) + str.mid(suggestion_pos+3); @@ -399,7 +399,7 @@ TQString findAccelViolations(TQString str, TQValueVector<StyleGuideViolation> &v TQString findUntranslatedViolations(TQString str, TQValueVector<StyleGuideViolation> &violations) { - if (str.find("xx")!=-1) + if (str.tqfind("xx")!=-1) removeXX(str); else { for (unsigned int c=0; c<str.length(); c++) @@ -486,7 +486,7 @@ static TQValueVector<StyleGuideViolation> checkSentenceStyle(TQString str, Colo if (afterWhiteSpace) //We don't check for fOO and things like that, just first letters.. { // Try to extract the whole word.. - TQString word = TQString::null; + TQString word = TQString(); for (unsigned int l = c+1; l<str.length(); l++) { if (!str[l].isLetter() && !str[l].isNumber() && str[l] != '&' && str[l] != '-') @@ -502,7 +502,7 @@ static TQValueVector<StyleGuideViolation> checkSentenceStyle(TQString str, Colo } // Check if it's in the explicit case word list - const char *correctWord = ExplicitCaseWords::words()->find(word.lower()); + const char *correctWord = ExplicitCaseWords::words()->tqfind(word.lower()); // Actual captialization checking if (correctWord) @@ -646,7 +646,7 @@ static TQValueVector<StyleGuideViolation> checkTitleStyle(TQString str, TitleTy bool lastWord = false; //Now, try to extract the whole word.. - TQString word = TQString::null; + TQString word = TQString(); for (unsigned int l = c+1; l<str.length(); l++) { if (!str[l].isLetter() && !str[l].isNumber() && str[l] != '&' && str[l] != '-') @@ -667,7 +667,7 @@ static TQValueVector<StyleGuideViolation> checkTitleStyle(TQString str, TitleTy TQString lower_word = word.lower(); // Check if it's in the explicit case word list - const char *correctWord = ExplicitCaseWords::words()->find(lower_word); + const char *correctWord = ExplicitCaseWords::words()->tqfind(lower_word); if ((titleType == ShortTitle) && (lower_word=="and" || lower_word=="a" || lower_word=="an" || lower_word=="the")) { @@ -686,7 +686,7 @@ static TQValueVector<StyleGuideViolation> checkTitleStyle(TQString str, TitleTy violations.push_back(c + x); } } - else if (c && !lastWord && LowerCaseWords::words()->find(word.lower())) + else if (c && !lastWord && LowerCaseWords::words()->tqfind(word.lower())) { // We're a lowercase word if (str[c].category() == TQChar::Letter_Uppercase) @@ -729,7 +729,7 @@ static void renderViolations(const TQValueVector<StyleGuideViolation>& violation // str.setLength() always does a deep copy, so the replacement code below is safe. parStr.setLength( len ); // compatible behaviour to the old implementation. Replace tabs by spaces - TQChar *chr = (TQChar*)parStr.unicode(); + TQChar *chr = (TQChar*)parStr.tqunicode(); int l = len; while ( l-- ) { @@ -739,7 +739,7 @@ static void renderViolations(const TQValueVector<StyleGuideViolation>& violation } - if ( flags & Qt::ShowPrefix ) + if ( flags & TQt::ShowPrefix ) { parStr = removedXX(stripAccelViolations(parStr)); removeAccelerators(parStr); @@ -751,13 +751,13 @@ static void renderViolations(const TQValueVector<StyleGuideViolation>& violation int xoff = r.x(); int yoff = r.y() + qfm.ascent(); - if ( flags & Qt::AlignBottom ) + if ( flags & TQt::AlignBottom ) yoff += r.height() - h; - else if ( flags & Qt::AlignVCenter ) + else if ( flags & TQt::AlignVCenter ) yoff += ( r.height() - h ) / 2; - if ( flags & Qt::AlignRight ) + if ( flags & TQt::AlignRight ) xoff += r.width() - w; - else if ( flags & Qt::AlignHCenter ) + else if ( flags & TQt::AlignHCenter ) xoff += ( r.width() - w ) / 2; @@ -894,22 +894,22 @@ StyleCheckStyle::~StyleCheckStyle() //We walk down the widget tree until we find something we render, and sic KAccelManager in programmer's mode on those void StyleCheckStyle::accelManageRecursive(TQWidget* widget) { - if (&widget->style() == this) + if (&widget->tqstyle() == this) { KAcceleratorManager::manage(widget, true); return; } - const TQObjectList* children = widget->children(); - if (!children) + const TQObjectList tqchildren = widget->childrenListObject(); + if (tqchildren.isEmpty()) return; - TQObjectListIterator iter(*children); + TQObjectListIterator iter(tqchildren); TQObject* walk; while ((walk = iter.current())) { if (walk->isWidgetType()) - accelManageRecursive(static_cast<TQWidget*>(walk)); + accelManageRecursive(TQT_TQWIDGET(walk)); ++iter; } } @@ -918,7 +918,7 @@ void StyleCheckStyle::accelManageRecursive(TQWidget* widget) void StyleCheckStyle::slotAccelManage() { //Walk through top-levels - TQWidgetList* topLevels = TQApplication::topLevelWidgets(); + TQWidgetList* topLevels = TQApplication::tqtopLevelWidgets(); if (!topLevels) return; @@ -991,7 +991,7 @@ void StyleCheckStyle::unPolish(TQWidget* widget) -// This function draws primitive elements as well as their masks. +// This function draws primitive elements as well as their tqmasks. void StyleCheckStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p, const TQRect &r, @@ -1058,7 +1058,7 @@ void StyleCheckStyle::drawPrimitive( PrimitiveElement pe, if ( sunken ) kDrawBeButton( p, x, y, w, h, cg, true, - &cg.brush(TQColorGroup::Mid) ); + &cg.tqbrush(TQColorGroup::Mid) ); else if ( flags & Style_MouseOver ) { TQBrush brush(cg.button().light(110)); @@ -1071,7 +1071,7 @@ void StyleCheckStyle::drawPrimitive( PrimitiveElement pe, else kDrawBeButton(p, x, y, w, h, cg, false, - &cg.brush(TQColorGroup::Button)); + &cg.tqbrush(TQColorGroup::Button)); break; } @@ -1124,7 +1124,7 @@ void StyleCheckStyle::drawPrimitive( PrimitiveElement pe, if (p && p->device()->devType() == TQInternal::Widget) { TQHeader* hdr = dynamic_cast<TQHeader*>(p->device()); if (hdr) - horizontal = hdr->orientation() == Horizontal; + horizontal = hdr->orientation() ==Qt::Horizontal; } int x,y,w,h; @@ -1341,16 +1341,16 @@ void StyleCheckStyle::drawPrimitive( PrimitiveElement pe, } - // RADIOBUTTON (exclusive indicator) mask + // RADIOBUTTON (exclusive indicator) tqmask // ------------------------------------------------------------------- case PE_ExclusiveIndicatorMask: { - if (maskBmp.isNull()) { - maskBmp = TQBitmap(13, 13, radiomask_bits, true); - maskBmp.setMask(maskBmp); + if (tqmaskBmp.isNull()) { + tqmaskBmp = TQBitmap(13, 13, radiotqmask_bits, true); + tqmaskBmp.setMask(tqmaskBmp); } - p->setPen(Qt::color1); - p->drawPixmap(r.x(), r.y(), maskBmp); + p->setPen(TQt::color1); + p->drawPixmap(r.x(), r.y(), tqmaskBmp); break; } @@ -1392,7 +1392,7 @@ void StyleCheckStyle::drawPrimitive( PrimitiveElement pe, case PE_WindowFrame: case PE_PanelLineEdit: { bool sunken = flags & Style_Sunken; - int lw = opt.isDefault() ? pixelMetric(PM_DefaultFrameWidth) + int lw = opt.isDefault() ? tqpixelMetric(PM_DefaultFrameWidth) : opt.lineWidth(); if (lw == 2) { @@ -1415,7 +1415,7 @@ void StyleCheckStyle::drawPrimitive( PrimitiveElement pe, p->drawLine(x+1, y+1, x+1, y2-1); p->setPen(oldPen); } else - KStyle::drawPrimitive(pe, p, r, cg, flags, opt); + KStyle::tqdrawPrimitive(pe, p, r, cg, flags, opt); break; } @@ -1437,7 +1437,7 @@ void StyleCheckStyle::drawPrimitive( PrimitiveElement pe, p->drawLine(r.x(), y2, x2, y2); p->drawLine(x2, r.y(), x2, y2); - // ### Qt should specify Style_Horizontal where appropriate + // ### TQt should specify Style_Horizontal where appropriate renderGradient( p, TQRect(r.x()+1, r.y()+1, x2-1, y2-1), cg.button(), (r.width() < r.height()) && (pe != PE_PanelMenuBar) ); @@ -1485,25 +1485,25 @@ void StyleCheckStyle::drawPrimitive( PrimitiveElement pe, // HighColor & Default arrows switch(pe) { case PE_ArrowUp: - a.setPoints(QCOORDARRLEN(u_arrow), u_arrow); + a.setPoints(TQCOORDARRLEN(u_arrow), u_arrow); break; case PE_ArrowDown: - a.setPoints(QCOORDARRLEN(d_arrow), d_arrow); + a.setPoints(TQCOORDARRLEN(d_arrow), d_arrow); break; case PE_ArrowLeft: - a.setPoints(QCOORDARRLEN(l_arrow), l_arrow); + a.setPoints(TQCOORDARRLEN(l_arrow), l_arrow); break; default: - a.setPoints(QCOORDARRLEN(r_arrow), r_arrow); + a.setPoints(TQCOORDARRLEN(r_arrow), r_arrow); } p->save(); if ( flags & Style_Down ) - p->translate( pixelMetric( PM_ButtonShiftHorizontal ), - pixelMetric( PM_ButtonShiftVertical ) ); + p->translate( tqpixelMetric( PM_ButtonShiftHorizontal ), + tqpixelMetric( PM_ButtonShiftVertical ) ); if ( flags & Style_Enabled ) { a.translate( r.x() + r.width() / 2, r.y() + r.height() / 2 ); @@ -1520,7 +1520,7 @@ void StyleCheckStyle::drawPrimitive( PrimitiveElement pe, p->restore(); } else - KStyle::drawPrimitive( pe, p, r, cg, flags, opt ); + KStyle::tqdrawPrimitive( pe, p, r, cg, flags, opt ); } } } @@ -1614,7 +1614,7 @@ void StyleCheckStyle::drawKStylePrimitive( KStylePrimitive kpe, // ------------------------------------------------------------------- case KPE_SliderGroove: { const TQSlider* slider = (const TQSlider*)widget; - bool horizontal = slider->orientation() == Horizontal; + bool horizontal = slider->orientation() ==Qt::Horizontal; int gcenter = (horizontal ? r.height() : r.width()) / 2; TQRect gr; @@ -1648,7 +1648,7 @@ void StyleCheckStyle::drawKStylePrimitive( KStylePrimitive kpe, // ------------------------------------------------------------------- case KPE_SliderHandle: { const TQSlider* slider = (const TQSlider*)widget; - bool horizontal = slider->orientation() == Horizontal; + bool horizontal = slider->orientation() ==Qt::Horizontal; int x,y,w,h; r.rect(&x, &y, &w, &h); int x2 = x+w-1; @@ -1705,7 +1705,7 @@ void StyleCheckStyle::drawKStylePrimitive( KStylePrimitive kpe, } -void StyleCheckStyle::drawControl( ControlElement element, +void StyleCheckStyle::tqdrawControl( ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -1727,7 +1727,7 @@ void StyleCheckStyle::drawControl( ControlElement element, if ( btnDefault || button->autoDefault() ) { // Compensate for default indicator - static int di = pixelMetric( PM_ButtonDefaultIndicator ); + static int di = tqpixelMetric( PM_ButtonDefaultIndicator ); br.addCoords( di, di, -di, -di ); } @@ -1750,14 +1750,14 @@ void StyleCheckStyle::drawControl( ControlElement element, // Shift button contents if pushed. if ( active ) { - x += pixelMetric(PM_ButtonShiftHorizontal, widget); - y += pixelMetric(PM_ButtonShiftVertical, widget); + x += tqpixelMetric(PM_ButtonShiftHorizontal, widget); + y += tqpixelMetric(PM_ButtonShiftVertical, widget); flags |= Style_Sunken; } // Does the button have a popup menu? if ( button->isMenuButton() ) { - int dx = pixelMetric( PM_MenuButtonIndicator, widget ); + int dx = tqpixelMetric( PM_MenuButtonIndicator, widget ); drawPrimitive( PE_ArrowDown, p, TQRect(x + w - dx - 2, y + 2, dx, h - 4), cg, flags, opt ); w -= dx; @@ -1786,7 +1786,7 @@ void StyleCheckStyle::drawControl( ControlElement element, // Make the label indicate if the button is a default button or not if ( active || button->isDefault() ) { // Draw "fake" bold text - this enables the font metrics to remain - // the same as computed in TQPushButton::sizeHint(), but gives + // the same as computed in TQPushButton::tqsizeHint(), but gives // a reasonable bold effect. int i; @@ -1794,25 +1794,25 @@ void StyleCheckStyle::drawControl( ControlElement element, if (button->isEnabled()) // Don't draw double-shadow when disabled for(i=0; i<2; i++) drawItem( p, TQRect(x+i+1, y+1, w, h), AlignCenter | ShowPrefix, - button->colorGroup(), button->isEnabled(), button->pixmap(), + button->tqcolorGroup(), button->isEnabled(), button->pixmap(), removedXX(stripAccelViolations(button->text())), -1, - active ? &button->colorGroup().dark() : &button->colorGroup().mid() ); + active ? &button->tqcolorGroup().dark() : &button->tqcolorGroup().mid() ); // Normal Text for(i=0; i<2; i++) drawItem( p, TQRect(x+i, y, w, h), AlignCenter | ShowPrefix, - button->colorGroup(), button->isEnabled(), button->pixmap(), + button->tqcolorGroup(), button->isEnabled(), button->pixmap(), removedXX(stripAccelViolations(button->text())), -1, - active ? &button->colorGroup().light() : &button->colorGroup().buttonText() ); + active ? &button->tqcolorGroup().light() : &button->tqcolorGroup().buttonText() ); } else - drawItem( p, TQRect(x, y, w, h), AlignCenter | ShowPrefix, button->colorGroup(), + drawItem( p, TQRect(x, y, w, h), AlignCenter | ShowPrefix, button->tqcolorGroup(), button->isEnabled(), button->pixmap(), removedXX(stripAccelViolations(button->text())), -1, - active ? &button->colorGroup().light() : &button->colorGroup().buttonText() ); + active ? &button->tqcolorGroup().light() : &button->tqcolorGroup().buttonText() ); // Draw a focus rect if the button has focus if ( flags & Style_HasFocus ) drawPrimitive( PE_FocusRect, p, - TQStyle::visualRect(subRect(SR_PushButtonFocusRect, widget), widget), + TQStyle::tqvisualRect(subRect(SR_PushButtonFocusRect, widget), widget), cg, flags ); break; } @@ -1828,7 +1828,7 @@ void StyleCheckStyle::drawControl( ControlElement element, TQRect tr = r; if ( t->identifier() == tb->currentTab() ) tr.setBottom( tr.bottom() - - pixelMetric( TQStyle::PM_DefaultFrameWidth, tb ) ); + tqpixelMetric( TQStyle::PM_DefaultFrameWidth, tb ) ); TQValueVector<StyleGuideViolation> violations = checkTitleStyle(t->text(), ShortTitle, HasAccels); renderViolations(violations, p, r, AlignCenter |ShowPrefix, t->text()); @@ -1846,18 +1846,18 @@ void StyleCheckStyle::drawControl( ControlElement element, { const TQCheckBox* checkbox = static_cast<const TQCheckBox*>(widget); - int alignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft; + int tqalignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft; TQValueVector<StyleGuideViolation> violations = checkSentenceStyle(checkbox->text()); - renderViolations(violations, p, r, alignment | AlignVCenter | ShowPrefix, checkbox->text()); + renderViolations(violations, p, r, tqalignment | AlignVCenter | ShowPrefix, checkbox->text()); - drawItem(p, r, alignment | AlignVCenter | ShowPrefix, cg, + drawItem(p, r, tqalignment | AlignVCenter | ShowPrefix, cg, flags & Style_Enabled, checkbox->pixmap(), removedXX(stripAccelViolations(checkbox->text()))); if (flags & Style_HasFocus) { - TQRect fr = visualRect(subRect(SR_CheckBoxFocusRect, widget), widget); + TQRect fr = tqvisualRect(subRect(SR_CheckBoxFocusRect, widget), widget); drawPrimitive(PE_FocusRect, p, fr, cg, flags); } break; @@ -1867,18 +1867,18 @@ void StyleCheckStyle::drawControl( ControlElement element, { const TQRadioButton* rb = static_cast<const TQRadioButton*>(widget); - int alignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft; + int tqalignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft; TQValueVector<StyleGuideViolation> violations = checkSentenceStyle(rb->text()); - renderViolations(violations, p, r,alignment | AlignVCenter | ShowPrefix, rb->text()); + renderViolations(violations, p, r,tqalignment | AlignVCenter | ShowPrefix, rb->text()); - drawItem(p, r, alignment | AlignVCenter | ShowPrefix, cg, + drawItem(p, r, tqalignment | AlignVCenter | ShowPrefix, cg, flags & Style_Enabled, rb->pixmap(), removedXX(stripAccelViolations(rb->text()))); if (flags & Style_HasFocus) { - TQRect fr = visualRect(subRect(SR_CheckBoxFocusRect, widget), widget); + TQRect fr = tqvisualRect(subRect(SR_CheckBoxFocusRect, widget), widget); drawPrimitive(PE_FocusRect, p, fr, cg, flags); } break; @@ -1933,13 +1933,13 @@ void StyleCheckStyle::drawControl( ControlElement element, bool enabled = mi->isEnabled(); bool checkable = popupmenu->isCheckable(); bool active = flags & Style_Active; - bool etchtext = styleHint( SH_EtchDisabledText ); + bool etchtext = tqstyleHint( SH_EtchDisabledText ); bool reverse = TQApplication::reverseLayout(); int x, y, w, h; r.rect( &x, &y, &w, &h ); if ( checkable ) - checkcol = QMAX( checkcol, 20 ); + checkcol = TQMAX( checkcol, 20 ); // Are we a menu item separator? if ( mi->isSeparator() ) { @@ -1964,7 +1964,7 @@ void StyleCheckStyle::drawControl( ControlElement element, // Do we have an icon? if ( mi->iconSet() ) { TQIconSet::Mode mode; - TQRect cr = visualRect( TQRect(x, y, checkcol, h), r ); + TQRect cr = tqvisualRect( TQRect(x, y, checkcol, h), r ); // Select the correct icon from the iconset if ( active ) @@ -2050,7 +2050,7 @@ void StyleCheckStyle::drawControl( ControlElement element, // Does the menu item have a text label? if ( !s.isNull() ) { - int t = s.find( '\t' ); + int t = s.tqfind( '\t' ); int m = itemVMargin; int text_flags = AlignVCenter | ShowPrefix | DontClip | SingleLine; text_flags |= reverse ? AlignRight : AlignLeft; @@ -2096,22 +2096,22 @@ void StyleCheckStyle::drawControl( ControlElement element, // Draw the pixmap if ( pixmap->depth() == 1 ) - p->setBackgroundMode( OpaqueMode ); + p->setBackgroundMode( Qt::OpaqueMode ); int diffw = ( ( w - pixmap->width() ) / 2 ) + ( ( w - pixmap->width() ) % 2 ); p->drawPixmap( x+diffw, y+itemFrame, *pixmap ); if ( pixmap->depth() == 1 ) - p->setBackgroundMode( TransparentMode ); + p->setBackgroundMode( Qt::TransparentMode ); } } // Does the menu item have a submenu? if ( mi->popup() ) { PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight; - int dim = pixelMetric(PM_MenuButtonIndicator); - TQRect vr = visualRect( TQRect( x + w - arrowHMargin - 2*itemFrame - dim, + int dim = tqpixelMetric(PM_MenuButtonIndicator); + TQRect vr = tqvisualRect( TQRect( x + w - arrowHMargin - 2*itemFrame - dim, y + h / 2 - dim / 2, dim, dim), r ); // Draw an arrow at the far end of the menu item @@ -2147,7 +2147,7 @@ void StyleCheckStyle::drawControl( ControlElement element, TQRect pixRect = rect; pixRect.setY( rect.center().y() - (pixh - 1) / 2 ); drawItem ( p, pixRect, AlignVCenter, cg, flags & Style_Enabled, - &pixmap, TQString::null ); + &pixmap, TQString() ); rect.setLeft( rect.left() + pixw + 2 ); } @@ -2164,12 +2164,12 @@ void StyleCheckStyle::drawControl( ControlElement element, } default: - KStyle::drawControl(element, p, widget, r, cg, flags, opt); + KStyle::tqdrawControl(element, p, widget, r, cg, flags, opt); } } -void StyleCheckStyle::drawControlMask( ControlElement element, +void StyleCheckStyle::tqdrawControlMask( ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -2182,7 +2182,7 @@ void StyleCheckStyle::drawControlMask( ControlElement element, case CE_PushButton: { int x1, y1, x2, y2; r.coords( &x1, &y1, &x2, &y2 ); - QCOORD corners[] = { x1,y1, x2,y1, x1,y2, x2,y2 }; + TQCOORD corners[] = { x1,y1, x2,y1, x1,y2, x2,y2 }; p->fillRect( r, color1 ); p->setPen( color0 ); p->drawPoints( TQPointArray(4, corners) ); @@ -2190,12 +2190,12 @@ void StyleCheckStyle::drawControlMask( ControlElement element, } default: - KStyle::drawControlMask(element, p, widget, r, opt); + KStyle::tqdrawControlMask(element, p, widget, r, opt); } } -void StyleCheckStyle::drawComplexControl( ComplexControl control, +void StyleCheckStyle::tqdrawComplexControl( ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -2246,7 +2246,7 @@ void StyleCheckStyle::drawComplexControl( ComplexControl control, p->drawLine(x+1, y+2, x+1, y2-2); // Get the button bounding box - TQRect ar = TQStyle::visualRect( + TQRect ar = TQStyle::tqvisualRect( querySubControlMetrics(CC_ComboBox, widget, SC_ComboBoxArrow), widget ); @@ -2265,7 +2265,7 @@ void StyleCheckStyle::drawComplexControl( ComplexControl control, if ( controls & SC_ComboBoxEditField ) { const TQComboBox * cb = (const TQComboBox *) widget; - TQRect re = TQStyle::visualRect( + TQRect re = TQStyle::tqvisualRect( querySubControlMetrics( CC_ComboBox, widget, SC_ComboBoxEditField), widget ); @@ -2289,7 +2289,7 @@ void StyleCheckStyle::drawComplexControl( ComplexControl control, p->fillRect( re.x(), re.y(), re.width(), re.height(), cg.brush( TQColorGroup::Highlight ) ); - TQRect re = TQStyle::visualRect( + TQRect re = TQStyle::tqvisualRect( subRect(SR_ComboBoxFocusRect, cb), widget); drawPrimitive( PE_FocusRect, p, re, cg, @@ -2323,28 +2323,28 @@ void StyleCheckStyle::drawComplexControl( ComplexControl control, drawPrimitive(PE_ButtonTool, p, button, cg, bflags, opt); // Check whether to draw a background pixmap - else if ( toolbutton->parentWidget() && - toolbutton->parentWidget()->backgroundPixmap() && - !toolbutton->parentWidget()->backgroundPixmap()->isNull() ) + else if ( toolbutton->tqparentWidget() && + toolbutton->tqparentWidget()->backgroundPixmap() && + !toolbutton->tqparentWidget()->backgroundPixmap()->isNull() ) { - TQPixmap pixmap = *(toolbutton->parentWidget()->backgroundPixmap()); + TQPixmap pixmap = *(toolbutton->tqparentWidget()->backgroundPixmap()); p->drawTiledPixmap( r, pixmap, toolbutton->pos() ); } - else if (widget->parent()) + else if (widget->tqparent()) { - if (widget->parent()->inherits(TQTOOLBAR_OBJECT_NAME_STRING)) + if (widget->tqparent()->inherits(TQTOOLBAR_OBJECT_NAME_STRING)) { - TQToolBar* parent = (TQToolBar*)widget->parent(); - TQRect pr = parent->rect(); + TQToolBar* tqparent = (TQToolBar*)widget->tqparent(); + TQRect pr = tqparent->rect(); renderGradient( p, r, cg.button(), - parent->orientation() == Qt::Vertical, + tqparent->orientation() == Qt::Vertical, r.x(), r.y(), pr.width()-2, pr.height()-2); } - else if (widget->parent()->inherits("QToolBarExtensionWidget")) + else if (widget->tqparent()->inherits("TQToolBarExtensionWidget")) { - TQWidget* parent = (TQWidget*)widget->parent(); - TQToolBar* toolbar = (TQToolBar*)parent->parent(); + TQWidget* tqparent = (TQWidget*)widget->tqparent(); + TQToolBar* toolbar = (TQToolBar*)tqparent->tqparent(); TQRect tr = toolbar->rect(); if ( toolbar->orientation() == Qt::Horizontal ) { @@ -2377,14 +2377,14 @@ void StyleCheckStyle::drawComplexControl( ComplexControl control, default: - KStyle::drawComplexControl(control, p, widget, + KStyle::tqdrawComplexControl(control, p, widget, r, cg, flags, controls, active, opt); break; } } -void StyleCheckStyle::drawComplexControlMask( ComplexControl control, +void StyleCheckStyle::tqdrawComplexControlMask( ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -2398,7 +2398,7 @@ void StyleCheckStyle::drawComplexControlMask( ComplexControl control, case CC_ToolButton: { int x1, y1, x2, y2; r.coords( &x1, &y1, &x2, &y2 ); - QCOORD corners[] = { x1,y1, x2,y1, x1,y2, x2,y2 }; + TQCOORD corners[] = { x1,y1, x2,y1, x1,y2, x2,y2 }; p->fillRect( r, color1 ); p->setPen( color0 ); p->drawPoints( TQPointArray(4, corners) ); @@ -2406,7 +2406,7 @@ void StyleCheckStyle::drawComplexControlMask( ComplexControl control, } default: - KStyle::drawComplexControlMask(control, p, widget, r, opt); + KStyle::tqdrawComplexControlMask(control, p, widget, r, opt); } } @@ -2414,7 +2414,7 @@ void StyleCheckStyle::drawComplexControlMask( ComplexControl control, TQRect StyleCheckStyle::subRect(SubRect r, const TQWidget *widget) const { // We want the focus rect for buttons to be adjusted from - // the Qt3 defaults to be similar to Qt 2's defaults. + // the TQt3 defaults to be similar to TQt 2's defaults. // ------------------------------------------------------------------- if (r == SR_PushButtonFocusRect ) { const TQPushButton* button = (const TQPushButton*) widget; @@ -2422,11 +2422,11 @@ TQRect StyleCheckStyle::subRect(SubRect r, const TQWidget *widget) const int dbw1 = 0, dbw2 = 0; if (button->isDefault() || button->autoDefault()) { - dbw1 = pixelMetric(PM_ButtonDefaultIndicator, widget); + dbw1 = tqpixelMetric(PM_ButtonDefaultIndicator, widget); dbw2 = dbw1 * 2; } - int dfw1 = pixelMetric(PM_DefaultFrameWidth, widget) * 2, + int dfw1 = tqpixelMetric(PM_DefaultFrameWidth, widget) * 2, dfw2 = dfw1 * 2; return TQRect(wrect.x() + dfw1 + dbw1 + 1, @@ -2438,7 +2438,7 @@ TQRect StyleCheckStyle::subRect(SubRect r, const TQWidget *widget) const } -int StyleCheckStyle::pixelMetric(PixelMetric m, const TQWidget *widget) const +int StyleCheckStyle::tqpixelMetric(PixelMetric m, const TQWidget *widget) const { switch(m) { @@ -2465,7 +2465,7 @@ int StyleCheckStyle::pixelMetric(PixelMetric m, const TQWidget *widget) const } default: - return KStyle::pixelMetric(m, widget); + return KStyle::tqpixelMetric(m, widget); } } @@ -2483,8 +2483,8 @@ TQSize StyleCheckStyle::sizeFromContents( ContentsType contents, const TQPushButton* button = (const TQPushButton*) widget; int w = contentSize.width(); int h = contentSize.height(); - int bm = pixelMetric( PM_ButtonMargin, widget ); - int fw = pixelMetric( PM_DefaultFrameWidth, widget ) * 2; + int bm = tqpixelMetric( PM_ButtonMargin, widget ); + int fw = tqpixelMetric( PM_DefaultFrameWidth, widget ) * 2; w += bm + fw + 6; // ### Add 6 to make way for bold font. h += bm + fw; @@ -2495,7 +2495,7 @@ TQSize StyleCheckStyle::sizeFromContents( ContentsType contents, w = 80; // Compensate for default indicator - int di = pixelMetric( PM_ButtonDefaultIndicator ); + int di = tqpixelMetric( PM_ButtonDefaultIndicator ); w += di * 2; h += di * 2; } @@ -2520,8 +2520,8 @@ TQSize StyleCheckStyle::sizeFromContents( ContentsType contents, int w = contentSize.width(), h = contentSize.height(); if ( mi->custom() ) { - w = mi->custom()->sizeHint().width(); - h = mi->custom()->sizeHint().height(); + w = mi->custom()->tqsizeHint().width(); + h = mi->custom()->tqsizeHint().height(); if ( ! mi->custom()->fullSpan() ) h += 2*itemVMargin + 2*itemFrame; } @@ -2532,22 +2532,22 @@ TQSize StyleCheckStyle::sizeFromContents( ContentsType contents, } else { if ( mi->pixmap() ) - h = QMAX( h, mi->pixmap()->height() + 2*itemFrame ); + h = TQMAX( h, mi->pixmap()->height() + 2*itemFrame ); else { // Ensure that the minimum height for text-only menu items // is the same as the icon size used by KDE. - h = QMAX( h, 16 + 2*itemFrame ); - h = QMAX( h, popup->fontMetrics().height() + h = TQMAX( h, 16 + 2*itemFrame ); + h = TQMAX( h, popup->fontMetrics().height() + 2*itemVMargin + 2*itemFrame ); } if ( mi->iconSet() ) - h = QMAX( h, mi->iconSet()->pixmap( + h = TQMAX( h, mi->iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal).height() + 2 * itemFrame ); } - if ( ! mi->text().isNull() && mi->text().find('\t') >= 0 ) + if ( ! mi->text().isNull() && mi->text().tqfind('\t') >= 0 ) w += 12; else if ( mi->popup() ) w += 2 * arrowHMargin; @@ -2566,12 +2566,12 @@ TQSize StyleCheckStyle::sizeFromContents( ContentsType contents, default: - return KStyle::sizeFromContents( contents, widget, contentSize, opt ); + return KStyle::tqsizeFromContents( contents, widget, contentSize, opt ); } } -// Fix Qt's wacky image alignment +// Fix TQt's wacky image tqalignment TQPixmap StyleCheckStyle::stylePixmap(StylePixmap stylepixmap, const TQWidget* widget, const TQStyleOption& opt) const @@ -2602,20 +2602,20 @@ bool StyleCheckStyle::eventFilter( TQObject *object, TQEvent *event ) if ( (event->type() == TQEvent::Enter) && (button->isEnabled()) ) { hoverWidget = button; - button->repaint( false ); + button->tqrepaint( false ); } else if ( (event->type() == TQEvent::Leave) && - (object == hoverWidget) ) { + (TQT_BASE_OBJECT(object) == TQT_BASE_OBJECT(hoverWidget)) ) { hoverWidget = 0L; - button->repaint( false ); + button->tqrepaint( false ); } } if ( event->type() == TQEvent::Paint && object->inherits(TQLABEL_OBJECT_NAME_STRING) ) { - TQLabel* lb = static_cast<TQLabel*>(object); - if (lb->pixmap() || lb->picture() || lb->movie() || (lb->textFormat() == Qt::RichText) || - (lb->textFormat() == Qt::AutoText && TQStyleSheet::mightBeRichText(lb->text())) ) + TQLabel* lb = static_cast<TQLabel*>(TQT_TQWIDGET(object)); + if (lb->pixmap() || lb->picture() || lb->movie() || (lb->textFormat() == TQt::RichText) || + (lb->textFormat() == TQt::AutoText && TQStyleSheet::mightBeRichText(lb->text())) ) { return false; } @@ -2629,14 +2629,14 @@ bool StyleCheckStyle::eventFilter( TQObject *object, TQEvent *event ) m = lb->fontMetrics().width('x') / 2 - lb->margin(); if ( m > 0 ) { - int hAlign = TQApplication::horizontalAlignment( lb->alignment() ); + int hAlign = TQApplication::horizontalAlignment( lb->tqalignment() ); if ( hAlign & AlignLeft ) cr.setLeft( cr.left() + m ); if ( hAlign & AlignRight ) cr.setRight( cr.right() - m ); - if ( lb->alignment() & AlignTop ) + if ( lb->tqalignment() & AlignTop ) cr.setTop( cr.top() + m ); - if ( lb->alignment() & AlignBottom ) + if ( lb->tqalignment() & AlignBottom ) cr.setBottom( cr.bottom() - m ); } @@ -2656,17 +2656,17 @@ bool StyleCheckStyle::eventFilter( TQObject *object, TQEvent *event ) if (lb->buddy()) { - renderViolations(violations, &p, cr,lb->alignment() | ShowPrefix, lb->text() ); + renderViolations(violations, &p, cr,lb->tqalignment() | ShowPrefix, lb->text() ); // ordinary text or pixmap label - drawItem( &p, cr, lb->alignment(), lb->colorGroup(), lb->isEnabled(), + drawItem( &p, cr, lb->tqalignment(), lb->tqcolorGroup(), lb->isEnabled(), 0, removedXX(stripAccelViolations(lb->text())) ); } else { - renderViolations(violations, &p, cr,lb->alignment(), lb->text() ); + renderViolations(violations, &p, cr,lb->tqalignment(), lb->text() ); // ordinary text or pixmap label - drawItem( &p, cr, lb->alignment(), lb->colorGroup(), lb->isEnabled(), + drawItem( &p, cr, lb->tqalignment(), lb->tqcolorGroup(), lb->isEnabled(), 0, removedXX(stripAccelViolations(lb->text())) ); } @@ -2677,19 +2677,19 @@ bool StyleCheckStyle::eventFilter( TQObject *object, TQEvent *event ) if ( event->type() == TQEvent::Paint && object->inherits(TQGROUPBOX_OBJECT_NAME_STRING) ) { - TQPaintEvent * pevent = static_cast<TQPaintEvent*>(event); - TQGroupBox* gb = static_cast<TQGroupBox*>(object); + TQPaintEvent * pevent = TQT_TQPAINTEVENT(event); + TQGroupBox* gb = static_cast<TQGroupBox*>(TQT_TQWIDGET(object)); bool nestedGroupBox = false; TQString stripped_title = removedXX(stripAccelViolations(gb->title())); - //Walk parent hierarchy to check whether any are groupboxes too.. - TQObject* parent = gb; + //Walk tqparent hierarchy to check whether any are groupboxes too.. + TQObject* tqparent = TQT_TQOBJECT(gb); - // GCC suggested parentheses around assignment used as truth value + // GCC suggested tqparentheses around assignment used as truth value // I suggested that it could eat me. GCC won. - while ( (parent = parent->parent()) ) + while ( (tqparent = tqparent->tqparent()) ) { - if (parent->inherits(TQGROUPBOX_OBJECT_NAME_STRING)) + if (tqparent->inherits(TQGROUPBOX_OBJECT_NAME_STRING)) { nestedGroupBox = true; break; @@ -2704,11 +2704,11 @@ bool StyleCheckStyle::eventFilter( TQObject *object, TQEvent *event ) int h = fm.height(); int tw = fm.width( stripped_title, stripped_title.length() ) + 2*fm.width(TQChar(' ')); int x; - if ( gb->alignment() & AlignHCenter ) // center alignment + if ( gb->tqalignment() & AlignHCenter ) // center tqalignment x = gb->frameRect().width()/2 - tw/2; - else if ( gb->alignment() & AlignRight ) // right alignment + else if ( gb->tqalignment() & AlignRight ) // right tqalignment x = gb->frameRect().width() - tw - 8; - else if ( gb->alignment() & AlignLeft ) // left alignment + else if ( gb->tqalignment() & AlignLeft ) // left tqalignment x = 8; else { // auto align @@ -2723,7 +2723,7 @@ bool StyleCheckStyle::eventFilter( TQObject *object, TQEvent *event ) renderViolations( violations, &paint, r, AlignCenter | ShowPrefix, gb->title() ); - drawItem(&paint, r, AlignCenter | ShowPrefix, gb->colorGroup(), + drawItem(&paint, r, AlignCenter | ShowPrefix, gb->tqcolorGroup(), gb->isEnabled(), 0, stripped_title ); paint.setClipRegion( pevent->region().subtract( r ) ); @@ -2732,15 +2732,15 @@ bool StyleCheckStyle::eventFilter( TQObject *object, TQEvent *event ) if (nestedGroupBox) { paint.save(); - TQPen errorPen(Qt::red, 4, TQPen::DashDotDotLine); + TQPen errorPen(TQt::red, 4, TQPen::DashDotDotLine); paint.setPen(errorPen); paint.drawRect( gb->frameRect() ); paint.restore(); } else { - drawPrimitive( TQStyle::PE_GroupBoxFrame, &paint, gb->frameRect(), - gb->colorGroup(), TQStyle::Style_Default, + tqdrawPrimitive( TQStyle::PE_GroupBoxFrame, &paint, gb->frameRect(), + gb->tqcolorGroup(), TQStyle::Style_Default, TQStyleOption(gb->lineWidth(), gb->midLineWidth(), gb->frameShape(), gb->frameShadow()) ); } @@ -2759,4 +2759,4 @@ void StyleCheckStyle::renderGradient( TQPainter* p, const TQRect& r, } // vim: set noet ts=4 sw=4: -// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; diff --git a/scheck/scheck.h b/scheck/scheck.h index 60f5a0ca..7f4e341f 100644 --- a/scheck/scheck.h +++ b/scheck/scheck.h @@ -15,7 +15,7 @@ * (C) 2000 Dirk Mueller <mueller@kde.org> * (C) 2001 Martijn Klingens <klingens@kde.org> * - * Portions of code are from the Qt GUI Toolkit, Copyright (C) 1992-2000 Trolltech AS. + * Portions of code are from the TQt GUI Toolkit, Copyright (C) 1992-2000 Trolltech AS. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public @@ -51,9 +51,10 @@ class TQPopupMenu; -class StyleCheckTitleWatcher: public QObject +class StyleCheckTitleWatcher: public TQObject { Q_OBJECT + TQ_OBJECT public: StyleCheckTitleWatcher(); @@ -69,6 +70,7 @@ class StyleCheckTitleWatcher: public QObject class StyleCheckStyle : public KStyle { Q_OBJECT + TQ_OBJECT public: StyleCheckStyle( ); @@ -93,7 +95,7 @@ class StyleCheckStyle : public KStyle SFlags flags = Style_Default, const TQStyleOption& = TQStyleOption::Default ) const; - void drawControl( ControlElement element, + void tqdrawControl( ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -101,13 +103,13 @@ class StyleCheckStyle : public KStyle SFlags flags = Style_Default, const TQStyleOption& = TQStyleOption::Default ) const; - void drawControlMask( ControlElement element, + void tqdrawControlMask( ControlElement element, TQPainter *p, const TQWidget *widget, const TQRect &r, const TQStyleOption& = TQStyleOption::Default ) const; - void drawComplexControl( ComplexControl control, + void tqdrawComplexControl( ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r, @@ -117,13 +119,13 @@ class StyleCheckStyle : public KStyle SCFlags active = SC_None, const TQStyleOption& = TQStyleOption::Default ) const; - void drawComplexControlMask( ComplexControl control, + void tqdrawComplexControlMask( ComplexControl control, TQPainter *p, const TQWidget *widget, const TQRect &r, const TQStyleOption& = TQStyleOption::Default ) const; - int pixelMetric( PixelMetric m, + int tqpixelMetric( PixelMetric m, const TQWidget *widget = 0 ) const; TQSize sizeFromContents( ContentsType contents, @@ -134,7 +136,7 @@ class StyleCheckStyle : public KStyle TQRect subRect( SubRect r, const TQWidget *widget ) const; - // Fix Qt3's wacky image positions + // Fix TQt3's wacky image positions TQPixmap stylePixmap( StylePixmap stylepixmap, const TQWidget *widget = 0, const TQStyleOption& = TQStyleOption::Default ) const; @@ -168,6 +170,6 @@ class StyleCheckStyle : public KStyle }; // vim: set noet ts=4 sw=4: -// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; +// kate: indent-width 4; tqreplace-tabs off; tab-width 4; space-indent off; #endif diff --git a/scheck/status.txt b/scheck/status.txt index 4860b230..d8e8376a 100644 --- a/scheck/status.txt +++ b/scheck/status.txt @@ -31,7 +31,7 @@ other non heading/title text - Kind of -- hard to distinguish from title Other violations -Check for nested groupboxes. - Done, when parenting hierarchy isn't bizzare. +Check for nested groupboxes. - Done, when tqparenting hierarchy isn't bizzare. Other todo: diff --git a/scripts/adddebug b/scripts/adddebug index 8968e89c..912fef71 100755 --- a/scripts/adddebug +++ b/scripts/adddebug @@ -23,7 +23,7 @@ if test -z $ndebug; then xpr="$xpr;"'s/[\t ]-DNDEBUG\b//g' xpr="$xpr;"'s/[\t ]-DNO_DEBUG\b//g' fi -find . $mxdp -name Makefile -exec perl -pi -e "$xpr" {} \; +tqfind . $mxdp -name Makefile -exec perl -pi -e "$xpr" {} \; using_unsermake= if head -n 1 Makefile | grep unsermake >/dev/null; then @@ -43,7 +43,7 @@ if test "$using_unsermake" = "new"; then # warning this uses sed, so the '?' in the perl regexp above doesn't work here cxxflags=`grep ^CXXFLAGS $toplevelMakefile | sed -e 's/[\t ]-O[1-9]\b//g;s/[\t ]-march=\S+\b//g;s/[\t ]-DNDEBUG\b//g;s/[\t ]-DNO_DEBUG\b//g'` xpr="s/^CXXFLAGS\s*=.*//; if ( /^\.FORWARDS:/) { "'$_'" .= \"\n$cxxflags -g3\"; }" - find . $mxdp -name Makefile -exec perl -pi -e "$xpr" {} \; + tqfind . $mxdp -name Makefile -exec perl -pi -e "$xpr" {} \; else echo "ERROR: top_builddir is $top_builddir but $makevars not found" fi @@ -56,7 +56,7 @@ elif test "$using_unsermake" = "old"; then # warning this uses sed, so the '?' in the perl regexp above doesn't work here cxxflags=`grep ^CXXFLAGS $makevars | sed -e 's/[\t ]-O[1-9]\b//g;s/[\t ]-march=\S+\b//g;s/[\t ]-DNDEBUG\b//g;s/[\t ]-DNO_DEBUG\b//g'` xpr="s/^CXXFLAGS\s*=.*//; if ( /^include .*MakeVars$/) { "'$_'" .= \"\n$cxxflags -g3\"; }" - find . $mxdp -name Makefile -exec perl -pi -e "$xpr" {} \; + tqfind . $mxdp -name Makefile -exec perl -pi -e "$xpr" {} \; else echo "ERROR: top_builddir is $top_builddir but $makevars not found" fi diff --git a/scripts/check_licenses b/scripts/check_licenses index 6accd259..33e64479 100755 --- a/scripts/check_licenses +++ b/scripts/check_licenses @@ -26,7 +26,7 @@ sub nameok() and $f !~ /_stub\.cpp/ and $f !~ /_skel.cpp/ and $f !~ /_closure\.cpp/ - and $f !~ /moc\.cpp/ + and $f !~ /tqmoc\.cpp/ ) { return 1; diff --git a/scripts/completions/bash/dcop b/scripts/completions/bash/dcop index 675bf6cf..d3e0fba4 100644 --- a/scripts/completions/bash/dcop +++ b/scripts/completions/bash/dcop @@ -32,7 +32,7 @@ _complete_dcop () elif (( $COMP_CWORD == 2 )); then # # Object. 'dcop <application>' returns all objects the application - # supports plus (default). The parenthesis in (default) should be + # supports plus (default). The tqparenthesis in (default) should be # omitted when using it as an argument so we need to remove them. # wordlist=$(dcop ${COMP_WORDS[1]} | sed -e "s,(default),default,") diff --git a/scripts/completions/zsh/_kdekillall b/scripts/completions/zsh/_kdekillall index 16ab40dc..eb3eb0ab 100644 --- a/scripts/completions/zsh/_kdekillall +++ b/scripts/completions/zsh/_kdekillall @@ -4,5 +4,5 @@ local progs progs=(`ps x | grep kdeinit: | grep -v Running | grep -v grep | sed 's,.*kdeinit: ,,' | sed 's, .*,,'`) _alternative \ - 'signals:: _signals -p' \ + 'Q_SIGNALS:: _Q_SIGNALS -p' \ 'compadd $progs' diff --git a/scripts/create_cvsignore b/scripts/create_cvsignore index 2fb4c23e..20d21341 100755 --- a/scripts/create_cvsignore +++ b/scripts/create_cvsignore @@ -42,7 +42,7 @@ handledir() { if test -f Makefile.am; then if test $recurse -eq 1; then - find . -type d | grep -v CVS | sed -e 's,/$,,' | \ + tqfind . -type d | grep -v CVS | sed -e 's,/$,,' | \ while read dir; do handledir $dir done diff --git a/scripts/create_makefiles b/scripts/create_makefiles index 955edb90..d8385f68 100755 --- a/scripts/create_makefiles +++ b/scripts/create_makefiles @@ -24,7 +24,7 @@ fi srcdir=`egrep '^srcdir *=' Makefile | sed -e "s#srcdir *= *##"` -( cd $srcdir ; find $1 -type d | sed -e 's,/$,,' ) | \ +( cd $srcdir ; tqfind $1 -type d | sed -e 's,/$,,' ) | \ while read a; do if test -f "$srcdir/$a/Makefile.am"; then test -d "$a" || mkdir -p "$a" diff --git a/scripts/create_svnignore b/scripts/create_svnignore index fed482fa..fd7d1c6d 100755 --- a/scripts/create_svnignore +++ b/scripts/create_svnignore @@ -42,7 +42,7 @@ handledir() { done fi grep -q LIBRARIES Makefile.am && addignore ".libs" - grep -q METASOURCES Makefile.am && addignore "*.moc" + grep -q METASOURCES Makefile.am && addignore "*.tqmoc" fgrep -q .skel Makefile.am && addignore "*.kidl" fgrep -q .skel Makefile.am && addignore "*_skel.c*" fgrep -q .stub Makefile.am && addignore "*_stub.cpp" @@ -69,7 +69,7 @@ handledir() { if test -f Makefile.am; then if test $recurse -eq 1; then - find . -type d | egrep -v 'CVS|.svn' | sed -e 's,/$,,' | \ + tqfind . -type d | egrep -v 'CVS|.svn' | sed -e 's,/$,,' | \ while read dir; do handledir $dir done diff --git a/scripts/cvs2dist b/scripts/cvs2dist index dba8a4d9..c1c8e138 100755 --- a/scripts/cvs2dist +++ b/scripts/cvs2dist @@ -8,7 +8,7 @@ # Original author (of cvs2pack.sh) was Sebastian Stein <seb.stein@hpfsc.de> # Heavy, heavy modifications by Jason Katz-Brown <jason@katzbrown.com> # Some modifications for i18n inclusion by Dominique Devriese <devriese@kde.org> -# Added --no-i18n-lang and --replace-files by Michael Buesch <mbuesch@freenet.de> +# Added --no-i18n-lang and --tqreplace-files by Michael Buesch <mbuesch@freenet.de> # License: GPL (http://www.gnu.org/) # Last modification: 2004/10/13 @@ -16,7 +16,7 @@ cmdline="$@" returndir=`pwd` override="README ChangeLog INSTALL AUTHORS AUTHOR COPYING COPYING.LIB TODO" -remove="config.cache config.log config.status Makefile configure inst-apps CVS acinclude.m4 aclocal.m4 config.h config.h.bot config.h.in configure.files libtool stamp-h stamp-h.in stamp-h1 subdirs *.moc *.la .libs .deps .cvsignore autom4te.cache {arch} .arch-ids" +remove="config.cache config.log config.status Makefile configure inst-apps CVS acinclude.m4 aclocal.m4 config.h config.h.bot config.h.in configure.files libtool stamp-h stamp-h.in stamp-h1 subdirs *.tqmoc *.la .libs .deps .cvsignore autom4te.cache {arch} .arch-ids" toplevelremove="configure.in.bot" # whitespace seperated list of languages to never include. always_skip_languages="xx" @@ -39,7 +39,7 @@ test -e ~/.cvs2distrc && extraoptions=`cat ~/.cvs2distrc` # --log has optional argument TEMP=`getopt \ -o v:n:r:e:a:B:dhmbgol \ ---long log::,version:,name:,required-header:,required-header-error-message:,make-unpackaged,help,no-bz2,no-bzip2,no-gzip,only-directory,remove-hidden,admin-dir:,branch:,no-i18n,no-i18n-lang:,cvs-root:,debug,replace-files: \ +--long log::,version:,name:,required-header:,required-header-error-message:,make-unpackaged,help,no-bz2,no-bzip2,no-gzip,only-directory,remove-hidden,admin-dir:,branch:,no-i18n,no-i18n-lang:,cvs-root:,debug,tqreplace-files: \ -n cvs2dist -- $extraoptions "$@"` if [ $? != 0 ]; then @@ -97,7 +97,7 @@ while true; do shift 2 ;; esac ;; - --replace-files) replace_files="$2"; shift 2 ;; + --tqreplace-files) replace_files="$2"; shift 2 ;; --) shift break ;; *) echo "Aborted." @@ -152,11 +152,11 @@ if [ ! -z $showhelp ] || [ -z $module ] || [ -z $directory ]; then echo " -e --required-header-error-message <message>" echo " Error message for above." echo " -d --remove-hidden Remove hidden files/directories from packages" - echo " --replace-files <file-pair-list>" + echo " --tqreplace-files <file-pair-list>" echo " <file-pair-list> is a comma separated list of file pairs" echo " which should be replaced in the final distribution package." echo " Each element of a pair is separated by an @" - echo -n " Example: --replace-files take_this_file@and_move_it_here," + echo -n " Example: --tqreplace-files take_this_file@and_move_it_here," echo "configure.in.bot.dist@configure.in.bot" echo " The filenames are all relative to your package root." echo " Please be careful! Try to avoid the usage of .. in the path. It" @@ -349,7 +349,7 @@ fi if [ -d $module/doc/$name ]; then mkdir -p $temp_dist/doc/$name cp -Rf $module/doc/$name $temp_dist/doc - find $module/doc/ -maxdepth 1 ! -xtype d | xargs --replace={} cp {} $temp_dist/doc + tqfind $module/doc/ -maxdepth 1 ! -xtype d | xargs --tqreplace={} cp {} $temp_dist/doc if [ $doi18n = "yes" ]; then pushd $temp_dir @@ -435,7 +435,7 @@ fi # and all files from the base dir, except directories echo "Copying over files from the module directory:" >> $log -find $module ! -xtype d -maxdepth 1 | xargs --verbose --replace={} cp {} $temp_dist 2>> $log +tqfind $module ! -xtype d -maxdepth 1 | xargs --verbose --tqreplace={} cp {} $temp_dist 2>> $log echo "--------" >> $log # we now enter the temp_dist and delete all unwanted files @@ -479,7 +479,7 @@ if [ -n "$replace_files" ]; then echo "$from_path does not exist!" >> $log echo "" echo "Warning: \"$from\" does not exist!" - echo -n "Please enter the path in --replace-files relative " + echo -n "Please enter the path in --tqreplace-files relative " echo "to the package root of your project." echo "Your package root is: \"$module/$directory\"" echo "" @@ -516,8 +516,8 @@ cd $temp_dist # remove files echo "Remove files: " >> $log for file in $remove; do - find . -name $file | xargs rm -Rf - echo "find . -name $file | xargs rm -Rf" >> $log + tqfind . -name $file | xargs rm -Rf + echo "tqfind . -name $file | xargs rm -Rf" >> $log done # remove more files @@ -528,7 +528,7 @@ done unset file # remove hidden files -test ! -z $removehidden && echo "Remove hidden files: " >> $log && find $temp_dist -name ".*" -and ! -name "." | xargs --verbose rm -Rf 2>> $log +test ! -z $removehidden && echo "Remove hidden files: " >> $log && tqfind $temp_dist -name ".*" -and ! -name "." | xargs --verbose rm -Rf 2>> $log echo "--------" >> $log diff --git a/scripts/cvsaddcurrentdir b/scripts/cvsaddcurrentdir index 56185f27..91be9ac4 100755 --- a/scripts/cvsaddcurrentdir +++ b/scripts/cvsaddcurrentdir @@ -10,7 +10,7 @@ #ignore dirs "CVS", ".deps", ".libs" #ignore files *.o, *.so, *.lo, *.la, *~, .#* -FOUND=`find |grep -v "^\.$"| grep -v CVS| grep -v "\.[ls]\?o$"|grep -v "~$"|grep -v "\.libs/"|grep -v "\.deps/" |grep -v "\.depend/"| grep -v "/\.#" |grep -v "\.la$"` +FOUND=`tqfind |grep -v "^\.$"| grep -v CVS| grep -v "\.[ls]\?o$"|grep -v "~$"|grep -v "\.libs/"|grep -v "\.deps/" |grep -v "\.depend/"| grep -v "/\.#" |grep -v "\.la$"` #echo $FOUND ask_for_adding() { diff --git a/scripts/cvscheck b/scripts/cvscheck index 1e1da5a8..1e2bb6b7 100755 --- a/scripts/cvscheck +++ b/scripts/cvscheck @@ -144,9 +144,9 @@ sub processEntries next if ($e eq "Makefile.calls"); next if ($e eq "Makefile.rules.in"); next if ($e eq "Makefile.calls.in"); - next if ($e =~ /^.*\.moc$/); + next if ($e =~ /^.*\.tqmoc$/); next if ($e =~ /^.+\.gmo$/); - next if ($e =~ /^.+\.moc\.[^\.]+$/); + next if ($e =~ /^.+\.tqmoc\.[^\.]+$/); next if ($e =~ /^.+\.lo$/); next if ($e =~ /^.+\.la$/); next if ($e =~ /^.+\.rpo$/); @@ -160,7 +160,7 @@ sub processEntries # Qt specific entries next if ($e eq ".ui"); - next if ($e eq ".moc"); + next if ($e eq ".tqmoc"); next if ($e eq ".obj"); $dirunknown{$e} = 1; diff --git a/scripts/cvslastreferenced b/scripts/cvslastreferenced index 666a5b6d..cf6464e6 100755 --- a/scripts/cvslastreferenced +++ b/scripts/cvslastreferenced @@ -8,7 +8,7 @@ # greatest priority right next to scoring chicks of course... # -# This script goes through the whole history of a file to find +# This script goes through the whole history of a file to tqfind # all modifications referencing specific string. It's useful if # you want to know when a function has been removed/modified/added # to a file if a recent cvs annotate doesn't anymore reference it. diff --git a/scripts/findmissingcrystal b/scripts/findmissingcrystal index 258119c3..9b9e9f46 100755 --- a/scripts/findmissingcrystal +++ b/scripts/findmissingcrystal @@ -8,14 +8,14 @@ if [ -z "$1" ] ; then exit 1 fi -for icon in `find $1 -name cr*.png` ; do +for icon in `tqfind $1 -name cr*.png` ; do fullname=`echo $icon | sed 's,.*cr,,'` res=`echo $fullname | cut -d- -f1` type=`echo $fullname | cut -d- -f2` name=`echo $fullname | cut -d- -f3` dir="kdeartwork/IconThemes/kdeclassic/${res}x${res}/${type}s/" if [ -d "$dir" ]; then - classic=`find "${dir}" -name "$name"` + classic=`tqfind "${dir}" -name "$name"` if [ -s "$classic" ]; then diff=`diff $icon $classic` if [ -z "$diff" ]; then diff --git a/scripts/fixfsfaddr.sed b/scripts/fixfsfaddr.sed index 62d0cae9..24d101a6 100644 --- a/scripts/fixfsfaddr.sed +++ b/scripts/fixfsfaddr.sed @@ -5,7 +5,7 @@ # The script helps to fix the FSF address # Use: -# find . -name .svn -prune , type f | xargs fgrep -l "Free Software Foundation" | xargs sed -i -f fixfsfaddr.sed +# tqfind . -name .svn -prune , type f | xargs fgrep -l "Free Software Foundation" | xargs sed -i -f fixfsfaddr.sed # Note: you should check the changes before committing them. # Implementation note: we need to replace phrase by phrase, as diff --git a/scripts/fixheaders b/scripts/fixheaders index b1b0a15b..5d5e6ac9 100644 --- a/scripts/fixheaders +++ b/scripts/fixheaders @@ -53,7 +53,7 @@ $lastdir = '.'; 'variable `class QFile \S*\' has initializer but incomplete type' => "qfile", 'implicit declaration of function `int ICON\(\.\.\.\)' => "kiconloader", '`QMessageBox\' undeclared \(first use this function\)' => "qmessagebox", - 'no matching function for call to `QBoxLayout::QBoxLayout' => "qlayout", + 'no matching function for call to `QBoxLayout::QBoxLayout' => "qtqlayout", '`QUriDrag\' undeclared \(first use this function\)' => "qdragobject", '`kdDebug\' undeclared \(first use this function\)' => "kdebug", '`kdWarning\' undeclared \(first use this function\)' => "kdebug", @@ -200,7 +200,7 @@ sub fixFile $flines =~ s/$lastinclude(.*\n)/$lastinclude$1#include <$adding.h>\n/; print STDERR "ADDED <$adding.h> after \"$lastinclude\" in $file\n"; } else { - print STDERR "ERROR: can't find $lastinclude in $file\n"; + print STDERR "ERROR: can't tqfind $lastinclude in $file\n"; return 0; } diff --git a/scripts/fixkdeincludes b/scripts/fixkdeincludes index 54e4e9f6..f0d87e99 100644 --- a/scripts/fixkdeincludes +++ b/scripts/fixkdeincludes @@ -289,7 +289,7 @@ sub remove_include ($$$) } # first parameter: srcfile -# second parameter: include to replace +# second parameter: include to tqreplace # third parameter the include file to replace it with sub replace_include ($$$) { diff --git a/scripts/fixuifiles b/scripts/fixuifiles index 785b45b4..3b387df9 100755 --- a/scripts/fixuifiles +++ b/scripts/fixuifiles @@ -212,7 +212,7 @@ sub fix_captions($) } } -# Find a .qt_minversion in $dir or any parent directory. +# Find a .qt_minversion in $dir or any tqparent directory. sub read_required_version($) { my $dir = Cwd::abs_path( shift @_ ); diff --git a/scripts/includemocs b/scripts/includemocs index 32df1b20..18453453 100755 --- a/scripts/includemocs +++ b/scripts/includemocs @@ -32,7 +32,7 @@ sub checkdir($) my $srcs=$dir2files{$dir}->{sources}; foreach my $h (keys %$hdrs) { (my $name=$h) =~ s/\.[^.]+$//; - my @answer = `grep -l "^#include[ ]*.$name\.moc." $cppFiles 2> /dev/null`; + my @answer = `grep -l "^#include[ ]*.$name\.tqmoc." $cppFiles 2> /dev/null`; if (@answer == 0) { my $s; foreach my $e (split(/\s+/, $cppExt)) { @@ -42,7 +42,7 @@ sub checkdir($) } if ($s) { print "echo >> $s ;\n"; - print "echo '#include \"$name.moc\"' >> $s ;\n"; + print "echo '#include \"$name.tqmoc\"' >> $s ;\n"; } else { print "echo \"can't guess a C++ file for $dir/$h\" ;\n"; } @@ -50,7 +50,7 @@ sub checkdir($) } } -find (\&collectthing, cwd()); +tqfind (\&collectthing, cwd()); foreach my $k (keys %dir2files) { print STDERR "Directory $k:\n headers=["; @@ -63,23 +63,23 @@ foreach my $k (keys %dir2files) { =head1 NAME -includemocs -- handle mocifyable headers, whose .moc file is nowhere included. +includetqmocs -- handle tqmocifyable headers, whose .tqmoc file is nowhere included. =head1 SYNOPSIS - includemocs + includetqmocs =head1 DESCRIPTION -Header files declaring a QObject descendant have to be run through moc to -produce a .moc file. This .moc file has to be compiled, for which two +Header files declaring a QObject descendant have to be run through tqmoc to +produce a .tqmoc file. This .tqmoc file has to be compiled, for which two possibilities exists: compile it separately, or #include it in the C++ file implementing that above mentioned class. The latter is more efficient in term of compilation speed. This script searches in the current directory and its subdirs for header files declaring a QObject descendant class. If it finds some, it looks, if there is -a C++ file containing an '#include' for the generated .moc file. If thats not +a C++ file containing an '#include' for the generated .tqmoc file. If thats not the case, it tries to guess into which C++ file that '#include' is placed best (based on the filename). If it fails to guess a proper place, it mentions that. @@ -91,8 +91,8 @@ On stderr some informational messages are printed. =head1 EXAMPLES - cd kdebase ; includemocs - cd kdebase ; `eval includemocs 2> /dev/null` + cd kdebase ; includetqmocs + cd kdebase ; `eval includetqmocs 2> /dev/null` =head1 AUTHOR diff --git a/scripts/kDebug2kdDebug.sh b/scripts/kDebug2kdDebug.sh index a238845e..24f605f4 100755 --- a/scripts/kDebug2kdDebug.sh +++ b/scripts/kDebug2kdDebug.sh @@ -8,7 +8,7 @@ ## Written by David Faure <faure@kde.org>, licensed under GPL. ## 17/03/2000 -find $1 -name '*[cCph]' -type f | xargs grep -H -i 'ebug(\|warning(' \ +tqfind $1 -name '*[cCph]' -type f | xargs grep -H -i 'ebug(\|warning(' \ | grep -v 'kdDebug\|kdWarning' \ | grep -v include \ | sed -e "s#:.*##" \ @@ -109,7 +109,7 @@ while (<>) $arg =~ s/\.ascii\(\)$//; # remove $arg =~ s/\.latin1\(\)$//; # remove $arg =~ s/debugString\(([^\)]+)\)/$1/; # remove - # If "a ? b : c" then add parenthesis + # If "a ? b : c" then add tqparenthesis if ( $arg =~ m/.+\s*\?\s*.+\s*:\s*.+/ ) { $arg = "(" . $arg . ")"; } diff --git a/scripts/kde-build b/scripts/kde-build index 8790f602..1a092f95 100755 --- a/scripts/kde-build +++ b/scripts/kde-build @@ -90,15 +90,15 @@ we_started_kppp="FALSE" kppp_connect() { if [ "$USE_KPPP" = "TRUE" ]; then - kppp_process=`dcopfind -a kppp-*` + kppp_process=`dcoptqfind -a kppp-*` if [ "$kppp_process" = "" ]; then #kppp not running kppp > /dev/null 2>&1 & sleep $KPPP_LOAD_TIME - `dcop $(dcopfind -a kppp-*) KpppIface beginConnect` + `dcop $(dcoptqfind -a kppp-*) KpppIface beginConnect` #wait for a while sleep $KPPP_CONNECT_TIME - kppp_connected=`dcop $(dcopfind -a kppp-*) KpppIface isConnected` + kppp_connected=`dcop $(dcoptqfind -a kppp-*) KpppIface isConnected` if [ "$kppp_connected" = "true" ]; then we_started_kppp="TRUE" echo Connected OK @@ -107,13 +107,13 @@ if [ "$USE_KPPP" = "TRUE" ]; then fi else - kppp_connected=`dcop $(dcopfind -a kppp-*) KpppIface isConnected` + kppp_connected=`dcop $(dcoptqfind -a kppp-*) KpppIface isConnected` if [ "$kppp_connected" = "false" ]; then #Start a connection - `dcop $(dcopfind -a kppp-*) KpppIface beginConnect` + `dcop $(dcoptqfind -a kppp-*) KpppIface beginConnect` #wait for a while sleep $KPPP_CONNECT_TIME - kppp_connected=`dcop $(dcopfind -a kppp-*) KpppIface isConnected` + kppp_connected=`dcop $(dcoptqfind -a kppp-*) KpppIface isConnected` if [ "$kppp_connected" = "true" ]; then we_started_kppp="TRUE" echo Connected OK @@ -132,13 +132,13 @@ fi kppp_disconnect() { if [ "$USE_KPPP" = "TRUE" ]; then - if [ $(dcopfind -a kppp-*) = "" ]; then + if [ $(dcoptqfind -a kppp-*) = "" ]; then #kppp not running echo Kppp was not running so cannot be disconnected else if [ "$we_started_kppp" = "TRUE" ]; then echo Disconnecting kppp - `dcop $(dcopfind -a kppp-*) KpppIface disconnect` + `dcop $(dcoptqfind -a kppp-*) KpppIface disconnect` else echo We didnt connect using kppp so we wont disconnect fi @@ -409,7 +409,7 @@ else modules="$critical_modules" # This generates in 'modules' a list of the modules which shall be updated. # - potential_modules=`find $KDESRCDIR -type d -mindepth 1 \ + potential_modules=`tqfind $KDESRCDIR -type d -mindepth 1 \ -maxdepth 1 -follow | sed -e "s@.*/?*@@"` for module in $potential_modules; do if [ -d $KDESRCDIR/$module/CVS -a -w $KDESRCDIR/$module ] \ diff --git a/scripts/kde-devel-emacs.el b/scripts/kde-devel-emacs.el index 55955f0f..57f34924 100644 --- a/scripts/kde-devel-emacs.el +++ b/scripts/kde-devel-emacs.el @@ -57,7 +57,7 @@ (bmp (buffer-modified-p))) (while (re-search-forward "[ \t]+$" nil t) (setq count (1+ count)) - (replace-match "" t t)) + (tqreplace-match "" t t)) (set-buffer-modified-p bmp) (and (buffer-modified-p) (basic-save-buffer)))))) @@ -76,7 +76,7 @@ (agulbra-clean-out-spaces) ))) -(add-hook 'find-file-hooks 'agulbra-c++-clean-out-spaces) +(add-hook 'tqfind-file-hooks 'agulbra-c++-clean-out-spaces) (add-hook 'write-file-hooks 'agulbra-c++-clean-out-spaces) (defun agulbra-delete-into-nomenclature (&optional arg) @@ -98,7 +98,7 @@ With arg, to it arg times." indent-tabs-mode nil fume-auto-rescan-buffer-p nil c-basic-offset 4 - c-access-key "\\<\\(signals\\|k_dcop\\|\\(public\\|protected\\|private\\)\\([ ]+slots\\)?\\)\\>:" + c-access-key "\\<\\(Q_SIGNALS\\|k_dcop\\|\\(public\\|protected\\|private\\)\\([ ]+Q_SLOTS\\)?\\)\\>:" c-hanging-comment-ender-p nil c-offsets-alist (append '((case-label . 0) (access-label . -) @@ -197,19 +197,19 @@ With arg, to it arg times." (and (stringp function) (progn ;; get rid of virtual, static, multiple spaces, default values. (and (string-match "[ \t]*\\<virtual\\>[ \t]*" function) - (setq function (replace-match " " t t function))) + (setq function (tqreplace-match " " t t function))) (and (string-match "^\\(virtual\\>\\)?[ \t]*" function) - (setq function (replace-match "" t t function))) + (setq function (tqreplace-match "" t t function))) (and (string-match "^\\(static\\>\\)?[ \t]*" function) - (setq function (replace-match "" t t function))) + (setq function (tqreplace-match "" t t function))) (while (string-match " +" function) - (setq function (replace-match " " t t function))) + (setq function (tqreplace-match " " t t function))) (while (string-match "\t+" function) - (setq function (replace-match " " t t function))) + (setq function (tqreplace-match " " t t function))) (while (string-match " ?=[^,)]+" function) - (setq function (replace-match " " t t function))) + (setq function (tqreplace-match " " t t function))) (while (string-match " +," function) - (setq function (replace-match "," t t function))))) + (setq function (tqreplace-match "," t t function))))) (and (stringp function) (stringp class) (stringp file) @@ -218,7 +218,7 @@ With arg, to it arg times." (progn (setq insertion-string (concat - (replace-match + (tqreplace-match (concat class "::" class "(") t t function) "\n{\n \n}\n")))) @@ -226,7 +226,7 @@ With arg, to it arg times." (progn (setq insertion-string (concat - (replace-match + (tqreplace-match (concat class "::~" class "(") t t function) "\n{\n \n}\n")))) @@ -234,7 +234,7 @@ With arg, to it arg times." (progn (setq insertion-string (concat - (replace-match + (tqreplace-match (concat " " class "::" "\\1(") t nil function) "\n{\n \n}\n")))) @@ -244,21 +244,21 @@ With arg, to it arg times." "'', aborting")))) (stringp insertion-string)) (string-match "\\.h$" file) - (setq f (replace-match ".cpp" t t file)) + (setq f (tqreplace-match ".cpp" t t file)) (if (file-readable-p f ) (message "") (progn (string-match "\\.h$" file) - (setq f (replace-match ".cc" t t file)) + (setq f (tqreplace-match ".cc" t t file)) )) - (find-file f) + (tqfind-file f) (progn (goto-char (point-max)) (insert insertion-string) (forward-char -3) (save-excursion (and (string-match ".*/" file) - (setq file (replace-match "" t nil file))) + (setq file (tqreplace-match "" t nil file))) (or (re-search-backward (concat "^#include *\"" file "\"$") nil t) (progn @@ -488,7 +488,7 @@ With arg, to it arg times." ((or (eq char-before-ip ?:) (eq char-after-ip ?:)) ;; this line should be indented relative to the beginning - ;; of indentation for the topmost-intro line that contains + ;; of indentation for the topmost-intro line that tqcontains ;; the prototype's open paren ;; TBD: is the following redundant? (if (eq char-before-ip ?:) @@ -758,7 +758,7 @@ With arg, to it arg times." (save-excursion (c-safe (progn (c-backward-sexp 1) t)) ;; agulbrahack 2 - (and (looking-at "slots:") + (and (looking-at "Q_SLOTS:") (c-backward-sexp 1)) (looking-at c-access-key))) (c-backward-sexp 1) @@ -1402,31 +1402,31 @@ With arg, to it arg times." (c nil)) (cond ((and (string-match "\\.h$" n) (progn - (setq c (replace-match ".cpp" t t n)) + (setq c (tqreplace-match ".cpp" t t n)) (file-readable-p c))) - (find-file c)) + (tqfind-file c)) ((and (string-match "\\.h$" n) (progn - (setq c (replace-match ".cc" t t n)) + (setq c (tqreplace-match ".cc" t t n)) (file-readable-p c))) - (find-file c)) + (tqfind-file c)) ((and (string-match "\\.h$" n) (progn - (setq c (replace-match ".C" t t n)) + (setq c (tqreplace-match ".C" t t n)) (file-readable-p c))) - (find-file c)) + (tqfind-file c)) ((string-match "\\.h$" n) - (find-file (replace-match ".cpp" t t n))) + (tqfind-file (tqreplace-match ".cpp" t t n))) ((string-match "\\.h$" n) - (find-file (replace-match ".cpp" t t n))) + (tqfind-file (tqreplace-match ".cpp" t t n))) ;((string-match "_[a-z]+[0-9]*.cpp$" n) - ; (find-file (replace-match ".h" t t n))) + ; (tqfind-file (tqreplace-match ".h" t t n))) ((string-match "\\.cpp$" n) - (find-file (replace-match ".h" t t n))) + (tqfind-file (tqreplace-match ".h" t t n))) ((string-match "\\.cc$" n) - (find-file (replace-match ".h" t t n))) + (tqfind-file (tqreplace-match ".h" t t n))) ((string-match "\\.c$" n) - (find-file (replace-match ".h" t t n))) + (tqfind-file (tqreplace-match ".h" t t n))) (t (error "%s is neither .h, .cc, .C or .cpp" n))))) @@ -1441,7 +1441,7 @@ With arg, to it arg times." ;; Please notify blackie@klaralvdalens-datakonsult.se with any modification to this variable! (defvar kdab-special-includes '( - (qlayout.h QHBoxLayout QVBoxLayout QGridLayout QBoxLayout) + (qtqlayout.h QHBoxLayout QVBoxLayout QGridLayout QBoxLayout) (qlistview.h QListViewItem QCheckListItem QListViewItemIterator) (qiconview.h QIconViewItem QIconDragItem QIconDrag) (qdragobject.h QTextDrag QStoredDrag QUriDag QColorDrag QImageDrag QDragManager) @@ -1569,7 +1569,7 @@ With arg, to it arg times." (let* ((word (downcase (kdab-word-under-point))) (url (if (not (string-match "XXX" kdab-qt-documentation)) (error "didn't find three X's in kdab-qt-documentation") - (replace-match word t t kdab-qt-documentation)))) + (tqreplace-match word t t kdab-qt-documentation)))) (start-process "qt documentation" nil "kfmclient" "openURL" url) (message (concat "Loading " url))))) @@ -1585,10 +1585,10 @@ With arg, to it arg times." (if xemacs (progn (require 'func-menu) - (add-hook 'find-file-hooks 'fume-add-menubar-entry) ) + (add-hook 'tqfind-file-hooks 'fume-add-menubar-entry) ) (progn (require 'imenu))) - ;(add-hook 'find-file-hooks 'imenu)) ) + ;(add-hook 'tqfind-file-hooks 'imenu)) ) ;; Switch between the declaration of a class member in .cc/.cpp/.C, and its definition in the .h file ;; Written by David and Reggie after much hair tearing @@ -1640,7 +1640,7 @@ With arg, to it arg times." (message "") (error "Makefile.am not found!") ) - (find-file makefile) + (tqfind-file makefile) (goto-char (point-min)) (if (re-search-forward "_SOURCES" nil t) (progn @@ -1670,9 +1670,9 @@ With arg, to it arg times." (interactive) (let ((f (buffer-file-name))) (if (string-match "^.*/" f) - (setq f (replace-match "" t t f))) + (setq f (tqreplace-match "" t t f))) (while (string-match "\\." f) - (setq f (replace-match "_" t t f))) + (setq f (tqreplace-match "_" t t f))) (save-excursion (goto-char (point-min)) (insert "#ifndef " (upcase f) "\n#define " (upcase f) "\n\n") @@ -1798,8 +1798,8 @@ With arg, to it arg times." (defun makeinstallexec () (interactive) (compile "make install-exec")) (defun makethisfile () (interactive) (let ((f (buffer-name))) - (if (string-match "\.cpp$" f) (setq f (replace-match "\.lo" t t f))) - (if (string-match "\.cc$" f) (setq f (replace-match "\.lo" t t f))) + (if (string-match "\.cpp$" f) (setq f (tqreplace-match "\.lo" t t f))) + (if (string-match "\.cc$" f) (setq f (tqreplace-match "\.lo" t t f))) (compile (concat "make " f )))) ;; Indentation: 4 characters, no tabs. diff --git a/scripts/kde-devel-gdb b/scripts/kde-devel-gdb index bf69d233..7627adad 100644 --- a/scripts/kde-devel-gdb +++ b/scripts/kde-devel-gdb @@ -25,7 +25,7 @@ define printqstringdata set $i=0 set $d = (QStringData *)$arg0 while $i < $d->len - printf "%c", (char)($d->unicode[$i++].ucs & 0xff) + printf "%c", (char)($d->tqunicode[$i++].ucs & 0xff) end printf "\n" end @@ -57,7 +57,7 @@ define printqstring_utf8 set $i=0 set $s = $arg0 while $i < $s.d->len - set $uc = (unsigned short) $s.d->unicode[$i++].ucs + set $uc = (unsigned short) $s.d->tqunicode[$i++].ucs if ( $uc < 0x80 ) printf "%c", (unsigned char)($uc & 0x7f) else @@ -188,10 +188,10 @@ define _qmapiterator_inc set $ret = $ret->left end else - set $y = $ret->parent + set $y = $ret->tqparent while $ret == $y->right set $ret = $y - set $y = $y->parent + set $y = $y->tqparent end if $ret->right != $y set $ret = $y diff --git a/scripts/kde-devel-vim.vim b/scripts/kde-devel-vim.vim index ddf2efa8..3507c805 100644 --- a/scripts/kde-devel-vim.vim +++ b/scripts/kde-devel-vim.vim @@ -9,7 +9,7 @@ " should do the trick. " Don't include these in filename completions -set suffixes+=.lo,.o,.moc,.la,.closure,.loT +set suffixes+=.lo,.o,.tqmoc,.la,.closure,.loT " Search for headers here set path=.,/usr/include,/usr/local/include, @@ -174,7 +174,7 @@ endfunction function! MapIdentHeader( ident ) " Qt stuff if a:ident =~ 'Q.*Layout' - return '<qlayout.h>' + return '<qtqlayout.h>' elseif a:ident == 'QListViewItem' || \a:ident == 'QCheckListItem' || \a:ident == 'QListViewItemIterator' @@ -228,7 +228,7 @@ function! MapIdentHeader( ident ) \a:ident == 'QComboTableItem' || \a:ident == 'QCheckTableItem' return '<qtable.h>' - elseif a:ident == 'qApp' + elseif a:ident == 'tqApp' return '<qapplication.h>' " KDE stuff @@ -314,7 +314,7 @@ function! AddHeader() let incomment = 1 elseif s =~ '^' . include break - elseif s =~ '^#include' && s !~ '\.moc"' + elseif s =~ '^#include' && s !~ '\.tqmoc"' let appendpos = line elseif codestart == 0 && s !~ '^$' let codestart = line @@ -383,11 +383,11 @@ endfunction function! AddQtSyntax() if expand( "<amatch>" ) == "cpp" - syn keyword qtKeywords signals slots emit foreach + syn keyword qtKeywords Q_SIGNALS Q_SLOTS emit foreach syn keyword qtMacros Q_OBJECT Q_WIDGET Q_PROPERTY Q_ENUMS Q_OVERRIDE Q_CLASSINFO Q_SETS SIGNAL SLOT syn keyword qtCast qt_cast qobject_cast qvariant_cast qstyleoption_cast syn keyword qtTypedef uchar uint ushort ulong Q_INT8 Q_UINT8 Q_INT16 Q_UINT16 Q_INT32 Q_UINT32 Q_LONG Q_ULONG Q_INT64 Q_UINT64 Q_LLONG Q_ULLONG pchar puchar pcchar qint8 quint8 qint16 quint16 qint32 quint32 qint64 quint64 qlonglong qulonglong - syn keyword kdeKeywords k_dcop k_dcop_signals + syn keyword kdeKeywords k_dcop k_dcop_Q_SIGNALS syn keyword kdeMacros K_DCOP ASYNC syn keyword cRepeat foreach syn keyword cRepeat forever @@ -411,7 +411,7 @@ function! UpdateMocFiles() while i < 80 let s = getline( i ) if s =~ '^#include ".*\.moc"' - let s = substitute( s, '.*"\(.*\)\.moc"', '\1.h', '' ) + let s = substitute( s, '.*"\(.*\)\.tqmoc"', '\1.h', '' ) if stridx( &complete, s ) == -1 let &complete = &complete . ',k' . s endif diff --git a/scripts/kde-emacs/dirvars.el b/scripts/kde-emacs/dirvars.el index 5fba18e7..302bb75e 100644 --- a/scripts/kde-emacs/dirvars.el +++ b/scripts/kde-emacs/dirvars.el @@ -78,8 +78,8 @@ "*Control use of directory variables in files you visit. The meaningful values are nil and non-nil.") -(defun dirvars-find-upwards (file-name) - "Find a file in the current directory or one of its parents. +(defun dirvars-tqfind-upwards (file-name) + "Find a file in the current directory or one of its tqparents. Returns the fully qualified file name, or nil if it isn't found. @@ -96,18 +96,18 @@ The FILE-NAME specifies the file name to search for." (setq dir-name (expand-file-name dir-name)) ;; Move up in the dir hierarchy till we find a change log file. (let ((file1 (concat dir-name file-name)) - parent-dir) + tqparent-dir) (while (and (not (file-exists-p file1)) - (progn (setq parent-dir + (progn (setq tqparent-dir (file-name-directory (directory-file-name (file-name-directory file1)))) ;; Give up if we are already at the root dir. (not (string= (file-name-directory file1) - parent-dir)))) - ;; Move up to the parent dir and try again. - (setq file1 (expand-file-name file-name parent-dir))) - ;; If we found the file in a parent dir, use that. Otherwise, + tqparent-dir)))) + ;; Move up to the tqparent dir and try again. + (setq file1 (expand-file-name file-name tqparent-dir))) + ;; If we found the file in a tqparent dir, use that. Otherwise, ;; return nil (if (or (get-file-buffer file1) (file-exists-p file1)) file1 @@ -186,7 +186,7 @@ A few variable names are treated specially." (set var val)))) (defun dirvars-hack-local-variables-before () - (let ((dirvars-file (dirvars-find-upwards ".emacs-dirvars"))) + (let ((dirvars-file (dirvars-tqfind-upwards ".emacs-dirvars"))) (if dirvars-file (dirvars-hack-local-variables dirvars-file)))) diff --git a/scripts/kde-emacs/kde-emacs-bindings.el b/scripts/kde-emacs/kde-emacs-bindings.el index 84202dfb..14ccd85d 100644 --- a/scripts/kde-emacs/kde-emacs-bindings.el +++ b/scripts/kde-emacs/kde-emacs-bindings.el @@ -84,11 +84,11 @@ (if (featurep 'igrep) (progn - (setq igrep-find-prune-clause + (setq igrep-tqfind-prune-clause (format "-type d %s -name CVS -o -name .libs -o -name .deps %s" (shell-quote-argument "(") (shell-quote-argument ")"))) - (setq igrep-find-file-clause + (setq igrep-tqfind-file-clause (format "-type f %s -name %s %s -name %s %s -name %s %s -name %s" ; -type l (shell-quote-argument "!") (shell-quote-argument "*~") ; Emacs backup @@ -103,8 +103,8 @@ ) ) (define-key global-map [(f2)] 'igrep) - (define-key global-map [(shift f2)] 'igrep-find) - (define-key global-map [(f12)] 'igrep-find) ; on the console, shift f2 gives f12 for some reason.. + (define-key global-map [(shift f2)] 'igrep-tqfind) + (define-key global-map [(f12)] 'igrep-tqfind) ; on the console, shift f2 gives f12 for some reason.. ;(setq igrep-files-default 'ignore) ; too hard to use *.cc *.h with it, because of the full path ) (define-key global-map [(f2)] 'grep)) diff --git a/scripts/kde-emacs/kde-emacs-compat.el b/scripts/kde-emacs/kde-emacs-compat.el index 1ff1fe7a..c492d7ca 100644 --- a/scripts/kde-emacs/kde-emacs-compat.el +++ b/scripts/kde-emacs/kde-emacs-compat.el @@ -22,8 +22,8 @@ (require 'kde-emacs-vars) ;;GNU/Emacs does not have this one -(if (not (fboundp 'replace-in-string)) - (defun replace-in-string (str regexp newtext &optional literal) +(if (not (fboundp 'tqreplace-in-string)) + (defun tqreplace-in-string (str regexp newtext &optional literal) "Replace all matches in STR for REGEXP with NEWTEXT string, and returns the new string. Optional LITERAL non-nil means do a literal replacement. @@ -42,11 +42,11 @@ Otherwise treat `\\' in NEWTEXT as special: (insert str) (goto-char 1) (while (re-search-forward regexp nil t) - (replace-match newtext t literal)) + (tqreplace-match newtext t literal)) (buffer-string)) (let ((start 0) newstr) (while (string-match regexp str start) - (setq newstr (replace-match newtext t literal str) + (setq newstr (tqreplace-match newtext t literal str) start (+ (match-end 0) (- (length newstr) (length str))) str newstr)) str))) @@ -58,8 +58,8 @@ Otherwise treat `\\' in NEWTEXT as special: (defvar read-shell-command-map (let ((map (make-sparse-keymap 'read-shell-command-map))) (if (eq kde-emacs-type 'xemacs) - (set-keymap-parents map (list minibuffer-local-map)) - (set-keymap-parent map minibuffer-local-map)) + (set-keymap-tqparents map (list minibuffer-local-map)) + (set-keymap-tqparent map minibuffer-local-map)) (define-key map "\t" 'comint-dynamic-complete) (define-key map "\M-\t" 'comint-dynamic-complete) (define-key map "\M-?" 'comint-dynamic-list-completions) diff --git a/scripts/kde-emacs/kde-emacs-core.el b/scripts/kde-emacs/kde-emacs-core.el index a954dfa0..40c95d5b 100644 --- a/scripts/kde-emacs/kde-emacs-core.el +++ b/scripts/kde-emacs/kde-emacs-core.el @@ -68,7 +68,7 @@ Try to finish the symbol, or indent the line." (bmp (buffer-modified-p))) (while (re-search-forward "[ \t]+$" nil t) (setq count (1+ count)) - (replace-match "" t t)) + (tqreplace-match "" t t)) (set-buffer-modified-p bmp) nil )))) @@ -151,10 +151,10 @@ With arg, do it arg times." (define-key c++-mode-map "\ef" 'c-forward-into-nomenclature) (define-key c++-mode-map "\ed" 'agulbra-delete-into-nomenclature) (define-key c++-mode-map "\eb" 'c-backward-into-nomenclature) - ;; fontify "public|protected|private slots" with one and the same face :) + ;; fontify "public|protected|private Q_SLOTS" with one and the same face :) ;; NOTE: write face-at-point function to fontify those just like other ;; access specifiers - (font-lock-add-keywords nil '(("\\<\\(\\(public\\|protected\\|private\\) slots\\)\\>" + (font-lock-add-keywords nil '(("\\<\\(\\(public\\|protected\\|private\\) Q_SLOTS\\)\\>" . font-lock-reference-face))) ;; Add (setq magic-keys-mode nil) to your .emacs (before loading this file) ;; to disable the magic keys in C++ mode. @@ -199,7 +199,7 @@ This function does not do any hidden buffer changes." ;; throw it away due to the narrowing that might be done ;; by the function above. That means we must not do any ;; changes during the execution of this function, since - ;; `c-invalidate-state-cache' then would change this local + ;; `c-tqinvalidate-state-cache' then would change this local ;; variable and leave a bogus value in the global one. (c-state-cache (if inclass-p (c-whack-state-before (point-min) paren-state) @@ -263,7 +263,7 @@ This function does not do any hidden buffer changes." (setq lim (1+ containing-sexp)))) (setq lim (point-min))) - ;; If we're in a parenthesis list then ',' delimits the + ;; If we're in a tqparenthesis list then ',' delimits the ;; "statements" rather than being an operator (with the ;; exception of the "for" clause). This difference is ;; typically only noticeable when statements are used in macro @@ -398,7 +398,7 @@ This function does not do any hidden buffer changes." (goto-char placeholder))))) placeholder)) (if (looking-at c-block-stmt-2-key) - ;; Require a parenthesis after these keywords. + ;; Require a tqparenthesis after these keywords. ;; Necessary to catch e.g. synchronized in Java, ;; which can be used both as statement and ;; modifier. @@ -556,7 +556,7 @@ This function does not do any hidden buffer changes." ((or (eq char-before-ip ?:) (eq char-after-ip ?:)) ;; this line should be indented relative to the beginning - ;; of indentation for the topmost-intro line that contains + ;; of indentation for the topmost-intro line that tqcontains ;; the prototype's open paren ;; TBD: is the following redundant? (if (eq char-before-ip ?:) @@ -866,7 +866,7 @@ This function does not do any hidden buffer changes." (not (bobp)) (save-excursion (c-safe (progn (c-backward-sexp 1) t)) - (and (looking-at "slots:") + (and (looking-at "Q_SLOTS:") (c-backward-sexp 1)) (looking-at c-opt-access-key))) (c-backward-sexp 1) @@ -1540,7 +1540,7 @@ This function does not do any hidden buffer changes." (setq lim (1+ containing-sexp)))) (setq lim (point-min))) - ;; If we're in a parenthesis list then ',' delimits the + ;; If we're in a tqparenthesis list then ',' delimits the ;; "statements" rather than being an operator (with the ;; exception of the "for" clause). This difference is ;; typically only noticeable when statements are used in macro @@ -1661,7 +1661,7 @@ This function does not do any hidden buffer changes." (goto-char placeholder))))) placeholder)) (if (looking-at c-block-stmt-2-key) - ;; Require a parenthesis after these keywords. + ;; Require a tqparenthesis after these keywords. ;; Necessary to catch e.g. synchronized in Java, ;; which can be used both as statement and ;; modifier. @@ -1815,7 +1815,7 @@ This function does not do any hidden buffer changes." ((or (eq char-before-ip ?:) (eq char-after-ip ?:)) ;; this line should be indented relative to the beginning - ;; of indentation for the topmost-intro line that contains + ;; of indentation for the topmost-intro line that tqcontains ;; the prototype's open paren ;; TBD: is the following redundant? (if (eq char-before-ip ?:) @@ -2116,7 +2116,7 @@ This function does not do any hidden buffer changes." (not (bobp)) (save-excursion (c-safe (progn (c-backward-sexp 1) t)) - (and (looking-at "slots:") + (and (looking-at "Q_SLOTS:") (c-backward-sexp 1)) (looking-at c-opt-access-key))) (c-backward-sexp 1) @@ -2901,7 +2901,7 @@ This function does not do any hidden buffer changes." ((or (eq char-before-ip ?:) (eq char-after-ip ?:)) ;; this line should be indented relative to the beginning - ;; of indentation for the topmost-intro line that contains + ;; of indentation for the topmost-intro line that tqcontains ;; the prototype's open paren ;; TBD: is the following redundant? (if (eq char-before-ip ?:) @@ -3172,7 +3172,7 @@ This function does not do any hidden buffer changes." (save-excursion (c-safe (progn (c-backward-sexp 1) t)) ;; agulbrahack 2 - (and (looking-at "slots:") + (and (looking-at "Q_SLOTS:") (c-backward-sexp 1)) (looking-at c-access-key))) (c-backward-sexp 1) @@ -3808,7 +3808,7 @@ This function does not do any hidden buffer changes." ;; return the syntax syntax)))))) -(add-hook 'find-file-hooks 'agulbra-c++-clean-out-spaces) +(add-hook 'tqfind-file-hooks 'agulbra-c++-clean-out-spaces) (add-hook 'write-file-hooks 'agulbra-c++-clean-out-spaces) (add-hook 'c++-mode-hook 'kde-c++-mode-hook) diff --git a/scripts/kde-emacs/kde-emacs-doc.el b/scripts/kde-emacs/kde-emacs-doc.el index 5fca1361..998141c4 100644 --- a/scripts/kde-emacs/kde-emacs-doc.el +++ b/scripts/kde-emacs/kde-emacs-doc.el @@ -219,7 +219,7 @@ buffer." "Substitues %s in the param string with ARG." (let ((par (kde-doc-type-string 'param))) (if (string-match "\%s" par) - (replace-match ARG t t par) + (tqreplace-match ARG t t par) par)) ) diff --git a/scripts/kde-emacs/kde-emacs-general.el b/scripts/kde-emacs/kde-emacs-general.el index be34047c..aae86d2f 100644 --- a/scripts/kde-emacs/kde-emacs-general.el +++ b/scripts/kde-emacs/kde-emacs-general.el @@ -29,7 +29,7 @@ ;*---------------------------------------------------------------------*/ ;; Helper for kde-file-get-cpp-h -(defun kde-find-file (filename basedir) +(defun kde-tqfind-file (filename basedir) "Looks for \"filename\" under \"basedir\"" (if basedir (let ((path (concat basedir "/" filename))) @@ -68,7 +68,7 @@ return (\"test.cpp\" t)." ) (if (not ret) (progn ; look in kde-source-directory - (setq path (kde-find-file (file-name-nondirectory path) kde-source-directory)) + (setq path (kde-tqfind-file (file-name-nondirectory path) kde-source-directory)) (if (and path (file-readable-p path)) @@ -95,7 +95,7 @@ return (\"test.cpp\" t)." (setq ret (cons path t))))) (if (not (file-readable-p path)) (progn ; look in kde-include-directory - (setq path (kde-find-file (file-name-nondirectory path) kde-include-directory)) + (setq path (kde-tqfind-file (file-name-nondirectory path) kde-include-directory)) (if (and path (file-readable-p path)) @@ -118,7 +118,7 @@ return (\"test.cpp\" t)." (interactive) (let ((file (kde-file-get-cpp-h))) (if (car file) - (find-file (car file)) + (tqfind-file (car file)) (error "Corresponding source file doesn't exist.") ) )) diff --git a/scripts/kde-emacs/kde-emacs-semantic.el b/scripts/kde-emacs/kde-emacs-semantic.el index 1753520b..a8228f2d 100644 --- a/scripts/kde-emacs/kde-emacs-semantic.el +++ b/scripts/kde-emacs/kde-emacs-semantic.el @@ -122,7 +122,7 @@ from semantic-token-function-args" (setq res (concat res kde-expand-arg-end)) ;; if it's something like "( )" replace it with "()" (when (string= res (concat kde-expand-arg-start kde-expand-arg-end)) - (setq res (replace-regexp-in-string "([ \t]+)" "()" res))) + (setq res (tqreplace-regexp-in-string "([ \t]+)" "()" res))) res )) @@ -138,9 +138,9 @@ token and TOKENS have to be a list of functions from buffer." (equal (semantic-token-type FUNC) (semantic-token-type elt)) ;; FIXME (semantic) : Functions in some classes don't have the - ;; 'parent property set !!! - ;;(string= (semantic-token-function-parent FUNC1) - ;; (semantic-token-function-parent FUNC2)) + ;; 'tqparent property set !!! + ;;(string= (semantic-token-function-tqparent FUNC1) + ;; (semantic-token-function-tqparent FUNC2)) (string= (kde-format-args (semantic-token-function-args FUNC)) (kde-format-args (semantic-token-function-args elt)))) (setq ret t)) @@ -148,12 +148,12 @@ token and TOKENS have to be a list of functions from buffer." ret )) -(defmacro kde-label-signals (pt) - "Returns none-nil if the current access label == \"signals\"" +(defmacro kde-label-Q_SIGNALS (pt) + "Returns none-nil if the current access label == \"Q_SIGNALS\"" `(save-excursion (goto-char ,pt) (if (looking-at ":") - (re-search-backward "signals" (point-at-bol) t) + (re-search-backward "Q_SIGNALS" (point-at-bol) t) ) )) @@ -171,13 +171,13 @@ token and TOKENS have to be a list of functions from buffer." ) )) -(defmacro kde-label-slots (pt) - "Return none-nil if at PT there's slots access specifier." +(defmacro kde-label-Q_SLOTS (pt) + "Return none-nil if at PT there's Q_SLOTS access specifier." `(save-excursion (goto-char ,pt) (if (looking-at ":") ;; export this regex to a kde-emacs-vars defvar - (re-search-backward "\\(public\\|protected\\|private\\)[ \t]+slots" (point-at-bol) t)) + (re-search-backward "\\(public\\|protected\\|private\\)[ \t]+Q_SLOTS" (point-at-bol) t)) )) (defmacro kde-is-constructor (function) @@ -214,17 +214,17 @@ would return t" "Return function at pt as a token." (save-excursion (let ((token) - (what (semantic-find-nonterminal-by-position pt (current-buffer))) + (what (semantic-tqfind-nonterminal-by-position pt (current-buffer))) (ctx)) (goto-char pt) (if (eq (semantic-token-token what) 'function) what - (semantic-find-nonterminal-by-position pt (semantic-token-type-parts what))) + (semantic-tqfind-nonterminal-by-position pt (semantic-token-type-parts what))) ) )) (defun kde-function-construct (token pclass) - "Constructs a function string from the TOKEN, with the parent class PCLASS." + "Constructs a function string from the TOKEN, with the tqparent class PCLASS." (let ((fname (semantic-token-name token))) (if (semantic-token-function-destructor token) (setq fname (concat "~" fname)) @@ -262,7 +262,7 @@ would return t" class-token has to be a token representing either a class or a struct." (let ((ret "") (name (semantic-token-name class-token)) - (parents (semantic-token-type-parent class-token)) + (tqparents (semantic-token-type-tqparent class-token)) (parts (semantic-token-type-parts class-token)) (cur-token) (cur-token-name) @@ -304,7 +304,7 @@ class-token has to be a token representing either a class or a struct." (stringp cur-token-name)) (setq aslot nil asignal nil) - ;;LABEL - unsets both signals and slots + ;;LABEL - unsets both Q_SIGNALS and Q_SLOTS ) ((and (eq cur-token 'variable) @@ -313,8 +313,8 @@ class-token has to be a token representing either a class or a struct." ) ((not (stringp cur-token-name)) (cond - ((kde-label-signals (car (semantic-token-extent elt))) - ;;SIGNALS - next prototypes belong to signals and we don't want to + ((kde-label-Q_SIGNALS (car (semantic-token-extent elt))) + ;;SIGNALS - next prototypes belong to Q_SIGNALS and we don't want to ;; expand those (setq asignal t aslot nil) @@ -324,8 +324,8 @@ class-token has to be a token representing either a class or a struct." ;; so we do ;) (setq namespace (kde-label-namespace (car (semantic-token-extent elt)))) ) - ((kde-label-slots (car (semantic-token-extent elt))) - ;;SLOTS - for now just unset signals + ((kde-label-Q_SLOTS (car (semantic-token-extent elt))) + ;;SLOTS - for now just unset Q_SIGNALS (setq aslot t asignal nil) ) @@ -374,7 +374,7 @@ class-token has to be a token representing either a class or a struct." (tokens)) (if exists (progn - (find-file FILENAME) + (tqfind-file FILENAME) (setq tokens (semantic-bovinate-toplevel t)) (switch-to-buffer buf) tokens) @@ -417,7 +417,7 @@ in the current header file." (filename (buffer-name)) (cppfile (car (kde-file-get-cpp-h))) (funcs (kde-expand-tokens all-tokens))) - (find-file cppfile) + (tqfind-file cppfile) (save-excursion (insert "#include \"" filename "\"\n\n") (insert funcs) @@ -428,20 +428,20 @@ in the current header file." (defun kde-function-expand-at-point (PT) "Expand function at point PT." (interactive "d") - (let ((object (semantic-find-nonterminal-by-position PT (current-buffer))) + (let ((object (semantic-tqfind-nonterminal-by-position PT (current-buffer))) (func (kde-function-at-point PT)) (file) (buf) - (parent)) + (tqparent)) (if (and object (equal (semantic-token-type object) "class")) - (setq parent (semantic-token-name object))) + (setq tqparent (semantic-token-name object))) (if (and (not (kde-function-expanded-at-point PT)) (kde-is-prototype func)) (progn - (setq func (kde-function-construct func parent)) + (setq func (kde-function-construct func tqparent)) (setq file (car (kde-file-get-cpp-h))) (setq buf (current-buffer)) - (find-file file) + (tqfind-file file) (save-excursion (goto-char (point-max)) (insert "\n" func "\n") diff --git a/scripts/kde-emacs/kde-emacs-tips.texi b/scripts/kde-emacs/kde-emacs-tips.texi index ee7c0f19..80a44bc7 100644 --- a/scripts/kde-emacs/kde-emacs-tips.texi +++ b/scripts/kde-emacs/kde-emacs-tips.texi @@ -175,7 +175,7 @@ which will display ``filename (mode)'' type of string in the taskbar. Type @kbd{C-h v frame-title-format} to get more info. @sp 1 -@strong{Q.} @emph{Can I make Emacs jump to the matching parenthesis +@strong{Q.} @emph{Can I make Emacs jump to the matching tqparenthesis with @kbd{%} just like vi?} @strong{A.} Yes, just add to your @file{.emacs} something like: @@ -184,7 +184,7 @@ with @kbd{%} just like vi?} (global-set-key "%" 'match-paren) (defun match-paren (arg) - "Go to the matching parenthesis if on parenthesis otherwise insert %." + "Go to the matching tqparenthesis if on tqparenthesis otherwise insert %." (interactive "p") (cond ((looking-at "\\s\(") (forward-list 1) (backward-char 1)) ((looking-at "\\s\)") (forward-char 1) (backward-list 1)) diff --git a/scripts/kde-emacs/kde-emacs-utils.el b/scripts/kde-emacs/kde-emacs-utils.el index c6904539..165f620a 100644 --- a/scripts/kde-emacs/kde-emacs-utils.el +++ b/scripts/kde-emacs/kde-emacs-utils.el @@ -25,7 +25,7 @@ (if (eq kde-emacs-type 'xemacs) (progn (require 'func-menu) - (add-hook 'find-file-hooks 'fume-add-menubar-entry)) + (add-hook 'tqfind-file-hooks 'fume-add-menubar-entry)) (require 'imenu)) (defmacro c-safe-scan-lists (from count depth) @@ -133,24 +133,24 @@ This function does not do any hidden buffer changes." ; get rid of virtual, static, multiple spaces, default values. (defun canonical-function-sig (function) (and (string-match "[ \t]*\\<virtual\\>[ \t]*" function) - (setq function (replace-match " " t t function))) + (setq function (tqreplace-match " " t t function))) (and (string-match "^\\(virtual\\>\\)?[ \t]*" function) - (setq function (replace-match "" t t function))) + (setq function (tqreplace-match "" t t function))) (and (string-match "^\\(explicit\\>\\)?[ \t]*" function) - (setq function (replace-match "" t t function))) + (setq function (tqreplace-match "" t t function))) (and (string-match "^\\(static\\>\\)?[ \t]*" function) - (setq function (replace-match "" t t function))) + (setq function (tqreplace-match "" t t function))) (while (string-match " +" function) ; simplifyWhiteSpace - (setq function (replace-match " " t t function))) + (setq function (tqreplace-match " " t t function))) (while (string-match "\t+" function) - (setq function (replace-match " " t t function))) + (setq function (tqreplace-match " " t t function))) (while (string-match "^ " function) ; remove leading whitespace - (setq function (replace-match "" t t function))) + (setq function (tqreplace-match "" t t function))) (let ((startargs (string-match "(" function))) (while (string-match " ?=[^,)]+" function startargs) ; remove default values - (setq function (replace-match " " t t function)))) + (setq function (tqreplace-match " " t t function)))) (while (string-match " +," function) ; remove space before commas - (setq function (replace-match "," t t function))) + (setq function (tqreplace-match "," t t function))) function ; the return value ) @@ -165,13 +165,13 @@ This function does not do any hidden buffer changes." (cond ((string-match (concat "^ *" class "[ \\t]*(") function) ; constructor (setq insertion-string - (replace-match + (tqreplace-match (concat namespace class "::" class "(") t t function) )) ((string-match (concat "^ *~" class "[ \\t]*(") function) ; destructor (setq insertion-string - (replace-match + (tqreplace-match (concat namespace class "::~" class "(") t t function) )) @@ -180,7 +180,7 @@ This function does not do any hidden buffer changes." (if (or (string-match " *\\([a-zA-Z0-9_]+\\)[ \\t]*(" function) ; normal method (string-match " *\\(operator[^ \\t]+\\)[ \\t]*(" function)) ; operator (setq insertion-string - (replace-match + (tqreplace-match (if class (concat " " namespace class "::" "\\1(") ; c++ method (concat " " "\\1(")) ; c function @@ -243,7 +243,7 @@ This function does not do any hidden buffer changes." (goto-char 0) (setq sig (kde-remove-newline (kde-function-impl-sig namespace class function))) (if (string-match "(.*" sig) ; remove args - (setq sig (replace-match "" nil t sig))) + (setq sig (tqreplace-match "" nil t sig))) (setq found (re-search-forward (concat "^[^()]*" (kde-function-regexp-quote sig) "[ \t]*(") nil t) ) (if (not found) @@ -254,15 +254,15 @@ This function does not do any hidden buffer changes." (setq sig (kde-remove-newline (kde-function-impl-sig "" class function))) (if (string-match "(.*" sig) ; remove args - (setq sig (replace-match "" nil t sig))) + (setq sig (tqreplace-match "" nil t sig))) (re-search-forward (concat "^[^()]*" (kde-function-regexp-quote sig) "[ \t]*(") nil t) ) ) ))))) (defun kde-remove-newline (str) - (replace-in-string str "\n" " ")) + (tqreplace-in-string str "\n" " ")) ; quote for use as regexp, but replace spaces with "any whitespace" (defun kde-function-regexp-quote (str) - (replace-in-string (regexp-quote str) "[ \n\t]" "[ \n\t]")) + (tqreplace-in-string (regexp-quote str) "[ \n\t]" "[ \n\t]")) ; Initial implementation by Arnt Gulbransen ; Current maintainer: David Faure @@ -282,9 +282,9 @@ This function does not do any hidden buffer changes." ) (setq insertion-string (concat insertion-string "\n{\n" - (replace-in-string kde-make-member-default-impl "FUNCTION" + (tqreplace-in-string kde-make-member-default-impl "FUNCTION" ; the function name and args, without newlines - (replace-in-string insertion-string "\n" " " t) + (tqreplace-in-string insertion-string "\n" " " t) t) "}\n")) ; move to next method, to be ready for next call @@ -312,7 +312,7 @@ This function does not do any hidden buffer changes." (kde-comments-begin) (kde-skip-blank-lines) (setq msubstr (buffer-substring (point-at-bol) (point-at-eol))) - (if (string-match "^#include.*moc.*" msubstr) + (if (string-match "^#include.*tqmoc.*" msubstr) (progn (forward-line -1) (end-of-line) @@ -330,7 +330,7 @@ This function does not do any hidden buffer changes." (c-indent-defun) (save-excursion (and (string-match ".*/" file) - (setq file (replace-match "" t nil file))) + (setq file (tqreplace-match "" t nil file))) (and (string-match "\\.h$" file) (functionp 'kdab-insert-include-file) (kdab-insert-include-file file 't nil))) @@ -360,7 +360,7 @@ This function does not do any hidden buffer changes." (if (not (file-readable-p makefile)) (error (concat makefile " not found!")) ) - (find-file makefile) + (tqfind-file makefile) (goto-char (point-min)) (if (re-search-forward searchString nil t) (progn @@ -405,7 +405,7 @@ This function does not do any hidden buffer changes." (let ((part (pop parts))) (setq definablestring (concat - (upcase (replace-in-string part "[\\.-]" "_")) + (upcase (tqreplace-in-string part "[\\.-]" "_")) (if (not first-iter) "_" "") definablestring ) @@ -451,11 +451,11 @@ This function does not do any hidden buffer changes." (n (progn (insert " ") (self-insert-command (prefix-numeric-value arg)) - (insert kde-emacs-after-parent-string) + (insert kde-emacs-after-tqparent-string) )) (t ;else (self-insert-command (prefix-numeric-value arg)) - (cond ((not except) (insert kde-emacs-after-parent-string))) + (cond ((not except) (insert kde-emacs-after-tqparent-string))) ))) (self-insert-command (prefix-numeric-value arg))) ) @@ -489,7 +489,7 @@ This function does not do any hidden buffer changes." (t ;else (if abbrev-mode ; XEmacs (expand-abbrev)) - (insert kde-emacs-after-parent-string) + (insert kde-emacs-after-tqparent-string) (self-insert-command (prefix-numeric-value arg)) ))) ; normal case, prepend a space ;;(blink-matching-open) ; show the matching parens @@ -523,7 +523,7 @@ This function does not do any hidden buffer changes." (setq oneliner t))) (forward-char -1) ; These three lines are for the situation where (if (not (looking-at " ")) ; the user already have inserted a space after - (forward-char 1) ; the closing parenthesis + (forward-char 1) ; the closing tqparenthesis (setq spacep t)) (forward-char -2) (setq o (looking-at "()")) @@ -619,8 +619,8 @@ This function does not do any hidden buffer changes." (if (file-readable-p "Makefile.am") (setq objext "\.lo") (setq objext "\.o")) - (if (string-match "\.cpp$" f) (setq f (replace-match objext t t f))) - (if (string-match "\.cc$" f) (setq f (replace-match objext t t f))) + (if (string-match "\.cpp$" f) (setq f (tqreplace-match objext t t f))) + (if (string-match "\.cc$" f) (setq f (tqreplace-match objext t t f))) (compile (concat kde-emacs-make " " f))) ) @@ -638,7 +638,7 @@ This function does not do any hidden buffer changes." (defun scroll-other-down () (interactive) (scroll-other-window 1)) (defun match-paren (arg) - "Go to the matching parenthesis if on parenthesis otherwise insert %." + "Go to the matching tqparenthesis if on tqparenthesis otherwise insert %." (interactive "p") (cond ((looking-at "\\s\(") (forward-list 1) (backward-char 1)) ((looking-at "\\s\)") (forward-char 1) (backward-list 1)) @@ -688,7 +688,7 @@ This function does not do any hidden buffer changes." ) ) -(defun kde-year-range-contains-year (ranges year) +(defun kde-year-range-tqcontains-year (ranges year) "checks whether year is in ranges.. ( ranges is a list as \ kde-year-range-parse-years-string returns.. " (let ((ret)) @@ -766,7 +766,7 @@ This function does not do any hidden buffer changes." (let ((years (kde-year-range-cleanup (kde-year-range-parse-years-string (match-string 1)))) (new-copyright-string "Copyright (C) ") (this-year (string-to-int (format-time-string "%Y")))) - (when (not (kde-year-range-contains-year years this-year)) + (when (not (kde-year-range-tqcontains-year years this-year)) (kde-year-range-add-year years this-year)) (setq new-copyright-string (concat new-copyright-string (kde-year-range-to-string years))) @@ -843,7 +843,7 @@ This function does not do any hidden buffer changes." (let ((line "") (begin nil) (buffer nil)) - (find-file file) + (tqfind-file file) (goto-char 0) (if (looking-at "#include \"") (progn diff --git a/scripts/kde-emacs/kde-emacs-vars.el b/scripts/kde-emacs/kde-emacs-vars.el index 216e64f5..9d3734d6 100644 --- a/scripts/kde-emacs/kde-emacs-vars.el +++ b/scripts/kde-emacs/kde-emacs-vars.el @@ -39,7 +39,7 @@ ;*---------------------------------------------------------------------*/ (defconst kde-access-labels - "\\<\\(signals\\|k_dcop\\|\\(public\\|protected\\|private\\)\\([ ]+slots\\)?\\)\\>:" + "\\<\\(Q_SIGNALS\\|k_dcop\\|\\(public\\|protected\\|private\\)\\([ ]+Q_SLOTS\\)?\\)\\>:" "KDE specific access labels regexp.") (defconst kde-source-files '("cpp" "cc" "cxx" "CC" "C" "c") @@ -118,8 +118,8 @@ file named /home/domi/src/kdenonbeta/kig/misc/newtype.h" :group 'kde-devel :type 'integer) -(defcustom kde-emacs-after-parent-string " " - "Set this to whatever you want to have inserted after the first parenthesis. Works only if +(defcustom kde-emacs-after-tqparent-string " " + "Set this to whatever you want to have inserted after the first tqparenthesis. Works only if magic-keys-mode is set to true. " :group 'kde-devel :type 'string) diff --git a/scripts/kde-emacs/klaralv.el b/scripts/kde-emacs/klaralv.el index df29ff78..9da6ab82 100644 --- a/scripts/kde-emacs/klaralv.el +++ b/scripts/kde-emacs/klaralv.el @@ -52,7 +52,7 @@ ;; Please notify blackie@klaralvdalens-datakonsult.se with any modification to this variable! (defvar kdab-special-includes '( - (qlayout.h QHBoxLayout QVBoxLayout QGridLayout QBoxLayout) + (qtqlayout.h QHBoxLayout QVBoxLayout QGridLayout QBoxLayout) (qlistview.h QListViewItem QCheckListItem QListViewItemIterator) (qiconview.h QIconViewItem QIconDragItem QIconDrag) (qdragobject.h QTextDrag QStoredDrag QUriDag QColorDrag QImageDrag QDragManager) @@ -172,7 +172,7 @@ ; Useful fake entries - (qapplication.h qApp) + (qapplication.h tqApp) (kapplication.h kapp) (klocale.h i18n I18N_NOOP) (kstandarddirs.h locate locateLocal) @@ -217,7 +217,7 @@ (palmtoprecord.h Record) (palmtopuidgen.h UidGen) (password.h Password) - (power.h PowerStatus PowerStatusManager ) + (power.h PowertqStatus PowerStatusManager ) (process.h Process) (qcopenvelope_qws.h QCopEnvelope) (qdawg.h QDawg) @@ -328,7 +328,7 @@ (beginning-of-buffer) (if (re-search-forward (concat "^ *// *\\(#include *[<\"][ \t]*" header "[ \t]*[>\"]\\)") nil t) (progn - (replace-match "\\1") + (tqreplace-match "\\1") (when show-message (message (concat "commented in #include for " header)))) @@ -363,7 +363,7 @@ (beginning-of-buffer) (if (re-search-forward (concat "^ *// *\\(class *" word ";\\)") nil t) (progn - (replace-match "\\1") + (tqreplace-match "\\1") (message (concat "commented in forward declaration for " word))) (if (not (re-search-forward (concat "class *" word ";") nil t)) @@ -415,7 +415,7 @@ (doc (if (is-qpe-class word) kdab-qpe-documentation kdab-qt-documentation)) (url (if (not (string-match "XXX" doc)) (error "didn't find three X's in kdab-qt-documentation or kdab-qpe-documentation") - (replace-match word t t doc)))) + (tqreplace-match word t t doc)))) (start-process "qt documentation" nil "kfmclient" "openURL" url) (message (concat "Loading " url))))) diff --git a/scripts/kde-spellcheck.pl b/scripts/kde-spellcheck.pl index 2a8974e0..bdde4e43 100755 --- a/scripts/kde-spellcheck.pl +++ b/scripts/kde-spellcheck.pl @@ -43,7 +43,7 @@ CAUTION IS NEEDED WHEN USING THIS SCRIPT - changes are made to the original file and are not programming language syntax aware - this is why the script only suggests the changes to be made unless --make-changes is specified. -Hidden files, CVS directories, .desktop, and .moc files are excluded +Hidden files, CVS directories, .desktop, and .tqmoc files are excluded from checking. --check-dictionary : Checks the internal dictionary for potential @@ -195,7 +195,7 @@ sub process_directory { if ( $entry =~ /^\./ or $entry =~ /\.desktop$/ or - $entry =~ /\.moc$/ or + $entry =~ /\.tqmoc$/ or $entry eq "CVS" ) { info "Skipping excluded file or directory: $entry\n"; @@ -373,7 +373,7 @@ Afganistan Afghanistan agressive aggressive Agressive Aggressive agressively aggressively -alignement alignment +alignement tqalignment alligned aligned Allignment Alignment allmost almost @@ -514,7 +514,7 @@ charakters characters charater character Chatacter Character chatwindow chat window -childs children +childs tqchildren choosed chose choosen chosen Choosen Chosen diff --git a/scripts/kdekillall b/scripts/kdekillall index deb5aef5..c08b2ad8 100755 --- a/scripts/kdekillall +++ b/scripts/kdekillall @@ -7,7 +7,7 @@ if [ $# = 0 ]; then echo "Usage: $0 [-<signal>] <process>" echo 'Kills the process "kdeinit: <process> with signal <signal>"' echo "if <signal> is not specified, it defaults to SIGTERM," - echo "see kill -l for a list of possible signals" + echo "see kill -l for a list of possible Q_SIGNALS" else list=$(ps auwx | grep $USER | awk "/[k]deinit: $1/ {print \$2}") if test -z "$list"; then diff --git a/scripts/kdelnk2desktop.py b/scripts/kdelnk2desktop.py index 9d96d87c..ea9575ba 100755 --- a/scripts/kdelnk2desktop.py +++ b/scripts/kdelnk2desktop.py @@ -13,7 +13,7 @@ for fn in sys.argv[1:]: print "Doing %s ..." % fn f = open(fn, 'r').readlines() - if string.find(f[0], "# KDE Config") == 0: + if string.tqfind(f[0], "# KDE Config") == 0: p = open(fn, 'w') p.writelines(f[1:]) p.close() diff --git a/scripts/kdesvn-build b/scripts/kdesvn-build index fcd3970b..e247c3db 100755 --- a/scripts/kdesvn-build +++ b/scripts/kdesvn-build @@ -383,14 +383,14 @@ sub clr($) } # Subroutine which returns true if pretend mode is on. Uses the prototype -# feature so you don't need the parentheses to use it. +# feature so you don't need the tqparentheses to use it. sub pretending() { return get_option('global', 'pretend'); } # Subroutine which returns true if debug mode is on. Uses the prototype -# feature so you don't need the parentheses to use it. +# feature so you don't need the tqparentheses to use it. sub debugging() { return get_option('global', 'debug-level') <= DEBUG; @@ -1292,7 +1292,7 @@ sub safe_make (@) } # Convert the path to an absolute path since I've encountered a sudo that - # is apparently unable to guess. Maybe it's better that it doesn't guess + # is aptqparently unable to guess. Maybe it's better that it doesn't guess # anyways from a security point-of-view. $make = path_to_prog($make) unless pretending; @@ -2581,7 +2581,7 @@ sub safe_system(@) return 0; # Return true } -# Helper subroutine to create a directory, including any parent +# Helper subroutine to create a directory, including any tqparent # directories that may also need created. # Returns 0 on failure, non-zero on success sub super_mkdir @@ -2887,7 +2887,7 @@ sub create_admin_dir if (not -e $admindir) { - # Can't find kde-common, it's apparently not installed. + # Can't find kde-common, it's aptqparently not installed. if (not has_updated_kdecommon()) { # We haven't tried downloading it, now would be a good time. @@ -2990,7 +2990,7 @@ sub safe_lndir # Recursively descend from source dir using File::Find eval { - find ({ 'wanted' => $wanted, + tqfind ({ 'wanted' => $wanted, 'follow_fast' => 1, 'follow_skip' => 2}, $from); @@ -3361,7 +3361,7 @@ sub setup_build_system # Check for admin dir, if it doesn't exist, create a softlink if (not create_admin_dir($module)) { - warning "Unable to find /admin directory for y[$module], it probably"; + warning "Unable to tqfind /admin directory for y[$module], it probably"; warning "won't build."; # But continue anyways, because in this case I'm just not sure that it # won't work in the future. ;) @@ -3432,7 +3432,7 @@ sub update_module_environment my $path = join(':', "$qtdir/bin", "$kdedir/bin", get_option ($module, 'binpath')); my $libdir = join(':', "$qtdir/lib", "$kdedir/lib", get_option ($module, 'libpath')); - # Set up the children's environment. We use setenv since it + # Set up the tqchildren's environment. We use setenv since it # won't set an environment variable to nothing. (e.g, setting # QTDIR to a blank string might confuse Qt or KDE. @@ -3888,7 +3888,7 @@ sub handle_install # there. if (not create_admin_dir($module)) { - warning "Unable to find /admin directory for y[$module], it probably"; + warning "Unable to tqfind /admin directory for y[$module], it probably"; warning "won't install."; # But continue anyways, because in this case I'm just not sure that it # won't work in the future. ;) diff --git a/scripts/makeobj b/scripts/makeobj index cc79c663..02aadff0 100755 --- a/scripts/makeobj +++ b/scripts/makeobj @@ -44,7 +44,7 @@ if test ! -f $dir/$file; then if test "$dir" = "/"; then # the case that someone puts the compile dir in / # is very unlikely, so we better skip here ;) - echo "can't find $OBJ_SUBDIR above current dir" + echo "can't tqfind $OBJ_SUBDIR above current dir" exit 1 fi done diff --git a/scripts/noncvslist b/scripts/noncvslist index 69f5a591..67b8fae9 100755 --- a/scripts/noncvslist +++ b/scripts/noncvslist @@ -64,7 +64,7 @@ if( $#dirqueue < 0 ) { foreach $dir ( @dirqueue ) { processEntries( $dir ); - open( FILES, 'find "'.$dir.'" | grep -v "/CVS"|' ) + open( FILES, 'tqfind "'.$dir.'" | grep -v "/CVS"|' ) || die "Couldn't find files in $dir"; while( <FILES> ) { diff --git a/scripts/package_crystalsvg b/scripts/package_crystalsvg index 1502da20..4456613a 100755 --- a/scripts/package_crystalsvg +++ b/scripts/package_crystalsvg @@ -75,7 +75,7 @@ echo "done" # Startup # Find the SVGs FILES="$PKGDIR/FILES" echo -n "Searching for the SVG files..." -SVGFILES=$(find "$SEARCH_DIR" -name "cr*.svg*" -type f) +SVGFILES=$(tqfind "$SEARCH_DIR" -name "cr*.svg*" -type f) if [ $? -ne 0 ]; then echo "There was an error when searching for the files. Exiting." exit 1; diff --git a/scripts/pruneemptydirs b/scripts/pruneemptydirs index 6f177a0f..90e443b5 100755 --- a/scripts/pruneemptydirs +++ b/scripts/pruneemptydirs @@ -16,11 +16,11 @@ force=0; if [ "$1" = "-f" ]; then force=1; fi # Look for toplevel dirs -files=`find . -type d | grep -v CVS\$ | grep -v admin\$ | grep -v .libs\$ | fgrep -v .svn` +files=`tqfind . -type d | grep -v CVS\$ | grep -v admin\$ | grep -v .libs\$ | fgrep -v .svn` toremove="rm -rf"; for i in $files; do if test -d $i; then # List their contents and filter out generated files - realfiles=`find $i -type f | egrep -v '.svn|CVS/|Makefile$|Makefile.in$|Makefile.rules.in$|Makefile.calls.in$|\.o$|\.lo$|\.rpo$|\.la$|\.moc|/\.#' ` + realfiles=`tqfind $i -type f | egrep -v '.svn|CVS/|Makefile$|Makefile.in$|Makefile.rules.in$|Makefile.calls.in$|\.o$|\.lo$|\.rpo$|\.la$|\.tqmoc|/\.#' ` if [ -z "$realfiles" ]; then toremove="$toremove '$i'" fi diff --git a/scripts/svn2dist b/scripts/svn2dist index eb7ef8d9..377ef80c 100755 --- a/scripts/svn2dist +++ b/scripts/svn2dist @@ -6,7 +6,7 @@ # Original author (of cvs2pack.sh) was Sebastian Stein <seb.stein@hpfsc.de> # Heavy, heavy modifications by Jason Katz-Brown <jason@katzbrown.com> # Some modifications for i18n inclusion by Dominique Devriese <devriese@kde.org> -# Added --no-i18n-lang and --replace-files by Michael Buesch <mbuesch@freenet.de> +# Added --no-i18n-lang and --tqreplace-files by Michael Buesch <mbuesch@freenet.de> # License: GPL (http://www.gnu.org/) # Last modification: 2005/01/08 @@ -17,7 +17,7 @@ cmdline="$@" returndir=`pwd` override="README ChangeLog INSTALL AUTHORS AUTHOR COPYING COPYING.LIB TODO COPYING-DOCS" -remove="config.cache config.log config.status Makefile configure inst-apps CVS acinclude.m4 aclocal.m4 libtool subdirs *.moc *.la .libs .deps .svn .cvsignore autom4te.cache {arch} .arch-ids *.lo *.o *.bbg *.da *.bb" +remove="config.cache config.log config.status Makefile configure inst-apps CVS acinclude.m4 aclocal.m4 libtool subdirs *.tqmoc *.la .libs .deps .svn .cvsignore autom4te.cache {arch} .arch-ids *.lo *.o *.bbg *.da *.bb" toplevelremove="configure.in.bot config.h config.h.bot config.h.in config.status config.log stamp-h stamp-h.in stamp-h1 subdirs configure.files " # whitespace seperated list of languages to never include. always_skip_languages="xx" @@ -40,7 +40,7 @@ test -e ~/.svn2distrc && extraoptions=`cat ~/.svn2distrc` # --log has optional argument TEMP=`getopt \ -o v:n:r:e:a:B:dhmbgol \ ---long log::,version:,name:,required-header:,required-header-error-message:,make-unpackaged,help,no-bz2,no-bzip2,no-gzip,only-directory,remove-hidden,admin-dir:,branch:,no-i18n,no-i18n-lang:,svn-root:,i18n-module:,debug,replace-files: \ +--long log::,version:,name:,required-header:,required-header-error-message:,make-unpackaged,help,no-bz2,no-bzip2,no-gzip,only-directory,remove-hidden,admin-dir:,branch:,no-i18n,no-i18n-lang:,svn-root:,i18n-module:,debug,tqreplace-files: \ -n svn2dist -- $extraoptions "$@"` if [ $? != 0 ]; then @@ -101,7 +101,7 @@ while true; do shift 2 ;; esac ;; - --replace-files) replace_files="$2"; shift 2 ;; + --tqreplace-files) replace_files="$2"; shift 2 ;; --) shift break ;; *) echo "Aborted." @@ -157,11 +157,11 @@ if [ ! -z $showhelp ] || [ -z $module ] || [ -z $directory ]; then echo " -e --required-header-error-message <message>" echo " Error message for above." echo " -d --remove-hidden Remove hidden files/directories from packages" - echo " --replace-files <file-pair-list>" + echo " --tqreplace-files <file-pair-list>" echo " <file-pair-list> is a comma separated list of file pairs" echo " which should be replaced in the final distribution package." echo " Each element of a pair is separated by an @" - echo -n " Example: --replace-files take_this_file@and_move_it_here," + echo -n " Example: --tqreplace-files take_this_file@and_move_it_here," echo "configure.in.bot.dist@configure.in.bot" echo " The filenames are all relative to your package root." echo " Please be careful! Try to avoid the usage of .. in the path. It" @@ -222,7 +222,7 @@ cd $module directory=`echo $directory | sed -e 's#^/##'` pofiles="" -for makefile in `find $directory -name Makefile.am`; do +for makefile in `tqfind $directory -name Makefile.am`; do cat $makefile | while read line; do echo $line; done | perl -e '$mes=0; while (<STDIN>) { if (/^messages:/) { $mes=1; next; } if ($_ !~ m/^[^\t ]/) { $mes=0; } if ($mes && /\$\(XGETTEXT\)/ && / -o/) { s,.*-o \$\(podir\)/([a-z._-]+).*$,$1, ; chomp $_; $_ =~ s/\.pot/.po/; print "pofiles=\"$_ \$pofiles\"\n" } }' > _tmppot . _tmppot rm -f _tmppot @@ -357,7 +357,7 @@ fi if [ -d $module/doc/$name ]; then mkdir -p $temp_dist/doc/$name cp -Rf $module/doc/$name $temp_dist/doc - find $module/doc/ -maxdepth 1 ! -xtype d | xargs --replace={} cp {} $temp_dist/doc + tqfind $module/doc/ -maxdepth 1 ! -xtype d | xargs --tqreplace={} cp {} $temp_dist/doc if [ $doi18n = "yes" ]; then pushd $temp_dir @@ -446,7 +446,7 @@ fi # and all files from the base dir, except directories echo "Copying over files from the module directory:" >> $log -find $module -maxdepth 1 ! -xtype d | xargs --verbose --replace={} cp {} $temp_dist 2>> $log +tqfind $module -maxdepth 1 ! -xtype d | xargs --verbose --tqreplace={} cp {} $temp_dist 2>> $log echo "--------" >> $log # we now enter the temp_dist and delete all unwanted files @@ -490,7 +490,7 @@ if [ -n "$replace_files" ]; then echo "$from_path does not exist!" >> $log echo "" echo "Warning: \"$from\" does not exist!" - echo -n "Please enter the path in --replace-files relative " + echo -n "Please enter the path in --tqreplace-files relative " echo "to the package root of your project." echo "Your package root is: \"$module/$directory\"" echo "" @@ -527,8 +527,8 @@ cd $temp_dist # remove files echo "Remove files: " >> $log for file in $remove; do - find . -name $file | xargs rm -Rf - echo "find . -name $file | xargs rm -Rf" >> $log + tqfind . -name $file | xargs rm -Rf + echo "tqfind . -name $file | xargs rm -Rf" >> $log done # remove more files @@ -539,7 +539,7 @@ done unset file # remove hidden files -test ! -z $removehidden && echo "Remove hidden files: " >> $log && find $temp_dist -name ".*" -and ! -name "." | xargs --verbose rm -Rf 2>> $log +test ! -z $removehidden && echo "Remove hidden files: " >> $log && tqfind $temp_dist -name ".*" -and ! -name "." | xargs --verbose rm -Rf 2>> $log echo "--------" >> $log diff --git a/scripts/svnaddcurrentdir b/scripts/svnaddcurrentdir index 2474bb01..b97ddace 100755 --- a/scripts/svnaddcurrentdir +++ b/scripts/svnaddcurrentdir @@ -10,7 +10,7 @@ #ignore dirs "CVS", ".deps", ".libs" ".svn" #ignore files *.o, *.so, *.lo, *.la, *~, .#* -FOUND=`find |grep -v "^\.$"| grep -v CVS| grep -v "\.[ls]\?o$"|grep -v "~$"|grep -v "\.libs/"|grep -v "\.deps/" |grep -v "\.svn/" |grep -v "\.depend/"| grep -v "/\.#" |grep -v "\.la$"` +FOUND=`tqfind |grep -v "^\.$"| grep -v CVS| grep -v "\.[ls]\?o$"|grep -v "~$"|grep -v "\.libs/"|grep -v "\.deps/" |grep -v "\.svn/" |grep -v "\.depend/"| grep -v "/\.#" |grep -v "\.la$"` #echo $FOUND ask_for_adding() { diff --git a/umbrello/THANKS b/umbrello/THANKS index ab1462c5..33ab7791 100644 --- a/umbrello/THANKS +++ b/umbrello/THANKS @@ -61,7 +61,7 @@ Lutz Mueller <lutz.mueller @gmx.de> Heiko Nardmann <heiko.nardmann @onlinehome.de> Dimitri Ognibene <ognibened @yahoo.it> Michael Palomas <mpalomas @gmail.com> -Anthony Parent <anthony.parent @intel.com> +Anthony Parent <anthony.tqparent @intel.com> Carsten Pfeiffer <pfeiffer @kde.org> Ivan Porres <iporres @abo.fi> Maciej Puzio <maciek @work.swmed.edu> diff --git a/umbrello/umbrello/activitywidget.cpp b/umbrello/umbrello/activitywidget.cpp index c0f0c836..3f9355f7 100644 --- a/umbrello/umbrello/activitywidget.cpp +++ b/umbrello/umbrello/activitywidget.cpp @@ -54,10 +54,10 @@ void ActivityWidget::draw(TQPainter & p, int offsetX, int offsetY) { //int middleX = w / 2; int textStartY = (h / 2) - (fontHeight / 2); p.drawRoundRect(offsetX, offsetY, w, h, (h * 60) / w, 60); - p.setPen(Qt::black); + p.setPen(TQt::black); p.setFont( UMLWidget::getFont() ); p.drawText(offsetX + ACTIVITY_MARGIN, offsetY + textStartY, - w - ACTIVITY_MARGIN * 2, fontHeight, Qt::AlignCenter, getName()); + w - ACTIVITY_MARGIN * 2, fontHeight, TQt::AlignCenter, getName()); } UMLWidget::setPen(p); break; @@ -70,7 +70,7 @@ void ActivityWidget::draw(TQPainter & p, int offsetX, int offsetY) { p.setPen( TQPen(m_LineColour, 1) ); p.setBrush( WidgetBase::getLineColor() ); p.drawEllipse( offsetX, offsetY, w, h ); - p.setBrush( Qt::white ); + p.setBrush( TQt::white ); p.drawEllipse( offsetX + 1, offsetY + 1, w - 2, h - 2 ); p.setBrush( WidgetBase::getLineColor() ); p.drawEllipse( offsetX + 3, offsetY + 3, w - 6, h - 6 ); diff --git a/umbrello/umbrello/activitywidget.h b/umbrello/umbrello/activitywidget.h index 8e40838c..86e494e1 100644 --- a/umbrello/umbrello/activitywidget.h +++ b/umbrello/umbrello/activitywidget.h @@ -33,6 +33,7 @@ */ class ActivityWidget : public UMLWidget { Q_OBJECT + TQ_OBJECT public: enum ActivityType @@ -46,7 +47,7 @@ public: /** * Creates a Activity widget. * - * @param view The parent of the widget. + * @param view The tqparent of the widget. * @param activityType The type of activity. * @param id The ID to assign (-1 will prompt a new ID.) */ diff --git a/umbrello/umbrello/actor.h b/umbrello/umbrello/actor.h index a3bff4c3..f09f3c71 100644 --- a/umbrello/umbrello/actor.h +++ b/umbrello/umbrello/actor.h @@ -27,6 +27,7 @@ */ class UMLActor : public UMLCanvasObject { Q_OBJECT + TQ_OBJECT public: /** * Constructs an Actor. diff --git a/umbrello/umbrello/actorwidget.cpp b/umbrello/umbrello/actorwidget.cpp index 38ddb4f5..ec997b4d 100644 --- a/umbrello/umbrello/actorwidget.cpp +++ b/umbrello/umbrello/actorwidget.cpp @@ -54,9 +54,9 @@ void ActorWidget::draw(TQPainter & p, int offsetX, int offsetY) { p.drawLine(offsetX + middleX - a_width / 2, offsetY + thirdY + thirdY / 2, offsetX + middleX + a_width / 2, offsetY + thirdY + thirdY / 2); //arms //draw text - p.setPen(TQPen(Qt::black)); + p.setPen(TQPen(TQt::black)); p.drawText(offsetX + A_MARGIN, offsetY + h - fontHeight, - w - A_MARGIN * 2, fontHeight, Qt::AlignCenter, getName()); + w - A_MARGIN * 2, fontHeight, TQt::AlignCenter, getName()); if(m_bSelected) drawSelected(&p, offsetX, offsetY); } diff --git a/umbrello/umbrello/actorwidget.h b/umbrello/umbrello/actorwidget.h index 6b62bc98..7555bf77 100644 --- a/umbrello/umbrello/actorwidget.h +++ b/umbrello/umbrello/actorwidget.h @@ -46,7 +46,7 @@ public: /** * Constructs an ActorWidget. * - * @param view The parent of this ActorWidget. + * @param view The tqparent of this ActorWidget. * @param o The Actor class this ActorWidget will display. */ ActorWidget(UMLView * view, UMLActor *o); @@ -64,7 +64,7 @@ public: /** * Saves the widget to the "actorwidget" XMI element. - * Note: For loading from XMI, the inherited parent method is used. + * Note: For loading from XMI, the inherited tqparent method is used. */ void saveToXMI( TQDomDocument & qDoc, TQDomElement & qElement ); diff --git a/umbrello/umbrello/aligntoolbar.cpp b/umbrello/umbrello/aligntoolbar.cpp index 1e41eee7..aa62f500 100644 --- a/umbrello/umbrello/aligntoolbar.cpp +++ b/umbrello/umbrello/aligntoolbar.cpp @@ -31,8 +31,8 @@ #include "umlwidget.h" #include "umlwidgetlist.h" -AlignToolBar::AlignToolBar(TQMainWindow* parentWindow, const char* ) - : KToolBar(parentWindow,Qt::DockRight,false) { +AlignToolBar::AlignToolBar(TQMainWindow* tqparentWindow, const char* ) + : KToolBar(tqparentWindow,TQt::DockRight,false) { // load images for the buttons loadPixmaps(); @@ -41,10 +41,10 @@ AlignToolBar::AlignToolBar(TQMainWindow* parentWindow, const char* ) insertButton(m_Pixmaps[alac_align_right], alac_align_right, true, i18n("Align Right")); insertButton(m_Pixmaps[alac_align_top], alac_align_top, true, i18n("Align Top")); insertButton(m_Pixmaps[alac_align_bottom], alac_align_bottom, true, i18n("Align Bottom")); - insertButton(m_Pixmaps[alac_align_vertical_middle], alac_align_vertical_middle, true, i18n("Align Vertical Middle")); - insertButton(m_Pixmaps[alac_align_horizontal_middle], alac_align_horizontal_middle, true, i18n("Align Horizontal Middle")); - insertButton(m_Pixmaps[alac_align_vertical_distribute], alac_align_vertical_distribute, true, i18n("Align Vertical Distribute")); - insertButton(m_Pixmaps[alac_align_horizontal_distribute], alac_align_horizontal_distribute, true, i18n("Align Horizontal Distribute")); + insertButton(m_Pixmaps[alac_align_vertical_middle], alac_align_vertical_middle, true, i18n("AlignQt::Vertical Middle")); + insertButton(m_Pixmaps[alac_align_horizontal_middle], alac_align_horizontal_middle, true, i18n("AlignQt::Horizontal Middle")); + insertButton(m_Pixmaps[alac_align_vertical_distribute], alac_align_vertical_distribute, true, i18n("AlignQt::Vertical Distribute")); + insertButton(m_Pixmaps[alac_align_horizontal_distribute], alac_align_horizontal_distribute, true, i18n("AlignQt::Horizontal Distribute")); setOrientation( Qt::Vertical ); setVerticalStretchable( true ); @@ -335,7 +335,7 @@ void AlignToolBar::slotButtonChanged(int btn) { // at least 2 widgets must be selected if (widgetList.count() > 1) { - // now perform alignment according to the clicked button + // now perform tqalignment according to the clicked button switch (btn) { case alac_align_left: alignLeft(widgetList); @@ -380,7 +380,7 @@ void AlignToolBar::slotButtonChanged(int btn) { UMLApp::app()->getDocument()->setModified(); } else { KMessageBox::messageBox(0, KMessageBox::Information, - i18n("For alignment you have to select at least 2 objects like classes or actors. You can not align associations."), + i18n("For tqalignment you have to select at least 2 objects like classes or actors. You can not align associations."), i18n("Information"), i18n("&OK"), TQString(""), "showAlignInformation"); } // if (widgetList.count() > 1) diff --git a/umbrello/umbrello/aligntoolbar.h b/umbrello/umbrello/aligntoolbar.h index bfc94d16..297b0a8a 100644 --- a/umbrello/umbrello/aligntoolbar.h +++ b/umbrello/umbrello/aligntoolbar.h @@ -21,24 +21,25 @@ class TQMainWindow; class UMLWidget; /** - * This toolbar provides tools for alignment. Widgets can only be aligned, when + * This toolbar provides tools for tqalignment. Widgets can only be aligned, when * there are at least 2 widgets (not associations) are selected * - * @short Toolbar providing alignment tools. + * @short Toolbar providing tqalignment tools. * @author Sebastian Stein <seb.kde@hpfsc.de> * Bugs and comments to uml-devel@lists.sf.net or http://bugs.kde.org */ class AlignToolBar : public KToolBar { Q_OBJECT + TQ_OBJECT public: /** - * Creates a bar with tools for alignment. + * Creates a bar with tools for tqalignment. * - * @param parentWindow The parent of the toolbar. + * @param tqparentWindow The tqparent of the toolbar. * @param name The name of the toolbar. */ - AlignToolBar(TQMainWindow* parentWindow, const char* name); + AlignToolBar(TQMainWindow* tqparentWindow, const char* name); /** * Standard deconstructor. @@ -214,7 +215,7 @@ private: private slots: /** - * Performs the alignment when a button was clicked. + * Performs the tqalignment when a button was clicked. * * @param btn The clicked button. */ diff --git a/umbrello/umbrello/artifact.h b/umbrello/umbrello/artifact.h index d5087545..98a3fb71 100644 --- a/umbrello/umbrello/artifact.h +++ b/umbrello/umbrello/artifact.h @@ -28,6 +28,7 @@ */ class UMLArtifact : public UMLCanvasObject { Q_OBJECT + TQ_OBJECT public: /** diff --git a/umbrello/umbrello/artifactwidget.cpp b/umbrello/umbrello/artifactwidget.cpp index 7356f260..118fc76a 100644 --- a/umbrello/umbrello/artifactwidget.cpp +++ b/umbrello/umbrello/artifactwidget.cpp @@ -48,12 +48,12 @@ void ArtifactWidget::drawAsNormal(TQPainter& p, int offsetX, int offsetY) { p.drawRect(offsetX, offsetY, w, h); - p.setPen( TQPen(Qt::black) ); + p.setPen( TQPen(TQt::black) ); p.setFont(font); if (!stereotype.isEmpty()) { p.drawText(offsetX + ARTIFACT_MARGIN, offsetY + (h/2) - fontHeight, - w, fontHeight, Qt::AlignCenter, m_pObject->getStereotype(true)); + w, fontHeight, TQt::AlignCenter, m_pObject->getStereotype(true)); } int lines; @@ -65,10 +65,10 @@ void ArtifactWidget::drawAsNormal(TQPainter& p, int offsetX, int offsetY) { if (lines == 1) { p.drawText(offsetX, offsetY + (h/2) - (fontHeight/2), - w, fontHeight, Qt::AlignCenter, name); + w, fontHeight, TQt::AlignCenter, name); } else { p.drawText(offsetX, offsetY + (h/2), - w, fontHeight, Qt::AlignCenter, name); + w, fontHeight, TQt::AlignCenter, name); } if(m_bSelected) { @@ -98,11 +98,11 @@ void ArtifactWidget::drawAsFile(TQPainter& p, int offsetX, int offsetY) { p.drawLine(startX + 40, offsetY + 10, startX + 50, offsetY + 10); p.drawLine(startX + 40, offsetY, startX + 50, offsetY + 10); - p.setPen( TQPen(Qt::black) ); + p.setPen( TQPen(TQt::black) ); p.setFont(font); p.drawText(offsetX, offsetY + h - fontHeight, - w, fontHeight, Qt::AlignCenter, name); + w, fontHeight, TQt::AlignCenter, name); if(m_bSelected) { drawSelected(&p, offsetX, offsetY); @@ -132,11 +132,11 @@ void ArtifactWidget::drawAsLibrary(TQPainter& p, int offsetX, int offsetY) { p.drawLine(startX + 40, offsetY + 10, startX + 50, offsetY + 10); p.drawLine(startX + 40, offsetY, startX + 50, offsetY + 10); - p.setPen( TQPen(Qt::black) ); + p.setPen( TQPen(TQt::black) ); p.setFont(font); p.drawText(offsetX, offsetY + h - fontHeight, - w, fontHeight, Qt::AlignCenter, name); + w, fontHeight, TQt::AlignCenter, name); if(m_bSelected) { drawSelected(&p, offsetX, offsetY); @@ -168,11 +168,11 @@ void ArtifactWidget::drawAsTable(TQPainter& p, int offsetX, int offsetY) { p.drawLine(startX + 10, offsetY, startX + 10, offsetY + iconHeight); p.drawLine(startX, offsetY + (iconHeight/4), startX + 50, offsetY + (iconHeight/4)); - p.setPen( TQPen(Qt::black) ); + p.setPen( TQPen(TQt::black) ); p.setFont(font); p.drawText(offsetX, offsetY + h - fontHeight, - w, fontHeight, Qt::AlignCenter, name); + w, fontHeight, TQt::AlignCenter, name); if(m_bSelected) { drawSelected(&p, offsetX, offsetY); diff --git a/umbrello/umbrello/artifactwidget.h b/umbrello/umbrello/artifactwidget.h index 3fdd26c2..68ca425a 100644 --- a/umbrello/umbrello/artifactwidget.h +++ b/umbrello/umbrello/artifactwidget.h @@ -35,7 +35,7 @@ public: /** * Constructs a ArtifactWidget. * - * @param view The parent of this ArtifactWidget. + * @param view The tqparent of this ArtifactWidget. * @param a The Artifact this widget will be representing. */ ArtifactWidget(UMLView *view, UMLArtifact *a); @@ -52,7 +52,7 @@ public: /** * Saves the widget to the "artifactwidget" XMI element. - * Note: For loading from XMI, the inherited parent method is used. + * Note: For loading from XMI, the inherited tqparent method is used. */ void saveToXMI(TQDomDocument& qDoc, TQDomElement& qElement); diff --git a/umbrello/umbrello/association.cpp b/umbrello/umbrello/association.cpp index 62f47a43..a4c9d9d5 100644 --- a/umbrello/umbrello/association.cpp +++ b/umbrello/umbrello/association.cpp @@ -164,7 +164,7 @@ void UMLAssociation::saveToXMI( TQDomDocument & qDoc, TQDomElement & qElement ) TQDomElement assocElement = UMLObject::save("UML:Generalization", qDoc); assocElement.setAttribute( "discriminator", "" ); assocElement.setAttribute( "child", ID2STR(getObjectId(A)) ); - assocElement.setAttribute( "parent", ID2STR(getObjectId(B)) ); + assocElement.setAttribute( "tqparent", ID2STR(getObjectId(B)) ); qElement.appendChild( assocElement ); return; } @@ -201,7 +201,7 @@ bool UMLAssociation::load( TQDomElement & element ) { m_AssocType == Uml::at_Dependency) { for (unsigned r = Uml::A; r <= Uml::B; r++) { const TQString fetch = (m_AssocType == Uml::at_Generalization ? - r == Uml::A ? "child" : "parent" + r == Uml::A ? "child" : "tqparent" : r == Uml::A ? "client" : "supplier"); TQString roleIdStr = element.attribute(fetch, ""); if (roleIdStr.isEmpty()) { @@ -235,7 +235,7 @@ bool UMLAssociation::load( TQDomElement & element ) { continue; // Permitted tag names: // roleA: "child" "subtype" "client" - // roleB: "parent" "supertype" "supplier" + // roleB: "tqparent" "supertype" "supplier" TQString idStr = tempElement.attribute( "xmi.id", "" ); if (idStr.isEmpty()) idStr = tempElement.attribute( "xmi.idref", "" ); @@ -335,7 +335,7 @@ bool UMLAssociation::load( TQDomElement & element ) { // In the old days, we could just record this on the association, // and be done with it. But thats not how the UML13.dtd does things. // As a result, we are checking roleA for information about the - // parent association (!) which by this point in the parse, should + // tqparent association (!) which by this point in the parse, should // be set. However, the information that the roles are allowed to have // is not complete, so we need to finish the analysis here. diff --git a/umbrello/umbrello/association.h b/umbrello/umbrello/association.h index 01fb357e..f3cb5a6f 100644 --- a/umbrello/umbrello/association.h +++ b/umbrello/umbrello/association.h @@ -31,6 +31,7 @@ class UMLRole; class UMLAssociation : public UMLObject { Q_OBJECT + TQ_OBJECT friend class AssociationWidget; public: /** @@ -257,7 +258,7 @@ protected: */ bool load(TQDomElement& element); - // keep track of number of parent widgets + // keep track of number of tqparent widgets int nrof_parent_widgets; /** diff --git a/umbrello/umbrello/associationwidget.cpp b/umbrello/umbrello/associationwidget.cpp index 825308a9..a385f7da 100644 --- a/umbrello/umbrello/associationwidget.cpp +++ b/umbrello/umbrello/associationwidget.cpp @@ -771,11 +771,11 @@ void AssociationWidget::setUMLAssociation (UMLAssociation * assoc) if (assoc && umla == assoc) return; - //umla->disconnect(this); //Qt does disconnect automatically upon destruction. + //umla->disconnect(this); //TQt does disconnect automatically upon destruction. umla->nrof_parent_widgets--; // we are the last "owner" of this association, so delete it - // from the parent UMLDoc, and as a stand-alone + // from the tqparent UMLDoc, and as a stand-alone //DISCUSS: Should we really do this? // It implies that an association's existence is ONLY // governed by its existence on at least one diagram. @@ -785,19 +785,19 @@ void AssociationWidget::setUMLAssociation (UMLAssociation * assoc) // relies on (at least the way it's implemented now) // ANSWER: yes, we *should* do this. // This only implies that IF an association once 'belonged' - // to one or more parent associationwidgets, then it must 'die' when the - // last widget does. UMLAssociations which never had a parent + // to one or more tqparent associationwidgets, then it must 'die' when the + // last widget does. UMLAssociations which never had a tqparent // in the first place wont be affected by this code, and can happily - // live on without a parent. + // live on without a tqparent. //DISCUSS: Sorry Brian, but this breaks cut/paste. // In particular, cut/paste means that the UMLAssociation _does_ - // have the assocwidget parent - the only means of doing a cut/paste + // have the assocwidget tqparent - the only means of doing a cut/paste // on the diagram is via the widgets. I.e. in practice there is no // such thing as an "orphan" UMLAssociation. - // BTW, IMHO the concept of a widget being the parent of a UML object + // BTW, IMHO the concept of a widget being the tqparent of a UML object // is fundamentally flawed. Widgets are pure presentation - they can // come and go at a whim. If at all, the widgets could be considered - // children of the corresponding UML object. + // tqchildren of the corresponding UML object. // // ANSWER: This is the wrong treatment of cut and paste. Associations that // are being cut/n pasted should be serialized to XMI, then reconstituted @@ -826,7 +826,7 @@ void AssociationWidget::setUMLAssociation (UMLAssociation * assoc) /** Returns true if the Widget is either at the starting or ending side of the association */ -bool AssociationWidget::contains(UMLWidget* widget) { +bool AssociationWidget::tqcontains(UMLWidget* widget) { return (widget == m_role[A].m_pWidget || widget == m_role[B].m_pWidget); } @@ -1896,7 +1896,7 @@ void AssociationWidget::constrainTextPos(int &textX, int &textY, double r = sqrt((x1 - x0) * (x1 - x0) + (y1 - y0) * (y1 - y0)) / 2; if (textWidth > r) r = textWidth; - // swap textCenter{X,Y} to convert from Qt coord.system. + // swap textCenter{X,Y} to convert from TQt coord.system. const TQPoint origTextCenter(textCenterY, textCenterX); const int relX = abs(origTextCenter.x() - midP.x()); const int relY = abs(origTextCenter.y() - midP.y()); @@ -1907,8 +1907,8 @@ void AssociationWidget::constrainTextPos(int &textX, int &textY, /* The original constraint was to snap the text position to the midpoint but that creates unpleasant visual jitter: - textX = midP.y() - textWidth / 2; // go back to Qt coord.sys. - textY = midP.x() - textHeight / 2; // go back to Qt coord.sys. + textX = midP.y() - textWidth / 2; // go back to TQt coord.sys. + textY = midP.x() - textHeight / 2; // go back to TQt coord.sys. Rather, we project the text position onto the closest point on the circle: @@ -1938,9 +1938,9 @@ void AssociationWidget::constrainTextPos(int &textX, int &textY, // Handle the special case, relX = 0. if (relX == 0) { if (origTextCenter.y() > midP.y()) - textX = midP.y() + (int)r; // go back to Qt coord.sys. + textX = midP.y() + (int)r; // go back to TQt coord.sys. else - textX = midP.y() - (int)r; // go back to Qt coord.sys. + textX = midP.y() - (int)r; // go back to TQt coord.sys. textX -= textWidth / 2; return; } @@ -1948,14 +1948,14 @@ void AssociationWidget::constrainTextPos(int &textX, int &textY, const double x = sqrt(r*r / (a*a + 1)); const double y = a * x; if (origTextCenter.x() > midP.x()) - textY = midP.x() + (int)x; // go back to Qt coord.sys. + textY = midP.x() + (int)x; // go back to TQt coord.sys. else - textY = midP.x() - (int)x; // go back to Qt coord.sys. + textY = midP.x() - (int)x; // go back to TQt coord.sys. textY -= textHeight / 2; if (origTextCenter.y() > midP.y()) - textX = midP.y() + (int)y; // go back to Qt coord.sys. + textX = midP.y() + (int)y; // go back to TQt coord.sys. else - textX = midP.y() - (int)y; // go back to Qt coord.sys. + textX = midP.y() - (int)y; // go back to TQt coord.sys. textX -= textWidth / 2; } @@ -2099,9 +2099,9 @@ void AssociationWidget::createAssocClassLine() { if (m_pAssocClassLine == NULL) m_pAssocClassLine = new TQCanvasLine(m_pView->canvas()); computeAssocClassLine(); - TQPen pen(getLineColor(), getLineWidth(), Qt::DashLine); + TQPen pen(getLineColor(), getLineWidth(), TQt::DashLine); m_pAssocClassLine->setPen(pen); - m_pAssocClassLine->setVisible(true); + m_pAssocClassLine->tqsetVisible(true); } void AssociationWidget::createAssocClassLine(ClassifierWidget* classifier, @@ -2181,7 +2181,7 @@ void AssociationWidget::mousePressEvent(TQMouseEvent * me) { // See if the user has clicked on a point to start moving the line segment // from that point checkPoints(mep); - if( me -> state() != Qt::ShiftButton ) + if( me -> state() != TQt::ShiftButton ) m_pView -> clearSelected(); setSelected( !m_bSelected ); } @@ -2629,7 +2629,7 @@ TQPoint AssociationWidget::findIntercept(const TQRect &rect, const TQPoint &poin default: break; } - // The Qt coordinate system has (0,0) in the top left corner. + // The TQt coordinate system has (0,0) in the top left corner. // In order to go to the regular XY coordinate system with (0,0) // in the bottom left corner, we swap the X and Y axis. // That's why the following assignments look twisted. @@ -2699,7 +2699,7 @@ int AssociationWidget::findInterceptOnEdge(const TQRect &rect, AssociationWidget::Region region, const TQPoint &point) { - // The Qt coordinate system has (0,0) in the top left corner. + // The TQt coordinate system has (0,0) in the top left corner. // In order to go to the regular XY coordinate system with (0,0) // in the bottom left corner, we swap the X and Y axis. // That's why the following assignments look twisted. @@ -2730,7 +2730,7 @@ int AssociationWidget::findInterceptOnEdge(const TQRect &rect, if (region == North || region == South) { if (dX == 0) return rectMidY; - // should be rectMidX, but we go back to Qt coord.sys. + // should be rectMidX, but we go back to TQt coord.sys. if (dY == 0) { kError() << "AssociationWidget::findInterceptOnEdge usage error: " << "North/South (dY == 0)" << endl; @@ -2743,11 +2743,11 @@ int AssociationWidget::findInterceptOnEdge(const TQRect &rect, else relativeX = -(float)rectHalfHeight / m; return (rectMidY + (int)relativeX); - // should be rectMidX, but we go back to Qt coord.sys. + // should be rectMidX, but we go back to TQt coord.sys. } else { if (dY == 0) return rectMidX; - // should be rectMidY, but we go back to Qt coord.sys. + // should be rectMidY, but we go back to TQt coord.sys. if (dX == 0) { kError() << "AssociationWidget::findInterceptOnEdge usage error: " << "East/West (dX == 0)" << endl; @@ -2758,7 +2758,7 @@ int AssociationWidget::findInterceptOnEdge(const TQRect &rect, if (region == West) relativeY = -relativeY; return (rectMidX + (int)relativeY); - // should be rectMidY, but we go back to Qt coord.sys. + // should be rectMidY, but we go back to TQt coord.sys. } } @@ -3121,14 +3121,14 @@ void AssociationWidget::setUMLObject(UMLObject *obj) { setOperation(dynamic_cast<UMLOperation *>(obj)); break; case Uml::ot_Attribute: - klass = static_cast<UMLClassifier*>(obj->parent()); + klass = static_cast<UMLClassifier*>(obj->tqparent()); connect(klass, TQT_SIGNAL(attributeRemoved(UMLClassifierListItem*)), this, TQT_SLOT(slotAttributeRemoved(UMLClassifierListItem*))); attr = static_cast<UMLAttribute*>(obj); connect(attr, TQT_SIGNAL(attributeChanged()), this, TQT_SLOT(slotAttributeChanged())); break; case Uml::ot_EntityAttribute: - ent = static_cast<UMLEntity*>(obj->parent()); + ent = static_cast<UMLEntity*>(obj->tqparent()); connect(ent, TQT_SIGNAL(entityAttributeRemoved(UMLClassifierListItem*)), this, TQT_SLOT(slotAttributeRemoved(UMLClassifierListItem*))); break; diff --git a/umbrello/umbrello/associationwidget.h b/umbrello/umbrello/associationwidget.h index f562983c..0227274d 100644 --- a/umbrello/umbrello/associationwidget.h +++ b/umbrello/umbrello/associationwidget.h @@ -54,6 +54,7 @@ class UMLOperation; */ class AssociationWidget : public WidgetBase, public LinkWidget { Q_OBJECT + TQ_OBJECT public: /** * Enumeration used for stating where a line is on a widget. @@ -68,14 +69,14 @@ public: /** * Constructor. * - * @param view The parent view of this widget. + * @param view The tqparent view of this widget. */ AssociationWidget(UMLView *view); /** * Constructor. * - * @param view The parent view of this widget. + * @param view The tqparent view of this widget. * @param WidgetA Pointer to the role A widget for the association. * @param Type The Association_Type for this association. * @param WidgetB Pointer to the role B widget for the association. @@ -243,7 +244,7 @@ public: * * @return True if widget plays role A or B in this assoc. */ - bool contains(UMLWidget* widget); + bool tqcontains(UMLWidget* widget); /** * Returns true if this AssociationWidget represents a collaboration message. @@ -1011,7 +1012,7 @@ public slots: /** * This slot is entered when an event has occurred on the views display, * most likely a mouse event. Before it sends out that mouse event all - * children should make sure that they don't have a menu active or there + * tqchildren should make sure that they don't have a menu active or there * could be more than one popup menu displayed. */ void slotRemovePopupMenu(); diff --git a/umbrello/umbrello/attribute.cpp b/umbrello/umbrello/attribute.cpp index 9266c1f4..fa71c865 100644 --- a/umbrello/umbrello/attribute.cpp +++ b/umbrello/umbrello/attribute.cpp @@ -23,11 +23,11 @@ #include "dialogs/umlattributedialog.h" #include "object_factory.h" -UMLAttribute::UMLAttribute( const UMLObject *parent, +UMLAttribute::UMLAttribute( const UMLObject *tqparent, const TQString& name, Uml::IDType id, Uml::Visibility s, UMLObject *type, const TQString& iv ) - : UMLClassifierListItem(parent, name, id) { + : UMLClassifierListItem(tqparent, name, id) { m_InitialValue = iv; m_BaseType = Uml::ot_Attribute; m_Vis = s; @@ -40,7 +40,7 @@ UMLAttribute::UMLAttribute( const UMLObject *parent, m_pSecondary = type; } -UMLAttribute::UMLAttribute(const UMLObject *parent) : UMLClassifierListItem(parent) { +UMLAttribute::UMLAttribute(const UMLObject *tqparent) : UMLClassifierListItem(tqparent) { m_BaseType = Uml::ot_Attribute; m_Vis = Uml::Visibility::Private; m_ParmKind = Uml::pd_In; @@ -88,15 +88,15 @@ TQString UMLAttribute::toString(Uml::Signature_Type sig) { if(sig == Uml::st_ShowSig || sig == Uml::st_SigNoVis) { // Determine whether the type name needs to be scoped. - UMLObject *owningObject = static_cast<UMLObject*>(parent()); + UMLObject *owningObject = static_cast<UMLObject*>(tqparent()); if (owningObject->getBaseType() == Uml::ot_Operation) { - // The immediate parent() is the UMLOperation but we want + // The immediate tqparent() is the UMLOperation but we want // the UMLClassifier: - owningObject = static_cast<UMLObject*>(owningObject->parent()); + owningObject = static_cast<UMLObject*>(owningObject->tqparent()); } UMLClassifier *ownParent = dynamic_cast<UMLClassifier*>(owningObject); if (ownParent == NULL) { - kError() << "UMLAttribute::toString: parent " + kError() << "UMLAttribute::toString: tqparent " << owningObject->getName() << " is not a UMLClassifier" << endl; return ""; @@ -129,15 +129,15 @@ TQString UMLAttribute::toString(Uml::Signature_Type sig) { TQString UMLAttribute::getFullyQualifiedName( const TQString& separator, bool includeRoot /* = false */) const { UMLOperation *op = NULL; - UMLObject *owningObject = static_cast<UMLObject*>(parent()); + UMLObject *owningObject = static_cast<UMLObject*>(tqparent()); if (owningObject->getBaseType() == Uml::ot_Operation) { op = static_cast<UMLOperation*>(owningObject); - owningObject = static_cast<UMLObject*>(owningObject->parent()); + owningObject = static_cast<UMLObject*>(owningObject->tqparent()); } UMLClassifier *ownParent = dynamic_cast<UMLClassifier*>(owningObject); if (ownParent == NULL) { kError() << "UMLAttribute::getFullyQualifiedName(" << m_Name - << "): parent " << owningObject->getName() + << "): tqparent " << owningObject->getName() << " is not a UMLClassifier" << endl; return ""; } @@ -168,7 +168,7 @@ bool UMLAttribute::operator==( UMLAttribute &rhs) { void UMLAttribute::copyInto(UMLAttribute *rhs) const { - // call the parent first. + // call the tqparent first. UMLClassifierListItem::copyInto(rhs); // Copy all datamembers @@ -180,8 +180,8 @@ void UMLAttribute::copyInto(UMLAttribute *rhs) const UMLObject* UMLAttribute::clone() const { - //FIXME: The new attribute should be slaved to the NEW parent not the old. - UMLAttribute *clone = new UMLAttribute( static_cast<UMLObject*>(parent()) ); + //FIXME: The new attribute should be slaved to the NEW tqparent not the old. + UMLAttribute *clone = new UMLAttribute( static_cast<UMLObject*>(tqparent()) ); copyInto(clone); return clone; @@ -249,8 +249,8 @@ bool UMLAttribute::load( TQDomElement & element ) { return true; } -bool UMLAttribute::showPropertiesDialog(TQWidget* parent) { - UMLAttributeDialog dialog(parent, this); +bool UMLAttribute::showPropertiesDialog(TQWidget* tqparent) { + UMLAttributeDialog dialog(tqparent, this); return dialog.exec(); } @@ -260,7 +260,7 @@ void UMLAttribute::setTemplateParams(const TQString& templateParam, UMLClassifie return; TQString type = templateParam.simplifyWhiteSpace(); - int start = type.find(TQChar('<')); + int start = type.tqfind(TQChar('<')); if (start >= 0 ) { int end = start; int count = 1; @@ -294,7 +294,7 @@ void UMLAttribute::setTemplateParams(const TQString& templateParam, UMLClassifie //We want to list only the params that already exist in this document //If the param doesnt't already exist, we couldn't draw an association anyway UMLClassifier* tmpClassifier = static_cast<UMLClassifier*>(obj); - if (templateParamList.findRef(tmpClassifier) == -1) { + if (templateParamList.tqfindRef(tmpClassifier) == -1) { templateParamList.append(tmpClassifier); } } @@ -311,9 +311,9 @@ UMLClassifierList UMLAttribute::getTemplateParams() { // Handle C++/D/Java template/generic parameters const Uml::Programming_Language pl = UMLApp::app()->getActiveLanguage(); if (pl == Uml::pl_Cpp || pl == Uml::pl_Java || pl == Uml::pl_D) { - int start = type.find(TQChar('<')); + int start = type.tqfind(TQChar('<')); if (start >= 0 ) { - int end = type.findRev(TQChar('>')); + int end = type.tqfindRev(TQChar('>')); if (end > start) { templateParam = type.mid(start + 1, end - start - 1); setTemplateParams(templateParam, templateParamList); diff --git a/umbrello/umbrello/attribute.h b/umbrello/umbrello/attribute.h index 7749b3e4..ab904874 100644 --- a/umbrello/umbrello/attribute.h +++ b/umbrello/umbrello/attribute.h @@ -27,18 +27,19 @@ */ class UMLAttribute : public UMLClassifierListItem { Q_OBJECT + TQ_OBJECT public: /** * Sets up an attribute. * - * @param parent The parent of this UMLAttribute. + * @param tqparent The tqparent of this UMLAttribute. * @param name The name of this UMLAttribute. * @param id The unique id given to this UMLAttribute. * @param s The visibility of the UMLAttribute. * @param type The type of this UMLAttribute. * @param iv The initial value of the attribute. */ - UMLAttribute(const UMLObject *parent, const TQString& name, + UMLAttribute(const UMLObject *tqparent, const TQString& name, Uml::IDType id = Uml::id_None, Uml::Visibility s = Uml::Visibility::Private, UMLObject *type = 0, const TQString& iv = 0); @@ -46,9 +47,9 @@ public: /** * Sets up an attribute. * - * @param parent The parent of this UMLAttribute. + * @param tqparent The tqparent of this UMLAttribute. */ - UMLAttribute(const UMLObject *parent); + UMLAttribute(const UMLObject *tqparent); /** * Overloaded '==' operator @@ -109,7 +110,7 @@ public: /** * Reimplement method from UMLObject. */ - TQString getFullyQualifiedName(const TQString& separator = TQString::null, + TQString getFullyQualifiedName(const TQString& separator = TQString(), bool includeRoot = false) const; /** @@ -120,7 +121,7 @@ public: /** * Display the properties configuration dialog for the attribute. */ - virtual bool showPropertiesDialog(TQWidget* parent); + virtual bool showPropertiesDialog(TQWidget* tqparent); void setParmKind (Uml::Parameter_Direction pk); Uml::Parameter_Direction getParmKind () const; diff --git a/umbrello/umbrello/autolayout/_graph.h b/umbrello/umbrello/autolayout/_graph.h index 179a9471..b3c42f30 100644 --- a/umbrello/umbrello/autolayout/_graph.h +++ b/umbrello/umbrello/autolayout/_graph.h @@ -15,7 +15,7 @@ #ifndef AUTOLAYOUTGRAPH_H #define AUTOLAYOUTGRAPH_H #include "baseinclude.h" -namespace Autolayout { +namespace Autotqlayout { /** @author Dimitri Ognibene <ognibened @yahoo.it> diff --git a/umbrello/umbrello/autolayout/autolayout.h b/umbrello/umbrello/autolayout/autolayout.h index 9f34a1d8..fecb2c6f 100644 --- a/umbrello/umbrello/autolayout/autolayout.h +++ b/umbrello/umbrello/autolayout/autolayout.h @@ -31,12 +31,12 @@ -#include "autolayouter.h" -#include "autolayouteradapter.h" -#include "graphvizautolayouter.h" -#include "dotautolayouter.h" -#include "circoautolayouter.h" -#include "neatoautolayouter.h" +#include "autotqlayouter.h" +#include "autotqlayouteradapter.h" +#include "graphvizautotqlayouter.h" +#include "dotautotqlayouter.h" +#include "circoautotqlayouter.h" +#include "neatoautotqlayouter.h" diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.cpp b/umbrello/umbrello/autolayout/autolayoutdlg.cpp index 894dddbc..61bf16b6 100644 --- a/umbrello/umbrello/autolayout/autolayoutdlg.cpp +++ b/umbrello/umbrello/autolayout/autolayoutdlg.cpp @@ -9,100 +9,100 @@ * * ***************************************************************************/ -#include "autolayoutdlg.h" +#include "autotqlayoutdlg.h" #include "../associationwidget.h" #include "../umlwidget.h" -#include "autolayout.h" -#include "newautolayoutdialog.h" +#include "autotqlayout.h" +#include "newautotqlayoutdialog.h" #include <tqcheckbox.h> #include <tqspinbox.h> #include <tqslider.h> #include <kdebug.h> -AutolayoutDlg::AutolayoutDlg(KConfig* c,UMLView* v,TQWidget *parent, const char *name) - :MyDialog1(parent, name) +AutotqlayoutDlg::AutotqlayoutDlg(KConfig* c,UMLView* v,TQWidget *tqparent, const char *name) + :MyDialog1(tqparent, name) { view=v; readConfig(c); config=c; } -void AutolayoutDlg::slotSetAssociationWeight(int i) +void AutotqlayoutDlg::slotSetAssociationWeight(int i) { associationWeight=i; } -void AutolayoutDlg::slotSetDependenciesWeight(int i) +void AutotqlayoutDlg::slotSetDependenciesWeight(int i) { dependenciesWeight=i; } -void AutolayoutDlg::slotSetGeneralizationWeight(int i) +void AutotqlayoutDlg::slotSetGeneralizationWeight(int i) { generalizationWeight=i; } -void AutolayoutDlg::slotSetGenralizationAsEdges(bool b) +void AutotqlayoutDlg::slotSetGenralizationAsEdges(bool b) { genralizationAsEdges=b; } -void AutolayoutDlg::slotSetDependenciesAsEdges(bool b) +void AutotqlayoutDlg::slotSetDependenciesAsEdges(bool b) { dependenciesAsEdges=b; } -void AutolayoutDlg::slotSetAssociationAsEdges(bool b) +void AutotqlayoutDlg::slotSetAssociationAsEdges(bool b) { associationAsEdges=b; } -void AutolayoutDlg::slotSetCompressShapes(bool b) +void AutotqlayoutDlg::slotSetCompressShapes(bool b) { compressShapes=b; } -void AutolayoutDlg::slotSetCenterDiagram(bool b) +void AutotqlayoutDlg::slotSetCenterDiagram(bool b) { centerDiagram=b; } -void AutolayoutDlg::slotSetClusterizeHierarchies(bool b) +void AutotqlayoutDlg::slotSetClusterizeHierarchies(bool b) { clusterizeHierarchies=b; } -void AutolayoutDlg::slotSetShapeSeparation(int i) +void AutotqlayoutDlg::slotSetShapeSeparation(int i) { - shapeSeparation=i; + tqshapeSeparation=i; } -void AutolayoutDlg::slotReloadSettings() +void AutotqlayoutDlg::slotReloadSettings() { readConfig(config); } -void AutolayoutDlg::slotSaveSettings() +void AutotqlayoutDlg::slotSaveSettings() { writeConfig(config); } -void AutolayoutDlg::slotDoAutolayout() +void AutotqlayoutDlg::slotDoAutotqlayout() { - Autolayout::Autolayouter* a=getAutolayouter();; + Autotqlayout::Autotqlayouter* a=getAutotqlayouter();; a->setAssociationAsEdges( associationAsEdges); a->setAssociationWeight( associationWeight ); @@ -115,16 +115,16 @@ void AutolayoutDlg::slotDoAutolayout() a->setGeneralizationWeight( generalizationWeight); a->setNoteConnectionWeight( 1); a->setNoteConnectionsAsEdges(true); - a->setShapeSeparation( shapeSeparation); - a->autolayout( view); + a->setShapeSeparation( tqshapeSeparation); + a->autotqlayout( view); delete a; a=0; accept(); } -void AutolayoutDlg::readConfig( KConfig * conf) +void AutotqlayoutDlg::readConfig( KConfig * conf) { - conf->setGroup("AutolayoutDlg"); + conf->setGroup("AutotqlayoutDlg"); associationEdgesCB->setChecked((bool)(conf->readBoolEntry( "associationAsEdges",false))); centerDiagramCB->setChecked((bool)(conf->readBoolEntry( "centerDiagram",true))); dependenciesEdgesCB->setChecked((bool)(conf->readBoolEntry( "dependenciesAsEdges",false))); @@ -134,14 +134,14 @@ void AutolayoutDlg::readConfig( KConfig * conf) generalizationCB->setChecked((bool)(conf->readBoolEntry( "genralizationAsEdges",true))); generalizationEdgessSL->setValue((int)(conf->readNumEntry( "generalizationWeight",1))); associationEdgesSL->setValue((int)(conf->readNumEntry( "associationWeight",0))); - shapeSeparationSB->setValue((int)(conf->readNumEntry( "shapeSeparation",0))); + tqshapeSeparationSB->setValue((int)(conf->readNumEntry( "tqshapeSeparation",0))); algorithmCOB->setCurrentItem((int)(conf->readNumEntry( "algorithm",0))); } -void AutolayoutDlg::writeConfig( KConfig * conf) +void AutotqlayoutDlg::writeConfig( KConfig * conf) { // conf=kapp->config(); - conf->setGroup("AutolayoutDlg"); + conf->setGroup("AutotqlayoutDlg"); conf->writeEntry( "associationAsEdges",associationEdgesCB->isChecked()); conf->writeEntry( "centerDiagram", centerDiagramCB->isChecked()); conf->writeEntry("dependenciesAsEdges",dependenciesEdgesCB->isChecked()); @@ -151,7 +151,7 @@ void AutolayoutDlg::writeConfig( KConfig * conf) conf->writeEntry("generalizationWeight",generalizationEdgessSL->value()); conf->writeEntry("associationWeight",associationEdgesSL->value()); - conf->writeEntry("shapeSeparation",shapeSeparationSB->value()); + conf->writeEntry("tqshapeSeparation",tqshapeSeparationSB->value()); //conf->writeEntry("al @@ -159,26 +159,26 @@ void AutolayoutDlg::writeConfig( KConfig * conf) } -void AutolayoutDlg::slotSelectAlgorithm( const TQString& _algname) +void AutotqlayoutDlg::slotSelectAlgorithm( const TQString& _algname) { algname=_algname; } -Autolayout::Autolayouter * AutolayoutDlg::getAutolayouter( ) +Autotqlayout::Autotqlayouter * AutotqlayoutDlg::getAutotqlayouter( ) { const TQString text = algorithmCOB->currentText(); - kDebug() << "Autolayout Algorithm " << algname << " found " << text << endl; + kDebug() << "Autotqlayout Algorithm " << algname << " found " << text << endl; if (text == "dot") - return new Autolayout::DotAutolayouter(); + return new Autotqlayout::DotAutotqlayouter(); if (text == "circo") - return new Autolayout::CircoAutolayouter(); + return new Autotqlayout::CircoAutotqlayouter(); if (text == "neato") - return new Autolayout::NeatoAutolayouter(); - kError() << "Autolayout Algorithm not found" << endl; - return new Autolayout::DotAutolayouter(); + return new Autotqlayout::NeatoAutotqlayouter(); + kError() << "Autotqlayout Algorithm not found" << endl; + return new Autotqlayout::DotAutotqlayouter(); } -#include "autolayoutdlg.moc" +#include "autotqlayoutdlg.moc" diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.h b/umbrello/umbrello/autolayout/autolayoutdlg.h index 126c4a08..a664a7b7 100644 --- a/umbrello/umbrello/autolayout/autolayoutdlg.h +++ b/umbrello/umbrello/autolayout/autolayoutdlg.h @@ -12,17 +12,18 @@ #ifndef AUTOLAYOUTDLG_H #define AUTOLAYOUTDLG_H -#include "newautolayoutdialog.h" +#include "newautotqlayoutdialog.h" #include "../umlview.h" #include <tqobject.h> #include <kconfig.h> -#include "autolayout.h" +#include "autotqlayout.h" -class AutolayoutDlg : public MyDialog1 +class AutotqlayoutDlg : public MyDialog1 { Q_OBJECT + TQ_OBJECT public: - AutolayoutDlg(KConfig* c,UMLView* v, TQWidget *parent = 0, const char *name = 0); + AutotqlayoutDlg(KConfig* c,UMLView* v, TQWidget *tqparent = 0, const char *name = 0); public slots: virtual void slotSetAssociationWeight(int i); virtual void slotSetDependenciesWeight(int i); @@ -36,7 +37,7 @@ class AutolayoutDlg : public MyDialog1 virtual void slotSetShapeSeparation(int i); virtual void slotReloadSettings(); virtual void slotSaveSettings(); - virtual void slotDoAutolayout(); + virtual void slotDoAutotqlayout(); void readConfig(KConfig*); void writeConfig(KConfig*); virtual void slotSelectAlgorithm(const TQString&); @@ -53,10 +54,10 @@ class AutolayoutDlg : public MyDialog1 bool compressShapes; bool centerDiagram; bool clusterizeHierarchies; - int shapeSeparation; + int tqshapeSeparation; KConfig* config; TQString algname; - Autolayout::Autolayouter* getAutolayouter(); + Autotqlayout::Autotqlayouter* getAutotqlayouter(); }; diff --git a/umbrello/umbrello/autolayout/autolayouter.cpp b/umbrello/umbrello/autolayout/autolayouter.cpp index f70fd195..caf852b7 100644 --- a/umbrello/umbrello/autolayout/autolayouter.cpp +++ b/umbrello/umbrello/autolayout/autolayouter.cpp @@ -11,13 +11,13 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "autolayouter.h" +#include "autotqlayouter.h" -namespace Autolayout { +namespace Autotqlayout { -void Autolayouter::autolayout( UMLView * v ) +void Autotqlayouter::autotqlayout( UMLView * v ) { setCanvas(v); setGraph(v); @@ -25,5 +25,5 @@ void Autolayouter::autolayout( UMLView * v ) updateView(v); } -} // end namespace Autolayout +} // end namespace Autotqlayout diff --git a/umbrello/umbrello/autolayout/autolayouter.h b/umbrello/umbrello/autolayout/autolayouter.h index a56b1ce3..40a24235 100644 --- a/umbrello/umbrello/autolayout/autolayouter.h +++ b/umbrello/umbrello/autolayout/autolayouter.h @@ -13,17 +13,17 @@ #define AUTOLAYOUTAUTOLAYOUTER_H #include "baseinclude.h" -namespace Autolayout { +namespace Autotqlayout { /** -This is the super class of any class which encapsulate an autolayout algorithm +This is the super class of any class which encapsulate an autotqlayout algorithm @author Dimitri Ognibene <ognibened @yahoo.it> */ -class Autolayouter { +class Autotqlayouter { public: - virtual ~Autolayouter() {} + virtual ~Autotqlayouter() {} virtual void setNoteConnectionWeight(int i)=0; virtual void setNoteConnectionsAsEdges(bool b)=0; @@ -47,14 +47,14 @@ public: virtual void setShapeSeparation(int i)=0; - virtual void autolayout(UMLView* v); + virtual void autotqlayout(UMLView* v); protected: virtual void run()=0; virtual void updateView(UMLView*)=0; - virtual Autolayout::Canvas* getCanvas()=0; - virtual Autolayout::Graph* getGraph()=0; - virtual Autolayout::Graph* setGraph(UMLView* view)=0; - virtual Autolayout::Canvas* setCanvas(UMLView* view)=0; + virtual Autotqlayout::Canvas* getCanvas()=0; + virtual Autotqlayout::Graph* getGraph()=0; + virtual Autotqlayout::Graph* setGraph(UMLView* view)=0; + virtual Autotqlayout::Canvas* setCanvas(UMLView* view)=0; }; diff --git a/umbrello/umbrello/autolayout/autolayouteradapter.cpp b/umbrello/umbrello/autolayout/autolayouteradapter.cpp index 0673fde1..0bba19c7 100644 --- a/umbrello/umbrello/autolayout/autolayouteradapter.cpp +++ b/umbrello/umbrello/autolayout/autolayouteradapter.cpp @@ -9,21 +9,21 @@ * * ***************************************************************************/ -#include "autolayouteradapter.h" +#include "autotqlayouteradapter.h" -namespace Autolayout +namespace Autotqlayout { - AutolayouterAdapter::AutolayouterAdapter() - : Autolayout::Autolayouter() + AutotqlayouterAdapter::AutotqlayouterAdapter() + : Autotqlayout::Autotqlayouter() {} - AutolayouterAdapter::~AutolayouterAdapter() + AutotqlayouterAdapter::~AutotqlayouterAdapter() {}} -void Autolayout::AutolayouterAdapter::addRelationship( AssociationWidget * a ) +void Autotqlayout::AutotqlayouterAdapter::addRelationship( AssociationWidget * a ) { int weight; switch (a->getAssocType()) @@ -71,60 +71,60 @@ void Autolayout::AutolayouterAdapter::addRelationship( AssociationWidget * a ) getGraph()->addEdge(a->getWidgetID(Uml::A).c_str(),a->getWidgetID(Uml::B).c_str(),weight); } -void Autolayout::AutolayouterAdapter::setAssociationWeight( int i ) +void Autotqlayout::AutotqlayouterAdapter::setAssociationWeight( int i ) { associationWeight=i; } -void Autolayout::AutolayouterAdapter::setDependenciesWeight( int i ) +void Autotqlayout::AutotqlayouterAdapter::setDependenciesWeight( int i ) { dependenciesWeight=i; } -void Autolayout::AutolayouterAdapter::setGeneralizationWeight( int i ) +void Autotqlayout::AutotqlayouterAdapter::setGeneralizationWeight( int i ) { generalizationWeight=i; } -void Autolayout::AutolayouterAdapter::setGeneralizationAsEdges( bool b ) +void Autotqlayout::AutotqlayouterAdapter::setGeneralizationAsEdges( bool b ) { genralizationAsEdges=b; } -void Autolayout::AutolayouterAdapter::setDependenciesAsEdges( bool b ) +void Autotqlayout::AutotqlayouterAdapter::setDependenciesAsEdges( bool b ) { dependenciesAsEdges=b; } -void Autolayout::AutolayouterAdapter::setAssociationAsEdges( bool b ) +void Autotqlayout::AutotqlayouterAdapter::setAssociationAsEdges( bool b ) { associationAsEdges=b; } -void Autolayout::AutolayouterAdapter::setCompressShapes( bool b ) +void Autotqlayout::AutotqlayouterAdapter::setCompressShapes( bool b ) { compressShapes=b; } -void Autolayout::AutolayouterAdapter::setCenterDiagram( bool b ) +void Autotqlayout::AutotqlayouterAdapter::setCenterDiagram( bool b ) { centerDiagram=b; } -void Autolayout::AutolayouterAdapter::setClusterizeHierarchies( bool b ) +void Autotqlayout::AutotqlayouterAdapter::setClusterizeHierarchies( bool b ) { clusterizeHierarchies=b; } -void Autolayout::AutolayouterAdapter::setShapeSeparation( int i ) +void Autotqlayout::AutotqlayouterAdapter::setShapeSeparation( int i ) { - shapeSeparation=i; + tqshapeSeparation=i; } -Autolayout::Graph * Autolayout::AutolayouterAdapter::setGraph( UMLView * view ) +Autotqlayout::Graph * Autotqlayout::AutotqlayouterAdapter::setGraph( UMLView * view ) { if (! view) return 0; - Autolayout::Graph * g=getGraph(); + Autotqlayout::Graph * g=getGraph(); if (g&&g->empty()) { UMLWidgetList list = view->getWidgetList(); @@ -151,7 +151,7 @@ Autolayout::Graph * Autolayout::AutolayouterAdapter::setGraph( UMLView * view ) return g; } -void Autolayout::AutolayouterAdapter::updateView( UMLView* view ) +void Autotqlayout::AutotqlayouterAdapter::updateView( UMLView* view ) { if (! view) return ; UMLWidgetList list = view->getWidgetList(); @@ -175,17 +175,17 @@ UMLWidgetList list = view->getWidgetList(); } } -Autolayout::Canvas * Autolayout::AutolayouterAdapter::setCanvas( UMLView* view ) +Autotqlayout::Canvas * Autotqlayout::AutotqlayouterAdapter::setCanvas( UMLView* view ) { - return canvas=new Autolayout::SimpleCanvas(view->getCanvasWidth(),view->getCanvasHeight()); + return canvas=new Autotqlayout::SimpleCanvas(view->getCanvasWidth(),view->getCanvasHeight()); } -void Autolayout::AutolayouterAdapter::setNoteConnectionWeight( int i ) +void Autotqlayout::AutotqlayouterAdapter::setNoteConnectionWeight( int i ) { noteConnectionWeight=i; } -void Autolayout::AutolayouterAdapter::setNoteConnectionsAsEdges( bool b ) +void Autotqlayout::AutotqlayouterAdapter::setNoteConnectionsAsEdges( bool b ) { noteConnectionAsEdges=b; } diff --git a/umbrello/umbrello/autolayout/autolayouteradapter.h b/umbrello/umbrello/autolayout/autolayouteradapter.h index 7c52e742..0d8e9021 100644 --- a/umbrello/umbrello/autolayout/autolayouteradapter.h +++ b/umbrello/umbrello/autolayout/autolayouteradapter.h @@ -11,24 +11,24 @@ #ifndef AUTOLAYOUTAUTOLAYOUTERADAPTER_H #define AUTOLAYOUTAUTOLAYOUTERADAPTER_H -//#include "autolayout.h" +//#include "autotqlayout.h" #include "baseinclude.h" -#include "autolayouter.h" +#include "autotqlayouter.h" #include "../umlnamespace.h" -namespace Autolayout +namespace Autotqlayout { /** @author Dimitri Ognibene <ognibened @yahoo.it> */ -class AutolayouterAdapter : virtual public Autolayout::Autolayouter +class AutotqlayouterAdapter : virtual public Autotqlayout::Autotqlayouter { public: - AutolayouterAdapter(); + AutotqlayouterAdapter(); - virtual ~AutolayouterAdapter(); + virtual ~AutotqlayouterAdapter(); virtual void setAssociationWeight(int i); virtual void setDependenciesWeight(int i); @@ -70,7 +70,7 @@ protected: bool compressShapes; bool centerDiagram; bool clusterizeHierarchies; - int shapeSeparation; + int tqshapeSeparation; int noteConnectionWeight; bool noteConnectionAsEdges; bool anchorsAsEdges; diff --git a/umbrello/umbrello/autolayout/canvas.h b/umbrello/umbrello/autolayout/canvas.h index 246df8a7..210b1353 100644 --- a/umbrello/umbrello/autolayout/canvas.h +++ b/umbrello/umbrello/autolayout/canvas.h @@ -15,7 +15,7 @@ #ifndef AUTOLAYOUTCANVAS_H #define AUTOLAYOUTCANVAS_H -namespace Autolayout { +namespace Autotqlayout { /** @author Dimitri Ognibene <ognibened @yahoo.it> diff --git a/umbrello/umbrello/autolayout/diagram.h b/umbrello/umbrello/autolayout/diagram.h index 33bda398..43f35f51 100644 --- a/umbrello/umbrello/autolayout/diagram.h +++ b/umbrello/umbrello/autolayout/diagram.h @@ -16,12 +16,12 @@ #define AUTOLAYOUTABLEDIAGRAM_H #include <dotneato.h> #define internal_renderizer -#include "autolayout.h" +#include "autotqlayout.h" /** @author Dimitri Ognibene <ognibened @yahoo.it> Umbrello UML Modeller Authors */ -namespace Autolayout{ +namespace Autotqlayout{ class Diagram//: public virtual Graph, public virtual Canvas{ { private: @@ -39,7 +39,7 @@ public: void addNode(const char *name, int width,int heigt); void addEdge(const char* nodea,const char*nodeb); - void autolayout(); + void autotqlayout(); void save(); Node getNode(const char*); diff --git a/umbrello/umbrello/autolayout/dotautolayouter.cpp b/umbrello/umbrello/autolayout/dotautolayouter.cpp index 5d197845..20d5d34c 100644 --- a/umbrello/umbrello/autolayout/dotautolayouter.cpp +++ b/umbrello/umbrello/autolayout/dotautolayouter.cpp @@ -11,31 +11,31 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "dotautolayouter.h" +#include "dotautotqlayouter.h" #include <graphviz/dotprocs.h> -namespace Autolayout { +namespace Autotqlayout { -DotAutolayouter::DotAutolayouter() - : Autolayout::GraphvizAutolayouter() +DotAutotqlayouter::DotAutotqlayouter() + : Autotqlayout::GraphvizAutotqlayouter() { } -DotAutolayouter::~DotAutolayouter() +DotAutotqlayouter::~DotAutotqlayouter() { dot_cleanup(gg->_agraph); } -void DotAutolayouter::run() +void DotAutotqlayouter::run() { //#ifndef internal_renderizer - /* bind graph to GV context - currently must be done before layout */ + /* bind graph to GV context - currently must be done before tqlayout */ // gvBindContext(gvc,g); //#endif - // do layout + // do tqlayout //dot_layout(); dot_layout( gg->_agraph ); } diff --git a/umbrello/umbrello/autolayout/dotautolayouter.h b/umbrello/umbrello/autolayout/dotautolayouter.h index 5c6530ba..1ccb4bcc 100644 --- a/umbrello/umbrello/autolayout/dotautolayouter.h +++ b/umbrello/umbrello/autolayout/dotautolayouter.h @@ -15,19 +15,19 @@ #ifndef AUTOLAYOUTDOTAUTOLAYOUTER_H #define AUTOLAYOUTDOTAUTOLAYOUTER_H #include "baseinclude.h" -#include "graphvizautolayouter.h" +#include "graphvizautotqlayouter.h" -namespace Autolayout { +namespace Autotqlayout { /** @author Dimitri Ognibene <ognibened @yahoo.it> */ -class DotAutolayouter : virtual public Autolayout::GraphvizAutolayouter +class DotAutotqlayouter : virtual public Autotqlayout::GraphvizAutotqlayouter { public: - DotAutolayouter(); + DotAutotqlayouter(); - virtual ~DotAutolayouter(); + virtual ~DotAutotqlayouter(); virtual void run(); diff --git a/umbrello/umbrello/autolayout/graphvizautolayouter.cpp b/umbrello/umbrello/autolayout/graphvizautolayouter.cpp index 8defc5ef..b8fe49d1 100644 --- a/umbrello/umbrello/autolayout/graphvizautolayouter.cpp +++ b/umbrello/umbrello/autolayout/graphvizautolayouter.cpp @@ -11,42 +11,42 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "graphvizautolayouter.h" +#include "graphvizautotqlayouter.h" #include <graphviz/graph.h> -namespace Autolayout { +namespace Autotqlayout { -GraphvizAutolayouter::GraphvizAutolayouter() - : Autolayout::AutolayouterAdapter() +GraphvizAutotqlayouter::GraphvizAutotqlayouter() + : Autotqlayout::AutotqlayouterAdapter() { gg = new GraphvizGraph(); } -GraphvizAutolayouter::~GraphvizAutolayouter() +GraphvizAutotqlayouter::~GraphvizAutotqlayouter() { agclose(gg->_agraph); delete gg; } -void GraphvizAutolayouter::setCompressShapes( bool b ) +void GraphvizAutotqlayouter::setCompressShapes( bool b ) { gg->setCompressShapes(b); } -void GraphvizAutolayouter::setCenterDiagram( bool b ) +void GraphvizAutotqlayouter::setCenterDiagram( bool b ) { gg->setCenterDiagram(b); } -void GraphvizAutolayouter::setShapeSeparation( int i ) +void GraphvizAutotqlayouter::setShapeSeparation( int i ) { gg->setShapeSeparation(i); } -Autolayout::Canvas * GraphvizAutolayouter::setCanvas( UMLView * view ) +Autotqlayout::Canvas * GraphvizAutotqlayouter::setCanvas( UMLView * view ) { - Canvas* canvas= AutolayouterAdapter::setCanvas(view); + Canvas* canvas= AutotqlayouterAdapter::setCanvas(view); gg->setCanvas(canvas); } diff --git a/umbrello/umbrello/autolayout/graphvizautolayouter.h b/umbrello/umbrello/autolayout/graphvizautolayouter.h index 114ae63f..a2036749 100644 --- a/umbrello/umbrello/autolayout/graphvizautolayouter.h +++ b/umbrello/umbrello/autolayout/graphvizautolayouter.h @@ -12,19 +12,19 @@ #ifndef AUTOLAYOUTGRAPHVIZAUTOLAYOUTER_H #define AUTOLAYOUTGRAPHVIZAUTOLAYOUTER_H #include "baseinclude.h" -#include "autolayouteradapter.h" +#include "autotqlayouteradapter.h" #include "graphvizgraph.h" -namespace Autolayout +namespace Autotqlayout { /** @author Dimitri Ognibene <ognibened @yahoo.it> */ -class GraphvizAutolayouter : virtual public Autolayout::AutolayouterAdapter +class GraphvizAutotqlayouter : virtual public Autotqlayout::AutotqlayouterAdapter { public: - GraphvizAutolayouter(); + GraphvizAutotqlayouter(); virtual void setCompressShapes(bool b); @@ -35,7 +35,7 @@ public: virtual Canvas* setCanvas(UMLView* view); - virtual ~GraphvizAutolayouter(); + virtual ~GraphvizAutotqlayouter(); protected: virtual Graph* getGraph(){if (!gg) gg=new GraphvizGraph(); return gg;} diff --git a/umbrello/umbrello/autolayout/graphvizgraph.cpp b/umbrello/umbrello/autolayout/graphvizgraph.cpp index 716f9223..a3b4ea8a 100644 --- a/umbrello/umbrello/autolayout/graphvizgraph.cpp +++ b/umbrello/umbrello/autolayout/graphvizgraph.cpp @@ -23,7 +23,7 @@ char* _strcpy(const char* name) a=strcpy(a,name); return a; } -namespace Autolayout +namespace Autotqlayout { /** @@ -31,7 +31,7 @@ namespace Autolayout * @return */ GraphvizGraph::GraphvizGraph() - : Autolayout::Graph() + : Autotqlayout::Graph() { aginit(); empty_flag=true; @@ -42,7 +42,7 @@ GraphvizGraph::GraphvizGraph() a_weight= agedgeattr(_agraph,"weight",""); agnodeattr(_agraph, "fixedsize", "true"); agnodeattr(_agraph, "margin", "0.01,0.01"); - agnodeattr(_agraph, "shape", "box"); + agnodeattr(_agraph, "tqshape", "box"); agraphattr(_agraph, "dpi", "DPI/0"); @@ -96,7 +96,7 @@ void GraphvizGraph::addNode(const char* name, int width, int height) } -void Autolayout::GraphvizGraph::setCompressShapes( bool b ) +void Autotqlayout::GraphvizGraph::setCompressShapes( bool b ) { if (empty()) { @@ -105,7 +105,7 @@ void Autolayout::GraphvizGraph::setCompressShapes( bool b ) } } -void Autolayout::GraphvizGraph::setCenterDiagram( bool b ) +void Autotqlayout::GraphvizGraph::setCenterDiagram( bool b ) { if (empty()) { @@ -114,7 +114,7 @@ void Autolayout::GraphvizGraph::setCenterDiagram( bool b ) } } -void Autolayout::GraphvizGraph::setShapeSeparation( int i ) +void Autotqlayout::GraphvizGraph::setShapeSeparation( int i ) { char* a; asprintf(&a,"%f",((float) i)/10.0); @@ -122,22 +122,22 @@ void Autolayout::GraphvizGraph::setShapeSeparation( int i ) free (a); } -bool Autolayout::GraphvizGraph::empty( ) +bool Autotqlayout::GraphvizGraph::empty( ) { return empty_flag; } -Autolayout::Node* Autolayout::GraphvizGraph::getNode( const char * arg1 ) +Autotqlayout::Node* Autotqlayout::GraphvizGraph::getNode( const char * arg1 ) { char *a = _strcpy(arg1); - Autolayout::GraphvizNode* b= - new Autolayout::GraphvizNode(agnode(_agraph,a)); + Autotqlayout::GraphvizNode* b= + new Autotqlayout::GraphvizNode(agnode(_agraph,a)); delete[](a); nodelist.push_back(b); return b; } -void GraphvizGraph::setCanvas( Autolayout::Canvas * canvas) +void GraphvizGraph::setCanvas( Autotqlayout::Canvas * canvas) { char buf[100]; sprintf(buf,"%f,%f",((float)canvas->getMaxX()/DPI),((float)canvas->getMaxY()/DPI)); @@ -146,5 +146,5 @@ void GraphvizGraph::setCanvas( Autolayout::Canvas * canvas) agraphattr(_agraph, "page", buf); } -} // end namespace Autolayout +} // end namespace Autotqlayout diff --git a/umbrello/umbrello/autolayout/graphvizgraph.h b/umbrello/umbrello/autolayout/graphvizgraph.h index dfbf323d..96ae6c31 100644 --- a/umbrello/umbrello/autolayout/graphvizgraph.h +++ b/umbrello/umbrello/autolayout/graphvizgraph.h @@ -21,13 +21,13 @@ #include <deque> #include <graphviz/types.h> -namespace Autolayout +namespace Autotqlayout { /** @author Dimitri Ognibene <ognibened @yahoo.it> */ -class GraphvizGraph : virtual public Autolayout::Graph +class GraphvizGraph : virtual public Autotqlayout::Graph { public: GraphvizGraph(); @@ -50,7 +50,7 @@ public: std::deque<Node*> nodelist; GVC_t* gvc; bool empty_flag; - friend class GraphvizAutolayouter; + friend class GraphvizAutotqlayouter; }; } diff --git a/umbrello/umbrello/autolayout/graphviznode.cpp b/umbrello/umbrello/autolayout/graphviznode.cpp index ea3510cf..430e176c 100644 --- a/umbrello/umbrello/autolayout/graphviznode.cpp +++ b/umbrello/umbrello/autolayout/graphviznode.cpp @@ -17,7 +17,7 @@ #include <graphviz/types.h> #include <graphviz/graph.h> -namespace Autolayout { +namespace Autotqlayout { @@ -40,7 +40,7 @@ int GraphvizNode::getY() } -Autolayout::GraphvizNode::GraphvizNode( Agnode_t * node ) +Autotqlayout::GraphvizNode::GraphvizNode( Agnode_t * node ) { n=node; } diff --git a/umbrello/umbrello/autolayout/graphviznode.h b/umbrello/umbrello/autolayout/graphviznode.h index 0efcb6d8..1190f5af 100644 --- a/umbrello/umbrello/autolayout/graphviznode.h +++ b/umbrello/umbrello/autolayout/graphviznode.h @@ -18,12 +18,12 @@ class Agnode_t; -namespace Autolayout { +namespace Autotqlayout { /** @author Dimitri Ognibene <ognibened @yahoo.it> */ -class GraphvizNode : virtual public Autolayout::Node +class GraphvizNode : virtual public Autotqlayout::Node { GraphvizNode (Agnode_t* n); diff --git a/umbrello/umbrello/autolayout/newautolayoutdialog.ui b/umbrello/umbrello/autolayout/newautolayoutdialog.ui index e6407a5c..de9477e8 100644 --- a/umbrello/umbrello/autolayout/newautolayoutdialog.ui +++ b/umbrello/umbrello/autolayout/newautolayoutdialog.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>MyDialog1</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>MyDialog1</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame12</cstring> </property> @@ -33,7 +33,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -44,7 +44,7 @@ <cstring>comboBox1</cstring> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>dot</string> @@ -66,7 +66,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -80,7 +80,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -88,12 +88,12 @@ <string>Shape separation</string> </property> <property name="buddy" stdset="0"> - <cstring>shapeSeparationSB</cstring> + <cstring>tqshapeSeparationSB</cstring> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> - <cstring>shapeSeparationSB</cstring> + <cstring>tqshapeSeparationSB</cstring> </property> <property name="prefix"> <string></string> @@ -107,7 +107,7 @@ </widget> </hbox> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame3</cstring> </property> @@ -121,7 +121,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>clusterizeHierarchiesCB</cstring> </property> @@ -129,7 +129,7 @@ <string>Clusteri&ze Hierarchies</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>centerDiagramCB</cstring> </property> @@ -137,7 +137,7 @@ <string>Ce&nter Diagram</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>compressShapesCB</cstring> </property> @@ -147,14 +147,14 @@ </widget> </hbox> </widget> - <widget class="QSplitter"> + <widget class="TQSplitter"> <property name="name"> <cstring>splitter14</cstring> </property> <property name="orientation"> <enum>Horizontal</enum> </property> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame5_2_2</cstring> </property> @@ -168,14 +168,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSplitter"> + <widget class="TQSplitter"> <property name="name"> <cstring>splitter7_4</cstring> </property> <property name="orientation"> <enum>Vertical</enum> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>generalizationCB</cstring> </property> @@ -186,7 +186,7 @@ <bool>true</bool> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>generalizationEdgessSL</cstring> </property> @@ -203,13 +203,13 @@ <string>Weight</string> </property> <property name="whatsThis" stdset="0"> - <string>Select the weight that the autolayout algoritm must use to compare association with other relationships like Generalization and Dependence</string> + <string>Select the weight that the autotqlayout algoritm must use to compare association with other relationships like Generalization and Dependence</string> </property> </widget> </widget> </vbox> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame5_2</cstring> </property> @@ -223,14 +223,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSplitter"> + <widget class="TQSplitter"> <property name="name"> <cstring>splitter7</cstring> </property> <property name="orientation"> <enum>Vertical</enum> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>associationEdgesCB</cstring> </property> @@ -238,7 +238,7 @@ <string>Association as Ed&ges</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>associationEdgesSL</cstring> </property> @@ -258,13 +258,13 @@ <string>Weight</string> </property> <property name="whatsThis" stdset="0"> - <string>Select the weight that the autolayout algoritm must use to compare association with other relationships like Generalization and Dependence</string> + <string>Select the weight that the autotqlayout algoritm must use to compare association with other relationships like Generalization and Dependence</string> </property> </widget> </widget> </vbox> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame5</cstring> </property> @@ -278,14 +278,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSplitter"> + <widget class="TQSplitter"> <property name="name"> <cstring>splitter6</cstring> </property> <property name="orientation"> <enum>Vertical</enum> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>dependenciesEdgesCB</cstring> </property> @@ -293,7 +293,7 @@ <string>Dependencies &as Edges</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>dependenciedEdgesSL</cstring> </property> @@ -313,7 +313,7 @@ <string>Weight</string> </property> <property name="whatsThis" stdset="0"> - <string>Select the weight that the autolayout algoritm must use to compare association with other relationships like Generalization and Dependence</string> + <string>Select the weight that the autotqlayout algoritm must use to compare association with other relationships like Generalization and Dependence</string> </property> </widget> </widget> @@ -330,22 +330,22 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>1</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonHelp</cstring> </property> @@ -366,14 +366,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>277</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -390,7 +390,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -404,7 +404,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>restoreDefaultsBTN</cstring> </property> @@ -412,7 +412,7 @@ <string>&Restore Default</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>saveDefaultsBTN</cstring> </property> @@ -450,7 +450,7 @@ <slot>setEnabled(bool)</slot> </connection> <connection> - <sender>shapeSeparationSB</sender> + <sender>tqshapeSeparationSB</sender> <signal>valueChanged(int)</signal> <receiver>MyDialog1</receiver> <slot>slotSetShapeSeparation(int)</slot> @@ -513,7 +513,7 @@ <sender>buttonOk</sender> <signal>clicked()</signal> <receiver>MyDialog1</receiver> - <slot>slotDoAutolayout()</slot> + <slot>slotDoAutotqlayout()</slot> </connection> <connection> <sender>restoreDefaultsBTN</sender> @@ -534,8 +534,8 @@ <slot>slotSelectAlgorithm(const QString&)</slot> </connection> </connections> -<slots> - <slot>slotDoAutolayout()</slot> +<Q_SLOTS> + <slot>slotDoAutotqlayout()</slot> <slot>slotSaveSettings()</slot> <slot>slotReloadSettings()</slot> <slot>slotSetClusterizeHierarchies(bool b)</slot> @@ -549,6 +549,6 @@ <slot>slotSetCenterDiagram(bool b)</slot> <slot>slotSetShapeSeparation(int i)</slot> <slot specifier="pure virtual">slotSelectAlgorithm(const QString&)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/umbrello/umbrello/autolayout/node.h b/umbrello/umbrello/autolayout/node.h index c2532b8b..74259233 100644 --- a/umbrello/umbrello/autolayout/node.h +++ b/umbrello/umbrello/autolayout/node.h @@ -15,7 +15,7 @@ #ifndef AUTOLAYOUTNODE_H #define AUTOLAYOUTNODE_H -namespace Autolayout { +namespace Autotqlayout { /** @author Umbrello UML Modeller Authors diff --git a/umbrello/umbrello/autolayout/simplecanvas.cpp b/umbrello/umbrello/autolayout/simplecanvas.cpp index 0598c15e..38832962 100644 --- a/umbrello/umbrello/autolayout/simplecanvas.cpp +++ b/umbrello/umbrello/autolayout/simplecanvas.cpp @@ -13,7 +13,7 @@ ***************************************************************************/ #include "simplecanvas.h" -namespace Autolayout { +namespace Autotqlayout { diff --git a/umbrello/umbrello/autolayout/simplecanvas.h b/umbrello/umbrello/autolayout/simplecanvas.h index 29712b9e..90cecea5 100644 --- a/umbrello/umbrello/autolayout/simplecanvas.h +++ b/umbrello/umbrello/autolayout/simplecanvas.h @@ -17,7 +17,7 @@ #include "canvas.h" #include <tqrect.h> -namespace Autolayout { +namespace Autotqlayout { /** @author Dimitri Ognibene <ognibened @yahoo.it> diff --git a/umbrello/umbrello/boxwidget.h b/umbrello/umbrello/boxwidget.h index 13f7e480..02e56eb8 100644 --- a/umbrello/umbrello/boxwidget.h +++ b/umbrello/umbrello/boxwidget.h @@ -35,7 +35,7 @@ public: /** * Constructs a BoxWidget. * - * @param view The parent to this widget. + * @param view The tqparent to this widget. * @param id The ID to assign (-1 will prompt a new ID.) */ explicit BoxWidget(UMLView * view, Uml::IDType id = Uml::id_None); @@ -52,7 +52,7 @@ public: /** * Saves the widget to the "boxwidget" XMI element. - * Note: For loading from XMI, the inherited parent method is used. + * Note: For loading from XMI, the inherited tqparent method is used. */ void saveToXMI(TQDomDocument& qDoc, TQDomElement& qElement); }; diff --git a/umbrello/umbrello/classifier.cpp b/umbrello/umbrello/classifier.cpp index 4b8e0bc0..b994097a 100644 --- a/umbrello/umbrello/classifier.cpp +++ b/umbrello/umbrello/classifier.cpp @@ -218,8 +218,8 @@ UMLOperation* UMLClassifier::createOperation(const TQString &name /*=null*/, bool UMLClassifier::addOperation(UMLOperation* op, int position ) { - if (m_List.findRef(op) != -1) { - kDebug() << "UMLClassifier::addOperation: findRef(" + if (m_List.tqfindRef(op) != -1) { + kDebug() << "UMLClassifier::addOperation: tqfindRef(" << op->getName() << ") finds op (bad)" << endl; return false; @@ -380,7 +380,7 @@ UMLClassifierList UMLClassifier::findSubClassConcepts (ClassifierType type) { UMLClassifier *concept = dynamic_cast<UMLClassifier*>(obj); if (concept && (type == ALL || (!concept->isInterface() && type == CLASS) || (concept->isInterface() && type == INTERFACE)) - && (inheritingConcepts.findRef(concept) == -1)) + && (inheritingConcepts.tqfindRef(concept) == -1)) inheritingConcepts.append(concept); } } @@ -392,13 +392,13 @@ UMLClassifierList UMLClassifier::findSuperClassConcepts (ClassifierType type) { UMLClassifierList list = getSuperClasses(); UMLAssociationList rlist = getRealizations(); - UMLClassifierList parentConcepts; + UMLClassifierList tqparentConcepts; Uml::IDType myID = getID(); for (UMLClassifier *concept = list.first(); concept; concept = list.next()) { if (type == ALL || (!concept->isInterface() && type == CLASS) || (concept->isInterface() && type == INTERFACE)) - parentConcepts.append(concept); + tqparentConcepts.append(concept); } for (UMLAssociation *a = rlist.first(); a; a = rlist.next()) @@ -409,12 +409,12 @@ UMLClassifierList UMLClassifier::findSuperClassConcepts (ClassifierType type) { UMLClassifier *concept = dynamic_cast<UMLClassifier*>(obj); if (concept && (type == ALL || (!concept->isInterface() && type == CLASS) || (concept->isInterface() && type == INTERFACE)) - && (parentConcepts.findRef(concept) == -1)) - parentConcepts.append(concept); + && (tqparentConcepts.tqfindRef(concept) == -1)) + tqparentConcepts.append(concept); } } - return parentConcepts; + return tqparentConcepts; } bool UMLClassifier::operator==( UMLClassifier & rhs ) { @@ -571,7 +571,7 @@ UMLAttribute* UMLClassifier::addAttribute(const TQString &name, UMLObject *type, bool UMLClassifier::addAttribute(UMLAttribute* att, IDChangeLog* Log /* = 0 */, int position /* = -1 */) { if (findChildObject(att->getName()) == NULL) { - att->parent()->removeChild( att ); + att->tqparent()->removeChild( att ); this->insertChild( att ); if (position >= 0 && position < (int)m_List.count()) m_List.insert(position, att); @@ -631,15 +631,15 @@ UMLOperationList UMLClassifier::getOpList(bool includeInherited) { ops.append(static_cast<UMLOperation*>(li)); } if (includeInherited) { - UMLClassifierList parents = findSuperClassConcepts(); + UMLClassifierList tqparents = findSuperClassConcepts(); UMLClassifier *c; - for (UMLClassifierListIt pit(parents); (c = pit.current()) != NULL; ++pit) { + for (UMLClassifierListIt pit(tqparents); (c = pit.current()) != NULL; ++pit) { if (c == this) { kError() << "UMLClassifier::getOpList: class " << c->getName() - << " is parent of itself ?!?" << endl; + << " is tqparent of itself ?!?" << endl; continue; } - // get operations for each parent by recursive call + // get operations for each tqparent by recursive call UMLOperationList pops = c->getOpList(true); // add these operations to operation list, but only if unique. for (UMLOperation *po = pops.first(); po; po = pops.next()) { @@ -684,7 +684,7 @@ UMLTemplate* UMLClassifier::addTemplate(const TQString &name, Uml::IDType id) { bool UMLClassifier::addTemplate(UMLTemplate* newTemplate, IDChangeLog* log /* = 0*/) { TQString name = newTemplate->getName(); if (findChildObject(name) == NULL) { - newTemplate->parent()->removeChild(newTemplate); + newTemplate->tqparent()->removeChild(newTemplate); this->insertChild(newTemplate); m_List.append(newTemplate); emit templateAdded(newTemplate); @@ -702,7 +702,7 @@ bool UMLClassifier::addTemplate(UMLTemplate* Template, int position) { TQString name = Template->getName(); if (findChildObject(name) == NULL) { - Template->parent()->removeChild(Template); + Template->tqparent()->removeChild(Template); this->insertChild(Template); if( position >= 0 && position <= (int)m_List.count() ) m_List.insert(position,Template); @@ -765,7 +765,7 @@ int UMLClassifier::takeItem(UMLClassifierListItem *item) { buf.append(' ' + currentAtt->getName()); } kDebug() << " UMLClassifier::takeItem (before): m_List is " << buf << endl; - int index = m_List.findRef(item); + int index = m_List.tqfindRef(item); if (index == -1) return -1; switch (item->getBaseType()) { diff --git a/umbrello/umbrello/classifier.h b/umbrello/umbrello/classifier.h index 9bec4917..56dde52c 100644 --- a/umbrello/umbrello/classifier.h +++ b/umbrello/umbrello/classifier.h @@ -37,6 +37,7 @@ class IDChangeLog; class UMLClassifier : public UMLPackage { Q_OBJECT + TQ_OBJECT public: /** @@ -83,10 +84,10 @@ public: * @param init An optional initial value, used by when creating through UMLListView * @return The UMLAttribute created */ - virtual UMLAttribute* createAttribute(const TQString &name = TQString::null, + virtual UMLAttribute* createAttribute(const TQString &name = TQString(), UMLObject *type = 0, Uml::Visibility vis = Uml::Visibility::Private, - const TQString &init = TQString::null); + const TQString &init = TQString()); /** * Adds an attribute to the class. @@ -151,7 +152,7 @@ public: * no new method is created and the existing operation is returned. * If no name is provided, or if the params are NULL, an Operation * Dialog is shown to ask the user for a name and parameters. - * The operation's signature is checked for validity within the parent + * The operation's signature is checked for validity within the tqparent * classifier. * * @param name The operation name (will be chosen internally if @@ -165,7 +166,7 @@ public: * created because for example, the user canceled the dialog * or no appropriate name can be found. */ - UMLOperation* createOperation( const TQString &name = TQString::null, + UMLOperation* createOperation( const TQString &name = TQString(), bool *isExistingOp = NULL, Model_Utils::NameAndType_List *params = NULL); @@ -239,7 +240,7 @@ public: * * @return The UMLTemplate created */ - UMLObject* createTemplate(const TQString& name = TQString::null); + UMLObject* createTemplate(const TQString& name = TQString()); /** * Adds a template to the class if it is not there yet. @@ -324,7 +325,7 @@ public: /** * Needs to be called after all UML objects are loaded from file. - * Calls the parent resolveRef(), and calls resolveRef() on all + * Calls the tqparent resolveRef(), and calls resolveRef() on all * UMLClassifierListItems. * Overrides the method from UMLObject. * diff --git a/umbrello/umbrello/classifiercodedocument.cpp b/umbrello/umbrello/classifiercodedocument.cpp index 29e4bd88..4f92dede 100644 --- a/umbrello/umbrello/classifiercodedocument.cpp +++ b/umbrello/umbrello/classifiercodedocument.cpp @@ -38,9 +38,9 @@ // Constructors/Destructors // -ClassifierCodeDocument::ClassifierCodeDocument ( UMLClassifier * parent ) +ClassifierCodeDocument::ClassifierCodeDocument ( UMLClassifier * tqparent ) { - init (parent); + init (tqparent); } ClassifierCodeDocument::~ClassifierCodeDocument ( ) @@ -131,8 +131,8 @@ bool ClassifierCodeDocument::hasObjectVectorClassFields() { UMLRole * role = dynamic_cast<UMLRole*>(cf->getParentObject()); TQString multi = role->getMultiplicity(); if ( - multi.contains(TQRegExp("[23456789\\*]")) || - multi.contains(TQRegExp("1\\d")) + multi.tqcontains(TQRegExp("[23456789\\*]")) || + multi.tqcontains(TQRegExp("1\\d")) ) return true; } @@ -170,7 +170,7 @@ bool ClassifierCodeDocument::hasAttributeClassFields() { // the codegenerator writer the liberty to organize their document as they desire. bool ClassifierCodeDocument::addCodeClassField ( CodeClassField * add_object ) { UMLObject * umlobj = add_object->getParentObject(); - if(!(m_classFieldMap.contains(umlobj))) + if(!(m_classFieldMap.tqcontains(umlobj))) { m_classfieldVector.append(add_object); m_classFieldMap.insert(umlobj,add_object); @@ -194,7 +194,7 @@ void ClassifierCodeDocument::addAttributeClassField (UMLClassifierListItem *obj, */ bool ClassifierCodeDocument::removeCodeClassField ( CodeClassField * remove_object ) { UMLObject * umlobj = remove_object->getParentObject(); - if(m_classFieldMap.contains(umlobj)) + if(m_classFieldMap.tqcontains(umlobj)) { if (m_classfieldVector.removeRef(remove_object)) { @@ -344,7 +344,7 @@ void ClassifierCodeDocument::addCodeClassFieldMethods(CodeClassFieldList &list ) // add declaration blocks for the passed classfields void ClassifierCodeDocument::declareClassFields (CodeClassFieldList & list , - CodeGenObjectWithTextBlocks * parent ) + CodeGenObjectWithTextBlocks * tqparent ) { for (CodeClassFieldListIt ccflit(list); ccflit.current(); ++ccflit) @@ -356,27 +356,27 @@ void ClassifierCodeDocument::declareClassFields (CodeClassFieldList & list , // if it has a tag, check if(!declBlock->getTag().isEmpty()) { - // In C++, because we may shift the declaration to a different parent + // In C++, because we may shift the declaration to a different tqparent // block for a change in scope, we need to track down any pre-existing - // location, and remove FIRST before adding to new parent + // location, and remove FIRST before adding to new tqparent CodeGenObjectWithTextBlocks * oldParent = findParentObjectForTaggedTextBlock (declBlock->getTag()); if(oldParent) { - if(oldParent != parent) + if(oldParent != tqparent) oldParent->removeTextBlock(declBlock); } } */ - parent->addTextBlock(declBlock); // wont add it IF its already present. Will give it a tag if missing + tqparent->addTextBlock(declBlock); // wont add it IF its already present. Will give it a tag if missing } } -bool ClassifierCodeDocument::parentIsClass() { +bool ClassifierCodeDocument::tqparentIsClass() { return (m_parentclassifier->getBaseType() == Uml::ot_Class); } -bool ClassifierCodeDocument::parentIsInterface() { +bool ClassifierCodeDocument::tqparentIsInterface() { return (m_parentclassifier->getBaseType() == Uml::ot_Interface); } @@ -396,7 +396,7 @@ void ClassifierCodeDocument::init (UMLClassifier * c ) // initCodeClassFields(); // cant call here?..newCodeClassField is pure virtual // slots - if (parentIsClass()) { + if (tqparentIsClass()) { connect(c,TQT_SIGNAL(attributeAdded(UMLClassifierListItem*)),this,TQT_SLOT(addAttributeClassField(UMLClassifierListItem*))); connect(c,TQT_SIGNAL(attributeRemoved(UMLClassifierListItem*)),this,TQT_SLOT(removeAttributeClassField(UMLClassifierListItem*))); } @@ -494,7 +494,7 @@ void ClassifierCodeDocument::initCodeClassFields ( ) { UMLClassifier * c = getParentClassifier(); // first, do the code classifields that arise from attributes - if (parentIsClass()) { + if (tqparentIsClass()) { UMLAttributeList alist = c->getAttributeList(); for(UMLAttribute * at = alist.first(); at; at = alist.next()) { @@ -542,7 +542,7 @@ void ClassifierCodeDocument::addAssociationClassField (UMLAssociation * a, bool { UMLRole * role = a->getUMLRole(Uml::B); - if(!m_classFieldMap.contains((UMLObject*)role)) + if(!m_classFieldMap.tqcontains((UMLObject*)role)) { CodeClassField * classfield = CodeGenFactory::newCodeClassField(this, role); if( addCodeClassField(classfield)) @@ -554,7 +554,7 @@ void ClassifierCodeDocument::addAssociationClassField (UMLAssociation * a, bool if (printRoleA) { UMLRole * role = a->getUMLRole(Uml::A); - if(!m_classFieldMap.contains((UMLObject*)role)) + if(!m_classFieldMap.tqcontains((UMLObject*)role)) { CodeClassField * classfield = CodeGenFactory::newCodeClassField(this, role); if( addCodeClassField(classfield)) @@ -573,8 +573,8 @@ void ClassifierCodeDocument::addAssociationClassField (UMLAssociation * a, bool void ClassifierCodeDocument::setAttributesFromNode ( TQDomElement & elem ) { - // NOTE: we DON'T set the parent here as we ONLY get to this point - // IF the parent codegenerator could find a matching parent classifier + // NOTE: we DON'T set the tqparent here as we ONLY get to this point + // IF the tqparent codegenerator could find a matching tqparent classifier // that already has a code document. // We FIRST set code class field stuff..check re-linnking with @@ -599,7 +599,7 @@ void ClassifierCodeDocument::setAttributesFromNode ( TQDomElement & elem ) } // look at all classfields currently in document.. match up -// by parent object ID and Role ID (needed for self-association CF's) +// by tqparent object ID and Role ID (needed for self-association CF's) CodeClassField * ClassifierCodeDocument::findCodeClassFieldFromParentID (Uml::IDType id, int role_id) @@ -619,7 +619,7 @@ ClassifierCodeDocument::findCodeClassFieldFromParentID (Uml::IDType id, } // shouldn't happen.. - kError() << "Failed to find codeclassfield for parent uml id:" + kError() << "Failed to find codeclassfield for tqparent uml id:" << ID2STR(id) << " (role id:" << role_id << ") Do you have a corrupt classifier code document?" << endl; @@ -635,12 +635,12 @@ void ClassifierCodeDocument::loadClassFieldsFromXMI( TQDomElement & elem) { TQString nodeName = childElem.tagName(); if( nodeName == "codeclassfield") { - TQString id = childElem.attribute("parent_id","-1"); + TQString id = childElem.attribute("tqparent_id","-1"); int role_id = childElem.attribute("role_id","-1").toInt(); CodeClassField * cf = findCodeClassFieldFromParentID(STR2ID(id), role_id); if(cf) { - // Because we just may change the parent object here, + // Because we just may change the tqparent object here, // we need to yank it from the map of umlobjects m_classFieldMap.remove(cf->getParentObject()); @@ -651,7 +651,7 @@ void ClassifierCodeDocument::loadClassFieldsFromXMI( TQDomElement & elem) { m_classFieldMap.insert(cf->getParentObject(),cf); } else - kError()<<" LoadFromXMI: can't load classfield parent_id:"<<id<<" do you have a corrupt savefile?"<<endl; + kError()<<" LoadFromXMI: can't load classfield tqparent_id:"<<id<<" do you have a corrupt savefile?"<<endl; } node = childElem.nextSibling(); childElem= node.toElement(); @@ -702,7 +702,7 @@ void ClassifierCodeDocument::setAttributesOnNode ( TQDomDocument & doc, TQDomEle CodeDocument::setAttributesOnNode(doc, docElement); // cache local attributes/fields - docElement.setAttribute("parent_class", ID2STR(getParentClassifier()->getID())); + docElement.setAttribute("tqparent_class", ID2STR(getParentClassifier()->getID())); // (code) class fields // which we will store in its own separate child node block diff --git a/umbrello/umbrello/classifiercodedocument.h b/umbrello/umbrello/classifiercodedocument.h index 2c847c35..f142cade 100644 --- a/umbrello/umbrello/classifiercodedocument.h +++ b/umbrello/umbrello/classifiercodedocument.h @@ -42,6 +42,7 @@ class ClassifierCodeDocument : public CodeDocument { friend class HierarchicalCodeBlock; Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -51,7 +52,7 @@ public: /** * Empty Constructor */ - ClassifierCodeDocument ( UMLClassifier * parent ); + ClassifierCodeDocument ( UMLClassifier * tqparent ); /** * Empty Destructor @@ -78,14 +79,14 @@ public: // some Utility methods /** - * Return if the parent classifier is an interface + * Return if the tqparent classifier is an interface */ - bool parentIsInterface(); + bool tqparentIsInterface(); /** - * Return if the parent classifier is a class + * Return if the tqparent classifier is a class */ - bool parentIsClass(); + bool tqparentIsClass(); /** * Tell if one or more codeclassfields are derived from any kind of association. @@ -132,11 +133,11 @@ public: */ CodeClassFieldList getSpecificClassFields (CodeClassField::ClassFieldType cfType, bool isStatic, Uml::Visibility visibility); - /** Using the parent object's UML ID, find the corresponding + /** Using the tqparent object's UML ID, find the corresponding * codeclassfield object in this classifiercodedocument. Returns * NULL if no such codeclassfield object exists in this document. * - * @param id ID of the parent object + * @param id ID of the tqparent object * @param role_id 0 for role A of the asssociation * 1 for role B of the asssociation * -1 if this is an attribute. @@ -197,11 +198,11 @@ protected: TextBlock * findCodeClassFieldTextBlockByTag (const TQString &tag); // add the declaration text blocks for various classfields - void declareClassFields (CodeClassFieldList & list , CodeGenObjectWithTextBlocks * parent); + void declareClassFields (CodeClassFieldList & list , CodeGenObjectWithTextBlocks * tqparent); virtual void updateContent( ) = 0; - // force syncronization of child classfields to their parent objects + // force syncronization of child classfields to their tqparent objects void syncClassFields( ); // IF the classifier object is modified, this will get called. @@ -218,7 +219,7 @@ private: // based on UMLRoles (e.g. derived from associations with other classifiers). void updateAssociationClassFields ( UMLAssociationList &assocList ); - // update code operations in this document using the parent classifier + // update code operations in this document using the tqparent classifier void updateOperations( ); /** @@ -236,7 +237,7 @@ private: public slots: /** - * Synchronize this document to the attributes/associations of the parent classifier. + * Synchronize this document to the attributes/associations of the tqparent classifier. */ void addAttributeClassField(UMLClassifierListItem *at, bool syncToParentIfAdded = true); void addAssociationClassField (UMLAssociation * assoc, bool syncToParentIfAdded = true); diff --git a/umbrello/umbrello/classifierlistitem.cpp b/umbrello/umbrello/classifierlistitem.cpp index 60e5b7bf..933d9d59 100644 --- a/umbrello/umbrello/classifierlistitem.cpp +++ b/umbrello/umbrello/classifierlistitem.cpp @@ -23,19 +23,19 @@ #include "model_utils.h" #include "object_factory.h" -UMLClassifierListItem::UMLClassifierListItem(const UMLObject *parent, +UMLClassifierListItem::UMLClassifierListItem(const UMLObject *tqparent, const TQString& name, Uml::IDType id) - : UMLObject(parent, name, id) { - UMLObject *parentObj = const_cast<UMLObject*>(parent); - UMLClassifier *pc = dynamic_cast<UMLClassifier*>(parentObj); + : UMLObject(tqparent, name, id) { + UMLObject *tqparentObj = const_cast<UMLObject*>(tqparent); + UMLClassifier *pc = dynamic_cast<UMLClassifier*>(tqparentObj); if (pc) UMLObject::setUMLPackage(pc); } -UMLClassifierListItem::UMLClassifierListItem(const UMLObject *parent) - : UMLObject(parent) { - UMLObject *parentObj = const_cast<UMLObject*>(parent); - UMLClassifier *pc = dynamic_cast<UMLClassifier*>(parentObj); +UMLClassifierListItem::UMLClassifierListItem(const UMLObject *tqparent) + : UMLObject(tqparent) { + UMLObject *tqparentObj = const_cast<UMLObject*>(tqparent); + UMLClassifier *pc = dynamic_cast<UMLClassifier*>(tqparentObj); if (pc) UMLObject::setUMLPackage(pc); } @@ -45,7 +45,7 @@ UMLClassifierListItem::~UMLClassifierListItem() { void UMLClassifierListItem::copyInto(UMLClassifierListItem *rhs) const { - // Call the parent. + // Call the tqparent. UMLObject::copyInto(rhs); } @@ -83,7 +83,7 @@ void UMLClassifierListItem::setTypeName(const TQString &type) { m_pSecondary = pDoc->findUMLObject(type); if (m_pSecondary == NULL) { // Make data type for easily identified cases - if (Model_Utils::isCommonDataType(type) || type.contains('*')) { + if (Model_Utils::isCommonDataType(type) || type.tqcontains('*')) { m_pSecondary = Object_Factory::createUMLObject(Uml::ot_Datatype, type); kDebug() << "UMLClassifierListItem::setTypeName: " << "created datatype for " << type << endl; diff --git a/umbrello/umbrello/classifierlistitem.h b/umbrello/umbrello/classifierlistitem.h index ceac48cc..aba5dd86 100644 --- a/umbrello/umbrello/classifierlistitem.h +++ b/umbrello/umbrello/classifierlistitem.h @@ -30,34 +30,35 @@ class UMLClassifier; class UMLClassifierListItem : public UMLObject { Q_OBJECT + TQ_OBJECT public: /** * Constructor. Empty. * - * @param parent The parent to this operation. + * @param tqparent The tqparent to this operation. * At first sight it would appear that the type of the - * parent should be UMLClassifier. However, the class + * tqparent should be UMLClassifier. However, the class * UMLAttribute is also used for the parameters of * operations, and in this case the UMLOperation is the - * parent. + * tqparent. * @param name The name of the operation. * @param id The id of the operation. */ - UMLClassifierListItem(const UMLObject *parent, + UMLClassifierListItem(const UMLObject *tqparent, const TQString& name, Uml::IDType id = Uml::id_None); /** * Constructor. Empty. * - * @param parent The parent to this operation. + * @param tqparent The tqparent to this operation. * At first sight it would appear that the type of the - * parent should be UMLClassifier. However, the class + * tqparent should be UMLClassifier. However, the class * UMLAttribute is also used for the parameters of * operations, and in this case the UMLOperation is the - * parent. + * tqparent. */ - UMLClassifierListItem(const UMLObject *parent); + UMLClassifierListItem(const UMLObject *tqparent); /** * Destructor. Empty. @@ -104,10 +105,10 @@ public: /** * Display the properties configuration dialog for the list item. * - * @param parent The parent widget. + * @param tqparent The tqparent widget. * @return True for success of this operation. */ - virtual bool showPropertiesDialog(TQWidget* parent) = 0; + virtual bool showPropertiesDialog(TQWidget* tqparent) = 0; /** * Copy the internal presentation of this object into the new diff --git a/umbrello/umbrello/classifierwidget.cpp b/umbrello/umbrello/classifierwidget.cpp index 8105818f..24da6833 100644 --- a/umbrello/umbrello/classifierwidget.cpp +++ b/umbrello/umbrello/classifierwidget.cpp @@ -558,14 +558,14 @@ void ClassifierWidget::draw(TQPainter & p, int offsetX, int offsetY) { p.setPen(pen); p.drawRect( offsetX + width() - templatesBoxSize.width(), offsetY, templatesBoxSize.width(), templatesBoxSize.height() ); - p.setPen( TQPen(Qt::black) ); + p.setPen( TQPen(TQt::black) ); font.setBold(false); p.setFont(font); const int x = offsetX + width() - templatesBoxSize.width() + MARGIN; int y = offsetY + MARGIN; for ( UMLTemplate *t = tlist.first(); t; t = tlist.next() ) { TQString text = t->toString(); - p.drawText(x, y, fm.size(0,text).width(), fontHeight, Qt::AlignVCenter, text); + p.drawText(x, y, fm.size(0,text).width(), fontHeight, TQt::AlignVCenter, text); y += fontHeight; } } @@ -573,7 +573,7 @@ void ClassifierWidget::draw(TQPainter & p, int offsetX, int offsetY) { const int textX = offsetX + MARGIN; const int textWidth = w - MARGIN * 2; - p.setPen(TQPen(Qt::black)); + p.setPen(TQPen(TQt::black)); // draw stereotype font.setBold(true); @@ -587,7 +587,7 @@ void ClassifierWidget::draw(TQPainter & p, int offsetX, int offsetY) { } else if (showStereotype) { p.setFont(font); stereo = m_pObject->getStereotype(true); - p.drawText(textX, m_bodyOffsetY, textWidth, fontHeight, Qt::AlignCenter, stereo); + p.drawText(textX, m_bodyOffsetY, textWidth, fontHeight, TQt::AlignCenter, stereo); m_bodyOffsetY += fontHeight; } @@ -600,12 +600,12 @@ void ClassifierWidget::draw(TQPainter & p, int offsetX, int offsetY) { } font.setItalic( m_pObject->getAbstract() ); p.setFont(font); - p.drawText(textX, m_bodyOffsetY, textWidth, nameHeight, Qt::AlignCenter, name); + p.drawText(textX, m_bodyOffsetY, textWidth, nameHeight, TQt::AlignCenter, name); if (!showNameOnly) { m_bodyOffsetY += fontHeight; UMLWidget::setPen(p); p.drawLine(offsetX, m_bodyOffsetY, offsetX + w - 1, m_bodyOffsetY); - p.setPen(TQPen(Qt::black)); + p.setPen(TQPen(TQt::black)); } font.setBold(false); font.setItalic(false); @@ -626,7 +626,7 @@ void ClassifierWidget::draw(TQPainter & p, int offsetX, int offsetY) { m_bodyOffsetY += fontHeight * numAtts; UMLWidget::setPen(p); p.drawLine(offsetX, m_bodyOffsetY, offsetX + w - 1, m_bodyOffsetY); - p.setPen(TQPen(Qt::black)); + p.setPen(TQPen(TQt::black)); } // draw operations @@ -652,11 +652,11 @@ void ClassifierWidget::drawAsCircle(TQPainter& p, int offsetX, int offsetY) { } p.drawEllipse(offsetX + w/2 - CIRCLE_SIZE/2, offsetY, CIRCLE_SIZE, CIRCLE_SIZE); - p.setPen( TQPen(Qt::black) ); + p.setPen( TQPen(TQt::black) ); TQFont font = UMLWidget::getFont(); p.setFont(font); - p.drawText(offsetX, offsetY + CIRCLE_SIZE, w, fontHeight, Qt::AlignCenter, name); + p.drawText(offsetX, offsetY + CIRCLE_SIZE, w, fontHeight, TQt::AlignCenter, name); if (m_bSelected) { drawSelected(&p, offsetX, offsetY); @@ -697,7 +697,7 @@ void ClassifierWidget::drawMembers(TQPainter & p, Uml::Object_Type ot, Uml::Sign f.setUnderline( obj->getStatic() ); p.setFont( f ); TQFontMetrics fontMetrics(f); - p.drawText(x, y, fontMetrics.size(0,text).width(), fontHeight, Qt::AlignVCenter, text); + p.drawText(x, y, fontMetrics.size(0,text).width(), fontHeight, TQt::AlignVCenter, text); f.setItalic(false); f.setUnderline(false); p.setFont(f); diff --git a/umbrello/umbrello/classifierwidget.h b/umbrello/umbrello/classifierwidget.h index f80f1289..4fa1041d 100644 --- a/umbrello/umbrello/classifierwidget.h +++ b/umbrello/umbrello/classifierwidget.h @@ -30,7 +30,7 @@ public: /** * Constructs a ClassifierWidget. * - * @param view The parent of this ClassifierWidget. + * @param view The tqparent of this ClassifierWidget. * @param o The UMLObject to represent. */ ClassifierWidget(UMLView * view, UMLClassifier * o); @@ -101,7 +101,7 @@ public: /** * Return the status of showing operation signatures. * - * @return Status of showing operation signatures. + * @return tqStatus of showing operation signatures. */ Uml::Signature_Type getShowOpSigs() const; @@ -173,7 +173,7 @@ public: * Returns whether to show attribute signatures. * Only applies when m_pObject->getBaseType() is ot_Class. * - * @return Status of how attribute signatures are shown. + * @return tqStatus of how attribute signatures are shown. */ Uml::Signature_Type getShowAttSigs() { return m_ShowAttSigs; diff --git a/umbrello/umbrello/clipboard/umlclipboard.cpp b/umbrello/umbrello/clipboard/umlclipboard.cpp index 069ba84b..357f97f7 100644 --- a/umbrello/umbrello/clipboard/umlclipboard.cpp +++ b/umbrello/umbrello/clipboard/umlclipboard.cpp @@ -267,7 +267,7 @@ void UMLClipboard::checkItemForCopyType(UMLListViewItem* Item, bool & WithDiagra } } -/** Adds the children of a UMLListViewItem to m_ItemList */ +/** Adds the tqchildren of a UMLListViewItem to m_ItemList */ bool UMLClipboard::insertItemChildren(UMLListViewItem * Item, UMLListViewItemList& SelectedItems) { if(Item->childCount()) { UMLListViewItem * child = (UMLListViewItem*)Item->firstChild(); @@ -281,7 +281,7 @@ bool UMLClipboard::insertItemChildren(UMLListViewItem * Item, UMLListViewItemLis // If the child is selected, remove it from the list of selected items // otherwise it will be inserted twice in m_ObjectList. if(child->isSelected()) { - SelectedItems.remove(SelectedItems.find(child) ); + SelectedItems.remove(SelectedItems.tqfind(child) ); } insertItemChildren(child, SelectedItems); child = (UMLListViewItem*)child->nextSibling(); @@ -290,14 +290,14 @@ bool UMLClipboard::insertItemChildren(UMLListViewItem * Item, UMLListViewItemLis return true; } -bool UMLClipboard::pasteChildren(UMLListViewItem *parent, IDChangeLog *chgLog) { - if (!parent) { - kWarning() << "Paste Children Error, parent missing" << endl; +bool UMLClipboard::pasteChildren(UMLListViewItem *tqparent, IDChangeLog *chgLog) { + if (!tqparent) { + kWarning() << "Paste Children Error, tqparent missing" << endl; return false; } UMLDoc *doc = UMLApp::app()->getDocument(); UMLListView *listView = UMLApp::app()->getListView(); - UMLListViewItem *childItem = static_cast<UMLListViewItem*>(parent->firstChild()); + UMLListViewItem *childItem = static_cast<UMLListViewItem*>(tqparent->firstChild()); while (childItem) { Uml::IDType oldID = childItem->getID(); Uml::IDType newID = chgLog->findNewID(oldID); @@ -347,7 +347,7 @@ bool UMLClipboard::pasteClip1(TQMimeSource* data) { return true; lv->setStartedCopy(false); /* If we get here we are pasting after a Copy and need to - // paste possible children. + // paste possible tqchildren. UMLListViewItem* itemdata = 0; UMLListViewItemListIt it(itemdatalist); while ( (itemdata=it.current()) != 0 ) { @@ -571,9 +571,9 @@ bool UMLClipboard::pasteClip5(TQMimeSource* data) { (lvitem->getType() != Uml::lvt_Class && lvitem->getType() != Uml::lvt_Interface)) { return false; } - UMLClassifier *parent = dynamic_cast<UMLClassifier *>(lvitem->getUMLObject()); - if (parent == NULL) { - kError() << "UMLClipboard::pasteClip5: parent is not a UMLClassifier" + UMLClassifier *tqparent = dynamic_cast<UMLClassifier *>(lvitem->getUMLObject()); + if (tqparent == NULL) { + kError() << "UMLClipboard::pasteClip5: tqparent is not a UMLClassifier" << endl; return false; } @@ -581,7 +581,7 @@ bool UMLClipboard::pasteClip5(TQMimeSource* data) { UMLObjectList objects; objects.setAutoDelete(false); IDChangeLog* idchanges = 0; - bool result = UMLDrag::decodeClip5(data, objects, parent); + bool result = UMLDrag::decodeClip5(data, objects, tqparent); if(!result) { return false; @@ -599,16 +599,16 @@ bool UMLClipboard::pasteClip5(TQMimeSource* data) { switch(obj->getBaseType()) { case Uml::ot_Attribute : { - UMLObject *exist = parent->findChildObject(obj->getName(), Uml::ot_Attribute); + UMLObject *exist = tqparent->findChildObject(obj->getName(), Uml::ot_Attribute); if (exist) { - TQString newName = parent->uniqChildName(Uml::ot_Attribute, obj->getName()); + TQString newName = tqparent->uniqChildName(Uml::ot_Attribute, obj->getName()); obj->setName(newName); } UMLAttribute *att = static_cast<UMLAttribute*>(obj); - if (parent->addAttribute(att, idchanges)) { + if (tqparent->addAttribute(att, idchanges)) { result = true; } else { - kError() << "UMLClipboard::pasteClip5: " << parent->getName() + kError() << "UMLClipboard::pasteClip5: " << tqparent->getName() << "->addAttribute(" << att->getName() << ") failed" << endl; } break; @@ -616,21 +616,21 @@ bool UMLClipboard::pasteClip5(TQMimeSource* data) { case Uml::ot_Operation : { UMLOperation *op = static_cast<UMLOperation*>(obj); - UMLOperation *exist = parent->checkOperationSignature(op->getName(), op->getParmList()); + UMLOperation *exist = tqparent->checkOperationSignature(op->getName(), op->getParmList()); if (exist) { - TQString newName = parent->uniqChildName(Uml::ot_Operation, obj->getName()); + TQString newName = tqparent->uniqChildName(Uml::ot_Operation, obj->getName()); op->setName(newName); } - if (parent->addOperation(op, idchanges)) { + if (tqparent->addOperation(op, idchanges)) { result = true; } else { - kError() << "UMLClipboard::pasteClip5: " << parent->getName() + kError() << "UMLClipboard::pasteClip5: " << tqparent->getName() << "->addOperation(" << op->getName() << ") failed" << endl; } break; } default : - kWarning() << "pasting unknown children type in clip type 5" << endl; + kWarning() << "pasting unknown tqchildren type in clip type 5" << endl; return false; } } diff --git a/umbrello/umbrello/clipboard/umlclipboard.h b/umbrello/umbrello/clipboard/umlclipboard.h index ef3bbc02..b7a42e2e 100644 --- a/umbrello/umbrello/clipboard/umlclipboard.h +++ b/umbrello/umbrello/clipboard/umlclipboard.h @@ -33,6 +33,7 @@ class TQMimeSource; */ class UMLClipboard : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Constructor. @@ -166,13 +167,13 @@ private: bool& OnlyAttsOps); /** - * Adds the children of a UMLListViewItem to m_ItemList. + * Adds the tqchildren of a UMLListViewItem to m_ItemList. */ bool insertItemChildren(UMLListViewItem* Item, UMLListViewItemList& SelectedItems); /** - * Inserts the data of the children of the given item + * Inserts the data of the tqchildren of the given item * into the item data list. Used for clip type 4. Used * to make * sure classes have all the attributes and * operations saved. @@ -180,9 +181,9 @@ private: bool insertItemChildren(UMLListViewItem* item); /** - * Pastes the children of a UMLListViewItem (The Parent) + * Pastes the tqchildren of a UMLListViewItem (The Parent) */ - bool pasteChildren(UMLListViewItem* parent, IDChangeLog *chgLog); + bool pasteChildren(UMLListViewItem* tqparent, IDChangeLog *chgLog); /** * Gives a `sorry' message box if you're pasting an item which diff --git a/umbrello/umbrello/clipboard/umldrag.cpp b/umbrello/umbrello/clipboard/umldrag.cpp index 27f8dde2..e7bd5d90 100644 --- a/umbrello/umbrello/clipboard/umldrag.cpp +++ b/umbrello/umbrello/clipboard/umldrag.cpp @@ -108,11 +108,11 @@ void UMLDrag::setSubType(const TQCString& string, int index) { data->setSubType(string, index); } -void UMLDrag::setEncodedData(const TQByteArray& encodedData, int index) { - data->enc[index] = encodedData.copy(); +void UMLDrag::setEncodedData(const TQByteArray& tqencodedData, int index) { + data->enc[index] = tqencodedData.copy(); } -TQByteArray UMLDrag::encodedData(const char* dataName) const { +TQByteArray UMLDrag::tqencodedData(const char* dataName) const { TQString str(dataName); for (int i = 0; i < 4; i++) { if ( !qstricmp(dataName,data->fmt[i]) ) { @@ -286,7 +286,7 @@ bool UMLDrag::decodeClip1(const TQMimeSource* mimeSource, UMLObjectList& objects if ( !mimeSource->provides("application/x-uml-clip1") ) { return false; } - TQByteArray payload = mimeSource->encodedData("application/x-uml-clip1"); + TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip1"); if ( !payload.size() ) { return false; } @@ -376,7 +376,7 @@ bool UMLDrag::decodeClip2(const TQMimeSource* mimeSource, UMLObjectList& objects if ( !mimeSource->provides("application/x-uml-clip2") ) { return false; } - TQByteArray payload = mimeSource->encodedData("application/x-uml-clip2"); + TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip2"); if ( !payload.size() ) { return false; } @@ -439,12 +439,12 @@ bool UMLDrag::decodeClip2(const TQMimeSource* mimeSource, UMLObjectList& objects while ( !diagramElement.isNull() ) { TQString type = diagramElement.attribute("type", "0"); Uml::Diagram_Type dt = (Uml::Diagram_Type)type.toInt(); - UMLListViewItem *parent = listView->findFolderForDiagram(dt); - if (parent == NULL) + UMLListViewItem *tqparent = listView->findFolderForDiagram(dt); + if (tqparent == NULL) return false; - UMLObject *po = parent->getUMLObject(); + UMLObject *po = tqparent->getUMLObject(); if (po == NULL || po->getBaseType() != Uml::ot_Folder) { - kError() << "UMLDrag::decodeClip2: bad parent for view" << endl; + kError() << "UMLDrag::decodeClip2: bad tqparent for view" << endl; return false; } UMLFolder *f = static_cast<UMLFolder*>(po); @@ -486,7 +486,7 @@ bool UMLDrag::getClip3TypeAndID(const TQMimeSource* mimeSource, if ( !mimeSource->provides("application/x-uml-clip3") ) { return false; } - TQByteArray payload = mimeSource->encodedData("application/x-uml-clip3"); + TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip3"); if ( !payload.size() ) { return false; } @@ -539,11 +539,11 @@ bool UMLDrag::getClip3TypeAndID(const TQMimeSource* mimeSource, } bool UMLDrag::decodeClip3(const TQMimeSource* mimeSource, UMLListViewItemList& umlListViewItems, - const UMLListView* parentListView){ + const UMLListView* tqparentListView){ if ( !mimeSource->provides("application/x-uml-clip3") ) { return false; } - TQByteArray payload = mimeSource->encodedData("application/x-uml-clip3"); + TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip3"); if ( !payload.size() ) { return false; } @@ -584,8 +584,8 @@ bool UMLDrag::decodeClip3(const TQMimeSource* mimeSource, UMLListViewItemList& u continue; } Uml::ListView_Type t = (Uml::ListView_Type)(type.toInt()); - UMLListViewItem* parent = parentListView->determineParentItem(t); - UMLListViewItem* itemData = new UMLListViewItem(parent); + UMLListViewItem* tqparent = tqparentListView->determineParentItem(t); + UMLListViewItem* itemData = new UMLListViewItem(tqparent); if ( itemData->loadFromXMI(listItemElement) ) umlListViewItems.append(itemData); else @@ -602,7 +602,7 @@ bool UMLDrag::decodeClip4(const TQMimeSource* mimeSource, UMLObjectList& objects if ( !mimeSource->provides("application/x-uml-clip4") ) { return false; } - TQByteArray payload = mimeSource->encodedData("application/x-uml-clip4"); + TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip4"); if ( !payload.size() ) { return false; } @@ -699,7 +699,7 @@ bool UMLDrag::decodeClip5(const TQMimeSource* mimeSource, UMLObjectList& objects if ( !mimeSource->provides("application/x-uml-clip5") ) { return false; } - TQByteArray payload = mimeSource->encodedData("application/x-uml-clip5"); + TQByteArray payload = mimeSource->tqencodedData("application/x-uml-clip5"); if ( !payload.size() ) { return false; } diff --git a/umbrello/umbrello/clipboard/umldrag.h b/umbrello/umbrello/clipboard/umldrag.h index 97cbffb5..315e3c98 100644 --- a/umbrello/umbrello/clipboard/umldrag.h +++ b/umbrello/umbrello/clipboard/umldrag.h @@ -35,8 +35,9 @@ class UMLListView; class UMLDragPrivate; class UMLClassifier; -class Q_EXPORT UMLDrag : public TQDragObject { +class TQ_EXPORT UMLDrag : public TQDragObject { Q_OBJECT + TQ_OBJECT UMLDragPrivate* data; public: @@ -148,7 +149,7 @@ public: * * @param dataName the name of the data type to return */ - virtual TQByteArray encodedData(const char* dataName) const; + virtual TQByteArray tqencodedData(const char* dataName) const; /** * For use when the user selects only UML Objects @@ -174,7 +175,7 @@ public: */ static bool decodeClip3(const TQMimeSource* mimeSource, UMLListViewItemList& umlListViewItems, - const UMLListView* parentListView=0); + const UMLListView* tqparentListView=0); struct LvTypeAndID { Uml::ListView_Type type; diff --git a/umbrello/umbrello/codeaccessormethod.cpp b/umbrello/umbrello/codeaccessormethod.cpp index e7890865..fab32f7c 100644 --- a/umbrello/umbrello/codeaccessormethod.cpp +++ b/umbrello/umbrello/codeaccessormethod.cpp @@ -30,10 +30,10 @@ // Constructors/Destructors // -CodeAccessorMethod::CodeAccessorMethod ( CodeClassField * parentCF ) - : CodeMethodBlock ( parentCF->getParentDocument(), parentCF->getParentObject() ) +CodeAccessorMethod::CodeAccessorMethod ( CodeClassField * tqparentCF ) + : CodeMethodBlock ( tqparentCF->getParentDocument(), tqparentCF->getParentObject() ) { - initFields(parentCF); + initFields(tqparentCF); } CodeAccessorMethod::~CodeAccessorMethod ( ) { } @@ -54,13 +54,13 @@ CodeClassField * CodeAccessorMethod::getParentClassField ( ) { return m_parentclassfield; } -bool CodeAccessorMethod::parentIsAttribute( ) { - return getParentClassField()->parentIsAttribute(); +bool CodeAccessorMethod::tqparentIsAttribute( ) { + return getParentClassField()->tqparentIsAttribute(); } /** - * Utility method to get the value of the parent object of the parent classifield. - * @return the value of the parent of the parent classfield + * Utility method to get the value of the tqparent object of the tqparent classifield. + * @return the value of the tqparent of the tqparent classfield */ /* UMLObject * CodeAccessorMethod::getParentObject ( ) { @@ -92,7 +92,7 @@ void CodeAccessorMethod::release () { // do nothing } -// ok, a method so the parent can force it to release +// ok, a method so the tqparent can force it to release void CodeAccessorMethod::forceRelease () { if(m_parentclassfield) m_parentclassfield->disconnect(this); @@ -142,8 +142,8 @@ void CodeAccessorMethod::setAttributesFromNode ( TQDomElement & root) { /* // I don't believe this is needed for a load from XMI. We never delete - // accessor methods from the parent classfield.. they are essentially - // in composition with the parent class and are arent meant to be out + // accessor methods from the tqparent classfield.. they are essentially + // in composition with the tqparent class and are arent meant to be out // on their own. Well, this is fine for now, but IF we start allowing // clipping and pasting of these methods between classes/ classfields // then we may have problems (ugh.. I cant imagine allowing this, but @@ -158,7 +158,7 @@ void CodeAccessorMethod::setAttributesFromNode ( TQDomElement & root) { if(newCF) initFields(newCF); else - kError()<<"ERROR: code accessor method cant load parent codeclassfield, corrupt file?"<<endl; + kError()<<"ERROR: code accessor method cant load tqparent codeclassfield, corrupt file?"<<endl; */ // now load/set other local attributes @@ -183,9 +183,9 @@ void CodeAccessorMethod::setAttributesFromObject(TextBlock * obj) } -void CodeAccessorMethod::initFields(CodeClassField * parentClassField ) { +void CodeAccessorMethod::initFields(CodeClassField * tqparentClassField ) { - m_parentclassfield = parentClassField; + m_parentclassfield = tqparentClassField; m_accessorType = GET; m_canDelete = false; // we cant delete these with the codeeditor, delete the UML operation instead. diff --git a/umbrello/umbrello/codeaccessormethod.h b/umbrello/umbrello/codeaccessormethod.h index b03d1524..b144c068 100644 --- a/umbrello/umbrello/codeaccessormethod.h +++ b/umbrello/umbrello/codeaccessormethod.h @@ -27,6 +27,7 @@ class CodeAccessorMethod : public CodeMethodBlock { friend class CodeClassField; Q_OBJECT + TQ_OBJECT public: // some types of accessor methods that are possible: @@ -65,11 +66,11 @@ public: */ void setType ( AccessorType type); - /** Utility method to get the value of the parent object of the parent classifield. + /** Utility method to get the value of the tqparent object of the tqparent classifield. */ // virtual UMLObject * getParentObject(); - bool parentIsAttribute(); + bool tqparentIsAttribute(); /** * Save the XMI representation of this object @@ -103,7 +104,7 @@ protected: virtual void updateContent() = 0; - // a method so the parent code classfield can force code block to release + // a method so the tqparent code classfield can force code block to release void forceRelease (); private: @@ -111,7 +112,7 @@ private: CodeClassField * m_parentclassfield; AccessorType m_accessorType; - void initFields(CodeClassField * parentCF ); + void initFields(CodeClassField * tqparentCF ); }; diff --git a/umbrello/umbrello/codeblock.h b/umbrello/umbrello/codeblock.h index 6575d932..49ad0fe1 100644 --- a/umbrello/umbrello/codeblock.h +++ b/umbrello/umbrello/codeblock.h @@ -33,6 +33,7 @@ class HierarchicalCodeBlock; class CodeBlock : public TextBlock { Q_OBJECT + TQ_OBJECT public: enum ContentType {AutoGenerated=0, UserGenerated }; @@ -43,8 +44,8 @@ public: /** constructor with TQString so we can create & populate it in * one step. */ - explicit CodeBlock ( CodeDocument * parent, const TQString & body = ""); - explicit CodeBlock ( HierarchicalCodeBlock * parent, const TQString & body = "" ); + explicit CodeBlock ( CodeDocument * tqparent, const TQString & body = ""); + explicit CodeBlock ( HierarchicalCodeBlock * tqparent, const TQString & body = "" ); /** * Empty Destructor diff --git a/umbrello/umbrello/codeblockwithcomments.cpp b/umbrello/umbrello/codeblockwithcomments.cpp index 3538f2c2..b4a92825 100644 --- a/umbrello/umbrello/codeblockwithcomments.cpp +++ b/umbrello/umbrello/codeblockwithcomments.cpp @@ -34,10 +34,10 @@ CodeBlockWithComments::CodeBlockWithComments ( HierarchicalCodeBlock * hb, const initFields(hb->getParentDocument(), comment); } -CodeBlockWithComments::CodeBlockWithComments ( CodeDocument * parent , const TQString & body, const TQString & comment) - : CodeBlock (parent, body) +CodeBlockWithComments::CodeBlockWithComments ( CodeDocument * tqparent , const TQString & body, const TQString & comment) + : CodeBlock (tqparent, body) { - initFields(parent, comment); + initFields(tqparent, comment); } CodeBlockWithComments::~CodeBlockWithComments ( ) { } @@ -143,7 +143,7 @@ void CodeBlockWithComments::setAttributesFromNode( TQDomElement & root) } /** - * @return QString + * @return TQString */ TQString CodeBlockWithComments::toString ( ) { @@ -171,9 +171,9 @@ void CodeBlockWithComments::setOverallIndentationLevel ( int level ) m_comment->setIndentationLevel(level); } -void CodeBlockWithComments::initFields(CodeDocument *parent, const TQString& comment) +void CodeBlockWithComments::initFields(CodeDocument *tqparent, const TQString& comment) { - CodeComment * codecomment = CodeGenFactory::newCodeComment(parent); + CodeComment * codecomment = CodeGenFactory::newCodeComment(tqparent); codecomment->setText(comment); m_comment = codecomment; } diff --git a/umbrello/umbrello/codeblockwithcomments.h b/umbrello/umbrello/codeblockwithcomments.h index 2ebb4676..ee7b88eb 100644 --- a/umbrello/umbrello/codeblockwithcomments.h +++ b/umbrello/umbrello/codeblockwithcomments.h @@ -32,6 +32,7 @@ class HierarchicalCodeBlock; class CodeBlockWithComments : public CodeBlock { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -61,7 +62,7 @@ public: CodeComment * getComment ( ); /** - * @return QString + * @return TQString */ virtual TQString toString ( ); @@ -100,7 +101,7 @@ private: CodeComment * m_comment; - void initFields(CodeDocument *parent, const TQString& comment); + void initFields(CodeDocument *tqparent, const TQString& comment); }; diff --git a/umbrello/umbrello/codeclassfield.cpp b/umbrello/umbrello/codeclassfield.cpp index 85686a3b..0a108a18 100644 --- a/umbrello/umbrello/codeclassfield.cpp +++ b/umbrello/umbrello/codeclassfield.cpp @@ -52,7 +52,7 @@ CodeClassField::CodeClassField ( ClassifierCodeDocument * doc , UMLAttribute * a CodeClassField::~CodeClassField ( ) { - // remove methods from parent document + // remove methods from tqparent document CodeAccessorMethodList list = m_methodVector; for(CodeAccessorMethod * m = list.first(); m ; m=list.next()) { @@ -61,7 +61,7 @@ CodeClassField::~CodeClassField ( ) { } list.clear(); - // clear the decl block from parent text block list too + // clear the decl block from tqparent text block list too if(m_declCodeBlock) { getParentDocument()->removeTextBlock(m_declCodeBlock); @@ -82,8 +82,8 @@ CodeClassField::~CodeClassField ( ) { void CodeClassField::setParentUMLObject (UMLObject * obj) { UMLRole *role = dynamic_cast<UMLRole*>(obj); if(role) { - UMLAssociation * parentAssoc = role->getParentAssociation(); - Uml::Association_Type atype = parentAssoc->getAssocType(); + UMLAssociation * tqparentAssoc = role->getParentAssociation(); + Uml::Association_Type atype = tqparentAssoc->getAssocType(); m_parentIsAttribute = false; if ( atype == Uml::at_Association || atype == Uml::at_Association_Self) @@ -103,7 +103,7 @@ void CodeClassField::setParentUMLObject (UMLObject * obj) { TQString CodeClassField::getTypeName ( ) { - if (parentIsAttribute()) + if (tqparentIsAttribute()) { UMLAttribute * at = (UMLAttribute*) getParentObject(); return at->getTypeName(); @@ -121,7 +121,7 @@ TQString CodeClassField::getTypeName ( ) { // of objects (as per specification of associations) TQString CodeClassField::getListObjectType() { TQString type = TQString (""); - if (!parentIsAttribute()) + if (!tqparentIsAttribute()) { UMLRole * role = dynamic_cast<UMLRole*>(getParentObject()); type = getUMLObjectName(role->getObject()); @@ -133,7 +133,7 @@ TQString CodeClassField::getListObjectType() { * Get the value of m_isAbstract * @return the value of m_isAbstract */ -bool CodeClassField::parentIsAttribute ( ) { +bool CodeClassField::tqparentIsAttribute ( ) { return m_parentIsAttribute; // return (m_classFieldType == Attribute) ? true : false; } @@ -171,8 +171,8 @@ bool CodeClassField::addMethod ( CodeAccessorMethod * add_object ) { if(findMethodByType(type)) return false; /* - // this wont work as the key for TQMap needs to inherit from QObject - if(m_methodMap->contains(type)) + // this wont work as the key for TQMap needs to inherit from TQObject + if(m_methodMap->tqcontains(type)) return false; // return false, we already have some object with this tag in the list else m_methodMap->insert(type, add_object); @@ -270,10 +270,10 @@ void CodeClassField::setAttributesFromNode ( TQDomElement & root) { // always disconnect getParentObject()->disconnect(this); - // superclass call.. may reset the parent object + // superclass call.. may reset the tqparent object CodeParameter::setAttributesFromNode(root); - // make AFTER super-class call. This will reconnect to the parent + // make AFTER super-class call. This will reconnect to the tqparent // and re-check we have all needed child accessor methods and decl blocks initFields( ); @@ -301,7 +301,7 @@ void CodeClassField::setAttributesFromNode ( TQDomElement & root) { } else if( tag == "header" ) { - // this is treated in parent.. skip over here + // this is treated in tqparent.. skip over here } else kWarning()<<"ERROR: bad savefile? code classfield loadFromXMI got child element with unknown tag:"<<tag<<" ignoring node."<<endl; @@ -323,7 +323,7 @@ void CodeClassField::saveToXMI ( TQDomDocument & doc, TQDomElement & root ) { } int CodeClassField::minimumListOccurances( ) { - if (!parentIsAttribute()) + if (!tqparentIsAttribute()) { UMLRole * role = dynamic_cast<UMLRole*>(getParentObject()); TQString multi = role->getMultiplicity(); @@ -331,7 +331,7 @@ int CodeClassField::minimumListOccurances( ) { if(!multi.isEmpty()) { TQString lowerBoundString = multi.remove(TQRegExp("\\.\\.\\d+$")); - if(!lowerBoundString.isEmpty() &&lowerBoundString.contains(TQRegExp("^\\d+$"))) + if(!lowerBoundString.isEmpty() &&lowerBoundString.tqcontains(TQRegExp("^\\d+$"))) return lowerBoundString.toInt(); } @@ -340,7 +340,7 @@ int CodeClassField::minimumListOccurances( ) { } int CodeClassField::maximumListOccurances( ) { - if (!parentIsAttribute()) + if (!tqparentIsAttribute()) { UMLRole * role = dynamic_cast<UMLRole*>(getParentObject()); TQString multi = role->getMultiplicity(); @@ -348,7 +348,7 @@ int CodeClassField::maximumListOccurances( ) { if(!multi.isEmpty()) { TQString upperBoundString = multi.section(TQRegExp("(\\.\\.)"),1); - if(!upperBoundString.isEmpty() && upperBoundString.contains(TQRegExp("^\\d+$"))) + if(!upperBoundString.isEmpty() && upperBoundString.tqcontains(TQRegExp("^\\d+$"))) return upperBoundString.toInt(); else return -1; // unbounded @@ -392,7 +392,7 @@ CodeAccessorMethod * CodeClassField::findMethodByType ( CodeAccessorMethod::Acce //if we already know to which file this class was written/should be written, just return it. /* // argh. this wont work because "accessorType' doesn't inherit from TQObject. - if(m_methodMap->contains(type)) + if(m_methodMap->tqcontains(type)) return ((*m_methodMap)[type]); CodeAccessorMethod * obj = NULL; */ @@ -422,7 +422,7 @@ void CodeClassField::initAccessorMethods() { // everything gets potential get/set method - //if(!m_methodMap->contains(CodeAccessorMethod::GET)) + //if(!m_methodMap->tqcontains(CodeAccessorMethod::GET)) if(!findMethodByType(CodeAccessorMethod::GET)) { CodeAccessorMethod * method = CodeGenFactory::newCodeAccessorMethod (getParentDocument(), this, CodeAccessorMethod::GET); @@ -444,7 +444,7 @@ void CodeClassField::initAccessorMethods() // add in the add,remove and list methods for things which are role based. // (and only used if the role specifies a 'list' type object - if (!parentIsAttribute()) { + if (!tqparentIsAttribute()) { if(!findMethodByType(CodeAccessorMethod::ADD)) { @@ -482,10 +482,10 @@ void CodeClassField::updateContent() { // Set properties for writing out the various methods derived from UMLRoles. - // I suppose this could be supported under individual accessor method synctoparent + // I suppose this could be supported under individual accessor method synctotqparent // calls, but its going to happen again and again for many languages. Why not a catch // all here? -b.t. - if (parentIsAttribute()) + if (tqparentIsAttribute()) { for ( CodeAccessorMethod *method = m_methodVector.first(); method; method = m_methodVector.next() ) @@ -569,14 +569,14 @@ void CodeClassField::updateContent() } } -// determine whether the parent object in this classfield indicates that it is +// determine whether the tqparent object in this classfield indicates that it is // a single variable or a List (Vector). One day this will be done correctly with special // multiplicity object that we don't have to figure out what it means via regex. bool CodeClassField::fieldIsSingleValue ( ) { // For the time being, all attributes ARE single values (yes, // I know this isnt always true, but we have to start somewhere.) - if(parentIsAttribute()) + if(tqparentIsAttribute()) return true; UMLRole * role = dynamic_cast<UMLRole*>(getParentObject()); @@ -585,8 +585,8 @@ bool CodeClassField::fieldIsSingleValue ( ) TQString multi = role->getMultiplicity(); - if(multi.isEmpty() || multi.contains(TQRegExp("^(0|1)$")) - || multi.contains(TQRegExp("^0\\.\\.1$"))) + if(multi.isEmpty() || multi.tqcontains(TQRegExp("^(0|1)$")) + || multi.tqcontains(TQRegExp("^0\\.\\.1$"))) return true; return false; diff --git a/umbrello/umbrello/codeclassfield.h b/umbrello/umbrello/codeclassfield.h index d5542bd3..10efbbae 100644 --- a/umbrello/umbrello/codeclassfield.h +++ b/umbrello/umbrello/codeclassfield.h @@ -40,6 +40,7 @@ class UMLRole; class CodeClassField : public CodeParameter { Q_OBJECT + TQ_OBJECT public: enum ClassFieldType { Attribute, PlainAssociation, Self, Aggregation, Composition, Unknown_Assoc }; @@ -50,8 +51,8 @@ public: /** * Constructors */ - CodeClassField ( ClassifierCodeDocument * parentDoc , UMLAttribute * attrib ); - CodeClassField ( ClassifierCodeDocument * parentDoc , UMLRole * role); + CodeClassField ( ClassifierCodeDocument * tqparentDoc , UMLAttribute * attrib ); + CodeClassField ( ClassifierCodeDocument * tqparentDoc , UMLRole * role); /** * Finish off initializations of the object. @@ -102,7 +103,7 @@ public: */ CodeAccessorMethod * findMethodByType(CodeAccessorMethod::AccessorType type, int role_id = -1); - /** Determine whether the parent object in this classfield indicates that it is + /** Determine whether the tqparent object in this classfield indicates that it is * a single variable or a List (Vector). One day this will be done correctly with special * multiplicity object. */ @@ -113,8 +114,8 @@ public: */ ClassFieldType getClassFieldType(); - // quick utility call to figure out if parent is an attribute or not - bool parentIsAttribute ( ); + // quick utility call to figure out if tqparent is an attribute or not + bool tqparentIsAttribute ( ); // get the type of object that will be added/removed from lists // of objects (as per specification of associations) @@ -163,7 +164,7 @@ public: protected: - /** Set the parent UMLobject appropriately. + /** Set the tqparent UMLobject appropriately. */ void setParentUMLObject (UMLObject * obj); diff --git a/umbrello/umbrello/codeclassfielddeclarationblock.cpp b/umbrello/umbrello/codeclassfielddeclarationblock.cpp index ba7c6878..5283cb38 100644 --- a/umbrello/umbrello/codeclassfielddeclarationblock.cpp +++ b/umbrello/umbrello/codeclassfielddeclarationblock.cpp @@ -14,7 +14,7 @@ */ /** basicially a class to allow for syncronization of the contents based on the - * values of the parentClassField's parentObject + * values of the tqparentClassField's tqparentObject */ #include "codeclassfielddeclarationblock.h" @@ -24,11 +24,11 @@ // Constructors/Destructors // -CodeClassFieldDeclarationBlock::CodeClassFieldDeclarationBlock ( CodeClassField * parentCF ) - : CodeBlockWithComments ( (CodeDocument*) parentCF->getParentDocument() ), - OwnedCodeBlock ((UMLObject*) parentCF->getParentObject()) +CodeClassFieldDeclarationBlock::CodeClassFieldDeclarationBlock ( CodeClassField * tqparentCF ) + : CodeBlockWithComments ( (CodeDocument*) tqparentCF->getParentDocument() ), + OwnedCodeBlock ((UMLObject*) tqparentCF->getParentObject()) { - init(parentCF); + init(tqparentCF); } CodeClassFieldDeclarationBlock::~CodeClassFieldDeclarationBlock ( ) { @@ -51,7 +51,7 @@ CodeClassField * CodeClassFieldDeclarationBlock::getParentClassField ( ) { return m_parentclassfield; } -/** Get the parent object of the parentCodeClassfield +/** Get the tqparent object of the tqparentCodeClassfield */ UMLObject * CodeClassFieldDeclarationBlock::getParentObject ( ) { return m_parentclassfield->getParentObject(); @@ -141,12 +141,12 @@ void CodeClassFieldDeclarationBlock::syncToParent () { // for role-based accessors, we DONT write ourselves out when // the name of the role is not defined. - if(!(getParentClassField()->parentIsAttribute())) + if(!(getParentClassField()->tqparentIsAttribute())) { - UMLRole * parent = dynamic_cast<UMLRole*>(getParentObject()); - if (parent == NULL) + UMLRole * tqparent = dynamic_cast<UMLRole*>(getParentObject()); + if (tqparent == NULL) return; - if(parent->getName().isEmpty()) + if(tqparent->getName().isEmpty()) { getComment()->setWriteOutText(false); setWriteOutText(false); @@ -164,9 +164,9 @@ void CodeClassFieldDeclarationBlock::syncToParent () { } -void CodeClassFieldDeclarationBlock::init (CodeClassField * parentCF) +void CodeClassFieldDeclarationBlock::init (CodeClassField * tqparentCF) { - m_parentclassfield = parentCF; + m_parentclassfield = tqparentCF; m_canDelete = false; connect(m_parentclassfield,TQT_SIGNAL(modified()),this,TQT_SLOT(syncToParent())); } diff --git a/umbrello/umbrello/codeclassfielddeclarationblock.h b/umbrello/umbrello/codeclassfielddeclarationblock.h index 62bfb031..285416e3 100644 --- a/umbrello/umbrello/codeclassfielddeclarationblock.h +++ b/umbrello/umbrello/codeclassfielddeclarationblock.h @@ -28,13 +28,14 @@ class CodeClassField; * class CodeClassFieldDeclarationBlock * Used to declare classifier fields (e.g. either class attributes or classifier * associations) in the code document for any given code classfield. This is a - * special CodeBlockWithComments which is "sync'd" to the parent CodeClassField. + * special CodeBlockWithComments which is "sync'd" to the tqparent CodeClassField. */ class CodeClassFieldDeclarationBlock : public CodeBlockWithComments, public OwnedCodeBlock { friend class CodeClassField; Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -43,7 +44,7 @@ public: /** * Constructor */ - CodeClassFieldDeclarationBlock (CodeClassField * parent); + CodeClassFieldDeclarationBlock (CodeClassField * tqparent); /** * Empty Destructor @@ -56,11 +57,11 @@ public: */ CodeClassField * getParentClassField ( ); - /** A Utility method to get the parent object of the parentCodeClassfield + /** A Utility method to get the tqparent object of the tqparentCodeClassfield */ UMLObject * getParentObject ( ); - // get the parent document + // get the tqparent document CodeDocument * getParentDocument ( ); /** @@ -95,13 +96,13 @@ protected: */ virtual void updateContent() = 0; - // so parent can actually release this block + // so tqparent can actually release this block void forceRelease (); private: CodeClassField * m_parentclassfield; - void init(CodeClassField * parent); + void init(CodeClassField * tqparent); public slots: diff --git a/umbrello/umbrello/codecomment.cpp b/umbrello/umbrello/codecomment.cpp index 78873e3d..b172c3c2 100644 --- a/umbrello/umbrello/codecomment.cpp +++ b/umbrello/umbrello/codecomment.cpp @@ -47,7 +47,7 @@ void CodeComment::saveToXMI ( TQDomDocument & doc, TQDomElement & root ) { kDebug() << "CodeComment::saveToXMI is called!" << endl; TQDomElement blockElement = doc.createElement( "codecomment" ); setAttributesOnNode(doc, blockElement); // as we added no additional fields to this class we may - // just use parent TextBlock method + // just use tqparent TextBlock method root.appendChild( blockElement ); } diff --git a/umbrello/umbrello/codecomment.h b/umbrello/umbrello/codecomment.h index 6f8c7ceb..b8c10127 100644 --- a/umbrello/umbrello/codecomment.h +++ b/umbrello/umbrello/codecomment.h @@ -31,6 +31,7 @@ class CodeComment : public TextBlock { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors diff --git a/umbrello/umbrello/codedocument.cpp b/umbrello/umbrello/codedocument.cpp index f6092f09..0a183a93 100644 --- a/umbrello/umbrello/codedocument.cpp +++ b/umbrello/umbrello/codedocument.cpp @@ -112,11 +112,11 @@ TQString CodeDocument::getPath ( ) { path = path.simplifyWhiteSpace(); // Replace all blanks with underscore - path.replace(TQRegExp(" "), "_"); + path.tqreplace(TQRegExp(" "), "_"); // this allows multiple directory paths (ala Java, some other languages) // in from the package specification - path.replace(TQRegExp("\\."),"/"); // Simple hack!.. but this is more or less language + path.tqreplace(TQRegExp("\\."),"/"); // Simple hack!.. but this is more or less language // dependant and should probably be commented out. // Still, as a general default it may be useful -b.t. return path; @@ -215,7 +215,7 @@ bool CodeDocument::insertTextBlock(TextBlock * newBlock, TextBlock * existingBlo if(!findTextBlockByTag(tag, true)) return false; - int index = m_textblockVector.findRef(existingBlock); + int index = m_textblockVector.tqfindRef(existingBlock); if(index < 0) { // may be hiding in child hierarchical codeblock @@ -242,7 +242,7 @@ bool CodeDocument::insertTextBlock(TextBlock * newBlock, TextBlock * existingBlo newBlock->setTag(new_tag); } - if(m_textBlockTagMap.contains(new_tag)) + if(m_textBlockTagMap.tqcontains(new_tag)) return false; // return false, we already have some object with this tag in the list else m_textBlockTagMap.insert(new_tag, newBlock); @@ -278,10 +278,10 @@ void CodeDocument::updateHeader () { //try to find a heading file (license, coments, etc) then extract its text TQString headingText = UMLApp::app()->getCommonPolicy()->getHeadingFile(getFileExtension()); - headingText.replace(TQRegExp("%filename%"),getFileName()+getFileExtension()); - headingText.replace(TQRegExp("%filepath%"),getPath()); - headingText.replace( TQRegExp("%time%"), TQTime::currentTime().toString()); - headingText.replace( TQRegExp("%date%"), TQDate::currentDate().toString()); + headingText.tqreplace(TQRegExp("%filename%"),getFileName()+getFileExtension()); + headingText.tqreplace(TQRegExp("%filepath%"),getPath()); + headingText.tqreplace( TQRegExp("%time%"), TQTime::currentTime().toString()); + headingText.tqreplace( TQRegExp("%date%"), TQDate::tqcurrentDate().toString()); getHeader()->setText(headingText); @@ -295,7 +295,7 @@ void CodeDocument::updateHeader () { /** * create the string representation of this object. - * @return QString + * @return TQString */ TQString CodeDocument::toString ( ) { @@ -364,7 +364,7 @@ void CodeDocument::setAttributesOnNode ( TQDomDocument & doc, TQDomElement & doc docElement.appendChild( commElement); // doc codePolicy? - // FIX: store ONLY if different from the parent generator + // FIX: store ONLY if different from the tqparent generator // policy.. something which is not possible right now. -b.t. } @@ -380,7 +380,7 @@ void CodeDocument::setAttributesFromNode ( TQDomElement & root) { TQString pkgStr = root.attribute("package",""); if (!pkgStr.isEmpty() && pkgStr != "-1") { UMLDoc *umldoc = UMLApp::app()->getDocument(); - if (pkgStr.contains( TQRegExp("\\D") )) { + if (pkgStr.tqcontains( TQRegExp("\\D") )) { // suspecting pre-1.5.3 file format where the package name was // saved instead of the package ID. UMLObject *o = umldoc->findUMLObject(pkgStr); @@ -467,11 +467,11 @@ void CodeDocument::addChildTagToMap ( const TQString &tag, TextBlock * tb) TextBlock * CodeDocument::findTextBlockByTag( const TQString &tag , bool descendIntoChildren) { //if we already know to which file this class was written/should be written, just return it. - if(m_textBlockTagMap.contains(tag)) + if(m_textBlockTagMap.tqcontains(tag)) return m_textBlockTagMap[tag]; if (descendIntoChildren) - if(m_childTextBlockTagMap.contains(tag)) + if(m_childTextBlockTagMap.tqcontains(tag)) return m_childTextBlockTagMap[tag]; return (TextBlock*) NULL; diff --git a/umbrello/umbrello/codedocument.h b/umbrello/umbrello/codedocument.h index 18c26d01..a3ea7f36 100644 --- a/umbrello/umbrello/codedocument.h +++ b/umbrello/umbrello/codedocument.h @@ -46,6 +46,7 @@ class CodeDocument : public TQObject, public CodeGenObjectWithTextBlocks { friend class HierarchicalCodeBlock; Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -167,7 +168,7 @@ public: /** * create the string representation of this object. - * @return QString + * @return TQString */ virtual TQString toString ( ); diff --git a/umbrello/umbrello/codegenerationpolicy.cpp b/umbrello/umbrello/codegenerationpolicy.cpp index 5f7b9824..12db5f5e 100644 --- a/umbrello/umbrello/codegenerationpolicy.cpp +++ b/umbrello/umbrello/codegenerationpolicy.cpp @@ -514,7 +514,7 @@ TQString CodeGenerationPolicy::getHeadingFile(const TQString& str) { if(!getIncludeHeadings() || str.isEmpty()) return TQString(""); - if(str.contains(" ") ||str.contains(";")) { + if(str.tqcontains(" ") ||str.tqcontains(";")) { kWarning() << "File folder must not have spaces or semi colons!" << endl; return TQString(""); } @@ -549,10 +549,10 @@ TQString CodeGenerationPolicy::getHeadingFile(const TQString& str) { retstr += ts.readLine()+endLine; //do variable substitution - retstr.replace( TQRegExp("%author%"),TQString(getenv("USER"))); //get the user name from some where else - retstr.replace( TQRegExp("%headingpath%"),filename ); - retstr.replace( TQRegExp("%time%"), TQTime::currentTime().toString()); - retstr.replace( TQRegExp("%date%"), TQDate::currentDate().toString()); + retstr.tqreplace( TQRegExp("%author%"),TQString(getenv("USER"))); //get the user name from some where else + retstr.tqreplace( TQRegExp("%headingpath%"),filename ); + retstr.tqreplace( TQRegExp("%time%"), TQTime::currentTime().toString()); + retstr.tqreplace( TQRegExp("%date%"), TQDate::tqcurrentDate().toString()); // the replace filepath, time parts are also in the code document updateHeader method // (which is not a virtual function)... diff --git a/umbrello/umbrello/codegenerationpolicy.h b/umbrello/umbrello/codegenerationpolicy.h index 87925bb4..1876fced 100644 --- a/umbrello/umbrello/codegenerationpolicy.h +++ b/umbrello/umbrello/codegenerationpolicy.h @@ -34,6 +34,7 @@ class CodeGenerationPolicyPage; class CodeGenerationPolicy : public TQObject { Q_OBJECT + TQ_OBJECT public: /** @@ -289,7 +290,7 @@ public: * Create a new dialog interface for this object. * @return dialog object */ - virtual CodeGenerationPolicyPage * createPage ( TQWidget *parent = 0, const char * name = 0); + virtual CodeGenerationPolicyPage * createPage ( TQWidget *tqparent = 0, const char * name = 0); /** * Gets the heading file (as a string) to be inserted at the diff --git a/umbrello/umbrello/codegenerator.cpp b/umbrello/umbrello/codegenerator.cpp index a5b24cee..010c4e92 100644 --- a/umbrello/umbrello/codegenerator.cpp +++ b/umbrello/umbrello/codegenerator.cpp @@ -116,7 +116,7 @@ TQString CodeGenerator::getUniqueID(CodeDocument * codeDoc) CodeDocument * CodeGenerator::findCodeDocumentByID( const TQString &tag ) { //if we already know to which file this class was written/should be written, just return it. CodeDocument * doc = (CodeDocument*)NULL; - if((doc = m_codeDocumentDictionary.find(tag))) + if((doc = m_codeDocumentDictionary.tqfind(tag))) return doc; return doc; @@ -133,7 +133,7 @@ bool CodeGenerator::addCodeDocument ( CodeDocument * doc ) doc->setID(tag); } - if(m_codeDocumentDictionary.find(tag)) + if(m_codeDocumentDictionary.tqfind(tag)) return false; // return false, we already have some object with this tag in the list else m_codeDocumentDictionary.insert(tag, doc); @@ -166,10 +166,10 @@ CodeDocumentList * CodeGenerator::getCodeDocumentList ( ) { } // the vanilla version -CodeViewerDialog * CodeGenerator::getCodeViewerDialog ( TQWidget* parent, CodeDocument *doc, +CodeViewerDialog * CodeGenerator::getCodeViewerDialog ( TQWidget* tqparent, CodeDocument *doc, Settings::CodeViewerState state) { - return new CodeViewerDialog(parent, doc, state); + return new CodeViewerDialog(tqparent, doc, state); } // Other methods @@ -227,7 +227,7 @@ void CodeGenerator::saveToXMI ( TQDomDocument & doc, TQDomElement & root ) { } /** - * Initialize this code generator from its parent UMLDoc. When this is called, it will + * Initialize this code generator from its tqparent UMLDoc. When this is called, it will * (re-)generate the list of code documents for this project (generator) by checking * for new objects/attributes which have been added or changed in the documnet. One or more * CodeDocuments will be created/overwritten/amended as is appropriate for the given language. @@ -261,7 +261,7 @@ void CodeGenerator::initFromParentDocument( ) { } /** - * Force a synchronize of this code generator, and its present contents, to that of the parent UMLDocument. + * Force a synchronize of this code generator, and its present contents, to that of the tqparent UMLDocument. * "UserGenerated" code will be preserved, but Autogenerated contents will be updated/replaced * or removed as is apppropriate. */ @@ -373,7 +373,7 @@ CodeDocument * CodeGenerator::newCodeDocument ( ) { } /** - * @return QString + * @return TQString * @param file */ @@ -382,7 +382,7 @@ TQString CodeGenerator::getHeadingFile( const TQString &file ) { } /** - * @return QString + * @return TQString * @param codeDoc * @param name */ @@ -470,7 +470,7 @@ bool CodeGenerator::openFile (TQFile & file, const TQString &fileName ) { TQDir outputDirectory = UMLApp::app()->getCommonPolicy()->getOutputDirectory(); file.setName(outputDirectory.absFilePath(fileName)); if(!file.open(IO_WriteOnly)) { - KMessageBox::sorry(0,i18n("Cannot open file %1 for writing. Please make sure the folder exists and you have permissions to write to it.").arg(file.name()),i18n("Cannot Open File")); + KMessageBox::sorry(0,i18n("Cannot open file %1 for writing. Please make sure the folder exists and you have permissions to write to it.").tqarg(file.name()),i18n("Cannot Open File")); return false; } return true; @@ -480,12 +480,12 @@ bool CodeGenerator::openFile (TQFile & file, const TQString &fileName ) { /** - * @return QString + * @return TQString * @param name */ TQString CodeGenerator::cleanName ( const TQString &name ) { TQString retval = name; - retval.replace(TQRegExp("\\W"), "_"); + retval.tqreplace(TQRegExp("\\W"), "_"); return retval; } @@ -499,7 +499,7 @@ TQString CodeGenerator::findFileName ( CodeDocument * codeDocument ) { // if path is given add this as a directory to the file name if (!path.isEmpty()) { - path.replace(TQRegExp("::"), "/"); // Simple hack! + path.tqreplace(TQRegExp("::"), "/"); // Simple hack! name = path + '/' + codeDocument->getFileName(); path = '/' + path; } else { @@ -507,7 +507,7 @@ TQString CodeGenerator::findFileName ( CodeDocument * codeDocument ) { } // Convert all "::" to "/" : Platform-specific path separator - name.replace(TQRegExp("::"), "/"); // Simple hack! + name.tqreplace(TQRegExp("::"), "/"); // Simple hack! // if a path name exists check the existence of the path directory if (!path.isEmpty()) { @@ -539,7 +539,7 @@ TQString CodeGenerator::findFileName ( CodeDocument * codeDocument ) { } name.simplifyWhiteSpace(); - name.replace(TQRegExp(" "),"_"); + name.tqreplace(TQRegExp(" "),"_"); return overwritableName( name, codeDocument->getFileExtension() ); } @@ -584,7 +584,7 @@ void CodeGenerator::findObjectsRelated(UMLClassifier *c, UMLPackageList &cList) } // now add in list ONLY if its not already there - if(temp && !cList.containsRef(temp)) + if(temp && !cList.tqcontainsRef(temp)) cList.append(temp); } @@ -594,13 +594,13 @@ void CodeGenerator::findObjectsRelated(UMLClassifier *c, UMLPackageList &cList) temp =0; //check return value temp =(UMLClassifier*) op->getType(); - if (temp && temp->getBaseType() != Uml::ot_Datatype && !cList.containsRef(temp)) + if (temp && temp->getBaseType() != Uml::ot_Datatype && !cList.tqcontainsRef(temp)) cList.append(temp); //check parameters UMLAttributeList atl = op->getParmList(); for (UMLAttribute *at = atl.first(); at; at = atl.next()) { temp = (UMLClassifier*)at->getType(); - if (temp && temp->getBaseType() != Uml::ot_Datatype && !cList.containsRef(temp)) + if (temp && temp->getBaseType() != Uml::ot_Datatype && !cList.tqcontainsRef(temp)) cList.append(temp); } @@ -612,7 +612,7 @@ void CodeGenerator::findObjectsRelated(UMLClassifier *c, UMLPackageList &cList) for (UMLAttribute *at = atl.first(); at; at = atl.next()) { temp=0; temp = (UMLClassifier*) at->getType(); - if (temp && temp->getBaseType() != Uml::ot_Datatype && !cList.containsRef(temp)) + if (temp && temp->getBaseType() != Uml::ot_Datatype && !cList.tqcontainsRef(temp)) cList.append(temp); } } @@ -622,7 +622,7 @@ void CodeGenerator::findObjectsRelated(UMLClassifier *c, UMLPackageList &cList) /** * Format an output document. - * @return QString + * @return TQString * @param text * @param lineprefix * @param linewidth @@ -640,7 +640,7 @@ TQString CodeGenerator::formatDoc(const TQString &text, const TQString &linePref continue; } int index; - while ((index = input.findRev(" ", lineWidth)) >= 0) { + while ((index = input.tqfindRev(" ", lineWidth)) >= 0) { output += linePrefix + input.left(index) + endLine; // add line input.remove(0, index + 1); //and remove processed string, including // white space @@ -706,7 +706,7 @@ bool CodeGenerator::isReservedKeyword(const TQString & keyword) { const TQStringList keywords = reservedKeywords(); - return keywords.contains(keyword); + return keywords.tqcontains(keyword); } const TQStringList CodeGenerator::reservedKeywords() const { diff --git a/umbrello/umbrello/codegenerator.h b/umbrello/umbrello/codegenerator.h index d47fd73f..eedec15d 100644 --- a/umbrello/umbrello/codegenerator.h +++ b/umbrello/umbrello/codegenerator.h @@ -81,6 +81,7 @@ class KConfig; class CodeGenerator : public TQObject { Q_OBJECT + TQ_OBJECT public: @@ -200,7 +201,7 @@ public: * %time% * %filepath% * - * @return QString + * @return TQString * @param file */ virtual TQString getHeadingFile (const TQString &file ); @@ -218,7 +219,7 @@ public: /** * Replaces spaces with underscores and capitalises as defined in m_modname - * @return QString + * @return TQString * @param name */ static TQString cleanName ( const TQString &name ); @@ -280,7 +281,7 @@ public: /** Get the editing dialog for this code document */ - virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* parent, CodeDocument * doc, + virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* tqparent, CodeDocument * doc, Settings::CodeViewerState state); /** @@ -303,7 +304,7 @@ public: virtual void createDefaultStereotypes (); /** - * Initialize this code generator from its parent UMLDoc. When this is called, + * Initialize this code generator from its tqparent UMLDoc. When this is called, * it will (re-)generate the list of code documents for this project (generator) * by checking for new objects/attributes which have been added or changed in the * document. One or more CodeDocuments will be created/overwritten/amended as is @@ -339,7 +340,7 @@ protected: * @param name the proposed output file name * @param extension the extension to use * @return the real file name that should be used (including extension) or - * TQString::null if none to be used + * TQString() if none to be used */ TQString overwritableName (const TQString& name, const TQString &extension ); @@ -393,7 +394,7 @@ public slots: virtual void checkRemoveUMLObject (UMLObject * obj); /** - * Force a synchronize of this code generator, and its present contents, to that of the parent UMLDocument. + * Force a synchronize of this code generator, and its present contents, to that of the tqparent UMLDocument. * "UserGenerated" code will be preserved, but Autogenerated contents will be updated/replaced * or removed as is apppropriate. */ diff --git a/umbrello/umbrello/codegenerators/adawriter.cpp b/umbrello/umbrello/codegenerators/adawriter.cpp index ec2bf59a..475be180 100644 --- a/umbrello/umbrello/codegenerators/adawriter.cpp +++ b/umbrello/umbrello/codegenerators/adawriter.cpp @@ -124,7 +124,7 @@ void AdaWriter::computeAssocTypeAndRole(UMLClassifier *c, return; const TQString multi = a->getMulti(Uml::B); bool hasNonUnityMultiplicity = (!multi.isEmpty() && multi != "1"); - hasNonUnityMultiplicity &= !multi.contains(TQRegExp("^1 *\\.\\. *1$")); + hasNonUnityMultiplicity &= !multi.tqcontains(TQRegExp("^1 *\\.\\. *1$")); roleName = cleanName(a->getRoleName(Uml::B)); if (roleName.isEmpty()) roleName = cleanName(a->getName()); @@ -154,7 +154,7 @@ void AdaWriter::writeClass(UMLClassifier *c) { const bool isClass = !c->isInterface(); TQString classname = cleanName(c->getName()); TQString fileName = packageName(c).lower(); - fileName.replace('.', '-'); + fileName.tqreplace('.', '-'); //find an appropriate name for our file fileName = overwritableName(c, fileName, ".ads"); @@ -176,8 +176,8 @@ void AdaWriter::writeClass(UMLClassifier *c) { TQString str; str = getHeadingFile(".ads"); if (!str.isEmpty()) { - str.replace(TQRegExp("%filename%"), fileName); - str.replace(TQRegExp("%filepath%"), file.name()); + str.tqreplace(TQRegExp("%filename%"), fileName); + str.tqreplace(TQRegExp("%filepath%"), file.name()); ada << str << endl; } @@ -298,8 +298,8 @@ void AdaWriter::writeClass(UMLClassifier *c) { ada << "tagged "; } else { // FIXME: Multiple inheritance is not yet supported - UMLClassifier* parent = superclasses.first(); - ada << "new " << className(parent, false) << " with "; + UMLClassifier* tqparent = superclasses.first(); + ada << "new " << className(tqparent, false) << " with "; } ada << "private;" << m_endl << m_endl; ada << getIndent() << "type " << name << "_Ptr is access all " << name << "'Class;" << m_endl << m_endl; @@ -363,8 +363,8 @@ void AdaWriter::writeClass(UMLClassifier *c) { ada << "tagged "; } else { // FIXME: Multiple inheritance is not yet supported - UMLClassifier* parent = superclasses.first(); - ada << "new " << className(parent, false) << " with "; + UMLClassifier* tqparent = superclasses.first(); + ada << "new " << className(tqparent, false) << " with "; } ada << "record" << m_endl; m_indentLevel++; @@ -483,9 +483,9 @@ void AdaWriter::writeOperation(UMLOperation *op, TQTextStream &ada, bool is_comm ada << cleanName(op->getName()) << " "; if (! (op->getStatic() && atl.count() == 0)) ada << "("; - UMLClassifier *parentClassifier = static_cast<UMLClassifier*>(op->getUMLPackage()); + UMLClassifier *tqparentClassifier = static_cast<UMLClassifier*>(op->getUMLPackage()); if (! op->getStatic()) { - ada << "Self : access " << className(parentClassifier); + ada << "Self : access " << className(tqparentClassifier); if (atl.count()) ada << ";" << m_endl; } diff --git a/umbrello/umbrello/codegenerators/adawriter.h b/umbrello/umbrello/codegenerators/adawriter.h index 779fc7d5..09e2e543 100644 --- a/umbrello/umbrello/codegenerators/adawriter.h +++ b/umbrello/umbrello/codegenerators/adawriter.h @@ -32,6 +32,7 @@ class UMLOperation; */ class AdaWriter : public SimpleCodeGenerator { Q_OBJECT + TQ_OBJECT public: /** diff --git a/umbrello/umbrello/codegenerators/aswriter.cpp b/umbrello/umbrello/codegenerators/aswriter.cpp index e973a55e..e99559f2 100644 --- a/umbrello/umbrello/codegenerators/aswriter.cpp +++ b/umbrello/umbrello/codegenerators/aswriter.cpp @@ -67,8 +67,8 @@ void ASWriter::writeClass(UMLClassifier *c) str = getHeadingFile(".as"); if(!str.isEmpty()) { - str.replace(TQRegExp("%filename%"),fileName+".as"); - str.replace(TQRegExp("%filepath%"),fileas.name()); + str.tqreplace(TQRegExp("%filename%"),fileName+".as"); + str.tqreplace(TQRegExp("%filepath%"),fileas.name()); as << str << m_endl; } @@ -602,7 +602,7 @@ const TQStringList ASWriter::reservedKeywords() const { << "or" << "ord" << "_parent" - << "parentNode" + << "tqparentNode" << "parseFloat" << "parseInt" << "parseXML" diff --git a/umbrello/umbrello/codegenerators/aswriter.h b/umbrello/umbrello/codegenerators/aswriter.h index 75399f13..8156a04b 100644 --- a/umbrello/umbrello/codegenerators/aswriter.h +++ b/umbrello/umbrello/codegenerators/aswriter.h @@ -28,6 +28,7 @@ */ class ASWriter : public SimpleCodeGenerator { Q_OBJECT + TQ_OBJECT public: ASWriter(); diff --git a/umbrello/umbrello/codegenerators/codegenfactory.cpp b/umbrello/umbrello/codegenerators/codegenfactory.cpp index 00401653..471d8f4c 100644 --- a/umbrello/umbrello/codegenerators/codegenfactory.cpp +++ b/umbrello/umbrello/codegenerators/codegenfactory.cpp @@ -161,7 +161,7 @@ CodeGenerator* createObject(Uml::Programming_Language pl) { obj = new RubyWriter(); break; case Uml::pl_SQL: - obj = new SQLWriter(); + obj = new STQLWriter(); break; case Uml::pl_Tcl: obj = new TclWriter(); diff --git a/umbrello/umbrello/codegenerators/codegenfactory.h b/umbrello/umbrello/codegenerators/codegenfactory.h index 27a0f293..0930f43d 100644 --- a/umbrello/umbrello/codegenerators/codegenfactory.h +++ b/umbrello/umbrello/codegenerators/codegenfactory.h @@ -46,7 +46,7 @@ namespace CodeGenFactory { * Create a CodeOperation belonging to the given ClassifierCodeDocument. * Only applies to the advanced generators. * - * @param cd the parent ClassifierCodeDocument. + * @param cd the tqparent ClassifierCodeDocument. * @param op the related UMLOperation * @return CodeOperation which is specific to the current language */ @@ -57,8 +57,8 @@ namespace CodeGenFactory { * ClassifierCodeDocument. * Only applies to the advanced generators. * - * @param cd the parent ClassifierCodeDocument - * @param at attribute which is parent of this class field + * @param cd the tqparent ClassifierCodeDocument + * @param at attribute which is tqparent of this class field * @return CodeClassField which is specific to the current language */ CodeClassField * newCodeClassField (ClassifierCodeDocument *cd, UMLAttribute * at); @@ -68,8 +68,8 @@ namespace CodeGenFactory { * ClassifierCodeDocument. * Only applies to the advanced generators. * - * @param cd the parent ClassifierCodeDocument - * @param role association role which is parent of this class field + * @param cd the tqparent ClassifierCodeDocument + * @param role association role which is tqparent of this class field * @return CodeClassField which is specific to the current language */ CodeClassField * newCodeClassField(ClassifierCodeDocument *cd, UMLRole *role); @@ -78,8 +78,8 @@ namespace CodeGenFactory { * Create a CodeAccessorMethod object belonging to the given ClassifierCodeDocument. * Only applies to the advanced generators. * - * @param cd the parent ClassifierCodeDocument - * @param cf CodeClassField which is parent of this object + * @param cd the tqparent ClassifierCodeDocument + * @param cf CodeClassField which is tqparent of this object * @param type CodeAccessorMethod::AccessorType to create * * @return CodeAccessorMethod which is specific to the current language @@ -93,8 +93,8 @@ namespace CodeGenFactory { * ClassifierCodeDocument. * Only applies to the advanced generators. * - * @param cd the parent ClassifierCodeDocument - * @param cf CodeClassField which is parent of this object + * @param cd the tqparent ClassifierCodeDocument + * @param cf CodeClassField which is tqparent of this object * * @return CodeClassFieldDeclarationBlock which is specific to the current language */ @@ -105,7 +105,7 @@ namespace CodeGenFactory { * Create a new CodeComment object belonging to the given CodeDocument. * Only applies to the advanced generators. * - * @param cd the parent CodeDocument + * @param cd the tqparent CodeDocument * @return CodeBlockWithComments */ CodeComment * newCodeComment (CodeDocument *cd); diff --git a/umbrello/umbrello/codegenerators/codegenpolicyext.h b/umbrello/umbrello/codegenerators/codegenpolicyext.h index 29e358a1..ea792388 100644 --- a/umbrello/umbrello/codegenerators/codegenpolicyext.h +++ b/umbrello/umbrello/codegenerators/codegenpolicyext.h @@ -36,7 +36,7 @@ public: * Create a new dialog interface for this object. * @return dialog object */ - virtual CodeGenerationPolicyPage * createPage(TQWidget *parent = 0, const char *name = 0) = 0; + virtual CodeGenerationPolicyPage * createPage(TQWidget *tqparent = 0, const char *name = 0) = 0; /** * set the defaults from a config file for this code generator from the passed KConfig pointer. diff --git a/umbrello/umbrello/codegenerators/cppcodeclassfield.cpp b/umbrello/umbrello/codegenerators/cppcodeclassfield.cpp index 4742cd6d..7c8f0ff3 100644 --- a/umbrello/umbrello/codegenerators/cppcodeclassfield.cpp +++ b/umbrello/umbrello/codegenerators/cppcodeclassfield.cpp @@ -33,14 +33,14 @@ // Constructors/Destructors // -CPPCodeClassField::CPPCodeClassField (ClassifierCodeDocument * parentDoc, UMLRole * role) - : CodeClassField(parentDoc, role) +CPPCodeClassField::CPPCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLRole * role) + : CodeClassField(tqparentDoc, role) { } -CPPCodeClassField::CPPCodeClassField (ClassifierCodeDocument * parentDoc, UMLAttribute * attrib) - : CodeClassField(parentDoc, attrib) +CPPCodeClassField::CPPCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLAttribute * attrib) + : CodeClassField(tqparentDoc, attrib) { } @@ -55,7 +55,7 @@ CPPCodeClassField::~CPPCodeClassField ( ) { } // TQString CPPCodeClassField::getFieldName() { - if (parentIsAttribute()) + if (tqparentIsAttribute()) { UMLAttribute * at = (UMLAttribute*) getParentObject(); return cleanName(at->getName()); @@ -65,7 +65,7 @@ TQString CPPCodeClassField::getFieldName() { UMLRole * role = (UMLRole*) getParentObject(); TQString roleName = role->getName(); if(fieldIsSingleValue()) { - return roleName.replace(0, 1, roleName.left(1).lower()); + return roleName.tqreplace(0, 1, roleName.left(1).lower()); } else { return roleName.lower() + "Vector"; } @@ -80,13 +80,13 @@ TQString CPPCodeClassField::getListFieldClassName () { TQString CPPCodeClassField::getInitialValue() { - if (parentIsAttribute()) + if (tqparentIsAttribute()) { UMLAttribute * at = dynamic_cast<UMLAttribute*>( getParentObject() ); if (at) { return fixInitialStringDeclValue(at->getInitialValue(), getTypeName()); } else { - kError() << "CPPCodeClassField::getInitialValue: parent object is not a UMLAttribute" + kError() << "CPPCodeClassField::getInitialValue: tqparent object is not a UMLAttribute" << endl; return ""; } diff --git a/umbrello/umbrello/codegenerators/cppcodeclassfield.h b/umbrello/umbrello/codegenerators/cppcodeclassfield.h index 929e5178..0b714b16 100644 --- a/umbrello/umbrello/codegenerators/cppcodeclassfield.h +++ b/umbrello/umbrello/codegenerators/cppcodeclassfield.h @@ -28,6 +28,7 @@ class ClassifierCodeDocument; class CPPCodeClassField : public CodeClassField { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -36,8 +37,8 @@ public: /** * Constructors */ - CPPCodeClassField (ClassifierCodeDocument * parentDoc, UMLRole * role); - CPPCodeClassField (ClassifierCodeDocument * parentDoc, UMLAttribute * attrib); + CPPCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLRole * role); + CPPCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLAttribute * attrib); /** * Empty Destructor @@ -47,7 +48,7 @@ public: TQString getFieldType(); TQString getFieldName(); TQString getInitialValue(); - /** get the name of the class which holds lists, e.g. "QPtrlist" or + /** get the name of the class which holds lists, e.g. "TQPtrlist" or * "Vector" or "List" and so on. */ TQString getListFieldClassName(); diff --git a/umbrello/umbrello/codegenerators/cppcodecomment.cpp b/umbrello/umbrello/codegenerators/cppcodecomment.cpp index d0e386c0..dada5357 100644 --- a/umbrello/umbrello/codegenerators/cppcodecomment.cpp +++ b/umbrello/umbrello/codegenerators/cppcodecomment.cpp @@ -53,12 +53,12 @@ CPPCodeComment::~CPPCodeComment ( ) { } void CPPCodeComment::saveToXMI ( TQDomDocument & doc, TQDomElement & root ) { TQDomElement blockElement = doc.createElement( "cppcodecomment" ); setAttributesOnNode(doc, blockElement); // as we added no additional fields to this class we may - // just use parent TextBlock method + // just use tqparent TextBlock method root.appendChild( blockElement ); } /** - * @return QString + * @return TQString */ TQString CPPCodeComment::toString ( ) { diff --git a/umbrello/umbrello/codegenerators/cppcodecomment.h b/umbrello/umbrello/codegenerators/cppcodecomment.h index 28fb4004..4d7e7e6e 100644 --- a/umbrello/umbrello/codegenerators/cppcodecomment.h +++ b/umbrello/umbrello/codegenerators/cppcodecomment.h @@ -31,6 +31,7 @@ class CPPCodeComment : virtual public CodeComment { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -59,7 +60,7 @@ public: virtual void saveToXMI ( TQDomDocument & doc, TQDomElement & root ); /** - * @return QString + * @return TQString */ TQString toString ( ); diff --git a/umbrello/umbrello/codegenerators/cppcodedocumentation.cpp b/umbrello/umbrello/codegenerators/cppcodedocumentation.cpp index 6328fd3b..c8e68f4c 100644 --- a/umbrello/umbrello/codegenerators/cppcodedocumentation.cpp +++ b/umbrello/umbrello/codegenerators/cppcodedocumentation.cpp @@ -53,12 +53,12 @@ CPPCodeDocumentation::~CPPCodeDocumentation ( ) { } void CPPCodeDocumentation::saveToXMI ( TQDomDocument & doc, TQDomElement & root ) { TQDomElement blockElement = doc.createElement( "cppcodedocumentation" ); setAttributesOnNode(doc, blockElement); // as we added no additional fields to this class we may - // just use parent TextBlock method + // just use tqparent TextBlock method root.appendChild( blockElement ); } /** - * @return QString + * @return TQString */ TQString CPPCodeDocumentation::toString ( ) { diff --git a/umbrello/umbrello/codegenerators/cppcodedocumentation.h b/umbrello/umbrello/codegenerators/cppcodedocumentation.h index 505fc8bb..b5ec87df 100644 --- a/umbrello/umbrello/codegenerators/cppcodedocumentation.h +++ b/umbrello/umbrello/codegenerators/cppcodedocumentation.h @@ -61,7 +61,7 @@ public: virtual void saveToXMI ( TQDomDocument & doc, TQDomElement & root ); /** - * @return QString + * @return TQString */ TQString toString ( ); diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp b/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp index f5d8ec42..563a86ee 100644 --- a/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp +++ b/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp @@ -28,8 +28,8 @@ #include <kmessagebox.h> -CPPCodeGenerationForm::CPPCodeGenerationForm( TQWidget *parent, const char *name ) - : CPPCodeGenerationFormBase (parent,name) +CPPCodeGenerationForm::CPPCodeGenerationForm( TQWidget *tqparent, const char *name ) + : CPPCodeGenerationFormBase (tqparent,name) { init(); @@ -70,8 +70,8 @@ CPPCodeGenerationForm::~CPPCodeGenerationForm() void CPPCodeGenerationForm::browseClicked() { - TQString button = sender()->name(); - TQString file = KFileDialog::getOpenFileName( TQString::null, "*.h", this, "Get Header File"); + TQString button = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name(); + TQString file = KFileDialog::getOpenFileName( TQString(), "*.h", this, "Get Header File"); if(file.isEmpty()) return; diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationform.h b/umbrello/umbrello/codegenerators/cppcodegenerationform.h index 5c35760c..7a98ef91 100644 --- a/umbrello/umbrello/codegenerators/cppcodegenerationform.h +++ b/umbrello/umbrello/codegenerators/cppcodegenerationform.h @@ -25,12 +25,13 @@ class TQCheckListItem; class CPPCodeGenerationForm : public CPPCodeGenerationFormBase { Q_OBJECT + TQ_OBJECT public: /** * std ctor */ - explicit CPPCodeGenerationForm (TQWidget *parent=0, const char *name=0); + explicit CPPCodeGenerationForm (TQWidget *tqparent=0, const char *name=0); /** * std dtor diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui b/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui index 2599ae35..455d4a2e 100644 --- a/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui +++ b/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>CPPCodeGenerationFormBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CPPCodeGenerationFormBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -12,11 +12,11 @@ <height>549</height> </rect> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>11</x> <y>44</y> @@ -39,15 +39,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <item> <property name="text"> <string>Slash-Slash (//)</string> @@ -62,7 +62,7 @@ <cstring>m_SelectCommentStyle</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -74,11 +74,11 @@ </widget> </grid> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1_2</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>11</x> <y>11</y> @@ -98,11 +98,11 @@ <string><p align="center">C++ Code Generation</p></string> </property> </widget> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>tabWidget2</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>10</x> <y>120</y> @@ -110,7 +110,7 @@ <height>305</height> </rect> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -121,14 +121,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView"> + <widget class="TQListView"> <property name="name"> <cstring>GeneralOptionsListView</cstring> </property> </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -149,14 +149,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>410</width> <height>113</height> </size> </property> </spacer> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2_2_2_2</cstring> </property> @@ -164,9 +164,9 @@ <string>Use following for classes in generated code:</string> </property> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout17</cstring> + <cstring>tqlayout17</cstring> </property> <grid> <property name="name"> @@ -203,7 +203,7 @@ </stringlist> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1_3_2_2_2</cstring> </property> @@ -211,7 +211,7 @@ <string><b>Variable</b></string> </property> </widget> - <widget class="QPushButton" row="2" column="4" rowspan="1" colspan="2"> + <widget class="TQPushButton" row="2" column="4" rowspan="1" colspan="2"> <property name="name"> <cstring>m_browseStringButton</cstring> </property> @@ -223,7 +223,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32767</height> @@ -233,7 +233,7 @@ <string>...</string> </property> </widget> - <widget class="QCheckBox" row="2" column="7"> + <widget class="TQCheckBox" row="2" column="7"> <property name="name"> <cstring>m_globalStringCheckBox</cstring> </property> @@ -285,7 +285,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -302,14 +302,14 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>stringClassTextLabel</cstring> </property> @@ -325,7 +325,7 @@ <string><p align="center">String</p></string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>listClassTextLabel</cstring> </property> @@ -366,7 +366,7 @@ </stringlist> </property> </widget> - <widget class="QLabel" row="0" column="5" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="5" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel4_2_2_2</cstring> </property> @@ -399,7 +399,7 @@ </stringlist> </property> </widget> - <widget class="QCheckBox" row="1" column="7"> + <widget class="TQCheckBox" row="1" column="7"> <property name="name"> <cstring>m_globalListCheckBox</cstring> </property> @@ -410,7 +410,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>textLabel3_2_2</cstring> </property> @@ -418,7 +418,7 @@ <string>Class name</string> </property> </widget> - <widget class="QPushButton" row="1" column="4" rowspan="1" colspan="2"> + <widget class="TQPushButton" row="1" column="4" rowspan="1" colspan="2"> <property name="name"> <cstring>m_browseListButton</cstring> </property> @@ -430,7 +430,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32767</height> @@ -440,7 +440,7 @@ <string>...</string> </property> </widget> - <widget class="QLabel" row="0" column="3" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="3" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel5_2_2_2</cstring> </property> @@ -470,10 +470,10 @@ <slot>browseClicked()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>browseClicked()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp index 8aec0351..8fa473cb 100644 --- a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp +++ b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp @@ -224,40 +224,40 @@ void CPPCodeGenerationPolicy::setVectorIncludeIsGlobal(bool value) { TQString CPPCodeGenerationPolicy::getVectorMethodAppend(const TQString & variableName, const TQString & itemClassName) { TQString value = m_vectorMethodAppendBase; if(!variableName.isEmpty()) - value.replace(TQRegExp("%VARNAME%"),variableName); - value.replace(TQRegExp("%VECTORTYPENAME%"), m_vectorClassName); + value.tqreplace(TQRegExp("%VARNAME%"),variableName); + value.tqreplace(TQRegExp("%VECTORTYPENAME%"), m_vectorClassName); if(!itemClassName.isEmpty()) - value.replace(TQRegExp("%ITEMCLASS%"),itemClassName); + value.tqreplace(TQRegExp("%ITEMCLASS%"),itemClassName); return value; } TQString CPPCodeGenerationPolicy::getVectorMethodRemove(const TQString & variableName, const TQString & itemClassName) { TQString value = m_vectorMethodRemoveBase; if(!variableName.isEmpty()) - value.replace(TQRegExp("%VARNAME%"),variableName); - value.replace(TQRegExp("%VECTORTYPENAME%"), m_vectorClassName); + value.tqreplace(TQRegExp("%VARNAME%"),variableName); + value.tqreplace(TQRegExp("%VECTORTYPENAME%"), m_vectorClassName); if(!itemClassName.isEmpty()) - value.replace(TQRegExp("%ITEMCLASS%"),itemClassName); + value.tqreplace(TQRegExp("%ITEMCLASS%"),itemClassName); return value; } TQString CPPCodeGenerationPolicy::getVectorMethodInit(const TQString & variableName, const TQString & itemClassName) { TQString value = m_vectorMethodInitBase; if(!variableName.isEmpty()) - value.replace(TQRegExp("%VARNAME%"),variableName); - value.replace(TQRegExp("%VECTORTYPENAME%"), m_vectorClassName); + value.tqreplace(TQRegExp("%VARNAME%"),variableName); + value.tqreplace(TQRegExp("%VECTORTYPENAME%"), m_vectorClassName); if(!itemClassName.isEmpty()) - value.replace(TQRegExp("%ITEMCLASS%"),itemClassName); + value.tqreplace(TQRegExp("%ITEMCLASS%"),itemClassName); return value; } TQString CPPCodeGenerationPolicy::getObjectMethodInit(const TQString & variableName, const TQString & itemClassName) { TQString value = m_objectMethodInitBase; if(!variableName.isEmpty()) - value.replace(TQRegExp("%VARNAME%"),variableName); - value.replace(TQRegExp("%VECTORTYPENAME%"), m_vectorClassName); + value.tqreplace(TQRegExp("%VARNAME%"),variableName); + value.tqreplace(TQRegExp("%VECTORTYPENAME%"), m_vectorClassName); if(!itemClassName.isEmpty()) - value.replace(TQRegExp("%ITEMCLASS%"),itemClassName); + value.tqreplace(TQRegExp("%ITEMCLASS%"),itemClassName); return value; } @@ -359,8 +359,8 @@ void CPPCodeGenerationPolicy::setDefaults( KConfig * config, bool emitUpdateSign * Create a new dialog interface for this object. * @return dialog object */ -CodeGenerationPolicyPage * CPPCodeGenerationPolicy::createPage ( TQWidget *parent, const char *name ) { - return new CPPCodeGenerationPolicyPage ( parent, name, this ); +CodeGenerationPolicyPage * CPPCodeGenerationPolicy::createPage ( TQWidget *tqparent, const char *name ) { + return new CPPCodeGenerationPolicyPage ( tqparent, name, this ); } void CPPCodeGenerationPolicy::init() { diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.h b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.h index 69d3490f..949b451c 100644 --- a/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.h +++ b/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.h @@ -27,6 +27,7 @@ class CodeGenerationPolicyPage; class CPPCodeGenerationPolicy : public CodeGenPolicyExt { Q_OBJECT + TQ_OBJECT public: static const bool DEFAULT_AUTO_GEN_EMPTY_CONSTRUCTORS; @@ -192,7 +193,7 @@ public: * Create a new dialog interface for this object. * @return dialog object */ - CodeGenerationPolicyPage * createPage ( TQWidget *parent = 0, const char * name = 0); + CodeGenerationPolicyPage * createPage ( TQWidget *tqparent = 0, const char * name = 0); protected: diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.cpp b/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.cpp index 60d37bac..a008daab 100644 --- a/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.cpp +++ b/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.cpp @@ -26,8 +26,8 @@ #include "cppcodegenerationformbase.h" #include "../uml.h" -CPPCodeGenerationPolicyPage::CPPCodeGenerationPolicyPage( TQWidget *parent, const char *name, CPPCodeGenerationPolicy * policy ) - : CodeGenerationPolicyPage(parent, name, policy) +CPPCodeGenerationPolicyPage::CPPCodeGenerationPolicyPage( TQWidget *tqparent, const char *name, CPPCodeGenerationPolicy * policy ) + : CodeGenerationPolicyPage(tqparent, name, policy) { CodeGenerationPolicy *common = UMLApp::app()->getCommonPolicy(); form = new CPPCodeGenerationForm(this); @@ -59,31 +59,31 @@ void CPPCodeGenerationPolicyPage::apply() CodeGenerationPolicy *common = UMLApp::app()->getCommonPolicy(); // now do our cpp-specific configs - CPPCodeGenerationPolicy * parent = (CPPCodeGenerationPolicy*) m_parentPolicy; + CPPCodeGenerationPolicy * tqparent = (CPPCodeGenerationPolicy*) m_parentPolicy; // block signals so that we don't generate too many sync signals for child code // documents - parent->blockSignals(true); + tqparent->blockSignals(true); common->setCommentStyle((CodeGenerationPolicy::CommentStyle ) form->m_SelectCommentStyle->currentItem()); common->setAutoGenerateConstructors(form->getGenerateEmptyConstructors()); - parent->setAutoGenerateAccessors(form->getGenerateAccessorMethods()); + tqparent->setAutoGenerateAccessors(form->getGenerateAccessorMethods()); - parent->setDestructorsAreVirtual(form->getVirtualDestructors()); - parent->setPackageIsNamespace(form->getPackageIsANamespace()); - parent->setAccessorsAreInline(form->getAccessorsAreInline()); - parent->setOperationsAreInline(form->getOperationsAreInline()); - parent->setAccessorsArePublic(form->getAccessorsArePublic()); + tqparent->setDestructorsAreVirtual(form->getVirtualDestructors()); + tqparent->setPackageIsNamespace(form->getPackageIsANamespace()); + tqparent->setAccessorsAreInline(form->getAccessorsAreInline()); + tqparent->setOperationsAreInline(form->getOperationsAreInline()); + tqparent->setAccessorsArePublic(form->getAccessorsArePublic()); - parent->setStringClassName(form->m_stringClassHCombo->currentText()); - parent->setStringClassNameInclude(form->m_stringIncludeFileHistoryCombo->currentText()); - parent->setStringIncludeIsGlobal(form->m_globalStringCheckBox->isChecked()); + tqparent->setStringClassName(form->m_stringClassHCombo->currentText()); + tqparent->setStringClassNameInclude(form->m_stringIncludeFileHistoryCombo->currentText()); + tqparent->setStringIncludeIsGlobal(form->m_globalStringCheckBox->isChecked()); - parent->setVectorClassName(form->m_listClassHCombo->currentText()); - parent->setVectorClassNameInclude(form->m_listIncludeFileHistoryCombo->currentText()); - parent->setVectorIncludeIsGlobal(form->m_globalListCheckBox->isChecked()); + tqparent->setVectorClassName(form->m_listClassHCombo->currentText()); + tqparent->setVectorClassNameInclude(form->m_listIncludeFileHistoryCombo->currentText()); + tqparent->setVectorIncludeIsGlobal(form->m_globalListCheckBox->isChecked()); - parent->blockSignals(false); + tqparent->blockSignals(false); // now send out modified code content signal common->emitModifiedCodeContentSig(); diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.h b/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.h index eb7aa9ce..6e32c62d 100644 --- a/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.h +++ b/umbrello/umbrello/codegenerators/cppcodegenerationpolicypage.h @@ -28,9 +28,10 @@ class CPPCodeGenerationPolicyPage : public CodeGenerationPolicyPage { Q_OBJECT + TQ_OBJECT public: - explicit CPPCodeGenerationPolicyPage (TQWidget *parent=0, const char *name=0, CPPCodeGenerationPolicy * policy = 0); + explicit CPPCodeGenerationPolicyPage (TQWidget *tqparent=0, const char *name=0, CPPCodeGenerationPolicy * policy = 0); virtual ~CPPCodeGenerationPolicyPage(); diff --git a/umbrello/umbrello/codegenerators/cppcodegenerator.cpp b/umbrello/umbrello/codegenerators/cppcodegenerator.cpp index b5c12dd6..1893ce65 100644 --- a/umbrello/umbrello/codegenerators/cppcodegenerator.cpp +++ b/umbrello/umbrello/codegenerators/cppcodegenerator.cpp @@ -95,7 +95,7 @@ bool CPPCodeGenerator::addHeaderCodeDocument ( CPPHeaderCodeDocument * doc ) doc->setID(tag); } - if(m_codeDocumentDictionary.find(tag)) + if(m_codeDocumentDictionary.tqfind(tag)) return false; // return false, we already have some object with this tag in the list else m_codeDocumentDictionary.insert(tag, doc); @@ -120,14 +120,14 @@ bool CPPCodeGenerator::removeHeaderCodeDocument ( CPPHeaderCodeDocument * remove // In the C++ version, we need to make both source and header files as well // as the makefile available. -CodeViewerDialog * CPPCodeGenerator::getCodeViewerDialog ( TQWidget* parent, CodeDocument *doc, +CodeViewerDialog * CPPCodeGenerator::getCodeViewerDialog ( TQWidget* tqparent, CodeDocument *doc, Settings::CodeViewerState state) { ClassifierCodeDocument * cdoc = dynamic_cast<ClassifierCodeDocument*>(doc); if(!cdoc) // bah..not a classcode document?? then just use vanilla version - return CodeGenerator::getCodeViewerDialog(parent,doc,state); + return CodeGenerator::getCodeViewerDialog(tqparent,doc,state); else { // build with passed (source) code document CodeViewerDialog *dialog; @@ -138,11 +138,11 @@ CodeViewerDialog * CPPCodeGenerator::getCodeViewerDialog ( TQWidget* parent, Cod if(hdoc) { // if we have a header document..build with that - dialog = new CodeViewerDialog(parent, hdoc, state); + dialog = new CodeViewerDialog(tqparent, hdoc, state); dialog->addCodeDocument(doc); } else // shouldn't happen, but lets try to gracefully deliver something. - dialog = new CodeViewerDialog(parent, doc, state); + dialog = new CodeViewerDialog(tqparent, doc, state); // add in makefile if available and desired if(getCreateProjectMakefile()) @@ -178,8 +178,8 @@ void CPPCodeGenerator::saveToXMI ( TQDomDocument & doc, TQDomElement & root ) { } /** - * Force a synchronize of this code generator, and its present contents, to that of the parent UMLDocument. - * Need to override parent method because we have header documents to consider too. + * Force a synchronize of this code generator, and its present contents, to that of the tqparent UMLDocument. + * Need to override tqparent method because we have header documents to consider too. */ void CPPCodeGenerator::syncCodeToDocument ( ) { @@ -347,7 +347,7 @@ void CPPCodeGenerator::initAttributes ( ) UMLApp::app()->setPolicyExt ( new CPPCodeGenerationPolicy(UMLApp::app()->getConfig()) ); - // load Classifier documents from parent document + // load Classifier documents from tqparent document //initFromParentDocument(); } diff --git a/umbrello/umbrello/codegenerators/cppcodegenerator.h b/umbrello/umbrello/codegenerators/cppcodegenerator.h index 2290c6e3..90b0c3f2 100644 --- a/umbrello/umbrello/codegenerators/cppcodegenerator.h +++ b/umbrello/umbrello/codegenerators/cppcodegenerator.h @@ -33,6 +33,7 @@ class KConfig; class CPPCodeGenerator : public CodeGenerator { Q_OBJECT + TQ_OBJECT public: static const bool DEFAULT_BUILD_MAKEFILE; @@ -88,7 +89,7 @@ public: /** Get the editing dialog for this code document */ - virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* parent, CodeDocument * doc, + virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* tqparent, CodeDocument * doc, Settings::CodeViewerState state); /** @@ -157,7 +158,7 @@ public slots: virtual void checkRemoveUMLObject (UMLObject * obj); /** - * Force a synchronize of this code generator, and its present contents, to that of the parent UMLDocument. + * Force a synchronize of this code generator, and its present contents, to that of the tqparent UMLDocument. * "UserGenerated" code will be preserved, but Autogenerated contents will be updated/replaced * or removed as is apppropriate. */ diff --git a/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.cpp b/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.cpp index 868dea41..57ae0172 100644 --- a/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.cpp +++ b/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.cpp @@ -25,10 +25,10 @@ // CPPHeaderClassDeclarationBlock::CPPHeaderClassDeclarationBlock - ( CPPHeaderCodeDocument * parentDoc, const TQString &startText, const TQString &endText, const TQString &comment) - : OwnedHierarchicalCodeBlock(parentDoc->getParentClassifier(), parentDoc, startText, endText, comment) + ( CPPHeaderCodeDocument * tqparentDoc, const TQString &startText, const TQString &endText, const TQString &comment) + : OwnedHierarchicalCodeBlock(tqparentDoc->getParentClassifier(), tqparentDoc, startText, endText, comment) { - init(parentDoc, comment); + init(tqparentDoc, comment); } CPPHeaderClassDeclarationBlock::~CPPHeaderClassDeclarationBlock ( ) { } @@ -75,10 +75,10 @@ void CPPHeaderClassDeclarationBlock::saveToXMI ( TQDomDocument & doc, TQDomEleme void CPPHeaderClassDeclarationBlock::updateContent ( ) { - CPPHeaderCodeDocument *parentDoc = dynamic_cast<CPPHeaderCodeDocument*>(getParentDocument()); - UMLClassifier *c = parentDoc->getParentClassifier(); + CPPHeaderCodeDocument *tqparentDoc = dynamic_cast<CPPHeaderCodeDocument*>(getParentDocument()); + UMLClassifier *c = tqparentDoc->getParentClassifier(); TQString endLine = UMLApp::app()->getCommonPolicy()->getNewLineEndingChars(); - bool isInterface = parentDoc->parentIsInterface(); // a little shortcut + bool isInterface = tqparentDoc->tqparentIsInterface(); // a little shortcut TQString CPPHeaderClassName = CodeGenerator::cleanName(c->getName()); bool forceDoc = UMLApp::app()->getCommonPolicy()->getCodeVerboseDocumentComments(); @@ -112,7 +112,7 @@ void CPPHeaderClassDeclarationBlock::updateContent ( ) */ /* - if(parentDoc->parentIsInterface()) + if(tqparentDoc->tqparentIsInterface()) startText.append("interface "); else */ @@ -144,10 +144,10 @@ void CPPHeaderClassDeclarationBlock::updateContent ( ) } -void CPPHeaderClassDeclarationBlock::init (CPPHeaderCodeDocument *parentDoc, const TQString &comment) +void CPPHeaderClassDeclarationBlock::init (CPPHeaderCodeDocument *tqparentDoc, const TQString &comment) { - setComment(new CPPCodeDocumentation(parentDoc)); + setComment(new CPPCodeDocumentation(tqparentDoc)); getComment()->setText(comment); setEndText("};"); diff --git a/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h b/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h index 0710560f..b6eb68c7 100644 --- a/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h +++ b/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h @@ -25,6 +25,7 @@ class CPPHeaderClassDeclarationBlock : public OwnedHierarchicalCodeBlock { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -33,7 +34,7 @@ public: /** * Empty Constructor */ - explicit CPPHeaderClassDeclarationBlock ( CPPHeaderCodeDocument * parentDoc, const TQString &start = "", const TQString &endText = "}", const TQString &comment = ""); + explicit CPPHeaderClassDeclarationBlock ( CPPHeaderCodeDocument * tqparentDoc, const TQString &start = "", const TQString &endText = "}", const TQString &comment = ""); /** * Empty Destructor @@ -60,7 +61,7 @@ protected: private: - void init (CPPHeaderCodeDocument * parent, const TQString &comment); + void init (CPPHeaderCodeDocument * tqparent, const TQString &comment); }; diff --git a/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.cpp b/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.cpp index d96ad398..2c983a15 100644 --- a/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.cpp +++ b/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.cpp @@ -56,12 +56,12 @@ CPPHeaderCodeAccessorMethod::~CPPHeaderCodeAccessorMethod ( ) { } // we basically want to update the body of this method void CPPHeaderCodeAccessorMethod::updateContent( ) { - CodeClassField * parentField = getParentClassField(); - CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(parentField); + CodeClassField * tqparentField = getParentClassField(); + CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(tqparentField); CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt(); CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe); bool isInlineMethod = policy->getAccessorsAreInline( ); - Uml::Visibility scope = parentField->getVisibility(); + Uml::Visibility scope = tqparentField->getVisibility(); TQString variableName = cppfield->getFieldName(); TQString itemClassName = cppfield->getTypeName(); TQString text; @@ -92,11 +92,11 @@ void CPPHeaderCodeAccessorMethod::updateContent( ) void CPPHeaderCodeAccessorMethod::updateMethodDeclaration() { - CodeClassField * parentField = getParentClassField(); - ClassifierCodeDocument * doc = parentField->getParentDocument(); + CodeClassField * tqparentField = getParentClassField(); + ClassifierCodeDocument * doc = tqparentField->getParentDocument(); CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt(); CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe); - CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(parentField); + CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(tqparentField); bool isInlineMethod = policy->getAccessorsAreInline( ); diff --git a/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.h b/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.h index dea417fc..021436fa 100644 --- a/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.h +++ b/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.h @@ -25,6 +25,7 @@ class CodeClassField; class CPPHeaderCodeAccessorMethod : public CodeAccessorMethod { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors diff --git a/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp b/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp index 3f15d05b..d2dba95d 100644 --- a/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp +++ b/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp @@ -21,8 +21,8 @@ // Constructors/Destructors // -CPPHeaderCodeClassFieldDeclarationBlock::CPPHeaderCodeClassFieldDeclarationBlock ( CodeClassField * parent ) - : CodeClassFieldDeclarationBlock ( parent ) +CPPHeaderCodeClassFieldDeclarationBlock::CPPHeaderCodeClassFieldDeclarationBlock ( CodeClassField * tqparent ) + : CodeClassFieldDeclarationBlock ( tqparent ) { setOverallIndentationLevel(1); updateContent(); @@ -41,8 +41,8 @@ CPPHeaderCodeClassFieldDeclarationBlock::~CPPHeaderCodeClassFieldDeclarationBloc */ void CPPHeaderCodeClassFieldDeclarationBlock::updateContent( ) { - UMLObject *umlparent = CodeClassFieldDeclarationBlock::getParentObject(); - if (umlparent == NULL) { + UMLObject *umltqparent = CodeClassFieldDeclarationBlock::getParentObject(); + if (umltqparent == NULL) { return; } @@ -50,7 +50,7 @@ void CPPHeaderCodeClassFieldDeclarationBlock::updateContent( ) CPPCodeClassField * hcppcf = dynamic_cast<CPPCodeClassField*>(cf); // Set the comment - TQString notes = umlparent->getDoc(); + TQString notes = umltqparent->getDoc(); getComment()->setText(notes); if(notes.isEmpty()) getComment()->setWriteOutText(false); @@ -59,12 +59,12 @@ void CPPHeaderCodeClassFieldDeclarationBlock::updateContent( ) // Set the body - TQString staticValue = umlparent->getStatic() ? "static " : ""; + TQString staticValue = umltqparent->getStatic() ? "static " : ""; TQString typeName = hcppcf->getTypeName(); TQString fieldName = hcppcf->getFieldName(); // Ugh. Sloppy exception. - if (!cf->parentIsAttribute() && !cf->fieldIsSingleValue()) + if (!cf->tqparentIsAttribute() && !cf->fieldIsSingleValue()) typeName = hcppcf->getListFieldClassName(); TQString body = staticValue + ' ' + typeName + ' ' + fieldName + ';'; diff --git a/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.h b/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.h index 6a77047c..dc3a4c29 100644 --- a/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.h +++ b/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.h @@ -23,6 +23,7 @@ class CPPHeaderCodeClassFieldDeclarationBlock : public CodeClassFieldDeclarationBlock { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -31,7 +32,7 @@ public: /** * Constructor */ - CPPHeaderCodeClassFieldDeclarationBlock ( CodeClassField * parent ); + CPPHeaderCodeClassFieldDeclarationBlock ( CodeClassField * tqparent ); /** * Empty Destructor @@ -40,7 +41,7 @@ public: protected: - // this will be called by syncToParent whenever the parent object is "modified" + // this will be called by syncToParent whenever the tqparent object is "modified" void updateContent ( ); private: diff --git a/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp b/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp index 2c471667..92bafba1 100644 --- a/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp +++ b/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp @@ -185,7 +185,7 @@ void CPPHeaderCodeDocument::loadChildTextBlocksFromNode ( TQDomElement & root) } else if( name == "codeoperation" ) { // find the code operation by id - TQString id = element.attribute("parent_id","-1"); + TQString id = element.attribute("tqparent_id","-1"); UMLObject * obj = UMLApp::app()->getDocument()->findObjectById(STR2ID(id)); UMLOperation * op = dynamic_cast<UMLOperation*>(obj); if(op) { @@ -206,7 +206,7 @@ void CPPHeaderCodeDocument::loadChildTextBlocksFromNode ( TQDomElement & root) { CPPHeaderClassDeclarationBlock * block = getClassDecl(); block->loadFromXMI(element); - // normally this would be populated by the following syncToparent + // normally this would be populated by the following syncTotqparent // call, but we cant wait for it, so lets just do it now. namespaceBlock = getHierarchicalCodeBlock("namespace", "Namespace", 0); @@ -326,7 +326,7 @@ void CPPHeaderCodeDocument::saveToXMI ( TQDomDocument & doc, TQDomElement & root */ // This method will cause the class to rebuild its text representation. -// based on the parent classifier object. +// based on the tqparent classifier object. // For any situation in which this is called, we are either building the code // document up, or replacing/regenerating the existing auto-generated parts. As // such, we will want to insert everything we resonablely will want @@ -334,7 +334,7 @@ void CPPHeaderCodeDocument::saveToXMI ( TQDomDocument & doc, TQDomElement & root // comments) to appear or not, as needed. void CPPHeaderCodeDocument::updateContent( ) { - // Gather info on the various fields and parent objects of this class... + // Gather info on the various fields and tqparent objects of this class... UMLClassifier * c = getParentClassifier(); CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt(); CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe); @@ -370,7 +370,7 @@ void CPPHeaderCodeDocument::updateContent( ) bool hasOperationMethods = c->getOpList().last() ? true : false; bool hasNamespace = false; bool isEnumeration = false; - bool isInterface = parentIsInterface(); + bool isInterface = tqparentIsInterface(); bool hasclassFields = hasClassFields(); bool forcedoc = UMLApp::app()->getCommonPolicy()->getCodeVerboseDocumentComments(); TQString endLine = UMLApp::app()->getCommonPolicy()->getNewLineEndingChars(); @@ -412,14 +412,14 @@ void CPPHeaderCodeDocument::updateContent( ) CodeGenerator::findObjectsRelated(c,includes); for(UMLPackage *con = includes.first(); con ; con = includes.next()) - if (con->getBaseType() != Uml::ot_Datatype && !packageMap.contains(con)) + if (con->getBaseType() != Uml::ot_Datatype && !packageMap.tqcontains(con)) { packageMap.insert(con,con->getPackage()); if(con != getParentClassifier()) includeStatement.append("#include \""+CodeGenerator::cleanName(con->getName().lower())+".h\""+endLine); } // now, add/update the includes codeblock - CodeBlockWithComments * inclBlock = addOrUpdateTaggedCodeBlockWithComments("includes", includeStatement, TQString::null, 0, false); + CodeBlockWithComments * inclBlock = addOrUpdateTaggedCodeBlockWithComments("includes", includeStatement, TQString(), 0, false); if(includeStatement.isEmpty() && inclBlock->getContentType() == CodeBlock::AutoGenerated) inclBlock->setWriteOutText(false); else @@ -800,7 +800,7 @@ void CPPHeaderCodeDocument::updateContent( ) // Operations // - // nothing to do here.. "updateOperations" in parent class puts things + // nothing to do here.. "updateOperations" in tqparent class puts things // in the right place using the "addCodeOperation" method we defined in this class // FINISH up with hash def block close diff --git a/umbrello/umbrello/codegenerators/cppheadercodedocument.h b/umbrello/umbrello/codegenerators/cppheadercodedocument.h index ed7723d0..59cc9c8d 100644 --- a/umbrello/umbrello/codegenerators/cppheadercodedocument.h +++ b/umbrello/umbrello/codegenerators/cppheadercodedocument.h @@ -34,6 +34,7 @@ class CPPHeaderClassDeclarationBlock; class CPPHeaderCodeDocument : public ClassifierCodeDocument { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors diff --git a/umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp b/umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp index 471c7734..c4ec5145 100644 --- a/umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp +++ b/umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp @@ -26,8 +26,8 @@ // CPPHeaderCodeOperation::CPPHeaderCodeOperation - ( CPPHeaderCodeDocument * doc, UMLOperation *parent, const TQString & body, const TQString & comment ) - : CodeOperation (doc, parent, body, comment) + ( CPPHeaderCodeDocument * doc, UMLOperation *tqparent, const TQString & body, const TQString & comment ) + : CodeOperation (doc, tqparent, body, comment) { // lets not go with the default comment and instead use // full-blown cpp documentation object instead @@ -68,7 +68,7 @@ void CPPHeaderCodeOperation::updateContent( ) void CPPHeaderCodeOperation::updateMethodDeclaration() { ClassifierCodeDocument *ccd = dynamic_cast<ClassifierCodeDocument*>(getParentDocument()); - bool isInterface = ccd->parentIsInterface(); + bool isInterface = ccd->tqparentIsInterface(); UMLOperation * o = getParentOperation(); CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt(); @@ -134,7 +134,7 @@ void CPPHeaderCodeOperation::updateMethodDeclaration() int CPPHeaderCodeOperation::lastEditableLine() { ClassifierCodeDocument * doc = dynamic_cast<ClassifierCodeDocument*>(getParentDocument()); UMLOperation * o = getParentOperation(); - if(doc->parentIsInterface() || o->getAbstract()) + if(doc->tqparentIsInterface() || o->getAbstract()) return -1; // very last line is NOT editable as its a one-line declaration w/ no body in // an interface. return 0; diff --git a/umbrello/umbrello/codegenerators/cppheadercodeoperation.h b/umbrello/umbrello/codegenerators/cppheadercodeoperation.h index 18b7f33f..915c4ac1 100644 --- a/umbrello/umbrello/codegenerators/cppheadercodeoperation.h +++ b/umbrello/umbrello/codegenerators/cppheadercodeoperation.h @@ -26,6 +26,7 @@ class CPPHeaderCodeDocument; class CPPHeaderCodeOperation : virtual public CodeOperation { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors diff --git a/umbrello/umbrello/codegenerators/cppmakecodedocument.cpp b/umbrello/umbrello/codegenerators/cppmakecodedocument.cpp index 33f945ae..873cd8c8 100644 --- a/umbrello/umbrello/codegenerators/cppmakecodedocument.cpp +++ b/umbrello/umbrello/codegenerators/cppmakecodedocument.cpp @@ -47,7 +47,7 @@ void CPPMakefileCodeDocument::updateContent( ) { } /** - * @return QString + * @return TQString */ TQString CPPMakefileCodeDocument::toString ( ) { return "# cpp make build document"; @@ -63,10 +63,10 @@ TQString CPPMakefileCodeDocument::getPath ( ) path.simplifyWhiteSpace(); // Replace all blanks with underscore - path.replace(TQRegExp(" "), "_"); + path.tqreplace(TQRegExp(" "), "_"); - path.replace(TQRegExp("\\."),"/"); - path.replace(TQRegExp("::"),"/"); + path.tqreplace(TQRegExp("\\."),"/"); + path.tqreplace(TQRegExp("::"),"/"); path.lower(); diff --git a/umbrello/umbrello/codegenerators/cppmakecodedocument.h b/umbrello/umbrello/codegenerators/cppmakecodedocument.h index 1b1c109b..18f97707 100644 --- a/umbrello/umbrello/codegenerators/cppmakecodedocument.h +++ b/umbrello/umbrello/codegenerators/cppmakecodedocument.h @@ -30,6 +30,7 @@ class CPPMakefileCodeDocument : public CodeDocument { Q_OBJECT + TQ_OBJECT public: static const char * DOCUMENT_ID_VALUE; @@ -48,7 +49,7 @@ public: virtual ~CPPMakefileCodeDocument ( ); /** - * @return QString + * @return TQString */ TQString toString ( ); diff --git a/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.cpp b/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.cpp index c71f6d2a..2ff19637 100644 --- a/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.cpp +++ b/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.cpp @@ -56,8 +56,8 @@ CPPSourceCodeAccessorMethod::~CPPSourceCodeAccessorMethod ( ) { } // we basically want to update the body of this method void CPPSourceCodeAccessorMethod::updateContent( ) { - CodeClassField * parentField = getParentClassField(); - CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(parentField); + CodeClassField * tqparentField = getParentClassField(); + CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(tqparentField); CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt(); CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe); bool isInlineMethod = policy->getAccessorsAreInline( ); @@ -92,11 +92,11 @@ void CPPSourceCodeAccessorMethod::updateContent( ) void CPPSourceCodeAccessorMethod::updateMethodDeclaration() { - CodeClassField * parentField = getParentClassField(); - ClassifierCodeDocument * doc = parentField->getParentDocument(); + CodeClassField * tqparentField = getParentClassField(); + ClassifierCodeDocument * doc = tqparentField->getParentDocument(); CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt(); CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe); - CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(parentField); + CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(tqparentField); UMLClassifier * c = doc->getParentClassifier(); bool isInlineMethod = policy->getAccessorsAreInline( ); diff --git a/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.h b/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.h index 7c4088e9..f1565f2b 100644 --- a/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.h +++ b/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.h @@ -25,6 +25,7 @@ class CodeClassField; class CPPSourceCodeAccessorMethod : public CodeAccessorMethod { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors diff --git a/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.cpp b/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.cpp index 016249e5..2e55e92a 100644 --- a/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.cpp +++ b/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.cpp @@ -20,8 +20,8 @@ // Constructors/Destructors // -CPPSourceCodeClassFieldDeclarationBlock::CPPSourceCodeClassFieldDeclarationBlock ( CodeClassField * parent ) - : CodeClassFieldDeclarationBlock ( parent ) +CPPSourceCodeClassFieldDeclarationBlock::CPPSourceCodeClassFieldDeclarationBlock ( CodeClassField * tqparent ) + : CodeClassFieldDeclarationBlock ( tqparent ) { setOverallIndentationLevel(1); updateContent(); diff --git a/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.h b/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.h index a27c0684..00b6135f 100644 --- a/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.h +++ b/umbrello/umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.h @@ -23,6 +23,7 @@ class CPPSourceCodeClassFieldDeclarationBlock : public CodeClassFieldDeclarationBlock { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -31,7 +32,7 @@ public: /** * Constructor */ - CPPSourceCodeClassFieldDeclarationBlock ( CodeClassField * parent ); + CPPSourceCodeClassFieldDeclarationBlock ( CodeClassField * tqparent ); /** * Empty Destructor @@ -40,7 +41,7 @@ public: protected: - // this will be called by syncToParent whenever the parent object is "modified" + // this will be called by syncToParent whenever the tqparent object is "modified" void updateContent ( ); private: diff --git a/umbrello/umbrello/codegenerators/cppsourcecodedocument.cpp b/umbrello/umbrello/codegenerators/cppsourcecodedocument.cpp index 3caefe82..53ee06f7 100644 --- a/umbrello/umbrello/codegenerators/cppsourcecodedocument.cpp +++ b/umbrello/umbrello/codegenerators/cppsourcecodedocument.cpp @@ -106,7 +106,7 @@ void CPPSourceCodeDocument::resetTextBlocks() } // This method will cause the class to rebuild its text representation. -// based on the parent classifier object. +// based on the tqparent classifier object. // For any situation in which this is called, we are either building the code // document up, or replacing/regenerating the existing auto-generated parts. As // such, we will want to insert everything we reasonably will want @@ -115,7 +115,7 @@ void CPPSourceCodeDocument::resetTextBlocks() void CPPSourceCodeDocument::updateContent( ) { - // Gather info on the various fields and parent objects of this class... + // Gather info on the various fields and tqparent objects of this class... //UMLClassifier * c = getParentClassifier(); CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt(); CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe); @@ -144,7 +144,7 @@ void CPPSourceCodeDocument::updateContent( ) // Include own header file TQString myOwnName( getParentClassifier()->getName() ); includeStatement.append("#include \""+CodeGenerator::cleanName(myOwnName.lower())+".h\""+endLine); - CodeBlockWithComments * iblock = addOrUpdateTaggedCodeBlockWithComments("includes", includeStatement, TQString::null, 0, false); + CodeBlockWithComments * iblock = addOrUpdateTaggedCodeBlockWithComments("includes", includeStatement, TQString(), 0, false); iblock->setWriteOutText(true); // After the includes we have just 2 big blocks basically, the "constructor" block and the diff --git a/umbrello/umbrello/codegenerators/cppsourcecodedocument.h b/umbrello/umbrello/codegenerators/cppsourcecodedocument.h index 09ee93e6..c820d5a4 100644 --- a/umbrello/umbrello/codegenerators/cppsourcecodedocument.h +++ b/umbrello/umbrello/codegenerators/cppsourcecodedocument.h @@ -31,6 +31,7 @@ class CPPSourceCodeDocument : public ClassifierCodeDocument { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors diff --git a/umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp b/umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp index 61b1950e..5c3d0a74 100644 --- a/umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp +++ b/umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp @@ -25,8 +25,8 @@ // Constructors/Destructors // -CPPSourceCodeOperation::CPPSourceCodeOperation ( CPPSourceCodeDocument * doc, UMLOperation *parent, const TQString & body, const TQString & comment ) - : CodeOperation (doc, parent, body, comment) +CPPSourceCodeOperation::CPPSourceCodeOperation ( CPPSourceCodeDocument * doc, UMLOperation *tqparent, const TQString & body, const TQString & comment ) + : CodeOperation (doc, tqparent, body, comment) { // lets not go with the default comment and instead use // full-blown cpp documentation object instead @@ -41,7 +41,7 @@ CPPSourceCodeOperation::CPPSourceCodeOperation ( CPPSourceCodeDocument * doc, UM CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe); UMLClassifier * c = doc->getParentClassifier(); UMLOperation * o = getParentOperation(); - bool isInterface = doc->parentIsInterface(); + bool isInterface = doc->tqparentIsInterface(); bool isInlineMethod = policy->getOperationsAreInline( ); // first, the comment on the operation @@ -131,7 +131,7 @@ void CPPSourceCodeOperation::updateMethodDeclaration() CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe); UMLClassifier * c = doc->getParentClassifier(); UMLOperation * o = getParentOperation(); - bool isInterface = doc->parentIsInterface(); + bool isInterface = doc->tqparentIsInterface(); bool isInlineMethod = policy->getOperationsAreInline( ); // first, the comment on the operation diff --git a/umbrello/umbrello/codegenerators/cppsourcecodeoperation.h b/umbrello/umbrello/codegenerators/cppsourcecodeoperation.h index 95073eea..86e5ff35 100644 --- a/umbrello/umbrello/codegenerators/cppsourcecodeoperation.h +++ b/umbrello/umbrello/codegenerators/cppsourcecodeoperation.h @@ -26,6 +26,7 @@ class CPPSourceCodeDocument; class CPPSourceCodeOperation : virtual public CodeOperation { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors diff --git a/umbrello/umbrello/codegenerators/cppwriter.cpp b/umbrello/umbrello/codegenerators/cppwriter.cpp index ab2b8fcb..3f22a300 100644 --- a/umbrello/umbrello/codegenerators/cppwriter.cpp +++ b/umbrello/umbrello/codegenerators/cppwriter.cpp @@ -52,12 +52,12 @@ CppWriter::CppWriter() VECTOR_METHOD_REMOVE = "int i, size = %VARNAME%.size();\nfor ( i = 0; i < size; i++) {\n\t%ITEMCLASS% item = %VARNAME%.at(i);\n\tif(item == remove_object) {\n\t\tvector<%ITEMCLASS%>::iterator it = %VARNAME%.begin() + i;\n\t\t%VARNAME%.erase(it);\n\t\treturn;\n\t}\n }"; // for std::vector VECTOR_METHOD_INIT = TQString(); // nothing to be done /* - VECTOR_METHOD_APPEND = "%VARNAME%.append(&add_object);"; // Qt lib implementation - VECTOR_METHOD_REMOVE = "%VARNAME%.removeRef(&remove_object);"; // Qt lib implementation - VECTOR_METHOD_INIT = "%VARNAME%.setAutoDelete(false);"; // Qt library + VECTOR_METHOD_APPEND = "%VARNAME%.append(&add_object);"; // TQt lib implementation + VECTOR_METHOD_REMOVE = "%VARNAME%.removeRef(&remove_object);"; // TQt lib implementation + VECTOR_METHOD_INIT = "%VARNAME%.setAutoDelete(false);"; // TQt library */ - OBJECT_METHOD_INIT = "%VARNAME% = new %ITEMCLASS%( );"; // Qt library + OBJECT_METHOD_INIT = "%VARNAME% = new %ITEMCLASS%( );"; // TQt library // boolean config params INLINE_ASSOCIATION_METHODS = false; @@ -113,7 +113,7 @@ void CppWriter::writeClass(UMLClassifier *c) need_impl = false; } if (need_impl) { - fileName.replace( TQRegExp(".h$"), ".cpp"); + fileName.tqreplace( TQRegExp(".h$"), ".cpp"); if( !openFile(filecpp, fileName)) { emit codeGenerated(c, false); return; @@ -141,13 +141,13 @@ void CppWriter::writeHeaderFile (UMLClassifier *c, TQFile &fileh) { // write header blurb TQString str = getHeadingFile(".h"); if(!str.isEmpty()) { - str.replace(TQRegExp("%filename%"),m_classifierInfo->fileName + ".h"); - str.replace(TQRegExp("%filepath%"),fileh.name()); + str.tqreplace(TQRegExp("%filename%"),m_classifierInfo->fileName + ".h"); + str.tqreplace(TQRegExp("%filepath%"),fileh.name()); h << str<< m_endl; } // Write the hash define stuff to prevent multiple parsing/inclusion of header - TQString hashDefine = m_classifierInfo->className.upper().simplifyWhiteSpace().replace(TQRegExp(" "), "_"); + TQString hashDefine = m_classifierInfo->className.upper().simplifyWhiteSpace().tqreplace(TQRegExp(" "), "_"); writeBlankLine(h); h << "#ifndef "<< hashDefine + "_H" << m_endl; h << "#define "<< hashDefine + "_H" << m_endl; @@ -206,8 +206,8 @@ void CppWriter::writeSourceFile (UMLClassifier *c, TQFile &filecpp ) { TQString str; str = getHeadingFile(".cpp"); if(!str.isEmpty()) { - str.replace(TQRegExp("%filename%"),m_classifierInfo->fileName + ".cpp"); - str.replace(TQRegExp("%filepath%"),filecpp.name()); + str.tqreplace(TQRegExp("%filename%"),m_classifierInfo->fileName + ".cpp"); + str.tqreplace(TQRegExp("%filepath%"),filecpp.name()); cpp << str << m_endl; } @@ -627,7 +627,7 @@ void CppWriter::writeAttributeMethods(UMLAttributeList *attribs, // from what I can tell, this IS the default behavior for // cleanName. I dunno why its not working -b.t. methodBaseName = methodBaseName.stripWhiteSpace(); - methodBaseName.replace(0,1,methodBaseName.at(0).upper()); + methodBaseName.tqreplace(0,1,methodBaseName.tqat(0).upper()); writeSingleAttributeAccessorMethods(at->getTypeName(), varName, methodBaseName, at->getDoc(), Uml::chg_Changeable, isHeaderMethod, @@ -641,7 +641,7 @@ void CppWriter::writeComment(const TQString &comment, const TQString &myIndent, // in the case we have several line comment.. // NOTE: this part of the method has the problem of adopting UNIX newline, // need to resolve for using with MAC/WinDoze eventually I assume - if (comment.contains(TQRegExp("\n"))) { + if (comment.tqcontains(TQRegExp("\n"))) { TQStringList lines = TQStringList::split( "\n", comment); for(uint i= 0; i < lines.count(); i++) @@ -736,14 +736,14 @@ void CppWriter::writeAssociationRoleDecl(TQString fieldClassName, TQString roleN // declare the association based on whether it is this a single variable // or a List (Vector). One day this will be done correctly with special // multiplicity object that we don't have to figure out what it means via regex. - if(multi.isEmpty() || multi.contains(TQRegExp("^[01]$"))) + if(multi.isEmpty() || multi.tqcontains(TQRegExp("^[01]$"))) { TQString fieldVarName = "m_" + roleName.lower(); // record this for later consideration of initialization IF the // multi value requires 1 of these objects - if(ObjectFieldVariables.findIndex(fieldVarName) == -1 && - multi.contains(TQRegExp("^1$")) + if(ObjectFieldVariables.tqfindIndex(fieldVarName) == -1 && + multi.tqcontains(TQRegExp("^1$")) ) { // ugh. UGLY. Storing variable name and its class in pairs. @@ -759,7 +759,7 @@ void CppWriter::writeAssociationRoleDecl(TQString fieldClassName, TQString roleN // record unique occurrences for later when we want to check // for initialization of this vector - if(VectorFieldVariables.findIndex(fieldVarName) == -1) + if(VectorFieldVariables.tqfindIndex(fieldVarName) == -1) VectorFieldVariables.append(fieldVarName); stream << indent << policyExt()->getVectorClassName() <<"<" << fieldClassName << "*"; @@ -823,7 +823,7 @@ void CppWriter::writeAssociationRoleMethod (const TQString &fieldClassName, const TQString &description, Uml::Changeability_Type change, TQTextStream &stream) { - if(multi.isEmpty() || multi.contains(TQRegExp("^[01]$"))) + if(multi.isEmpty() || multi.tqcontains(TQRegExp("^[01]$"))) { TQString fieldVarName = "m_" + roleName.lower(); writeSingleAttributeAccessorMethods(fieldClassName, fieldVarName, roleName, @@ -860,9 +860,9 @@ void CppWriter::writeVectorAttributeAccessorMethods ( stream << "add" << fldName << " ( " << className << " add_object )"; if (writeMethodBody) { TQString method = VECTOR_METHOD_APPEND; - method.replace(TQRegExp("%VARNAME%"),fieldVarName); - method.replace(TQRegExp("%VECTORTYPENAME%"), policyExt()->getVectorClassName()); - method.replace(TQRegExp("%ITEMCLASS%"),className); + method.tqreplace(TQRegExp("%VARNAME%"),fieldVarName); + method.tqreplace(TQRegExp("%VECTORTYPENAME%"), policyExt()->getVectorClassName()); + method.tqreplace(TQRegExp("%ITEMCLASS%"),className); stream << indent << " {" << m_endl; m_indentLevel++; printTextAsSeparateLinesWithIndent(method,getIndent(),stream); @@ -883,9 +883,9 @@ void CppWriter::writeVectorAttributeAccessorMethods ( stream << "remove" << fldName << " ( " << className << " remove_object )"; if (writeMethodBody) { TQString method = VECTOR_METHOD_REMOVE; - method.replace(TQRegExp("%VARNAME%"),fieldVarName); - method.replace(TQRegExp("%VECTORTYPENAME%"), policyExt()->getVectorClassName()); - method.replace(TQRegExp("%ITEMCLASS%"),className); + method.tqreplace(TQRegExp("%VARNAME%"),fieldVarName); + method.tqreplace(TQRegExp("%VECTORTYPENAME%"), policyExt()->getVectorClassName()); + method.tqreplace(TQRegExp("%ITEMCLASS%"),className); stream << indent << " {" << m_endl; m_indentLevel++; printTextAsSeparateLinesWithIndent(method,getIndent(),stream); @@ -1034,8 +1034,8 @@ void CppWriter::writeInitAttibuteMethod (TQTextStream &stream) for( it = VectorFieldVariables.begin(); it != VectorFieldVariables.end(); ++it ) { TQString fieldVarName = *it; TQString method = VECTOR_METHOD_INIT; - method.replace(TQRegExp("%VARNAME%"),fieldVarName); - method.replace(TQRegExp("%VECTORTYPENAME%"), policyExt()->getVectorClassName()); + method.tqreplace(TQRegExp("%VARNAME%"),fieldVarName); + method.tqreplace(TQRegExp("%VECTORTYPENAME%"), policyExt()->getVectorClassName()); stream << getIndent() << method << m_endl; } } @@ -1047,8 +1047,8 @@ void CppWriter::writeInitAttibuteMethod (TQTextStream &stream) it++; TQString fieldClassName = *it; TQString method = OBJECT_METHOD_INIT; - method.replace(TQRegExp("%VARNAME%"),fieldVarName); - method.replace(TQRegExp("%ITEMCLASS%"),fieldClassName); + method.tqreplace(TQRegExp("%VARNAME%"),fieldVarName); + method.tqreplace(TQRegExp("%ITEMCLASS%"),fieldClassName); stream << getIndent() << method << m_endl; } } diff --git a/umbrello/umbrello/codegenerators/csharpwriter.cpp b/umbrello/umbrello/codegenerators/csharpwriter.cpp index 42b055e5..a6c64db4 100644 --- a/umbrello/umbrello/codegenerators/csharpwriter.cpp +++ b/umbrello/umbrello/codegenerators/csharpwriter.cpp @@ -169,8 +169,8 @@ void CSharpWriter::writeClass(UMLClassifier *c) { TQString str; str = getHeadingFile(".cs"); if (!str.isEmpty()) { - str.replace(TQRegExp("%filename%"),fileName); - str.replace(TQRegExp("%filepath%"),filecs.name()); + str.tqreplace(TQRegExp("%filename%"),fileName); + str.tqreplace(TQRegExp("%filepath%"),filecs.name()); cs<<str<<m_endl; } @@ -199,7 +199,7 @@ void CSharpWriter::writeClass(UMLClassifier *c) { UMLClassifier *cl = dynamic_cast<UMLClassifier*>(p); if (cl) p = cl->getUMLPackage(); - if (p != logicalView && m_seenIncludes.findRef(p) == -1 && p != container) { + if (p != logicalView && m_seenIncludes.tqfindRef(p) == -1 && p != container) { cs << "using " << p->getFullyQualifiedName(".") << ";" << m_endl; m_seenIncludes.append(p); } @@ -405,7 +405,7 @@ void CSharpWriter::writeOverridesRecursive(UMLClassifierList *superclasses, TQTe opabstract.clear(); } - // Recurse to parent superclasses + // Recurse to tqparent superclasses UMLClassifierList superRecursive = obj->getSuperClasses(); UMLClassifierList *superRecursivePtr =& superRecursive; if (superRecursivePtr->count() > 0) { @@ -433,10 +433,10 @@ void CSharpWriter::writeRealizationsRecursive(UMLClassifier *currentClass, UMLAs writeOperations(opreal,cs,false,false,true); cs << m_container_indent << m_indentation << "#endregion" << m_endl << m_endl; - // Recurse to parent realizations - UMLAssociationList parentReal = real->getRealizations(); - if (!parentReal.isEmpty()) { - writeRealizationsRecursive(real, &parentReal, cs); + // Recurse to tqparent realizations + UMLAssociationList tqparentReal = real->getRealizations(); + if (!tqparentReal.isEmpty()) { + writeRealizationsRecursive(real, &tqparentReal, cs); } } } @@ -470,7 +470,7 @@ void CSharpWriter::writeOperations(UMLOperationList opList, if (forceDoc() || !at->getDoc().isEmpty()) { cs << m_container_indent << m_indentation << "/// <param name=\"" << cleanName(at->getName()) << "\">"; //removing newlines from parameter doc - cs << formatDoc(at->getDoc(), "").replace("\n", " ").remove('\r').replace(TQRegExp(" $"), ""); + cs << formatDoc(at->getDoc(), "").tqreplace("\n", " ").remove('\r').tqreplace(TQRegExp(" $"), ""); cs << "</param>" << m_endl; } } @@ -493,7 +493,7 @@ void CSharpWriter::writeOperations(UMLOperationList opList, if (op->getStatic()) cs << "static "; } else { - // method overriding an abstract parent + // method overriding an abstract tqparent cs << op->getVisibility().toString() << " override "; if (op->getStatic()) cs << "static "; } @@ -629,7 +629,7 @@ void CSharpWriter::writeAssociatedAttributes(UMLAssociationList &associated, UML TQString roleName = cleanName(a->getRoleName(Uml::B)); TQString typeName = cleanName(o->getName()); if (roleName.isEmpty()) { - roleName = TQString("UnnamedRoleB_%1").arg(m_unnamedRoles++); + roleName = TQString("UnnamedRoleB_%1").tqarg(m_unnamedRoles++); } TQString roleDoc = a->getRoleDoc(Uml::B); @@ -693,7 +693,7 @@ void CSharpWriter::writeAttribute(TQString doc, Uml::Visibility visibility, bool TQString CSharpWriter::makeLocalTypeName(UMLClassifierListItem *cl) { UMLPackage *p = cl->getType()->getUMLPackage(); - if (m_seenIncludes.findRef(p) != -1) { + if (m_seenIncludes.tqfindRef(p) != -1) { return cl->getType()->getName(); } else { diff --git a/umbrello/umbrello/codegenerators/csharpwriter.h b/umbrello/umbrello/codegenerators/csharpwriter.h index ef09bac5..6cf4d3f6 100644 --- a/umbrello/umbrello/codegenerators/csharpwriter.h +++ b/umbrello/umbrello/codegenerators/csharpwriter.h @@ -31,6 +31,7 @@ class CSharpWriter : public SimpleCodeGenerator { Q_OBJECT + TQ_OBJECT public: CSharpWriter(); @@ -79,7 +80,7 @@ private: int m_unnamedRoles; /** - * write realizations of a class and recurse to parent classes + * write realizations of a class and recurse to tqparent classes * @param currentClass class to start with * @param realizations realizations of this class diff --git a/umbrello/umbrello/codegenerators/dwriter.cpp b/umbrello/umbrello/codegenerators/dwriter.cpp index 088ab9c1..60bc2abb 100644 --- a/umbrello/umbrello/codegenerators/dwriter.cpp +++ b/umbrello/umbrello/codegenerators/dwriter.cpp @@ -114,8 +114,8 @@ void DWriter::writeClass(UMLClassifier *c) { TQString str; str = getHeadingFile(".d"); if(!str.isEmpty()) { - str.replace(TQRegExp("%filename%"),fileName); - str.replace(TQRegExp("%filepath%"),file.name()); + str.tqreplace(TQRegExp("%filename%"),fileName); + str.tqreplace(TQRegExp("%filepath%"),file.name()); d<<str<<m_endl; } @@ -442,8 +442,8 @@ void DWriter::writeComment(const TQString &comment, const TQString &myIndent, TQString tmp = lines[i]; while (tmp.length() > 77) { - uint l = tmp.left(77).findRev(' '); - if (l < 1) l = tmp.find(' ', 77); + uint l = tmp.left(77).tqfindRev(' '); + if (l < 1) l = tmp.tqfind(' ', 77); if (l < 1 || l > tmp.length()) { d << myIndent << (dDocStyle ? " * " : "// ") << tmp << m_endl; break; @@ -527,7 +527,7 @@ void DWriter::writeAssociationRoleDecl(TQString fieldClassName, // declare the association based on whether it is this a single variable // or a List (Vector). One day this will be done correctly with special // multiplicity object that we don't have to figure out what it means via regex. - if(multi.isEmpty() || multi.contains(TQRegExp("^[01]$"))) { + if(multi.isEmpty() || multi.tqcontains(TQRegExp("^[01]$"))) { d << m_indentation << fieldClassName << " "; if (hasAccessors) d << "m_"; @@ -584,7 +584,7 @@ void DWriter::writeAssociationMethods (UMLAssociationList associations, UMLClass void DWriter::writeAssociationRoleMethod (TQString fieldClassName, TQString roleName, TQString multi, TQString description, Uml::Visibility visib, Uml::Changeability_Type change, TQTextStream &d) { - if(multi.isEmpty() || multi.contains(TQRegExp("^[01]$"))) { + if(multi.isEmpty() || multi.tqcontains(TQRegExp("^[01]$"))) { TQString fieldVarName = "m_" + deCapitaliseFirstLetter(roleName); writeSingleAttributeAccessorMethods( @@ -942,7 +942,7 @@ TQString DWriter::getUMLObjectName(UMLObject *obj) { } TQString DWriter::deCapitaliseFirstLetter(TQString string) { - string.replace( 0, 1, string[0].lower()); + string.tqreplace( 0, 1, string[0].lower()); return string; } diff --git a/umbrello/umbrello/codegenerators/idlwriter.cpp b/umbrello/umbrello/codegenerators/idlwriter.cpp index dc367f50..8e5688ac 100644 --- a/umbrello/umbrello/codegenerators/idlwriter.cpp +++ b/umbrello/umbrello/codegenerators/idlwriter.cpp @@ -70,7 +70,7 @@ void IDLWriter::computeAssocTypeAndRole at == Uml::at_UniAssociation) { // Assuming unidirectional association, and we are // at the "wrong" side. - // Returning roleName = TQString::null tells caller to + // Returning roleName = TQString() tells caller to // skip this association at this side. roleName = TQString(); return; @@ -129,8 +129,8 @@ void IDLWriter::writeClass(UMLClassifier *c) { TQString str; str = getHeadingFile(".idl"); if (!str.isEmpty()) { - str.replace(TQRegExp("%filename%"), fileName); - str.replace(TQRegExp("%filepath%"), file.name()); + str.tqreplace(TQRegExp("%filename%"), fileName); + str.tqreplace(TQRegExp("%filepath%"), file.name()); idl << str << m_endl; } @@ -275,13 +275,13 @@ void IDLWriter::writeClass(UMLClassifier *c) { UMLClassifierList superclasses = c->getSuperClasses(); if (! superclasses.isEmpty()) { idl << " : "; - UMLClassifier *parent = superclasses.first(); + UMLClassifier *tqparent = superclasses.first(); int n_parents = superclasses.count(); while (n_parents--) { - idl << parent->getFullyQualifiedName("::"); + idl << tqparent->getFullyQualifiedName("::"); if (n_parents) idl << ", "; - parent = superclasses.next(); + tqparent = superclasses.next(); } } idl << " {" << m_endl << m_endl; diff --git a/umbrello/umbrello/codegenerators/javaantcodedocument.cpp b/umbrello/umbrello/codegenerators/javaantcodedocument.cpp index cc9e394b..1fd6fd69 100644 --- a/umbrello/umbrello/codegenerators/javaantcodedocument.cpp +++ b/umbrello/umbrello/codegenerators/javaantcodedocument.cpp @@ -146,7 +146,7 @@ void JavaANTCodeDocument::loadChildTextBlocksFromNode ( TQDomElement & root) } else if( name == "codeoperation" ) { // find the code operation by id - TQString id = element.attribute("parent_id","-1"); + TQString id = element.attribute("tqparent_id","-1"); UMLObject * obj = UMLApp::app()->getDocument()->findObjectById(STR2ID(id)); UMLOperation * op = dynamic_cast<UMLOperation*>(obj); if(op) { @@ -297,10 +297,10 @@ TQString JavaANTCodeDocument::getPath ( ) path.simplifyWhiteSpace(); // Replace all blanks with underscore - path.replace(TQRegExp(" "), "_"); + path.tqreplace(TQRegExp(" "), "_"); - path.replace(TQRegExp("\\."),"/"); - path.replace(TQRegExp("::"), "/"); + path.tqreplace(TQRegExp("\\."),"/"); + path.tqreplace(TQRegExp("::"), "/"); path.lower(); diff --git a/umbrello/umbrello/codegenerators/javaantcodedocument.h b/umbrello/umbrello/codegenerators/javaantcodedocument.h index 97d19c50..27c8e7c5 100644 --- a/umbrello/umbrello/codegenerators/javaantcodedocument.h +++ b/umbrello/umbrello/codegenerators/javaantcodedocument.h @@ -32,6 +32,7 @@ class JavaANTCodeDocument : public CodeDocument { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors diff --git a/umbrello/umbrello/codegenerators/javaclassdeclarationblock.cpp b/umbrello/umbrello/codegenerators/javaclassdeclarationblock.cpp index e1966001..babc04a9 100644 --- a/umbrello/umbrello/codegenerators/javaclassdeclarationblock.cpp +++ b/umbrello/umbrello/codegenerators/javaclassdeclarationblock.cpp @@ -23,10 +23,10 @@ // JavaClassDeclarationBlock::JavaClassDeclarationBlock - ( JavaClassifierCodeDocument * parentDoc, const TQString &startText, const TQString &endText, const TQString &comment) - : OwnedHierarchicalCodeBlock(parentDoc->getParentClassifier(), parentDoc, startText, endText, comment) + ( JavaClassifierCodeDocument * tqparentDoc, const TQString &startText, const TQString &endText, const TQString &comment) + : OwnedHierarchicalCodeBlock(tqparentDoc->getParentClassifier(), tqparentDoc, startText, endText, comment) { - init(parentDoc, comment); + init(tqparentDoc, comment); } JavaClassDeclarationBlock::~JavaClassDeclarationBlock ( ) { } @@ -66,12 +66,12 @@ void JavaClassDeclarationBlock::loadFromXMI ( TQDomElement & root ) void JavaClassDeclarationBlock::updateContent ( ) { - JavaClassifierCodeDocument *parentDoc = dynamic_cast<JavaClassifierCodeDocument*>(getParentDocument()); - UMLClassifier *c = parentDoc->getParentClassifier(); + JavaClassifierCodeDocument *tqparentDoc = dynamic_cast<JavaClassifierCodeDocument*>(getParentDocument()); + UMLClassifier *c = tqparentDoc->getParentClassifier(); CodeGenerationPolicy *commonPolicy = UMLApp::app()->getCommonPolicy(); TQString endLine = commonPolicy->getNewLineEndingChars(); - bool isInterface = parentDoc->parentIsInterface(); // a little shortcut - TQString JavaClassName = parentDoc->getJavaClassName(c->getName()); + bool isInterface = tqparentDoc->tqparentIsInterface(); // a little shortcut + TQString JavaClassName = tqparentDoc->getJavaClassName(c->getName()); // COMMENT if(isInterface) @@ -101,7 +101,7 @@ void JavaClassDeclarationBlock::updateContent ( ) } else startText.append("public "); - if(parentDoc->parentIsInterface()) + if(tqparentDoc->tqparentIsInterface()) startText.append("interface "); else startText.append("class "); @@ -122,7 +122,7 @@ void JavaClassDeclarationBlock::updateContent ( ) startText.append(" extends "); for (UMLClassifier * concept= superclasses.first(); concept; concept = superclasses.next()) { - startText.append(parentDoc->cleanName(concept->getName())); + startText.append(tqparentDoc->cleanName(concept->getName())); if(i != (nrof_superclasses-1)) startText.append(", "); i++; @@ -140,7 +140,7 @@ void JavaClassDeclarationBlock::updateContent ( ) } for (UMLClassifier * concept= superinterfaces.first(); concept; concept = superinterfaces.next()) { - startText.append(parentDoc->cleanName(concept->getName())); + startText.append(tqparentDoc->cleanName(concept->getName())); if(i != (nrof_superinterfaces-1)) startText.append(", "); i++; @@ -153,10 +153,10 @@ void JavaClassDeclarationBlock::updateContent ( ) } -void JavaClassDeclarationBlock::init (JavaClassifierCodeDocument *parentDoc, const TQString &comment) +void JavaClassDeclarationBlock::init (JavaClassifierCodeDocument *tqparentDoc, const TQString &comment) { - setComment(new JavaCodeDocumentation(parentDoc)); + setComment(new JavaCodeDocumentation(tqparentDoc)); getComment()->setText(comment); setEndText("}"); diff --git a/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h b/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h index 08e639c7..caa07074 100644 --- a/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h +++ b/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h @@ -25,6 +25,7 @@ class JavaClassDeclarationBlock : public OwnedHierarchicalCodeBlock { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -33,7 +34,7 @@ public: /** * Empty Constructor */ - explicit JavaClassDeclarationBlock ( JavaClassifierCodeDocument * parentDoc, const TQString &start = "", const TQString &endText = "}", const TQString &comment = ""); + explicit JavaClassDeclarationBlock ( JavaClassifierCodeDocument * tqparentDoc, const TQString &start = "", const TQString &endText = "}", const TQString &comment = ""); /** * Empty Destructor @@ -59,7 +60,7 @@ protected: private: - void init (JavaClassifierCodeDocument * parent, const TQString &comment); + void init (JavaClassifierCodeDocument * tqparent, const TQString &comment); }; diff --git a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp index 426c6d9a..bcf46bb6 100644 --- a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp +++ b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp @@ -89,10 +89,10 @@ TQString JavaClassifierCodeDocument::getPath ( ) path.simplifyWhiteSpace(); // Replace all blanks with underscore - path.replace(TQRegExp(" "), "_"); + path.tqreplace(TQRegExp(" "), "_"); - path.replace(TQRegExp("\\."),"/"); - path.replace(TQRegExp("::"), "/"); + path.tqreplace(TQRegExp("\\."),"/"); + path.tqreplace(TQRegExp("::"), "/"); path.lower(); @@ -222,7 +222,7 @@ void JavaClassifierCodeDocument::loadChildTextBlocksFromNode ( TQDomElement & ro } else if( name == "codeoperation" ) { // find the code operation by id - TQString id = element.attribute("parent_id","-1"); + TQString id = element.attribute("tqparent_id","-1"); UMLObject * obj = UMLApp::app()->getDocument()->findObjectById(STR2ID(id)); UMLOperation * op = dynamic_cast<UMLOperation*>(obj); if(op) { @@ -326,7 +326,7 @@ void JavaClassifierCodeDocument::resetTextBlocks() } // This method will cause the class to rebuild its text representation. -// based on the parent classifier object. +// based on the tqparent classifier object. // For any situation in which this is called, we are either building the code // document up, or replacing/regenerating the existing auto-generated parts. As // such, we will want to insert everything we resonablely will want @@ -334,7 +334,7 @@ void JavaClassifierCodeDocument::resetTextBlocks() // comments) to appear or not, as needed. void JavaClassifierCodeDocument::updateContent( ) { - // Gather info on the various fields and parent objects of this class... + // Gather info on the various fields and tqparent objects of this class... UMLClassifier * c = getParentClassifier(); CodeGenerationPolicy * commonPolicy = UMLApp::app()->getCommonPolicy(); CodeGenPolicyExt * pe = UMLApp::app()->getPolicyExt(); @@ -344,7 +344,7 @@ void JavaClassifierCodeDocument::updateContent( ) // This depends on whether or not we have attribute/association classes CodeClassFieldList * cfList = getCodeClassFieldList(); for(CodeClassField * field = cfList->first(); field; field = cfList->next()) - if(field->parentIsAttribute()) + if(field->tqparentIsAttribute()) field->setWriteOutMethods(policy->getAutoGenerateAttribAccessors()); else field->setWriteOutMethods(policy->getAutoGenerateAssocAccessors()); @@ -359,7 +359,7 @@ void JavaClassifierCodeDocument::updateContent( ) CodeClassFieldList aggregationClassFields = getSpecificClassFields ( CodeClassField::Aggregation ); CodeClassFieldList compositionClassFields = getSpecificClassFields ( CodeClassField::Composition ); - bool isInterface = parentIsInterface(); + bool isInterface = tqparentIsInterface(); bool hasOperationMethods = c->getOpList().last() ? true : false; TQString endLine = commonPolicy->getNewLineEndingChars(); // a shortcut..so we don't have to call this all the time @@ -371,7 +371,7 @@ void JavaClassifierCodeDocument::updateContent( ) // PACKAGE CODE BLOCK // TQString pkgs = getPackage(); - pkgs.replace(TQRegExp("::"), "."); + pkgs.tqreplace(TQRegExp("::"), "."); TQString packageText = getPackage().isEmpty() ? "" : "package "+pkgs+';'+endLine; CodeBlockWithComments * pblock = addOrUpdateTaggedCodeBlockWithComments("packages", packageText, "", 0, false); if(packageText.isEmpty() && pblock->getContentType() == CodeBlock::AutoGenerated) @@ -397,7 +397,7 @@ void JavaClassifierCodeDocument::updateContent( ) // NO (default) datatypes in the import statement.. use defined // ones whould be possible, but no idea how to do that...at least for now. // Dynamic casting is slow..not an optimal way to do this. - if (!packageMap.contains(con) && con->getBaseType() != Uml::ot_Datatype) + if (!packageMap.tqcontains(con) && con->getBaseType() != Uml::ot_Datatype) { packageMap.insert(con, con->getPackage()); @@ -428,7 +428,7 @@ void JavaClassifierCodeDocument::updateContent( ) // NOW create document in sections.. // now we want to populate the body of our class - // our layout is the following general groupings of code blocks: + // our tqlayout is the following general groupings of code blocks: // start java classifier document @@ -532,7 +532,7 @@ void JavaClassifierCodeDocument::updateContent( ) constBlock->addOrUpdateTaggedCodeBlockWithComments("emptyconstructor", emptyConstStatement, "Empty Constructor", 1, false); // Now, as an additional condition we only show the empty constructor block // IF it was desired to be shown - if(parentIsClass() && pol->getAutoGenerateConstructors()) + if(tqparentIsClass() && pol->getAutoGenerateConstructors()) emptyConstBlock->setWriteOutText(true); else emptyConstBlock->setWriteOutText(false); diff --git a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.h b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.h index 831e0555..5813609f 100644 --- a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.h +++ b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.h @@ -40,6 +40,7 @@ class JavaCodeGenerationPolicy; class JavaClassifierCodeDocument : public ClassifierCodeDocument { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors diff --git a/umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp b/umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp index 6c883952..dde0ca31 100644 --- a/umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp +++ b/umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp @@ -74,8 +74,8 @@ void JavaCodeAccessorMethod::setAttributesFromNode( TQDomElement & root) void JavaCodeAccessorMethod::updateContent( ) { - CodeClassField * parentField = getParentClassField(); - JavaCodeClassField * javafield = dynamic_cast<JavaCodeClassField*>(parentField); + CodeClassField * tqparentField = getParentClassField(); + JavaCodeClassField * javafield = dynamic_cast<JavaCodeClassField*>(tqparentField); TQString fieldName = javafield->getFieldName(); TQString text = ""; @@ -150,7 +150,7 @@ void JavaCodeAccessorMethod::updateMethodDeclaration() // set scope of this accessor appropriately..if its an attribute, // we need to be more sophisticated - if(javafield->parentIsAttribute()) + if(javafield->tqparentIsAttribute()) switch (scopePolicy) { case CodeGenerationPolicy::Public: case CodeGenerationPolicy::Private: @@ -159,7 +159,7 @@ void JavaCodeAccessorMethod::updateMethodDeclaration() break; default: case CodeGenerationPolicy::FromParent: - // do nothing..already have taken parent value + // do nothing..already have taken tqparent value break; } diff --git a/umbrello/umbrello/codegenerators/javacodeaccessormethod.h b/umbrello/umbrello/codegenerators/javacodeaccessormethod.h index e26ef033..902b37c4 100644 --- a/umbrello/umbrello/codegenerators/javacodeaccessormethod.h +++ b/umbrello/umbrello/codegenerators/javacodeaccessormethod.h @@ -25,6 +25,7 @@ class CodeClassField; class JavaCodeAccessorMethod : public CodeAccessorMethod { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors diff --git a/umbrello/umbrello/codegenerators/javacodeclassfield.cpp b/umbrello/umbrello/codegenerators/javacodeclassfield.cpp index 0777cf1d..c168ac35 100644 --- a/umbrello/umbrello/codegenerators/javacodeclassfield.cpp +++ b/umbrello/umbrello/codegenerators/javacodeclassfield.cpp @@ -36,14 +36,14 @@ // Constructors/Destructors // -JavaCodeClassField::JavaCodeClassField (ClassifierCodeDocument * parentDoc, UMLRole * role) - : CodeClassField(parentDoc, role) +JavaCodeClassField::JavaCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLRole * role) + : CodeClassField(tqparentDoc, role) { } -JavaCodeClassField::JavaCodeClassField (ClassifierCodeDocument * parentDoc, UMLAttribute * attrib) - : CodeClassField(parentDoc, attrib) +JavaCodeClassField::JavaCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLAttribute * attrib) + : CodeClassField(tqparentDoc, attrib) { } @@ -58,7 +58,7 @@ JavaCodeClassField::~JavaCodeClassField ( ) { } // TQString JavaCodeClassField::getFieldName() { - if (parentIsAttribute()) + if (tqparentIsAttribute()) { UMLAttribute * at = (UMLAttribute*) getParentObject(); return cleanName(at->getName()); @@ -68,7 +68,7 @@ TQString JavaCodeClassField::getFieldName() { UMLRole * role = (UMLRole*) getParentObject(); TQString roleName = role->getName(); if(fieldIsSingleValue()) { - return roleName.replace(0, 1, roleName.left(1).lower()); + return roleName.tqreplace(0, 1, roleName.left(1).lower()); } else { return roleName.lower() + "Vector"; } @@ -78,13 +78,13 @@ TQString JavaCodeClassField::getFieldName() { TQString JavaCodeClassField::getInitialValue() { - if (parentIsAttribute()) + if (tqparentIsAttribute()) { UMLAttribute * at = dynamic_cast<UMLAttribute*>( getParentObject() ); if (at) { return fixInitialStringDeclValue(at->getInitialValue(), getTypeName()); } else { - kError() << "JavaodeClassField::getInitialValue: parent object is not a UMLAttribute" + kError() << "JavaodeClassField::getInitialValue: tqparent object is not a UMLAttribute" << endl; return ""; } diff --git a/umbrello/umbrello/codegenerators/javacodeclassfield.h b/umbrello/umbrello/codegenerators/javacodeclassfield.h index b381796c..0cad977b 100644 --- a/umbrello/umbrello/codegenerators/javacodeclassfield.h +++ b/umbrello/umbrello/codegenerators/javacodeclassfield.h @@ -27,6 +27,7 @@ class ClassifierCodeDocument; class JavaCodeClassField : public CodeClassField { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -35,8 +36,8 @@ public: /** * Constructors */ - JavaCodeClassField (ClassifierCodeDocument * parentDoc, UMLRole * role); - JavaCodeClassField (ClassifierCodeDocument * parentDoc, UMLAttribute * attrib); + JavaCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLRole * role); + JavaCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLAttribute * attrib); /** * Empty Destructor diff --git a/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp b/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp index 5507c314..6f6eb5ec 100644 --- a/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp +++ b/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp @@ -27,8 +27,8 @@ // Constructors/Destructors // -JavaCodeClassFieldDeclarationBlock::JavaCodeClassFieldDeclarationBlock ( CodeClassField * parent ) - : CodeClassFieldDeclarationBlock ( parent ) +JavaCodeClassFieldDeclarationBlock::JavaCodeClassFieldDeclarationBlock ( CodeClassField * tqparent ) + : CodeClassFieldDeclarationBlock ( tqparent ) { setOverallIndentationLevel(1); updateContent(); @@ -67,7 +67,7 @@ void JavaCodeClassFieldDeclarationBlock::updateContent( ) TQString scopeStr = jdoc->scopeToJavaDecl(getParentObject()->getVisibility()); // IF this is from an association, then scope taken as appropriate to policy - if(!jcf->parentIsAttribute()) + if(!jcf->tqparentIsAttribute()) { switch (scopePolicy) { case CodeGenerationPolicy::Public: @@ -77,7 +77,7 @@ void JavaCodeClassFieldDeclarationBlock::updateContent( ) break; default: case CodeGenerationPolicy::FromParent: - // do nothing here... will leave as from parent object + // do nothing here... will leave as from tqparent object break; } } @@ -86,13 +86,13 @@ void JavaCodeClassFieldDeclarationBlock::updateContent( ) TQString fieldName = jcf->getFieldName(); TQString initialV = jcf->getInitialValue(); - if (!cf->parentIsAttribute() && !cf->fieldIsSingleValue()) + if (!cf->tqparentIsAttribute() && !cf->fieldIsSingleValue()) typeName = "List"; TQString body = staticValue+scopeStr+' '+typeName+' '+fieldName; if (!initialV.isEmpty()) body.append(" = " + initialV); - else if (!cf->parentIsAttribute()) + else if (!cf->tqparentIsAttribute()) { UMLRole * role = dynamic_cast<UMLRole*>(cf->getParentObject()); if (role->getObject()->getBaseType() == Uml::ot_Interface) @@ -101,7 +101,7 @@ void JavaCodeClassFieldDeclarationBlock::updateContent( ) } else { // FIX?: IF a constructor method exists in the classifiercodedoc - // of the parent Object, then we can use that instead (if its empty). + // of the tqparent Object, then we can use that instead (if its empty). if(cf->fieldIsSingleValue()) { if(!typeName.isEmpty()) diff --git a/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.h b/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.h index 1ed37a43..d7f3c2f5 100644 --- a/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.h +++ b/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.h @@ -23,6 +23,7 @@ class JavaCodeClassFieldDeclarationBlock : public CodeClassFieldDeclarationBlock { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -31,7 +32,7 @@ public: /** * Constructor */ - JavaCodeClassFieldDeclarationBlock ( CodeClassField * parent ); + JavaCodeClassFieldDeclarationBlock ( CodeClassField * tqparent ); /** * Empty Destructor @@ -40,7 +41,7 @@ public: protected: - // this will be called by syncToParent whenever the parent object is "modified" + // this will be called by syncToParent whenever the tqparent object is "modified" void updateContent ( ); private: diff --git a/umbrello/umbrello/codegenerators/javacodecomment.cpp b/umbrello/umbrello/codegenerators/javacodecomment.cpp index 588a0acc..38794003 100644 --- a/umbrello/umbrello/codegenerators/javacodecomment.cpp +++ b/umbrello/umbrello/codegenerators/javacodecomment.cpp @@ -62,7 +62,7 @@ TQString JavaCodeComment::unformatText ( const TQString & text , const TQString } /** - * @return QString + * @return TQString */ TQString JavaCodeComment::toString ( ) { diff --git a/umbrello/umbrello/codegenerators/javacodecomment.h b/umbrello/umbrello/codegenerators/javacodecomment.h index 468b2a7c..2d756d70 100644 --- a/umbrello/umbrello/codegenerators/javacodecomment.h +++ b/umbrello/umbrello/codegenerators/javacodecomment.h @@ -31,6 +31,7 @@ class JavaCodeComment : virtual public CodeComment { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -54,7 +55,7 @@ public: // other /** - * @return QString + * @return TQString */ TQString toString ( ); diff --git a/umbrello/umbrello/codegenerators/javacodedocumentation.cpp b/umbrello/umbrello/codegenerators/javacodedocumentation.cpp index 662b88c9..a04a3cd1 100644 --- a/umbrello/umbrello/codegenerators/javacodedocumentation.cpp +++ b/umbrello/umbrello/codegenerators/javacodedocumentation.cpp @@ -54,12 +54,12 @@ JavaCodeDocumentation::~JavaCodeDocumentation ( ) { } void JavaCodeDocumentation::saveToXMI ( TQDomDocument & doc, TQDomElement & root ) { TQDomElement blockElement = doc.createElement( "javacodedocumentation" ); setAttributesOnNode(doc, blockElement); // as we added no additional fields to this class we may - // just use parent TextBlock method + // just use tqparent TextBlock method root.appendChild( blockElement ); } /** - * @return QString + * @return TQString */ TQString JavaCodeDocumentation::toString ( ) { diff --git a/umbrello/umbrello/codegenerators/javacodedocumentation.h b/umbrello/umbrello/codegenerators/javacodedocumentation.h index acc386c1..dff2da00 100644 --- a/umbrello/umbrello/codegenerators/javacodedocumentation.h +++ b/umbrello/umbrello/codegenerators/javacodedocumentation.h @@ -33,6 +33,7 @@ class JavaClassifierCodeDocument; class JavaCodeDocumentation : virtual public CodeComment { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -61,7 +62,7 @@ public: virtual void saveToXMI ( TQDomDocument & doc, TQDomElement & root ); /** - * @return QString + * @return TQString */ TQString toString ( ); diff --git a/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui b/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui index cd39611a..e756333c 100644 --- a/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui +++ b/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>JavaCodeGenerationFormBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -16,15 +16,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="3" column="0"> + <widget class="TQGroupBox" row="3" column="0"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -43,7 +43,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_makeANTDocumentCheckBox</cstring> </property> @@ -53,7 +53,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox" row="2" column="0"> + <widget class="TQGroupBox" row="2" column="0"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -72,15 +72,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>m_generateConstructors</cstring> </property> @@ -91,7 +91,7 @@ <bool>false</bool> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>m_generateAssocAccessors</cstring> </property> @@ -102,7 +102,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>m_generateAttribAccessors</cstring> </property> @@ -115,15 +115,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <item> <property name="text"> <string>Public</string> @@ -151,7 +151,7 @@ <number>3</number> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -161,15 +161,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_3_2</cstring> </property> @@ -177,7 +177,7 @@ <string>Default association field scope:</string> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <item> <property name="text"> <string>Public</string> @@ -209,7 +209,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -228,7 +228,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -236,7 +236,7 @@ <string>Style:</string> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>Slash-Slash (//)</string> @@ -253,7 +253,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -273,5 +273,5 @@ </widget> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/umbrello/umbrello/codegenerators/javacodegenerationpolicy.cpp b/umbrello/umbrello/codegenerators/javacodegenerationpolicy.cpp index 6225485f..aeee86e0 100644 --- a/umbrello/umbrello/codegenerators/javacodegenerationpolicy.cpp +++ b/umbrello/umbrello/codegenerators/javacodegenerationpolicy.cpp @@ -174,8 +174,8 @@ void JavaCodeGenerationPolicy::setDefaults( KConfig * config, bool emitUpdateSig * Create a new dialog interface for this object. * @return dialog object */ -CodeGenerationPolicyPage * JavaCodeGenerationPolicy::createPage ( TQWidget *parent, const char *name ) { - return new JavaCodeGenerationPolicyPage ( parent, name, this ); +CodeGenerationPolicyPage * JavaCodeGenerationPolicy::createPage ( TQWidget *tqparent, const char *name ) { + return new JavaCodeGenerationPolicyPage ( tqparent, name, this ); } void JavaCodeGenerationPolicy::init() { diff --git a/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h b/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h index e72c5161..cb9171f4 100644 --- a/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h +++ b/umbrello/umbrello/codegenerators/javacodegenerationpolicy.h @@ -27,6 +27,7 @@ class CodeGenerationPolicyPage; class JavaCodeGenerationPolicy : public CodeGenPolicyExt { Q_OBJECT + TQ_OBJECT public: static const bool DEFAULT_AUTO_GEN_ATTRIB_ACCESSORS; @@ -96,7 +97,7 @@ public: * Create a new dialog interface for this object. * @return dialog object */ - CodeGenerationPolicyPage * createPage ( TQWidget *parent = 0, const char * name = 0); + CodeGenerationPolicyPage * createPage ( TQWidget *tqparent = 0, const char * name = 0); protected: diff --git a/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.cpp b/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.cpp index c7bfbf0b..c802024a 100644 --- a/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.cpp +++ b/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.cpp @@ -26,8 +26,8 @@ #include "javacodegenerationformbase.h" #include "../uml.h" -JavaCodeGenerationPolicyPage::JavaCodeGenerationPolicyPage( TQWidget *parent, const char *name, JavaCodeGenerationPolicy * policy ) - : CodeGenerationPolicyPage(parent, name, policy) +JavaCodeGenerationPolicyPage::JavaCodeGenerationPolicyPage( TQWidget *tqparent, const char *name, JavaCodeGenerationPolicy * policy ) + : CodeGenerationPolicyPage(tqparent, name, policy) { CodeGenerationPolicy *commonPolicy = UMLApp::app()->getCommonPolicy(); form = new JavaCodeGenerationFormBase(this); @@ -54,7 +54,7 @@ JavaCodeGenerationPolicyPage::~JavaCodeGenerationPolicyPage() void JavaCodeGenerationPolicyPage::apply() { CodeGenerationPolicy *commonPolicy = UMLApp::app()->getCommonPolicy(); - JavaCodeGenerationPolicy * parent = (JavaCodeGenerationPolicy*) m_parentPolicy; + JavaCodeGenerationPolicy * tqparent = (JavaCodeGenerationPolicy*) m_parentPolicy; // block signals so we don't cause too many update content calls to code documents commonPolicy->blockSignals(true); @@ -63,8 +63,8 @@ void JavaCodeGenerationPolicyPage::apply() commonPolicy->setAttributeAccessorScope((CodeGenerationPolicy::ScopePolicy) (form->m_accessorScopeCB->currentItem()+200)); commonPolicy->setAssociationFieldScope((CodeGenerationPolicy::ScopePolicy) (form->m_assocFieldScopeCB->currentItem()+200)); commonPolicy->setAutoGenerateConstructors(form->m_generateConstructors->isChecked()); - parent->setAutoGenerateAttribAccessors(form->m_generateAttribAccessors->isChecked()); - parent->setAutoGenerateAssocAccessors(form->m_generateAssocAccessors->isChecked()); + tqparent->setAutoGenerateAttribAccessors(form->m_generateAttribAccessors->isChecked()); + tqparent->setAutoGenerateAssocAccessors(form->m_generateAssocAccessors->isChecked()); /** * @todo unclean - CreateANTBuildFile attribute should be in java policy diff --git a/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.h b/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.h index 01b739b9..2ace585e 100644 --- a/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.h +++ b/umbrello/umbrello/codegenerators/javacodegenerationpolicypage.h @@ -28,9 +28,10 @@ class JavaCodeGenerationPolicyPage : public CodeGenerationPolicyPage { Q_OBJECT + TQ_OBJECT public: - explicit JavaCodeGenerationPolicyPage (TQWidget *parent=0, const char *name=0, JavaCodeGenerationPolicy * policy = 0); + explicit JavaCodeGenerationPolicyPage (TQWidget *tqparent=0, const char *name=0, JavaCodeGenerationPolicy * policy = 0); virtual ~JavaCodeGenerationPolicyPage(); diff --git a/umbrello/umbrello/codegenerators/javacodegenerator.cpp b/umbrello/umbrello/codegenerators/javacodegenerator.cpp index 0f78a0fb..12462784 100644 --- a/umbrello/umbrello/codegenerators/javacodegenerator.cpp +++ b/umbrello/umbrello/codegenerators/javacodegenerator.cpp @@ -79,10 +79,10 @@ bool JavaCodeGenerator::getCreateANTBuildFile ( ) { } // In the Java version, we make the ANT build file also available. -CodeViewerDialog * JavaCodeGenerator::getCodeViewerDialog ( TQWidget* parent, CodeDocument *doc, +CodeViewerDialog * JavaCodeGenerator::getCodeViewerDialog ( TQWidget* tqparent, CodeDocument *doc, Settings::CodeViewerState state) { - CodeViewerDialog *dialog = new CodeViewerDialog(parent, doc, state); + CodeViewerDialog *dialog = new CodeViewerDialog(tqparent, doc, state); if(getCreateANTBuildFile()) dialog->addCodeDocument(findCodeDocumentByID("ANTDOC")); return dialog; @@ -115,7 +115,7 @@ TQString JavaCodeGenerator::getListFieldClassName () { // Same thing again for "bool" to "boolean" TQString JavaCodeGenerator::fixTypeName(const TQString &string) { - if (string.isEmpty() || string.contains(TQRegExp("^\\s+$"))) + if (string.isEmpty() || string.tqcontains(TQRegExp("^\\s+$"))) return "void"; if (string == "string") return "String"; @@ -143,7 +143,7 @@ CodeDocument * JavaCodeGenerator::newClassifierCodeDocument ( UMLClassifier * c) } void JavaCodeGenerator::init() { - // load Classifier documents from parent document + // load Classifier documents from tqparent document //initFromParentDocument(); // add in an ANT document diff --git a/umbrello/umbrello/codegenerators/javacodegenerator.h b/umbrello/umbrello/codegenerators/javacodegenerator.h index 3d94ad5f..c9fc49e7 100644 --- a/umbrello/umbrello/codegenerators/javacodegenerator.h +++ b/umbrello/umbrello/codegenerators/javacodegenerator.h @@ -36,6 +36,7 @@ class CodeViewerDialog; class JavaCodeGenerator : public CodeGenerator { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -91,7 +92,7 @@ public: /** Get the editing dialog for this code document */ - virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* parent, CodeDocument * doc, + virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* tqparent, CodeDocument * doc, Settings::CodeViewerState state); // Other methods diff --git a/umbrello/umbrello/codegenerators/javacodeoperation.cpp b/umbrello/umbrello/codegenerators/javacodeoperation.cpp index c7e7d162..a788b215 100644 --- a/umbrello/umbrello/codegenerators/javacodeoperation.cpp +++ b/umbrello/umbrello/codegenerators/javacodeoperation.cpp @@ -25,8 +25,8 @@ // JavaCodeOperation::JavaCodeOperation - ( JavaClassifierCodeDocument * doc, UMLOperation *parent, const TQString & body, const TQString & comment ) - : CodeOperation (doc, parent, body, comment) + ( JavaClassifierCodeDocument * doc, UMLOperation *tqparent, const TQString & body, const TQString & comment ) + : CodeOperation (doc, tqparent, body, comment) { // lets not go with the default comment and instead use // full-blown java documentation object instead @@ -81,7 +81,7 @@ void JavaCodeOperation::updateMethodDeclaration() maybeStatic = "static "; TQString startText = strVis + ' ' + maybeStatic + returnType + methodName + " (" + paramStr + ')'; - // IF the parent is an interface, our operations look different + // IF the tqparent is an interface, our operations look different // e.g. they have no body if(isInterface) { startText += ';'; @@ -123,7 +123,7 @@ void JavaCodeOperation::updateMethodDeclaration() int JavaCodeOperation::lastEditableLine() { ClassifierCodeDocument * doc = dynamic_cast<ClassifierCodeDocument*>(getParentDocument()); - if(doc->parentIsInterface()) + if(doc->tqparentIsInterface()) return -1; // very last line is NOT editable as its a one-line declaration w/ no body in // an interface. return 0; diff --git a/umbrello/umbrello/codegenerators/javacodeoperation.h b/umbrello/umbrello/codegenerators/javacodeoperation.h index 50087fd7..51b7f48a 100644 --- a/umbrello/umbrello/codegenerators/javacodeoperation.h +++ b/umbrello/umbrello/codegenerators/javacodeoperation.h @@ -26,6 +26,7 @@ class JavaClassifierCodeDocument; class JavaCodeOperation : virtual public CodeOperation { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors diff --git a/umbrello/umbrello/codegenerators/javawriter.cpp b/umbrello/umbrello/codegenerators/javawriter.cpp index db6d6515..9c351555 100644 --- a/umbrello/umbrello/codegenerators/javawriter.cpp +++ b/umbrello/umbrello/codegenerators/javawriter.cpp @@ -137,8 +137,8 @@ void JavaWriter::writeClass(UMLClassifier *c) TQString str; str = getHeadingFile(".java"); if(!str.isEmpty()) { - str.replace(TQRegExp("%filename%"),fileName); - str.replace(TQRegExp("%filepath%"),file.name()); + str.tqreplace(TQRegExp("%filename%"),fileName); + str.tqreplace(TQRegExp("%filepath%"),file.name()); java<<str<<m_endl; } @@ -408,7 +408,7 @@ void JavaWriter::writeAttributeMethods(UMLAttributeList &atpub, Uml::Visibility // from what I can tell, this IS the default behavior for // cleanName. I dunno why its not working -b.t. fieldName.stripWhiteSpace(); - fieldName.replace(0,1,fieldName.at(0).upper()); + fieldName.tqreplace(0,1,fieldName.tqat(0).upper()); writeSingleAttributeAccessorMethods(at->getTypeName(), cleanName(at->getName()), @@ -425,7 +425,7 @@ void JavaWriter::writeComment(const TQString &comment, const TQString &myIndent, // in the case we have several line comment.. // NOTE: this part of the method has the problem of adopting UNIX newline, // need to resolve for using with MAC/WinDoze eventually I assume - if (comment.contains(TQRegExp("\n"))) { + if (comment.tqcontains(TQRegExp("\n"))) { if(javaDocStyle) java << myIndent << "/**" << m_endl; @@ -530,9 +530,9 @@ void JavaWriter::writeAssociationRoleDecl(TQString fieldClassName, // declare the association based on whether it is this a single variable // or a List (Vector). One day this will be done correctly with special // multiplicity object that we don't have to figure out what it means via regex. - if(multi.isEmpty() || multi.contains(TQRegExp("^[01]$"))) + if(multi.isEmpty() || multi.tqcontains(TQRegExp("^[01]$"))) { - TQString fieldVarName = "m_" + roleName.replace(0, 1, roleName.left(1).lower()); + TQString fieldVarName = "m_" + roleName.tqreplace(0, 1, roleName.left(1).lower()); java<<startline<<scope<<" "<<fieldClassName<<" "<<fieldVarName<<";"; } else @@ -589,9 +589,9 @@ void JavaWriter::writeAssociationRoleMethod (TQString fieldClassName, TQString r TQString description, Uml::Visibility visib, Uml::Changeability_Type change, TQTextStream &java) { - if(multi.isEmpty() || multi.contains(TQRegExp("^[01]$"))) + if(multi.isEmpty() || multi.tqcontains(TQRegExp("^[01]$"))) { - TQString fieldVarName = "m_" + roleName.replace(0, 1, roleName.left(1).lower()); + TQString fieldVarName = "m_" + roleName.tqreplace(0, 1, roleName.left(1).lower()); writeSingleAttributeAccessorMethods(fieldClassName, fieldVarName, roleName, description, visib, change, false, java); } diff --git a/umbrello/umbrello/codegenerators/jswriter.cpp b/umbrello/umbrello/codegenerators/jswriter.cpp index ea4cc2e1..b53cd9f6 100644 --- a/umbrello/umbrello/codegenerators/jswriter.cpp +++ b/umbrello/umbrello/codegenerators/jswriter.cpp @@ -68,8 +68,8 @@ void JSWriter::writeClass(UMLClassifier *c) str = getHeadingFile(".js"); if(!str.isEmpty()) { - str.replace(TQRegExp("%filename%"),fileName); - str.replace(TQRegExp("%filepath%"),filejs.name()); + str.tqreplace(TQRegExp("%filename%"),fileName); + str.tqreplace(TQRegExp("%filepath%"),filejs.name()); js << str << m_endl; } diff --git a/umbrello/umbrello/codegenerators/jswriter.h b/umbrello/umbrello/codegenerators/jswriter.h index 679222b3..3f54101e 100644 --- a/umbrello/umbrello/codegenerators/jswriter.h +++ b/umbrello/umbrello/codegenerators/jswriter.h @@ -28,6 +28,7 @@ */ class JSWriter : public SimpleCodeGenerator { Q_OBJECT + TQ_OBJECT public: JSWriter(); diff --git a/umbrello/umbrello/codegenerators/pascalwriter.cpp b/umbrello/umbrello/codegenerators/pascalwriter.cpp index 766ea6df..2a42bef7 100644 --- a/umbrello/umbrello/codegenerators/pascalwriter.cpp +++ b/umbrello/umbrello/codegenerators/pascalwriter.cpp @@ -129,7 +129,7 @@ void PascalWriter::writeClass(UMLClassifier *c) { const bool isClass = !c->isInterface(); TQString classname = cleanName(c->getName()); TQString fileName = qualifiedName(c).lower(); - fileName.replace('.', '-'); + fileName.tqreplace('.', '-'); //find an appropriate name for our file fileName = overwritableName(c, fileName, ".pas"); @@ -151,8 +151,8 @@ void PascalWriter::writeClass(UMLClassifier *c) { TQString str; str = getHeadingFile(".pas"); if (!str.isEmpty()) { - str.replace(TQRegExp("%filename%"), fileName); - str.replace(TQRegExp("%filepath%"), file.name()); + str.tqreplace(TQRegExp("%filename%"), fileName); + str.tqreplace(TQRegExp("%filepath%"), file.name()); pas << str << endl; } @@ -244,8 +244,8 @@ void PascalWriter::writeClass(UMLClassifier *c) { pas << getIndent() << classname << " = object"; if (!superclasses.isEmpty()) { // FIXME: Multiple inheritance is not yet supported - UMLClassifier* parent = superclasses.first(); - pas << "(" << qualifiedName(parent) << ")"; + UMLClassifier* tqparent = superclasses.first(); + pas << "(" << qualifiedName(tqparent) << ")"; } pas << m_endl; @@ -382,7 +382,7 @@ TQStringList PascalWriter::defaultDatatypes() { l.append("Longint"); l.append("LongBool"); l.append("Longword"); - l.append("QWord"); + l.append("TQWord"); l.append("Real"); l.append("Shortint"); l.append("ShortString"); @@ -434,7 +434,7 @@ const TQStringList PascalWriter::reservedKeywords() const { keywords.append( "class" ); keywords.append( "const" ); keywords.append( "constructor" ); - keywords.append( "contains" ); + keywords.append( "tqcontains" ); keywords.append( "default" ); keywords.append( "deprecated" ); keywords.append( "destructor" ); diff --git a/umbrello/umbrello/codegenerators/pascalwriter.h b/umbrello/umbrello/codegenerators/pascalwriter.h index 0e1f93ca..e8db48ba 100644 --- a/umbrello/umbrello/codegenerators/pascalwriter.h +++ b/umbrello/umbrello/codegenerators/pascalwriter.h @@ -24,6 +24,7 @@ class UMLOperation; */ class PascalWriter : public SimpleCodeGenerator { Q_OBJECT + TQ_OBJECT public: /** diff --git a/umbrello/umbrello/codegenerators/perlwriter.cpp b/umbrello/umbrello/codegenerators/perlwriter.cpp index 42563ec4..93195090 100644 --- a/umbrello/umbrello/codegenerators/perlwriter.cpp +++ b/umbrello/umbrello/codegenerators/perlwriter.cpp @@ -54,7 +54,7 @@ bool PerlWriter::GetUseStatements(UMLClassifier *c, TQString &Ret, TQString neatName = cleanName(conc->getName()); if (neatName != AV && neatName != SV && neatName != HV) { TQString OtherPkgName = conc->getPackage("."); - OtherPkgName.replace(TQRegExp("\\."),"::"); + OtherPkgName.tqreplace(TQRegExp("\\."),"::"); TQString OtherName = OtherPkgName + "::" + cleanName(conc->getName()); // Only print out the use statement if the other package isn't the @@ -75,7 +75,7 @@ bool PerlWriter::GetUseStatements(UMLClassifier *c, TQString &Ret, for (UMLClassifier *obj = superclasses.first(); obj; obj = superclasses.next()) { TQString packageName = obj->getPackage("."); - packageName.replace(TQRegExp("\\."),"::"); + packageName.tqreplace(TQRegExp("\\."),"::"); Ret += packageName + "::" + cleanName(obj->getName()) + ' '; } @@ -100,11 +100,11 @@ void PerlWriter::writeClass(UMLClassifier *c) { packageName.simplifyWhiteSpace(); // Replace all blanks with underscore - packageName.replace(TQRegExp(" "), "_"); + packageName.tqreplace(TQRegExp(" "), "_"); // Replace all dots (".") with double colon scope resolution operators // ("::") - packageName.replace(TQRegExp("\\."),"::"); + packageName.tqreplace(TQRegExp("\\."),"::"); // Store complete package name TQString ThisPkgName = packageName + "::" + classname; @@ -118,7 +118,7 @@ void PerlWriter::writeClass(UMLClassifier *c) { CodeGenerationPolicy *pol = UMLApp::app()->getCommonPolicy(); TQString curDir = pol->getOutputDirectory().absPath(); - if (fileName.contains("::")) { + if (fileName.tqcontains("::")) { // create new directories for each level TQString newDir; newDir = curDir; @@ -166,14 +166,14 @@ void PerlWriter::writeClass(UMLClassifier *c) { str = getHeadingFile(".pm"); // what this mean? if(!str.isEmpty()) { - str.replace(TQRegExp("%filename%"),fileName); - str.replace(TQRegExp("%filepath%"),fileperl.name()); - str.replace(TQRegExp("%year%"),TQDate::currentDate().toString("yyyy")); - str.replace(TQRegExp("%date%"),TQDate::currentDate().toString()); - str.replace(TQRegExp("%time%"),TQTime::currentTime().toString()); - str.replace(TQRegExp("%package-name%"),ThisPkgName); - if(str.find(TQRegExp("%PACKAGE-DECLARE%"))){ - str.replace(TQRegExp("%PACKAGE-DECLARE%"), + str.tqreplace(TQRegExp("%filename%"),fileName); + str.tqreplace(TQRegExp("%filepath%"),fileperl.name()); + str.tqreplace(TQRegExp("%year%"),TQDate::tqcurrentDate().toString("yyyy")); + str.tqreplace(TQRegExp("%date%"),TQDate::tqcurrentDate().toString()); + str.tqreplace(TQRegExp("%time%"),TQTime::currentTime().toString()); + str.tqreplace(TQRegExp("%package-name%"),ThisPkgName); + if(str.tqfind(TQRegExp("%PACKAGE-DECLARE%"))){ + str.tqreplace(TQRegExp("%PACKAGE-DECLARE%"), "package " + ThisPkgName + ';' + m_endl + m_endl + "#UML_MODELER_BEGIN_PERSONAL_VARS_" + classname @@ -184,10 +184,10 @@ void PerlWriter::writeClass(UMLClassifier *c) { bPackageDeclared = true; } - if(str.find(TQRegExp("%USE-STATEMENTS%"))){ + if(str.tqfind(TQRegExp("%USE-STATEMENTS%"))){ TQString UseStms; if(GetUseStatements(c,UseStms,ThisPkgName)){ - str.replace(TQRegExp("%USE-STATEMENTS%"), UseStms); + str.tqreplace(TQRegExp("%USE-STATEMENTS%"), UseStms); bUseStmsWritten = true; } } diff --git a/umbrello/umbrello/codegenerators/perlwriter.h b/umbrello/umbrello/codegenerators/perlwriter.h index 4d5fdabd..99e39bb1 100644 --- a/umbrello/umbrello/codegenerators/perlwriter.h +++ b/umbrello/umbrello/codegenerators/perlwriter.h @@ -32,6 +32,7 @@ class UMLClassifier; */ class PerlWriter : public SimpleCodeGenerator { Q_OBJECT + TQ_OBJECT public: PerlWriter(); diff --git a/umbrello/umbrello/codegenerators/php5writer.cpp b/umbrello/umbrello/codegenerators/php5writer.cpp index 64a01b47..d1eadb0b 100644 --- a/umbrello/umbrello/codegenerators/php5writer.cpp +++ b/umbrello/umbrello/codegenerators/php5writer.cpp @@ -173,7 +173,7 @@ static const char *php5words[] = "checkout", "chgrp", "child_nodes", - "children", + "tqchildren", "chmod", "chop", "chown", @@ -345,7 +345,7 @@ static const char *php5words[] = "dba_open", "dba_optimize", "dba_popen", - "dba_replace", + "dba_tqreplace", "dbase_add_record", "dbase_close", "dbase_create", @@ -367,7 +367,7 @@ static const char *php5words[] = "dbminsert", "dbmnextkey", "dbmopen", - "dbmreplace", + "dbmtqreplace", "dbplus_add", "dbplus_aql", "dbplus_chdir", @@ -375,7 +375,7 @@ static const char *php5words[] = "dbplus_curr", "dbplus_errcode", "dbplus_errno", - "dbplus_find", + "dbplus_tqfind", "dbplus_first", "dbplus_flush", "dbplus_freealllocks", @@ -511,8 +511,8 @@ static const char *php5words[] = "E_PARSE", "ereg", "eregi", - "eregi_replace", - "ereg_replace", + "eregi_tqreplace", + "ereg_tqreplace", "error_log", "error_reporting", "escapeshellarg", @@ -646,7 +646,7 @@ static const char *php5words[] = "_FILES", "filesize", "filetype", - "find", + "tqfind", "first_child", "floatval", "flock", @@ -760,8 +760,8 @@ static const char *php5words[] = "getrusage", "getservbyname", "getservbyport", - "getshape1", - "getshape2", + "gettqshape1", + "gettqshape2", "gettext", "gettimeofday", "gettype", @@ -1293,7 +1293,7 @@ static const char *php5words[] = "ldap_mod_add", "ldap_mod_del", "ldap_modify", - "ldap_mod_replace", + "ldap_mod_tqreplace", "ldap_next_attribute", "ldap_next_entry", "ldap_next_reference", @@ -1350,9 +1350,9 @@ static const char *php5words[] = "mb_encode_numericentity", "mb_ereg", "mb_eregi", - "mb_eregi_replace", + "mb_eregi_tqreplace", "mb_ereg_match", - "mb_ereg_replace", + "mb_ereg_tqreplace", "mb_ereg_search", "mb_ereg_search_getpos", "mb_ereg_search_getregs", @@ -1565,7 +1565,7 @@ static const char *php5words[] = "msession_create", "msession_destroy", "msession_disconnect", - "msession_find", + "msession_tqfind", "msession_get", "msession_get_array", "msession_getdata", @@ -1776,7 +1776,7 @@ static const char *php5words[] = "ncurses_killchar", "ncurses_longname", "ncurses_mouseinterval", - "ncurses_mousemask", + "ncurses_mousetqmask", "ncurses_move", "ncurses_mvaddch", "ncurses_mvaddchnstr", @@ -2051,8 +2051,8 @@ static const char *php5words[] = "ovrimos_rollback", "owner_document", "pack", - "parent_node", - "parents", + "tqparent_node", + "tqparents", "parse_ini_file", "parse_str", "parse_url", @@ -2323,7 +2323,7 @@ static const char *php5words[] = "preg_match", "preg_match_all", "preg_quote", - "preg_replace", + "preg_tqreplace", "preg_replace_callback", "preg_split", "prev", @@ -2389,7 +2389,7 @@ static const char *php5words[] = "putenv", "qdom_error", "qdom_tree", - "QUERY_STRING", + "TQUERY_STRING", "quoted_printable_decode", "quotemeta", "rad2deg", @@ -2424,7 +2424,7 @@ static const char *php5words[] = "remove_attribute", "remove_child", "rename", - "replace", + "tqreplace", "replace_child", "replace_node", "_REQUEST", @@ -2661,7 +2661,7 @@ static const char *php5words[] = "strpos", "strrchr", "str_repeat", - "str_replace", + "str_tqreplace", "strrev", "str_rot13", "strrpos", @@ -2677,7 +2677,7 @@ static const char *php5words[] = "str_word_count", "substr", "substr_count", - "substr_replace", + "substr_tqreplace", "SWFAction", "swf_actiongeturl", "swf_actiongotoframe", @@ -2704,7 +2704,7 @@ static const char *php5words[] = "SWFDisplayItem", "swf_endbutton", "swf_enddoaction", - "swf_endshape", + "swf_endtqshape", "swf_endsymbol", "SWFFill", "SWFFont", @@ -2738,21 +2738,21 @@ static const char *php5words[] = "swf_setfont", "swf_setframe", "SWFShape", - "swf_shapearc", - "swf_shapecurveto", - "swf_shapecurveto3", - "swf_shapefillbitmapclip", - "swf_shapefillbitmaptile", - "swf_shapefilloff", - "swf_shapefillsolid", - "swf_shapelinesolid", - "swf_shapelineto", - "swf_shapemoveto", + "swf_tqshapearc", + "swf_tqshapecurveto", + "swf_tqshapecurveto3", + "swf_tqshapefillbitmapclip", + "swf_tqshapefillbitmaptile", + "swf_tqshapefilloff", + "swf_tqshapefillsolid", + "swf_tqshapelinesolid", + "swf_tqshapelineto", + "swf_tqshapemoveto", "swf_showframe", "SWFSprite", "swf_startbutton", "swf_startdoaction", - "swf_startshape", + "swf_starttqshape", "swf_startsymbol", "SWFText", "SWFTextField", @@ -2816,7 +2816,7 @@ static const char *php5words[] = "udm_crc32", "udm_errno", "udm_error", - "udm_find", + "udm_tqfind", "udm_free_agent", "udm_free_ispell_data", "udm_free_res", @@ -3024,8 +3024,8 @@ void Php5Writer::writeClass(UMLClassifier *c) { TQString str; str = getHeadingFile(".php"); if(!str.isEmpty()) { - str.replace(TQRegExp("%filename%"),fileName); - str.replace(TQRegExp("%filepath%"),filephp.name()); + str.tqreplace(TQRegExp("%filename%"),fileName); + str.tqreplace(TQRegExp("%filepath%"),filephp.name()); php<<str<<m_endl; } diff --git a/umbrello/umbrello/codegenerators/php5writer.h b/umbrello/umbrello/codegenerators/php5writer.h index ea2a7862..726cf09b 100644 --- a/umbrello/umbrello/codegenerators/php5writer.h +++ b/umbrello/umbrello/codegenerators/php5writer.h @@ -30,6 +30,7 @@ */ class Php5Writer : public SimpleCodeGenerator { Q_OBJECT + TQ_OBJECT public: Php5Writer(); diff --git a/umbrello/umbrello/codegenerators/phpwriter.cpp b/umbrello/umbrello/codegenerators/phpwriter.cpp index e9dba103..5536c2c9 100644 --- a/umbrello/umbrello/codegenerators/phpwriter.cpp +++ b/umbrello/umbrello/codegenerators/phpwriter.cpp @@ -171,7 +171,7 @@ static const char *words[] = "checkout", "chgrp", "child_nodes", - "children", + "tqchildren", "chmod", "chop", "chown", @@ -343,7 +343,7 @@ static const char *words[] = "dba_open", "dba_optimize", "dba_popen", - "dba_replace", + "dba_tqreplace", "dbase_add_record", "dbase_close", "dbase_create", @@ -365,7 +365,7 @@ static const char *words[] = "dbminsert", "dbmnextkey", "dbmopen", - "dbmreplace", + "dbmtqreplace", "dbplus_add", "dbplus_aql", "dbplus_chdir", @@ -373,7 +373,7 @@ static const char *words[] = "dbplus_curr", "dbplus_errcode", "dbplus_errno", - "dbplus_find", + "dbplus_tqfind", "dbplus_first", "dbplus_flush", "dbplus_freealllocks", @@ -509,8 +509,8 @@ static const char *words[] = "E_PARSE", "ereg", "eregi", - "eregi_replace", - "ereg_replace", + "eregi_tqreplace", + "ereg_tqreplace", "error_log", "error_reporting", "escapeshellarg", @@ -644,7 +644,7 @@ static const char *words[] = "_FILES", "filesize", "filetype", - "find", + "tqfind", "first_child", "floatval", "flock", @@ -758,8 +758,8 @@ static const char *words[] = "getrusage", "getservbyname", "getservbyport", - "getshape1", - "getshape2", + "gettqshape1", + "gettqshape2", "gettext", "gettimeofday", "gettype", @@ -1289,7 +1289,7 @@ static const char *words[] = "ldap_mod_add", "ldap_mod_del", "ldap_modify", - "ldap_mod_replace", + "ldap_mod_tqreplace", "ldap_next_attribute", "ldap_next_entry", "ldap_next_reference", @@ -1346,9 +1346,9 @@ static const char *words[] = "mb_encode_numericentity", "mb_ereg", "mb_eregi", - "mb_eregi_replace", + "mb_eregi_tqreplace", "mb_ereg_match", - "mb_ereg_replace", + "mb_ereg_tqreplace", "mb_ereg_search", "mb_ereg_search_getpos", "mb_ereg_search_getregs", @@ -1561,7 +1561,7 @@ static const char *words[] = "msession_create", "msession_destroy", "msession_disconnect", - "msession_find", + "msession_tqfind", "msession_get", "msession_get_array", "msession_getdata", @@ -1772,7 +1772,7 @@ static const char *words[] = "ncurses_killchar", "ncurses_longname", "ncurses_mouseinterval", - "ncurses_mousemask", + "ncurses_mousetqmask", "ncurses_move", "ncurses_mvaddch", "ncurses_mvaddchnstr", @@ -2047,8 +2047,8 @@ static const char *words[] = "ovrimos_rollback", "owner_document", "pack", - "parent_node", - "parents", + "tqparent_node", + "tqparents", "parse_ini_file", "parse_str", "parse_url", @@ -2319,7 +2319,7 @@ static const char *words[] = "preg_match", "preg_match_all", "preg_quote", - "preg_replace", + "preg_tqreplace", "preg_replace_callback", "preg_split", "prev", @@ -2385,7 +2385,7 @@ static const char *words[] = "putenv", "qdom_error", "qdom_tree", - "QUERY_STRING", + "TQUERY_STRING", "quoted_printable_decode", "quotemeta", "rad2deg", @@ -2420,7 +2420,7 @@ static const char *words[] = "remove_attribute", "remove_child", "rename", - "replace", + "tqreplace", "replace_child", "replace_node", "_REQUEST", @@ -2657,7 +2657,7 @@ static const char *words[] = "strpos", "strrchr", "str_repeat", - "str_replace", + "str_tqreplace", "strrev", "str_rot13", "strrpos", @@ -2673,7 +2673,7 @@ static const char *words[] = "str_word_count", "substr", "substr_count", - "substr_replace", + "substr_tqreplace", "SWFAction", "swf_actiongeturl", "swf_actiongotoframe", @@ -2700,7 +2700,7 @@ static const char *words[] = "SWFDisplayItem", "swf_endbutton", "swf_enddoaction", - "swf_endshape", + "swf_endtqshape", "swf_endsymbol", "SWFFill", "SWFFont", @@ -2734,21 +2734,21 @@ static const char *words[] = "swf_setfont", "swf_setframe", "SWFShape", - "swf_shapearc", - "swf_shapecurveto", - "swf_shapecurveto3", - "swf_shapefillbitmapclip", - "swf_shapefillbitmaptile", - "swf_shapefilloff", - "swf_shapefillsolid", - "swf_shapelinesolid", - "swf_shapelineto", - "swf_shapemoveto", + "swf_tqshapearc", + "swf_tqshapecurveto", + "swf_tqshapecurveto3", + "swf_tqshapefillbitmapclip", + "swf_tqshapefillbitmaptile", + "swf_tqshapefilloff", + "swf_tqshapefillsolid", + "swf_tqshapelinesolid", + "swf_tqshapelineto", + "swf_tqshapemoveto", "swf_showframe", "SWFSprite", "swf_startbutton", "swf_startdoaction", - "swf_startshape", + "swf_starttqshape", "swf_startsymbol", "SWFText", "SWFTextField", @@ -2812,7 +2812,7 @@ static const char *words[] = "udm_crc32", "udm_errno", "udm_error", - "udm_find", + "udm_tqfind", "udm_free_agent", "udm_free_ispell_data", "udm_free_res", @@ -3020,8 +3020,8 @@ void PhpWriter::writeClass(UMLClassifier *c) { TQString str; str = getHeadingFile(".php"); if(!str.isEmpty()) { - str.replace(TQRegExp("%filename%"),fileName); - str.replace(TQRegExp("%filepath%"),filephp.name()); + str.tqreplace(TQRegExp("%filename%"),fileName); + str.tqreplace(TQRegExp("%filepath%"),filephp.name()); php<<str<<m_endl; } diff --git a/umbrello/umbrello/codegenerators/phpwriter.h b/umbrello/umbrello/codegenerators/phpwriter.h index e03699f1..b7b9affa 100644 --- a/umbrello/umbrello/codegenerators/phpwriter.h +++ b/umbrello/umbrello/codegenerators/phpwriter.h @@ -28,6 +28,7 @@ */ class PhpWriter : public SimpleCodeGenerator { Q_OBJECT + TQ_OBJECT public: PhpWriter(); diff --git a/umbrello/umbrello/codegenerators/pythonwriter.cpp b/umbrello/umbrello/codegenerators/pythonwriter.cpp index f243ab2c..ba1a636e 100644 --- a/umbrello/umbrello/codegenerators/pythonwriter.cpp +++ b/umbrello/umbrello/codegenerators/pythonwriter.cpp @@ -64,7 +64,7 @@ void PythonWriter::writeClass(UMLClassifier *c) { //Replace the first letter of the filename because //python class begin with an upper caracter (convention) first = first.upper(); - fileName = fileName.replace(0, 1, first); + fileName = fileName.tqreplace(0, 1, first); TQFile fileh; if( !openFile(fileh, fileName) ) { @@ -83,8 +83,8 @@ void PythonWriter::writeClass(UMLClassifier *c) { str = getHeadingFile(".py"); if(!str.isEmpty()) { - str.replace(TQRegExp("%filename%"), fileName); - str.replace(TQRegExp("%filepath%"), fileh.name()); + str.tqreplace(TQRegExp("%filename%"), fileName); + str.tqreplace(TQRegExp("%filepath%"), fileh.name()); h<<str<<m_endl; } @@ -115,9 +115,9 @@ void PythonWriter::writeClass(UMLClassifier *c) { headerName.remove(TQRegExp(".py$")); first = headerName.at(0); first = first.upper(); - headerName = headerName.replace(0, 1, first); - str = headerName.replace(TQChar('/'),TQChar('.')); - if (includesList.findIndex(str) < 0) // not yet imported + headerName = headerName.tqreplace(0, 1, first); + str = headerName.tqreplace(TQChar('/'),TQChar('.')); + if (includesList.tqfindIndex(str) < 0) // not yet imported h << "from " << str << " import *" << m_endl; } } @@ -418,7 +418,7 @@ const TQStringList PythonWriter::reservedKeywords() const { << "TypeError" << "UnboundLocalError" << "unichr" - << "unicode" + << "tqunicode" << "UnicodeError" << "UserWarning" << "ValueError" diff --git a/umbrello/umbrello/codegenerators/pythonwriter.h b/umbrello/umbrello/codegenerators/pythonwriter.h index c9dddc23..b7f324e7 100644 --- a/umbrello/umbrello/codegenerators/pythonwriter.h +++ b/umbrello/umbrello/codegenerators/pythonwriter.h @@ -31,6 +31,7 @@ enum Access {PRIVATE, PUBLIC, PROTECTED}; */ class PythonWriter : public SimpleCodeGenerator { Q_OBJECT + TQ_OBJECT public: PythonWriter(); diff --git a/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.cpp b/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.cpp index f75ff165..294175d5 100644 --- a/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.cpp +++ b/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.cpp @@ -26,10 +26,10 @@ // RubyClassDeclarationBlock::RubyClassDeclarationBlock - ( RubyClassifierCodeDocument * parentDoc, const TQString &startText, const TQString &endText, const TQString &comment) - : OwnedHierarchicalCodeBlock(parentDoc->getParentClassifier(), parentDoc, startText, endText, comment) + ( RubyClassifierCodeDocument * tqparentDoc, const TQString &startText, const TQString &endText, const TQString &comment) + : OwnedHierarchicalCodeBlock(tqparentDoc->getParentClassifier(), tqparentDoc, startText, endText, comment) { - init(parentDoc, comment); + init(tqparentDoc, comment); } RubyClassDeclarationBlock::~RubyClassDeclarationBlock ( ) { } @@ -69,20 +69,20 @@ void RubyClassDeclarationBlock::loadFromXMI ( TQDomElement & root ) void RubyClassDeclarationBlock::updateContent ( ) { - RubyClassifierCodeDocument *parentDoc = dynamic_cast<RubyClassifierCodeDocument*>(getParentDocument()); - UMLClassifier *c = parentDoc->getParentClassifier(); + RubyClassifierCodeDocument *tqparentDoc = dynamic_cast<RubyClassifierCodeDocument*>(getParentDocument()); + UMLClassifier *c = tqparentDoc->getParentClassifier(); CodeGenerationPolicy * p = UMLApp::app()->getCommonPolicy(); TQString endLine = p->getNewLineEndingChars(); - bool isInterface = parentDoc->parentIsInterface(); // a little shortcut - TQString RubyClassName = parentDoc->getRubyClassName(c->getName()); + bool isInterface = tqparentDoc->tqparentIsInterface(); // a little shortcut + TQString RubyClassName = tqparentDoc->getRubyClassName(c->getName()); bool forceDoc = p->getCodeVerboseDocumentComments(); // COMMENT TQString comment = c->getDoc(); - comment.replace("@ref ", ""); - comment.replace("@see", "_See_"); - comment.replace("@short", "_Summary_"); - comment.replace("@author", "_Author_"); + comment.tqreplace("@ref ", ""); + comment.tqreplace("@see", "_See_"); + comment.tqreplace("@short", "_Summary_"); + comment.tqreplace("@author", "_Author_"); if (isInterface) getComment()->setText("Module " + RubyClassName + endLine + comment); @@ -98,7 +98,7 @@ void RubyClassDeclarationBlock::updateContent ( ) // Now set START/ENDING Text TQString startText = ""; - if (parentDoc->parentIsInterface()) { + if (tqparentDoc->tqparentIsInterface()) { startText.append("module "); } else { startText.append("class "); @@ -131,10 +131,10 @@ void RubyClassDeclarationBlock::updateContent ( ) setStartText(startText); } -void RubyClassDeclarationBlock::init (RubyClassifierCodeDocument *parentDoc, const TQString &comment) +void RubyClassDeclarationBlock::init (RubyClassifierCodeDocument *tqparentDoc, const TQString &comment) { - setComment(new RubyCodeDocumentation(parentDoc)); + setComment(new RubyCodeDocumentation(tqparentDoc)); getComment()->setText(comment); setEndText("end"); diff --git a/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h b/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h index 63e43702..10b7f5bd 100644 --- a/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h +++ b/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h @@ -33,6 +33,7 @@ class RubyClassDeclarationBlock : public OwnedHierarchicalCodeBlock { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -41,7 +42,7 @@ public: /** * Empty Constructor */ - explicit RubyClassDeclarationBlock ( RubyClassifierCodeDocument * parentDoc, const TQString &start = "", const TQString &endText = "end", const TQString &comment = ""); + explicit RubyClassDeclarationBlock ( RubyClassifierCodeDocument * tqparentDoc, const TQString &start = "", const TQString &endText = "end", const TQString &comment = ""); /** * Empty Destructor @@ -67,7 +68,7 @@ protected: private: - void init (RubyClassifierCodeDocument * parent, const TQString &comment); + void init (RubyClassifierCodeDocument * tqparent, const TQString &comment); }; diff --git a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp index ada4b0bb..ecd5523b 100644 --- a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp +++ b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp @@ -86,10 +86,10 @@ TQString RubyClassifierCodeDocument::getPath ( ) path.simplifyWhiteSpace(); // Replace all blanks with underscore - path.replace(TQRegExp(" "), "_"); + path.tqreplace(TQRegExp(" "), "_"); - path.replace(TQRegExp("\\."),"/"); - path.replace(TQRegExp("::"), "/"); + path.tqreplace(TQRegExp("\\."),"/"); + path.tqreplace(TQRegExp("::"), "/"); path.lower(); @@ -252,7 +252,7 @@ void RubyClassifierCodeDocument::loadChildTextBlocksFromNode ( TQDomElement & ro } else if( name == "codeoperation" ) { // find the code operation by id - TQString id = element.attribute("parent_id","-1"); + TQString id = element.attribute("tqparent_id","-1"); UMLObject * obj = UMLApp::app()->getDocument()->findObjectById(STR2ID(id)); UMLOperation * op = dynamic_cast<UMLOperation*>(obj); if(op) { @@ -355,7 +355,7 @@ void RubyClassifierCodeDocument::resetTextBlocks() } // This method will cause the class to rebuild its text representation. -// based on the parent classifier object. +// based on the tqparent classifier object. // For any situation in which this is called, we are either building the code // document up, or replacing/regenerating the existing auto-generated parts. As // such, we will want to insert everything we resonablely will want @@ -363,7 +363,7 @@ void RubyClassifierCodeDocument::resetTextBlocks() // comments) to appear or not, as needed. void RubyClassifierCodeDocument::updateContent( ) { - // Gather info on the various fields and parent objects of this class... + // Gather info on the various fields and tqparent objects of this class... UMLClassifier * c = getParentClassifier(); RubyCodeGenerator * gen = dynamic_cast<RubyCodeGenerator*>(UMLApp::app()->getGenerator()); @@ -371,7 +371,7 @@ void RubyClassifierCodeDocument::updateContent( ) // This depends on whether or not we have attribute/association classes CodeClassFieldList * cfList = getCodeClassFieldList(); for(CodeClassField * field = cfList->first(); field; field = cfList->next()) - if(field->parentIsAttribute()) + if(field->tqparentIsAttribute()) field->setWriteOutMethods(gen->getAutoGenerateAttribAccessors()); else field->setWriteOutMethods(gen->getAutoGenerateAssocAccessors()); @@ -399,7 +399,7 @@ void RubyClassifierCodeDocument::updateContent( ) CodeClassFieldList privAggregationClassFields = getSpecificClassFields ( CodeClassField::Aggregation, Uml::Visibility::Private); CodeClassFieldList privCompositionClassFields = getSpecificClassFields ( CodeClassField::Composition, Uml::Visibility::Private); - bool isInterface = parentIsInterface(); + bool isInterface = tqparentIsInterface(); bool hasOperationMethods = c->getOpList().last() ? true : false; CodeGenerationPolicy *pol = UMLApp::app()->getCommonPolicy(); TQString endLine = pol->getNewLineEndingChars(); // a shortcut..so we don't have to call this all the time @@ -435,7 +435,7 @@ void RubyClassifierCodeDocument::updateContent( ) // NOW create document in sections.. // now we want to populate the body of our class - // our layout is the following general groupings of code blocks: + // our tqlayout is the following general groupings of code blocks: // start ruby classifier document diff --git a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.h b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.h index cfaa66fe..05f73e14 100644 --- a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.h +++ b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.h @@ -42,6 +42,7 @@ class RubyCodeGenerationPolicy; class RubyClassifierCodeDocument : public ClassifierCodeDocument { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors diff --git a/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp b/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp index 43986061..8a4fd7bd 100644 --- a/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp +++ b/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp @@ -78,8 +78,8 @@ void RubyCodeAccessorMethod::setAttributesFromNode( TQDomElement & root) void RubyCodeAccessorMethod::updateContent( ) { - CodeClassField * parentField = getParentClassField(); - RubyCodeClassField * rubyfield = dynamic_cast<RubyCodeClassField*>(parentField); + CodeClassField * tqparentField = getParentClassField(); + RubyCodeClassField * rubyfield = dynamic_cast<RubyCodeClassField*>(tqparentField); TQString fieldName = rubyfield->getFieldName(); TQString endLine = UMLApp::app()->getCommonPolicy()->getNewLineEndingChars(); @@ -153,13 +153,13 @@ void RubyCodeAccessorMethod::updateMethodDeclaration() TQString endLine = p->getNewLineEndingChars(); TQString description = getParentObject()->getDoc(); - description.replace(TQRegExp("m_[npb](?=[A-Z])"), ""); - description.replace("m_", ""); - description.replace(TQRegExp("[\\n\\r]+[\\t ]*"), endLine); + description.tqreplace(TQRegExp("m_[npb](?=[A-Z])"), ""); + description.tqreplace("m_", ""); + description.tqreplace(TQRegExp("[\\n\\r]+[\\t ]*"), endLine); // set scope of this accessor appropriately..if its an attribute, // we need to be more sophisticated - if(rubyfield->parentIsAttribute()) + if(rubyfield->tqparentIsAttribute()) switch (scopePolicy) { case CodeGenerationPolicy::Public: case CodeGenerationPolicy::Private: @@ -168,7 +168,7 @@ void RubyCodeAccessorMethod::updateMethodDeclaration() break; default: case CodeGenerationPolicy::FromParent: - // do nothing..already have taken parent value + // do nothing..already have taken tqparent value break; } diff --git a/umbrello/umbrello/codegenerators/rubycodeaccessormethod.h b/umbrello/umbrello/codegenerators/rubycodeaccessormethod.h index 0e61a978..cc58ce2e 100644 --- a/umbrello/umbrello/codegenerators/rubycodeaccessormethod.h +++ b/umbrello/umbrello/codegenerators/rubycodeaccessormethod.h @@ -31,6 +31,7 @@ class RubyCodeAccessorMethod : public CodeAccessorMethod { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors diff --git a/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp b/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp index b3b723b9..e04d189a 100644 --- a/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp +++ b/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp @@ -38,14 +38,14 @@ // Constructors/Destructors // -RubyCodeClassField::RubyCodeClassField (ClassifierCodeDocument * parentDoc, UMLRole * role) - : CodeClassField(parentDoc, role) +RubyCodeClassField::RubyCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLRole * role) + : CodeClassField(tqparentDoc, role) { } -RubyCodeClassField::RubyCodeClassField (ClassifierCodeDocument * parentDoc, UMLAttribute * attrib) - : CodeClassField(parentDoc, attrib) +RubyCodeClassField::RubyCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLAttribute * attrib) + : CodeClassField(tqparentDoc, attrib) { } @@ -60,7 +60,7 @@ RubyCodeClassField::~RubyCodeClassField ( ) { } // TQString RubyCodeClassField::getFieldName() { - if (parentIsAttribute()) + if (tqparentIsAttribute()) { UMLAttribute * at = (UMLAttribute*) getParentObject(); return cleanName(at->getName()); @@ -70,7 +70,7 @@ TQString RubyCodeClassField::getFieldName() { UMLRole * role = (UMLRole*) getParentObject(); TQString roleName = role->getName(); if(fieldIsSingleValue()) { - return roleName.replace(0, 1, roleName.left(1).lower()); + return roleName.tqreplace(0, 1, roleName.left(1).lower()); } else { return roleName.lower() + "Array"; } @@ -80,13 +80,13 @@ TQString RubyCodeClassField::getFieldName() { TQString RubyCodeClassField::getInitialValue() { - if (parentIsAttribute()) + if (tqparentIsAttribute()) { UMLAttribute * at = dynamic_cast<UMLAttribute*>( getParentObject() ); if (at) { return fixInitialStringDeclValue(at->getInitialValue(), getTypeName()); } else { - kError() << "RubyodeClassField::getInitialValue: parent object is not a UMLAttribute" + kError() << "RubyodeClassField::getInitialValue: tqparent object is not a UMLAttribute" << endl; return ""; } diff --git a/umbrello/umbrello/codegenerators/rubycodeclassfield.h b/umbrello/umbrello/codegenerators/rubycodeclassfield.h index 50269729..28e96b74 100644 --- a/umbrello/umbrello/codegenerators/rubycodeclassfield.h +++ b/umbrello/umbrello/codegenerators/rubycodeclassfield.h @@ -29,6 +29,7 @@ class ClassifierCodeDocument; class RubyCodeClassField : public CodeClassField { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -37,8 +38,8 @@ public: /** * Constructors */ - RubyCodeClassField (ClassifierCodeDocument * parentDoc, UMLRole * role); - RubyCodeClassField (ClassifierCodeDocument * parentDoc, UMLAttribute * attrib); + RubyCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLRole * role); + RubyCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLAttribute * attrib); /** * Empty Destructor diff --git a/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp b/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp index e99ca774..2171bb28 100644 --- a/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp +++ b/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp @@ -22,8 +22,8 @@ // Constructors/Destructors // -RubyCodeClassFieldDeclarationBlock::RubyCodeClassFieldDeclarationBlock ( CodeClassField * parent ) - : CodeClassFieldDeclarationBlock ( parent ) +RubyCodeClassFieldDeclarationBlock::RubyCodeClassFieldDeclarationBlock ( CodeClassField * tqparent ) + : CodeClassFieldDeclarationBlock ( tqparent ) { setOverallIndentationLevel(1); updateContent(); @@ -61,7 +61,7 @@ void RubyCodeClassFieldDeclarationBlock::updateContent( ) TQString scopeStr = rdoc->scopeToRubyDecl(getParentObject()->getVisibility()); // IF this is from an association, then scope taken as appropriate to policy - if(!rcf->parentIsAttribute()) + if(!rcf->tqparentIsAttribute()) { switch (scopePolicy) { case CodeGenerationPolicy::Public: @@ -71,7 +71,7 @@ void RubyCodeClassFieldDeclarationBlock::updateContent( ) break; default: case CodeGenerationPolicy::FromParent: - // do nothing here... will leave as from parent object + // do nothing here... will leave as from tqparent object break; } } @@ -80,13 +80,13 @@ void RubyCodeClassFieldDeclarationBlock::updateContent( ) TQString fieldName = rcf->getFieldName(); TQString initialV = rcf->getInitialValue(); - if (!cf->parentIsAttribute() && !cf->fieldIsSingleValue()) + if (!cf->tqparentIsAttribute() && !cf->fieldIsSingleValue()) typeName = "Array"; TQString body = staticValue+scopeStr+' '+typeName+' '+fieldName; if (!initialV.isEmpty()) body.append(" = " + initialV); - else if (!cf->parentIsAttribute()) + else if (!cf->tqparentIsAttribute()) { UMLRole * role = dynamic_cast<UMLRole*>(cf->getParentObject()); if (role->getObject()->getBaseType() == Uml::ot_Interface) @@ -95,7 +95,7 @@ void RubyCodeClassFieldDeclarationBlock::updateContent( ) } else { // FIX?: IF a constructor method exists in the classifiercodedoc - // of the parent Object, then we can use that instead (if its empty). + // of the tqparent Object, then we can use that instead (if its empty). if(cf->fieldIsSingleValue()) { if(!typeName.isEmpty()) diff --git a/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.h b/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.h index beba96c2..1dd6b342 100644 --- a/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.h +++ b/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.h @@ -27,6 +27,7 @@ class RubyCodeClassFieldDeclarationBlock : public CodeClassFieldDeclarationBlock { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -35,7 +36,7 @@ public: /** * Constructor */ - RubyCodeClassFieldDeclarationBlock ( CodeClassField * parent ); + RubyCodeClassFieldDeclarationBlock ( CodeClassField * tqparent ); /** * Empty Destructor @@ -44,7 +45,7 @@ public: protected: - // this will be called by syncToParent whenever the parent object is "modified" + // this will be called by syncToParent whenever the tqparent object is "modified" void updateContent ( ); private: diff --git a/umbrello/umbrello/codegenerators/rubycodecomment.cpp b/umbrello/umbrello/codegenerators/rubycodecomment.cpp index 89508b63..bf85df1a 100644 --- a/umbrello/umbrello/codegenerators/rubycodecomment.cpp +++ b/umbrello/umbrello/codegenerators/rubycodecomment.cpp @@ -65,7 +65,7 @@ TQString RubyCodeComment::unformatText(const TQString & text, const TQString & i } /** - * @return QString + * @return TQString */ TQString RubyCodeComment::toString( ) { diff --git a/umbrello/umbrello/codegenerators/rubycodecomment.h b/umbrello/umbrello/codegenerators/rubycodecomment.h index 0646cd33..8c7cec59 100644 --- a/umbrello/umbrello/codegenerators/rubycodecomment.h +++ b/umbrello/umbrello/codegenerators/rubycodecomment.h @@ -34,6 +34,7 @@ class RubyCodeComment : virtual public CodeComment { Q_OBJECT + TQ_OBJECT public: /** * Constructors @@ -46,7 +47,7 @@ public: virtual ~RubyCodeComment ( ); /** - * @return QString + * @return TQString */ TQString toString ( ); diff --git a/umbrello/umbrello/codegenerators/rubycodedocumentation.cpp b/umbrello/umbrello/codegenerators/rubycodedocumentation.cpp index e19f4daa..9afee3f1 100644 --- a/umbrello/umbrello/codegenerators/rubycodedocumentation.cpp +++ b/umbrello/umbrello/codegenerators/rubycodedocumentation.cpp @@ -57,12 +57,12 @@ RubyCodeDocumentation::~RubyCodeDocumentation ( ) { } void RubyCodeDocumentation::saveToXMI ( TQDomDocument & doc, TQDomElement & root ) { TQDomElement blockElement = doc.createElement( "rubycodedocumentation" ); setAttributesOnNode(doc, blockElement); // as we added no additional fields to this class we may - // just use parent TextBlock method + // just use tqparent TextBlock method root.appendChild( blockElement ); } /** - * @return QString + * @return TQString */ TQString RubyCodeDocumentation::toString ( ) { diff --git a/umbrello/umbrello/codegenerators/rubycodedocumentation.h b/umbrello/umbrello/codegenerators/rubycodedocumentation.h index 0d210419..a4db50ab 100644 --- a/umbrello/umbrello/codegenerators/rubycodedocumentation.h +++ b/umbrello/umbrello/codegenerators/rubycodedocumentation.h @@ -35,6 +35,7 @@ class RubyClassifierCodeDocument; class RubyCodeDocumentation : virtual public CodeComment { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -63,7 +64,7 @@ public: virtual void saveToXMI ( TQDomDocument & doc, TQDomElement & root ); /** - * @return QString + * @return TQString */ TQString toString ( ); diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui b/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui index 14bcf0f2..39d29328 100644 --- a/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui +++ b/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>RubyCodeGenerationFormBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -16,15 +16,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="2" column="0"> + <widget class="TQGroupBox" row="2" column="0"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -43,15 +43,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>m_generateConstructors</cstring> </property> @@ -62,7 +62,7 @@ <bool>false</bool> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>m_generateAssocAccessors</cstring> </property> @@ -73,7 +73,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>m_generateAttribAccessors</cstring> </property> @@ -86,15 +86,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <item> <property name="text"> <string>Public</string> @@ -122,7 +122,7 @@ <number>3</number> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_3</cstring> </property> @@ -132,15 +132,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_3_2</cstring> </property> @@ -148,7 +148,7 @@ <string>Default association field scope:</string> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <item> <property name="text"> <string>Public</string> @@ -180,7 +180,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -199,7 +199,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -207,7 +207,7 @@ <string>Style:</string> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>Hash (#)</string> @@ -224,7 +224,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -244,5 +244,5 @@ </widget> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.cpp b/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.cpp index 8e58fdf0..62df797d 100644 --- a/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.cpp +++ b/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.cpp @@ -156,8 +156,8 @@ void RubyCodeGenerationPolicy::setDefaults( KConfig * config, bool emitUpdateSig * Create a new dialog interface for this object. * @return dialog object */ -CodeGenerationPolicyPage * RubyCodeGenerationPolicy::createPage ( TQWidget *parent, const char *name ) { - return new RubyCodeGenerationPolicyPage ( parent, name, this ); +CodeGenerationPolicyPage * RubyCodeGenerationPolicy::createPage ( TQWidget *tqparent, const char *name ) { + return new RubyCodeGenerationPolicyPage ( tqparent, name, this ); } void RubyCodeGenerationPolicy::init() { diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h b/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h index 56c051e2..459e80d0 100644 --- a/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h +++ b/umbrello/umbrello/codegenerators/rubycodegenerationpolicy.h @@ -30,6 +30,7 @@ class CodeGenerationPolicyPage; class RubyCodeGenerationPolicy : public CodeGenPolicyExt { Q_OBJECT + TQ_OBJECT public: static const bool DEFAULT_AUTO_GEN_ATTRIB_ACCESSORS; @@ -98,7 +99,7 @@ public: * Create a new dialog interface for this object. * @return dialog object */ - CodeGenerationPolicyPage * createPage ( TQWidget *parent = 0, const char * name = 0); + CodeGenerationPolicyPage * createPage ( TQWidget *tqparent = 0, const char * name = 0); protected: diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.cpp b/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.cpp index 5c890b4f..c6153448 100644 --- a/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.cpp +++ b/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.cpp @@ -30,8 +30,8 @@ #include "../codegenerationpolicy.h" #include "../uml.h" -RubyCodeGenerationPolicyPage::RubyCodeGenerationPolicyPage( TQWidget *parent, const char *name, RubyCodeGenerationPolicy * policy ) - : CodeGenerationPolicyPage(parent, name, policy) +RubyCodeGenerationPolicyPage::RubyCodeGenerationPolicyPage( TQWidget *tqparent, const char *name, RubyCodeGenerationPolicy * policy ) + : CodeGenerationPolicyPage(tqparent, name, policy) { CodeGenerationPolicy *common = UMLApp::app()->getCommonPolicy(); form = new RubyCodeGenerationFormBase(this); @@ -52,19 +52,19 @@ void RubyCodeGenerationPolicyPage::apply() CodeGenerationPolicy *common = UMLApp::app()->getCommonPolicy(); // now do our ruby-specific configs - RubyCodeGenerationPolicy * parent = (RubyCodeGenerationPolicy*) m_parentPolicy; + RubyCodeGenerationPolicy * tqparent = (RubyCodeGenerationPolicy*) m_parentPolicy; // block signals so we don't cause too many update content calls to code documents - parent->blockSignals(true); + tqparent->blockSignals(true); common->setCommentStyle((CodeGenerationPolicy::CommentStyle) form->m_SelectCommentStyle->currentItem()); common->setAttributeAccessorScope((CodeGenerationPolicy::ScopePolicy) (form->m_accessorScopeCB->currentItem()+200)); common->setAssociationFieldScope((CodeGenerationPolicy::ScopePolicy) (form->m_assocFieldScopeCB->currentItem()+200)); common->setAutoGenerateConstructors(form->m_generateConstructors->isChecked()); - parent->setAutoGenerateAttribAccessors(form->m_generateAttribAccessors->isChecked()); - parent->setAutoGenerateAssocAccessors(form->m_generateAssocAccessors->isChecked()); + tqparent->setAutoGenerateAttribAccessors(form->m_generateAttribAccessors->isChecked()); + tqparent->setAutoGenerateAssocAccessors(form->m_generateAssocAccessors->isChecked()); - parent->blockSignals(false); + tqparent->blockSignals(false); // now send out modified code content signal common->emitModifiedCodeContentSig(); diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.h b/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.h index 1637843b..c994dff8 100644 --- a/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.h +++ b/umbrello/umbrello/codegenerators/rubycodegenerationpolicypage.h @@ -31,9 +31,10 @@ class RubyCodeGenerationPolicyPage : public CodeGenerationPolicyPage { Q_OBJECT + TQ_OBJECT public: - explicit RubyCodeGenerationPolicyPage (TQWidget *parent=0, const char *name=0, RubyCodeGenerationPolicy * policy = 0); + explicit RubyCodeGenerationPolicyPage (TQWidget *tqparent=0, const char *name=0, RubyCodeGenerationPolicy * policy = 0); virtual ~RubyCodeGenerationPolicyPage(); diff --git a/umbrello/umbrello/codegenerators/rubycodegenerator.cpp b/umbrello/umbrello/codegenerators/rubycodegenerator.cpp index 4acfd65a..e0732773 100644 --- a/umbrello/umbrello/codegenerators/rubycodegenerator.cpp +++ b/umbrello/umbrello/codegenerators/rubycodegenerator.cpp @@ -59,10 +59,10 @@ Uml::Programming_Language RubyCodeGenerator::getLanguage() { } // In the Java version, we make the ANT build file also available. -CodeViewerDialog * RubyCodeGenerator::getCodeViewerDialog ( TQWidget* parent, CodeDocument *doc, +CodeViewerDialog * RubyCodeGenerator::getCodeViewerDialog ( TQWidget* tqparent, CodeDocument *doc, Settings::CodeViewerState state) { - CodeViewerDialog *dialog = new CodeViewerDialog(parent, doc, state); + CodeViewerDialog *dialog = new CodeViewerDialog(tqparent, doc, state); return dialog; } @@ -90,25 +90,25 @@ TQString RubyCodeGenerator::getListFieldClassName () { TQString RubyCodeGenerator::cppToRubyType(const TQString &typeStr) { TQString type = cleanName(typeStr); - type.replace("const ", ""); - type.replace(TQRegExp("[*&\\s]"), ""); - type.replace(TQRegExp("[<>]"), "_"); - type.replace("TQStringList", "Array"); - type.replace(TQRegExp("^string$"),"String"); - type.replace("TQString", "String"); - type.replace("bool", "true|false"); - type.replace(TQRegExp("^(uint|int|ushort|short|ulong|long)$"), "Integer"); - type.replace(TQRegExp("^(float|double)$"), "Float"); - type.replace(TQRegExp("^Q(?=[A-Z])"), "Qt::"); - type.replace(TQRegExp("^K(?!(DE|Parts|IO)"), "KDE::"); + type.tqreplace("const ", ""); + type.tqreplace(TQRegExp("[*&\\s]"), ""); + type.tqreplace(TQRegExp("[<>]"), "_"); + type.tqreplace(TQSTRINGLIST_OBJECT_NAME_STRING, "Array"); + type.tqreplace(TQRegExp("^string$"),"String"); + type.tqreplace(TQSTRING_OBJECT_NAME_STRING, "String"); + type.tqreplace("bool", "true|false"); + type.tqreplace(TQRegExp("^(uint|int|ushort|short|ulong|long)$"), "Integer"); + type.tqreplace(TQRegExp("^(float|double)$"), "Float"); + type.tqreplace(TQRegExp("^Q(?=[A-Z])"), "TQt::"); + type.tqreplace(TQRegExp("^K(?!(DE|Parts|IO)"), "KDE::"); return type; } TQString RubyCodeGenerator::cppToRubyName(const TQString &nameStr) { TQString name = cleanName(nameStr); - name.replace(TQRegExp("^m_"), ""); - name.replace(TQRegExp("^[pbn](?=[A-Z])"), ""); + name.tqreplace(TQRegExp("^m_"), ""); + name.tqreplace(TQRegExp("^[pbn](?=[A-Z])"), ""); name = name.mid(0, 1).lower() + name.mid(1); return name; } @@ -127,7 +127,7 @@ CodeDocument * RubyCodeGenerator::newClassifierCodeDocument ( UMLClassifier * c) /* These initializations are done in CodeGenFactory::createObject() void RubyCodeGenerator::initFields() { UMLApp::app()->setPolicyExt ( new RubyCodeGenerationPolicy(UMLApp::app()->getConfig()) ); - // load Classifier documents from parent document + // load Classifier documents from tqparent document initFromParentDocument(); } */ diff --git a/umbrello/umbrello/codegenerators/rubycodegenerator.h b/umbrello/umbrello/codegenerators/rubycodegenerator.h index 611338ca..4be5e7e8 100644 --- a/umbrello/umbrello/codegenerators/rubycodegenerator.h +++ b/umbrello/umbrello/codegenerators/rubycodegenerator.h @@ -36,6 +36,7 @@ class CodeViewerDialog; class RubyCodeGenerator : public CodeGenerator { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -76,7 +77,7 @@ public: /** Get the editing dialog for this code document */ - virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* parent, CodeDocument * doc, + virtual CodeViewerDialog * getCodeViewerDialog( TQWidget* tqparent, CodeDocument * doc, Settings::CodeViewerState state); // Other methods @@ -97,8 +98,8 @@ public: Uml::Programming_Language getLanguage(); /** - * Convert a C++ type such as 'int' or 'QWidget' to - * ruby types Integer and Qt::Widget + * Convert a C++ type such as 'int' or 'TQWidget' to + * ruby types Integer and TQt::Widget * * @param cppType the C++ type to be converted */ diff --git a/umbrello/umbrello/codegenerators/rubycodeoperation.cpp b/umbrello/umbrello/codegenerators/rubycodeoperation.cpp index 7354281b..bba8b462 100644 --- a/umbrello/umbrello/codegenerators/rubycodeoperation.cpp +++ b/umbrello/umbrello/codegenerators/rubycodeoperation.cpp @@ -32,8 +32,8 @@ // Constructors/Destructors // -RubyCodeOperation::RubyCodeOperation ( RubyClassifierCodeDocument * doc, UMLOperation *parent, const TQString & body, const TQString & comment ) - : CodeOperation (doc, parent, body, comment) +RubyCodeOperation::RubyCodeOperation ( RubyClassifierCodeDocument * doc, UMLOperation *tqparent, const TQString & body, const TQString & comment ) + : CodeOperation (doc, tqparent, body, comment) { // lets not go with the default comment and instead use // full-blown ruby documentation object instead @@ -85,7 +85,7 @@ void RubyCodeOperation::updateMethodDeclaration() methodName = "initialize"; } - methodName.replace(TQRegExp("operator\\s*"), ""); + methodName.tqreplace(TQRegExp("operator\\s*"), ""); methodName = methodName.mid(0, 1).lower() + methodName.mid(1); TQString paramStr = TQString(""); @@ -131,7 +131,7 @@ void RubyCodeOperation::updateMethodDeclaration() UMLAttributeList parameters = o->getParmList(); for(UMLAttributeListIt iterator(parameters); iterator.current(); ++iterator) { comment += endLine + "* _" + iterator.current()->getName() + "_ "; - comment += (' ' + iterator.current()->getDoc().replace( TQRegExp("[\\n\\r]+[\\t ]*"), + comment += (' ' + iterator.current()->getDoc().tqreplace( TQRegExp("[\\n\\r]+[\\t ]*"), endLine + " " ) ); } // add a returns statement too @@ -140,15 +140,15 @@ void RubyCodeOperation::updateMethodDeclaration() getComment()->setText(comment); } } else { - comment.replace(TQRegExp("[\\n\\r]+ *"), endLine); - comment.replace(TQRegExp("[\\n\\r]+\\t*"), endLine); + comment.tqreplace(TQRegExp("[\\n\\r]+ *"), endLine); + comment.tqreplace(TQRegExp("[\\n\\r]+\\t*"), endLine); - comment.replace(" m_", " "); - comment.replace(TQRegExp("\\s[npb](?=[A-Z])"), " "); + comment.tqreplace(" m_", " "); + comment.tqreplace(TQRegExp("\\s[npb](?=[A-Z])"), " "); TQRegExp re_params("@param (\\w)(\\w*)"); int pos = re_params.search(comment); while (pos != -1) { - comment.replace( re_params.cap(0), + comment.tqreplace( re_params.cap(0), TQString("@param _") + re_params.cap(1).lower() + re_params.cap(2) + '_' ); commentedParams.append(re_params.cap(1).lower() + re_params.cap(2)); @@ -160,28 +160,28 @@ void RubyCodeOperation::updateMethodDeclaration() for (UMLAttributeListIt iterator(parameters); iterator.current(); ++iterator) { // Only write an individual @param entry if one hasn't been found already // in the main doc comment - if (commentedParams.contains(RubyCodeGenerator::cppToRubyName(iterator.current()->getName())) == 0) { + if (commentedParams.tqcontains(RubyCodeGenerator::cppToRubyName(iterator.current()->getName())) == 0) { comment += (endLine + "@param _" + RubyCodeGenerator::cppToRubyName(iterator.current()->getName()) + '_'); if (iterator.current()->getDoc().isEmpty()) { comment += (' ' + RubyCodeGenerator::cppToRubyType(iterator.current()->getTypeName())); } else { - comment += (' ' + iterator.current()->getDoc().replace(TQRegExp("[\\n\\r]+[\\t ]*"), endLine + " ")); + comment += (' ' + iterator.current()->getDoc().tqreplace(TQRegExp("[\\n\\r]+[\\t ]*"), endLine + " ")); } } } - comment.replace("@ref ", ""); - comment.replace("@param", "*"); - comment.replace("@return", "* _returns_"); + comment.tqreplace("@ref ", ""); + comment.tqreplace("@param", "*"); + comment.tqreplace("@return", "* _returns_"); // All lines after the first one starting with '*' in the doc comment // must be indented correctly. If they aren't a list // item starting with '*', then indent the text with // two spaces, ' ', to line up with the list item. - pos = comment.find(endLine + '*'); + pos = comment.tqfind(endLine + '*'); if (pos != -1) { pos += endLine.length() + 1; - pos = comment.find(endLine, pos); + pos = comment.tqfind(endLine, pos); } while (pos > 0) { @@ -191,13 +191,13 @@ void RubyCodeOperation::updateMethodDeclaration() pos += 2; } - pos = comment.find(endLine, pos); + pos = comment.tqfind(endLine, pos); } TQString typeStr = RubyCodeGenerator::cppToRubyType(o->getTypeName()); if ( !typeStr.isEmpty() && !TQRegExp("^void\\s*$").exactMatch(typeStr) - && comment.contains("_returns_") == 0 ) + && comment.tqcontains("_returns_") == 0 ) { comment += endLine + "* _returns_ " + typeStr; } @@ -217,7 +217,7 @@ void RubyCodeOperation::updateMethodDeclaration() int RubyCodeOperation::lastEditableLine() { ClassifierCodeDocument * doc = dynamic_cast<ClassifierCodeDocument*>(getParentDocument()); - if(doc->parentIsInterface()) + if(doc->tqparentIsInterface()) return -1; // very last line is NOT editable as its a one-line declaration w/ no body in // an interface. return 0; diff --git a/umbrello/umbrello/codegenerators/rubycodeoperation.h b/umbrello/umbrello/codegenerators/rubycodeoperation.h index fab1d239..1bdc4556 100644 --- a/umbrello/umbrello/codegenerators/rubycodeoperation.h +++ b/umbrello/umbrello/codegenerators/rubycodeoperation.h @@ -28,6 +28,7 @@ class RubyClassifierCodeDocument; class RubyCodeOperation : virtual public CodeOperation { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors diff --git a/umbrello/umbrello/codegenerators/rubywriter.cpp b/umbrello/umbrello/codegenerators/rubywriter.cpp index 571634a5..5b193220 100644 --- a/umbrello/umbrello/codegenerators/rubywriter.cpp +++ b/umbrello/umbrello/codegenerators/rubywriter.cpp @@ -80,18 +80,18 @@ void RubyWriter::writeClass(UMLClassifier *c) { str = getHeadingFile(".rb"); if(!str.isEmpty()) { - str.replace(TQRegExp("%filename%"), fileName); - str.replace(TQRegExp("%filepath%"), fileh.name()); + str.tqreplace(TQRegExp("%filename%"), fileName); + str.tqreplace(TQRegExp("%filepath%"), fileh.name()); h<<str<<m_endl; } if(forceDoc() || !c->getDoc().isEmpty()) { TQString docStr = c->getDoc(); - docStr.replace(TQRegExp("\\n"), "\n# "); - docStr.replace("@ref ", ""); - docStr.replace("@see", "_See_"); - docStr.replace("@short", "_Summary_"); - docStr.replace("@author", "_Author_"); + docStr.tqreplace(TQRegExp("\\n"), "\n# "); + docStr.tqreplace("@ref ", ""); + docStr.tqreplace("@see", "_See_"); + docStr.tqreplace("@short", "_Summary_"); + docStr.tqreplace("@author", "_Author_"); h<<"#"<<m_endl; h<<"# "<<docStr<<m_endl; h<<"#"<<m_endl<<m_endl; @@ -146,24 +146,24 @@ void RubyWriter::writeClass(UMLClassifier *c) { TQString RubyWriter::cppToRubyType(const TQString &typeStr) { TQString type = cleanName(typeStr); - type.replace("const ", ""); - type.replace(TQRegExp("[*&\\s]"), ""); - type.replace(TQRegExp("[<>]"), "_"); - type.replace("TQStringList", "Array"); - type.replace("TQString", "String"); - type.replace("bool", "true|false"); - type.replace(TQRegExp("^(uint|int|ushort|short|ulong|long)$"), "Integer"); - type.replace(TQRegExp("^(float|double)$"), "Float"); - type.replace(TQRegExp("^Q(?=[A-Z])"), "Qt::"); - type.replace(TQRegExp("^K(?!(DE|Parts|IO)"), "KDE::"); + type.tqreplace("const ", ""); + type.tqreplace(TQRegExp("[*&\\s]"), ""); + type.tqreplace(TQRegExp("[<>]"), "_"); + type.tqreplace(TQSTRINGLIST_OBJECT_NAME_STRING, "Array"); + type.tqreplace(TQSTRING_OBJECT_NAME_STRING, "String"); + type.tqreplace("bool", "true|false"); + type.tqreplace(TQRegExp("^(uint|int|ushort|short|ulong|long)$"), "Integer"); + type.tqreplace(TQRegExp("^(float|double)$"), "Float"); + type.tqreplace(TQRegExp("^Q(?=[A-Z])"), "TQt::"); + type.tqreplace(TQRegExp("^K(?!(DE|Parts|IO)"), "KDE::"); return type; } TQString RubyWriter::cppToRubyName(const TQString &nameStr) { TQString name = cleanName(nameStr); - name.replace(TQRegExp("^m_"), ""); - name.replace(TQRegExp("^[pbn](?=[A-Z])"), ""); + name.tqreplace(TQRegExp("^m_"), ""); + name.tqreplace(TQRegExp("^[pbn](?=[A-Z])"), ""); name = name.mid(0, 1).lower() + name.mid(1); return name; } @@ -251,7 +251,7 @@ void RubyWriter::writeOperations(const TQString &classname, UMLOperationList &op methodName = "initialize"; } - methodName.replace("operator ", ""); + methodName.tqreplace("operator ", ""); methodName = methodName.mid(0, 1).lower() + methodName.mid(1); UMLAttributeList atl = op->getParmList(); @@ -267,15 +267,15 @@ void RubyWriter::writeOperations(const TQString &classname, UMLOperationList &op h << m_indentation << "#" << m_endl; TQString docStr = op->getDoc(); - docStr.replace(TQRegExp("[\\n\\r]+ *"), m_endl); - docStr.replace(TQRegExp("[\\n\\r]+\\t*"), m_endl); + docStr.tqreplace(TQRegExp("[\\n\\r]+ *"), m_endl); + docStr.tqreplace(TQRegExp("[\\n\\r]+\\t*"), m_endl); - docStr.replace(" m_", " "); - docStr.replace(TQRegExp("\\s[npb](?=[A-Z])"), " "); + docStr.tqreplace(" m_", " "); + docStr.tqreplace(TQRegExp("\\s[npb](?=[A-Z])"), " "); TQRegExp re_params("@param (\\w)(\\w*)"); int pos = re_params.search(docStr); while (pos != -1) { - docStr.replace( re_params.cap(0), + docStr.tqreplace( re_params.cap(0), TQString("@param _") + re_params.cap(1).lower() + re_params.cap(2) + '_' ); commentedParams.append(re_params.cap(1).lower() + re_params.cap(2)); @@ -283,31 +283,31 @@ void RubyWriter::writeOperations(const TQString &classname, UMLOperationList &op pos = re_params.search(docStr, pos); } - docStr.replace("\n", TQString("\n") + m_indentation + "# "); + docStr.tqreplace("\n", TQString("\n") + m_indentation + "# "); // Write parameter documentation for (at = atl.first(); at ; at = atl.next()) { // Only write an individual @param entry if one hasn't been found already // in the main doc comment - if (commentedParams.contains(cppToRubyName(at->getName())) == 0) { + if (commentedParams.tqcontains(cppToRubyName(at->getName())) == 0) { docStr += (m_endl + m_indentation + "# @param _" + cppToRubyName(at->getName()) + '_'); if (at->getDoc().isEmpty()) { docStr += (' ' + cppToRubyType(at->getTypeName())); } else { - docStr += (' ' + at->getDoc().replace(TQRegExp("[\\n\\r]+[\\t ]*"), m_endl + " ")); + docStr += (' ' + at->getDoc().tqreplace(TQRegExp("[\\n\\r]+[\\t ]*"), m_endl + " ")); } } } - docStr.replace("@ref ", ""); - docStr.replace("@param", "*"); - docStr.replace("@return", "* _returns_"); + docStr.tqreplace("@ref ", ""); + docStr.tqreplace("@param", "*"); + docStr.tqreplace("@return", "* _returns_"); // All lines after the first '# *' in the doc comment // must be indented correctly. If they aren't a list // item starting with '# *', then indent the text with // three spaces, '# ', to line up with the list item. - pos = docStr.find("# *"); + pos = docStr.tqfind("# *"); TQRegExp re_linestart("# (?!\\*)"); pos = re_linestart.search(docStr, pos); while (pos > 0) { @@ -320,7 +320,7 @@ void RubyWriter::writeOperations(const TQString &classname, UMLOperationList &op h << m_indentation << "# "<< docStr << m_endl; TQString typeStr = cppToRubyType(op->getTypeName()); - if (!typeStr.isEmpty() && typeStr != "void" && docStr.contains("_returns_") == 0) { + if (!typeStr.isEmpty() && typeStr != "void" && docStr.tqcontains("_returns_") == 0) { h << m_indentation << "# * _returns_ " << typeStr << m_endl; } } @@ -375,9 +375,9 @@ void RubyWriter::writeSingleAttributeAccessorMethods( TQTextStream &h) { TQString description = descr; - description.replace(TQRegExp("m_[npb](?=[A-Z])"), ""); - description.replace("m_", ""); - description.replace("\n", TQString("\n") + m_indentation + "# "); + description.tqreplace(TQRegExp("m_[npb](?=[A-Z])"), ""); + description.tqreplace("m_", ""); + description.tqreplace("\n", TQString("\n") + m_indentation + "# "); if (!description.isEmpty()) { h << m_indentation << "# " << description << m_endl; diff --git a/umbrello/umbrello/codegenerators/rubywriter.h b/umbrello/umbrello/codegenerators/rubywriter.h index c1a69775..929a7306 100644 --- a/umbrello/umbrello/codegenerators/rubywriter.h +++ b/umbrello/umbrello/codegenerators/rubywriter.h @@ -33,6 +33,7 @@ class ClassifierInfo; */ class RubyWriter : public SimpleCodeGenerator { Q_OBJECT + TQ_OBJECT public: RubyWriter(); @@ -56,8 +57,8 @@ public: private: /** - * Convert a C++ type such as 'int' or 'QWidget' to - * ruby types Integer and Qt::Widget + * Convert a C++ type such as 'int' or 'TQWidget' to + * ruby types Integer and TQt::Widget * * @param cppType the C++ type to be converted */ diff --git a/umbrello/umbrello/codegenerators/simplecodegenerator.cpp b/umbrello/umbrello/codegenerators/simplecodegenerator.cpp index 6b7ac992..d4f62cc3 100644 --- a/umbrello/umbrello/codegenerators/simplecodegenerator.cpp +++ b/umbrello/umbrello/codegenerators/simplecodegenerator.cpp @@ -47,10 +47,10 @@ SimpleCodeGenerator::SimpleCodeGenerator (bool createDirHierarchyForPackages /* =true */) { m_indentLevel = 0; - UMLDoc * parentDoc = UMLApp::app()->getDocument(); - parentDoc->disconnect(this); // disconnect from UMLDoc.. we arent planning to be synced at all + UMLDoc * tqparentDoc = UMLApp::app()->getDocument(); + tqparentDoc->disconnect(this); // disconnect from UMLDoc.. we arent planning to be synced at all m_createDirHierarchyForPackages = createDirHierarchyForPackages; - initFields(parentDoc); + initFields(tqparentDoc); } SimpleCodeGenerator::~SimpleCodeGenerator ( ) { } @@ -77,7 +77,7 @@ TQString SimpleCodeGenerator::getIndent () TQString SimpleCodeGenerator::findFileName(UMLPackage* concept, const TQString &ext) { //if we already know to which file this class was written/should be written, just return it. - if (m_fileMap.contains(concept)) + if (m_fileMap.tqcontains(concept)) return m_fileMap[concept]; //else, determine the "natural" file name @@ -89,16 +89,16 @@ TQString SimpleCodeGenerator::findFileName(UMLPackage* concept, const TQString & package.simplifyWhiteSpace(); // Replace all blanks with underscore - package.replace(TQRegExp(" "), "_"); + package.tqreplace(TQRegExp(" "), "_"); // Convert all "::" to "/" : Platform-specific path separator - // package.replace(TQRegExp("::"), "/"); + // package.tqreplace(TQRegExp("::"), "/"); // if package is given add this as a directory to the file name if (!package.isEmpty() && m_createDirHierarchyForPackages) { name = package + '.' + concept->getName(); - name.replace(TQRegExp("\\."),"/"); - package.replace(TQRegExp("\\."), "/"); + name.tqreplace(TQRegExp("\\."),"/"); + package.tqreplace(TQRegExp("\\."), "/"); package = '/' + package; } else { name = concept->getFullyQualifiedName("-"); @@ -136,10 +136,10 @@ TQString SimpleCodeGenerator::findFileName(UMLPackage* concept, const TQString & name.simplifyWhiteSpace(); - name.replace(TQRegExp(" "),"_"); + name.tqreplace(TQRegExp(" "),"_"); TQString extension = ext.simplifyWhiteSpace(); - extension.replace(' ', '_'); + extension.tqreplace(' ', '_'); return overwritableName(concept, name, extension); } @@ -256,14 +256,14 @@ void SimpleCodeGenerator::writeCodeToFile ( UMLClassifierList & concepts) { this->writeClass(c); // call the writer for each class. } -void SimpleCodeGenerator::initFields ( UMLDoc * parentDoc ) { +void SimpleCodeGenerator::initFields ( UMLDoc * tqparentDoc ) { - // load Classifier documents from parent document + // load Classifier documents from tqparent document // initFromParentDocument(); m_fileMap.clear(); m_applyToAllRemaining = true; - m_doc = parentDoc; + m_doc = tqparentDoc; // this really is just being used to sync the internal params // to the codegenpolicy as there are no code documents to really sync. @@ -282,7 +282,7 @@ void SimpleCodeGenerator::syncCodeToDocument() { } -// override parent method +// override tqparent method void SimpleCodeGenerator::initFromParentDocument( ) { // Do nothing diff --git a/umbrello/umbrello/codegenerators/simplecodegenerator.h b/umbrello/umbrello/codegenerators/simplecodegenerator.h index c9d4a32d..301dc780 100644 --- a/umbrello/umbrello/codegenerators/simplecodegenerator.h +++ b/umbrello/umbrello/codegenerators/simplecodegenerator.h @@ -35,6 +35,7 @@ class UMLDoc; class SimpleCodeGenerator : public CodeGenerator { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -88,7 +89,7 @@ protected: */ TQMap<UMLPackage*,TQString> m_fileMap; - // the parent document + // the tqparent document UMLDoc *m_doc; /** @@ -104,7 +105,7 @@ protected: int m_indentLevel; TQString m_endl; - // override parent method..we need special handling + // override tqparent method..we need special handling void initFromParentDocument( ); private: diff --git a/umbrello/umbrello/codegenerators/sqlwriter.cpp b/umbrello/umbrello/codegenerators/sqlwriter.cpp index 8582ec93..d08ea1fe 100644 --- a/umbrello/umbrello/codegenerators/sqlwriter.cpp +++ b/umbrello/umbrello/codegenerators/sqlwriter.cpp @@ -30,12 +30,12 @@ #include "../association.h" #include "../attribute.h" -SQLWriter::SQLWriter() { +STQLWriter::STQLWriter() { } -SQLWriter::~SQLWriter() {} +STQLWriter::~STQLWriter() {} -void SQLWriter::writeClass(UMLClassifier *c) { +void STQLWriter::writeClass(UMLClassifier *c) { if(!c) { kDebug()<<"Cannot write class of NULL concept!" << endl; @@ -65,8 +65,8 @@ void SQLWriter::writeClass(UMLClassifier *c) { TQString str; str = getHeadingFile(".sql"); if(!str.isEmpty()) { - str.replace(TQRegExp("%filename%"),fileName); - str.replace(TQRegExp("%filepath%"),file.name()); + str.tqreplace(TQRegExp("%filename%"),fileName); + str.tqreplace(TQRegExp("%filepath%"),file.name()); sql<<str<<m_endl; } @@ -113,7 +113,7 @@ void SQLWriter::writeClass(UMLClassifier *c) { } -void SQLWriter::writeAttributes(UMLClassifier *c, TQTextStream &sql) { +void STQLWriter::writeAttributes(UMLClassifier *c, TQTextStream &sql) { UMLAttributeList atpub, atprot, atpriv, atimp; atpub.setAutoDelete(false); atprot.setAutoDelete(false); @@ -140,7 +140,7 @@ void SQLWriter::writeAttributes(UMLClassifier *c, TQTextStream &sql) { } // now print the attributes; they are sorted by there scope - // in front of the first attribute shouldn't be a , -> so we need to find + // in front of the first attribute shouldn't be a , -> so we need to tqfind // out, when the first attribute was added bool first = true; @@ -171,7 +171,7 @@ void SQLWriter::writeAttributes(UMLClassifier *c, TQTextStream &sql) { return; } -void SQLWriter::printAttributes(TQTextStream& sql, UMLAttributeList attributeList, bool first) { +void STQLWriter::printAttributes(TQTextStream& sql, UMLAttributeList attributeList, bool first) { TQString attrDoc = ""; UMLAttribute* at; @@ -211,11 +211,11 @@ void SQLWriter::printAttributes(TQTextStream& sql, UMLAttributeList attributeLis return; } -Uml::Programming_Language SQLWriter::getLanguage() { +Uml::Programming_Language STQLWriter::getLanguage() { return Uml::pl_SQL; } -TQStringList SQLWriter::defaultDatatypes() { +TQStringList STQLWriter::defaultDatatypes() { TQStringList l; l.append("varchar"); l.append("tinyint"); @@ -244,7 +244,7 @@ TQStringList SQLWriter::defaultDatatypes() { return l; } -const TQStringList SQLWriter::reservedKeywords() const { +const TQStringList STQLWriter::reservedKeywords() const { static TQStringList keywords; diff --git a/umbrello/umbrello/codegenerators/sqlwriter.h b/umbrello/umbrello/codegenerators/sqlwriter.h index 42271af0..e4df5e2b 100644 --- a/umbrello/umbrello/codegenerators/sqlwriter.h +++ b/umbrello/umbrello/codegenerators/sqlwriter.h @@ -15,24 +15,25 @@ * * ***************************************************************************/ -#ifndef SQLWRITER_H -#define SQLWRITER_H +#ifndef STQLWRITER_H +#define STQLWRITER_H #include "simplecodegenerator.h" #include "../umlattributelist.h" /** - * class SQLWriter is a code generator for UMLClassifier objects. + * class STQLWriter is a code generator for UMLClassifier objects. * Create an instance of this class, and feed it a UMLClassifier when * calling writeClass and it will generate a sql source file for * that concept */ -class SQLWriter : public SimpleCodeGenerator { +class STQLWriter : public SimpleCodeGenerator { Q_OBJECT + TQ_OBJECT public: - SQLWriter(); - virtual ~SQLWriter(); + STQLWriter(); + virtual ~STQLWriter(); /** * call this method to generate sql code for a UMLClassifier @@ -74,4 +75,4 @@ private: void printAttributes(TQTextStream& sql, UMLAttributeList attributeList, bool first); }; -#endif // SQLWRITER_H +#endif // STQLWRITER_H diff --git a/umbrello/umbrello/codegenerators/tclwriter.cpp b/umbrello/umbrello/codegenerators/tclwriter.cpp index f443e8f1..913211c4 100644 --- a/umbrello/umbrello/codegenerators/tclwriter.cpp +++ b/umbrello/umbrello/codegenerators/tclwriter.cpp @@ -58,7 +58,7 @@ static const char *tclwords[] = { "llength", "load", "lrange", - "lreplace", + "ltqreplace", "method", "namespace", "private", @@ -165,8 +165,8 @@ TclWriter::writeHeaderFile(UMLClassifier * c, TQFile & fileh) // write header blurb TQString str = getHeadingFile(".tcl"); if (!str.isEmpty()) { - str.replace(TQRegExp("%filename%"), classifierInfo->fileName); - str.replace(TQRegExp("%filepath%"), fileh.name()); + str.tqreplace(TQRegExp("%filename%"), classifierInfo->fileName); + str.tqreplace(TQRegExp("%filepath%"), fileh.name()); writeCode(str); } // set current namespace @@ -337,8 +337,8 @@ TclWriter::writeSourceFile(UMLClassifier * c, TQFile & filetcl) TQString str; str = getHeadingFile(".tclbody"); if (!str.isEmpty()) { - str.replace(TQRegExp("%filename%"), classifierInfo->fileName + "body"); - str.replace(TQRegExp("%filepath%"), filetcl.name()); + str.tqreplace(TQRegExp("%filename%"), classifierInfo->fileName + "body"); + str.tqreplace(TQRegExp("%filepath%"), filetcl.name()); writeCode(str); } // Start body of class @@ -599,13 +599,13 @@ TclWriter::writeAssociationRoleDecl(const TQString &fieldClassName, const TQStri // declare the association based on whether it is this a single variable // or a List (Vector). One day this will be done correctly with special // multiplicity object that we don't have to figure out what it means via regex. - if (multi.isEmpty() || multi.contains(TQRegExp("^[01]$"))) { + if (multi.isEmpty() || multi.tqcontains(TQRegExp("^[01]$"))) { TQString fieldVarName = roleName.lower(); // record this for later consideration of initialization IF the // multi value requires 1 of these objects - if (ObjectFieldVariables.findIndex(fieldVarName) == -1 && - multi.contains(TQRegExp("^1$")) + if (ObjectFieldVariables.tqfindIndex(fieldVarName) == -1 && + multi.tqcontains(TQRegExp("^1$")) ) { // ugh. UGLY. Storing variable name and its class in pairs. ObjectFieldVariables.append(fieldVarName); @@ -619,7 +619,7 @@ TclWriter::writeAssociationRoleDecl(const TQString &fieldClassName, const TQStri // record unique occurrences for later when we want to check // for initialization of this vector - if (VectorFieldVariables.findIndex(fieldVarName) == -1) + if (VectorFieldVariables.tqfindIndex(fieldVarName) == -1) VectorFieldVariables.append(fieldVarName); writeDocu(m_endl + "@var" + scope + " variable <" + fieldClassName + "*> " + fieldVarName + m_endl + doc); @@ -888,7 +888,7 @@ TclWriter::writeAssociationRoleSource(const TQString &fieldClassName, // declare the association based on whether it is this a single variable // or a List (Vector). One day this will be done correctly with special // multiplicity object that we don't have to figure out what it means via regex. - if (multi.isEmpty() || multi.contains(TQRegExp("^[01]$"))) { + if (multi.isEmpty() || multi.tqcontains(TQRegExp("^[01]$"))) { TQString fieldVarName = roleName.lower(); writeCode("configbody " + mClassGlobal + "::" + fieldVarName + " {} {"); @@ -921,7 +921,7 @@ TclWriter::writeAssociationRoleSource(const TQString &fieldClassName, writeCode('}' + m_endl); } -QString +TQString TclWriter::fixTypeName(const TQString &string) { if (string.isEmpty()) @@ -930,13 +930,13 @@ TclWriter::fixTypeName(const TQString &string) } // methods like this _shouldn't_ be needed IF we properly did things thruought the code. -QString +TQString TclWriter::getUMLObjectName(UMLObject * obj) { return (obj != 0) ? obj->getName() : TQString("NULL"); } -const QStringList +const TQStringList TclWriter::reservedKeywords() const { static TQStringList keywords; diff --git a/umbrello/umbrello/codegenerators/xmlcodecomment.cpp b/umbrello/umbrello/codegenerators/xmlcodecomment.cpp index 8d3a6893..01e79399 100644 --- a/umbrello/umbrello/codegenerators/xmlcodecomment.cpp +++ b/umbrello/umbrello/codegenerators/xmlcodecomment.cpp @@ -41,7 +41,7 @@ XMLCodeComment::~XMLCodeComment ( ) { } // /** - * @return QString + * @return TQString */ TQString XMLCodeComment::toString ( ) { diff --git a/umbrello/umbrello/codegenerators/xmlcodecomment.h b/umbrello/umbrello/codegenerators/xmlcodecomment.h index e3f55ccc..688ade91 100644 --- a/umbrello/umbrello/codegenerators/xmlcodecomment.h +++ b/umbrello/umbrello/codegenerators/xmlcodecomment.h @@ -31,6 +31,7 @@ class CodeDocument; class XMLCodeComment: virtual public CodeComment { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -54,7 +55,7 @@ public: // /** - * @return QString + * @return TQString */ TQString toString ( ); diff --git a/umbrello/umbrello/codegenerators/xmlelementcodeblock.cpp b/umbrello/umbrello/codegenerators/xmlelementcodeblock.cpp index 6a068113..21dd5230 100644 --- a/umbrello/umbrello/codegenerators/xmlelementcodeblock.cpp +++ b/umbrello/umbrello/codegenerators/xmlelementcodeblock.cpp @@ -29,10 +29,10 @@ // Constructors/Destructors // -XMLElementCodeBlock::XMLElementCodeBlock ( CodeDocument * parentDoc, const TQString & nodeName, const TQString & comment) - : HierarchicalCodeBlock(parentDoc) +XMLElementCodeBlock::XMLElementCodeBlock ( CodeDocument * tqparentDoc, const TQString & nodeName, const TQString & comment) + : HierarchicalCodeBlock(tqparentDoc) { - init(parentDoc, nodeName, comment); + init(tqparentDoc, nodeName, comment); } XMLElementCodeBlock::~XMLElementCodeBlock ( ) { } @@ -150,10 +150,10 @@ void XMLElementCodeBlock::updateContent ( ) } -void XMLElementCodeBlock::init (CodeDocument *parentDoc, const TQString &nodeName, const TQString &comment) +void XMLElementCodeBlock::init (CodeDocument *tqparentDoc, const TQString &nodeName, const TQString &comment) { - setComment(new XMLCodeComment(parentDoc)); + setComment(new XMLCodeComment(tqparentDoc)); getComment()->setText(comment); m_nodeName = nodeName; diff --git a/umbrello/umbrello/codegenerators/xmlelementcodeblock.h b/umbrello/umbrello/codegenerators/xmlelementcodeblock.h index 334cac17..21427df0 100644 --- a/umbrello/umbrello/codegenerators/xmlelementcodeblock.h +++ b/umbrello/umbrello/codegenerators/xmlelementcodeblock.h @@ -28,6 +28,7 @@ class UMLAttribute; class XMLElementCodeBlock : public HierarchicalCodeBlock { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -36,7 +37,7 @@ public: /** * Empty Constructor */ - XMLElementCodeBlock ( CodeDocument * parentDoc, const TQString & nodeName, const TQString & comment = ""); + XMLElementCodeBlock ( CodeDocument * tqparentDoc, const TQString & nodeName, const TQString & comment = ""); /** * Empty Destructor @@ -81,7 +82,7 @@ private: UMLAttributeList m_attList; TQString m_nodeName; - void init (CodeDocument * parent, const TQString &nodeName, const TQString &comment); + void init (CodeDocument * tqparent, const TQString &nodeName, const TQString &comment); }; diff --git a/umbrello/umbrello/codegenerators/xmlschemawriter.cpp b/umbrello/umbrello/codegenerators/xmlschemawriter.cpp index 8c043a3e..00753349 100644 --- a/umbrello/umbrello/codegenerators/xmlschemawriter.cpp +++ b/umbrello/umbrello/codegenerators/xmlschemawriter.cpp @@ -87,8 +87,8 @@ void XMLSchemaWriter::writeClass(UMLClassifier *c) // 1. create the header TQString headerText = getHeadingFile(".xsd"); if(!headerText.isEmpty()) { - headerText.replace(TQRegExp("%filename%"),fileName); - headerText.replace(TQRegExp("%filepath%"),file.name()); + headerText.tqreplace(TQRegExp("%filename%"),fileName); + headerText.tqreplace(TQRegExp("%filepath%"),file.name()); } if(!headerText.isEmpty()) XMLschema<<headerText<<m_endl; @@ -445,7 +445,7 @@ void XMLSchemaWriter::writeChildObjsInAssociation (UMLClassifier *c, } bool XMLSchemaWriter::hasBeenWritten(UMLClassifier *c) { - if (writtenClassifiers.contains(c)) + if (writtenClassifiers.tqcontains(c)) return true; else return false; @@ -529,7 +529,7 @@ void XMLSchemaWriter::writeComment( const TQString &comment, TQTextStream &XMLsc // need to resolve for using with MAC/WinDoze eventually I assume TQString indent = getIndent(); XMLschema<<indent<<"<!-- "; - if (comment.contains(TQRegExp("\n"))) { + if (comment.tqcontains(TQRegExp("\n"))) { XMLschema<<m_endl; TQStringList lines = TQStringList::split( "\n", comment); for(uint i= 0; i < lines.count(); i++) @@ -543,7 +543,7 @@ void XMLSchemaWriter::writeComment( const TQString &comment, TQTextStream &XMLsc } } -// all that matters here is roleA, the role served by the children of this class +// all that matters here is roleA, the role served by the tqchildren of this class // in any composition or aggregation association. In full associations, I have only // considered the case of "self" association, so it shouldn't matter if we use role A or // B to find the child class as long as we don't use BOTH roles. I bet this will fail @@ -673,10 +673,10 @@ void XMLSchemaWriter::writeAssociationRoleDecl( UMLClassifier *c, const TQString { // populate both with the actual value as long as our value isnt an asterix // In that case, use special value (from above) - if(values[0].contains(TQRegExp("\\d{1,}"))) + if(values[0].tqcontains(TQRegExp("\\d{1,}"))) minOccurs = values[0]; // use first number in sequence - if(values[values.count()-1].contains(TQRegExp("\\d{1,}"))) + if(values[values.count()-1].tqcontains(TQRegExp("\\d{1,}"))) maxOccurs = values[values.count()-1]; // use only last number in sequence } } @@ -690,13 +690,13 @@ void XMLSchemaWriter::writeAssociationRoleDecl( UMLClassifier *c, const TQString // class (err. node) is inherit from it with a "concrete" element. Therefore, // in this manner, we need a group node for abstract classes to lay out the child // element choices so that the child, concrete class may be plugged into whatever spot - // it parent could go. The tradeoff is that "group" nodes may not be extended, so the + // it tqparent could go. The tradeoff is that "group" nodes may not be extended, so the // choices that you lay out here are it (e.g. no more nodes may inherit" from this group) // // The flipside for concrete classes is that we want to use them as elements in our document. // Unfortunately, about all you can do with complexTypes in terms of inheritance, is to // use these as the basis for a new node type. This is NOT full inheritence because the new - // class (err. element node) wont be able to go into the document where it parent went without + // class (err. element node) wont be able to go into the document where it tqparent went without // you heavily editing the schema. // // Therefore, IF a group is abstract, but has no inheriting sub-classes, there are no choices, and its nigh @@ -736,8 +736,8 @@ void XMLSchemaWriter::writeAssociationRoleDecl( UMLClassifier *c, const TQString // Same thing again for "bool" to "boolean" TQString XMLSchemaWriter::fixTypeName(const TQString& string) { - // string.replace(TQRegExp("^string$"),schemaNamespaceTag+":string"); - // string.replace(TQRegExp("^bool$"),schemaNamespaceTag+":boolean"); + // string.tqreplace(TQRegExp("^string$"),schemaNamespaceTag+":string"); + // string.tqreplace(TQRegExp("^bool$"),schemaNamespaceTag+":boolean"); return schemaNamespaceTag + ':' + string; } diff --git a/umbrello/umbrello/codegenerators/xmlschemawriter.h b/umbrello/umbrello/codegenerators/xmlschemawriter.h index 95210078..cc4372a2 100644 --- a/umbrello/umbrello/codegenerators/xmlschemawriter.h +++ b/umbrello/umbrello/codegenerators/xmlschemawriter.h @@ -38,6 +38,7 @@ class XMLSchemaWriter : public SimpleCodeGenerator { Q_OBJECT + TQ_OBJECT public: /** @@ -87,7 +88,7 @@ private: /** * write a <group> declaration for this classifier. Used for interfaces to classes with - * inheriting children. + * inheriting tqchildren. */ void writeGroupClassifierDecl(UMLClassifier *c, UMLClassifierList superclassifiers, diff --git a/umbrello/umbrello/codegenobjectwithtextblocks.cpp b/umbrello/umbrello/codegenobjectwithtextblocks.cpp index c3fb2fd6..99bbbf58 100644 --- a/umbrello/umbrello/codegenobjectwithtextblocks.cpp +++ b/umbrello/umbrello/codegenobjectwithtextblocks.cpp @@ -32,8 +32,8 @@ // Constructors/Destructors // -CodeGenObjectWithTextBlocks::CodeGenObjectWithTextBlocks ( CodeDocument *parent ) - : m_pCodeDoc(parent) +CodeGenObjectWithTextBlocks::CodeGenObjectWithTextBlocks ( CodeDocument *tqparent ) + : m_pCodeDoc(tqparent) { initFields(); } @@ -85,18 +85,18 @@ bool CodeGenObjectWithTextBlocks::addTextBlock(TextBlock* add_object ) { else { - // if it has a tag, check to see that its not in some other parent object - // IF it is then we will need to remove it FIRST before adding to new parent - CodeDocument * parentDoc = add_object->getParentDocument(); - if(parentDoc) { + // if it has a tag, check to see that its not in some other tqparent object + // IF it is then we will need to remove it FIRST before adding to new tqparent + CodeDocument * tqparentDoc = add_object->getParentDocument(); + if(tqparentDoc) { - CodeGenObjectWithTextBlocks * oldParent = parentDoc->findParentObjectForTaggedTextBlock (tag); + CodeGenObjectWithTextBlocks * oldParent = tqparentDoc->findParentObjectForTaggedTextBlock (tag); if(oldParent && oldParent != this) oldParent->removeTextBlock(add_object); } } - if(m_textBlockTagMap.contains(tag)) + if(m_textBlockTagMap.tqcontains(tag)) return false; // return false, we already have some object with this tag in the list // if we get here, then the object is a "fresh" one, we havent @@ -136,15 +136,15 @@ bool CodeGenObjectWithTextBlocks::removeTextBlock ( TextBlock * remove_object ) TextBlock * CodeGenObjectWithTextBlocks::findTextBlockByTag( const TQString &tag ) { //if we already know to which file this class was written/should be written, just return it. - if(m_textBlockTagMap.contains(tag)) + if(m_textBlockTagMap.tqcontains(tag)) return m_textBlockTagMap[tag]; return (TextBlock*) NULL; } -// IMPORTANT: this will only search for a parent from the viewpoint of this object +// IMPORTANT: this will only search for a tqparent from the viewpoint of this object // and down into its Hierarchical codeblocks. This means you should start any -// search from the parent document of the text block. This method NOT meant for +// search from the tqparent document of the text block. This method NOT meant for // casual usage. CodeGenObjectWithTextBlocks * CodeGenObjectWithTextBlocks::findParentObjectForTaggedTextBlock (const TQString & tag) { @@ -170,7 +170,7 @@ CodeGenObjectWithTextBlocks * CodeGenObjectWithTextBlocks::findParentObjectForTa return this; // shouldn't happen unless the textblock doesn't exist in this object - // or its children at all + // or its tqchildren at all return (CodeGenObjectWithTextBlocks*) NULL; } @@ -378,7 +378,7 @@ void CodeGenObjectWithTextBlocks::setAttributesFromNode ( TQDomElement & root) // in this vanilla version, we only load comments and codeblocks // as they are the only instanciatable (vanilla) things // this method should be overridden if this class is inherited -// by some other class that is concrete and takes children +// by some other class that is concrete and takes tqchildren // derived from codeblock/codecomment void CodeGenObjectWithTextBlocks::loadChildTextBlocksFromNode ( TQDomElement & root) { @@ -460,7 +460,7 @@ void CodeGenObjectWithTextBlocks::loadChildTextBlocksFromNode ( TQDomElement & r } else if( name == "codeoperation" ) { // find the code operation by id - TQString id = element.attribute("parent_id","-1"); + TQString id = element.attribute("tqparent_id","-1"); UMLObject * obj = UMLApp::app()->getDocument()->findObjectById(STR2ID(id)); UMLOperation * op = dynamic_cast<UMLOperation*>(obj); if(op) { diff --git a/umbrello/umbrello/codegenobjectwithtextblocks.h b/umbrello/umbrello/codegenobjectwithtextblocks.h index c21aacf2..0e522e83 100644 --- a/umbrello/umbrello/codegenobjectwithtextblocks.h +++ b/umbrello/umbrello/codegenobjectwithtextblocks.h @@ -45,7 +45,7 @@ public: /** * Constructor */ - CodeGenObjectWithTextBlocks ( CodeDocument *parent ); + CodeGenObjectWithTextBlocks ( CodeDocument *tqparent ); /** * Empty Destructor @@ -129,7 +129,7 @@ public: virtual TextBlock * findTextBlockByTag ( const TQString &tag ); /** - * @return QString + * @return TQString * @param prefix */ virtual TQString getUniqueTag (const TQString& prefix = "" ) = 0; @@ -140,9 +140,9 @@ public: virtual CodeBlockWithComments * newCodeBlockWithComments() = 0; virtual HierarchicalCodeBlock * newHierarchicalCodeBlock() = 0; - /** Find the direct parent for a given textblock. This + /** Find the direct tqparent for a given textblock. This * may be any object which holds text blocks, e.g. a CodeGenObjectWithTextBlocks. - * @return parent object. Could return null if the textblock is missing from the + * @return tqparent object. Could return null if the textblock is missing from the * branch of the document tree being examined. */ CodeGenObjectWithTextBlocks * findParentObjectForTaggedTextBlock (const TQString & tag); @@ -165,7 +165,7 @@ protected: * in this vanilla version, we only load comments and codeblocks * as they are the only instanciatable (vanilla) things * this method should be overridden if this class is inherited - * by some other class that is concrete and takes children + * by some other class that is concrete and takes tqchildren * derived from codeblock/codecomment/hierarchicalcb/ownedhiercodeblock */ virtual void loadChildTextBlocksFromNode ( TQDomElement & root); diff --git a/umbrello/umbrello/codeimport/adaimport.cpp b/umbrello/umbrello/codeimport/adaimport.cpp index 0cbd8d1c..c9325b36 100644 --- a/umbrello/umbrello/codeimport/adaimport.cpp +++ b/umbrello/umbrello/codeimport/adaimport.cpp @@ -132,7 +132,7 @@ TQString AdaImport::expand(const TQString& name) { return name; TQString result = name; TQString pfx = pfxRegExp.cap(1); - if (m_renaming.contains(pfx)) { + if (m_renaming.tqcontains(pfx)) { result.remove(pfxRegExp); result.prepend(m_renaming[pfx] + '.'); } @@ -146,7 +146,7 @@ void AdaImport::parseStems(const TQStringList& stems) { uint i = 0; while (1) { TQString filename = base + ".ads"; - if (! m_parsedFiles.contains(filename)) { + if (! m_parsedFiles.tqcontains(filename)) { // Save current m_source and m_srcIndex. TQStringList source(m_source); uint srcIndex = m_srcIndex; @@ -198,9 +198,9 @@ bool AdaImport::parseStmt() { } if (keyword == "package") { const TQString& name = advance(); - TQStringList parentPkgs = TQStringList::split(".", name.lower()); - parentPkgs.pop_back(); // exclude the current package - parseStems(parentPkgs); + TQStringList tqparentPkgs = TQStringList::split(".", name.lower()); + tqparentPkgs.pop_back(); // exclude the current package + parseStems(tqparentPkgs); UMLObject *ns = NULL; if (advance() == "is") { ns = Import_Utils::createUMLObject(Uml::ot_Package, name, @@ -324,15 +324,15 @@ bool AdaImport::parseStmt() { UMLClassifier *klass = static_cast<UMLClassifier*>(ns); TQString base = expand(advance()); UMLObject *p = Import_Utils::createUMLObject(Uml::ot_Interface, base, m_scope[m_scopeIndex]); - UMLClassifier *parent = static_cast<UMLClassifier*>(p); - Import_Utils::createGeneralization(klass, parent); + UMLClassifier *tqparent = static_cast<UMLClassifier*>(p); + Import_Utils::createGeneralization(klass, tqparent); } } else { ns->setAbstract(m_isAbstract); } m_isAbstract = false; if (isTaggedType) { - if (! m_classesDefinedInThisScope.contains(ns)) + if (! m_classesDefinedInThisScope.tqcontains(ns)) m_classesDefinedInThisScope.append(ns); } else { ns->setStereotype("record"); @@ -359,13 +359,13 @@ bool AdaImport::parseStmt() { t = (known ? known->getBaseType() : Uml::ot_Datatype); } UMLObject *ns = Import_Utils::createUMLObject(t, base, NULL); - UMLClassifier *parent = static_cast<UMLClassifier*>(ns); + UMLClassifier *tqparent = static_cast<UMLClassifier*>(ns); ns = Import_Utils::createUMLObject(t, name, m_scope[m_scopeIndex], m_comment); if (isExtension) { next = advance(); if (next == "null" || next == "record") { UMLClassifier *klass = static_cast<UMLClassifier*>(ns); - Import_Utils::createGeneralization(klass, parent); + Import_Utils::createGeneralization(klass, tqparent); if (next == "record") { // Set the m_klass for attributes. m_klass = klass; @@ -375,8 +375,8 @@ bool AdaImport::parseStmt() { TQStringList::Iterator end(baseInterfaces.end()); for (TQStringList::Iterator bi(baseInterfaces.begin()); bi != end; ++bi) { ns = Import_Utils::createUMLObject(t, *bi, m_scope[m_scopeIndex]); - parent = static_cast<UMLClassifier*>(ns); - Import_Utils::createGeneralization(klass, parent); + tqparent = static_cast<UMLClassifier*>(ns); + Import_Utils::createGeneralization(klass, tqparent); } } } @@ -478,7 +478,7 @@ bool AdaImport::parseStmt() { Uml::Object_Type t = type->getBaseType(); if ((t != Uml::ot_Interface && (t != Uml::ot_Class || type->getStereotype() == "record")) || - !m_classesDefinedInThisScope.contains(type)) { + !m_classesDefinedInThisScope.tqcontains(type)) { // Not an instance bound method - we cannot represent it. skipStmt(")"); break; diff --git a/umbrello/umbrello/codeimport/classimport.cpp b/umbrello/umbrello/codeimport/classimport.cpp index e32758dd..9a7cbae9 100644 --- a/umbrello/umbrello/codeimport/classimport.cpp +++ b/umbrello/umbrello/codeimport/classimport.cpp @@ -32,7 +32,7 @@ void ClassImport::importFiles(const TQStringList &fileList) { fileIT != fileList.end(); ++fileIT) { TQString fileName = (*fileIT); umldoc->writeToStatusBar(i18n("Importing file: %1 Progress: %2/%3"). - arg(fileName).arg(processedFilesCount).arg(fileList.size())); + tqarg(fileName).tqarg(processedFilesCount).tqarg(fileList.size())); parseFile(fileName); processedFilesCount++; } @@ -47,7 +47,7 @@ ClassImport *ClassImport::createImporterByFileExt(const TQString &filename) { classImporter = new PythonImport(); else if (filename.endsWith(".java")) classImporter = new JavaImport(); - else if (filename.contains( TQRegExp("\\.ad[sba]$") )) + else if (filename.tqcontains( TQRegExp("\\.ad[sba]$") )) classImporter = new AdaImport(); else if (filename.endsWith(".pas")) classImporter = new PascalImport(); diff --git a/umbrello/umbrello/codeimport/cppimport.cpp b/umbrello/umbrello/codeimport/cppimport.cpp index f97a5359..68d8f731 100644 --- a/umbrello/umbrello/codeimport/cppimport.cpp +++ b/umbrello/umbrello/codeimport/cppimport.cpp @@ -50,7 +50,7 @@ CppImport::CppImport() { CppImport::~CppImport() {} void CppImport::feedTheModel(const TQString& fileName) { - if (ms_seenFiles.find(fileName) != ms_seenFiles.end()) + if (ms_seenFiles.tqfind(fileName) != ms_seenFiles.end()) return; ms_seenFiles.append(fileName); TQMap<TQString, Dependence> deps = ms_driver->dependences(fileName); @@ -66,7 +66,7 @@ void CppImport::feedTheModel(const TQString& fileName) { continue; } kDebug() << fileName << ": " << includeFile << " => " << it.data().first << endl; - if (ms_seenFiles.find(includeFile) == ms_seenFiles.end()) + if (ms_seenFiles.tqfind(includeFile) == ms_seenFiles.end()) feedTheModel(includeFile); } } @@ -101,7 +101,7 @@ void CppImport::initialize() { } void CppImport::parseFile(const TQString& fileName) { - if (ms_seenFiles.find(fileName) != ms_seenFiles.end()) + if (ms_seenFiles.tqfind(fileName) != ms_seenFiles.end()) return; ms_driver->parseFile( fileName ); feedTheModel(fileName); diff --git a/umbrello/umbrello/codeimport/idlimport.cpp b/umbrello/umbrello/codeimport/idlimport.cpp index cd2db89d..36d8992f 100644 --- a/umbrello/umbrello/codeimport/idlimport.cpp +++ b/umbrello/umbrello/codeimport/idlimport.cpp @@ -84,7 +84,7 @@ void IDLImport::fillSource(const TQString& word) { } void IDLImport::parseFile(const TQString& filename) { - if (filename.contains('/')) { + if (filename.tqcontains('/')) { TQString path = filename; path.remove( TQRegExp("/[^/]+$") ); kDebug() << "IDLImport::parseFile: adding path " << path << endl; @@ -290,13 +290,13 @@ bool IDLImport::parseStmt() { // (of a member of struct or valuetype, or return type // of an operation.) Up next is the name of the attribute // or operation. - if (! keyword.contains( TQRegExp("^\\w") )) { + if (! keyword.tqcontains( TQRegExp("^\\w") )) { kError() << "importIDL: ignoring " << keyword << endl; return false; } TQString typeName = joinTypename(); TQString name = advance(); - if (name.contains( TQRegExp("\\W") )) { + if (name.tqcontains( TQRegExp("\\W") )) { kError() << "importIDL: expecting name in " << name << endl; return false; } diff --git a/umbrello/umbrello/codeimport/import_utils.cpp b/umbrello/umbrello/codeimport/import_utils.cpp index 87206ccb..249ed865 100644 --- a/umbrello/umbrello/codeimport/import_utils.cpp +++ b/umbrello/umbrello/codeimport/import_utils.cpp @@ -97,9 +97,9 @@ TQString formatComment(const TQString &comment) { lines.pop_front(); // nothing interesting on this line } TQString& last = lines.last(); - int endpos = last.find("*/"); + int endpos = last.tqfind("*/"); if (endpos != -1) { - if (last.contains(wordex)) + if (last.tqcontains(wordex)) last = last.mid(0, endpos - 1); // remove comment end else lines.pop_back(); // nothing interesting on this line @@ -126,40 +126,40 @@ UMLObject* findUMLObject(TQString name, UMLObject *createUMLObject(Uml::Object_Type type, const TQString& inName, - UMLPackage *parentPkg, + UMLPackage *tqparentPkg, const TQString& comment, const TQString& stereotype) { TQString name = inName; UMLDoc *umldoc = UMLApp::app()->getDocument(); UMLFolder *logicalView = umldoc->getRootFolder(Uml::mt_Logical); const Uml::Programming_Language pl = UMLApp::app()->getActiveLanguage(); - if (parentPkg == NULL) { + if (tqparentPkg == NULL) { // kDebug() << "Import_Utils::createUMLObject(" << name - // << "): parentPkg is NULL, assuming Logical View" << endl; - parentPkg = logicalView; + // << "): tqparentPkg is NULL, assuming Logical View" << endl; + tqparentPkg = logicalView; } - UMLObject * o = umldoc->findUMLObject(name, type, parentPkg); + UMLObject * o = umldoc->findUMLObject(name, type, tqparentPkg); bNewUMLObjectWasCreated = false; if (o == NULL) { // Strip possible adornments and look again. - int isConst = name.contains(TQRegExp("^const ")); + int isConst = name.tqcontains(TQRegExp("^const ")); name.remove(TQRegExp("^const\\s+")); TQString typeName(name); - const int isAdorned = typeName.contains( TQRegExp("[^\\w:\\. ]") ); - const int isPointer = typeName.contains('*'); - const int isRef = typeName.contains('&'); + const int isAdorned = typeName.tqcontains( TQRegExp("[^\\w:\\. ]") ); + const int isPointer = typeName.tqcontains('*'); + const int isRef = typeName.tqcontains('&'); typeName.remove(TQRegExp("[^\\w:\\. ].*$")); typeName = typeName.simplifyWhiteSpace(); - UMLObject *origType = umldoc->findUMLObject(typeName, Uml::ot_UMLObject, parentPkg); + UMLObject *origType = umldoc->findUMLObject(typeName, Uml::ot_UMLObject, tqparentPkg); if (origType == NULL) { // Still not found. Create the stripped down type. if (bPutAtGlobalScope) - parentPkg = logicalView; + tqparentPkg = logicalView; // Find, or create, the scopes. TQStringList components; - if (typeName.contains("::")) { + if (typeName.tqcontains("::")) { components = TQStringList::split("::", typeName); - } else if (typeName.contains(".")) { + } else if (typeName.tqcontains(".")) { components = TQStringList::split(".", typeName); } if (components.count() > 1) { @@ -168,24 +168,24 @@ UMLObject *createUMLObject(Uml::Object_Type type, while ( components.count() ) { TQString scopeName = components.front(); components.pop_front(); - o = umldoc->findUMLObject(scopeName, Uml::ot_UMLObject, parentPkg); + o = umldoc->findUMLObject(scopeName, Uml::ot_UMLObject, tqparentPkg); if (o) { - parentPkg = static_cast<UMLPackage*>(o); + tqparentPkg = static_cast<UMLPackage*>(o); continue; } int wantNamespace = KMessageBox::Yes; if (pl == Uml::pl_Cpp) { - /* We know std and Qt are namespaces */ - if (scopeName != "std" && scopeName != "Qt") { + /* We know std and TQt are namespaces */ + if (scopeName != "std" && scopeName != "TQt") { wantNamespace = KMessageBox::questionYesNo(NULL, - i18n("Is the scope %1 a namespace or a class?").arg(scopeName), + i18n("Is the scope %1 a namespace or a class?").tqarg(scopeName), i18n("C++ Import Requests Your Help"), i18n("Namespace"), i18n("Class")); } } Uml::Object_Type ot = (wantNamespace == KMessageBox::Yes ? Uml::ot_Package : Uml::ot_Class); - o = Object_Factory::createUMLObject(ot, scopeName, parentPkg); - parentPkg = static_cast<UMLPackage*>(o); + o = Object_Factory::createUMLObject(ot, scopeName, tqparentPkg); + tqparentPkg = static_cast<UMLPackage*>(o); UMLListView *listView = UMLApp::app()->getListView(); UMLListViewItem *lvitem = listView->findUMLObject(o); listView->setCurrentItem(lvitem); @@ -196,7 +196,7 @@ UMLObject *createUMLObject(Uml::Object_Type type, Uml::Object_Type t = type; if (type == Uml::ot_UMLObject || isAdorned) t = Uml::ot_Class; - origType = Object_Factory::createUMLObject(t, typeName, parentPkg, false); + origType = Object_Factory::createUMLObject(t, typeName, tqparentPkg, false); bNewUMLObjectWasCreated = true; bPutAtGlobalScope = false; } @@ -228,7 +228,7 @@ UMLObject *createUMLObject(Uml::Object_Type type, } else { o = origType; } - } else if (parentPkg && !bPutAtGlobalScope) { + } else if (tqparentPkg && !bPutAtGlobalScope) { UMLPackage *existingPkg = o->getUMLPackage(); if (existingPkg != umldoc->getDatatypeFolder()) { if (existingPkg) @@ -236,8 +236,8 @@ UMLObject *createUMLObject(Uml::Object_Type type, else kError() << "createUMLObject(" << name << "): " << "o->getUMLPackage() was NULL" << endl; - o->setUMLPackage(parentPkg); - parentPkg->addObject(o); + o->setUMLPackage(tqparentPkg); + tqparentPkg->addObject(o); } } TQString strippedComment = formatComment(comment); @@ -260,7 +260,7 @@ UMLObject *createUMLObject(Uml::Object_Type type, return o; TQStringList::Iterator end(params.end()); for (TQStringList::Iterator it(params.begin()); it != end; ++it) { - UMLObject *p = umldoc->findUMLObject(*it, Uml::ot_UMLObject, parentPkg); + UMLObject *p = umldoc->findUMLObject(*it, Uml::ot_UMLObject, tqparentPkg); if (p == NULL || p->getBaseType() == Uml::ot_Datatype) continue; const Uml::Association_Type at = Uml::at_Dependency; @@ -274,8 +274,8 @@ UMLObject *createUMLObject(Uml::Object_Type type, return o; } -UMLOperation* makeOperation(UMLClassifier *parent, const TQString &name) { - UMLOperation *op = Object_Factory::createOperation(parent, name); +UMLOperation* makeOperation(UMLClassifier *tqparent, const TQString &name) { + UMLOperation *op = Object_Factory::createOperation(tqparent, name); return op; } @@ -396,7 +396,7 @@ void insertMethod(UMLClassifier *klass, UMLOperation* &op, UMLAttribute* addMethodParameter(UMLOperation *method, const TQString& type, const TQString& name) { - UMLClassifier *owner = static_cast<UMLClassifier*>(method->parent()); + UMLClassifier *owner = static_cast<UMLClassifier*>(method->tqparent()); UMLObject *typeObj = owner->findTemplate(type); if (typeObj == NULL) { bPutAtGlobalScope = true; @@ -415,28 +415,28 @@ void addEnumLiteral(UMLEnum *enumType, const TQString &literal, const TQString & el->setDoc(comment); } -void createGeneralization(UMLClassifier *child, UMLClassifier *parent) { - // if the child is an interface, so is the parent. +void createGeneralization(UMLClassifier *child, UMLClassifier *tqparent) { + // if the child is an interface, so is the tqparent. if (child->isInterface()) - parent->setBaseType(Uml::ot_Interface); + tqparent->setBaseType(Uml::ot_Interface); Uml::Association_Type association = Uml::at_Generalization; - if (parent->isInterface() && !child->isInterface()) { - // if the parent is an interface, but the child is not, then + if (tqparent->isInterface() && !child->isInterface()) { + // if the tqparent is an interface, but the child is not, then // this is really realization. // association = Uml::at_Realization; } - UMLAssociation *assoc = new UMLAssociation(association, child, parent); + UMLAssociation *assoc = new UMLAssociation(association, child, tqparent); UMLDoc *umldoc = UMLApp::app()->getDocument(); assoc->setUMLPackage(umldoc->getRootFolder(Uml::mt_Logical)); umldoc->addAssociation(assoc); } -void createGeneralization(UMLClassifier *child, const TQString &parentName) { - UMLObject *parentObj = createUMLObject( Uml::ot_Class, parentName ); - UMLClassifier *parent = static_cast<UMLClassifier*>(parentObj); - createGeneralization(child, parent); +void createGeneralization(UMLClassifier *child, const TQString &tqparentName) { + UMLObject *tqparentObj = createUMLObject( Uml::ot_Class, tqparentName ); + UMLClassifier *tqparent = static_cast<UMLClassifier*>(tqparentObj); + createGeneralization(child, tqparent); } TQStringList includePathList() { @@ -449,14 +449,14 @@ TQStringList includePathList() { } void addIncludePath(const TQString& path) { - if (! incPathList.contains(path)) + if (! incPathList.tqcontains(path)) incPathList.append(path); } -bool isDatatype(const TQString& name, UMLPackage *parentPkg) { +bool isDatatype(const TQString& name, UMLPackage *tqparentPkg) { UMLDoc *umldoc = UMLApp::app()->getDocument(); - UMLObject * o = umldoc->findUMLObject(name, Uml::ot_Datatype, parentPkg); + UMLObject * o = umldoc->findUMLObject(name, Uml::ot_Datatype, tqparentPkg); return (o!=NULL); } diff --git a/umbrello/umbrello/codeimport/import_utils.h b/umbrello/umbrello/codeimport/import_utils.h index f04aa3be..965361f6 100644 --- a/umbrello/umbrello/codeimport/import_utils.h +++ b/umbrello/umbrello/codeimport/import_utils.h @@ -35,15 +35,15 @@ namespace Import_Utils { */ UMLObject* createUMLObject(Uml::Object_Type type, const TQString& name, - UMLPackage *parentPkg = NULL, - const TQString& comment = TQString::null, - const TQString& stereotype = TQString::null); + UMLPackage *tqparentPkg = NULL, + const TQString& comment = TQString(), + const TQString& stereotype = TQString()); /** * Control whether an object which is newly created by createUMLObject() * is put at the global scope. * * @param yesno When set to false, the object is created at the scope - * given by the parentPkg argument of createUMLObject(). + * given by the tqparentPkg argument of createUMLObject(). */ void putAtGlobalScope(bool yesno); @@ -68,7 +68,7 @@ namespace Import_Utils { UMLObject* insertAttribute(UMLClassifier *klass, Uml::Visibility scope, const TQString& name, const TQString& type, - const TQString& comment = TQString::null, + const TQString& comment = TQString(), bool isStatic = false); /** * Create a UMLAttribute and insert it into the document. @@ -81,14 +81,14 @@ namespace Import_Utils { bool isStatic /* =false */); /** * Create a UMLOperation. - * The reason for this method is to not generate any Qt signals. + * The reason for this method is to not generate any TQt signals. * Instead, these are generated by insertMethod(). * (If we generated a creation signal prematurely, i.e. without * the method parameters being known yet, then that would lead to * a conflict with a pre-existing parameterless method of the same * name.) */ - UMLOperation* makeOperation(UMLClassifier *parent, const TQString &name); + UMLOperation* makeOperation(UMLClassifier *tqparent, const TQString &name); /** * Insert the UMLOperation into the given classifier. @@ -112,11 +112,11 @@ namespace Import_Utils { Uml::Visibility scope, const TQString& type, bool isStatic, bool isAbstract, bool isFriend = false, bool isConstructor = false, - const TQString& comment = TQString::null); + const TQString& comment = TQString()); /** * Add an argument to a UMLOperation. - * The parentPkg arg is only used for resolving possible scope + * The tqparentPkg arg is only used for resolving possible scope * prefixes in the `type'. */ UMLAttribute* addMethodParameter(UMLOperation *method, @@ -131,15 +131,15 @@ namespace Import_Utils { /** * Create a generalization from the given child classifier to the given - * parent classifier. + * tqparent classifier. */ - void createGeneralization(UMLClassifier *child, UMLClassifier *parent); + void createGeneralization(UMLClassifier *child, UMLClassifier *tqparent); /** * Create a generalization from the existing child UMLObject to the given - * parent class name. + * tqparent class name. */ - void createGeneralization(UMLClassifier *child, const TQString &parentName); + void createGeneralization(UMLClassifier *child, const TQString &tqparentName); /** * Strip comment lines of leading whitespace and stars. @@ -168,7 +168,7 @@ namespace Import_Utils { /** * Returns true if a type is an actual Datatype */ - bool isDatatype(const TQString& name, UMLPackage *parentPkg = NULL); + bool isDatatype(const TQString& name, UMLPackage *tqparentPkg = NULL); } // end namespace Import_Utils diff --git a/umbrello/umbrello/codeimport/javaimport.cpp b/umbrello/umbrello/codeimport/javaimport.cpp index 7f62a1a9..f73f5586 100644 --- a/umbrello/umbrello/codeimport/javaimport.cpp +++ b/umbrello/umbrello/codeimport/javaimport.cpp @@ -86,7 +86,7 @@ void JavaImport::fillSource(const TQString& word) { void JavaImport::spawnImport( TQString file ) { // if the file is being parsed, don't bother // - if (s_filesAlreadyParsed.contains( file ) ) { + if (s_filesAlreadyParsed.tqcontains( file ) ) { return; } if (TQFile::exists(file)) { @@ -100,9 +100,9 @@ void JavaImport::spawnImport( TQString file ) { ///returns the UML Object if found, or null otherwise -UMLObject* findObject( TQString name, UMLPackage *parentPkg ) { +UMLObject* findObject( TQString name, UMLPackage *tqparentPkg ) { UMLDoc *umldoc = UMLApp::app()->getDocument(); - UMLObject * o = umldoc->findUMLObject(name, Uml::ot_UMLObject , parentPkg); + UMLObject * o = umldoc->findUMLObject(name, Uml::ot_UMLObject , tqparentPkg); return o; } @@ -112,7 +112,7 @@ UMLObject* JavaImport::resolveClass (TQString className) { kDebug() << "importJava trying to resolve " << className << endl; // keep track if we are dealing with an array // - bool isArray = className.contains('['); + bool isArray = className.tqcontains('['); // remove any [] so that the class itself can be resolved // TQString baseClassName = className; @@ -172,15 +172,15 @@ UMLObject* JavaImport::resolveClass (TQString className) { spawnImport( aFile ); // we need to set the package for the class that will be resolved // start at the root package - UMLPackage *parent = m_scope[0]; + UMLPackage *tqparent = m_scope[0]; UMLPackage *current = NULL; for (TQStringList::Iterator it = split.begin(); it != split.end(); ++it) { TQString name = (*it); UMLObject *ns = Import_Utils::createUMLObject(Uml::ot_Package, - name, parent); + name, tqparent); current = static_cast<UMLPackage*>(ns); - parent = current; + tqparent = current; } // for if ( isArray ) { // we have imported the type. For arrays we want to return @@ -271,7 +271,7 @@ bool JavaImport::parseStmt() { } while (1) { const TQString arg = m_source[++start]; - if (! arg.contains( TQRegExp("^[A-Za-z_]") )) { + if (! arg.tqcontains( TQRegExp("^[A-Za-z_]") )) { kDebug() << "importJava(" << name << "): cannot handle template syntax (" << arg << ")" << endl; break; @@ -292,11 +292,11 @@ bool JavaImport::parseStmt() { const TQString& baseName = advance(); // try to resolve the class we are extending, or if impossible // create a placeholder - UMLObject *parent = resolveClass( baseName ); - if ( parent ) { - Import_Utils::createGeneralization(m_klass, static_cast<UMLClassifier*>(parent)); + UMLObject *tqparent = resolveClass( baseName ); + if ( tqparent ) { + Import_Utils::createGeneralization(m_klass, static_cast<UMLClassifier*>(tqparent)); } else { - kDebug() << "importJava parentClass " << baseName + kDebug() << "importJava tqparentClass " << baseName << " is not resolveable. Creating placeholder" << endl; Import_Utils::createGeneralization(m_klass, baseName); } @@ -420,7 +420,7 @@ bool JavaImport::parseStmt() { // (of a member of class or interface, or return type // of an operation.) Up next is the name of the attribute // or operation. - if (! keyword.contains( TQRegExp("^\\w") )) { + if (! keyword.tqcontains( TQRegExp("^\\w") )) { kError() << "importJava: ignoring " << keyword << endl; return false; } @@ -441,7 +441,7 @@ bool JavaImport::parseStmt() { } else { nextToken = advance(); } - if (name.contains( TQRegExp("\\W") )) { + if (name.tqcontains( TQRegExp("\\W") )) { kError() << "importJava: expecting name in " << name << endl; return false; } diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp b/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp index e6a7e2b5..8e107ccf 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp @@ -117,7 +117,7 @@ TQString nodeTypeToString( int type ) return "Custom"; } - return TQString::null; + return TQString(); } @@ -128,7 +128,7 @@ AST::AST() m_endLine( 0 ), m_endColumn( 0 ) { #ifndef CPPPARSER_NO_CHILDREN - m_children.setAutoDelete( false ); + m_tqchildren.setAutoDelete( false ); #endif } @@ -170,14 +170,14 @@ void AST::getEndPosition( int* line, int* col ) const * col = m_endColumn; } -void AST::setParent( AST* parent ) +void AST::setParent( AST* tqparent ) { #ifndef CPPPARSER_NO_CHILDREN if( m_parent ) m_parent->removeChild( this ); #endif - m_parent = parent; + m_parent = tqparent; #ifndef CPPPARSER_NO_CHILDREN if( m_parent ) @@ -188,12 +188,12 @@ void AST::setParent( AST* parent ) #ifndef CPPPARSER_NO_CHILDREN void AST::appendChild( AST* child ) { - m_children.append( child ); + m_tqchildren.append( child ); } void AST::removeChild( AST* child ) { - m_children.remove( child ); + m_tqchildren.remove( child ); } #endif @@ -227,7 +227,7 @@ void NameAST::addClassOrNamespaceName( ClassOrNamespaceNameAST::Node& classOrNam TQString NameAST::text() const { if( !m_unqualifiedName.get() ) - return TQString::null; + return TQString(); TQString str; @@ -462,11 +462,11 @@ void ClassOrNamespaceNameAST::setTemplateArgumentList( TemplateArgumentListAST:: TQString ClassOrNamespaceNameAST::text() const { if( !m_name.get() ) - return TQString::null; + return TQString(); TQString str = m_name->text(); if( m_templateArgumentList.get() ) - str += TQString::fromLatin1("< ") + m_templateArgumentList->text() + TQString::fromLatin1(" >"); + str += TQString::tqfromLatin1("< ") + m_templateArgumentList->text() + TQString::tqfromLatin1(" >"); return str; } diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast.h b/umbrello/umbrello/codeimport/kdevcppparser/ast.h index e2bd7835..0de3a2ed 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/ast.h +++ b/umbrello/umbrello/codeimport/kdevcppparser/ast.h @@ -24,7 +24,7 @@ #include <tqstring.h> #include <tqptrlist.h> -#if defined( Q_OS_WIN32 ) || defined( Q_CC_SUN ) +#if defined( Q_OS_WIN32 ) || defined( TQ_CC_SUN ) #ifndef _THROW0 # define _THROW0() @@ -177,9 +177,9 @@ enum NodeType TQString nodeTypeToString( int type ); -#if defined(CPPPARSER_QUICK_ALLOCATOR) +#if defined(CPPPARSER_TQUICK_ALLOCATOR) -#include <quick_allocator.h> +#include <tquick_allocator.h> #define DECLARE_ALLOC(tp) \ void * operator new(std::size_t) \ @@ -222,8 +222,8 @@ public: int nodeType() const { return m_nodeType; } void setNodeType( int nodeType ) { m_nodeType = nodeType; } - AST* parent() { return m_parent; } - void setParent( AST* parent ); + AST* tqparent() { return m_parent; } + void setParent( AST* tqparent ); void setStartPosition( int line, int col ); void getStartPosition( int* line, int* col ) const; @@ -232,7 +232,7 @@ public: void getEndPosition( int* line, int* col ) const; #ifndef CPPPARSER_NO_CHILDREN - TQPtrList<AST> children() { return m_children; } + TQPtrList<AST> tqchildren() { return m_tqchildren; } void appendChild( AST* child ); void removeChild( AST* child ); #endif @@ -266,7 +266,7 @@ private: int m_endLine, m_endColumn; Slice m_slice; #ifndef CPPPARSER_NO_CHILDREN - TQPtrList<AST> m_children; + TQPtrList<AST> m_tqchildren; #endif TQString m_comment; @@ -830,7 +830,7 @@ public: class ParameterDeclarationClauseAST* parameterDeclarationClause() { return m_parameterDeclarationClause.get(); } void setParameterDeclarationClause( AUTO_PTR<class ParameterDeclarationClauseAST>& parameterDeclarationClause ); - // ### replace 'constant' with cvQualify + // ### tqreplace 'constant' with cvQualify AST* constant() { return m_constant.get(); } void setConstant( AST::Node& constant ); diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp index 45cfd8ed..ac33d165 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp @@ -35,8 +35,8 @@ AST* findNodeAt( AST* node, int line, int column ) if( (line > startLine || (line == startLine && column >= startColumn)) && (line < endLine || (line == endLine && column < endColumn)) ){ - TQPtrList<AST> children = node->children(); - TQPtrListIterator<AST> it( children ); + TQPtrList<AST> tqchildren = node->tqchildren(); + TQPtrListIterator<AST> it( tqchildren ); while( it.current() ){ AST* a = it.current(); ++it; @@ -57,8 +57,8 @@ void scopeOfNode( AST* ast, TQStringList& scope ) if( !ast ) return; - if( ast->parent() ) - scopeOfNode( ast->parent(), scope ); + if( ast->tqparent() ) + scopeOfNode( ast->tqparent(), scope ); TQString s; switch( ast->nodeType() ) @@ -66,7 +66,7 @@ void scopeOfNode( AST* ast, TQStringList& scope ) case NodeType_ClassSpecifier: if( ((ClassSpecifierAST*)ast)->name() ){ s = ((ClassSpecifierAST*)ast)->name()->text(); - s = s.isEmpty() ? TQString::fromLatin1("<unnamed>") : s; + s = s.isEmpty() ? TQString::tqfromLatin1("<unnamed>") : s; scope.push_back( s ); } break; @@ -74,7 +74,7 @@ void scopeOfNode( AST* ast, TQStringList& scope ) case NodeType_Namespace: { AST* namespaceName = ((NamespaceAST*)ast)->namespaceName(); - s = namespaceName ? namespaceName->text() : TQString::fromLatin1("<unnamed>"); + s = namespaceName ? namespaceName->text() : TQString::tqfromLatin1("<unnamed>"); scope.push_back( s ); } break; @@ -108,15 +108,15 @@ void scopeOfNode( AST* ast, TQStringList& scope ) TQString typeSpecToString( TypeSpecifierAST* typeSpec ) /// @todo remove { if( !typeSpec ) - return TQString::null; + return TQString(); - return typeSpec->text().replace( TQRegExp(" :: "), "::" ); + return typeSpec->text().tqreplace( TQRegExp(" :: "), "::" ); } TQString declaratorToString( DeclaratorAST* declarator, const TQString& scope, bool skipPtrOp ) { if( !declarator ) - return TQString::null; + return TQString(); TQString text; @@ -131,7 +131,7 @@ TQString declaratorToString( DeclaratorAST* declarator, const TQString& scope, b text += scope; if( declarator->subDeclarator() ) - text += TQString::fromLatin1("(") + declaratorToString(declarator->subDeclarator()) + TQString::fromLatin1(")"); + text += TQString::tqfromLatin1("(") + declaratorToString(declarator->subDeclarator()) + TQString::tqfromLatin1(")"); if( declarator->declaratorId() ) text += declarator->declaratorId()->text(); @@ -171,6 +171,6 @@ TQString declaratorToString( DeclaratorAST* declarator, const TQString& scope, b text += " const"; } - return text.replace( TQRegExp(" :: "), "::" ).simplifyWhiteSpace(); + return text.tqreplace( TQRegExp(" :: "), "::" ).simplifyWhiteSpace(); } diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.h b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.h index 312a0c44..1f6209db 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.h +++ b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.h @@ -24,6 +24,6 @@ namespace KTextEditor{ class EditInterface; } AST* findNodeAt( AST* unit, int line, int column ); void scopeOfNode( AST* ast, TQStringList& ); TQString typeSpecToString( TypeSpecifierAST* typeSpec ); -TQString declaratorToString( DeclaratorAST* declarator, const TQString& scope = TQString::null, bool skipPtrOp=false ); +TQString declaratorToString( DeclaratorAST* declarator, const TQString& scope = TQString(), bool skipPtrOp=false ); #endif // __ast_utils_h diff --git a/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.cpp b/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.cpp index 5763ec5e..f8e6c475 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.cpp @@ -150,7 +150,7 @@ void CppTree2Uml::parseTypedef( TypedefAST* ast ) */ bool isDatatype = Import_Utils::isDatatype(typeId, m_currentNamespace[m_nsCnt]); - if (type.contains('*') || isDatatype) { + if (type.tqcontains('*') || isDatatype) { UMLObject *inner = Import_Utils::createUMLObject( Uml::ot_Class, typeId, m_currentNamespace[m_nsCnt] ); @@ -300,7 +300,7 @@ void CppTree2Uml::parseFunctionDefinition( FunctionDefinitionAST* ast ) UMLOperation *m = Import_Utils::makeOperation(c, id); // if a class has no return type, it could be a constructor or // a destructor - if (d && returnType.isEmpty() && id.find("~") == -1) + if (d && returnType.isEmpty() && id.tqfind("~") == -1) isConstructor = true; parseFunctionArguments( d, m ); @@ -530,7 +530,7 @@ void CppTree2Uml::parseFunctionDeclaration( GroupAST* funSpec, GroupAST* storag UMLOperation *m = Import_Utils::makeOperation(c, id); // if a class has no return type, it could be a constructor or // a destructor - if (d && returnType.isEmpty() && id.find("~") == -1) + if (d && returnType.isEmpty() && id.tqfind("~") == -1) isConstructor = true; parseFunctionArguments( d, m ); @@ -554,7 +554,7 @@ void CppTree2Uml::parseFunctionArguments(DeclaratorAST* declarator, TQString name; if (param->declarator()) - name = declaratorToString(param->declarator(), TQString::null, true ); + name = declaratorToString(param->declarator(), TQString(), true ); TQString tp = typeOfDeclaration( param->typeSpec(), param->declarator() ); @@ -567,7 +567,7 @@ void CppTree2Uml::parseFunctionArguments(DeclaratorAST* declarator, TQString CppTree2Uml::typeOfDeclaration( TypeSpecifierAST* typeSpec, DeclaratorAST* declarator ) { if( !typeSpec || !declarator ) - return TQString::null; + return TQString(); TQString text; diff --git a/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.h b/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.h index 7248c782..b97c7ced 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.h +++ b/umbrello/umbrello/codeimport/kdevcppparser/cpptree2uml.h @@ -33,21 +33,21 @@ public: virtual void parseTranslationUnit( TranslationUnitAST* ); // declarations - //virtual void parseDeclaration( DeclarationAST* ); // use parent method - //virtual void parseLinkageSpecification( LinkageSpecificationAST* ); // use parent method + //virtual void parseDeclaration( DeclarationAST* ); // use tqparent method + //virtual void parseLinkageSpecification( LinkageSpecificationAST* ); // use tqparent method virtual void parseNamespace( NamespaceAST* ); - //virtual void parseNamespaceAlias( NamespaceAliasAST* ); // use parent method - //virtual void parseUsing( UsingAST* ); // use parent method - //virtual void parseUsingDirective( UsingDirectiveAST* ); // use parent method + //virtual void parseNamespaceAlias( NamespaceAliasAST* ); // use tqparent method + //virtual void parseUsing( UsingAST* ); // use tqparent method + //virtual void parseUsingDirective( UsingDirectiveAST* ); // use tqparent method virtual void parseTypedef( TypedefAST* ); virtual void parseTemplateDeclaration( TemplateDeclarationAST* ); virtual void parseSimpleDeclaration( SimpleDeclarationAST* ); virtual void parseFunctionDefinition( FunctionDefinitionAST* ); - //virtual void parseLinkageBody( LinkageBodyAST* ); // use parent method + //virtual void parseLinkageBody( LinkageBodyAST* ); // use tqparent method virtual void parseAccessDeclaration( AccessDeclarationAST* ); // type-specifier - //virtual void parseTypeSpecifier( TypeSpecifierAST* ); // use parent method + //virtual void parseTypeSpecifier( TypeSpecifierAST* ); // use tqparent method virtual void parseClassSpecifier( ClassSpecifierAST* ); virtual void parseEnumSpecifier( EnumSpecifierAST* ); virtual void parseElaboratedTypeSpecifier( ElaboratedTypeSpecifierAST* ); diff --git a/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp b/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp index 1a804c81..030f7f2b 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp @@ -100,7 +100,7 @@ void Driver::remove( const TQString & fileName ) m_problems.remove( fileName ); removeAllMacrosInFile( fileName ); - TQMap<TQString, TranslationUnitAST*>::Iterator it = m_parsedUnits.find( fileName ); + TQMap<TQString, TranslationUnitAST*>::Iterator it = m_parsedUnits.tqfind( fileName ); if( it != m_parsedUnits.end() ){ TranslationUnitAST* unit = *it; m_parsedUnits.remove( it ); @@ -120,7 +120,7 @@ void Driver::removeAllMacrosInFile( const TQString& fileName ) TranslationUnitAST::Node Driver::takeTranslationUnit( const TQString& fileName ) { - TQMap<TQString, TranslationUnitAST*>::Iterator it = m_parsedUnits.find( fileName ); + TQMap<TQString, TranslationUnitAST*>::Iterator it = m_parsedUnits.tqfind( fileName ); TranslationUnitAST::Node unit( *it ); //m_parsedUnits.remove( it ); m_parsedUnits[ fileName] = 0; @@ -129,7 +129,7 @@ TranslationUnitAST::Node Driver::takeTranslationUnit( const TQString& fileName ) TranslationUnitAST* Driver::translationUnit( const TQString& fileName ) const { - TQMap<TQString, TranslationUnitAST*>::ConstIterator it = m_parsedUnits.find( fileName ); + TQMap<TQString, TranslationUnitAST*>::ConstIterator it = m_parsedUnits.tqfind( fileName ); return it != m_parsedUnits.end() ? *it : 0; } @@ -146,7 +146,7 @@ void Driver::addDependence( const TQString & fileName, const Dependence & dep ) TQString file = findIncludeFile( dep ); findOrInsertDependenceList( fileName ).insert( file, dep ); - if ( m_parsedUnits.find(file) != m_parsedUnits.end() ) + if ( m_parsedUnits.tqfind(file) != m_parsedUnits.end() ) return; if ( !TQFile::exists( file ) ) { @@ -176,7 +176,7 @@ void Driver::addProblem( const TQString & fileName, const Problem & problem ) TQMap< TQString, Dependence >& Driver::findOrInsertDependenceList( const TQString & fileName ) { - TQMap<TQString, TQMap<TQString, Dependence> >::Iterator it = m_dependences.find( fileName ); + TQMap<TQString, TQMap<TQString, Dependence> >::Iterator it = m_dependences.tqfind( fileName ); if( it != m_dependences.end() ) return it.data(); @@ -187,7 +187,7 @@ TQMap< TQString, Dependence >& Driver::findOrInsertDependenceList( const TQStrin TQValueList < Problem >& Driver::findOrInsertProblemList( const TQString & fileName ) { - TQMap<TQString, TQValueList<Problem> >::Iterator it = m_problems.find( fileName ); + TQMap<TQString, TQValueList<Problem> >::Iterator it = m_problems.tqfind( fileName ); if( it != m_problems.end() ) return it.data(); @@ -198,7 +198,7 @@ TQValueList < Problem >& Driver::findOrInsertProblemList( const TQString & fileN TQMap< TQString, Dependence > Driver::dependences( const TQString & fileName ) const { - TQMap<TQString, TQMap<TQString, Dependence> >::ConstIterator it = m_dependences.find( fileName ); + TQMap<TQString, TQMap<TQString, Dependence> >::ConstIterator it = m_dependences.tqfind( fileName ); if( it != m_dependences.end() ) return it.data(); return TQMap<TQString, Dependence>(); @@ -211,7 +211,7 @@ TQMap< TQString, Macro > Driver::macros() const TQValueList < Problem > Driver::problems( const TQString & fileName ) const { - TQMap<TQString, TQValueList<Problem> >::ConstIterator it = m_problems.find( fileName ); + TQMap<TQString, TQValueList<Problem> >::ConstIterator it = m_problems.tqfind( fileName ); if( it != m_problems.end() ) return it.data(); return TQValueList<Problem>(); @@ -222,7 +222,7 @@ void Driver::parseFile( const TQString& fileName, bool onlyPreProcess, bool forc TQFileInfo fileInfo( fileName ); TQString absFilePath = fileInfo.absFilePath(); - TQMap<TQString, TranslationUnitAST*>::Iterator it = m_parsedUnits.find( absFilePath ); + TQMap<TQString, TranslationUnitAST*>::Iterator it = m_parsedUnits.tqfind( absFilePath ); if( force && it != m_parsedUnits.end() ){ takeTranslationUnit( absFilePath ); @@ -252,7 +252,7 @@ void Driver::parseFile( const TQString& fileName, bool onlyPreProcess, bool forc fileParsed( fileName ); } - m_currentFileName = TQString::null; + m_currentFileName = TQString(); lexer = 0; } @@ -325,26 +325,26 @@ void Driver::setupLexer( Lexer * lexer ) lexer->addSkipWord( "KDE_DEPRECATED" ); // qt - lexer->addSkipWord( "Q_OVERRIDE", SkipWordAndArguments ); + lexer->addSkipWord( "TQ_OVERRIDE", SkipWordAndArguments ); lexer->addSkipWord( "Q_ENUMS", SkipWordAndArguments ); - lexer->addSkipWord( "Q_PROPERTY", SkipWordAndArguments ); - lexer->addSkipWord( "Q_CLASSINFO", SkipWordAndArguments ); - lexer->addSkipWord( "Q_SETS", SkipWordAndArguments ); + lexer->addSkipWord( "TQ_PROPERTY", SkipWordAndArguments ); + lexer->addSkipWord( "TQ_CLASSINFO", SkipWordAndArguments ); + lexer->addSkipWord( "TQ_SETS", SkipWordAndArguments ); lexer->addSkipWord( "Q_UNUSED", SkipWordAndArguments ); - lexer->addSkipWord( "Q_CREATE_INSTANCE", SkipWordAndArguments ); - lexer->addSkipWord( "Q_DUMMY_COMPARISON_OPERATOR", SkipWordAndArguments ); + lexer->addSkipWord( "TQ_CREATE_INSTANCE", SkipWordAndArguments ); + lexer->addSkipWord( "TQ_DUMMY_COMPARISON_OPERATOR", SkipWordAndArguments ); lexer->addSkipWord( "ACTIVATE_SIGNAL_WITH_PARAM", SkipWordAndArguments ); - lexer->addSkipWord( "Q_INLINE_TEMPLATES" ); - lexer->addSkipWord( "Q_TEMPLATE_EXTERN" ); - lexer->addSkipWord( "Q_TYPENAME" ); - lexer->addSkipWord( "Q_REFCOUNT" ); - lexer->addSkipWord( "Q_EXPLICIT" ); - lexer->addSkipWord( "QMAC_PASCAL" ); + lexer->addSkipWord( "TQ_INLINE_TEMPLATES" ); + lexer->addSkipWord( "TQ_TEMPLATE_EXTERN" ); + lexer->addSkipWord( "TQ_TYPENAME" ); + lexer->addSkipWord( "TQ_REFCOUNT" ); + lexer->addSkipWord( "TQ_EXPLICIT" ); + lexer->addSkipWord( "TQMAC_PASCAL" ); lexer->addSkipWord( "QT_STATIC_CONST" ); lexer->addSkipWord( "QT_STATIC_CONST_IMPL" ); - lexer->addSkipWord( "QT_WIN_PAINTER_MEMBERS" ); - lexer->addSkipWord( "QT_NC_MSGBOX" ); - lexer->addSkipWord( "Q_VARIANT_AS", SkipWordAndArguments ); + lexer->addSkipWord( "TQT_WIN_PAINTER_MEMBERS" ); + lexer->addSkipWord( "TQT_NC_MSGBOX" ); + lexer->addSkipWord( "TQ_VARIANT_AS", SkipWordAndArguments ); lexer->addSkipWord( "CALLBACK_CALL_TYPE" ); // flex @@ -415,7 +415,7 @@ TQString Driver::findIncludeFile( const Dependence& dep ) const return fileInfo.absFilePath(); } - return TQString::null; + return TQString(); } void Driver::setResolveDependencesEnabled( bool enabled ) diff --git a/umbrello/umbrello/codeimport/kdevcppparser/driver.h b/umbrello/umbrello/codeimport/kdevcppparser/driver.h index 6c53a939..5a300745 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/driver.h +++ b/umbrello/umbrello/codeimport/kdevcppparser/driver.h @@ -81,7 +81,7 @@ enum Dep_Local }; -typedef QPair<TQString, int> Dependence; +typedef TQPair<TQString, int> Dependence; class Macro { @@ -185,7 +185,7 @@ public: TQMap<TQString, Macro> macros() const; TQValueList<Problem> problems( const TQString& fileName ) const; - bool hasMacro( const TQString& name ) const { return m_macros.contains( name ); } + bool hasMacro( const TQString& name ) const { return m_macros.tqcontains( name ); } const Macro& macro( const TQString& name ) const { return m_macros[ name ]; } Macro& macro( const TQString& name ) { return m_macros[ name ]; } diff --git a/umbrello/umbrello/codeimport/kdevcppparser/keywords.lut.h b/umbrello/umbrello/codeimport/kdevcppparser/keywords.lut.h index 5c276953..1969fdb7 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/keywords.lut.h +++ b/umbrello/umbrello/codeimport/kdevcppparser/keywords.lut.h @@ -15,7 +15,7 @@ static const struct HashEntry keywordEntries[] = { { "k_dcop_signals", Token_k_dcop_signals, 0, 0, &keywordEntries[104] }, { "auto", Token_auto, 0, 0, &keywordEntries[91] }, { 0, 0, 0, 0, 0 }, - { "Q_OBJECT", Token_Q_OBJECT, 0, 0, &keywordEntries[86] }, + { "TQ_OBJECT", Token_TQ_OBJECT, 0, 0, &keywordEntries[86] }, { "and_eq", Token_and_eq, 0, 0, 0 }, { 0, 0, 0, 0, 0 }, { "operator", Token_operator, 0, 0, 0 }, diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp index 11b326f6..270c3d87 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/lexer.cpp @@ -31,7 +31,7 @@ #if defined( KDEVELOP_BGPARSER ) #include <tqthread.h> -class KDevTread: public QThread +class KDevTread: public TQThread { public: static void yield() @@ -83,7 +83,7 @@ struct LexerData const Scope& scope = *it; ++it; - if( scope.contains(name) ) + if( scope.tqcontains(name) ) return true; } @@ -97,11 +97,11 @@ struct LexerData const Scope& scope = *it; ++it; - if( scope.contains(name) ) + if( scope.tqcontains(name) ) return scope[ name ]; } - return TQString::null; + return TQString(); } }; @@ -143,7 +143,7 @@ void Lexer::reset() m_index = 0; m_size = 0; m_tokens.clear(); - m_source = TQString::null; + m_source = TQString(); m_ptr = 0; m_endPtr = 0; m_startLine = false; @@ -175,7 +175,7 @@ int Lexer::toInt( const Token& token ) int i = s[0] == 'L' ? 2 : 1; // wide char ? if( s[i] == '\\' ){ // escaped char - int c = s[i+1].unicode(); + int c = s[i+1].tqunicode(); switch( c ) { case '0': return 0; @@ -186,7 +186,7 @@ int Lexer::toInt( const Token& token ) return c; } } else { - return s[i].unicode(); + return s[i].tqunicode(); } } else { return 0; @@ -273,7 +273,7 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline ) int start = currentPosition(); readIdentifier(); TQString ide = m_source.mid( start, currentPosition() - start ); - int k = Lookup::find( &keyword, ide ); + int k = Lookup::tqfind( &keyword, ide ); if( m_preprocessorEnabled && m_driver->hasMacro(ide) && (k == -1 || !m_driver->macro(ide).body().isEmpty()) ){ @@ -374,21 +374,21 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline ) TQString tokText = tok.text(); TQString str = (tok == Token_identifier && d->hasBind(tokText)) ? d->apply( tokText ) : tokText; if( str == ide ){ - //Problem p( i18n("unsafe use of macro '%1'").arg(ide), m_currentLine, m_currentColumn ); + //Problem p( i18n("unsafe use of macro '%1'").tqarg(ide), m_currentLine, m_currentColumn ); //m_driver->addProblem( m_driver->currentFileName(), p ); m_driver->removeMacro( ide ); - // str = TQString::null; + // str = TQString(); } if( stringify ) { - textToInsert.append( TQString::fromLatin1("\"") + str + TQString::fromLatin1("\" ") ); + textToInsert.append( TQString::tqfromLatin1("\"") + str + TQString::tqfromLatin1("\" ") ); } else if( merge ){ textToInsert.truncate( textToInsert.length() - 1 ); textToInsert.append( str ); } else if( tok == Token_ellipsis && d->hasBind("...") ){ textToInsert.append( ellipsisArg ); } else { - textToInsert.append( str + TQString::fromLatin1(" ") ); + textToInsert.append( str + TQString::tqfromLatin1(" ") ); } } @@ -408,7 +408,7 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline ) tk.setStartPosition( startLine, startColumn ); tk.setEndPosition( m_currentLine, m_currentColumn ); } else if( m_skipWordsEnabled ){ - TQMap< TQString, QPair<SkipType, TQString> >::Iterator pos = m_words.find( ide ); + TQMap< TQString, TQPair<SkipType, TQString> >::Iterator pos = m_words.tqfind( ide ); if( pos != m_words.end() ){ if( (*pos).first == SkipWordAndArguments ){ readWhiteSpaces(); @@ -424,9 +424,9 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline ) } } else if( /*qt_rx.exactMatch(ide) ||*/ ide.endsWith("EXPORT") || - (ide.startsWith("Q_EXPORT") && ide != "Q_EXPORT_INTERFACE") || - ide.startsWith("QM_EXPORT") || - ide.startsWith("QM_TEMPLATE")){ + (ide.startsWith("TQ_EXPORT") && ide != "TQ_EXPORT_INTERFACE") || + ide.startsWith("TQM_EXPORT") || + ide.startsWith("TQM_TEMPLATE")){ readWhiteSpaces(); if( currentChar() == '(' ) @@ -465,7 +465,7 @@ void Lexer::nextToken( Token& tk, bool stopOnNewline ) tk.setStartPosition( startLine, startColumn ); tk.setEndPosition( m_currentLine, m_currentColumn ); } else { - tk = CREATE_TOKEN( ch.unicode(), currentPosition(), 1 ); + tk = CREATE_TOKEN( ch.tqunicode(), currentPosition(), 1 ); nextChar(); tk.setStartPosition( startLine, startColumn ); tk.setEndPosition( m_currentLine, m_currentColumn ); @@ -504,7 +504,7 @@ void Lexer::resetSkipWords() void Lexer::addSkipWord( const TQString& word, SkipType skipType, const TQString& str ) { - m_words[ word ] = qMakePair( skipType, str ); + m_words[ word ] = tqMakePair( skipType, str ); } void Lexer::skip( int l, int r ) @@ -808,7 +808,7 @@ int Lexer::macroPrimary() { readWhiteSpaces( false ); int result = 0; - switch( currentChar().unicode() ) { + switch( currentChar().tqunicode() ) { case '(': nextChar(); result = macroExpression(); @@ -996,7 +996,7 @@ int Lexer::macroExpression() } // *IMPORTANT* -// please, don't include lexer.moc here, because Lexer isn't a TQObject class!! +// please, don't include lexer.tqmoc here, because Lexer isn't a TQObject class!! // if you have problem while recompiling try to remove cppsupport/.deps, // cppsupport/Makefile.in and rerun automake/autoconf diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lexer.h b/umbrello/umbrello/codeimport/kdevcppparser/lexer.h index 4851c183..541626d4 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/lexer.h +++ b/umbrello/umbrello/codeimport/kdevcppparser/lexer.h @@ -56,7 +56,7 @@ enum Type { Token_k_dcop, Token_k_dcop_signals, - Token_Q_OBJECT, + Token_TQ_OBJECT, Token_signals, Token_slots, Token_emit, @@ -212,7 +212,7 @@ public: void setPreprocessorEnabled( bool enabled ); void resetSkipWords(); - void addSkipWord( const TQString& word, SkipType skipType=SkipWord, const TQString& str = TQString::null ); + void addSkipWord( const TQString& word, SkipType skipType=SkipWord, const TQString& str = TQString() ); TQString source() const; void setSource( const TQString& source ); @@ -296,7 +296,7 @@ private: bool m_recordComments; bool m_recordWhiteSpaces; bool m_startLine; - TQMap< TQString, QPair<SkipType, TQString> > m_words; + TQMap< TQString, TQPair<SkipType, TQString> > m_words; int m_currentLine; int m_currentColumn; @@ -485,12 +485,12 @@ inline const Token& Lexer::nextToken() inline const Token& Lexer::tokenAt( int n ) const { - return *m_tokens[ QMIN(n, m_size-1) ]; + return *m_tokens[ TQMIN(n, m_size-1) ]; } inline const Token& Lexer::lookAhead( int n ) const { - return *m_tokens[ QMIN(m_index + n, m_size-1) ]; + return *m_tokens[ TQMIN(m_index + n, m_size-1) ]; } inline int Lexer::tokenPosition( const Token& token ) const diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp b/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp index f46b9270..fad6627a 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/lookup.cpp @@ -71,10 +71,10 @@ const HashEntry* Lookup::findEntry( const struct HashTable *table, const HashEntry* Lookup::findEntry( const struct HashTable *table, const TQString &s ) { - return findEntry( table, s.unicode(), s.length() ); + return findEntry( table, s.tqunicode(), s.length() ); } -int Lookup::find(const struct HashTable *table, +int Lookup::tqfind(const struct HashTable *table, const TQChar *c, unsigned int len) { const HashEntry *entry = findEntry( table, c, len ); @@ -83,9 +83,9 @@ int Lookup::find(const struct HashTable *table, return -1; } -int Lookup::find(const struct HashTable *table, const TQString &s) +int Lookup::tqfind(const struct HashTable *table, const TQString &s) { - return find(table, s.unicode(), s.length()); + return tqfind(table, s.tqunicode(), s.length()); } unsigned int Lookup::hash(const TQChar *c, unsigned int len) @@ -100,7 +100,7 @@ unsigned int Lookup::hash(const TQChar *c, unsigned int len) unsigned int Lookup::hash(const TQString &key) { - return hash(key.unicode(), key.length()); + return hash(key.tqunicode(), key.length()); } unsigned int Lookup::hash(const char *s) diff --git a/umbrello/umbrello/codeimport/kdevcppparser/lookup.h b/umbrello/umbrello/codeimport/kdevcppparser/lookup.h index b2bad4de..c8a07dab 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/lookup.h +++ b/umbrello/umbrello/codeimport/kdevcppparser/lookup.h @@ -95,8 +95,8 @@ /** * Find an entry in the table, and return its value (i.e. the value field of HashEntry) */ - static int find(const struct HashTable *table, const TQString& s); - static int find(const struct HashTable *table, const TQChar *c, unsigned int len); + static int tqfind(const struct HashTable *table, const TQString& s); + static int tqfind(const struct HashTable *table, const TQChar *c, unsigned int len); /** * Find an entry in the table, and return the entry diff --git a/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp b/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp index 9b93384c..89b0852a 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp @@ -37,7 +37,7 @@ using namespace std; { \ const Token& token = lex->lookAhead( 0 ); \ if( token != tk ){ \ - reportError( i18n("'%1' expected found '%2'").arg(descr).arg(token.text()) ); \ + reportError( i18n("'%1' expected found '%2'").tqarg(descr).tqarg(token.text()) ); \ return false; \ } \ lex->nextToken(); \ @@ -47,7 +47,7 @@ using namespace std; { \ const Token& token = lex->lookAhead( 0 ); \ if( token != tk ){ \ - reportError( i18n("'%1' expected found '%2'").arg(descr).arg(token.text()) ); \ + reportError( i18n("'%1' expected found '%2'").tqarg(descr).tqarg(token.text()) ); \ } \ else \ lex->nextToken(); \ @@ -137,7 +137,7 @@ bool Parser::reportError( const Error& err ) if( s.isEmpty() ) s = i18n( "<eof>" ); - m_driver->addProblem( m_driver->currentFileName(), Problem(err.text.arg(s), line, col) ); + m_driver->addProblem( m_driver->currentFileName(), Problem(err.text.tqarg(s), line, col) ); } return true; @@ -213,8 +213,8 @@ bool Parser::skipUntilDeclaration() case Token_public: case Token_protected: case Token_private: - case Token_signals: // Qt - case Token_slots: // Qt + case Token_signals: // TQt + case Token_slots: // TQt return true; case '}': @@ -316,7 +316,7 @@ bool Parser::skipCommaExpression( AST::Node& node ) TQString comment; while( lex->lookAhead(0) == ',' ){ - comment = TQString::null; + comment = TQString(); advanceAndCheckTrailingComment( comment ); if( !skipExpression(expr) ){ @@ -832,7 +832,7 @@ bool Parser::parseTemplateArgumentList( TemplateArgumentListAST::Node& node, boo TQString comment; while( lex->lookAhead(0) == ',' ){ - comment = TQString::null; + comment = TQString(); advanceAndCheckTrailingComment( comment ); if( !parseTemplateArgument(templArg) ){ @@ -1474,7 +1474,7 @@ bool Parser::parseTemplateParameterList( TemplateParameterListAST::Node& node ) TQString comment; while( lex->lookAhead(0) == ',' ){ - comment = TQString::null; + comment = TQString(); advanceAndCheckTrailingComment( comment ); if( !parseTemplateParameter(param) ){ @@ -1779,7 +1779,7 @@ bool Parser::parseParameterDeclarationList( ParameterDeclarationListAST::Node& n TQString comment; while( lex->lookAhead(0) == ',' ){ - comment = TQString::null; + comment = TQString(); advanceAndCheckTrailingComment( comment ); if( lex->lookAhead(0) == Token_ellipsis ) @@ -1980,7 +1980,7 @@ bool Parser::parseMemberSpecification( DeclarationAST::Node& node ) if ( !comment.isEmpty() ) node->setComment( comment ); return true; - } else if( lex->lookAhead(0) == Token_Q_OBJECT || lex->lookAhead(0) == Token_K_DCOP ){ + } else if( lex->lookAhead(0) == Token_TQ_OBJECT || lex->lookAhead(0) == Token_K_DCOP ){ lex->nextToken(); return true; } else if( lex->lookAhead(0) == Token_signals || lex->lookAhead(0) == Token_k_dcop || lex->lookAhead(0) == Token_k_dcop_signals ){ @@ -2228,7 +2228,7 @@ bool Parser::parseBaseClause( BaseClauseAST::Node& node ) TQString comment; while( lex->lookAhead(0) == ',' ){ - comment = TQString::null; + comment = TQString(); advanceAndCheckTrailingComment( comment ); if( !parseBaseSpecifier(baseSpec) ){ @@ -2282,7 +2282,7 @@ bool Parser::parseMemInitializerList( AST::Node& /*node*/ ) TQString comment; while( lex->lookAhead(0) == ',' ){ - comment = TQString::null; + comment = TQString(); advanceAndCheckTrailingComment( comment ); if( parseMemInitializer(init) ){ @@ -2327,7 +2327,7 @@ bool Parser::parseTypeIdList( GroupAST::Node& node ) TQString comment; while( lex->lookAhead(0) == ',' ){ - comment = TQString::null; + comment = TQString(); advanceAndCheckTrailingComment( comment ); if( parseTypeId(typeId) ){ if (!comment.isEmpty()) @@ -3904,7 +3904,7 @@ bool Parser::parseCommaExpression( AST::Node& node ) TQString comment; while( lex->lookAhead(0) == ',' ){ - comment = TQString::null; + comment = TQString(); advanceAndCheckTrailingComment( comment ); if( !parseAssignmentExpression(expr) ) @@ -4110,7 +4110,7 @@ bool Parser::parseIdentifierList( GroupAST::Node & node ) TQString comment; while( lex->lookAhead(0) == ',' ){ - comment = TQString::null; + comment = TQString(); advanceAndCheckTrailingComment( comment ); if( lex->lookAhead(0) == Token_identifier ){ AST_FROM_TOKEN( tk, lex->index() ); diff --git a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp index 5235bc3c..5cd28356 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.cpp @@ -40,42 +40,42 @@ /////////////////////////////////////////////////////////////////////////////// TQString URLUtil::filename(const TQString & name) { - int slashPos = name.findRev("/"); + int slashPos = name.tqfindRev("/"); return slashPos<0 ? name : name.mid(slashPos+1); } /////////////////////////////////////////////////////////////////////////////// TQString URLUtil::directory(const TQString & name) { - int slashPos = name.findRev("/"); + int slashPos = name.tqfindRev("/"); return slashPos<0 ? TQString("") : name.left(slashPos); } /////////////////////////////////////////////////////////////////////////////// -TQString URLUtil::relativePath(const KURL & parent, const KURL & child, uint slashPolicy) { +TQString URLUtil::relativePath(const KURL & tqparent, const KURL & child, uint slashPolicy) { bool slashPrefix = slashPolicy & SLASH_PREFIX; bool slashSuffix = slashPolicy & SLASH_SUFFIX; - if (parent == child) + if (tqparent == child) return slashPrefix ? TQString("/") : TQString(""); - if (!parent.isParentOf(child)) return TQString(); + if (!tqparent.isParentOf(child)) return TQString(); int a=slashPrefix ? -1 : 1; int b=slashSuffix ? 1 : -1; - return child.path(b).mid(parent.path(a).length()); + return child.path(b).mid(tqparent.path(a).length()); } /////////////////////////////////////////////////////////////////////////////// -TQString URLUtil::relativePath(const TQString & parent, const TQString & child, uint slashPolicy) { - return relativePath(KURL(parent), KURL(child), slashPolicy); +TQString URLUtil::relativePath(const TQString & tqparent, const TQString & child, uint slashPolicy) { + return relativePath(KURL(tqparent), KURL(child), slashPolicy); } /////////////////////////////////////////////////////////////////////////////// TQString URLUtil::upDir(const TQString & path, bool slashSuffix) { - int slashPos = path.findRev("/"); - if (slashPos<1) return TQString::null; + int slashPos = path.tqfindRev("/"); + if (slashPos<1) return TQString(); return path.mid(0,slashPos+ (slashSuffix ? 1 : 0) ); } @@ -103,7 +103,7 @@ KURL URLUtil::mergeURL(const KURL & source, const KURL & dest, const KURL & chil /////////////////////////////////////////////////////////////////////////////// TQString URLUtil::getExtension(const TQString & path) { - int dotPos = path.findRev('.'); + int dotPos = path.tqfindRev('.'); if (dotPos<0) return TQString(""); return path.mid(dotPos+1); } @@ -114,7 +114,7 @@ TQString URLUtil::extractPathNameRelative(const KURL &baseDirUrl, const KURL &ur { TQString absBase = extractPathNameAbsolute( baseDirUrl ), absRef = extractPathNameAbsolute( url ); - int i = absRef.find( absBase, 0, true ); + int i = absRef.tqfind( absBase, 0, true ); if (i == -1) return TQString(); @@ -122,7 +122,7 @@ TQString URLUtil::extractPathNameRelative(const KURL &baseDirUrl, const KURL &ur if (absRef == absBase) return TQString( "." ); else - return absRef.replace( 0, absBase.length(), TQString() ); + return absRef.tqreplace( 0, absBase.length(), TQString() ); } /////////////////////////////////////////////////////////////////////////////// @@ -289,12 +289,12 @@ TQString URLUtil::envExpand ( const TQString& str ) if (len > 1 && str[0] == '$') { - int pos = str.find ('/'); + int pos = str.tqfind ('/'); if (pos < 0) pos = len; - char* ret = getenv( TQConstString(str.unicode()+1, pos-1).string().local8Bit().data() ); + char* ret = getenv( TQConstString(str.tqunicode()+1, pos-1).string().local8Bit().data() ); if (ret) { diff --git a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.h b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.h index 75486983..d243ddbd 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/urlutil.h +++ b/umbrello/umbrello/codeimport/kdevcppparser/urlutil.h @@ -38,13 +38,13 @@ namespace URLUtil */ TQString directory(const TQString & pathName); /** - * Returns the relative path between a parent and child URL, or blank if the specified child is not a child of parent + * Returns the relative path between a tqparent and child URL, or blank if the specified child is not a child of tqparent */ - TQString relativePath(const KURL & parent, const KURL & child, uint slashPolicy = SLASH_PREFIX); + TQString relativePath(const KURL & tqparent, const KURL & child, uint slashPolicy = SLASH_PREFIX); /** - * Returns the relative path between a parent and child URL, or blank if the specified child is not a child of parent + * Returns the relative path between a tqparent and child URL, or blank if the specified child is not a child of tqparent */ - TQString relativePath(const TQString & parent, const TQString & child, uint slashPolicy = SLASH_PREFIX); + TQString relativePath(const TQString & tqparent, const TQString & child, uint slashPolicy = SLASH_PREFIX); /** * Returns the relative path between a directory and file. Should never return empty path. * Example: @@ -110,7 +110,7 @@ namespace URLUtil * Will dump the list of KURL @p urls on standard output, eventually printing @ aMessage if it * is not null. */ - void dump( const KURL::List &urls, const TQString &aMessage = TQString::null ); + void dump( const KURL::List &urls, const TQString &aMessage = TQString() ); /** * Same as TQDir::canonicalPath in later versions of QT. Earlier versions of QT diff --git a/umbrello/umbrello/codeimport/nativeimportbase.cpp b/umbrello/umbrello/codeimport/nativeimportbase.cpp index b2f7dac3..925e397a 100644 --- a/umbrello/umbrello/codeimport/nativeimportbase.cpp +++ b/umbrello/umbrello/codeimport/nativeimportbase.cpp @@ -113,10 +113,10 @@ bool NativeImportBase::preprocess(TQString& line) { // Check for end of multi line comment. if (m_inComment) { int delimiterLen = 0; - int pos = line.find(m_multiLineCommentEnd); + int pos = line.tqfind(m_multiLineCommentEnd); if (pos == -1) { if (! m_multiLineAltCommentEnd.isEmpty()) - pos = line.find(m_multiLineAltCommentEnd); + pos = line.tqfind(m_multiLineAltCommentEnd); if (pos == -1) { m_comment += line + "\n"; return true; // done @@ -142,20 +142,20 @@ bool NativeImportBase::preprocess(TQString& line) { // Check for start of multi line comment. int delimIntroLen = 0; int delimEndLen = 0; - int pos = line.find(m_multiLineCommentIntro); + int pos = line.tqfind(m_multiLineCommentIntro); if (pos != -1) { delimIntroLen = m_multiLineCommentIntro.length(); } else if (!m_multiLineAltCommentIntro.isEmpty()) { - pos = line.find(m_multiLineAltCommentIntro); + pos = line.tqfind(m_multiLineAltCommentIntro); if (pos != -1) delimIntroLen = m_multiLineAltCommentIntro.length(); } if (pos != -1) { - int endpos = line.find(m_multiLineCommentEnd); + int endpos = line.tqfind(m_multiLineCommentEnd); if (endpos != -1) { delimEndLen = m_multiLineCommentEnd.length(); } else if (!m_multiLineAltCommentEnd.isEmpty()) { - endpos = line.find(m_multiLineAltCommentEnd); + endpos = line.tqfind(m_multiLineAltCommentEnd); if (endpos != -1) delimEndLen = m_multiLineAltCommentEnd.length(); } @@ -237,7 +237,7 @@ void NativeImportBase::scan(TQString line) { if (preprocess(line)) return; // Check for single line comment. - int pos = line.find(m_singleLineCommentIntro); + int pos = line.tqfind(m_singleLineCommentIntro); if (pos != -1) { TQString cmnt = line.mid(pos); m_source.append(cmnt); @@ -245,7 +245,7 @@ void NativeImportBase::scan(TQString line) { return; line = line.left(pos); } - if (line.contains(TQRegExp("^\\s*$"))) + if (line.tqcontains(TQRegExp("^\\s*$"))) return; TQStringList words = split(line); for (TQStringList::Iterator it = words.begin(); it != words.end(); ++it) { @@ -263,12 +263,12 @@ void NativeImportBase::initVars() { void NativeImportBase::parseFile(const TQString& filename) { TQString nameWithoutPath = filename; nameWithoutPath.remove(TQRegExp("^.*/")); - if (m_parsedFiles.contains(nameWithoutPath)) + if (m_parsedFiles.tqcontains(nameWithoutPath)) return; m_parsedFiles.append(nameWithoutPath); TQString fname = filename; const TQString msgPrefix = "NativeImportBase::parseFile(" + filename + "): "; - if (filename.contains('/')) { + if (filename.tqcontains('/')) { TQString path = filename; path.remove( TQRegExp("/[^/]+$") ); kDebug() << msgPrefix << "adding path " << path << endl; diff --git a/umbrello/umbrello/codeimport/nativeimportbase.h b/umbrello/umbrello/codeimport/nativeimportbase.h index 03a78a5c..292fd5d1 100644 --- a/umbrello/umbrello/codeimport/nativeimportbase.h +++ b/umbrello/umbrello/codeimport/nativeimportbase.h @@ -153,7 +153,7 @@ protected: /** * Advance m_srcIndex until m_source[m_srcIndex] contains a non-comment. * Comments encountered during advancement are accumulated in `m_comment'. - * If m_srcIndex hits the end of m_source then TQString::null is returned. + * If m_srcIndex hits the end of m_source then TQString() is returned. */ TQString advance(); diff --git a/umbrello/umbrello/codeimport/pascalimport.cpp b/umbrello/umbrello/codeimport/pascalimport.cpp index a769571d..f2358735 100644 --- a/umbrello/umbrello/codeimport/pascalimport.cpp +++ b/umbrello/umbrello/codeimport/pascalimport.cpp @@ -104,7 +104,7 @@ bool PascalImport::parseStmt() { continue; } TQString filename = unit + ".pas"; - if (! m_parsedFiles.contains(unit)) { + if (! m_parsedFiles.tqcontains(unit)) { // Save current m_source and m_srcIndex. TQStringList source(m_source); uint srcIndex = m_srcIndex; @@ -332,9 +332,9 @@ bool PascalImport::parseStmt() { do { TQString base = advance(); UMLObject *ns = Import_Utils::createUMLObject(Uml::ot_Class, base, NULL); - UMLClassifier *parent = static_cast<UMLClassifier*>(ns); + UMLClassifier *tqparent = static_cast<UMLClassifier*>(ns); m_comment = TQString(); - Import_Utils::createGeneralization(klass, parent); + Import_Utils::createGeneralization(klass, tqparent); } while (advance() == ","); if (m_source[m_srcIndex] != ")") { kError() << "PascalImport: expecting \")\" at " diff --git a/umbrello/umbrello/codeimport/pythonimport.cpp b/umbrello/umbrello/codeimport/pythonimport.cpp index 2436699a..cf7c0dae 100644 --- a/umbrello/umbrello/codeimport/pythonimport.cpp +++ b/umbrello/umbrello/codeimport/pythonimport.cpp @@ -45,7 +45,7 @@ bool PythonImport::preprocess(TQString& line) { if (NativeImportBase::preprocess(line)) return true; // Handle single line comment - int pos = line.find(m_singleLineCommentIntro); + int pos = line.tqfind(m_singleLineCommentIntro); if (pos != -1) { TQString cmnt = line.mid(pos); m_source.append(cmnt); @@ -56,11 +56,11 @@ bool PythonImport::preprocess(TQString& line) { line.remove( TQRegExp("\\s+$") ); } // Transform changes in indentation into braces a la C++/Java/Perl/... - pos = line.find( TQRegExp("\\S") ); + pos = line.tqfind( TQRegExp("\\S") ); if (pos == -1) return true; bool isContinuation = false; - int leadingWhite = line.left(pos).contains( TQRegExp("\\s") ); + int leadingWhite = line.left(pos).tqcontains( TQRegExp("\\s") ); if (leadingWhite > m_srcIndent[m_srcIndentIndex]) { if (m_srcIndex == 0) { kError() << "PythonImport::preprocess(): internal error 1" << endl; @@ -80,7 +80,7 @@ bool PythonImport::preprocess(TQString& line) { } } if (line.endsWith(":")) { - line.replace( TQRegExp(":$"), "{" ); + line.tqreplace( TQRegExp(":$"), "{" ); m_braceWasOpened = true; } else { m_braceWasOpened = false; diff --git a/umbrello/umbrello/codeimport/pythonimport.h b/umbrello/umbrello/codeimport/pythonimport.h index d5c62a91..41de3c01 100644 --- a/umbrello/umbrello/codeimport/pythonimport.h +++ b/umbrello/umbrello/codeimport/pythonimport.h @@ -62,7 +62,7 @@ protected: int m_srcIndent[100]; /** - * Index for m_srcIndent[]. Index 0 is reserved and contains 0. + * Index for m_srcIndent[]. Index 0 is reserved and tqcontains 0. */ int m_srcIndentIndex; diff --git a/umbrello/umbrello/codemethodblock.cpp b/umbrello/umbrello/codemethodblock.cpp index c5fc22be..d4a3acc3 100644 --- a/umbrello/umbrello/codemethodblock.cpp +++ b/umbrello/umbrello/codemethodblock.cpp @@ -22,8 +22,8 @@ // Constructors/Destructors // -CodeMethodBlock::CodeMethodBlock ( ClassifierCodeDocument * doc, UMLObject * parentObj, const TQString & body, const TQString & comment) - : CodeBlockWithComments ((CodeDocument*)doc, body, comment), OwnedCodeBlock (parentObj) +CodeMethodBlock::CodeMethodBlock ( ClassifierCodeDocument * doc, UMLObject * tqparentObj, const TQString & body, const TQString & comment) + : CodeBlockWithComments ((CodeDocument*)doc, body, comment), OwnedCodeBlock (tqparentObj) { initFields(); } @@ -133,7 +133,7 @@ void CodeMethodBlock::setAttributesFromObject(TextBlock * obj) } /** - * @return QString + * @return TQString */ TQString CodeMethodBlock::toString ( ) { diff --git a/umbrello/umbrello/codemethodblock.h b/umbrello/umbrello/codemethodblock.h index 41555627..a10a676c 100644 --- a/umbrello/umbrello/codemethodblock.h +++ b/umbrello/umbrello/codemethodblock.h @@ -35,6 +35,7 @@ class CodeMethodBlock : public CodeBlockWithComments, public OwnedCodeBlock { friend class CodeGenObjectWithTextBlocks; Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -44,7 +45,7 @@ public: /** * Constructors */ - CodeMethodBlock ( ClassifierCodeDocument * doc, UMLObject * parentObj, + CodeMethodBlock ( ClassifierCodeDocument * doc, UMLObject * tqparentObj, const TQString & body = "", const TQString & comment = ""); /** @@ -56,7 +57,7 @@ public: // /** - * @return QString + * @return TQString */ virtual TQString toString ( ); @@ -70,7 +71,7 @@ public: */ TQString getEndMethodText () const; - // get the parent code document + // get the tqparent code document CodeDocument * getParentDocument(); protected: @@ -92,13 +93,13 @@ protected: */ void setEndMethodText (const TQString &value); - /** this is the method called from within syncToparent(). + /** this is the method called from within syncTotqparent(). * to update the start and end Method text. It is called * whether or not the method is Auto or User generated. */ virtual void updateMethodDeclaration ( ) = 0; - /** this is the method called from within syncToparent(). + /** this is the method called from within syncTotqparent(). * to update the *body* of the method * It is only called if the method is Auto-generated. */ diff --git a/umbrello/umbrello/codeoperation.cpp b/umbrello/umbrello/codeoperation.cpp index 13f5121b..5c8228d5 100644 --- a/umbrello/umbrello/codeoperation.cpp +++ b/umbrello/umbrello/codeoperation.cpp @@ -32,10 +32,10 @@ // Constructors/Destructors // -CodeOperation::CodeOperation ( ClassifierCodeDocument * doc , UMLOperation * parentOp, const TQString & body, const TQString & comment) - : CodeMethodBlock ( doc, parentOp, body, comment) +CodeOperation::CodeOperation ( ClassifierCodeDocument * doc , UMLOperation * tqparentOp, const TQString & body, const TQString & comment) + : CodeMethodBlock ( doc, tqparentOp, body, comment) { - init(parentOp); + init(tqparentOp); } CodeOperation::~CodeOperation ( ) { } @@ -77,7 +77,7 @@ TQPtrList<CodeParameter> CodeOperation::getParameterList ( ) { */ /** - * Get the parent UMLOperation of this codeoperation. + * Get the tqparent UMLOperation of this codeoperation. */ UMLOperation * CodeOperation::getParentOperation( ) { return dynamic_cast<UMLOperation*>(getParentObject()); @@ -129,11 +129,11 @@ void CodeOperation::setAttributesFromNode ( TQDomElement & element) // now set local attributes - // oops..this is done in the parent class "ownedcodeblock". - // we simply need to record the parent operation here - // m_parentOperation->disconnect(this); // always disconnect from current parent + // oops..this is done in the tqparent class "ownedcodeblock". + // we simply need to record the tqparent operation here + // m_parentOperation->disconnect(this); // always disconnect from current tqparent - TQString idStr = element.attribute("parent_id","-1"); + TQString idStr = element.attribute("tqparent_id","-1"); Uml::IDType id = STR2ID(idStr); UMLObject * obj = UMLApp::app()->getDocument()->findObjectById(id); UMLOperation * op = dynamic_cast<UMLOperation*>(obj); @@ -156,14 +156,14 @@ void CodeOperation::setAttributesFromObject(TextBlock * obj) } -void CodeOperation::init (UMLOperation * parentOp) +void CodeOperation::init (UMLOperation * tqparentOp) { m_canDelete = false; // we cant delete these with the codeeditor, delete the UML operation instead. - setTag(CodeOperation::findTag(parentOp)); + setTag(CodeOperation::findTag(tqparentOp)); - // not needed.. done by parent "ownedcodeblock" class - // connect(parentOp,TQT_SIGNAL(modified()),this,TQT_SLOT(syncToParent())); + // not needed.. done by tqparent "ownedcodeblock" class + // connect(tqparentOp,TQT_SIGNAL(modified()),this,TQT_SLOT(syncToParent())); } diff --git a/umbrello/umbrello/codeoperation.h b/umbrello/umbrello/codeoperation.h index 7ac63dd3..a0d8b693 100644 --- a/umbrello/umbrello/codeoperation.h +++ b/umbrello/umbrello/codeoperation.h @@ -27,6 +27,7 @@ class CodeOperation : public CodeMethodBlock { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -35,7 +36,7 @@ public: /** * Constructors */ - CodeOperation ( ClassifierCodeDocument * doc , UMLOperation * parent, + CodeOperation ( ClassifierCodeDocument * doc , UMLOperation * tqparent, const TQString & body = "", const TQString & comment = ""); /** @@ -44,7 +45,7 @@ public: virtual ~CodeOperation ( ); /** - * Get the parent UMLOperation of this codeoperation. + * Get the tqparent UMLOperation of this codeoperation. */ UMLOperation * getParentOperation( ); @@ -87,7 +88,7 @@ protected: private: UMLOperation * m_parentOperation; - void init (UMLOperation * parentOp); + void init (UMLOperation * tqparentOp); }; diff --git a/umbrello/umbrello/codeparameter.cpp b/umbrello/umbrello/codeparameter.cpp index 5ee7345c..1ca714fc 100644 --- a/umbrello/umbrello/codeparameter.cpp +++ b/umbrello/umbrello/codeparameter.cpp @@ -33,10 +33,10 @@ // Constructors/Destructors // -CodeParameter::CodeParameter ( ClassifierCodeDocument * parentDoc, UMLObject * parentObject ) - : TQObject ( (TQObject*) parentObject, "ACodeParam") +CodeParameter::CodeParameter ( ClassifierCodeDocument * tqparentDoc, UMLObject * tqparentObject ) + : TQObject ( (TQObject*) tqparentObject, "ACodeParam") { - initFields( parentDoc, parentObject ); + initFields( tqparentDoc, tqparentObject ); } CodeParameter::~CodeParameter ( ) { } @@ -50,15 +50,15 @@ CodeParameter::~CodeParameter ( ) { } // /** - * Utility method to get the value of parent object abstract value - * @return the value of parent object abstrtact + * Utility method to get the value of tqparent object abstract value + * @return the value of tqparent object abstrtact */ bool CodeParameter::getAbstract ( ) { return m_parentObject->getAbstract(); } /** - * Utility method to get the value of parent object static + * Utility method to get the value of tqparent object static * Whether or not this is static. * @return the value of static */ @@ -67,7 +67,7 @@ bool CodeParameter::getStatic ( ) { } /** - * Utility method to get the value of parent object name + * Utility method to get the value of tqparent object name * The name of this code parameter. * @return the value */ @@ -76,7 +76,7 @@ TQString CodeParameter::getName ( ) const { } /** - * Utility method to get the value of parent object type. + * Utility method to get the value of tqparent object type. * the typeName of this parameters (e.g. boolean, int, etc or perhaps Class name of * an object) * @return the value of type @@ -87,9 +87,9 @@ TQString CodeParameter::getTypeName ( ) { } /** - * Utility method to get the value of parent object scope. + * Utility method to get the value of tqparent object scope. * The visibility of this code parameter. - * @return the value of parent object scope + * @return the value of tqparent object scope */ Uml::Visibility CodeParameter::getVisibility ( ) const { return m_parentObject->getVisibility(); @@ -139,7 +139,7 @@ UMLObject * CodeParameter::getParentObject ( ) { return m_parentObject; } -// need to get the ID of the parent object +// need to get the ID of the tqparent object // this is kind of broken for UMLRoles. TQString CodeParameter::getID () { UMLRole * role = dynamic_cast<UMLRole*>(m_parentObject); @@ -162,7 +162,7 @@ void CodeParameter::setAttributesOnNode ( TQDomDocument & doc, TQDomElement & bl // set local attributes - blockElement.setAttribute("parent_id",getID()); + blockElement.setAttribute("tqparent_id",getID()); // setting ID's takes special treatment // as UMLRoles arent properly stored in the XMI right now. @@ -187,8 +187,8 @@ void CodeParameter::setAttributesOnNode ( TQDomDocument & doc, TQDomElement & bl */ void CodeParameter::setAttributesFromNode ( TQDomElement & root) { - // set local attributes, parent object first - TQString idStr = root.attribute("parent_id","-1"); + // set local attributes, tqparent object first + TQString idStr = root.attribute("tqparent_id","-1"); Uml::IDType id = STR2ID(idStr); // always disconnect @@ -202,7 +202,7 @@ void CodeParameter::setAttributesFromNode ( TQDomElement & root) { // FIX..one day. // Ugh. This is UGLY, but we have to do it this way because UMLRoles // don't go into the document list of UMLobjects, and have the same - // ID as their parent UMLAssociations. So..the drill is then special + // ID as their tqparent UMLAssociations. So..the drill is then special // for Associations..in that case we need to find out which role will // serve as the parameter here. The REAL fix, of course, would be to // treat UMLRoles on a more even footing, but im not sure how that change @@ -230,7 +230,7 @@ void CodeParameter::setAttributesFromNode ( TQDomElement & root) { initFields ( m_parentDocument, obj); // just the regular approach } else - kError() << "Cant load CodeParam: parentUMLObject w/id:" + kError() << "Cant load CodeParam: tqparentUMLObject w/id:" << ID2STR(id) << " not found, corrupt save file?" << endl; // other attribs now @@ -262,7 +262,7 @@ void CodeParameter::setAttributesFromNode ( TQDomElement & root) { /** * create the string representation of this code parameter. - * @return QString + * @return TQString */ void CodeParameter::syncToParent( ) { diff --git a/umbrello/umbrello/codeparameter.h b/umbrello/umbrello/codeparameter.h index 05fa96f8..8b3f8ef6 100644 --- a/umbrello/umbrello/codeparameter.h +++ b/umbrello/umbrello/codeparameter.h @@ -31,9 +31,10 @@ class ClassifierCodeDocument; class UMLObject; -class CodeParameter : public QObject +class CodeParameter : public TQObject { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -42,7 +43,7 @@ public: /** * Empty Constructor */ - CodeParameter ( ClassifierCodeDocument * doc, UMLObject * parentObj ); + CodeParameter ( ClassifierCodeDocument * doc, UMLObject * tqparentObj ); /** * Empty Destructor @@ -56,23 +57,23 @@ public: // /** - * Get the parent Code Document + * Get the tqparent Code Document */ ClassifierCodeDocument * getParentDocument ( ); /** - * Get the parent UMLObject + * Get the tqparent UMLObject */ UMLObject * getParentObject ( ); /** - * Utility method. Get the value of parent abstract value. + * Utility method. Get the value of tqparent abstract value. * @return the value */ bool getAbstract ( ); /** - * Utility method. Get the value of parent Static + * Utility method. Get the value of tqparent Static * Whether or not this is static. * @return the value */ @@ -123,7 +124,7 @@ public: */ CodeComment * getComment ( ); - // the id of this parameter is the same as the parent UMLObject id. + // the id of this parameter is the same as the tqparent UMLObject id. TQString getID (); protected: diff --git a/umbrello/umbrello/component.h b/umbrello/umbrello/component.h index c67495ab..4012d4bf 100644 --- a/umbrello/umbrello/component.h +++ b/umbrello/umbrello/component.h @@ -29,6 +29,7 @@ class UMLComponent : public UMLPackage { Q_OBJECT + TQ_OBJECT public: /** * Sets up a Component. diff --git a/umbrello/umbrello/componentwidget.cpp b/umbrello/umbrello/componentwidget.cpp index 84bae8b0..7e8b1fd5 100644 --- a/umbrello/umbrello/componentwidget.cpp +++ b/umbrello/umbrello/componentwidget.cpp @@ -74,14 +74,14 @@ void ComponentWidget::draw(TQPainter & p, int offsetX, int offsetY) { p.drawRect(offsetX, offsetY + h/2 - fontHeight/2 - fontHeight, COMPONENT_MARGIN*4, fontHeight); p.drawRect(offsetX, offsetY + h/2 + fontHeight/2, COMPONENT_MARGIN*4, fontHeight); - p.setPen( TQPen(Qt::black) ); + p.setPen( TQPen(TQt::black) ); p.setFont(font); int lines = 1; if (!stereotype.isEmpty()) { p.drawText(offsetX + (COMPONENT_MARGIN*4), offsetY + (h/2) - fontHeight, - w - (COMPONENT_MARGIN*4), fontHeight, Qt::AlignCenter, + w - (COMPONENT_MARGIN*4), fontHeight, TQt::AlignCenter, m_pObject->getStereotype(true)); lines = 2; } @@ -94,10 +94,10 @@ void ComponentWidget::draw(TQPainter & p, int offsetX, int offsetY) { if (lines == 1) { p.drawText(offsetX + (COMPONENT_MARGIN*4), offsetY + (h/2) - (fontHeight/2), - w - (COMPONENT_MARGIN*4), fontHeight, Qt::AlignCenter, name ); + w - (COMPONENT_MARGIN*4), fontHeight, TQt::AlignCenter, name ); } else { p.drawText(offsetX + (COMPONENT_MARGIN*4), offsetY + (h/2), - w - (COMPONENT_MARGIN*4), fontHeight, Qt::AlignCenter, name ); + w - (COMPONENT_MARGIN*4), fontHeight, TQt::AlignCenter, name ); } if(m_bSelected) { diff --git a/umbrello/umbrello/componentwidget.h b/umbrello/umbrello/componentwidget.h index d07b0536..4f0a3a05 100644 --- a/umbrello/umbrello/componentwidget.h +++ b/umbrello/umbrello/componentwidget.h @@ -33,7 +33,7 @@ public: /** * Constructs a ComponentWidget. * - * @param view The parent of this ComponentWidget. + * @param view The tqparent of this ComponentWidget. * @param c The UMLComponent this will be representing. */ ComponentWidget(UMLView * view, UMLComponent *c); diff --git a/umbrello/umbrello/configurable.cpp b/umbrello/umbrello/configurable.cpp index 2b2447b3..96bef270 100644 --- a/umbrello/umbrello/configurable.cpp +++ b/umbrello/umbrello/configurable.cpp @@ -18,7 +18,7 @@ // own header #include "configurable.h" -// Qt includes +// TQt includes #include <tqstringlist.h> // KDE includes diff --git a/umbrello/umbrello/datatypewidget.cpp b/umbrello/umbrello/datatypewidget.cpp index 4e8aef78..636aa4a1 100644 --- a/umbrello/umbrello/datatypewidget.cpp +++ b/umbrello/umbrello/datatypewidget.cpp @@ -55,19 +55,19 @@ void DatatypeWidget::draw(TQPainter& p, int offsetX, int offsetY) { TQString name = getName(); p.drawRect(offsetX, offsetY, w, h); - p.setPen(TQPen(Qt::black)); + p.setPen(TQPen(TQt::black)); TQFont font = UMLWidget::getFont(); font.setBold(true); p.setFont(font); p.drawText(offsetX + DATATYPE_MARGIN, offsetY, w - DATATYPE_MARGIN* 2,fontHeight, - Qt::AlignCenter, m_pObject->getStereotype(true)); + TQt::AlignCenter, m_pObject->getStereotype(true)); font.setItalic( m_pObject->getAbstract() ); p.setFont(font); p.drawText(offsetX + DATATYPE_MARGIN, offsetY + fontHeight, - w - DATATYPE_MARGIN * 2, fontHeight, Qt::AlignCenter, name); + w - DATATYPE_MARGIN * 2, fontHeight, TQt::AlignCenter, name); if (m_bSelected) { drawSelected(&p, offsetX, offsetY); diff --git a/umbrello/umbrello/datatypewidget.h b/umbrello/umbrello/datatypewidget.h index 81a53ca6..81dbe0f9 100644 --- a/umbrello/umbrello/datatypewidget.h +++ b/umbrello/umbrello/datatypewidget.h @@ -33,7 +33,7 @@ public: /** * Constructs an DatatypeWidget. * - * @param view The parent of this DatatypeWidget. + * @param view The tqparent of this DatatypeWidget. * @param d The UMLClassifier this will be representing. */ DatatypeWidget(UMLView* view, UMLClassifier *d); diff --git a/umbrello/umbrello/dialog_utils.cpp b/umbrello/umbrello/dialog_utils.cpp index 43e92a93..0e114082 100644 --- a/umbrello/umbrello/dialog_utils.cpp +++ b/umbrello/umbrello/dialog_utils.cpp @@ -25,15 +25,15 @@ namespace Dialog_Utils { -TQLineEdit* makeLabeledEditField(TQGroupBox *containingBox, TQGridLayout *layout, int row, +TQLineEdit* makeLabeledEditField(TQGroupBox *containingBox, TQGridLayout *tqlayout, int row, TQLabel * &label, const TQString& labelText, TQLineEdit * &editField, - const TQString& editFieldText /* = TQString::null */) + const TQString& editFieldText /* = TQString() */) { label = new TQLabel(labelText, containingBox); - layout->addWidget(label, row, 0); + tqlayout->addWidget(label, row, 0); editField = new TQLineEdit(editFieldText, containingBox); - layout->addWidget(editField, row, 1 ); + tqlayout->addWidget(editField, row, 1 ); label->setBuddy(editField); return editField; } diff --git a/umbrello/umbrello/dialog_utils.h b/umbrello/umbrello/dialog_utils.h index dfcd9ea5..5588049e 100644 --- a/umbrello/umbrello/dialog_utils.h +++ b/umbrello/umbrello/dialog_utils.h @@ -31,7 +31,7 @@ namespace Dialog_Utils { * Create a labeled text lineedit widget. * * @param containingBox The containing TQGroupBox. - * @param layout The TQGridLayout to use. + * @param tqlayout The TQGridLayout to use. * @param row The row number within the TQGridLayout. * @param label The TQLabel object allocated (return value) * @param labelText The label text. @@ -39,10 +39,10 @@ namespace Dialog_Utils { * @param editFieldText Initialization text in the editField (optional.) * @return a pointer to the TQLineEdit so you can setFocus() if necessary */ -TQLineEdit* makeLabeledEditField(TQGroupBox *containingBox, TQGridLayout *layout, int row, +TQLineEdit* makeLabeledEditField(TQGroupBox *containingBox, TQGridLayout *tqlayout, int row, TQLabel * &label, const TQString& labelText, TQLineEdit * &editField, - const TQString& editFieldText = TQString::null); + const TQString& editFieldText = TQString()); /** * Helper function for requesting a name for an UMLWidget using a dialog. diff --git a/umbrello/umbrello/dialogs/activitydialog.h b/umbrello/umbrello/dialogs/activitydialog.h index ccc746c3..f8dbe366 100644 --- a/umbrello/umbrello/dialogs/activitydialog.h +++ b/umbrello/umbrello/dialogs/activitydialog.h @@ -38,6 +38,7 @@ class ActivityWidget; class ActivityDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** diff --git a/umbrello/umbrello/dialogs/activitypage.cpp b/umbrello/umbrello/dialogs/activitypage.cpp index 5a728576..10ccb04b 100644 --- a/umbrello/umbrello/dialogs/activitypage.cpp +++ b/umbrello/umbrello/dialogs/activitypage.cpp @@ -37,7 +37,7 @@ void ActivityPage::setupPage() { m_pActivityGB = new TQGroupBox(i18n("Activities"), this ); - // vertical box layout for the activity lists, arrow buttons and the button box + // vertical box tqlayout for the activity lists, arrow buttons and the button box TQVBoxLayout* listVBoxLayout = new TQVBoxLayout( m_pActivityGB ); listVBoxLayout -> setMargin(margin); listVBoxLayout -> setSpacing ( 10 ); @@ -69,10 +69,10 @@ void ActivityPage::setupPage() { KButtonBox* buttonBox = new KButtonBox(m_pActivityGB); - buttonBox->addButton( i18n("New Activity..."), this, TQT_SLOT(slotNewActivity()) ); + buttonBox->addButton( i18n("New Activity..."), TQT_TQOBJECT(this), TQT_SLOT(slotNewActivity()) ); m_pDeleteActivityButton = buttonBox->addButton( i18n("Delete"), - this, TQT_SLOT(slotDelete()) ); - m_pRenameButton = buttonBox->addButton( i18n("Rename"), this, TQT_SLOT(slotRename()) ); + TQT_TQOBJECT(this), TQT_SLOT(slotDelete()) ); + m_pRenameButton = buttonBox->addButton( i18n("Rename"), TQT_TQOBJECT(this), TQT_SLOT(slotRename()) ); listVBoxLayout->addWidget(buttonBox); mainLayout -> addWidget( m_pActivityGB ); diff --git a/umbrello/umbrello/dialogs/activitypage.h b/umbrello/umbrello/dialogs/activitypage.h index 57a079e6..a6165a8a 100644 --- a/umbrello/umbrello/dialogs/activitypage.h +++ b/umbrello/umbrello/dialogs/activitypage.h @@ -28,6 +28,7 @@ class ListPopupMenu; */ class ActivityPage : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** * Constructor diff --git a/umbrello/umbrello/dialogs/assocgenpage.cpp b/umbrello/umbrello/dialogs/assocgenpage.cpp index b093cae0..07c9e3af 100644 --- a/umbrello/umbrello/dialogs/assocgenpage.cpp +++ b/umbrello/umbrello/dialogs/assocgenpage.cpp @@ -25,8 +25,8 @@ #include "../association.h" #include "../dialog_utils.h" -AssocGenPage::AssocGenPage (UMLDoc *d, TQWidget *parent, AssociationWidget *assoc) - : TQWidget(parent) +AssocGenPage::AssocGenPage (UMLDoc *d, TQWidget *tqparent, AssociationWidget *assoc) + : TQWidget(tqparent) { m_pAssociationWidget = assoc; diff --git a/umbrello/umbrello/dialogs/assocgenpage.h b/umbrello/umbrello/dialogs/assocgenpage.h index 4cd34421..06c32c05 100644 --- a/umbrello/umbrello/dialogs/assocgenpage.h +++ b/umbrello/umbrello/dialogs/assocgenpage.h @@ -42,16 +42,17 @@ class KComboBox; */ class AssocGenPage : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** * Sets up the AssocGenPage. * * @param d The UMLDoc which controls controls object creation. - * @param parent The parent to the AssocGenPage. + * @param tqparent The tqparent to the AssocGenPage. * @param a The AssociationWidget to display the properties of. */ - AssocGenPage(UMLDoc *d, TQWidget *parent, AssociationWidget *a); + AssocGenPage(UMLDoc *d, TQWidget *tqparent, AssociationWidget *a); /** * Standard deconstructor. diff --git a/umbrello/umbrello/dialogs/assocpage.cpp b/umbrello/umbrello/dialogs/assocpage.cpp index feb193eb..425f01fe 100644 --- a/umbrello/umbrello/dialogs/assocpage.cpp +++ b/umbrello/umbrello/dialogs/assocpage.cpp @@ -14,7 +14,7 @@ #include <klocale.h> #include "assocpropdlg.h" -AssocPage::AssocPage(TQWidget *parent, UMLView * v, UMLObject * o) : TQWidget(parent) { +AssocPage::AssocPage(TQWidget *tqparent, UMLView * v, UMLObject * o) : TQWidget(tqparent) { m_pObject = o; m_pView = v; int margin = fontMetrics().height(); @@ -25,12 +25,12 @@ AssocPage::AssocPage(TQWidget *parent, UMLView * v, UMLObject * o) : TQWidget(pa m_pAssocGB = new TQGroupBox(i18n("Associations"), this); mainLayout -> addWidget(m_pAssocGB); - TQHBoxLayout * layout = new TQHBoxLayout(m_pAssocGB); - layout -> setSpacing(10); - layout -> setMargin(margin); + TQHBoxLayout * tqlayout = new TQHBoxLayout(m_pAssocGB); + tqlayout -> setSpacing(10); + tqlayout -> setMargin(margin); m_pAssocLB = new TQListBox(m_pAssocGB); - layout -> addWidget(m_pAssocLB); + tqlayout -> addWidget(m_pAssocLB); setMinimumSize(310, 330); fillListBox(); m_pMenu = 0; diff --git a/umbrello/umbrello/dialogs/assocpage.h b/umbrello/umbrello/dialogs/assocpage.h index a38aa2ac..469dd35d 100644 --- a/umbrello/umbrello/dialogs/assocpage.h +++ b/umbrello/umbrello/dialogs/assocpage.h @@ -40,15 +40,16 @@ */ class AssocPage : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** * Constructs an instance of AssocPage. * - * @param parent The parent of the page + * @param tqparent The tqparent of the page * @param v The view the UMLObject being represented. * @param o The UMLObject being represented */ - AssocPage(TQWidget *parent, UMLView * v, UMLObject * o); + AssocPage(TQWidget *tqparent, UMLView * v, UMLObject * o); /** * Standard deconstructor. diff --git a/umbrello/umbrello/dialogs/assocpropdlg.cpp b/umbrello/umbrello/dialogs/assocpropdlg.cpp index 1d5b9c77..cf4f5b21 100644 --- a/umbrello/umbrello/dialogs/assocpropdlg.cpp +++ b/umbrello/umbrello/dialogs/assocpropdlg.cpp @@ -35,14 +35,14 @@ #include "../umlview.h" -AssocPropDlg::AssocPropDlg (TQWidget *parent, AssociationWidget * assocWidget, int pageNum) +AssocPropDlg::AssocPropDlg (TQWidget *tqparent, AssociationWidget * assocWidget, int pageNum) : KDialogBase(IconList, i18n("Association Properties"), Ok | Apply | Cancel | Help, - Ok, parent, "_ASSOCPROPDLG_", true, true) + Ok, tqparent, "_ASSOCPROPDLG_", true, true) { init(); m_pAssoc = assocWidget; - m_pDoc = ((UMLApp *)parent) -> getDocument(); // needed? + m_pDoc = ((UMLApp *)tqparent) -> getDocument(); // needed? setupPages(assocWidget); showPage(pageNum); diff --git a/umbrello/umbrello/dialogs/assocpropdlg.h b/umbrello/umbrello/dialogs/assocpropdlg.h index 8fbbebe8..359add61 100644 --- a/umbrello/umbrello/dialogs/assocpropdlg.h +++ b/umbrello/umbrello/dialogs/assocpropdlg.h @@ -31,16 +31,17 @@ class UMLDoc; */ class AssocPropDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * Sets up a Association Properties Dialog. - * @param parent The parent of the AssocPropDlg + * @param tqparent The tqparent of the AssocPropDlg * @param a The Association Widget to display properties of. * @param pageNum The page to show first. */ - AssocPropDlg(TQWidget *parent, AssociationWidget *a, int pageNum = 0); + AssocPropDlg(TQWidget *tqparent, AssociationWidget *a, int pageNum = 0); /** * Standard deconstructor diff --git a/umbrello/umbrello/dialogs/assocrolepage.cpp b/umbrello/umbrello/dialogs/assocrolepage.cpp index adb7dcc3..f603abee 100644 --- a/umbrello/umbrello/dialogs/assocrolepage.cpp +++ b/umbrello/umbrello/dialogs/assocrolepage.cpp @@ -23,8 +23,8 @@ // local includes #include "../dialog_utils.h" -AssocRolePage::AssocRolePage (UMLDoc *d, TQWidget *parent, AssociationWidget *assoc) - : TQWidget(parent) +AssocRolePage::AssocRolePage (UMLDoc *d, TQWidget *tqparent, AssociationWidget *assoc) + : TQWidget(tqparent) { m_pAssociationWidget = assoc; @@ -228,7 +228,7 @@ void AssocRolePage::constructWidget() { // m_pDocB-> setEnabled(false); m_pDocB->setWordWrap(TQMultiLineEdit::WidgetWidth); - // add group boxes to main layout + // add group boxes to main tqlayout mainLayout -> addWidget( propsAGB, 0, 0); mainLayout -> addWidget( scopeABG, 1, 0); mainLayout -> addWidget(changeABG, 2, 0); diff --git a/umbrello/umbrello/dialogs/assocrolepage.h b/umbrello/umbrello/dialogs/assocrolepage.h index 440707cc..ada69b4f 100644 --- a/umbrello/umbrello/dialogs/assocrolepage.h +++ b/umbrello/umbrello/dialogs/assocrolepage.h @@ -38,16 +38,17 @@ */ class AssocRolePage : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** * Sets up the AssocRolePage. * * @param d The UMLDoc which controls controls object creation. - * @param parent The parent to the AssocRolePage. + * @param tqparent The tqparent to the AssocRolePage. * @param a The AssociationWidget to display the properties of. */ - AssocRolePage(UMLDoc *d, TQWidget *parent, AssociationWidget *a); + AssocRolePage(UMLDoc *d, TQWidget *tqparent, AssociationWidget *a); /** * Standard deconstructor. diff --git a/umbrello/umbrello/dialogs/classgenpage.cpp b/umbrello/umbrello/dialogs/classgenpage.cpp index d633b6ae..7757b2d8 100644 --- a/umbrello/umbrello/dialogs/classgenpage.cpp +++ b/umbrello/umbrello/dialogs/classgenpage.cpp @@ -38,7 +38,7 @@ #include "../umlview.h" #include "../stereotype.h" -ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* parent, UMLObject* o) : TQWidget(parent) { +ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* tqparent, UMLObject* o) : TQWidget(tqparent) { m_pWidget = 0; m_pObject = 0; m_pInstanceWidget = 0; @@ -236,7 +236,7 @@ ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* parent, UMLObject* o) : TQWidget ////////// } -ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* parent, ObjectWidget* o) : TQWidget(parent) { +ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* tqparent, ObjectWidget* o) : TQWidget(tqparent) { m_pObject = 0; m_pInstanceWidget = 0; m_pWidget = o; @@ -301,7 +301,7 @@ ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* parent, ObjectWidget* o) : TQWid connect( m_pDrawActorCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotActorToggled( bool ) ) ); } -ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* parent, UMLWidget* widget) : TQWidget(parent) { +ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* tqparent, UMLWidget* widget) : TQWidget(tqparent) { m_pWidget = 0; m_pObject = 0; m_pInstanceWidget = widget; diff --git a/umbrello/umbrello/dialogs/classgenpage.h b/umbrello/umbrello/dialogs/classgenpage.h index 4d661ae1..d6d06a50 100644 --- a/umbrello/umbrello/dialogs/classgenpage.h +++ b/umbrello/umbrello/dialogs/classgenpage.h @@ -38,35 +38,36 @@ class UMLDoc; */ class ClassGenPage : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** * Sets up the ClassGenPage. * * @param d The UMLDoc which controls controls object creation. - * @param parent The parent to the ClassGenPage. + * @param tqparent The tqparent to the ClassGenPage. * @param o The UMLObject to display the properties of. */ - ClassGenPage(UMLDoc *d, TQWidget *parent, UMLObject * o); + ClassGenPage(UMLDoc *d, TQWidget *tqparent, UMLObject * o); /** * Sets up the ClassGenPage for an ObjectWidget * * @param d The UMLDoc which controls controls object creation. - * @param parent The parent to the ClassGenPage. + * @param tqparent The tqparent to the ClassGenPage. * @param o The ObjectWidget to display the properties of. */ - ClassGenPage(UMLDoc *d, TQWidget *parent, ObjectWidget * o); + ClassGenPage(UMLDoc *d, TQWidget *tqparent, ObjectWidget * o); /** * Sets up the ClassGenPage for a UMLWidget instance (used * for component instances on deployment diagrams) * * @param d The UMLDoc which controls controls object creation. - * @param parent The parent to the ClassGenPage. + * @param tqparent The tqparent to the ClassGenPage. * @param widget The UMLWidget to display the properties of. */ - ClassGenPage(UMLDoc* d, TQWidget* parent, UMLWidget* widget); + ClassGenPage(UMLDoc* d, TQWidget* tqparent, UMLWidget* widget); /** * Standard deconstructor. diff --git a/umbrello/umbrello/dialogs/classifierlistpage.cpp b/umbrello/umbrello/dialogs/classifierlistpage.cpp index e59956bc..df0efb41 100644 --- a/umbrello/umbrello/dialogs/classifierlistpage.cpp +++ b/umbrello/umbrello/dialogs/classifierlistpage.cpp @@ -29,8 +29,8 @@ using namespace Uml; -ClassifierListPage::ClassifierListPage(TQWidget* parent, UMLClassifier* classifier, - UMLDoc* doc, Uml::Object_Type type) : TQWidget(parent) { +ClassifierListPage::ClassifierListPage(TQWidget* tqparent, UMLClassifier* classifier, + UMLDoc* doc, Uml::Object_Type type) : TQWidget(tqparent) { m_itemType = type; TQString typeName(""); TQString newItemType(""); @@ -60,11 +60,11 @@ ClassifierListPage::ClassifierListPage(TQWidget* parent, UMLClassifier* classifi int margin = fontMetrics().height(); setMinimumSize(310,330); - //main layout contains our two group boxes, the list and the documentation + //main tqlayout contains our two group boxes, the list and the documentation TQVBoxLayout* mainLayout = new TQVBoxLayout( this ); mainLayout->setSpacing(10); - //top group box, contains a vertical layout with list box above and buttons below + //top group box, contains a vertical tqlayout with list box above and buttons below m_pItemListGB = new TQGroupBox(typeName, this ); TQVBoxLayout* listVBoxLayout = new TQVBoxLayout( m_pItemListGB ); listVBoxLayout->setMargin(margin); @@ -95,10 +95,10 @@ ClassifierListPage::ClassifierListPage(TQWidget* parent, UMLClassifier* classifi //the action buttons KButtonBox* buttonBox = new KButtonBox(m_pItemListGB); - buttonBox->addButton( newItemType, this, TQT_SLOT(slotNewListItem()) ); + buttonBox->addButton( newItemType, TQT_TQOBJECT(this), TQT_SLOT(slotNewListItem()) ); m_pDeleteListItemButton = buttonBox->addButton( i18n("&Delete"), - this, TQT_SLOT(slotDelete()) ); - m_pPropertiesButton = buttonBox->addButton( i18n("&Properties"), this, TQT_SLOT(slotProperties()) ); + TQT_TQOBJECT(this), TQT_SLOT(slotDelete()) ); + m_pPropertiesButton = buttonBox->addButton( i18n("&Properties"), TQT_TQOBJECT(this), TQT_SLOT(slotProperties()) ); listVBoxLayout->addWidget(buttonBox); mainLayout->addWidget(m_pItemListGB); @@ -201,7 +201,7 @@ void ClassifierListPage::slotClicked(TQListBoxItem*item) { // focus and so at least one item is always selected; this doesn't happen, if // there are no items of course; // - // for more information see Qt doc for void TQListBox::clearSelection() + // for more information see TQt doc for void TQListBox::clearSelection() UMLClassifierListItem* listItem; if (item == NULL) { if (m_pItemListLB->count() == 0) { diff --git a/umbrello/umbrello/dialogs/classifierlistpage.h b/umbrello/umbrello/dialogs/classifierlistpage.h index 1dba8297..7f0e298f 100644 --- a/umbrello/umbrello/dialogs/classifierlistpage.h +++ b/umbrello/umbrello/dialogs/classifierlistpage.h @@ -38,16 +38,17 @@ class UMLDoc; */ class ClassifierListPage : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** * Sets up the ClassifierListPage * - * @param parent The parent to the ClassAttPage. + * @param tqparent The tqparent to the ClassAttPage. * @param classifier The Concept to display the properties of. * @param doc The UMLDoc document * @param type The type of listItem this handles */ - ClassifierListPage(TQWidget* parent, UMLClassifier* classifier, UMLDoc* doc, Uml::Object_Type type); + ClassifierListPage(TQWidget* tqparent, UMLClassifier* classifier, UMLDoc* doc, Uml::Object_Type type); /** * Standard deconstructor. diff --git a/umbrello/umbrello/dialogs/classoptionspage.h b/umbrello/umbrello/dialogs/classoptionspage.h index 718944cc..e9c81525 100644 --- a/umbrello/umbrello/dialogs/classoptionspage.h +++ b/umbrello/umbrello/dialogs/classoptionspage.h @@ -23,7 +23,7 @@ class ClassifierWidget; /** * A dialog page to display options for a @ref UMLWidget and its - * children. This is not normally called by you. It is used by + * tqchildren. This is not normally called by you. It is used by * the @ref ClassPropDlg. * * @short A dialog page to display the options for a UMLWidget. diff --git a/umbrello/umbrello/dialogs/classpropdlg.cpp b/umbrello/umbrello/dialogs/classpropdlg.cpp index 169de20e..1b744ca0 100644 --- a/umbrello/umbrello/dialogs/classpropdlg.cpp +++ b/umbrello/umbrello/dialogs/classpropdlg.cpp @@ -33,9 +33,9 @@ #include "../uml.h" #include "../umlview.h" -ClassPropDlg::ClassPropDlg(TQWidget *parent, UMLObject * c, int pageNum, bool assoc) +ClassPropDlg::ClassPropDlg(TQWidget *tqparent, UMLObject * c, int pageNum, bool assoc) : KDialogBase(IconList, i18n("Properties"), Ok | Apply | Cancel | Help, - Ok, parent, "_CLASSDLG_", true, true) { + Ok, tqparent, "_CLASSDLG_", true, true) { m_pWidget = 0; m_pGenPage = 0; m_pAttPage = 0; @@ -52,9 +52,9 @@ ClassPropDlg::ClassPropDlg(TQWidget *parent, UMLObject * c, int pageNum, bool as showPage(pageNum); } -ClassPropDlg::ClassPropDlg(TQWidget *parent, ObjectWidget * o) +ClassPropDlg::ClassPropDlg(TQWidget *tqparent, ObjectWidget * o) : KDialogBase(IconList, i18n("Properties"), Ok | Apply | Cancel | Help, - Ok, parent, "_CLASSDLG_", true, true) { + Ok, tqparent, "_CLASSDLG_", true, true) { m_pWidget = o; m_pGenPage = 0; m_pAttPage = 0; @@ -82,9 +82,9 @@ ClassPropDlg::ClassPropDlg(TQWidget *parent, ObjectWidget * o) setMinimumSize(340,420); } -ClassPropDlg::ClassPropDlg(TQWidget *parent, UMLWidget * w) +ClassPropDlg::ClassPropDlg(TQWidget *tqparent, UMLWidget * w) : KDialogBase(IconList, i18n("Properties"), Ok | Apply | Cancel | Help, - Ok, parent, "_CLASSDLG_", true, true) { + Ok, tqparent, "_CLASSDLG_", true, true) { m_pWidget = w; m_pGenPage = 0; m_pAttPage = 0; @@ -95,7 +95,7 @@ ClassPropDlg::ClassPropDlg(TQWidget *parent, UMLWidget * w) m_pOptionsPage = 0; m_Type = pt_Widget; m_pObject = w -> getUMLObject(); - m_pDoc = ((UMLApp *)parent) -> getDocument(); + m_pDoc = ((UMLApp *)tqparent) -> getDocument(); if (w->getBaseType() == Uml::wt_Class || w->getBaseType() == Uml::wt_Interface diff --git a/umbrello/umbrello/dialogs/classpropdlg.h b/umbrello/umbrello/dialogs/classpropdlg.h index 6a107ad7..afb89f46 100644 --- a/umbrello/umbrello/dialogs/classpropdlg.h +++ b/umbrello/umbrello/dialogs/classpropdlg.h @@ -40,32 +40,33 @@ class UMLWidget; */ class ClassPropDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * Sets up a ClassPropDlg. * - * @param parent The parent of the ClassPropDlg + * @param tqparent The tqparent of the ClassPropDlg * @param c The UMLObject to display properties of. * @param pageNum The page to show first. * @param assoc Determines whether to display associations */ - ClassPropDlg(TQWidget *parent, UMLObject *c, int pageNum = 0, bool assoc = false); + ClassPropDlg(TQWidget *tqparent, UMLObject *c, int pageNum = 0, bool assoc = false); /** * Sets up a ClassPropDlg. * - * @param parent The parent of the ClassPropDlg + * @param tqparent The tqparent of the ClassPropDlg * @param o The ObjectWidget to display properties of. */ - ClassPropDlg(TQWidget *parent, ObjectWidget * o); + ClassPropDlg(TQWidget *tqparent, ObjectWidget * o); /** * Sets up a ClassPropDlg. * - * @param parent The parent of the ClassPropDlg + * @param tqparent The tqparent of the ClassPropDlg * @param o The UMLWidget to display properties of. */ - ClassPropDlg(TQWidget *parent, UMLWidget * o); + ClassPropDlg(TQWidget *tqparent, UMLWidget * o); /** diff --git a/umbrello/umbrello/dialogs/classwizard.cpp b/umbrello/umbrello/dialogs/classwizard.cpp index c49e418f..1cabe1b2 100644 --- a/umbrello/umbrello/dialogs/classwizard.cpp +++ b/umbrello/umbrello/dialogs/classwizard.cpp @@ -26,7 +26,7 @@ #include "../umlclassifierlistitemlist.h" #include "../classifierlistitem.h" -ClassWizard::ClassWizard( UMLDoc * pDoc ) : KWizard( (TQWidget*)pDoc -> parent(), "_CLASSWIZARD_", true) { +ClassWizard::ClassWizard( UMLDoc * pDoc ) : KWizard( (TQWidget*)pDoc -> tqparent(), "_CLASSWIZARD_", true) { m_pDoc = pDoc; //create a unique class to start with UMLObject * pTemp = 0; diff --git a/umbrello/umbrello/dialogs/codeeditor.cpp b/umbrello/umbrello/dialogs/codeeditor.cpp index 9fe17afc..b4533d83 100644 --- a/umbrello/umbrello/dialogs/codeeditor.cpp +++ b/umbrello/umbrello/dialogs/codeeditor.cpp @@ -55,16 +55,16 @@ #include "umlroledialog.h" #include "umloperationdialog.h" -CodeEditor::CodeEditor ( const TQString & text, const TQString & context, CodeViewerDialog * parent, const char * name , CodeDocument * doc) - : TQTextEdit ( text, context, parent, name) +CodeEditor::CodeEditor ( const TQString & text, const TQString & context, CodeViewerDialog * tqparent, const char * name , CodeDocument * doc) + : TQTextEdit ( text, context, tqparent, name) { - init(parent, doc); + init(tqparent, doc); } -CodeEditor::CodeEditor ( CodeViewerDialog * parent, const char* name, CodeDocument * doc ) - : TQTextEdit ( parent, name ) +CodeEditor::CodeEditor ( CodeViewerDialog * tqparent, const char* name, CodeDocument * doc ) + : TQTextEdit ( tqparent, name ) { - init(parent, doc); + init(tqparent, doc); } /* @@ -129,7 +129,7 @@ void CodeEditor::doubleClicked(int para, int pos) } -// allow us to edit, as appropriate, the parent UMLObject of the +// allow us to edit, as appropriate, the tqparent UMLObject of the // given text block. void CodeEditor::editTextBlock(TextBlock * tBlock, int para) { @@ -168,7 +168,7 @@ void CodeEditor::editTextBlock(TextBlock * tBlock, int para) { } else { - kError()<<" CodeViewerDlg ERROR: UNKNOWN parent for textBlock"<<endl; + kError()<<" CodeViewerDlg ERROR: UNKNOWN tqparent for textBlock"<<endl; } } @@ -223,7 +223,7 @@ void CodeEditor::loadFromDocument () } -void CodeEditor::insert (const TQString & text, TextBlock * parent, bool editable, const TQColor & fgcolor, const TQColor & bgcolor, UMLObject * umlobj, const TQString & displayName, int startLine) +void CodeEditor::insert (const TQString & text, TextBlock * tqparent, bool editable, const TQColor & fgcolor, const TQColor & bgcolor, UMLObject * umlobj, const TQString & displayName, int startLine) { // set some params @@ -247,24 +247,24 @@ void CodeEditor::insert (const TQString & text, TextBlock * parent, bool editabl // now do 'paragraph' background highlighting // int endLine = paragraphs()-2; - int endLine = text.contains(TQRegExp("\n")) + startLine -1; + int endLine = text.tqcontains(TQRegExp("\n")) + startLine -1; if(m_isHighlighted) for(int para=startLine;para<=endLine;para++) setParagraphBackgroundColor(para,bgcolor); // record paragraph information - // Did we already start recording info for this parent object? + // Did we already start recording info for this tqparent object? TextBlockInfo * tbinfo; - if(m_tbInfoMap->contains(parent)) - tbinfo = (*m_tbInfoMap)[parent]; + if(m_tbInfoMap->tqcontains(tqparent)) + tbinfo = (*m_tbInfoMap)[tqparent]; else { tbinfo = new TextBlockInfo(); tbinfo->displayName = displayName; - tbinfo->isCodeAccessorMethod = dynamic_cast<CodeAccessorMethod*>(parent) ? true : false; - m_tbInfoMap->insert(parent,tbinfo); + tbinfo->isCodeAccessorMethod = dynamic_cast<CodeAccessorMethod*>(tqparent) ? true : false; + m_tbInfoMap->insert(tqparent,tbinfo); } - // set a parent, if its not already set + // set a tqparent, if its not already set if(umlobj && !tbinfo->getParent()) { tbinfo->displayName = displayName; @@ -272,13 +272,13 @@ void CodeEditor::insert (const TQString & text, TextBlock * parent, bool editabl tbinfo->isClickable = textBlockIsClickable(umlobj); } - // now mark all lines that we just inserted as belonging to the parent + // now mark all lines that we just inserted as belonging to the tqparent for(int para=startLine;para<=endLine;para++) - m_textBlockList.insert(para,parent); + m_textBlockList.insert(para,tqparent); // lastly, update the para info - // start position is relative to the FIRST parent position - int start = startLine - m_textBlockList.findRef(parent); + // start position is relative to the FIRST tqparent position + int start = startLine - m_textBlockList.tqfindRef(tqparent); int size = endLine-startLine; // create the object that records this particular "paragraph" @@ -293,7 +293,7 @@ void CodeEditor::insert (const TQString & text, TextBlock * parent, bool editabl { // now we have to fix the 'start' value for all the para // info blocks that coorspond to textblocks that we inserted - // inside of. This means parent tblock paragraph locations + // inside of. This means tqparent tblock paragraph locations // that are greater than zero in that type of textblock int increase = size + 1; @@ -302,7 +302,7 @@ void CodeEditor::insert (const TQString & text, TextBlock * parent, bool editabl { TextBlock * tblock = it.key(); TextBlockInfo * thisTbInfo = it.data(); - int firstLoc = m_textBlockList.findRef(tblock); + int firstLoc = m_textBlockList.tqfindRef(tblock); ParaInfo * lastPi = thisTbInfo->m_paraList.last(); for(ParaInfo * pi = thisTbInfo->m_paraList.first(); pi; pi = thisTbInfo->m_paraList.next()) @@ -353,7 +353,7 @@ void CodeEditor::appendText(TextBlockList * items) appendText(cb); /* // no! shouldn't be any 'naked' comments floating about. Always - // are assocated with a parent code block + // are assocated with a tqparent code block else if ( (cm = dynamic_cast<CodeComment*>(tb)) ) appendText(cm); */ @@ -363,7 +363,7 @@ void CodeEditor::appendText(TextBlockList * items) } -void CodeEditor::appendText (CodeComment * comment, TextBlock * parent, UMLObject * umlObj , const TQString & componentName) +void CodeEditor::appendText (CodeComment * comment, TextBlock * tqparent, UMLObject * umlObj , const TQString & componentName) { if(!comment->getWriteOutText() && !m_showHiddenBlocks) @@ -376,7 +376,7 @@ void CodeEditor::appendText (CodeComment * comment, TextBlock * parent, UMLObjec TQString indent = comment->getIndentationString(); TQString text = comment->toString(); // use comment formatting, NOT formatMultiLineText(comment->toString(), indent, "\n"); if(!StringIsBlank(text)) - insert(text,parent,true,getState().fontColor, bgcolor, umlObj, componentName); + insert(text,tqparent,true,getState().fontColor, bgcolor, umlObj, componentName); } @@ -409,28 +409,28 @@ void CodeEditor::appendText (CodeClassFieldDeclarationBlock * db ) { TQString indent = db->getIndentationString(); TQString body = db->formatMultiLineText (db->getText(), indent, "\n"); - UMLObject * parentObj = db->getParentClassField()->getParentObject(); + UMLObject * tqparentObj = db->getParentClassField()->getParentObject(); TQColor bgcolor = getState().editBlockColor; TQString componentName = TQString(""); - if(parentObj) + if(tqparentObj) { - if(db->getParentClassField()->parentIsAttribute()) { - componentName = parentDocName + "::attribute_field(" + parentObj->getName() + ')'; + if(db->getParentClassField()->tqparentIsAttribute()) { + componentName = tqparentDocName + "::attribute_field(" + tqparentObj->getName() + ')'; } else { - UMLRole * role = dynamic_cast<UMLRole*>(parentObj); - componentName = parentDocName + "::association_field(" + role->getName() + ')'; + UMLRole * role = dynamic_cast<UMLRole*>(tqparentObj); + componentName = tqparentDocName + "::association_field(" + role->getName() + ')'; } bgcolor = getState().umlObjectColor; } - appendText(db->getComment(), db, parentObj,componentName); + appendText(db->getComment(), db, tqparentObj,componentName); if(!db->getWriteOutText() && m_showHiddenBlocks) bgcolor = getState().hiddenColor; if(!StringIsBlank(body)) - insert(body,db,false,getState().fontColor,bgcolor,parentObj); + insert(body,db,false,getState().fontColor,bgcolor,tqparentObj); } @@ -460,42 +460,42 @@ void CodeEditor::appendText (CodeMethodBlock * mb) { bgcolor = getState().hiddenColor; } - TQString componentName = TQString("<b>parentless method\?</b>"); + TQString componentName = TQString("<b>tqparentless method\?</b>"); - // ugly, but we need to know if there is a parent object here. + // ugly, but we need to know if there is a tqparent object here. CodeOperation * op = dynamic_cast<CodeOperation*>(mb); CodeAccessorMethod * accessor = dynamic_cast<CodeAccessorMethod*>(mb); - UMLObject * parentObj = 0; + UMLObject * tqparentObj = 0; if(op) { - parentObj = op->getParentOperation(); - if(((UMLOperation*)parentObj)->isConstructorOperation()) - componentName = parentDocName + "::operation("+ parentObj->getName()+") constructor method"; + tqparentObj = op->getParentOperation(); + if(((UMLOperation*)tqparentObj)->isConstructorOperation()) + componentName = tqparentDocName + "::operation("+ tqparentObj->getName()+") constructor method"; else - componentName = parentDocName + "::operation("+ parentObj->getName()+") method"; + componentName = tqparentDocName + "::operation("+ tqparentObj->getName()+") method"; } if(accessor) { - parentObj = accessor->getParentObject(); - if(accessor->getParentClassField()->parentIsAttribute()) { - componentName = parentDocName + "::attribute_field(" + parentObj->getName() + ") accessor method"; + tqparentObj = accessor->getParentObject(); + if(accessor->getParentClassField()->tqparentIsAttribute()) { + componentName = tqparentDocName + "::attribute_field(" + tqparentObj->getName() + ") accessor method"; } else { - UMLRole * role = dynamic_cast<UMLRole*>(parentObj); - componentName = parentDocName + "::association_field(" + role->getName() + ") accessor method"; + UMLRole * role = dynamic_cast<UMLRole*>(tqparentObj); + componentName = tqparentDocName + "::association_field(" + role->getName() + ") accessor method"; } } - //appendText(mb->getComment(), mb, parentObj, componentName); - appendText(mb->getComment(), mb->getComment(), parentObj, componentName); + //appendText(mb->getComment(), mb, tqparentObj, componentName); + appendText(mb->getComment(), mb->getComment(), tqparentObj, componentName); if(!StringIsBlank(startText)) - insert(startText,mb,false,getState().fontColor,bgcolor,parentObj); + insert(startText,mb,false,getState().fontColor,bgcolor,tqparentObj); // always insert body for methods..IF we don't, we create a // situation where the user cant edit the body (!) - insert(body,mb,true,getState().fontColor,bgcolor,parentObj); + insert(body,mb,true,getState().fontColor,bgcolor,tqparentObj); if(!StringIsBlank(endText)) - insert(endText,mb,false,getState().fontColor,bgcolor,parentObj); + insert(endText,mb,false,getState().fontColor,bgcolor,tqparentObj); } @@ -520,22 +520,22 @@ void CodeEditor::appendText(HierarchicalCodeBlock * hblock) return; OwnedHierarchicalCodeBlock * test = dynamic_cast<OwnedHierarchicalCodeBlock *>(hblock); - UMLObject * parentObj = 0; + UMLObject * tqparentObj = 0; TQString componentName = TQString(""); TQColor paperColor = getState().nonEditBlockColor; if(test) { - parentObj = test->getParentObject(); - UMLClassifier *c = dynamic_cast<UMLClassifier*>(parentObj); + tqparentObj = test->getParentObject(); + UMLClassifier *c = dynamic_cast<UMLClassifier*>(tqparentObj); if (c) { TQString typeStr; if (c->isInterface()) typeStr = "Interface"; else typeStr = "Class"; - componentName = parentDocName + "::" + typeStr + '(' + parentObj->getName() + ')'; + componentName = tqparentDocName + "::" + typeStr + '(' + tqparentObj->getName() + ')'; } else { - componentName = parentDocName + "::UNKNOWN(" + parentObj->getName() + ')'; + componentName = tqparentDocName + "::UNKNOWN(" + tqparentObj->getName() + ')'; } paperColor = getState().umlObjectColor; @@ -549,10 +549,10 @@ void CodeEditor::appendText(HierarchicalCodeBlock * hblock) TQString startText = hblock->formatMultiLineText ( hblock->getStartText(), indent, "\n"); TQString endText = hblock->formatMultiLineText( hblock->getEndText(), indent, "\n"); - appendText(hblock->getComment(), hblock, parentObj, componentName); + appendText(hblock->getComment(), hblock, tqparentObj, componentName); if(!StringIsBlank(startText)) - insert(startText,hblock,false,getState().fontColor,paperColor, parentObj); + insert(startText,hblock,false,getState().fontColor,paperColor, tqparentObj); appendText(items); if(!StringIsBlank(endText)) insert(endText,hblock,false,getState().fontColor,paperColor); @@ -621,7 +621,7 @@ void CodeEditor::slotInsertCodeBlockBeforeSelected() m_parentDoc->insertTextBlock(newBlock, tb, false); - int location = m_textBlockList.findRef(m_selectedTextBlock); // find first para of selected block + int location = m_textBlockList.tqfindRef(m_selectedTextBlock); // find first para of selected block TQString body = newBlock->formatMultiLineText (newBlock->getText(), newBlock->getIndentationString(), "\n"); @@ -643,7 +643,7 @@ void CodeEditor::slotInsertCodeBlockAfterSelected() // find last para of selected block TextBlockInfo *tbinfo = (*m_tbInfoMap)[m_selectedTextBlock]; ParaInfo * lastpi = tbinfo->m_paraList.last(); - int location = m_textBlockList.findRef(m_selectedTextBlock) + lastpi->start + lastpi->size + 1; + int location = m_textBlockList.tqfindRef(m_selectedTextBlock) + lastpi->start + lastpi->size + 1; TQString body = newBlock->formatMultiLineText (newBlock->getText(), newBlock->getIndentationString(), "\n"); @@ -659,7 +659,7 @@ TQPopupMenu * CodeEditor::createPopupMenu ( const TQPoint & pos ) m_lastPara = paragraphAt(pos); TQPopupMenu * menu = new TQPopupMenu(this); - // ugh. A bug in the Qt interaction between TQTextEdit and Menu + // ugh. A bug in the TQt interaction between TQTextEdit and Menu // can sometimes trigger a clear() call of the text area after // the popup menu is destroyed. The workaround is to disable // the behavior by blocking the destroy signal from the menu. @@ -774,13 +774,13 @@ void CodeEditor::slotRedrawText() { rebuildView(m_lastPara); } -void CodeEditor::init ( CodeViewerDialog * parentDlg, CodeDocument * parentDoc ) { +void CodeEditor::init ( CodeViewerDialog * tqparentDlg, CodeDocument * tqparentDoc ) { // safety to insure that we are up to date - parentDoc->synchronize(); + tqparentDoc->synchronize(); - m_parentDlg = parentDlg; - m_parentDoc = parentDoc; + m_parentDlg = tqparentDlg; + m_parentDoc = tqparentDoc; setUndoRedoEnabled( false ); setCursor( TQCursor( 0 ) ); @@ -798,12 +798,12 @@ void CodeEditor::init ( CodeViewerDialog * parentDlg, CodeDocument * parentDoc ) setFont( getState().font ); - // set name of parent doc + // set name of tqparent doc ClassifierCodeDocument * cdoc = dynamic_cast<ClassifierCodeDocument*>(m_parentDoc); if(cdoc) - parentDocName = cdoc->getParentClassifier()->getName(); + tqparentDocName = cdoc->getParentClassifier()->getName(); else - parentDocName = ""; + tqparentDocName = ""; // set some viewability parameters //int margin = fontMetrics().height(); @@ -832,8 +832,8 @@ void CodeEditor::updateTextBlockFromText (TextBlock * block) { TQString baseIndent = block->getIndentationString(block->getIndentationLevel()+(cmb ? 1 : 0)); TextBlockInfo *info = (*m_tbInfoMap)[block]; - UMLObject * parentObj = info->getParent(); - int pstart = m_textBlockList.findRef(block); + UMLObject * tqparentObj = info->getParent(); + int pstart = m_textBlockList.tqfindRef(block); TQString content = ""; // Assemble content from editiable paras @@ -860,10 +860,10 @@ void CodeEditor::updateTextBlockFromText (TextBlock * block) { //cerr<<"UPDATE GOT CONTENT:["<<content.latin1()<<"] to block:"<<block<<endl; block->setText(content); - // if a parent for the block, try to set its documentation + // if a tqparent for the block, try to set its documentation // as long as its NOT an accessor codeblock. - if(parentObj && !info->isCodeAccessorMethod) - parentObj->setDoc(content); + if(tqparentObj && !info->isCodeAccessorMethod) + tqparentObj->setDoc(content); // make note that its now user generated if(cmb) @@ -913,7 +913,7 @@ void CodeEditor::cursorPositionChanged(int para, int pos) int minPos = baseIndent.length(); // add indent chars to the current line, if missing - if(!m_backspacePressed && !currentParaText.contains(TQRegExp('^'+baseIndent))) + if(!m_backspacePressed && !currentParaText.tqcontains(TQRegExp('^'+baseIndent))) { insertAt(baseIndent,para,0); setCursorPosition(para,pos+minPos); @@ -957,7 +957,7 @@ void CodeEditor::cursorPositionChanged(int para, int pos) // furthermore, IF its nothing but indentation + whitespace // we switch this back to Auto-Generated. - if(cmb && contents.contains(TQRegExp('^'+baseIndent+"\\s$"))) + if(cmb && contents.tqcontains(TQRegExp('^'+baseIndent+"\\s$"))) { cmb->setContentType(CodeBlock::AutoGenerated); cmb->syncToParent(); @@ -1006,7 +1006,7 @@ bool CodeEditor::paraIsNotSingleLine (int para) TextBlock * tBlock = m_textBlockList.at(para); if(tBlock) { - int pstart = m_textBlockList.findRef(tBlock); + int pstart = m_textBlockList.tqfindRef(tBlock); TextBlockInfo *info = (*m_tbInfoMap)[tBlock]; TQPtrList<ParaInfo> list = info->m_paraList; @@ -1030,7 +1030,7 @@ bool CodeEditor::isParaEditable (int para) { int editEnd = tBlock->lastEditableLine(); bool hasEditableRange = (editStart > 0 || editEnd < 0) ? true : false; TextBlockInfo *info = (*m_tbInfoMap)[tBlock]; - int pstart = m_textBlockList.findRef(tBlock); + int pstart = m_textBlockList.tqfindRef(tBlock); int relativeLine = para - pstart; TQPtrList<ParaInfo> list = info->m_paraList; for(ParaInfo * item = list.first(); item; item=list.next()) @@ -1055,7 +1055,7 @@ void CodeEditor::changeTextBlockHighlighting(TextBlock * tBlock, bool selected) { TextBlockInfo *info = (*m_tbInfoMap)[tBlock]; TQPtrList<ParaInfo> list = info->m_paraList; - int pstart = m_textBlockList.findRef(tBlock); + int pstart = m_textBlockList.tqfindRef(tBlock); for(ParaInfo * item = list.first(); item; item=list.next()) for(int p=(item->start+pstart);p<=(item->start+pstart+item->size);p++) if(selected) @@ -1113,7 +1113,7 @@ void CodeEditor::contractSelectedParagraph( int paraToRemove ) { TextBlock * tBlock = m_textBlockList.at(paraToRemove); if(tBlock) { - int pstart = m_textBlockList.findRef(tBlock); + int pstart = m_textBlockList.tqfindRef(tBlock); TextBlockInfo *info = (*m_tbInfoMap)[tBlock]; TQPtrList<ParaInfo> list = info->m_paraList; @@ -1149,7 +1149,7 @@ void CodeEditor::expandSelectedParagraph( int priorPara ) { m_textBlockList.insert(priorPara,tBlock); TextBlockInfo *info = (*m_tbInfoMap)[tBlock]; TQPtrList<ParaInfo> list = info->m_paraList; - int pstart = m_textBlockList.findRef(tBlock); + int pstart = m_textBlockList.tqfindRef(tBlock); // now update the paragraph information bool upStartPosition = false; diff --git a/umbrello/umbrello/dialogs/codeeditor.h b/umbrello/umbrello/dialogs/codeeditor.h index 5956e3ab..b430b27d 100644 --- a/umbrello/umbrello/dialogs/codeeditor.h +++ b/umbrello/umbrello/dialogs/codeeditor.h @@ -40,13 +40,14 @@ class TextBlockInfo; class TextBlock; class ParaInfo; -class CodeEditor : public QTextEdit +class CodeEditor : public TQTextEdit { Q_OBJECT + TQ_OBJECT public: - explicit CodeEditor ( const TQString & text, const TQString & context = TQString(), CodeViewerDialog * parent = 0, const char * name = 0 , CodeDocument * doc = 0); - explicit CodeEditor ( CodeViewerDialog * parent, const char* name = 0, CodeDocument * doc = 0); + explicit CodeEditor ( const TQString & text, const TQString & context = TQString(), CodeViewerDialog * tqparent = 0, const char * name = 0 , CodeDocument * doc = 0); + explicit CodeEditor ( CodeViewerDialog * tqparent, const char* name = 0, CodeDocument * doc = 0); ~CodeEditor (); // return code viewer state @@ -62,7 +63,7 @@ protected: void appendText (CodeClassFieldDeclarationBlock * db ); void appendText (TextBlockList * items); void appendText (CodeMethodBlock * mb); - void appendText (CodeComment * comment, TextBlock * parent, UMLObject * umlObj = 0, const TQString & compName=""); + void appendText (CodeComment * comment, TextBlock * tqparent, UMLObject * umlObj = 0, const TQString & compName=""); void appendText (CodeBlockWithComments * cb ); // Rebuild our view of the document. Happens whenever we change @@ -82,7 +83,7 @@ protected: // and 'return' events. void keyPressEvent ( TQKeyEvent * e ); - // (re) load the parent code document into the editor + // (re) load the tqparent code document into the editor void loadFromDocument(); // specialized popup menu for our tool @@ -90,7 +91,7 @@ protected: private: - TQString parentDocName; + TQString tqparentDocName; CodeDocument * m_parentDoc; CodeViewerDialog * m_parentDlg; @@ -110,7 +111,7 @@ private: TextBlockList m_textBlockList; // main insert routine. Will append if startline is not supplied. - void insert (const TQString & text, TextBlock * parent, bool isEditable = false, + void insert (const TQString & text, TextBlock * tqparent, bool isEditable = false, const TQColor & fgcolor = TQColor("black"), const TQColor & bgcolor = TQColor("white"), UMLObject * umlobj = 0, const TQString & displayName = "", int startLine = -1); @@ -123,7 +124,7 @@ private: void updateTextBlockFromText (TextBlock * block); void initText ( CodeDocument * doc ); - void init ( CodeViewerDialog * parentDlg, CodeDocument * parentDoc ); + void init ( CodeViewerDialog * tqparentDlg, CodeDocument * tqparentDoc ); void changeTextBlockHighlighting(TextBlock * tb, bool selected); bool isParaEditable (int para); diff --git a/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui b/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui index f0df1e17..24fea3fa 100644 --- a/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui +++ b/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>CodeGenerationOptionsBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CodeGenerationOptionsBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -27,7 +27,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tabWidget</cstring> </property> @@ -42,7 +42,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -53,15 +53,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>m_SelectLanguageGroup</cstring> </property> @@ -78,14 +78,14 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>m_SelectLanguageBox</cstring> </property> </widget> </hbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox1</cstring> </property> @@ -102,7 +102,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -110,7 +110,7 @@ <string>Write all generated files to folder:</string> </property> </widget> - <widget class="QPushButton" row="1" column="2"> + <widget class="TQPushButton" row="1" column="2"> <property name="name"> <cstring>m_browseOutput</cstring> </property> @@ -118,7 +118,7 @@ <string>Bro&wse...</string> </property> </widget> - <widget class="QPushButton" row="3" column="2"> + <widget class="TQPushButton" row="3" column="2"> <property name="name"> <cstring>m_browseHeadings</cstring> </property> @@ -126,7 +126,7 @@ <string>B&rowse...</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>m_includeHeadings</cstring> </property> @@ -137,7 +137,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>m_outputDir</cstring> </property> @@ -145,7 +145,7 @@ <string>Files generated by Code Generator will be written to this folder</string> </property> </widget> - <widget class="QLineEdit" row="3" column="1"> + <widget class="TQLineEdit" row="3" column="1"> <property name="name"> <cstring>m_headingsDir</cstring> </property> @@ -163,7 +163,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> @@ -180,7 +180,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> @@ -189,7 +189,7 @@ </spacer> </grid> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>m_overwriteGroup</cstring> </property> @@ -206,7 +206,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -215,7 +215,7 @@ generator wants to use as output file already exists:</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_overwrite</cstring> </property> @@ -226,7 +226,7 @@ generator wants to use as output file already exists:</string> <string>Overwrite existing files if they exist in the destination folder</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_ask</cstring> </property> @@ -240,7 +240,7 @@ generator wants to use as output file already exists:</string> <string>If a file with the same name already exists, ask what to do</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>m_changeName</cstring> </property> @@ -257,7 +257,7 @@ generator wants to use as output file already exists:</string> </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -268,15 +268,15 @@ generator wants to use as output file already exists:</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox5</cstring> </property> @@ -297,7 +297,7 @@ generator wants to use as output file already exists:</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>30</height> @@ -314,7 +314,7 @@ generator wants to use as output file already exists:</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>30</height> @@ -331,14 +331,14 @@ generator wants to use as output file already exists:</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>30</height> </size> </property> </spacer> - <widget class="QLabel" row="2" column="1"> + <widget class="TQLabel" row="2" column="1"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -346,7 +346,7 @@ generator wants to use as output file already exists:</string> <string>Line ending style:</string> </property> </widget> - <widget class="QLabel" row="0" column="1" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -354,7 +354,7 @@ generator wants to use as output file already exists:</string> <string>Indentation type:</string> </property> </widget> - <widget class="QLabel" row="1" column="1" rowspan="1" colspan="3"> + <widget class="TQLabel" row="1" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -362,7 +362,7 @@ generator wants to use as output file already exists:</string> <string>Indentation amount:</string> </property> </widget> - <widget class="QComboBox" row="2" column="2" rowspan="1" colspan="3"> + <widget class="TQComboBox" row="2" column="2" rowspan="1" colspan="3"> <item> <property name="text"> <string>*NIX ("\n")</string> @@ -382,7 +382,7 @@ generator wants to use as output file already exists:</string> <cstring>m_SelectEndLineCharsBox</cstring> </property> </widget> - <widget class="QComboBox" row="0" column="3" rowspan="1" colspan="2"> + <widget class="TQComboBox" row="0" column="3" rowspan="1" colspan="2"> <item> <property name="text"> <string>No Indentation</string> @@ -409,18 +409,18 @@ generator wants to use as output file already exists:</string> </widget> </grid> </widget> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>GroupBox3</cstring> </property> <property name="title"> <string>Comment Verbosity</string> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_forceSections</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>10</x> <y>60</y> @@ -436,11 +436,11 @@ is empty</string> <string>Writes comments to indicate the different sections (public, private etc) in a class, even if the sections are empty</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_forceDoc</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>11</x> <y>29</y> @@ -460,7 +460,7 @@ is empty</string> </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -471,7 +471,7 @@ is empty</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QFrame" row="0" column="0"> + <widget class="TQFrame" row="0" column="0"> <property name="name"> <cstring>languageOptionsFrame</cstring> </property> @@ -521,11 +521,11 @@ is empty</string> <slot>activeLanguageChanged(int)</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot access="protected">browseClicked()</slot> <slot access="protected">activeLanguageChanged(int id)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp b/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp index 8fdb046c..ab54eb3d 100644 --- a/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp +++ b/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp @@ -37,8 +37,8 @@ #include <tqlistview.h> #include <tqbuttongroup.h> -CodeGenerationOptionsPage::CodeGenerationOptionsPage(TQWidget *parent) - : CodeGenerationOptionsBase(parent) +CodeGenerationOptionsPage::CodeGenerationOptionsPage(TQWidget *tqparent) + : CodeGenerationOptionsBase(tqparent) { init(); } @@ -154,7 +154,7 @@ void CodeGenerationOptionsPage::apply() { m_parentPolicy->setIndentationAmount(m_SelectIndentationNumber->value()); // emit in THIS order.. the first signal triggers any sub-class to do its apply - // slot, THEN, once we are all updated, we may sync the parent generator's code + // slot, THEN, once we are all updated, we may sync the tqparent generator's code // documents emit applyClicked(); emit syncCodeDocumentsToParent(); @@ -171,7 +171,7 @@ void CodeGenerationOptionsPage::setDefaults() { void CodeGenerationOptionsPage::browseClicked() { - TQString button = sender()->name(); + TQString button = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name(); TQString dir = KFileDialog::getExistingDirectory(); if(dir.isEmpty()) return; diff --git a/umbrello/umbrello/dialogs/codegenerationoptionspage.h b/umbrello/umbrello/dialogs/codegenerationoptionspage.h index 6cd7a2e7..f444254e 100644 --- a/umbrello/umbrello/dialogs/codegenerationoptionspage.h +++ b/umbrello/umbrello/dialogs/codegenerationoptionspage.h @@ -39,8 +39,9 @@ class CodeGenerationPolicyPage; class CodeGenerationOptionsPage : public CodeGenerationOptionsBase { Q_OBJECT + TQ_OBJECT public: - CodeGenerationOptionsPage(TQWidget *parent=0); + CodeGenerationOptionsPage(TQWidget *tqparent=0); ~CodeGenerationOptionsPage(); void setDefaults(); TQString getCodeGenerationLanguage(); diff --git a/umbrello/umbrello/dialogs/codegenerationpolicybase.ui b/umbrello/umbrello/dialogs/codegenerationpolicybase.ui index bbc739a7..bb48596d 100644 --- a/umbrello/umbrello/dialogs/codegenerationpolicybase.ui +++ b/umbrello/umbrello/dialogs/codegenerationpolicybase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>CodeGenerationPolicyBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CodeGenerationPolicyBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -12,11 +12,11 @@ <height>515</height> </rect> </property> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>policyFrame</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>30</x> <y>20</y> @@ -32,8 +32,8 @@ </property> </widget> </widget> -<slots> +<Q_SLOTS> <slot access="protected">apply()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/umbrello/umbrello/dialogs/codegenerationpolicypage.cpp b/umbrello/umbrello/dialogs/codegenerationpolicypage.cpp index 0e488e75..0cdd5e08 100644 --- a/umbrello/umbrello/dialogs/codegenerationpolicypage.cpp +++ b/umbrello/umbrello/dialogs/codegenerationpolicypage.cpp @@ -29,8 +29,8 @@ /** This is the page which comes up IF there is no special options for the * code generator. */ -CodeGenerationPolicyPage::CodeGenerationPolicyPage( TQWidget *parent, const char *name, CodeGenPolicyExt * policy ) - :CodeGenerationPolicyBase(parent,name) +CodeGenerationPolicyPage::CodeGenerationPolicyPage( TQWidget *tqparent, const char *name, CodeGenPolicyExt * policy ) + :CodeGenerationPolicyBase(tqparent,name) { m_parentPolicy = policy; } diff --git a/umbrello/umbrello/dialogs/codegenerationpolicypage.h b/umbrello/umbrello/dialogs/codegenerationpolicypage.h index 959e34aa..54723dd3 100644 --- a/umbrello/umbrello/dialogs/codegenerationpolicypage.h +++ b/umbrello/umbrello/dialogs/codegenerationpolicypage.h @@ -31,8 +31,9 @@ class CodeGenPolicyExt; class CodeGenerationPolicyPage : public CodeGenerationPolicyBase { Q_OBJECT + TQ_OBJECT public: - explicit CodeGenerationPolicyPage (TQWidget *parent=0, const char *name=0, CodeGenPolicyExt * policy = 0); + explicit CodeGenerationPolicyPage (TQWidget *tqparent=0, const char *name=0, CodeGenPolicyExt * policy = 0); virtual ~CodeGenerationPolicyPage(); diff --git a/umbrello/umbrello/dialogs/codegenerationwizard.cpp b/umbrello/umbrello/dialogs/codegenerationwizard.cpp index b64e30dc..dbd47a94 100644 --- a/umbrello/umbrello/dialogs/codegenerationwizard.cpp +++ b/umbrello/umbrello/dialogs/codegenerationwizard.cpp @@ -125,7 +125,7 @@ void CodeGenerationWizard::generateCode() { } void CodeGenerationWizard::classGenerated(UMLClassifier* concept, bool generated) { - TQListViewItem* item = m_statusList->findItem( concept->getFullyQualifiedName(), 0 ); + TQListViewItem* item = m_statusList->tqfindItem( concept->getFullyQualifiedName(), 0 ); if( !item ) { kError()<<"GenerationStatusPage::Error finding class in list view"<<endl; } else if (generated) { @@ -159,13 +159,13 @@ void CodeGenerationWizard::showPage(TQWidget *page) { if(!info.exists()) { if (KMessageBox::questionYesNo(this, - i18n("The folder %1 does not exist. Do you want to create it now?").arg(info.filePath()), + i18n("The folder %1 does not exist. Do you want to create it now?").tqarg(info.filePath()), i18n("Output Folder Does Not Exist"), i18n("Create Folder"), i18n("Do Not Create")) == KMessageBox::Yes) { TQDir dir; if(!dir.mkdir(info.filePath())) { - KMessageBox::sorry(this,i18n("The folder could not be created.\nPlease make sure you have write access to its parent folder or select another, valid, folder."), + KMessageBox::sorry(this,i18n("The folder could not be created.\nPlease make sure you have write access to its tqparent folder or select another, valid, folder."), i18n("Error Creating Folder")); return; } @@ -188,7 +188,7 @@ void CodeGenerationWizard::showPage(TQWidget *page) { // it exits and we can write... make sure it is a directory if(!info.isDir()) { - KMessageBox::sorry(this,i18n("%1 does not seem to be a folder. Please choose a valid folder.").arg(info.filePath()), + KMessageBox::sorry(this,i18n("%1 does not seem to be a folder. Please choose a valid folder.").tqarg(info.filePath()), i18n("Please Choose Valid Folder")); return; } @@ -232,7 +232,7 @@ void CodeGenerationWizard::moveSelectedItems(TQListView* fromList, TQListView* t TQListViewItem* selectedItem = it.current(); TQString name = selectedItem->text(0); - if (!toList->findItem(name, 0)) { + if (!toList->tqfindItem(name, 0)) { new TQListViewItem(toList, name); } diff --git a/umbrello/umbrello/dialogs/codegenerationwizard.h b/umbrello/umbrello/dialogs/codegenerationwizard.h index 2fec8046..13d36927 100644 --- a/umbrello/umbrello/dialogs/codegenerationwizard.h +++ b/umbrello/umbrello/dialogs/codegenerationwizard.h @@ -39,6 +39,7 @@ class CodeGenerationOptionsPage; class CodeGenerationWizard : public CodeGenerationWizardBase { Q_OBJECT + TQ_OBJECT public: CodeGenerationWizard(UMLClassifierList *classList); ~CodeGenerationWizard(); diff --git a/umbrello/umbrello/dialogs/codegenerationwizardbase.ui b/umbrello/umbrello/dialogs/codegenerationwizardbase.ui index 732aa0c7..be3de2e9 100644 --- a/umbrello/umbrello/dialogs/codegenerationwizardbase.ui +++ b/umbrello/umbrello/dialogs/codegenerationwizardbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>CodeGenerationWizardBase</class> -<widget class="QWizard"> +<widget class="TQWizard"> <property name="name"> <cstring>CodeGenerationWizardBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -15,7 +15,7 @@ <property name="caption"> <string>Code Generation Wizard</string> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>select</cstring> </property> @@ -32,7 +32,7 @@ <property name="spacing"> <number>10</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -41,7 +41,7 @@ for in the right hand side list</string> </property> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>Frame4</cstring> </property> @@ -64,7 +64,7 @@ for in the right hand side list</string> <property name="spacing"> <number>10</number> </property> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>m_addButton</cstring> </property> @@ -88,14 +88,14 @@ for in the right hand side list</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QListView" row="0" column="2" rowspan="5" colspan="1"> + <widget class="TQListView" row="0" column="2" rowspan="5" colspan="1"> <column> <property name="text"> <string>Classes Selected</string> @@ -122,7 +122,7 @@ for in the right hand side list</string> <enum>Extended</enum> </property> </widget> - <widget class="QPushButton" row="3" column="1"> + <widget class="TQPushButton" row="3" column="1"> <property name="name"> <cstring>m_removeButton</cstring> </property> @@ -146,14 +146,14 @@ for in the right hand side list</string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QListView" row="0" column="0" rowspan="5" colspan="1"> + <widget class="TQListView" row="0" column="0" rowspan="5" colspan="1"> <column> <property name="text"> <string>Classes Available</string> @@ -190,7 +190,7 @@ for in the right hand side list</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -201,12 +201,12 @@ for in the right hand side list</string> </widget> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>status</cstring> </property> <attribute name="title"> - <string>Code Generation Status</string> + <string>Code Generation tqStatus</string> </attribute> <vbox> <property name="name"> @@ -218,7 +218,7 @@ for in the right hand side list</string> <property name="spacing"> <number>10</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>m_label</cstring> </property> @@ -226,12 +226,12 @@ for in the right hand side list</string> <string>Press the Generation button to start the code generation</string> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox2</cstring> </property> <property name="title"> - <string>Generation Status</string> + <string>Generation tqStatus</string> </property> <vbox> <property name="name"> @@ -243,7 +243,7 @@ for in the right hand side list</string> <property name="spacing"> <number>10</number> </property> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Class</string> @@ -257,7 +257,7 @@ for in the right hand side list</string> </column> <column> <property name="text"> - <string>Generation Status</string> + <string>Generation tqStatus</string> </property> <property name="clickable"> <bool>true</bool> @@ -300,10 +300,10 @@ for in the right hand side list</string> <forwards> <forward>class UMLClassifier</forward> </forwards> -<slots> +<Q_SLOTS> <slot>selectClass()</slot> <slot access="protected">deselectClass()</slot> <slot>classGenerated( UMLClassifier * /* c */ )</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/umbrello/umbrello/dialogs/codeviewerdialog.cpp b/umbrello/umbrello/dialogs/codeviewerdialog.cpp index 479fcb6b..ef0091fe 100644 --- a/umbrello/umbrello/dialogs/codeviewerdialog.cpp +++ b/umbrello/umbrello/dialogs/codeviewerdialog.cpp @@ -30,10 +30,10 @@ #include "../classifiercodedocument.h" #include "codeeditor.h" -CodeViewerDialog::CodeViewerDialog ( TQWidget* parent, CodeDocument * doc, +CodeViewerDialog::CodeViewerDialog ( TQWidget* tqparent, CodeDocument * doc, Settings::CodeViewerState state, const char* name, bool modal, WFlags fl ) - : CodeViewerDialogBase ( parent, name, modal, fl ) + : CodeViewerDialogBase ( tqparent, name, modal, fl ) { m_state = state; @@ -49,7 +49,7 @@ CodeViewerDialog::CodeViewerDialog ( TQWidget* parent, CodeDocument * doc, */ CodeViewerDialog::~CodeViewerDialog() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } void CodeViewerDialog::initGUI ( const char * name) { @@ -69,7 +69,7 @@ void CodeViewerDialog::initGUI ( const char * name) { CodeViewerDialogBaseLayout->setMargin(margin); - resize( TQSize(width, height).expandedTo(minimumSizeHint()) ); + resize( TQSize(width, height).expandedTo(tqminimumSizeHint()) ); } diff --git a/umbrello/umbrello/dialogs/codeviewerdialog.h b/umbrello/umbrello/dialogs/codeviewerdialog.h index e27607bc..0f447d3a 100644 --- a/umbrello/umbrello/dialogs/codeviewerdialog.h +++ b/umbrello/umbrello/dialogs/codeviewerdialog.h @@ -42,16 +42,17 @@ class UMLObject; class CodeViewerDialog : public CodeViewerDialogBase { Q_OBJECT + TQ_OBJECT public: - CodeViewerDialog ( TQWidget* parent, CodeDocument * doc, Settings::CodeViewerState state, + CodeViewerDialog ( TQWidget* tqparent, CodeDocument * doc, Settings::CodeViewerState state, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~CodeViewerDialog (); /** return the code viewer state */ Settings::CodeViewerState getState( ); - TQString parentDocName; + TQString tqparentDocName; /** * Adds a code document to the tabbed output diff --git a/umbrello/umbrello/dialogs/codeviewerdialogbase.ui b/umbrello/umbrello/dialogs/codeviewerdialogbase.ui index 672aefdb..d8efcf93 100644 --- a/umbrello/umbrello/dialogs/codeviewerdialogbase.ui +++ b/umbrello/umbrello/dialogs/codeviewerdialogbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>CodeViewerDialogBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>CodeViewerDialogBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -27,15 +27,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="1"> + <widget class="TQCheckBox" row="0" column="1"> <property name="name"> <cstring>m_showHiddenCodeCB</cstring> </property> @@ -43,7 +43,7 @@ <string>Show hidden blocks</string> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>componentLabel</cstring> </property> @@ -62,7 +62,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton" row="0" column="2"> + <widget class="TQPushButton" row="0" column="2"> <property name="name"> <cstring>m_exitButton</cstring> </property> @@ -78,7 +78,7 @@ <string>Close</string> </property> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>m_highlightCheckBox</cstring> </property> @@ -91,7 +91,7 @@ </widget> </grid> </widget> - <widget class="QTabWidget" row="1" column="0"> + <widget class="TQTabWidget" row="1" column="0"> <property name="name"> <cstring>m_tabWidget</cstring> </property> @@ -106,8 +106,8 @@ <slot>close()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>changeHighlighting(int)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/umbrello/umbrello/dialogs/codevieweroptionsbase.ui b/umbrello/umbrello/dialogs/codevieweroptionsbase.ui index 99fd198d..6845d23d 100644 --- a/umbrello/umbrello/dialogs/codevieweroptionsbase.ui +++ b/umbrello/umbrello/dialogs/codevieweroptionsbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>CodeViewerOptionsBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CodeViewerOptionsBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -29,9 +29,9 @@ </sizepolicy> </property> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> - <cstring>colorGroupBox</cstring> + <cstring>tqcolorGroupBox</cstring> </property> <property name="sizePolicy"> <sizepolicy> @@ -48,7 +48,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>colorLayout</cstring> </property> @@ -56,7 +56,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>fontLabel</cstring> </property> @@ -87,7 +87,7 @@ </color> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>paperLabel</cstring> </property> @@ -118,7 +118,7 @@ </color> </property> </widget> - <widget class="QLabel" row="0" column="4"> + <widget class="TQLabel" row="0" column="4"> <property name="name"> <cstring>selectedLabel</cstring> </property> @@ -159,9 +159,9 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <grid> <property name="name"> @@ -190,9 +190,9 @@ </color> </property> </widget> - <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="4"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="4"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <grid> <property name="name"> @@ -244,7 +244,7 @@ </color> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -260,7 +260,7 @@ <string><p align="right">UML object block:</p></string> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -278,7 +278,7 @@ </widget> </grid> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -317,7 +317,7 @@ </color> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -362,7 +362,7 @@ <data format="XPM.GZ" length="4462">789c9d97c76e24490e86effd1442f3d65870d2451a0ce6206f5adeb4cc620f8c34f2553225b5a4c1befb46927fe6a1d4c0ccac4287fa8a0c26834193f5dbb785b3fd9d856fbf7d799ec9ecba5ea8afe469e15bf3727ffffeeffffcf1e797af49b2d0ffc7d142f2f55f5fbe1ecc16ea85dde9a4ed81290045faa77ca49cf4ab67ba1e3953969173651ab9d4fdf1c8a27c3872ad7c3c72d3b32c2a67c3f3444636fbef23eb7e590267e68fcc4656395d8dacf6d938ef97eaef289781cddebdb2846fccff44b989ba58e3411f3dc75158e6df1d3889539517ca49bf54fe43398d1dec4f46567f685fd9c539f43fc025f80c1c3ce8d93f28e77185f8bf0c6cfae4c0b5f9c3c6e5c0542a4b5876fe13708df39d2bd7716372aa8c93c4e4723bb2f977aadc26ceec4bdb7310e6b0bfab9c2445ecd49f1370694cebca65d260ffa6711a41aef14d24e94cee6be3348e0ae5e9c8765f07ca3e8db17f0f9c825794eb3489351fe9bb7217e4969f29388bd51ee9fda5715a19730696b852fea95c6471647ca95cf64bcf43e0cef4657b647bfe6acf213d6bb32f9a9f5992b5a64f9a8f990b6cf9ecc15d6cf9acf6b2da55a8a75cb973dee4b2d1b38b5c05de02434e87e01aacfb351df5bebddea74b5c67f9c795711ea15e357e2ecde358fb87efc0a867df8cac728a074e62e527706afb59f3cf6583be5c28bb3c35f693812d1fbdc6dbe57966fec932d899ffa4f7e38adca17e34beaeca4b9c271a18f1d5fc739257b0d70d9c68be7bed7fcee7827ab91cd8e4740cf6b19d4ffb87ab07b9bf516e72d4a3ac821b9cef6e60d84f47367ded2fae1d9f7704f6163f79000ffde27660f387ed3c5dbf54dfeebb0bf6acbe6b706bfa5ef32f8f8b18f5bf0f463f20edb77956a4e68fbc80b3c4facd163847be6bfde72ec86dbeac82715fbc0286be683cf3bc081d44f7df80d344fb0b6b7de64581fb916765297263d6fccd9b7ee97e566e8b06cfdb1f59cf2bda2f8bbc2c11df0c5c41aefdb328ca22b1feb0012eedbce24736f91b18fb796d64eb87cb60817dcdafb07d906bfd14d22f659d8785ef97b2f6d7b2df6ef1d6fb2babaac6f92e8c25b27ecc1f239b7f3a5fca5a8678ea7c2d9bc0e6ef1238b3fca2c7814d5f4cbf9334b5f833384bed3c7a5f5514f4adbe2ec07962e7590457f06f6f649b977afe2a16f42f5e070bfc591e18f7a5f1a812a9e0df39d827da4fbd8c6ccfd7785569bf945f953371a9d5a3de67950bfa2d75c63eb2fb15bdcfaaf011e6c7263846bf8f4636f91618f3c7d3c0f047fb69550efab2074e12bd6fd27957553ec33c5b043bcc7f9d0795f818fdb501a3df8ae673e507ff69021eea37063bc45ffb73550736ff36c0a84f3e0317a86f8b5f139e6ffe1f821de6d9127898ff3be00a7c3ab2cd03e3d697560ff40016e47b3bb2e96bbd559d8f32bbff4b7065f193042c98873acf240af6adbf3c83c5f2954bb0c7bcd77c107d81d2fdebc63e33ff640aaecc9e1c8151df5c803dfaadc64b52dfa03ed64636ffb4ff4b2867f453ede7227586fcd3f9264ded91fffafe236d5da37fe83c91ceb7b9e5b7f6731ff92ed7f747d6fbf7e185cf58347e3e6932e47b3430fa893edf87d795c2fc3f003b67f5f902cec17abfde0dfa3c053b3c5ffb832fc2eb8fddcf233887fc195c801f46b6f3cdc02558fba72f7d2d1a7f7e321ee58fe0cad86bbff24dd3e2fe74fef836b0c6eb60d62fa6bf5e07b3419f853dd7dc70fb8bd5f1255fd90ed30f9f3c5ff30ddff21ddff384a7fcc08ffcc4cf61cdf8855ff9e79c7e1db4dff89d3f7891977899577895d7789d377893b7f83b6fcfe937bc13b477798ff7f9800ff928ac633ee11f7cca6761d7f99c7e1b3cb908da11c7413be1943376e153cc39175c72f549ff9e17c31744429e6a6aa8a58e2ee98aaee9866e7f617fc24b7417a4f734a1293dd0233dd133cd8285177aa5f9f3b63ca5377aa78f607b919668995682e62aadd17ab0b1419b9ff41f682b48bed336edd02eed05ed7d5ea3033a0cdf1ed1f127fd273ae123fa41a774a6b685cee982228a837e42e927fd47caf8985c38651eb40b2ac38e4a5842658a97fab33fd248cb87d2c9a55cc9b5dcc82d1fc99ddccb44a6f230af2f8ff224cf417f262ff22a3fe54ddee543166549966545567f617f4dd66523dc6b2c9bb225df655b7682f692ecca9eeccfe97772c09b722847722c27c1f3eb70f66bf9116c9fca999ccbc59cfe25bf4a143a5ef8992561324a78bd92522acf9ebc78efe7cf7b153276db37bef59dbff457fedadff85b7f27abfede4ffcd4cf9ff76faeff4fffefeff8c7f5fedfdfbffc0fa355c495</data> </image> </images> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> </includehints> diff --git a/umbrello/umbrello/dialogs/codevieweroptionspage.cpp b/umbrello/umbrello/dialogs/codevieweroptionspage.cpp index f4715b0d..3950d682 100644 --- a/umbrello/umbrello/dialogs/codevieweroptionspage.cpp +++ b/umbrello/umbrello/dialogs/codevieweroptionspage.cpp @@ -26,8 +26,8 @@ #include <kcolorbutton.h> -CodeViewerOptionsPage::CodeViewerOptionsPage( Settings::CodeViewerState options, TQWidget *parent, const char *name ) - :CodeViewerOptionsBase(parent,name) +CodeViewerOptionsPage::CodeViewerOptionsPage( Settings::CodeViewerState options, TQWidget *tqparent, const char *name ) + :CodeViewerOptionsBase(tqparent,name) { init (options); } diff --git a/umbrello/umbrello/dialogs/codevieweroptionspage.h b/umbrello/umbrello/dialogs/codevieweroptionspage.h index fae3cb05..f5a21736 100644 --- a/umbrello/umbrello/dialogs/codevieweroptionspage.h +++ b/umbrello/umbrello/dialogs/codevieweroptionspage.h @@ -28,8 +28,9 @@ class CodeViewerOptionsPage : public CodeViewerOptionsBase { Q_OBJECT + TQ_OBJECT public: - CodeViewerOptionsPage (Settings::CodeViewerState options, TQWidget *parent, const char *name=0); + CodeViewerOptionsPage (Settings::CodeViewerState options, TQWidget *tqparent, const char *name=0); ~CodeViewerOptionsPage(); Settings::CodeViewerState getOptions(); diff --git a/umbrello/umbrello/dialogs/defaultcodegenpolicypage.cpp b/umbrello/umbrello/dialogs/defaultcodegenpolicypage.cpp index 3da163b7..9732bbaf 100644 --- a/umbrello/umbrello/dialogs/defaultcodegenpolicypage.cpp +++ b/umbrello/umbrello/dialogs/defaultcodegenpolicypage.cpp @@ -29,10 +29,10 @@ /** This is the page which comes up IF there is no special options for the * code generator. */ -DefaultCodeGenPolicyPage::DefaultCodeGenPolicyPage ( TQWidget *parent, const char *name, CodeGenPolicyExt * policy ) - :CodeGenerationPolicyPage(parent,name,policy) +DefaultCodeGenPolicyPage::DefaultCodeGenPolicyPage ( TQWidget *tqparent, const char *name, CodeGenPolicyExt * policy ) + :CodeGenerationPolicyPage(tqparent,name,policy) { - textLabel = new TQLabel(parent,"textLabel"); + textLabel = new TQLabel(tqparent,"textLabel"); textLabel->setText(tr2i18n("<p align=\"center\">No Options Available.</p>")); } diff --git a/umbrello/umbrello/dialogs/defaultcodegenpolicypage.h b/umbrello/umbrello/dialogs/defaultcodegenpolicypage.h index 68f55066..2bbf169c 100644 --- a/umbrello/umbrello/dialogs/defaultcodegenpolicypage.h +++ b/umbrello/umbrello/dialogs/defaultcodegenpolicypage.h @@ -24,10 +24,11 @@ class CodeGenePolicyExt; class DefaultCodeGenPolicyPage : public CodeGenerationPolicyPage { Q_OBJECT + TQ_OBJECT public: - explicit DefaultCodeGenPolicyPage( TQWidget* parent = 0, const char* name = 0, CodeGenPolicyExt * policy =0); + explicit DefaultCodeGenPolicyPage( TQWidget* tqparent = 0, const char* name = 0, CodeGenPolicyExt * policy =0); ~DefaultCodeGenPolicyPage(); diff --git a/umbrello/umbrello/dialogs/diagramprintpage.cpp b/umbrello/umbrello/dialogs/diagramprintpage.cpp index 8374def4..cff98397 100644 --- a/umbrello/umbrello/dialogs/diagramprintpage.cpp +++ b/umbrello/umbrello/dialogs/diagramprintpage.cpp @@ -30,7 +30,7 @@ #include "../umlnamespace.h" -DiagramPrintPage::DiagramPrintPage(TQWidget * parent, UMLDoc * m_pDoc) : KPrintDialogPage(parent), m_pDoc(m_pDoc) { +DiagramPrintPage::DiagramPrintPage(TQWidget * tqparent, UMLDoc * m_pDoc) : KPrintDialogPage(tqparent), m_pDoc(m_pDoc) { int margin = fontMetrics().height(); setTitle(i18n("&Diagrams")); TQHBoxLayout * mainLayout = new TQHBoxLayout(this); @@ -112,13 +112,13 @@ void DiagramPrintPage::getOptions( TQMap<TQString,TQString>& opts, bool /*inclde for(int i=0;i<listCount;i++) { if(m_pSelectLB -> isSelected(i)) { UMLView *view = (UMLView *)m_pDoc -> findView(m_nIdList[i]); - TQString sCount = TQString("%1").arg(count); - TQString sID = TQString("%1").arg(ID2STR(view -> getID())); + TQString sCount = TQString("%1").tqarg(count); + TQString sID = TQString("%1").tqarg(ID2STR(view -> getID())); opts.insert(diagram + sCount, sID); count++; } } - opts.insert("kde-uml-count", TQString("%1").arg(count)); + opts.insert("kde-uml-count", TQString("%1").tqarg(count)); } void DiagramPrintPage::setOptions( const TQMap<TQString,TQString>& /*opts*/ ) {} diff --git a/umbrello/umbrello/dialogs/diagramprintpage.h b/umbrello/umbrello/dialogs/diagramprintpage.h index d5f55933..94e1deb5 100644 --- a/umbrello/umbrello/dialogs/diagramprintpage.h +++ b/umbrello/umbrello/dialogs/diagramprintpage.h @@ -36,14 +36,15 @@ class TQGroupBox; class DiagramPrintPage : public KPrintDialogPage { Q_OBJECT + TQ_OBJECT public: /** * Constructs the diagram print page. * - * @param parent The parent to the page. + * @param tqparent The tqparent to the page. * @param doc The @ref UMLDoc class instance being used. */ - DiagramPrintPage(TQWidget * parent, UMLDoc *doc); + DiagramPrintPage(TQWidget * tqparent, UMLDoc *doc); /** * Stnadard deconstructor. diff --git a/umbrello/umbrello/dialogs/diagrampropertiespage.ui b/umbrello/umbrello/dialogs/diagrampropertiespage.ui index 8a8d2826..bf07ce16 100644 --- a/umbrello/umbrello/dialogs/diagrampropertiespage.ui +++ b/umbrello/umbrello/dialogs/diagrampropertiespage.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>DiagramPropertiesPage</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DiagramPropertiesPage</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -22,7 +22,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox1</cstring> </property> @@ -39,7 +39,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -53,7 +53,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -61,30 +61,30 @@ <string>Name:</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>diagramName</cstring> </property> </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout20</cstring> + <cstring>tqlayout20</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -92,7 +92,7 @@ <string>Zoom:</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>zoom</cstring> </property> @@ -111,7 +111,7 @@ <number>10</number> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -131,14 +131,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>50</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>showOpSigs</cstring> </property> @@ -162,23 +162,23 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>showGrid</cstring> </property> @@ -186,7 +186,7 @@ <string>Show &grid</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>snapToGrid</cstring> </property> @@ -194,7 +194,7 @@ <string>Snap &to grid</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>snapComponentSizeToGrid</cstring> </property> @@ -218,7 +218,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -227,15 +227,15 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on </spacer> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -249,7 +249,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -257,7 +257,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on <string>Grid spacing: </string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabelX</cstring> </property> @@ -265,7 +265,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on <string>X</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>gridSpaceX</cstring> </property> @@ -276,7 +276,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on <number>5</number> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -284,7 +284,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on <string>Y</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>gridSpaceY</cstring> </property> @@ -307,7 +307,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -316,15 +316,15 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on </spacer> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -338,7 +338,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabe15</cstring> </property> @@ -346,7 +346,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on <string>Line width: </string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>lineWidth</cstring> </property> @@ -369,7 +369,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -380,7 +380,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox2</cstring> </property> @@ -397,7 +397,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on <property name="spacing"> <number>6</number> </property> - <widget class="QTextEdit" row="0" column="0"> + <widget class="TQTextEdit" row="0" column="0"> <property name="name"> <cstring>documentation</cstring> </property> @@ -406,5 +406,5 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/umbrello/umbrello/dialogs/exportallviewsdialog.cpp b/umbrello/umbrello/dialogs/exportallviewsdialog.cpp index b72901be..fa1e6d60 100644 --- a/umbrello/umbrello/dialogs/exportallviewsdialog.cpp +++ b/umbrello/umbrello/dialogs/exportallviewsdialog.cpp @@ -12,7 +12,7 @@ // own header #include "exportallviewsdialog.h" -// include files for Qt +// include files for TQt #include <tqlayout.h> #include <tqlabel.h> #include <tqtooltip.h> @@ -25,15 +25,15 @@ #include "../umlviewimageexportermodel.h" ExportAllViewsDialog::ExportAllViewsDialog( - TQWidget* parent /* = 0 */, + TQWidget* tqparent /* = 0 */, const char* name /* = 0 */, bool modal /* = false */, WFlags fl /* = 0*/, const TQString &defaultMimeType /*= "image/png"*/) - : ExportAllViewsDialogBase(parent,name, modal,fl) { + : ExportAllViewsDialogBase(tqparent,name, modal,fl) { // create and initialize m_imageType m_imageType = new KFileFilterCombo(this, "m_imageType"); - m_imageType->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 0, m_imageType->sizePolicy().hasHeightForWidth())); + m_imageType->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 0, m_imageType->sizePolicy().hasHeightForWidth())); m_imageType->setEditable(false); m_imageType->setMimeFilter(UMLViewImageExporterModel::supportedMimeTypes(), defaultMimeType); diff --git a/umbrello/umbrello/dialogs/exportallviewsdialog.h b/umbrello/umbrello/dialogs/exportallviewsdialog.h index 793f69b9..3b28037c 100644 --- a/umbrello/umbrello/dialogs/exportallviewsdialog.h +++ b/umbrello/umbrello/dialogs/exportallviewsdialog.h @@ -28,22 +28,23 @@ class KFileFilterCombo; */ class ExportAllViewsDialog : public ExportAllViewsDialogBase { Q_OBJECT + TQ_OBJECT public: /** * Constructor for UMLViewImageExporterModel. * - * @param parent The parent of the dialog. + * @param tqparent The tqparent of the dialog. * @param name The internal name. * @param modal If modal is true the dialog will block input to other the windows * in the application until it's closed. * @param fl Window flags. * @param defaultMimeType The default mime type that appears in the mime types list. * - * @see TQDialog::QDialog + * @see TQDialog::TQDialog */ - explicit ExportAllViewsDialog(TQWidget* parent = 0, const char* name = 0, + explicit ExportAllViewsDialog(TQWidget* tqparent = 0, const char* name = 0, bool modal = false, WFlags fl = 0, const TQString& defaultMimeType = "image/png"); diff --git a/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui b/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui index c82820a3..a97e6ff0 100644 --- a/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui +++ b/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>ExportAllViewsDialogBase</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>ExportAllViewsDialogBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>mainLayout</cstring> </property> @@ -33,7 +33,7 @@ <property name="spacing"> <number>15</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>kURLRequesterLayout</cstring> </property> @@ -41,7 +41,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>kURLRequesterLabel</cstring> </property> @@ -68,7 +68,7 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>imageTypeLayout</cstring> </property> @@ -76,7 +76,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>imageTypeLabel</cstring> </property> @@ -92,7 +92,7 @@ </widget> </vbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>m_useFolders</cstring> </property> @@ -120,14 +120,14 @@ Only the folders made by the user are created in the base directory (Logical vie <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>buttonsLayout</cstring> </property> @@ -151,14 +151,14 @@ Only the folders made by the user are created in the base directory (Logical vie <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -175,7 +175,7 @@ Only the folders made by the user are created in the base directory (Logical vie <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -207,7 +207,7 @@ Only the folders made by the user are created in the base directory (Logical vie <slot>reject()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/umbrello/umbrello/dialogs/notedialog.cpp b/umbrello/umbrello/dialogs/notedialog.cpp index effb585d..420b425e 100644 --- a/umbrello/umbrello/dialogs/notedialog.cpp +++ b/umbrello/umbrello/dialogs/notedialog.cpp @@ -22,7 +22,7 @@ #include <kmessagebox.h> -NoteDialog::NoteDialog( TQWidget * parent, NoteWidget * pNote ) : KDialogBase(Plain, i18n("Note Documentation"), Help | Ok | Cancel , Ok, parent, "_NOTEDIALOG_", true, true) { +NoteDialog::NoteDialog( TQWidget * tqparent, NoteWidget * pNote ) : KDialogBase(Plain, i18n("Note Documentation"), Help | Ok | Cancel , Ok, tqparent, "_NOTEDIALOG_", true, true) { m_pNoteWidget = pNote; int margin = fontMetrics().height(); diff --git a/umbrello/umbrello/dialogs/notedialog.h b/umbrello/umbrello/dialogs/notedialog.h index 22f41708..6f6e2fd2 100644 --- a/umbrello/umbrello/dialogs/notedialog.h +++ b/umbrello/umbrello/dialogs/notedialog.h @@ -27,12 +27,13 @@ class TQTextEdit; class NoteDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * Constructs an NoteDialog. */ - NoteDialog( TQWidget * parent, NoteWidget * pNote ); + NoteDialog( TQWidget * tqparent, NoteWidget * pNote ); /** * Standard deconstructor. diff --git a/umbrello/umbrello/dialogs/overwritedialogue.cpp b/umbrello/umbrello/dialogs/overwritedialogue.cpp index c9cb8b92..c7661ced 100644 --- a/umbrello/umbrello/dialogs/overwritedialogue.cpp +++ b/umbrello/umbrello/dialogs/overwritedialogue.cpp @@ -23,17 +23,17 @@ OverwriteDialogue::OverwriteDialogue( const TQString& fileName, const TQString& outputDirectory, - bool applyToAllRemaining, TQWidget* parent, const char* name) : -KDialogBase(Plain, i18n("Destination File Already Exists"), Ok|Apply|Cancel, Yes, parent, name) { + bool applyToAllRemaining, TQWidget* tqparent, const char* name) : +KDialogBase(Plain, i18n("Destination File Already Exists"), Ok|Apply|Cancel, Yes, tqparent, name) { - TQVBoxLayout* layout = new TQVBoxLayout( plainPage(), 0, spacingHint() ); + TQVBoxLayout* tqlayout = new TQVBoxLayout( plainPage(), 0, spacingHint() ); - TQLabel* dialogueLabel = new TQLabel(i18n("The file %1 already exists in %2.\n\nUmbrello can overwrite the file, generate a similar\nfile name or not generate this file.").arg(fileName).arg(outputDirectory), plainPage() ); - layout->addWidget(dialogueLabel); + TQLabel* dialogueLabel = new TQLabel(i18n("The file %1 already exists in %2.\n\nUmbrello can overwrite the file, generate a similar\nfile name or not generate this file.").tqarg(fileName).tqarg(outputDirectory), plainPage() ); + tqlayout->addWidget(dialogueLabel); m_applyToAllRemaining = new TQCheckBox( i18n("&Apply to all remaining files"), plainPage() ); m_applyToAllRemaining->setChecked(applyToAllRemaining); - layout->addWidget(m_applyToAllRemaining); + tqlayout->addWidget(m_applyToAllRemaining); setButtonText(KDialogBase::Ok, i18n("&Overwrite")); setButtonText(KDialogBase::Apply, i18n("&Generate Similar File Name")); diff --git a/umbrello/umbrello/dialogs/overwritedialogue.h b/umbrello/umbrello/dialogs/overwritedialogue.h index 3c49cd34..f67d7673 100644 --- a/umbrello/umbrello/dialogs/overwritedialogue.h +++ b/umbrello/umbrello/dialogs/overwritedialogue.h @@ -29,13 +29,14 @@ class TQCheckBox; */ class OverwriteDialogue: public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * constructor sets up the dialog, adding checkbox and label */ OverwriteDialogue(const TQString& fileName, const TQString& outputDirectory, - bool applyToAllRemaining, TQWidget* parent=0, const char* name=0); + bool applyToAllRemaining, TQWidget* tqparent=0, const char* name=0); /** * destrictor doesn't do anything diff --git a/umbrello/umbrello/dialogs/parmpropdlg.cpp b/umbrello/umbrello/dialogs/parmpropdlg.cpp index 38a75292..ce5b5590 100644 --- a/umbrello/umbrello/dialogs/parmpropdlg.cpp +++ b/umbrello/umbrello/dialogs/parmpropdlg.cpp @@ -31,8 +31,8 @@ #include "parmpropdlg.moc" -ParmPropDlg::ParmPropDlg(TQWidget * parent, UMLDoc * doc, UMLAttribute * a) - : KDialogBase(Plain, i18n("Parameter Properties"), Help | Ok | Cancel , Ok, parent, "_PARMPROPDLG_", true, true) +ParmPropDlg::ParmPropDlg(TQWidget * tqparent, UMLDoc * doc, UMLAttribute * a) + : KDialogBase(Plain, i18n("Parameter Properties"), Help | Ok | Cancel , Ok, tqparent, "_PARMPROPDLG_", true, true) { m_pUmldoc = doc; m_pAtt = a; @@ -127,9 +127,9 @@ ParmPropDlg::ParmPropDlg(TQWidget * parent, UMLDoc * doc, UMLAttribute * a) // m_pTypeCB->setAutoCompletion(false); //add template parameters - UMLClassifier *pConcept = dynamic_cast<UMLClassifier*>( m_pAtt->parent()->parent() ); + UMLClassifier *pConcept = dynamic_cast<UMLClassifier*>( m_pAtt->tqparent()->tqparent() ); if (pConcept == NULL) { - kError() << "ParmPropDlg: grandparent of " << m_pAtt->getName() + kError() << "ParmPropDlg: grandtqparent of " << m_pAtt->getName() << " is not a UMLClassifier" << endl; } else { UMLTemplateList tmplParams( pConcept->getTemplateList() ); @@ -219,9 +219,9 @@ void ParmPropDlg::slotOk() { m_pAtt->setParmKind( getParmKind() ); m_pAtt->setStereotype( m_pStereoTypeCB->currentText() ); TQString typeName = m_pTypeCB->currentText(); - UMLClassifier * pConcept = dynamic_cast<UMLClassifier*>( m_pAtt->parent()->parent() ); + UMLClassifier * pConcept = dynamic_cast<UMLClassifier*>( m_pAtt->tqparent()->tqparent() ); if (pConcept == NULL) { - kError() << "ParmPropDlg::slotOk: grandparent of " << m_pAtt->getName() + kError() << "ParmPropDlg::slotOk: grandtqparent of " << m_pAtt->getName() << " is not a UMLClassifier" << endl; } else { UMLTemplate *tmplParam = pConcept->findTemplate(typeName); diff --git a/umbrello/umbrello/dialogs/parmpropdlg.h b/umbrello/umbrello/dialogs/parmpropdlg.h index b8efd75b..8beca582 100644 --- a/umbrello/umbrello/dialogs/parmpropdlg.h +++ b/umbrello/umbrello/dialogs/parmpropdlg.h @@ -29,7 +29,7 @@ class UMLDoc; /** * Displays a dialog box that displays properties of a paramater. * You need to make sure that @ref UMLDoc is made to be the - * parent. + * tqparent. * * @short A properties dialog box for a parameter. * @author Paul Hensgen <phensgen@techie.com> @@ -37,14 +37,15 @@ class UMLDoc; */ class ParmPropDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * Constructs a ParmPropDlg. * - * @param parent The parent of the dialog. + * @param tqparent The tqparent of the dialog. * @param a The parameter to represent. */ - ParmPropDlg(TQWidget * parent, UMLDoc * doc, UMLAttribute * a); + ParmPropDlg(TQWidget * tqparent, UMLDoc * doc, UMLAttribute * a); /** * Standard deconstructor. diff --git a/umbrello/umbrello/dialogs/pkgcontentspage.cpp b/umbrello/umbrello/dialogs/pkgcontentspage.cpp index dce7c98b..6d9473c7 100644 --- a/umbrello/umbrello/dialogs/pkgcontentspage.cpp +++ b/umbrello/umbrello/dialogs/pkgcontentspage.cpp @@ -17,8 +17,8 @@ #include "../umldoc.h" #include "classpropdlg.h" -PkgContentsPage::PkgContentsPage(TQWidget *parent, UMLPackage *pkg) - : TQWidget(parent) +PkgContentsPage::PkgContentsPage(TQWidget *tqparent, UMLPackage *pkg) + : TQWidget(tqparent) { m_pPackage = pkg; int margin = fontMetrics().height(); @@ -29,12 +29,12 @@ PkgContentsPage::PkgContentsPage(TQWidget *parent, UMLPackage *pkg) m_pContentGB = new TQGroupBox(i18n("Contained Items"), this); mainLayout -> addWidget(m_pContentGB); - TQHBoxLayout * layout = new TQHBoxLayout(m_pContentGB); - layout -> setSpacing(10); - layout -> setMargin(margin); + TQHBoxLayout * tqlayout = new TQHBoxLayout(m_pContentGB); + tqlayout -> setSpacing(10); + tqlayout -> setMargin(margin); m_pContentLB = new TQListBox(m_pContentGB); - layout -> addWidget(m_pContentLB); + tqlayout -> addWidget(m_pContentLB); setMinimumSize(310, 330); fillListBox(); m_pMenu = 0; diff --git a/umbrello/umbrello/dialogs/pkgcontentspage.h b/umbrello/umbrello/dialogs/pkgcontentspage.h index b95e5348..ef6faff1 100644 --- a/umbrello/umbrello/dialogs/pkgcontentspage.h +++ b/umbrello/umbrello/dialogs/pkgcontentspage.h @@ -27,14 +27,15 @@ */ class PkgContentsPage : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** * Constructs an instance of PkgContentsPage. * - * @param parent The parent of the page. + * @param tqparent The tqparent of the page. * @param pkg The UMLPackage being represented. */ - PkgContentsPage(TQWidget *parent, UMLPackage *pkg); + PkgContentsPage(TQWidget *tqparent, UMLPackage *pkg); /** * Standard destructor. diff --git a/umbrello/umbrello/dialogs/selectopdlg.cpp b/umbrello/umbrello/dialogs/selectopdlg.cpp index 1c175752..e49ea6d9 100644 --- a/umbrello/umbrello/dialogs/selectopdlg.cpp +++ b/umbrello/umbrello/dialogs/selectopdlg.cpp @@ -26,10 +26,10 @@ #include "../umlview.h" #include "../dialog_utils.h" -SelectOpDlg::SelectOpDlg(UMLView * parent, UMLClassifier * c) - : KDialogBase(Plain, i18n("Select Operation"), Ok | Cancel , Ok, parent, "_SELOPDLG_", true, true) +SelectOpDlg::SelectOpDlg(UMLView * tqparent, UMLClassifier * c) + : KDialogBase(Plain, i18n("Select Operation"), Ok | Cancel , Ok, tqparent, "_SELOPDLG_", true, true) { - m_pView = parent; + m_pView = tqparent; TQVBoxLayout * topLayout = new TQVBoxLayout(plainPage()); m_pOpGB = new TQGroupBox(i18n("Select Operation"), plainPage()); diff --git a/umbrello/umbrello/dialogs/selectopdlg.h b/umbrello/umbrello/dialogs/selectopdlg.h index 4bbcf52b..3c12b1b1 100644 --- a/umbrello/umbrello/dialogs/selectopdlg.h +++ b/umbrello/umbrello/dialogs/selectopdlg.h @@ -39,14 +39,15 @@ class UMLView; class SelectOpDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * Constructs a SelectOpDlg instance. * - * @param parent The parent to this instance. + * @param tqparent The tqparent to this instance. * @param c The concept to get the operations from. */ - SelectOpDlg(UMLView * parent, UMLClassifier * c); + SelectOpDlg(UMLView * tqparent, UMLClassifier * c); /** * Standard deconstructor. diff --git a/umbrello/umbrello/dialogs/settingsdlg.cpp b/umbrello/umbrello/dialogs/settingsdlg.cpp index 59b9ff28..f051925a 100644 --- a/umbrello/umbrello/dialogs/settingsdlg.cpp +++ b/umbrello/umbrello/dialogs/settingsdlg.cpp @@ -26,12 +26,12 @@ #include "codevieweroptionspage.h" #include "../dialog_utils.h" -SettingsDlg::SettingsDlg( TQWidget * parent, Settings::OptionState *state ) +SettingsDlg::SettingsDlg( TQWidget * tqparent, Settings::OptionState *state ) : KDialogBase( IconList, i18n("Umbrello Setup"), - Help | Default | Apply | Ok | Cancel, Ok, parent, 0, true, true ) { + Help | Default | Apply | Ok | Cancel, Ok, tqparent, 0, true, true ) { m_bChangesApplied = false; m_pOptionState = state; - setHelp( "umbrello/index.html", TQString::null ); + setHelp( "umbrello/index.html", TQString() ); setupGeneralPage(); setupFontPage(); setupUIPage(); @@ -343,13 +343,13 @@ void SettingsDlg::slotDefault() { break; case Settings::page_font: - m_FontWidgets.chooser -> setFont( parentWidget() -> font() ); + m_FontWidgets.chooser -> setFont( tqparentWidget() -> font() ); break; case Settings::page_UI: m_UiWidgets.useFillColorCB -> setChecked( true ); m_UiWidgets.fillColorB -> setColor( TQColor( 255, 255, 192 ) ); - m_UiWidgets.lineColorB -> setColor( Qt::red ); + m_UiWidgets.lineColorB -> setColor( TQt::red ); m_UiWidgets.lineWidthB -> setValue( 0 ); break; @@ -425,7 +425,7 @@ void SettingsDlg::applyPage( Settings::Page page ) { } void SettingsDlg::slotLineBClicked() { - m_UiWidgets.lineColorB -> setColor( Qt::red ); + m_UiWidgets.lineColorB -> setColor( TQt::red ); } void SettingsDlg::slotFillBClicked() { diff --git a/umbrello/umbrello/dialogs/settingsdlg.h b/umbrello/umbrello/dialogs/settingsdlg.h index c00437b2..a01696c8 100644 --- a/umbrello/umbrello/dialogs/settingsdlg.h +++ b/umbrello/umbrello/dialogs/settingsdlg.h @@ -43,9 +43,10 @@ class CodeGenerator; class SettingsDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - SettingsDlg(TQWidget * parent, Settings::OptionState *state); + SettingsDlg(TQWidget * tqparent, Settings::OptionState *state); ~SettingsDlg(); //public methods diff --git a/umbrello/umbrello/dialogs/statedialog.h b/umbrello/umbrello/dialogs/statedialog.h index 9ed9b5ec..5e3c9300 100644 --- a/umbrello/umbrello/dialogs/statedialog.h +++ b/umbrello/umbrello/dialogs/statedialog.h @@ -37,6 +37,7 @@ class KFontChooser; class StateDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** @@ -51,7 +52,7 @@ public: return m_bChangesMade; } -protected slots: +protected: enum Page { @@ -61,6 +62,8 @@ protected slots: FontPage }; +protected slots: + /** * Entered when OK button pressed. */ diff --git a/umbrello/umbrello/dialogs/umlattributedialog.cpp b/umbrello/umbrello/dialogs/umlattributedialog.cpp index d6ea57ce..2568fd92 100644 --- a/umbrello/umbrello/dialogs/umlattributedialog.cpp +++ b/umbrello/umbrello/dialogs/umlattributedialog.cpp @@ -157,7 +157,7 @@ bool UMLAttributeDialog::apply() { m_pNameLE->setText( m_pAttribute->getName() ); return false; } - UMLClassifier * pConcept = dynamic_cast<UMLClassifier *>( m_pAttribute->parent() ); + UMLClassifier * pConcept = dynamic_cast<UMLClassifier *>( m_pAttribute->tqparent() ); UMLObject *o = pConcept->findChildObject(name); if (o && o != m_pAttribute) { KMessageBox::error(this, i18n("The attribute name you have chosen is already being used in this operation."), @@ -204,7 +204,7 @@ bool UMLAttributeDialog::apply() { } else { // If it's obviously a pointer type (C++) then create a datatype. // Else we don't know what it is so as a compromise create a class. - Uml::Object_Type ot = (typeName.contains('*') ? Uml::ot_Datatype : Uml::ot_Class); + Uml::Object_Type ot = (typeName.tqcontains('*') ? Uml::ot_Datatype : Uml::ot_Class); obj = Object_Factory::createUMLObject(ot, typeName); } if (obj == NULL) diff --git a/umbrello/umbrello/dialogs/umlattributedialog.h b/umbrello/umbrello/dialogs/umlattributedialog.h index 98d11511..d21d2834 100644 --- a/umbrello/umbrello/dialogs/umlattributedialog.h +++ b/umbrello/umbrello/dialogs/umlattributedialog.h @@ -29,6 +29,7 @@ class TQLineEdit; class UMLAttributeDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: UMLAttributeDialog( TQWidget * pParent, UMLAttribute * pAttribute ); ~UMLAttributeDialog(); diff --git a/umbrello/umbrello/dialogs/umlentityattributedialog.cpp b/umbrello/umbrello/dialogs/umlentityattributedialog.cpp index 55a47857..a84d302b 100644 --- a/umbrello/umbrello/dialogs/umlentityattributedialog.cpp +++ b/umbrello/umbrello/dialogs/umlentityattributedialog.cpp @@ -186,7 +186,7 @@ bool UMLEntityAttributeDialog::apply() { m_pNameLE->setText( m_pEntityAttribute->getName() ); return false; } - UMLClassifier * pConcept = dynamic_cast<UMLClassifier *>( m_pEntityAttribute->parent() ); + UMLClassifier * pConcept = dynamic_cast<UMLClassifier *>( m_pEntityAttribute->tqparent() ); UMLObject *o = pConcept->findChildObject(name); if (o && o != m_pEntityAttribute) { KMessageBox::error(this, i18n("The entity attribute name you have chosen is already being used in this operation."), @@ -227,7 +227,7 @@ bool UMLEntityAttributeDialog::apply() { if (classifier == NULL) { // If it's obviously a pointer type (C++) then create a datatype. // Else we don't know what it is so as a compromise create a class. - Uml::Object_Type ot = (typeName.contains('*') ? Uml::ot_Datatype + Uml::Object_Type ot = (typeName.tqcontains('*') ? Uml::ot_Datatype : Uml::ot_Class); obj = Object_Factory::createUMLObject(ot, typeName); if (obj == NULL) diff --git a/umbrello/umbrello/dialogs/umlentityattributedialog.h b/umbrello/umbrello/dialogs/umlentityattributedialog.h index 7be7516f..1cd5c338 100644 --- a/umbrello/umbrello/dialogs/umlentityattributedialog.h +++ b/umbrello/umbrello/dialogs/umlentityattributedialog.h @@ -29,6 +29,7 @@ class TQLineEdit; class UMLEntityAttributeDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: UMLEntityAttributeDialog( TQWidget* pParent, UMLEntityAttribute* pEntityAttribute ); ~UMLEntityAttributeDialog(); diff --git a/umbrello/umbrello/dialogs/umloperationdialog.cpp b/umbrello/umbrello/dialogs/umloperationdialog.cpp index 37e8f64c..7edb1e35 100644 --- a/umbrello/umbrello/dialogs/umloperationdialog.cpp +++ b/umbrello/umbrello/dialogs/umloperationdialog.cpp @@ -46,8 +46,8 @@ #include "../stereotype.h" #include "../uniqueid.h" -UMLOperationDialog::UMLOperationDialog( TQWidget * parent, UMLOperation * pOperation ) - : KDialogBase( Plain, i18n("Operation Properties"), Help | Ok | Cancel , Ok, parent, "_UMLOPERATIONDLG_", true, true) { +UMLOperationDialog::UMLOperationDialog( TQWidget * tqparent, UMLOperation * pOperation ) + : KDialogBase( Plain, i18n("Operation Properties"), Help | Ok | Cancel , Ok, tqparent, "_UMLOPERATIONDLG_", true, true) { m_pOperation = pOperation; m_doc = UMLApp::app()->getDocument(); m_pMenu = 0; @@ -138,9 +138,9 @@ void UMLOperationDialog::setupDialog() { buttonLayout->addWidget( m_pDownButton ); KButtonBox* buttonBox = new KButtonBox(m_pParmsGB); - buttonBox->addButton( i18n("Ne&w Parameter..."), this, TQT_SLOT(slotNewParameter()) ); - m_pDeleteButton = buttonBox->addButton( i18n("&Delete"), this, TQT_SLOT(slotDeleteParameter()) ); - m_pPropertiesButton = buttonBox->addButton( i18n("&Properties"), this, + buttonBox->addButton( i18n("Ne&w Parameter..."), TQT_TQOBJECT(this), TQT_SLOT(slotNewParameter()) ); + m_pDeleteButton = buttonBox->addButton( i18n("&Delete"), TQT_TQOBJECT(this), TQT_SLOT(slotDeleteParameter()) ); + m_pPropertiesButton = buttonBox->addButton( i18n("&Properties"), TQT_TQOBJECT(this), TQT_SLOT(slotParameterProperties()) ); parmsLayout->addWidget(buttonBox); @@ -162,7 +162,7 @@ void UMLOperationDialog::setupDialog() { m_pRtypeCB->setCompletionMode( KGlobalSettings::CompletionPopup ); // add template parameters - UMLClassifier *classifier = dynamic_cast<UMLClassifier*>(m_pOperation->parent()); + UMLClassifier *classifier = dynamic_cast<UMLClassifier*>(m_pOperation->tqparent()); if (classifier) { UMLClassifierListItemList tmplParams( classifier->getFilteredList(Uml::ot_Template) ); for (UMLClassifierListItem *li = tmplParams.first(); li; li = tmplParams.next()) @@ -459,11 +459,11 @@ bool UMLOperationDialog::apply() return false; } - UMLClassifier *classifier = dynamic_cast<UMLClassifier*>( m_pOperation->parent() ); + UMLClassifier *classifier = dynamic_cast<UMLClassifier*>( m_pOperation->tqparent() ); if( classifier != 0L && classifier->checkOperationSignature(name, m_pOperation->getParmList(), m_pOperation) ) { - TQString msg = TQString(i18n("An operation with that signature already exists in %1.\n")).arg(classifier->getName()) + TQString msg = TQString(i18n("An operation with that signature already exists in %1.\n")).tqarg(classifier->getName()) + TQString(i18n("Choose a different name or parameter list." )); KMessageBox::error(this, msg, i18n("Operation Name Invalid"), false); diff --git a/umbrello/umbrello/dialogs/umloperationdialog.h b/umbrello/umbrello/dialogs/umloperationdialog.h index 269f41ef..2f67bfe2 100644 --- a/umbrello/umbrello/dialogs/umloperationdialog.h +++ b/umbrello/umbrello/dialogs/umloperationdialog.h @@ -37,12 +37,13 @@ class KArrowButton; class UMLOperationDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * Constructor */ - UMLOperationDialog( TQWidget * parent, UMLOperation * pOperation ); + UMLOperationDialog( TQWidget * tqparent, UMLOperation * pOperation ); /** * Deconstructor diff --git a/umbrello/umbrello/dialogs/umlroledialog.cpp b/umbrello/umbrello/dialogs/umlroledialog.cpp index 255f4010..00f2bd1a 100644 --- a/umbrello/umbrello/dialogs/umlroledialog.cpp +++ b/umbrello/umbrello/dialogs/umlroledialog.cpp @@ -21,8 +21,8 @@ #include "../umlrole.h" #include "umlroleproperties.h" -UMLRoleDialog::UMLRoleDialog( TQWidget * parent, UMLRole * pRole ) - : KDialogBase( Plain, i18n("Role Properties"), Help | Ok | Cancel , Ok, parent, "_UMLROLEDLG_", true, true) +UMLRoleDialog::UMLRoleDialog( TQWidget * tqparent, UMLRole * pRole ) + : KDialogBase( Plain, i18n("Role Properties"), Help | Ok | Cancel , Ok, tqparent, "_UMLROLEDLG_", true, true) { m_pRole = pRole; setupDialog(); @@ -35,7 +35,7 @@ void UMLRoleDialog::setupDialog() { m_pRoleProps = new UMLRoleProperties(this, m_pRole); setMainWidget( m_pRoleProps ); - resize( TQSize(425, 620).expandedTo(minimumSizeHint()) ); + resize( TQSize(425, 620).expandedTo(tqminimumSizeHint()) ); // topLayout -> addWidget( m_pParmsGB); diff --git a/umbrello/umbrello/dialogs/umlroledialog.h b/umbrello/umbrello/dialogs/umlroledialog.h index 9f1ab218..0b41060d 100644 --- a/umbrello/umbrello/dialogs/umlroledialog.h +++ b/umbrello/umbrello/dialogs/umlroledialog.h @@ -25,11 +25,12 @@ class UMLRoleProperties; class UMLRoleDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * Constructor */ - UMLRoleDialog( TQWidget * parent, UMLRole * pRole ); + UMLRoleDialog( TQWidget * tqparent, UMLRole * pRole ); /** * Deconstructor diff --git a/umbrello/umbrello/dialogs/umlroleproperties.cpp b/umbrello/umbrello/dialogs/umlroleproperties.cpp index fe2e2f5f..481eafb3 100644 --- a/umbrello/umbrello/dialogs/umlroleproperties.cpp +++ b/umbrello/umbrello/dialogs/umlroleproperties.cpp @@ -21,8 +21,8 @@ #include <kdebug.h> -UMLRoleProperties::UMLRoleProperties ( TQWidget *parent, UMLRole *role) - : UMLRolePropertiesBase (parent) +UMLRoleProperties::UMLRoleProperties ( TQWidget *tqparent, UMLRole *role) + : UMLRolePropertiesBase (tqparent) { m_pRole = role; diff --git a/umbrello/umbrello/dialogs/umlroleproperties.h b/umbrello/umbrello/dialogs/umlroleproperties.h index 61b7b8fe..cd3cb005 100644 --- a/umbrello/umbrello/dialogs/umlroleproperties.h +++ b/umbrello/umbrello/dialogs/umlroleproperties.h @@ -24,15 +24,16 @@ */ class UMLRoleProperties : public UMLRolePropertiesBase { Q_OBJECT + TQ_OBJECT public: /** * Sets up the UMLRoleProperties. * - * @param parent The parent widget to the UMLRoleProperties. + * @param tqparent The tqparent widget to the UMLRoleProperties. * @param role The UMLRole to display the properties of. */ - UMLRoleProperties( TQWidget *parent, UMLRole *role); + UMLRoleProperties( TQWidget *tqparent, UMLRole *role); /** * Standard deconstructor. @@ -47,7 +48,7 @@ public: protected: - // the parent role object + // the tqparent role object UMLRole * m_pRole; private: diff --git a/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui b/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui index 7c35a284..18501ded 100644 --- a/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui +++ b/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui @@ -1,10 +1,10 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>UMLRolePropertiesBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>UMLRolePropertiesBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -12,11 +12,11 @@ <height>545</height> </rect> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>10</x> <y>10</y> @@ -28,18 +28,18 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>propsGroupBox</cstring> </property> <property name="title"> <string>Role Properties</string> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>10</x> <y>30</y> @@ -51,7 +51,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>roleNameLabel</cstring> </property> @@ -59,17 +59,17 @@ <string>Rolename:</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>m_pMultiLE</cstring> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>m_pRoleLE</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -80,7 +80,7 @@ </grid> </widget> </widget> - <widget class="QGroupBox" row="3" column="0"> + <widget class="TQGroupBox" row="3" column="0"> <property name="name"> <cstring>docGroupBox</cstring> </property> @@ -91,14 +91,14 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTextEdit" row="0" column="0"> + <widget class="TQTextEdit" row="0" column="0"> <property name="name"> <cstring>m_pDocTE</cstring> </property> </widget> </grid> </widget> - <widget class="QButtonGroup" row="2" column="0"> + <widget class="TQButtonGroup" row="2" column="0"> <property name="name"> <cstring>changeabilityButtonGroup</cstring> </property> @@ -109,15 +109,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="2"> + <widget class="TQRadioButton" row="0" column="2"> <property name="name"> <cstring>m_pAddOnlyRB</cstring> </property> @@ -125,7 +125,7 @@ <string>Add only</string> </property> </widget> - <widget class="QRadioButton" row="0" column="1"> + <widget class="TQRadioButton" row="0" column="1"> <property name="name"> <cstring>m_pFrozenRB</cstring> </property> @@ -133,7 +133,7 @@ <string>Frozen</string> </property> </widget> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>m_pChangeableRB</cstring> </property> @@ -148,7 +148,7 @@ </widget> </grid> </widget> - <widget class="QButtonGroup" row="1" column="0"> + <widget class="TQButtonGroup" row="1" column="0"> <property name="name"> <cstring>visibilityButtonGroup</cstring> </property> @@ -159,7 +159,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>m_pPublicRB</cstring> </property> @@ -170,7 +170,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton" row="0" column="1"> + <widget class="TQRadioButton" row="0" column="1"> <property name="name"> <cstring>m_pPrivateRB</cstring> </property> @@ -178,7 +178,7 @@ <string>Private</string> </property> </widget> - <widget class="QRadioButton" row="0" column="2"> + <widget class="TQRadioButton" row="0" column="2"> <property name="name"> <cstring>m_pProtectedRB</cstring> </property> @@ -186,7 +186,7 @@ <string>Protected</string> </property> </widget> - <widget class="QRadioButton" row="0" column="3"> + <widget class="TQRadioButton" row="0" column="3"> <property name="name"> <cstring>m_pImplementationRB</cstring> </property> @@ -199,5 +199,5 @@ </grid> </widget> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/umbrello/umbrello/dialogs/umltemplatedialog.cpp b/umbrello/umbrello/dialogs/umltemplatedialog.cpp index 6075fbe4..20183e3a 100644 --- a/umbrello/umbrello/dialogs/umltemplatedialog.cpp +++ b/umbrello/umbrello/dialogs/umltemplatedialog.cpp @@ -131,7 +131,7 @@ bool UMLTemplateDialog::apply() { return false; } - UMLClassifier * pClass = dynamic_cast<UMLClassifier *>( m_pTemplate->parent() ); + UMLClassifier * pClass = dynamic_cast<UMLClassifier *>( m_pTemplate->tqparent() ); if (pClass) { UMLObject *o = pClass->findChildObject(name); if (o && o != m_pTemplate) { diff --git a/umbrello/umbrello/dialogs/umltemplatedialog.h b/umbrello/umbrello/dialogs/umltemplatedialog.h index 013eb51e..cdf8b3f1 100644 --- a/umbrello/umbrello/dialogs/umltemplatedialog.h +++ b/umbrello/umbrello/dialogs/umltemplatedialog.h @@ -31,6 +31,7 @@ class UMLTemplate; class UMLTemplateDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: UMLTemplateDialog(TQWidget* pParent, UMLTemplate* pAttribute); ~UMLTemplateDialog(); diff --git a/umbrello/umbrello/dialogs/umlviewdialog.cpp b/umbrello/umbrello/dialogs/umlviewdialog.cpp index 76ef776d..33a6a21f 100644 --- a/umbrello/umbrello/dialogs/umlviewdialog.cpp +++ b/umbrello/umbrello/dialogs/umlviewdialog.cpp @@ -135,7 +135,7 @@ void UMLViewDialog::applyPage( Page page ) { case Font: kDebug() << "UMLViewDialog::applyPage: setting font " - << m_pChooser->font().toString() << endl; + << TQString(m_pChooser->font().toString()) << endl; m_pView->setFont( m_pChooser->font(), true ); break; diff --git a/umbrello/umbrello/dialogs/umlviewdialog.h b/umbrello/umbrello/dialogs/umlviewdialog.h index f81d9869..6484aab3 100644 --- a/umbrello/umbrello/dialogs/umlviewdialog.h +++ b/umbrello/umbrello/dialogs/umlviewdialog.h @@ -37,6 +37,7 @@ class DiagramPropertiesPage; class UMLViewDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * Constructor diff --git a/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp b/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp index 824d708f..a330ad30 100644 --- a/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp +++ b/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp @@ -87,12 +87,12 @@ void UMLWidgetColorPage::init() UMLWidgetColorPage::~UMLWidgetColorPage() {} void UMLWidgetColorPage::slotLineButtonClicked() { - // UMLView * pView = dynamic_cast<UMLView *>( m_pUMLWidget -> parent() ); + // UMLView * pView = dynamic_cast<UMLView *>( m_pUMLWidget -> tqparent() ); m_pLineColorB -> setColor( Settings::getOptionState().uiState.lineColor ); } void UMLWidgetColorPage::slotFillButtonClicked() { - // UMLView * pView = dynamic_cast<UMLView *>( m_pUMLWidget -> parent() ); + // UMLView * pView = dynamic_cast<UMLView *>( m_pUMLWidget -> tqparent() ); m_pFillColorB -> setColor( Settings::getOptionState().uiState.fillColor ); } diff --git a/umbrello/umbrello/dialogs/umlwidgetcolorpage.h b/umbrello/umbrello/dialogs/umlwidgetcolorpage.h index bc03d5b6..b5c33e2c 100644 --- a/umbrello/umbrello/dialogs/umlwidgetcolorpage.h +++ b/umbrello/umbrello/dialogs/umlwidgetcolorpage.h @@ -29,6 +29,7 @@ class TQGroupBox; class UMLWidgetColorPage : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** diff --git a/umbrello/umbrello/docgenerators/docbookgenerator.cpp b/umbrello/umbrello/docgenerators/docbookgenerator.cpp index 87a84d14..f96b3d37 100644 --- a/umbrello/umbrello/docgenerators/docbookgenerator.cpp +++ b/umbrello/umbrello/docgenerators/docbookgenerator.cpp @@ -54,7 +54,7 @@ bool DocbookGenerator::generateDocbookForProject() UMLDoc* umlDoc = app->getDocument(); KURL url = umlDoc->URL(); TQString fileName = url.fileName(); - fileName.replace(TQRegExp(".xmi$"),""); + fileName.tqreplace(TQRegExp(".xmi$"),""); url.setFileName(fileName); kDebug() << "Exporting to directory: " << url << endl; generateDocbookForProjectInto(url); @@ -96,10 +96,10 @@ KIO::Job* DocbookGenerator::generateDocbookForProjectInto(const KURL& destDir) // lets open the file for writing if( !file.open( IO_WriteOnly ) ) { - KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(tmpfile.name()), i18n("Save Error")); + KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(tmpfile.name()), i18n("Save Error")); return false; } - umlDoc->saveToXMI(file); // save the xmi stuff to it + umlDoc->saveToXMI(*TQT_TQIODEVICE(&file)); // save the xmi stuff to it file.close(); tmpfile.close(); @@ -131,7 +131,7 @@ KIO::Job* DocbookGenerator::generateDocbookForProjectInto(const KURL& destDir) KURL url = umlDoc->URL(); TQString fileName = url.fileName(); - fileName.replace(TQRegExp(".xmi$"),".docbook"); + fileName.tqreplace(TQRegExp(".xmi$"),".docbook"); url.setPath(destDir.path()); url.addPath(fileName); kDebug() << "Copying result to: " << url << endl; diff --git a/umbrello/umbrello/docgenerators/docbookgenerator.h b/umbrello/umbrello/docgenerators/docbookgenerator.h index 24851380..17e89bab 100644 --- a/umbrello/umbrello/docgenerators/docbookgenerator.h +++ b/umbrello/umbrello/docgenerators/docbookgenerator.h @@ -38,9 +38,10 @@ namespace KIO * @todo allow to specify the destination and ensure that it works with distant * ones */ -class DocbookGenerator : public QObject +class DocbookGenerator : public TQObject { Q_OBJECT + TQ_OBJECT public: /** diff --git a/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp b/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp index a0555188..74aade2f 100644 --- a/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp +++ b/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp @@ -55,7 +55,7 @@ bool XhtmlGenerator::generateXhtmlForProject() UMLDoc* umlDoc = app->getDocument(); KURL url = umlDoc->URL(); TQString fileName = url.fileName(); - fileName.replace(TQRegExp(".xmi$"),""); + fileName.tqreplace(TQRegExp(".xmi$"),""); url.setFileName(fileName); kDebug() << "Exporting to directory: " << url << endl; return generateXhtmlForProjectInto(url); @@ -90,7 +90,7 @@ void XhtmlGenerator::slotDocbookToXhtml(KIO::Job * docbookJob) const KURL& url = umlDoc->URL(); TQString docbookName = url.fileName(); - docbookName.replace(TQRegExp(".xmi$"),".docbook"); + docbookName.tqreplace(TQRegExp(".xmi$"),".docbook"); // KURL docbookUrl(TQString("file://")+m_tmpDir.name()); KURL docbookUrl = m_destDir; docbookUrl.addPath(docbookName); @@ -115,7 +115,7 @@ void XhtmlGenerator::slotDocbookToXhtml(KIO::Job * docbookJob) if (!localXsl.isEmpty()) { localXsl = TQString("href=\"file://") + localXsl + "\""; - xslt.replace(TQRegExp("href=\"http://[^\"]*\""),localXsl); + xslt.tqreplace(TQRegExp("href=\"http://[^\"]*\""),localXsl); } KTempFile tmpXsl; *tmpXsl.textStream() << xslt; @@ -145,7 +145,7 @@ void XhtmlGenerator::slotDocbookToXhtml(KIO::Job * docbookJob) xmlCleanupParser(); TQString xhtmlName = url.fileName(); - xhtmlName.replace(TQRegExp(".xmi$"),".html"); + xhtmlName.tqreplace(TQRegExp(".xmi$"),".html"); KURL xhtmlUrl = m_destDir; xhtmlUrl.addPath(xhtmlName); diff --git a/umbrello/umbrello/docgenerators/xhtmlgenerator.h b/umbrello/umbrello/docgenerators/xhtmlgenerator.h index ad5076cf..0d249bbb 100644 --- a/umbrello/umbrello/docgenerators/xhtmlgenerator.h +++ b/umbrello/umbrello/docgenerators/xhtmlgenerator.h @@ -38,9 +38,10 @@ namespace KIO * @todo allow to specify the destination and ensure that it works with distant * ones */ -class XhtmlGenerator : public QObject +class XhtmlGenerator : public TQObject { Q_OBJECT + TQ_OBJECT public: /** diff --git a/umbrello/umbrello/docgenerators/xmi2docbook.xsl b/umbrello/umbrello/docgenerators/xmi2docbook.xsl index ff10aac5..a48938f7 100644 --- a/umbrello/umbrello/docgenerators/xmi2docbook.xsl +++ b/umbrello/umbrello/docgenerators/xmi2docbook.xsl @@ -450,12 +450,12 @@ <title>Supertypes:</title> <xsl:for-each select="$generalizations"> - <!-- get the parent in the generalization --> + <!-- get the tqparent in the generalization --> <xsl:variable name="generalization" select="key('generalization', ./@xmi.idref)" /> <xsl:variable name="target" select="$generalization/ - Foundation.Core.Generalization.parent/ + Foundation.Core.Generalization.tqparent/ */@xmi.idref" /> <xsl:call-template name="classify"> <xsl:with-param name="target" select="$target"/> diff --git a/umbrello/umbrello/docwindow.cpp b/umbrello/umbrello/docwindow.cpp index ab935d00..ddd056a2 100644 --- a/umbrello/umbrello/docwindow.cpp +++ b/umbrello/umbrello/docwindow.cpp @@ -26,7 +26,7 @@ #include "umlwidget.h" -DocWindow::DocWindow( UMLDoc * doc, TQWidget *parent, const char *name ) : TQWidget( parent, name ) { +DocWindow::DocWindow( UMLDoc * doc, TQWidget *tqparent, const char *name ) : TQWidget( tqparent, name ) { //setup visual display TQHBoxLayout * mainLayout = new TQHBoxLayout( this ); diff --git a/umbrello/umbrello/docwindow.h b/umbrello/umbrello/docwindow.h index 29ff5c4e..217e7d83 100644 --- a/umbrello/umbrello/docwindow.h +++ b/umbrello/umbrello/docwindow.h @@ -29,11 +29,12 @@ class UMLWidget; class DocWindow : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** * Constructor */ - explicit DocWindow( UMLDoc * doc, TQWidget *parent = 0, const char *name = 0 ); + explicit DocWindow( UMLDoc * doc, TQWidget *tqparent = 0, const char *name = 0 ); /** * Deconstructor diff --git a/umbrello/umbrello/entity.cpp b/umbrello/umbrello/entity.cpp index 31ef1513..38c73138 100644 --- a/umbrello/umbrello/entity.cpp +++ b/umbrello/umbrello/entity.cpp @@ -107,7 +107,7 @@ UMLObject* UMLEntity::addEntityAttribute(const TQString& name, Uml::IDType id) { bool UMLEntity::addEntityAttribute(UMLEntityAttribute* attribute, IDChangeLog* Log /* = 0*/) { TQString name = (TQString)attribute->getName(); if (findChildObject(name) == NULL) { - attribute->parent()->removeChild(attribute); + attribute->tqparent()->removeChild(attribute); this->insertChild(attribute); m_List.append(attribute); emit entityAttributeAdded(attribute); @@ -124,7 +124,7 @@ bool UMLEntity::addEntityAttribute(UMLEntityAttribute* attribute, IDChangeLog* L bool UMLEntity::addEntityAttribute(UMLEntityAttribute* attribute, int position) { TQString name = (TQString)attribute->getName(); if (findChildObject(name) == NULL) { - attribute->parent()->removeChild(attribute); + attribute->tqparent()->removeChild(attribute); this->insertChild(attribute); if ( position >= 0 && position <= (int)m_List.count() ) { m_List.insert(position,attribute); diff --git a/umbrello/umbrello/entity.h b/umbrello/umbrello/entity.h index a207fbd3..9b507f00 100644 --- a/umbrello/umbrello/entity.h +++ b/umbrello/umbrello/entity.h @@ -28,6 +28,7 @@ class UMLEntityAttribute; */ class UMLEntity : public UMLClassifier { Q_OBJECT + TQ_OBJECT public: /** * Sets up an entity. @@ -59,14 +60,14 @@ public: virtual UMLObject* clone() const; /** - * Creates an entity attribute for the parent concept. + * Creates an entity attribute for the tqparent concept. * Reimplementation of method from UMLClassifier. * * @param name An optional name, used by when creating through UMLListView * @param type An optional type, used by when creating through UMLListView * @return The UMLEntityAttribute created */ - UMLAttribute* createAttribute(const TQString &name = TQString::null, + UMLAttribute* createAttribute(const TQString &name = TQString(), UMLObject *type = 0); /** diff --git a/umbrello/umbrello/entityattribute.cpp b/umbrello/umbrello/entityattribute.cpp index b8030fed..ebc2111f 100644 --- a/umbrello/umbrello/entityattribute.cpp +++ b/umbrello/umbrello/entityattribute.cpp @@ -21,17 +21,17 @@ #include "dialogs/umlentityattributedialog.h" #include "object_factory.h" -UMLEntityAttribute::UMLEntityAttribute( const UMLObject *parent, const TQString& name, +UMLEntityAttribute::UMLEntityAttribute( const UMLObject *tqparent, const TQString& name, Uml::IDType id, Uml::Visibility s, UMLObject *type, const TQString& iv ) - : UMLAttribute(parent, name, id, s, type, iv) { + : UMLAttribute(tqparent, name, id, s, type, iv) { init(); if (m_pSecondary) { m_pSecondary->setBaseType(Uml::ot_Entity); } } -UMLEntityAttribute::UMLEntityAttribute(const UMLObject *parent) : UMLAttribute(parent) { +UMLEntityAttribute::UMLEntityAttribute(const UMLObject *tqparent) : UMLAttribute(tqparent) { init(); } @@ -119,7 +119,7 @@ bool UMLEntityAttribute::operator==( UMLEntityAttribute &rhs) { void UMLEntityAttribute::copyInto(UMLEntityAttribute *rhs) const { - // call the parent first. + // call the tqparent first. UMLClassifierListItem::copyInto(rhs); // Copy all datamembers @@ -131,7 +131,7 @@ void UMLEntityAttribute::copyInto(UMLEntityAttribute *rhs) const UMLObject* UMLEntityAttribute::clone() const { - UMLEntityAttribute* clone = new UMLEntityAttribute( (UMLEntityAttribute*)parent() ); + UMLEntityAttribute* clone = new UMLEntityAttribute( (UMLEntityAttribute*)tqparent() ); copyInto(clone); return clone; @@ -169,8 +169,8 @@ bool UMLEntityAttribute::load( TQDomElement & element ) { return true; } -bool UMLEntityAttribute::showPropertiesDialog(TQWidget* parent) { - UMLEntityAttributeDialog dialog(parent, this); +bool UMLEntityAttribute::showPropertiesDialog(TQWidget* tqparent) { + UMLEntityAttributeDialog dialog(tqparent, this); return dialog.exec(); } diff --git a/umbrello/umbrello/entityattribute.h b/umbrello/umbrello/entityattribute.h index 31b3179c..4a094dfb 100644 --- a/umbrello/umbrello/entityattribute.h +++ b/umbrello/umbrello/entityattribute.h @@ -26,18 +26,19 @@ */ class UMLEntityAttribute : public UMLAttribute { Q_OBJECT + TQ_OBJECT public: /** * Sets up an entityattribute. * - * @param parent The parent of this UMLEntityAttribute. + * @param tqparent The tqparent of this UMLEntityAttribute. * @param name The name of this UMLEntityAttribute. * @param id The unique id given to this UMLEntityAttribute. * @param s The visibility of the UMLEntityAttribute. * @param type The type of this UMLEntityAttribute. * @param iv The initial value of the entityattribute. */ - UMLEntityAttribute(const UMLObject* parent, const TQString& name, + UMLEntityAttribute(const UMLObject* tqparent, const TQString& name, Uml::IDType id = Uml::id_None, Uml::Visibility s = Uml::Visibility::Private, UMLObject *type = 0, const TQString& iv = 0); @@ -45,9 +46,9 @@ public: /** * Sets up an entityattribute. * - * @param parent The parent of this UMLEntityAttribute. + * @param tqparent The tqparent of this UMLEntityAttribute. */ - UMLEntityAttribute(const UMLObject* parent); + UMLEntityAttribute(const UMLObject* tqparent); /** * Overloaded '==' operator @@ -157,7 +158,7 @@ public: /** * Display the properties configuration dialog for the entityattribute. */ - bool showPropertiesDialog(TQWidget* parent); + bool showPropertiesDialog(TQWidget* tqparent); protected: /** diff --git a/umbrello/umbrello/entitywidget.cpp b/umbrello/umbrello/entitywidget.cpp index 9dd7d7e3..8f96fb87 100644 --- a/umbrello/umbrello/entitywidget.cpp +++ b/umbrello/umbrello/entitywidget.cpp @@ -62,7 +62,7 @@ void EntityWidget::draw(TQPainter& p, int offsetX, int offsetY) { const TQString name = this->getName(); p.drawRect(offsetX, offsetY, w, h); - p.setPen(TQPen(Qt::black)); + p.setPen(TQPen(TQt::black)); TQFont font = UMLWidget::getFont(); font.setBold(true); @@ -71,11 +71,11 @@ void EntityWidget::draw(TQPainter& p, int offsetX, int offsetY) { if ( !m_pObject->getStereotype().isEmpty() ) { p.drawText(offsetX + ENTITY_MARGIN, offsetY, w - ENTITY_MARGIN * 2,fontHeight, - Qt::AlignCenter, m_pObject->getStereotype(true)); + TQt::AlignCenter, m_pObject->getStereotype(true)); font.setItalic( m_pObject -> getAbstract() ); p.setFont(font); p.drawText(offsetX + ENTITY_MARGIN, offsetY + fontHeight, - w - ENTITY_MARGIN * 2, fontHeight, Qt::AlignCenter, name); + w - ENTITY_MARGIN * 2, fontHeight, TQt::AlignCenter, name); font.setBold(false); font.setItalic(false); p.setFont(font); @@ -84,7 +84,7 @@ void EntityWidget::draw(TQPainter& p, int offsetX, int offsetY) { font.setItalic( m_pObject -> getAbstract() ); p.setFont(font); p.drawText(offsetX + ENTITY_MARGIN, offsetY, - w - ENTITY_MARGIN * 2, fontHeight, Qt::AlignCenter, name); + w - ENTITY_MARGIN * 2, fontHeight, TQt::AlignCenter, name); font.setBold(false); font.setItalic(false); p.setFont(font); @@ -102,7 +102,7 @@ void EntityWidget::draw(TQPainter& p, int offsetX, int offsetY) { UMLClassifierListItemList list = classifier->getFilteredList(Uml::ot_EntityAttribute); for (entityattribute = list.first(); entityattribute; entityattribute = list.next()) { TQString text = entityattribute->getName(); - p.setPen( TQPen(Qt::black) ); + p.setPen( TQPen(TQt::black) ); UMLEntityAttribute* casted = dynamic_cast<UMLEntityAttribute*>( entityattribute ); if( casted && casted->getIndexType() == Uml::Primary ) { @@ -111,7 +111,7 @@ void EntityWidget::draw(TQPainter& p, int offsetX, int offsetY) { font.setUnderline( false ); } p.drawText(offsetX + ENTITY_MARGIN, offsetY + y, - fontMetrics.width(text), fontHeight, Qt::AlignVCenter, text); + fontMetrics.width(text), fontHeight, TQt::AlignVCenter, text); p.setFont( font ); y+=fontHeight; } diff --git a/umbrello/umbrello/entitywidget.h b/umbrello/umbrello/entitywidget.h index e99da521..55b0e625 100644 --- a/umbrello/umbrello/entitywidget.h +++ b/umbrello/umbrello/entitywidget.h @@ -33,7 +33,7 @@ public: /** * Constructs an EntityWidget. * - * @param view The parent of this EntityWidget. + * @param view The tqparent of this EntityWidget. * @param o The UMLObject this will be representing. */ EntityWidget(UMLView* view, UMLObject* o); diff --git a/umbrello/umbrello/enum.cpp b/umbrello/umbrello/enum.cpp index 93ee1bdd..491817e2 100644 --- a/umbrello/umbrello/enum.cpp +++ b/umbrello/umbrello/enum.cpp @@ -109,7 +109,7 @@ UMLObject* UMLEnum::addEnumLiteral(const TQString &name, Uml::IDType id) { bool UMLEnum::addEnumLiteral(UMLEnumLiteral* literal, IDChangeLog* Log /* = 0*/) { TQString name = (TQString)literal->getName(); if (findChildObject(name) == NULL) { - literal->parent()->removeChild(literal); + literal->tqparent()->removeChild(literal); this->insertChild(literal); m_List.append(literal); UMLObject::emitModified(); @@ -126,7 +126,7 @@ bool UMLEnum::addEnumLiteral(UMLEnumLiteral* literal, IDChangeLog* Log /* = 0*/) bool UMLEnum::addEnumLiteral(UMLEnumLiteral* literal, int position) { TQString name = (TQString)literal->getName(); if (findChildObject(name) == NULL) { - literal->parent()->removeChild(literal); + literal->tqparent()->removeChild(literal); this->insertChild(literal); if ( position >= 0 && position <= (int)m_List.count() ) { m_List.insert(position,literal); diff --git a/umbrello/umbrello/enum.h b/umbrello/umbrello/enum.h index 94532f68..edf107ae 100644 --- a/umbrello/umbrello/enum.h +++ b/umbrello/umbrello/enum.h @@ -28,6 +28,7 @@ class UMLEnumLiteral; */ class UMLEnum : public UMLClassifier { Q_OBJECT + TQ_OBJECT public: /** * Sets up an enum. diff --git a/umbrello/umbrello/enumliteral.cpp b/umbrello/umbrello/enumliteral.cpp index 8158e40e..b6efb808 100644 --- a/umbrello/umbrello/enumliteral.cpp +++ b/umbrello/umbrello/enumliteral.cpp @@ -15,13 +15,13 @@ #include <kdebug.h> #include <klocale.h> -UMLEnumLiteral::UMLEnumLiteral(const UMLObject *parent, +UMLEnumLiteral::UMLEnumLiteral(const UMLObject *tqparent, const TQString& name, Uml::IDType id) - : UMLClassifierListItem(parent, name, id) { + : UMLClassifierListItem(tqparent, name, id) { m_BaseType = Uml::ot_EnumLiteral; } -UMLEnumLiteral::UMLEnumLiteral(const UMLObject *parent) : UMLClassifierListItem(parent) { +UMLEnumLiteral::UMLEnumLiteral(const UMLObject *tqparent) : UMLClassifierListItem(tqparent) { m_BaseType = Uml::ot_EnumLiteral; } @@ -44,7 +44,7 @@ void UMLEnumLiteral::copyInto(UMLEnumLiteral *rhs) const UMLObject* UMLEnumLiteral::clone() const { - UMLEnumLiteral *clone = new UMLEnumLiteral((UMLObject *) parent()); + UMLEnumLiteral *clone = new UMLEnumLiteral((UMLObject *) tqparent()); copyInto(clone); return clone; @@ -60,9 +60,9 @@ bool UMLEnumLiteral::load(TQDomElement& ) { return true; } -bool UMLEnumLiteral::showPropertiesDialog(TQWidget* parent) { +bool UMLEnumLiteral::showPropertiesDialog(TQWidget* tqparent) { bool ok; - TQString name = KInputDialog::getText(i18n("Name"), i18n("Enter name:"), getName(), &ok, parent); + TQString name = KInputDialog::getText(i18n("Name"), i18n("Enter name:"), getName(), &ok, tqparent); if ( ok && !name.isEmpty() ) { setName(name); return true; diff --git a/umbrello/umbrello/enumliteral.h b/umbrello/umbrello/enumliteral.h index e9a63b1a..3e530c4d 100644 --- a/umbrello/umbrello/enumliteral.h +++ b/umbrello/umbrello/enumliteral.h @@ -29,19 +29,19 @@ public: /** * Sets up an enum literal. * - * @param parent The parent of this UMLEnumLiteral. + * @param tqparent The tqparent of this UMLEnumLiteral. * @param name The name of this UMLEnumLiteral. * @param id The unique id given to this UMLEnumLiteral. */ - UMLEnumLiteral(const UMLObject* parent, + UMLEnumLiteral(const UMLObject* tqparent, const TQString& name, Uml::IDType id = Uml::id_None); /** * Sets up an enum literal. * - * @param parent The parent of this UMLEnumLiteral. + * @param tqparent The tqparent of this UMLEnumLiteral. */ - UMLEnumLiteral(const UMLObject* parent); + UMLEnumLiteral(const UMLObject* tqparent); /** * Overloaded '==' operator @@ -72,7 +72,7 @@ public: /** * Display the properties configuration dialog for the enum literal. */ - bool showPropertiesDialog(TQWidget* parent); + bool showPropertiesDialog(TQWidget* tqparent); protected: /** diff --git a/umbrello/umbrello/enumwidget.cpp b/umbrello/umbrello/enumwidget.cpp index 0c03b209..de1eb522 100644 --- a/umbrello/umbrello/enumwidget.cpp +++ b/umbrello/umbrello/enumwidget.cpp @@ -72,19 +72,19 @@ void EnumWidget::draw(TQPainter& p, int offsetX, int offsetY) { } p.drawRect(offsetX, offsetY, w, h); - p.setPen(TQPen(Qt::black)); + p.setPen(TQPen(TQt::black)); TQFont font = UMLWidget::getFont(); font.setBold(true); p.setFont(font); p.drawText(offsetX + ENUM_MARGIN, offsetY, w - ENUM_MARGIN * 2,fontHeight, - Qt::AlignCenter, m_pObject->getStereotype(true)); + TQt::AlignCenter, m_pObject->getStereotype(true)); font.setItalic( m_pObject -> getAbstract() ); p.setFont(font); p.drawText(offsetX + ENUM_MARGIN, offsetY + fontHeight, - w - ENUM_MARGIN * 2, fontHeight, Qt::AlignCenter, name); + w - ENUM_MARGIN * 2, fontHeight, TQt::AlignCenter, name); font.setBold(false); font.setItalic(false); p.setFont(font); @@ -101,9 +101,9 @@ void EnumWidget::draw(TQPainter& p, int offsetX, int offsetY) { UMLClassifierListItemList list = classifier->getFilteredList(Uml::ot_EnumLiteral); for (enumLiteral = list.first(); enumLiteral; enumLiteral = list.next()) { TQString text = enumLiteral->getName(); - p.setPen( TQPen(Qt::black) ); + p.setPen( TQPen(TQt::black) ); p.drawText(offsetX + ENUM_MARGIN, offsetY + y, - fontMetrics.width(text), fontHeight, Qt::AlignVCenter, text); + fontMetrics.width(text), fontHeight, TQt::AlignVCenter, text); y+=fontHeight; } diff --git a/umbrello/umbrello/enumwidget.h b/umbrello/umbrello/enumwidget.h index aa61f4ea..b5802135 100644 --- a/umbrello/umbrello/enumwidget.h +++ b/umbrello/umbrello/enumwidget.h @@ -33,7 +33,7 @@ public: /** * Constructs an EnumWidget. * - * @param view The parent of this EnumWidget. + * @param view The tqparent of this EnumWidget. * @param o The UMLObject this will be representing. */ EnumWidget(UMLView* view, UMLObject* o); diff --git a/umbrello/umbrello/floatingtextwidget.cpp b/umbrello/umbrello/floatingtextwidget.cpp index fb278399..5857ef5d 100644 --- a/umbrello/umbrello/floatingtextwidget.cpp +++ b/umbrello/umbrello/floatingtextwidget.cpp @@ -72,7 +72,7 @@ void FloatingTextWidget::draw(TQPainter & p, int offsetX, int offsetY) { p.setFont( UMLWidget::getFont() ); TQColor textColor(50, 50, 50); p.setPen(textColor); - p.drawText( offsetX , offsetY,w,h, Qt::AlignCenter, getDisplayText() ); + p.drawText( offsetX , offsetY,w,h, TQt::AlignCenter, getDisplayText() ); if(m_bSelected) drawSelected(&p, offsetX, offsetY); } @@ -225,7 +225,7 @@ void FloatingTextWidget::changeName(const TQString& newText) setText( newText ); UMLApp::app()->getDocument()->setModified(true); } - setVisible( true ); + tqsetVisible( true ); updateComponentSize(); update(); } @@ -236,7 +236,7 @@ void FloatingTextWidget::setText(const TQString &t) { m_pLink->getSeqNumAndOp(seqNum, op); if (seqNum.length() > 0 || op.length() > 0) { if (! m_pView->getShowOpSig()) - op.replace( TQRegExp("\\(.*\\)"), "()" ); + op.tqreplace( TQRegExp("\\(.*\\)"), "()" ); m_Text = seqNum.append(": ").append( op ); } else m_Text = t; @@ -265,7 +265,7 @@ void FloatingTextWidget::changeTextDlg() { if(ok && newText != getText() && isTextValid(newText)) { setText( newText ); - setVisible( ( getText().length() > 0 ) ); + tqsetVisible( ( getText().length() > 0 ) ); updateComponentSize(); update(); } @@ -302,7 +302,7 @@ void FloatingTextWidget::showOpDlg() { opText = selectDlg.getOpText(); if (selectDlg.isClassOp()) { Model_Utils::OpDescriptor od; - Model_Utils::Parse_Status st = Model_Utils::parseOperation(opText, od, c); + Model_Utils::Parse_tqStatus st = Model_Utils::parseOperation(opText, od, c); if (st == Model_Utils::PS_OK) { UMLClassifierList selfAndAncestors = c->findSuperClassConcepts(); selfAndAncestors.prepend(c); @@ -444,7 +444,7 @@ bool FloatingTextWidget::loadFromXMI( TQDomElement & qElement ) { void FloatingTextWidget::setMessageText() { if (m_pLink) m_pLink->setMessageText(this); - setVisible(getText().length() > 0); + tqsetVisible(getText().length() > 0); updateComponentSize(); } diff --git a/umbrello/umbrello/floatingtextwidget.h b/umbrello/umbrello/floatingtextwidget.h index 75e25be0..ad33e532 100644 --- a/umbrello/umbrello/floatingtextwidget.h +++ b/umbrello/umbrello/floatingtextwidget.h @@ -37,6 +37,7 @@ class FloatingTextWidgetController; class FloatingTextWidget : public UMLWidget { Q_OBJECT + TQ_OBJECT public: friend class FloatingTextWidgetController; @@ -53,7 +54,7 @@ public: /** * Constructs a FloatingTextWidget instance. * - * @param view The parent of this FloatingTextWidget. + * @param view The tqparent of this FloatingTextWidget. * @param role The role this FloatingTextWidget will take up. * @param text The main text to display. * @param id The ID to assign (-1 will prompt a new ID.) diff --git a/umbrello/umbrello/floatingtextwidgetcontroller.h b/umbrello/umbrello/floatingtextwidgetcontroller.h index bb40e778..5b89c3ad 100644 --- a/umbrello/umbrello/floatingtextwidgetcontroller.h +++ b/umbrello/umbrello/floatingtextwidgetcontroller.h @@ -55,7 +55,7 @@ protected: /** * Overridden from UMLWidgetController. * Saves the values of the widget needed for move/resize. - * Calls parent method and then saves the value of m_unconstrainedPositionX/Y + * Calls tqparent method and then saves the value of m_unconstrainedPositionX/Y * and m_movementDirectionX/Y. * * @param me The TQMouseEvent to get the offset from. @@ -67,7 +67,7 @@ protected: * FloatingTextWidgets can't be resized, so this method always returns false. * Cursor isn't changed. * - * @param me The QMouseEVent to check. + * @param me The TQMouseEVent to check. * @return true if the mouse is in resize area, false otherwise. */ virtual bool isInResizeArea(TQMouseEvent *me); diff --git a/umbrello/umbrello/folder.cpp b/umbrello/umbrello/folder.cpp index c3f97dc4..2ba73694 100644 --- a/umbrello/umbrello/folder.cpp +++ b/umbrello/umbrello/folder.cpp @@ -157,8 +157,8 @@ void UMLFolder::removeAllViews() { UMLView *v = NULL; for (UMLViewListIt vit(m_diagrams); (v = vit.current()) != NULL; ++vit) { // TODO ------------------ check this code - bad: calling back to UMLDoc::removeView() - v->removeAllAssociations(); // note : It may not be apparent, but when we remove all associations - // from a view, it also causes any UMLAssociations that lack parent + v->removeAllAssociations(); // note : It may not be aptqparent, but when we remove all associations + // from a view, it also causes any UMLAssociations that lack tqparent // association widgets (but once had them) to remove themselves from // this document. UMLApp::app()->getDocument()->removeView(v, false); @@ -223,7 +223,7 @@ void UMLFolder::saveToXMI(TQDomDocument& qDoc, TQDomElement& qElement) { kError() << "UMLFolder::saveToXMI(" << m_folderFile << "): " << "cannot create file, contents will be saved in main model file" << endl; - m_folderFile = TQString::null; + m_folderFile = TQString(); save(qDoc, qElement); return; } @@ -248,8 +248,8 @@ void UMLFolder::saveToXMI(TQDomDocument& qDoc, TQDomElement& qElement) { folderRoot.setAttribute("name", m_Name); folderRoot.setAttribute("filename", m_folderFile); folderRoot.setAttribute("mainModel", umldoc->URL().fileName()); - folderRoot.setAttribute("parentId", ID2STR(m_pUMLPackage->getID())); - folderRoot.setAttribute("parent", m_pUMLPackage->getFullyQualifiedName("::", true)); + folderRoot.setAttribute("tqparentId", ID2STR(m_pUMLPackage->getID())); + folderRoot.setAttribute("tqparent", m_pUMLPackage->getFullyQualifiedName("::", true)); saveContents(folderDoc, folderRoot); folderDoc.appendChild(folderRoot); TQTextStream stream(&file); @@ -286,11 +286,11 @@ bool UMLFolder::loadDiagramsFromXMI(TQDomNode& diagrams) { bool UMLFolder::loadFolderFile(const TQString& path) { TQFile file(path); if (!file.exists()) { - KMessageBox::error(0, i18n("The folderfile %1 does not exist.").arg(path), i18n("Load Error")); + KMessageBox::error(0, i18n("The folderfile %1 does not exist.").tqarg(path), i18n("Load Error")); return false; } if (!file.open(IO_ReadOnly)) { - KMessageBox::error(0, i18n("The folderfile %1 cannot be opened.").arg(path), i18n("Load Error")); + KMessageBox::error(0, i18n("The folderfile %1 cannot be opened.").tqarg(path), i18n("Load Error")); return false; } TQTextStream stream(&file); diff --git a/umbrello/umbrello/folder.h b/umbrello/umbrello/folder.h index 365795f0..42e0e586 100644 --- a/umbrello/umbrello/folder.h +++ b/umbrello/umbrello/folder.h @@ -33,6 +33,7 @@ class UMLFolder : public UMLPackage { Q_OBJECT + TQ_OBJECT public: /** * Sets up a Folder. diff --git a/umbrello/umbrello/forkjoinwidget.cpp b/umbrello/umbrello/forkjoinwidget.cpp index a720a6cd..f30ebac8 100644 --- a/umbrello/umbrello/forkjoinwidget.cpp +++ b/umbrello/umbrello/forkjoinwidget.cpp @@ -42,7 +42,7 @@ TQSize ForkJoinWidget::calculateSize() { } void ForkJoinWidget::draw(TQPainter& p, int offsetX, int offsetY) { - p.fillRect( offsetX, offsetY, width(), height(), TQBrush( Qt::black )); + p.fillRect( offsetX, offsetY, width(), height(), TQBrush( TQt::black )); if (m_bSelected) { drawSelected(&p, offsetX, offsetY); diff --git a/umbrello/umbrello/forkjoinwidget.h b/umbrello/umbrello/forkjoinwidget.h index 8ee869ea..def633b4 100644 --- a/umbrello/umbrello/forkjoinwidget.h +++ b/umbrello/umbrello/forkjoinwidget.h @@ -31,7 +31,7 @@ public: /** * Constructs a ForkJoinWidget. * - * @param view The parent to this widget. + * @param view The tqparent to this widget. * @param drawVertical Whether to draw the plate horizontally or vertically. * @param id The ID to assign (-1 will prompt a new ID.) */ diff --git a/umbrello/umbrello/hierarchicalcodeblock.cpp b/umbrello/umbrello/hierarchicalcodeblock.cpp index eff7f463..7d31bf1d 100644 --- a/umbrello/umbrello/hierarchicalcodeblock.cpp +++ b/umbrello/umbrello/hierarchicalcodeblock.cpp @@ -114,7 +114,7 @@ bool HierarchicalCodeBlock::insertTextBlock(TextBlock * newBlock, TextBlock * ex return false; TQString tag = existingBlock->getTag(); - // FIX: just do a quick check if the parent DOCUMENT has this. + // FIX: just do a quick check if the tqparent DOCUMENT has this. // IF it does, then the lack of an index will force us into // a search of any child hierarchical codeblocks we may have // Its not efficient, but works. I don't think speed is a problem @@ -123,7 +123,7 @@ bool HierarchicalCodeBlock::insertTextBlock(TextBlock * newBlock, TextBlock * ex if(!getParentDocument()->findTextBlockByTag(tag, true)) return false; - int index = m_textblockVector.findRef(existingBlock); + int index = m_textblockVector.tqfindRef(existingBlock); if(index < 0) { // may be hiding in child hierarchical codeblock @@ -149,7 +149,7 @@ bool HierarchicalCodeBlock::insertTextBlock(TextBlock * newBlock, TextBlock * ex newBlock->setTag(new_tag); } - if(m_textBlockTagMap.contains(new_tag)) + if(m_textBlockTagMap.tqcontains(new_tag)) return false; // return false, we already have some object with this tag in the list else { m_textBlockTagMap.insert(new_tag, newBlock); @@ -202,7 +202,7 @@ void HierarchicalCodeBlock::setStartText ( const TQString &text ) { } /** - * @return QString + * @return TQString */ TQString HierarchicalCodeBlock::getStartText ( ) { return m_startText; @@ -310,7 +310,7 @@ void HierarchicalCodeBlock::setAttributesFromObject (TextBlock * obj) { /** - * @return QString + * @return TQString */ TQString HierarchicalCodeBlock::toString ( ) { @@ -365,7 +365,7 @@ TextBlock * HierarchicalCodeBlock::findCodeClassFieldTextBlockByTag ( const TQSt if(cdoc) return cdoc->findCodeClassFieldTextBlockByTag(tag); else - kError()<<" HierarchicalCodeBlock: findCodeClassFieldTextBlockByTag() finds NO parent document! Badly constructed textblock?!?"<<endl; + kError()<<" HierarchicalCodeBlock: findCodeClassFieldTextBlockByTag() finds NO tqparent document! Badly constructed textblock?!?"<<endl; // if we get here, we failed. return (TextBlock*) NULL; diff --git a/umbrello/umbrello/hierarchicalcodeblock.h b/umbrello/umbrello/hierarchicalcodeblock.h index ef145753..2b37f38e 100644 --- a/umbrello/umbrello/hierarchicalcodeblock.h +++ b/umbrello/umbrello/hierarchicalcodeblock.h @@ -28,6 +28,7 @@ class HierarchicalCodeBlock : public CodeBlockWithComments, public CodeGenObjectWithTextBlocks { Q_OBJECT + TQ_OBJECT friend class CodeGenObjectWithTextBlocks; public: @@ -85,7 +86,7 @@ public: void setStartText ( const TQString &text ); /** - * @return QString + * @return TQString */ TQString getStartText ( ); @@ -100,7 +101,7 @@ public: virtual void loadFromXMI ( TQDomElement & root ); /** - * @return QString + * @return TQString */ virtual TQString toString ( ); diff --git a/umbrello/umbrello/import_rose.cpp b/umbrello/umbrello/import_rose.cpp index 3968e72a..a04dfc43 100644 --- a/umbrello/umbrello/import_rose.cpp +++ b/umbrello/umbrello/import_rose.cpp @@ -31,12 +31,12 @@ namespace Import_Rose { typedef TQPtrList<PetalNode> PetalNodeList; -uint nClosures; // Multiple closing parentheses may appear on a single +uint nClosures; // Multiple closing tqparentheses may appear on a single // line. The parsing is done line-by-line and using // recursive descent. This means that we can only handle - // _one_ closing parenthesis at a time, i.e. the closing + // _one_ closing tqparenthesis at a time, i.e. the closing // of the currently parsed node. Since we may see more - // closing parentheses than we can handle, we need a + // closing tqparentheses than we can handle, we need a // counter indicating how many additional node closings // have been seen. @@ -106,8 +106,8 @@ bool checkClosing(TQStringList& tokens) { if (tokens.count() == 0) return false; if (tokens.last() == ")") { - // For a single closing parenthesis, we just return true. - // But if there are more closing parentheses, we need to increment + // For a single closing tqparenthesis, we just return true. + // But if there are more closing tqparentheses, we need to increment // nClosures for each scope. tokens.pop_back(); while (tokens.count() && tokens.last() == ")") { @@ -125,7 +125,7 @@ bool checkClosing(TQStringList& tokens) { * or a quoted string. */ bool isImmediateValue(TQString s) { - return s.contains(TQRegExp("^[\\d\\-\"]")); + return s.tqcontains(TQRegExp("^[\\d\\-\"]")); } /** @@ -133,7 +133,7 @@ bool isImmediateValue(TQString s) { * Examples of immediate value lists: * number list: ( 123 , 456 ) * string list: ( "SomeText" 888 ) - * Any enclosing parentheses are removed. + * Any enclosing tqparentheses are removed. * All extracted items are also removed from `l'. * For the example given above the following is returned: * "123 456" @@ -236,7 +236,7 @@ TQString extractValue(TQStringList& l, TQTextStream& stream) { } else { result = shift(l); if (l.first() != ")") { - kError() << loc() << "expecting closing parenthesis" << endl; + kError() << loc() << "expecting closing tqparenthesis" << endl; return result; } l.pop_front(); @@ -286,7 +286,7 @@ PetalNode *readAttributes(TQStringList initialArgs, TQTextStream& stream) { TQStringList tokens = scan(line); TQString stringOrNodeOpener = shift(tokens); TQString name; - if (nt == PetalNode::nt_object && !stringOrNodeOpener.contains(TQRegExp("^[A-Za-z]"))) { + if (nt == PetalNode::nt_object && !stringOrNodeOpener.tqcontains(TQRegExp("^[A-Za-z]"))) { kError() << loc() << "unexpected line " << line << endl; return NULL; } @@ -301,7 +301,7 @@ PetalNode *readAttributes(TQStringList initialArgs, TQTextStream& stream) { // Decrement nClosures exactly once, namely for the own scope. // Each recursion of readAttributes() is only responsible for // its own scope. I.e. each further scope closing is handled by - // an outer recursion in case of multiple closing parentheses. + // an outer recursion in case of multiple closing tqparentheses. nClosures--; break; } @@ -339,7 +339,7 @@ PetalNode *readAttributes(TQStringList initialArgs, TQTextStream& stream) { // Decrement nClosures exactly once, namely for the own scope. // Each recursion of readAttributes() is only responsible for // its own scope. I.e. each further scope closing is handled by - // an outer recursion in case of multiple closing parentheses. + // an outer recursion in case of multiple closing tqparentheses. nClosures--; break; } @@ -365,18 +365,18 @@ bool loadFromMDL(TQIODevice& file) { linum = 0; while (!(line = stream.readLine()).isNull()) { linum++; - if (line.contains( TQRegExp("^\\s*\\(object Petal") )) { - while (!(line = stream.readLine()).isNull() && !line.contains(')')) { + if (line.tqcontains( TQRegExp("^\\s*\\(object Petal") )) { + while (!(line = stream.readLine()).isNull() && !line.tqcontains(')')) { linum++; // CHECK: do we need petal version info? } if (line.isNull()) break; } else { TQRegExp objectRx("^\\s*\\(object "); - if (line.contains(objectRx)) { + if (line.tqcontains(objectRx)) { nClosures = 0; TQStringList initialArgs = scan(line); - initialArgs.pop_front(); // remove opening parenthesis + initialArgs.pop_front(); // remove opening tqparenthesis root = readAttributes(initialArgs, stream); } } diff --git a/umbrello/umbrello/kplayerslideraction.cpp b/umbrello/umbrello/kplayerslideraction.cpp index 05ce0100..e7614daf 100644 --- a/umbrello/umbrello/kplayerslideraction.cpp +++ b/umbrello/umbrello/kplayerslideraction.cpp @@ -33,11 +33,11 @@ void KPlayerPopupFrame::keyPressEvent (TQKeyEvent* ev) { switch ( ev -> key() ) { - case Qt::Key_Alt: - case Qt::Key_Tab: - case Qt::Key_Escape: - case Qt::Key_Return: - case Qt::Key_Enter: + case TQt::Key_Alt: + case TQt::Key_Tab: + case TQt::Key_Escape: + case TQt::Key_Return: + case TQt::Key_Enter: close(); } } @@ -50,7 +50,7 @@ void KPlayerPopupFrame::keyPressEvent (TQKeyEvent* ev) void KPlayerPopupFrame::mousePressEvent (TQMouseEvent* ev) { TQFrame::mousePressEvent (ev); -//if ( ! rect().contains (ev -> pos()) ) +//if ( ! rect().tqcontains (ev -> pos()) ) // m_outside_mouse_press = true; } @@ -60,21 +60,21 @@ void KPlayerPopupFrame::mouseReleaseEvent (TQMouseEvent* ev) if ( m_outside_mouse_press ) { m_outside_mouse_press = false; - if ( ! rect().contains (ev -> pos()) ) + if ( ! rect().tqcontains (ev -> pos()) ) close(); } }*/ KPlayerPopupSliderAction::KPlayerPopupSliderAction (const TQString& text, const TQString& pix, const KShortcut& shortcut, const TQObject* receiver, - const char* slot, TQObject* parent, const char* name) - : KAction (text, pix, shortcut, parent, name) + const char* slot, TQObject* tqparent, const char* name) + : KAction (text, pix, shortcut, tqparent, name) { m_frame = new KPlayerPopupFrame; m_frame -> setFrameStyle (TQFrame::PopupPanel | TQFrame::Raised); m_frame -> setLineWidth (2); m_slider = new KPlayerSlider (Qt::Vertical, m_frame); - m_frame -> resize (36, m_slider -> sizeHint().height() + 4); + m_frame -> resize (36, m_slider -> tqsizeHint().height() + 4); m_slider -> setGeometry (m_frame -> contentsRect()); //CHANGED kdDebug() << "Popup slider size " << m_slider -> width() << "x" << m_slider -> height() << "\n"; connect (m_slider, TQT_SIGNAL (changed (int)), receiver, slot); @@ -158,9 +158,9 @@ void KPlayerPopupSliderAction::slotActivated (void) } KPlayerSliderAction::KPlayerSliderAction (const TQString& text, const KShortcut& cut, - const TQObject* receiver, const char* slot, KActionCollection* parent, const char* name) - : KWidgetAction (new KPlayerSlider (Qt::Horizontal, 0, name), text, cut, receiver, slot, parent, name) - //: KAction (text, 0, parent, name) + const TQObject* receiver, const char* slot, KActionCollection* tqparent, const char* name) + : KWidgetAction (new KPlayerSlider (Qt::Horizontal, 0, name), text, cut, receiver, slot, tqparent, name) + //: KAction (text, 0, tqparent, name) { setAutoSized (true); connect (slider(), TQT_SIGNAL (changed (int)), receiver, slot); @@ -187,7 +187,7 @@ int KPlayerSliderAction::plug (TQWidget* widget, int index) return result; KToolBar* toolbar = (KToolBar*) widget; //int id = getToolButtonID(); - //kdDebug() << "Orientation: " << toolbar -> orientation() << "\n"; + //kdDebug() << "Qt::Orientation: " << toolbar -> orientation() << "\n"; //m_slider -> reparent (toolbar, TQPoint()); //toolbar -> insertWidget (id, 0, m_slider, index); //toolbar -> setItemAutoSized (id, true); @@ -199,10 +199,10 @@ int KPlayerSliderAction::plug (TQWidget* widget, int index) //addContainer (toolbar, id); //setupToolbar (toolbar -> orientation(), toolbar); orientationChanged (toolbar -> orientation()); - connect (toolbar, TQT_SIGNAL (orientationChanged (Orientation)), this, TQT_SLOT (orientationChanged (Orientation))); + connect (toolbar, TQT_SIGNAL (orientationChanged (Qt::Orientation)), this, TQT_SLOT (orientationChanged (Qt::Orientation))); //connect (toolbar, TQT_SIGNAL (destroyed()), this, TQT_SLOT (toolbarDestroyed())); - //if ( parentCollection() ) - // parentCollection() -> connectHighlight (toolbar, this); + //if ( tqparentCollection() ) + // tqparentCollection() -> connectHighlight (toolbar, this); //return containerCount() - 1; return result; } @@ -213,10 +213,10 @@ void KPlayerSliderAction::unplug (TQWidget* widget) //Q_ASSERT (isPlugged()); //Q_ASSERT (widget -> inherits ("KToolBar")); KWidgetAction::unplug (widget); - if ( ! slider() || ! isPlugged() || widget != slider() -> parent() ) + if ( ! slider() || ! isPlugged() || TQT_BASE_OBJECT(widget) != TQT_BASE_OBJECT(slider() -> tqparent()) ) return; //KToolBar* toolbar = (KToolBar*) widget; - disconnect (widget, TQT_SIGNAL (orientationChanged (Orientation)), this, TQT_SLOT (orientationChanged (Orientation))); + disconnect (widget, TQT_SIGNAL (orientationChanged (Qt::Orientation)), this, TQT_SLOT (orientationChanged (Qt::Orientation))); //disconnect (toolbar, TQT_SIGNAL (destroyed()), this, TQT_SLOT (toolbarDestroyed())); //m_slider -> reparent (0, TQPoint()); /*int index = findContainer (toolbar); @@ -226,7 +226,7 @@ void KPlayerSliderAction::unplug (TQWidget* widget) removeContainer (index);*/ } -/*void KPlayerSliderAction::setupToolbar (Orientation orientation, KToolBar* toolbar) +/*void KPlayerSliderAction::setupToolbar (Qt::Orientation orientation, KToolBar* toolbar) { if ( orientation == Qt::Horizontal ) { @@ -264,9 +264,9 @@ void KPlayerSliderAction::orientationChanged (Qt::Orientation orientation) m_slider -> reparent (0, TQPoint()); }*/ -KPlayerSlider::KPlayerSlider (Qt::Orientation orientation, TQWidget* parent, const char* name) -//CHANGED : TQSlider (orientation, parent, name) - : TQSlider (300, 2200, 400, 1000, orientation, parent, name) +KPlayerSlider::KPlayerSlider (Qt::Orientation orientation, TQWidget* tqparent, const char* name) +//CHANGED : TQSlider (orientation, tqparent, name) + : TQSlider (300, 2200, 400, 1000, orientation, tqparent, name) { m_changing_orientation = false; setTickmarks (TQSlider::Both); @@ -278,9 +278,9 @@ KPlayerSlider::~KPlayerSlider() //CHANGED kdDebug() << "KPlayerSlider destroyed\n"; } -TQSize KPlayerSlider::sizeHint() const +TQSize KPlayerSlider::tqsizeHint() const { - TQSize hint = TQSlider::sizeHint(); + TQSize hint = TQSlider::tqsizeHint(); //CHANGED int length = kPlayerSettings() -> preferredSliderLength(); int length = 200; if ( orientation() == Qt::Horizontal ) @@ -296,10 +296,10 @@ TQSize KPlayerSlider::sizeHint() const return hint; } -TQSize KPlayerSlider::minimumSizeHint() const +TQSize KPlayerSlider::tqminimumSizeHint() const { //kdDebug() << "KPlayerSlider minimum size hint\n"; - TQSize hint = TQSlider::minimumSizeHint(); + TQSize hint = TQSlider::tqminimumSizeHint(); //CHANGED int length = kPlayerSettings() -> minimumSliderLength(); int length = 200; if ( orientation() == Qt::Horizontal ) diff --git a/umbrello/umbrello/kplayerslideraction.h b/umbrello/umbrello/kplayerslideraction.h index 076ebf22..9ffd1a3a 100644 --- a/umbrello/umbrello/kplayerslideraction.h +++ b/umbrello/umbrello/kplayerslideraction.h @@ -19,28 +19,29 @@ #include <kaction.h> #include <tqslider.h> -/**KPlayer's slider widget. Works around the Qt upside-down slider bug. +/**KPlayer's slider widget. Works around the TQt upside-down slider bug. * Taken from kplayer CVS 2003-09-21 (kplayer > 0.3.1) by Jonathan Riddell *@author kiriuja */ -class KPlayerSlider : public QSlider +class KPlayerSlider : public TQSlider { Q_OBJECT + TQ_OBJECT public: /** The KPlayerSlider constructor. Parameters are passed on to TQSlider. */ - explicit KPlayerSlider (Qt::Orientation, TQWidget* parent = 0, const char* name = 0); + explicit KPlayerSlider (Qt::Orientation, TQWidget* tqparent = 0, const char* name = 0); /** The KPlayerSlider destructor. Does nothing. */ virtual ~KPlayerSlider(); /** The size hint. */ - virtual TQSize sizeHint() const; + virtual TQSize tqsizeHint() const; /** The minimum size hint. */ - virtual TQSize minimumSizeHint() const; + virtual TQSize tqminimumSizeHint() const; /** The minimum value. */ @@ -101,15 +102,16 @@ protected: /**KPlayer popup frame. *@author kiriuja */ -class KPlayerPopupFrame : public QFrame +class KPlayerPopupFrame : public TQFrame { Q_OBJECT + TQ_OBJECT public: /** The KPlayerPopupFrame constructor. Parameters are passed on to TQFrame. */ - KPlayerPopupFrame (TQWidget* parent = 0, const char* name = 0) - : TQFrame (parent, name, Qt::WType_Popup) { } + KPlayerPopupFrame (TQWidget* tqparent = 0, const char* name = 0) + : TQFrame (tqparent, name, TQt::WType_Popup) { } /** The KPlayerPopupFrame destructor. Does nothing. */ virtual ~KPlayerPopupFrame() { } @@ -126,12 +128,13 @@ protected: class KPlayerPopupSliderAction : public KAction { Q_OBJECT + TQ_OBJECT public: /** The KPlayerPopupSliderAction constructor. Parameters are passed on to KAction. */ KPlayerPopupSliderAction (const TQString& text, const TQString& pix, const KShortcut& shortcut, - const TQObject* receiver, const char* slot, TQObject* parent = 0, const char* name = 0); + const TQObject* receiver, const char* slot, TQObject* tqparent = 0, const char* name = 0); /** The KPlayerPopupSliderAction destructor. Deletes the KPlayerPopupFrame. */ virtual ~KPlayerPopupSliderAction(); @@ -141,9 +144,9 @@ public: KPlayerSlider* slider (void) { return m_slider; } - /** Plugs the action into the toolbar. Reparents the slider into the toolbar. */ + /** Plugs the action into the toolbar. Retqparents the slider into the toolbar. */ //virtual int plug (TQWidget*, int = -1); - /** Unplugs the action from the toolbar. Reparents the slider out of the toolbar. */ + /** Unplugs the action from the toolbar. Retqparents the slider out of the toolbar. */ //virtual void unplug (TQWidget*); protected slots: @@ -166,12 +169,13 @@ protected: class KPlayerSliderAction : public KWidgetAction { Q_OBJECT + TQ_OBJECT public: /** The KPlayerSliderAction constructor. Parameters are passed on to KAction. */ KPlayerSliderAction (const TQString& text, const KShortcut&, const TQObject* receiver, - const char* slot, KActionCollection* parent = 0, const char* name = 0); + const char* slot, KActionCollection* tqparent = 0, const char* name = 0); /** The KPlayerSliderAction destructor. Does nothing. */ virtual ~KPlayerSliderAction(); diff --git a/umbrello/umbrello/kstartuplogo.cpp b/umbrello/umbrello/kstartuplogo.cpp index 7f768260..48df28a8 100644 --- a/umbrello/umbrello/kstartuplogo.cpp +++ b/umbrello/umbrello/kstartuplogo.cpp @@ -17,8 +17,8 @@ #include <kstandarddirs.h> #include <tqtimer.h> -KStartupLogo::KStartupLogo(TQWidget * parent, const char *name) - : TQWidget(parent,name, Qt::WStyle_NoBorder | Qt::WStyle_Customize | Qt::WDestructiveClose ) +KStartupLogo::KStartupLogo(TQWidget * tqparent, const char *name) + : TQWidget(tqparent,name, TQt::WStyle_NoBorder | TQt::WStyle_Customize | TQt::WDestructiveClose ) ,m_bReadyToHide(false) { //pm.load(locate("appdata", "pics/startlogo.png")); KStandardDirs * dirs = KGlobal::dirs(); diff --git a/umbrello/umbrello/kstartuplogo.h b/umbrello/umbrello/kstartuplogo.h index 71181891..07770d6c 100644 --- a/umbrello/umbrello/kstartuplogo.h +++ b/umbrello/umbrello/kstartuplogo.h @@ -26,8 +26,9 @@ */ class KStartupLogo : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KStartupLogo(TQWidget *parent=0, const char *name=0); + KStartupLogo(TQWidget *tqparent=0, const char *name=0); ~KStartupLogo(); void setHideEnabled(bool bEnabled); diff --git a/umbrello/umbrello/linepath.cpp b/umbrello/umbrello/linepath.cpp index b79ed8ac..b2dde5ab 100644 --- a/umbrello/umbrello/linepath.cpp +++ b/umbrello/umbrello/linepath.cpp @@ -84,7 +84,7 @@ void LinePath::setAssociation(AssociationWidget * association ) { createHeadLines(); if( getAssocType() == Uml::at_Coll_Message ) setupParallelLine(); - UMLView * view = (UMLView *)m_pAssociation -> parent(); + UMLView * view = (UMLView *)m_pAssociation -> tqparent(); connect( view, TQT_SIGNAL( sigColorChanged( Uml::IDType ) ), this, TQT_SLOT( slotLineColorChanged( Uml::IDType ) ) ); connect( view, TQT_SIGNAL( sigLineWidthChanged( Uml::IDType ) ), this, TQT_SLOT( slotLineWidthChanged( Uml::IDType ) ) ); } @@ -176,7 +176,7 @@ bool LinePath::insertPoint( int pointIndex, const TQPoint &point ) { line -> setZ( -2 ); line -> setPoints( point.x(), point.y(), ep.x(), ep.y() ); line -> setPen( getPen() ); - line -> setVisible( true ); + line -> tqsetVisible( true ); m_LineList.insert( 1, line ); if (!bLoading) setupSelected(); @@ -191,7 +191,7 @@ bool LinePath::insertPoint( int pointIndex, const TQPoint &point ) { line -> setPoints( point.x(), point.y(), ep.x(), ep.y() ); line -> setZ( -2 ); line -> setPen( getPen() ); - line -> setVisible( true ); + line -> tqsetVisible( true ); m_LineList.append( line ); if (!bLoading) setupSelected(); @@ -205,7 +205,7 @@ bool LinePath::insertPoint( int pointIndex, const TQPoint &point ) { line -> setPoints( point.x(), point.y(), ep.x(), ep.y() ); line -> setZ( -2 ); line -> setPen( getPen() ); - line -> setVisible( true ); + line -> tqsetVisible( true ); m_LineList.insert( pointIndex, line ); if (!bLoading) setupSelected(); @@ -277,7 +277,7 @@ bool LinePath::setStartEndPoints( const TQPoint &start, const TQPoint &end ) { line -> setPoints( start.x(), start.y(), end.x(), end.y() ); line -> setZ( -2 ); line -> setPen( getPen() ); - line -> setVisible( true ); + line -> tqsetVisible( true ); m_LineList.append( line ); return true; } @@ -297,7 +297,7 @@ int LinePath::onLinePath( const TQPoint &position ) { TQCanvasItemList::iterator end(list.end()); for(TQCanvasItemList::iterator item_it(list.begin()); item_it != end; ++item_it ) { - if( ( index = m_LineList.findRef( (TQCanvasLine*)*item_it ) ) != -1 ) + if( ( index = m_LineList.tqfindRef( (TQCanvasLine*)*item_it ) ) != -1 ) break; }//end for return index; @@ -374,7 +374,7 @@ void LinePath::setLineColor( const TQColor &color ) { } if( getAssocType() == Uml::at_Aggregation ) - if (m_pClearPoly) m_pClearPoly -> setBrush( TQBrush( Qt::white ) ); + if (m_pClearPoly) m_pClearPoly -> setBrush( TQBrush( TQt::white ) ); else if( getAssocType() == Uml::at_Composition ) if (m_pClearPoly) m_pClearPoly -> setBrush( TQBrush( color ) ); @@ -467,7 +467,7 @@ void LinePath::setupSelected() { TQPen LinePath::getPen() { Uml::Association_Type type = getAssocType(); if( type == Uml::at_Dependency || type == Uml::at_Realization || type == Uml::at_Anchor ) - return TQPen( getLineColor(), getLineWidth(), Qt::DashLine ); + return TQPen( getLineColor(), getLineWidth(), TQt::DashLine ); return TQPen( getLineColor(), getLineWidth() ); } @@ -644,7 +644,7 @@ void LinePath::growList(LineList &list, int by) { TQCanvasLine * line = new TQCanvasLine( getCanvas() ); line -> setZ( 0 ); line -> setPen( pen ); - line -> setVisible( true ); + line -> tqsetVisible( true ); list.append( line ); } } @@ -665,8 +665,8 @@ void LinePath::createHeadLines() { case Uml::at_Realization: growList(m_HeadList, 3); m_pClearPoly = new TQCanvasPolygon( canvas ); - m_pClearPoly -> setVisible( true ); - m_pClearPoly -> setBrush( TQBrush( Qt::white ) ); + m_pClearPoly -> tqsetVisible( true ); + m_pClearPoly -> setBrush( TQBrush( TQt::white ) ); m_pClearPoly -> setZ( -1 ); break; @@ -674,9 +674,9 @@ void LinePath::createHeadLines() { case Uml::at_Aggregation: growList(m_HeadList, 4); m_pClearPoly = new TQCanvasPolygon( canvas ); - m_pClearPoly -> setVisible( true ); + m_pClearPoly -> tqsetVisible( true ); if( getAssocType() == Uml::at_Aggregation ) - m_pClearPoly -> setBrush( TQBrush( Qt::white ) ); + m_pClearPoly -> setBrush( TQBrush( TQt::white ) ); else m_pClearPoly -> setBrush( TQBrush( getLineColor() ) ); m_pClearPoly -> setZ( -1 ); @@ -815,7 +815,7 @@ Uml::Association_Type LinePath::getAssocType() { TQColor LinePath::getLineColor() { if( !m_pAssociation ) - return Qt::black; + return TQt::black; return m_pAssociation -> getLineColor(); } @@ -847,7 +847,7 @@ void LinePath::cleanup() { m_pClearPoly = 0; m_bHeadCreated = m_bParallelLineCreated = false; if( m_pAssociation ) { - UMLView * view = (UMLView *)m_pAssociation -> parent(); + UMLView * view = (UMLView *)m_pAssociation -> tqparent(); if(view) { disconnect( view, TQT_SIGNAL( sigColorChanged( Uml::IDType ) ), this, TQT_SLOT( slotLineColorChanged( Uml::IDType ) ) ); disconnect( view, TQT_SIGNAL( sigLineWidthChanged( Uml::IDType ) ), this, TQT_SLOT( slotLineWidthChanged( Uml::IDType ) ) ); diff --git a/umbrello/umbrello/linepath.h b/umbrello/umbrello/linepath.h index ea0251a9..d02714ed 100644 --- a/umbrello/umbrello/linepath.h +++ b/umbrello/umbrello/linepath.h @@ -25,7 +25,7 @@ class AssociationWidget; class UMLView; -// Qt forward declarations +// TQt forward declarations class TQDataStream; class TQDomDocument; class TQDomElement; @@ -44,6 +44,7 @@ typedef TQPtrListIterator<TQCanvasRectangle> RectListIt; */ class LinePath : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Constructor @@ -168,7 +169,7 @@ public: * This is needed because the m_pAssociation does not yet * exist at the time of the LinePath::loadFromXMI call. * However, this means that the points in the m_LineList - * do not have a parent when they are loaded. + * do not have a tqparent when they are loaded. * They need to be reparented by calling LinePath::activate() * once the m_pAssociation exists. */ diff --git a/umbrello/umbrello/linkwidget.cpp b/umbrello/umbrello/linkwidget.cpp index 508de933..259d6567 100644 --- a/umbrello/umbrello/linkwidget.cpp +++ b/umbrello/umbrello/linkwidget.cpp @@ -30,7 +30,7 @@ UMLClassifier *LinkWidget::getOperationOwner() { UMLOperation *op = getOperation(); if (op == NULL) return NULL; - return static_cast<UMLClassifier*>(op->parent()); + return static_cast<UMLClassifier*>(op->tqparent()); } TQString LinkWidget::getOperationText(UMLView *view /* = NULL */) { diff --git a/umbrello/umbrello/listpopupmenu.cpp b/umbrello/umbrello/listpopupmenu.cpp index d94f8c18..548ded25 100644 --- a/umbrello/umbrello/listpopupmenu.cpp +++ b/umbrello/umbrello/listpopupmenu.cpp @@ -37,15 +37,15 @@ #include "objectwidget.h" //ListPopupMenu for a UMLView (diagram) -ListPopupMenu::ListPopupMenu(TQWidget *parent, Menu_Type type, UMLView * view) - : KPopupMenu(parent) { +ListPopupMenu::ListPopupMenu(TQWidget *tqparent, Menu_Type type, UMLView * view) + : KPopupMenu(tqparent) { init(); setupMenu(type, view); } //ListPopupMenu for the tree list view -ListPopupMenu::ListPopupMenu(TQWidget *parent, Uml::ListView_Type type) - : KPopupMenu(parent) { +ListPopupMenu::ListPopupMenu(TQWidget *tqparent, Uml::ListView_Type type) + : KPopupMenu(tqparent) { init(); Menu_Type mt = mt_Undefined; switch(type) @@ -205,9 +205,9 @@ ListPopupMenu::ListPopupMenu(TQWidget *parent, Uml::ListView_Type type) } //ListPopupMenu for a canvas widget -ListPopupMenu::ListPopupMenu(TQWidget * parent, UMLWidget * object, +ListPopupMenu::ListPopupMenu(TQWidget * tqparent, UMLWidget * object, bool multi, bool unique) - : KPopupMenu(parent) + : KPopupMenu(tqparent) { init(); //make the right menu for the type @@ -259,7 +259,7 @@ ListPopupMenu::ListPopupMenu(TQWidget * parent, UMLWidget * object, StateWidget *pState; ActivityWidget *pActivity; - UMLView * pView = static_cast<UMLView *>( parent ); + UMLView * pView = static_cast<UMLView *>( tqparent ); switch(type) { case Uml::wt_Actor: @@ -373,9 +373,9 @@ ListPopupMenu::ListPopupMenu(TQWidget * parent, UMLWidget * object, { ForkJoinWidget *pForkJoin = static_cast<ForkJoinWidget*>(object); if (pForkJoin->getDrawVertical()) - insertItem(i18n("Flip Horizontal"), mt_Flip); + insertItem(i18n("FlipQt::Horizontal"), mt_Flip); else - insertItem(i18n("Flip Vertical"), mt_Flip); + insertItem(i18n("FlipQt::Vertical"), mt_Flip); } break; diff --git a/umbrello/umbrello/listpopupmenu.h b/umbrello/umbrello/listpopupmenu.h index e7030090..54c7336c 100644 --- a/umbrello/umbrello/listpopupmenu.h +++ b/umbrello/umbrello/listpopupmenu.h @@ -187,30 +187,30 @@ public: /** * Constructs the popup menu for a diagram * - * @param parent The parent to ListPopupMenu. + * @param tqparent The tqparent to ListPopupMenu. * @param type The type of menu to display. * @param view The UMLView in which this ListPopupMenu is going to be displayed */ - explicit ListPopupMenu(TQWidget* parent, Menu_Type type = mt_Undefined, UMLView* view = 0); + explicit ListPopupMenu(TQWidget* tqparent, Menu_Type type = mt_Undefined, UMLView* view = 0); /** * Constructs the popup menu for a list view item. * - * @param parent The parent to ListPopupMenu. + * @param tqparent The tqparent to ListPopupMenu. * @param type The type of menu to display. */ - ListPopupMenu(TQWidget* parent, Uml::ListView_Type type); + ListPopupMenu(TQWidget* tqparent, Uml::ListView_Type type); /** * Constructs the popup menu for a canvas widget. * - * @param parent The parent to ListPopupMenu. + * @param tqparent The tqparent to ListPopupMenu. * @param object The UMLWidget to represent a menu for. * @param multi True if multiple items are selected. * @param unique True if multiple selected items all have * the same type (e.g. Class, Interface) */ - ListPopupMenu(TQWidget* parent, UMLWidget* object, bool multi = false, bool unique = false); + ListPopupMenu(TQWidget* tqparent, UMLWidget* object, bool multi = false, bool unique = false); /** * Standard deconstructor. @@ -296,7 +296,7 @@ private: * Shortcut for commonly used menu initializations. * * @param type The Menu_Type for which to set up the menu. - * @param view The UMLView parent of the menu. + * @param view The UMLView tqparent of the menu. */ void setupMenu(Menu_Type type, UMLView * view = 0); diff --git a/umbrello/umbrello/messagewidget.cpp b/umbrello/umbrello/messagewidget.cpp index 1139b58c..3e24e7f7 100644 --- a/umbrello/umbrello/messagewidget.cpp +++ b/umbrello/umbrello/messagewidget.cpp @@ -64,7 +64,7 @@ void MessageWidget::init() { m_pOw[Uml::A] = m_pOw[Uml::B] = NULL; m_pFText = NULL; m_nY = 0; - setVisible(true); + tqsetVisible(true); } MessageWidget::~MessageWidget() { @@ -94,9 +94,9 @@ void MessageWidget::draw(TQPainter& p, int offsetX, int offsetY) { } } -void MessageWidget::drawSolidArrowhead(TQPainter& p, int x, int y, Qt::ArrowType direction) { +void MessageWidget::drawSolidArrowhead(TQPainter& p, int x, int y, TQt::ArrowType direction) { int arrowheadExtentX = 4; - if (direction == Qt::RightArrow) { + if (direction == TQt::RightArrow) { arrowheadExtentX = -arrowheadExtentX; } TQPointArray points; @@ -106,10 +106,10 @@ void MessageWidget::drawSolidArrowhead(TQPainter& p, int x, int y, Qt::ArrowType } void MessageWidget::drawArrow(TQPainter& p, int x, int y, int w, - Qt::ArrowType direction, bool useDottedLine /* = false */) { + TQt::ArrowType direction, bool useDottedLine /* = false */) { int arrowheadStartX = x; int arrowheadExtentX = 4; - if (direction == Qt::RightArrow) { + if (direction == TQt::RightArrow) { arrowheadStartX += w; arrowheadExtentX = -arrowheadExtentX; } @@ -135,7 +135,7 @@ void MessageWidget::drawSynchronous(TQPainter& p, int offsetX, int offsetY) { bool messageOverlaps = m_pOw[Uml::A] -> messageOverlap( getY(), this ); if(m_pOw[Uml::A] == m_pOw[Uml::B]) { - p.fillRect( offsetX, offsetY, 17, h, TQBrush(Qt::white) ); //box + p.fillRect( offsetX, offsetY, 17, h, TQBrush(TQt::white) ); //box p.drawRect(offsetX, offsetY, 17, h); //box offsetX += 17; w -= 17; @@ -146,7 +146,7 @@ void MessageWidget::drawSynchronous(TQPainter& p, int offsetX, int offsetY) { // draw line segment parallel to (and at the right of) the life line p.drawLine(offsetX + w, offsetY, offsetX + w, lowerLineY); // draw lower line segment (back to the life line) - drawArrow(p, offsetX, lowerLineY, w, Qt::LeftArrow); + drawArrow(p, offsetX, lowerLineY, w, TQt::LeftArrow); offsetX -= 17; offsetY -= 3; } else if(x1 < x2) { @@ -156,11 +156,11 @@ void MessageWidget::drawSynchronous(TQPainter& p, int offsetX, int offsetY) { } TQPen pen = p.pen(); int startX = offsetX + w - 16; - p.fillRect(startX, offsetY, 17, h, TQBrush(Qt::white)); //box + p.fillRect(startX, offsetY, 17, h, TQBrush(TQt::white)); //box p.drawRect(startX, offsetY, 17, h); //box p.drawLine(offsetX, offsetY + 4, startX, offsetY + 4); //arrow line - drawSolidArrowhead(p, startX - 1, offsetY + 4, Qt::RightArrow); - drawArrow(p, offsetX, offsetY + h - 3, w - 16, Qt::LeftArrow, true); // return arrow + drawSolidArrowhead(p, startX - 1, offsetY + 4, TQt::RightArrow); + drawArrow(p, offsetX, offsetY + h - 3, w - 16, TQt::LeftArrow, true); // return arrow if (messageOverlaps) { offsetX -= 8; //reset for drawSelected() } @@ -169,11 +169,11 @@ void MessageWidget::drawSynchronous(TQPainter& p, int offsetX, int offsetY) { w -=8; } TQPen pen = p.pen(); - p.fillRect( offsetX, offsetY, 17, h, TQBrush(Qt::white) ); //box + p.fillRect( offsetX, offsetY, 17, h, TQBrush(TQt::white) ); //box p.drawRect(offsetX, offsetY, 17, h); //box p.drawLine(offsetX + 18, offsetY + 4, offsetX + w, offsetY + 4); //arrow line - drawSolidArrowhead(p, offsetX + 17, offsetY + 4, Qt::LeftArrow); - drawArrow(p, offsetX + 18, offsetY + h - 3, w - 18, Qt::RightArrow, true); // return arrow + drawSolidArrowhead(p, offsetX + 17, offsetY + 4, TQt::LeftArrow); + drawArrow(p, offsetX + 18, offsetY + h - 3, w - 18, TQt::RightArrow, true); // return arrow } if(m_bSelected) { @@ -200,7 +200,7 @@ void MessageWidget::drawAsynchronous(TQPainter& p, int offsetX, int offsetY) { // draw line segment parallel to (and at the right of) the life line p.drawLine(offsetX + w, offsetY, offsetX + w, lowerLineY); // draw lower line segment (back to the life line) - drawArrow(p, offsetX, lowerLineY, w, Qt::LeftArrow); + drawArrow(p, offsetX, lowerLineY, w, TQt::LeftArrow); if (messageOverlapsA) { offsetX -= 7; //reset for drawSelected() } @@ -209,7 +209,7 @@ void MessageWidget::drawAsynchronous(TQPainter& p, int offsetX, int offsetY) { offsetX += 7; w -= 7; } - drawArrow(p, offsetX, offsetY + 4, w, Qt::RightArrow); + drawArrow(p, offsetX, offsetY + 4, w, TQt::RightArrow); if (messageOverlapsA) { offsetX -= 7; } @@ -217,7 +217,7 @@ void MessageWidget::drawAsynchronous(TQPainter& p, int offsetX, int offsetY) { if (messageOverlapsA) { w -= 7; } - drawArrow(p, offsetX, offsetY + 4, w, Qt::LeftArrow); + drawArrow(p, offsetX, offsetY + 4, w, TQt::LeftArrow); } if (m_bSelected) @@ -238,7 +238,7 @@ void MessageWidget::drawCreation(TQPainter& p, int offsetX, int offsetY) { offsetX += 7; w -= 7; } - drawArrow(p, offsetX, lineY, w, Qt::RightArrow); + drawArrow(p, offsetX, lineY, w, TQt::RightArrow); if (messageOverlapsA) { offsetX -= 7; } @@ -246,7 +246,7 @@ void MessageWidget::drawCreation(TQPainter& p, int offsetX, int offsetY) { if (messageOverlapsA) { w -= 7; } - drawArrow(p, offsetX, lineY, w, Qt::LeftArrow); + drawArrow(p, offsetX, lineY, w, TQt::LeftArrow); } if (m_bSelected) @@ -353,7 +353,7 @@ void MessageWidget::calculateWidget() { setMessageText(m_pFText); calculateDimensions(); - setVisible(true); + tqsetVisible(true); setX(m_nPosX); setY(m_nY); @@ -381,7 +381,7 @@ void MessageWidget::slotWidgetMoved(Uml::IDType id) { setTextPosition(); } -bool MessageWidget::contains(ObjectWidget * w) { +bool MessageWidget::tqcontains(ObjectWidget * w) { if(m_pOw[Uml::A] == w || m_pOw[Uml::B] == w) return true; else @@ -447,7 +447,7 @@ bool MessageWidget::activate(IDChangeLog * Log /*= 0*/) { if (op) { // If the UMLOperation is set, m_CustomOp isn't used anyway. // Just setting it empty for the sake of sanity. - m_CustomOp = TQString::null; + m_CustomOp = TQString(); } } @@ -464,7 +464,7 @@ bool MessageWidget::activate(IDChangeLog * Log /*= 0*/) { m_pFText -> setText(""); m_pFText->setActivated(); TQString messageText = m_pFText->getText(); - m_pFText->setVisible( messageText.length() > 1 ); + m_pFText->tqsetVisible( messageText.length() > 1 ); connect(m_pOw[Uml::A], TQT_SIGNAL(sigWidgetMoved(Uml::IDType)), this, TQT_SLOT(slotWidgetMoved(Uml::IDType))); connect(m_pOw[Uml::B], TQT_SIGNAL(sigWidgetMoved(Uml::IDType)), this, TQT_SLOT(slotWidgetMoved(Uml::IDType))); diff --git a/umbrello/umbrello/messagewidget.h b/umbrello/umbrello/messagewidget.h index 29383405..a0828da7 100644 --- a/umbrello/umbrello/messagewidget.h +++ b/umbrello/umbrello/messagewidget.h @@ -40,13 +40,14 @@ class MessageWidgetController; */ class MessageWidget : public UMLWidget, public LinkWidget { Q_OBJECT + TQ_OBJECT public: friend class MessageWidgetController; /** * Constructs a MessageWidget. * - * @param view The parent to this class. + * @param view The tqparent to this class. * @param a The role A widget for this message. * @param b The role B widget for this message. * @param y The vertical position to display this message. @@ -61,7 +62,7 @@ public: /** * Constructs a MessageWidget. * - * @param view The parent to this class. + * @param view The tqparent to this class. * @param sequenceMessageType The Uml::Sequence_Message_Type of this message widget * @param id The ID to assign (-1 will prompt a new ID.) */ @@ -100,7 +101,7 @@ public: * @param w The ObjectWidget to check for. * @return true - if is contained, false - not contained. */ - bool contains(ObjectWidget * w); + bool tqcontains(ObjectWidget * w); /** * Returns the related widget on the given side. @@ -208,7 +209,7 @@ public: UMLClassifier * getSeqNumAndOp(TQString& seqNum, TQString& op); /** - * Calculate the geometry of the widget. + * Calculate the tqgeometry of the widget. */ void calculateWidget(); @@ -348,16 +349,16 @@ protected: * Draw an arrow pointing in the given direction. * The arrow head is not solid, i.e. it is made up of two lines * like so: ---> - * The direction can be either Qt::LeftArrow or Qt::RightArrow. + * The direction can be either TQt::LeftArrow or TQt::RightArrow. */ static void drawArrow( TQPainter& p, int x, int y, int w, - Qt::ArrowType direction, bool useDottedLine = false ); + TQt::ArrowType direction, bool useDottedLine = false ); /** * Draw a solid (triangular) arrowhead pointing in the given direction. - * The direction can be either Qt::LeftArrow or Qt::RightArrow. + * The direction can be either TQt::LeftArrow or TQt::RightArrow. */ - static void drawSolidArrowhead(TQPainter& p, int x, int y, Qt::ArrowType direction); + static void drawSolidArrowhead(TQPainter& p, int x, int y, TQt::ArrowType direction); /** * Update the UMLWidget::m_bResizable flag according to the diff --git a/umbrello/umbrello/messagewidgetcontroller.h b/umbrello/umbrello/messagewidgetcontroller.h index a691f465..6d13034b 100644 --- a/umbrello/umbrello/messagewidgetcontroller.h +++ b/umbrello/umbrello/messagewidgetcontroller.h @@ -64,7 +64,7 @@ protected: /** * Overriden from UMLWidgetController. * Saves the values of the widget needed for move/resize. - * Calls parent method and then saves the value of m_unconstrainedPositionY + * Calls tqparent method and then saves the value of m_unconstrainedPositionY * * @param me The TQMouseEvent to get the offset from. */ diff --git a/umbrello/umbrello/model_utils.cpp b/umbrello/umbrello/model_utils.cpp index f120a80c..95a93f6b 100644 --- a/umbrello/umbrello/model_utils.cpp +++ b/umbrello/umbrello/model_utils.cpp @@ -113,14 +113,14 @@ UMLObject* findUMLObject(const UMLObjectList& inList, if (UMLApp::app()->getActiveLanguage() == Uml::pl_Cpp) { if (name.endsWith("*")) name.remove("*"); - else if (name.contains("&")) + else if (name.tqcontains("&")) name.remove("&"); } #endif TQString nameWithoutFirstPrefix; - if (name.contains("::")) + if (name.tqcontains("::")) components = TQStringList::split("::", name); - else if (name.contains(".")) + else if (name.tqcontains(".")) components = TQStringList::split(".", name); if (components.size() > 1) { name = components.front(); @@ -130,7 +130,7 @@ UMLObject* findUMLObject(const UMLObjectList& inList, if (currentObj) { UMLPackage *pkg = NULL; if (dynamic_cast<UMLClassifierListItem*>(currentObj)) { - currentObj = static_cast<UMLObject*>(currentObj->parent()); + currentObj = static_cast<UMLObject*>(currentObj->tqparent()); } pkg = dynamic_cast<UMLPackage*>(currentObj); if (pkg == NULL) @@ -146,7 +146,7 @@ UMLObject* findUMLObject(const UMLObjectList& inList, return pkg; } } - if (seenPkgs.findRef(pkg) != -1) { + if (seenPkgs.tqfindRef(pkg) != -1) { kError() << "findUMLObject(" << name << "): " << "breaking out of cycle involving " << pkg->getName() << endl; @@ -235,7 +235,7 @@ UMLObject* findUMLObject(const UMLObjectList& inList, return NULL; } -TQString uniqObjectName(Uml::Object_Type type, UMLPackage *parentPkg, TQString prefix) { +TQString uniqObjectName(Uml::Object_Type type, UMLPackage *tqparentPkg, TQString prefix) { TQString currentName = prefix; if (currentName.isEmpty()) { if(type == Uml::ot_Class) @@ -271,7 +271,7 @@ TQString uniqObjectName(Uml::Object_Type type, UMLPackage *parentPkg, TQString p } UMLDoc *doc = UMLApp::app()->getDocument(); TQString name = currentName; - for (int number = 1; !doc->isUnique(name, parentPkg); number++) { + for (int number = 1; !doc->isUnique(name, tqparentPkg); number++) { name = currentName + '_' + TQString::number(number); } return name; @@ -407,7 +407,7 @@ int stringToDirection(TQString input, Uml::Parameter_Direction & result) { return dirLen; } -Parse_Status parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *owningScope) { +Parse_tqStatus parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *owningScope) { UMLDoc *pDoc = UMLApp::app()->getDocument(); @@ -430,7 +430,7 @@ Parse_Status parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *owningS return PS_OK; } -Parse_Status parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owningScope, +Parse_tqStatus parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owningScope, Uml::Visibility *vis /* = 0 */) { UMLDoc *pDoc = UMLApp::app()->getDocument(); @@ -438,7 +438,7 @@ Parse_Status parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owning if (a.isEmpty()) return PS_Empty; - int colonPos = a.find(':'); + int colonPos = a.tqfind(':'); if (colonPos < 0) { nmTp = NameAndType(a, NULL); return PS_OK; @@ -494,19 +494,19 @@ Parse_Status parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owning return PS_OK; } -Parse_Status parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *owningScope) { +Parse_tqStatus parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *owningScope) { UMLDoc *pDoc = UMLApp::app()->getDocument(); m = m.simplifyWhiteSpace(); if (m.isEmpty()) return PS_Empty; - if (m.contains(TQRegExp("operator *()"))) { - // C++ special case: two sets of parentheses + if (m.tqcontains(TQRegExp("operator *()"))) { + // C++ special case: two sets of tqparentheses desc.m_name = "operator()"; m.remove(TQRegExp("operator *()")); } else { /** - * The search pattern includes everything up to the opening parenthesis + * The search pattern includes everything up to the opening tqparenthesis * because UML also permits non programming-language oriented designs * using narrative names, for example "check water temperature". */ @@ -532,7 +532,7 @@ Parse_Status parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *ownin desc.m_pReturnType = pRetType; } } - // Remove possible empty parentheses () + // Remove possible empty tqparentheses () m.remove( TQRegExp("\\s*\\(\\s*\\)") ); desc.m_args.clear(); pat = TQRegExp( "\\((.*)\\)" ); @@ -546,7 +546,7 @@ Parse_Status parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *ownin TQStringList args = TQStringList::split( TQRegExp("\\s*,\\s*"), arglist); for (TQStringList::Iterator lit = args.begin(); lit != args.end(); ++lit) { NameAndType nmTp; - Parse_Status ps = parseAttribute(*lit, nmTp, owningScope); + Parse_tqStatus ps = parseAttribute(*lit, nmTp, owningScope); if (ps) return ps; desc.m_args.append(nmTp); @@ -554,7 +554,7 @@ Parse_Status parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *ownin return PS_OK; } -TQString psText(Parse_Status value) { +TQString psText(Parse_tqStatus value) { const TQString text[] = { i18n("OK"), i18n("Empty"), i18n("Malformed argument"), i18n("Unknown argument type"), i18n("Illegal method name"), @@ -602,7 +602,7 @@ TQString progLangToString(Uml::Programming_Language pl) { default: break; } - return TQString::null; + return TQString(); } Uml::Programming_Language stringToProgLang(TQString str) { diff --git a/umbrello/umbrello/model_utils.h b/umbrello/umbrello/model_utils.h index 9e1468c0..771d6f86 100644 --- a/umbrello/umbrello/model_utils.h +++ b/umbrello/umbrello/model_utils.h @@ -56,7 +56,7 @@ UMLObject * findObjectInList(Uml::IDType id, const UMLObjectList& inList); * * @param inList List in which to seek the object. * @param name Name of the object to find. - * @param type Object_Type of the object to find (optional.) + * @param type Object_Type of the object to tqfind (optional.) * When the given type is ot_UMLObject the type is * disregarded, i.e. the given name is the only * search criterion. @@ -75,14 +75,14 @@ UMLObject* findUMLObject( const UMLObjectList& inList, * if the default name is taken e.g. new_actor, new_actor_1 * etc. * @param type The object type. - * @param parentPkg The package in which to compare the name. + * @param tqparentPkg The package in which to compare the name. * @param prefix The prefix to use (optional.) * If no prefix is given then a type related * prefix will be chosen internally. */ TQString uniqObjectName(Uml::Object_Type type, - UMLPackage *parentPkg, - TQString prefix = TQString::null); + UMLPackage *tqparentPkg, + TQString prefix = TQString()); /** * Return true if the given tag is a one of the common XMI @@ -236,7 +236,7 @@ Uml::Programming_Language stringToProgLang(TQString str); /** * Return type of parseOperation() */ -enum Parse_Status { +enum Parse_tqStatus { PS_OK, PS_Empty, PS_Malformed_Arg, PS_Unknown_ArgType, PS_Illegal_MethodName, PS_Unknown_ReturnType, PS_Unspecified_Error }; @@ -253,7 +253,7 @@ struct NameAndType { } NameAndType(TQString name, UMLObject *type, Uml::Parameter_Direction direction = Uml::pd_In, - TQString initialValue = TQString::null) + TQString initialValue = TQString()) : m_name(name), m_type(type), m_direction(direction), m_initialValue(initialValue) { } @@ -284,7 +284,7 @@ struct OpDescriptor { * @param owningScope Pointer to the owning scope of the template param. * @return Error status of the parse, PS_OK for success. */ -Parse_Status parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *owningScope); +Parse_tqStatus parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *owningScope); /** * Parses an attribute given in UML syntax. @@ -303,7 +303,7 @@ Parse_Status parseTemplate(TQString t, NameAndType& nmTp, UMLClassifier *owningS * * @return Error status of the parse, PS_OK for success. */ -Parse_Status parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owningScope, +Parse_tqStatus parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owningScope, Uml::Visibility *vis = 0); /** @@ -316,12 +316,12 @@ Parse_Status parseAttribute(TQString a, NameAndType& nmTp, UMLClassifier *owning * @param owningScope Pointer to the owning scope of the operation. * @return Error status of the parse, PS_OK for success. */ -Parse_Status parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *owningScope); +Parse_tqStatus parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *owningScope); /** - * Returns the Parse_Status as a text. + * Returns the Parse_tqStatus as a text. */ -TQString psText(Parse_Status value); +TQString psText(Parse_tqStatus value); } diff --git a/umbrello/umbrello/node.h b/umbrello/umbrello/node.h index 6d9df54e..88d1be8a 100644 --- a/umbrello/umbrello/node.h +++ b/umbrello/umbrello/node.h @@ -27,6 +27,7 @@ */ class UMLNode : public UMLCanvasObject { Q_OBJECT + TQ_OBJECT public: /** * Sets up a Node. diff --git a/umbrello/umbrello/nodewidget.cpp b/umbrello/umbrello/nodewidget.cpp index 8214b7b6..5379a972 100644 --- a/umbrello/umbrello/nodewidget.cpp +++ b/umbrello/umbrello/nodewidget.cpp @@ -63,7 +63,7 @@ void NodeWidget::draw(TQPainter & p, int offsetX, int offsetY) { p.drawRect(offsetX, bodyOffsetY, bodyWidth, bodyHeight); p.drawLine(offsetX + w - 1, offsetY, offsetX + bodyWidth - 2, bodyOffsetY + 1); - p.setPen( TQPen(Qt::black) ); + p.setPen( TQPen(TQt::black) ); p.setFont(font); int lines = 1; @@ -71,7 +71,7 @@ void NodeWidget::draw(TQPainter & p, int offsetX, int offsetY) { TQString stereotype = m_pObject->getStereotype(); if (!stereotype.isEmpty()) { p.drawText(offsetX, bodyOffsetY + (bodyHeight/2) - fontHeight, - bodyWidth, fontHeight, Qt::AlignCenter, m_pObject->getStereotype(true)); + bodyWidth, fontHeight, TQt::AlignCenter, m_pObject->getStereotype(true)); lines = 2; } } @@ -84,10 +84,10 @@ void NodeWidget::draw(TQPainter & p, int offsetX, int offsetY) { if (lines == 1) { p.drawText(offsetX, bodyOffsetY + (bodyHeight/2) - (fontHeight/2), - bodyWidth, fontHeight, Qt::AlignCenter, name); + bodyWidth, fontHeight, TQt::AlignCenter, name); } else { p.drawText(offsetX, bodyOffsetY + (bodyHeight/2), - bodyWidth, fontHeight, Qt::AlignCenter, name); + bodyWidth, fontHeight, TQt::AlignCenter, name); } if(m_bSelected) { diff --git a/umbrello/umbrello/nodewidget.h b/umbrello/umbrello/nodewidget.h index c06ea759..c1151212 100644 --- a/umbrello/umbrello/nodewidget.h +++ b/umbrello/umbrello/nodewidget.h @@ -31,7 +31,7 @@ public: /** * Constructs a NodeWidget. * - * @param view The parent of this NodeWidget. + * @param view The tqparent of this NodeWidget. * @param n The UMLNode this will be representing. */ NodeWidget(UMLView * view, UMLNode *n ); diff --git a/umbrello/umbrello/notewidget.cpp b/umbrello/umbrello/notewidget.cpp index 9badeef5..1826847b 100644 --- a/umbrello/umbrello/notewidget.cpp +++ b/umbrello/umbrello/notewidget.cpp @@ -42,7 +42,7 @@ NoteWidget::NoteWidget(UMLView * view, Uml::IDType id) m_pEditor->setFrameStyle(TQFrame::NoFrame | TQFrame::Plain); m_pEditor->setHScrollBarMode(TQScrollView::AlwaysOff); m_pEditor->setVScrollBarMode(TQScrollView::AlwaysOff); - m_pEditor->setTextFormat(Qt::RichText); + m_pEditor->setTextFormat(TQt::RichText); m_pEditor->setShown(true); setEditorGeometry(); connect(m_pView, TQT_SIGNAL(contentsMoving(int, int)), @@ -201,7 +201,7 @@ void NoteWidget::drawText(TQPainter * p /*=NULL*/, int offsetX /*=0*/, int offse #if defined (NOTEWIDGET_EMBED_EDITOR) m_pEditor->setText( getDoc() ); m_pEditor->setShown(true); - m_pEditor->repaint(); + m_pEditor->tqrepaint(); #else if (p == NULL) return; @@ -212,7 +212,7 @@ void NoteWidget::drawText(TQPainter * p /*=NULL*/, int offsetX /*=0*/, int offse if reach height exit and don't print anymore start new line on \n character */ - p->setPen( Qt::black ); + p->setPen( TQt::black ); TQFont font = UMLWidget::getFont(); p->setFont( font ); const TQFontMetrics &fm = getFontMetrics(FT_NORMAL); @@ -247,7 +247,7 @@ void NoteWidget::drawText(TQPainter * p /*=NULL*/, int offsetX /*=0*/, int offse // print "fullLine" in current line, update write position to next line // and decide then on following actions p->drawText(offsetX + textX, offsetY + textY, - textWidth, fontHeight, Qt::AlignLeft, fullLine ); + textWidth, fontHeight, TQt::AlignLeft, fullLine ); fullLine = word; word = ""; // update write position @@ -260,7 +260,7 @@ void NoteWidget::drawText(TQPainter * p /*=NULL*/, int offsetX /*=0*/, int offse if (c == returnChar) { // print "word" - which is now "fullLine" and set to next line p->drawText(offsetX + textX, offsetY + textY, - textWidth, fontHeight, Qt::AlignLeft, fullLine); + textWidth, fontHeight, TQt::AlignLeft, fullLine); fullLine = ""; textX = margin; textY += fontHeight; @@ -271,7 +271,7 @@ void NoteWidget::drawText(TQPainter * p /*=NULL*/, int offsetX /*=0*/, int offse // newline found and combination of "fullLine" and "word" fits // in one line p->drawText(offsetX + textX, offsetY + textY, - textWidth, fontHeight, Qt::AlignLeft, testCombineLine); + textWidth, fontHeight, TQt::AlignLeft, testCombineLine); fullLine = word = ""; textX = margin; textY += fontHeight; diff --git a/umbrello/umbrello/notewidget.h b/umbrello/umbrello/notewidget.h index d11730f1..b14dbe57 100644 --- a/umbrello/umbrello/notewidget.h +++ b/umbrello/umbrello/notewidget.h @@ -18,7 +18,7 @@ // forward declarations class NoteWidgetController; -// Qt forward declarations +// TQt forward declarations class TQPainter; class TQTextEdit; @@ -34,13 +34,14 @@ class TQTextEdit; */ class NoteWidget : public UMLWidget { Q_OBJECT + TQ_OBJECT public: friend class NoteWidgetController; /** * Constructs a NoteWidget. * - * @param view The parent to this widget. + * @param view The tqparent to this widget. * @param noteType The NoteWidget::NoteType of this NoteWidget * @param id The unique id of the widget. * The default (-1) will prompt a new ID. diff --git a/umbrello/umbrello/notewidgetcontroller.h b/umbrello/umbrello/notewidgetcontroller.h index 081556ed..7c3da48c 100644 --- a/umbrello/umbrello/notewidgetcontroller.h +++ b/umbrello/umbrello/notewidgetcontroller.h @@ -44,7 +44,7 @@ public: /** * Overriden from UMLWidgetController. * Handles a mouse move event. - * Executes base code and then sets the geometry of the editor. + * Executes base code and then sets the tqgeometry of the editor. * * @param me The TQMouseEvent event. */ diff --git a/umbrello/umbrello/object_factory.cpp b/umbrello/umbrello/object_factory.cpp index 7b8d16b2..a87ff2c3 100644 --- a/umbrello/umbrello/object_factory.cpp +++ b/umbrello/umbrello/object_factory.cpp @@ -60,10 +60,10 @@ bool assignUniqueIdOnCreation() { } UMLObject* createNewUMLObject(Uml::Object_Type type, const TQString &name, - UMLPackage *parentPkg) { - if (parentPkg == NULL) { + UMLPackage *tqparentPkg) { + if (tqparentPkg == NULL) { kError() << "Object_Factory::createNewUMLObject(" << name - << "): parentPkg is NULL" << endl; + << "): tqparentPkg is NULL" << endl; return NULL; } UMLObject *o = NULL; @@ -114,40 +114,40 @@ UMLObject* createNewUMLObject(Uml::Object_Type type, const TQString &name, kWarning() << "createNewUMLObject error unknown type: " << type << endl; return NULL; } - o->setUMLPackage(parentPkg); + o->setUMLPackage(tqparentPkg); UMLDoc *doc = UMLApp::app()->getDocument(); - parentPkg->addObject(o); + tqparentPkg->addObject(o); doc->signalUMLObjectCreated(o); kapp->processEvents(); return o; } UMLObject* createUMLObject(Uml::Object_Type type, const TQString &n, - UMLPackage *parentPkg /* = NULL */, + UMLPackage *tqparentPkg /* = NULL */, bool solicitNewName /* = true */) { UMLDoc *doc = UMLApp::app()->getDocument(); - if (parentPkg == NULL) { + if (tqparentPkg == NULL) { if (type == Uml::ot_Datatype) { - parentPkg = doc->getDatatypeFolder(); + tqparentPkg = doc->getDatatypeFolder(); } else { Uml::Model_Type mt = Model_Utils::convert_OT_MT(type); kDebug() << "Object_Factory::createUMLObject(" << n << "): " - << "parentPkg is not set, assuming Model_Type " << mt << endl; - parentPkg = doc->getRootFolder(mt); + << "tqparentPkg is not set, assuming Model_Type " << mt << endl; + tqparentPkg = doc->getRootFolder(mt); } } if (!n.isEmpty()) { - UMLObject *o = doc->findUMLObject(n, type, parentPkg); + UMLObject *o = doc->findUMLObject(n, type, tqparentPkg); if (o) { if (!solicitNewName) return o; } else { - o = createNewUMLObject(type, n, parentPkg); + o = createNewUMLObject(type, n, tqparentPkg); return o; } } bool ok = false; - TQString name = Model_Utils::uniqObjectName(type, parentPkg, n); + TQString name = Model_Utils::uniqObjectName(type, tqparentPkg, n); bool bValidNameEntered = false; do { name = KInputDialog::getText(i18n("Name"), i18n("Enter name:"), name, &ok, (TQWidget*)UMLApp::app()); @@ -165,19 +165,19 @@ UMLObject* createUMLObject(Uml::Object_Type type, const TQString &n, i18n("Reserved Keyword")); continue; } - if (! doc->isUnique(name, parentPkg)) { + if (! doc->isUnique(name, tqparentPkg)) { KMessageBox::error(0, i18n("That name is already being used."), i18n("Not a Unique Name")); continue; } bValidNameEntered = true; } while (bValidNameEntered == false); - UMLObject *o = createNewUMLObject(type, name, parentPkg); + UMLObject *o = createNewUMLObject(type, name, tqparentPkg); return o; } -UMLAttribute *createAttribute(UMLObject *parent, const TQString& name, UMLObject *type) { - UMLAttribute *attr = new UMLAttribute(parent); +UMLAttribute *createAttribute(UMLObject *tqparent, const TQString& name, UMLObject *type) { + UMLAttribute *attr = new UMLAttribute(tqparent); attr->setName(name); attr->setType(type); if (g_predefinedId == Uml::id_None) @@ -185,35 +185,35 @@ UMLAttribute *createAttribute(UMLObject *parent, const TQString& name, UMLObject return attr; } -UMLOperation *createOperation(UMLClassifier *parent, const TQString& name) { - UMLOperation *op = new UMLOperation(parent, name, g_predefinedId); +UMLOperation *createOperation(UMLClassifier *tqparent, const TQString& name) { + UMLOperation *op = new UMLOperation(tqparent, name, g_predefinedId); return op; } -UMLClassifierListItem* createChildObject(UMLClassifier* parent, Uml::Object_Type type) { +UMLClassifierListItem* createChildObject(UMLClassifier* tqparent, Uml::Object_Type type) { UMLObject* returnObject = NULL; switch (type) { case Uml::ot_Attribute: case Uml::ot_EntityAttribute: { - UMLClassifier *c = dynamic_cast<UMLClassifier*>(parent); + UMLClassifier *c = dynamic_cast<UMLClassifier*>(tqparent); if (c && !c->isInterface()) returnObject = c->createAttribute(); break; } case Uml::ot_Operation: { - UMLClassifier *c = dynamic_cast<UMLClassifier*>(parent); + UMLClassifier *c = dynamic_cast<UMLClassifier*>(tqparent); if (c) returnObject = c->createOperation(); break; } case Uml::ot_Template: { - UMLClassifier *c = dynamic_cast<UMLClassifier*>(parent); + UMLClassifier *c = dynamic_cast<UMLClassifier*>(tqparent); if (c) returnObject = c->createTemplate(); break; } case Uml::ot_EnumLiteral: { - UMLEnum* umlenum = dynamic_cast<UMLEnum*>(parent); + UMLEnum* umlenum = dynamic_cast<UMLEnum*>(tqparent); if (umlenum) { returnObject = umlenum->createEnumLiteral(); } @@ -226,7 +226,7 @@ UMLClassifierListItem* createChildObject(UMLClassifier* parent, Uml::Object_Type } UMLObject* makeObjectFromXMI(const TQString& xmiTag, - const TQString& stereoID /* = TQString::null */) { + const TQString& stereoID /* = TQString() */) { UMLObject* pObject = 0; if (Uml::tagEq(xmiTag, "UseCase")) { pObject = new UMLUseCase(); diff --git a/umbrello/umbrello/object_factory.h b/umbrello/umbrello/object_factory.h index a4007bf6..541975c0 100644 --- a/umbrello/umbrello/object_factory.h +++ b/umbrello/umbrello/object_factory.h @@ -31,7 +31,7 @@ namespace Object_Factory { * @param n A name to give to the object (optional.) * If not given then an input dialog prompts * the user to supply a name. - * @param parentPkg The object's parent package. + * @param tqparentPkg The object's tqparent package. * @param solicitNewName Ask user for a different name if an object * of the given name already exists. * If set to false and the name already exists @@ -39,24 +39,24 @@ namespace Object_Factory { * The default is to ask for the new name. */ UMLObject* createUMLObject(Uml::Object_Type type, - const TQString &n = TQString::null, - UMLPackage *parentPkg = 0, + const TQString &n = TQString(), + UMLPackage *tqparentPkg = 0, bool solicitNewName = true); /** * Creates an operation, attribute, template, or enum literal - * for the parent classifier. + * for the tqparent classifier. * - * @param parent The parent concept + * @param tqparent The tqparent concept * @param type The type to create * @return Pointer to the UMLClassifierListItem created */ -UMLClassifierListItem* createChildObject(UMLClassifier *parent, Uml::Object_Type type); +UMLClassifierListItem* createChildObject(UMLClassifier *tqparent, Uml::Object_Type type); -UMLAttribute *createAttribute(UMLObject *parent, const TQString& name, +UMLAttribute *createAttribute(UMLObject *tqparent, const TQString& name, UMLObject *type = 0); -UMLOperation *createOperation(UMLClassifier *parent, const TQString& name); +UMLOperation *createOperation(UMLClassifier *tqparent, const TQString& name); /** * Control whether the createUMLObject() solicits a new unique ID for the @@ -77,7 +77,7 @@ bool assignUniqueIdOnCreation(); * Used by loadFromXMI and clipboard paste. */ UMLObject* makeObjectFromXMI(const TQString& xmiTag, - const TQString& stereoID = TQString::null); + const TQString& stereoID = TQString()); } diff --git a/umbrello/umbrello/objectwidget.cpp b/umbrello/umbrello/objectwidget.cpp index 6ae111f0..79384852 100644 --- a/umbrello/umbrello/objectwidget.cpp +++ b/umbrello/umbrello/objectwidget.cpp @@ -197,7 +197,7 @@ void ObjectWidget::slotColorChanged(Uml::IDType /*viewID*/) { UMLWidget::setLineColor( m_pView->getLineColor() ); if( m_pLine) - m_pLine -> setPen( TQPen( UMLWidget::getLineColor(), UMLWidget::getLineWidth(), Qt::DashLine ) ); + m_pLine -> setPen( TQPen( UMLWidget::getLineColor(), UMLWidget::getLineWidth(), TQt::DashLine ) ); } void ObjectWidget::cleanup() { @@ -243,10 +243,10 @@ void ObjectWidget::drawObject(TQPainter & p, int offsetX, int offsetY) { multiInstOfst = 10; } p.drawRect(offsetX, offsetY, w - multiInstOfst, h - multiInstOfst); - p.setPen(TQPen(Qt::black)); + p.setPen(TQPen(TQt::black)); p.drawText(offsetX + O_MARGIN, offsetY + O_MARGIN, w - O_MARGIN * 2 - multiInstOfst, h - O_MARGIN * 2 - multiInstOfst, - Qt::AlignCenter, t); + TQt::AlignCenter, t); p.setFont( oldFont ); } @@ -274,10 +274,10 @@ void ObjectWidget::drawActor(TQPainter & p, int offsetX, int offsetY) { p.drawLine(middleX - A_WIDTH / 2, offsetY + thirdH + thirdH / 2, middleX + A_WIDTH / 2, offsetY + thirdH + thirdH / 2);//arms //draw text - p.setPen(TQPen(Qt::black)); + p.setPen(TQPen(TQt::black)); TQString t = m_InstanceName + " : " + m_pObject -> getName(); p.drawText(offsetX + A_MARGIN, offsetY + textStartY, - w - A_MARGIN * 2, fontHeight, Qt::AlignCenter, t); + w - A_MARGIN * 2, fontHeight, TQt::AlignCenter, t); } void ObjectWidget::tabUp() { @@ -322,7 +322,7 @@ int ObjectWidget::getEndLineY() { } void ObjectWidget::messageAdded(MessageWidget* message) { - if (messageWidgetList.containsRef(message) ) { + if (messageWidgetList.tqcontainsRef(message) ) { kError() << "ObjectWidget::messageAdded(" << message->getName() << ") : duplicate entry !" << endl; diff --git a/umbrello/umbrello/objectwidget.h b/umbrello/umbrello/objectwidget.h index 837c6ff1..fff23f2a 100644 --- a/umbrello/umbrello/objectwidget.h +++ b/umbrello/umbrello/objectwidget.h @@ -34,11 +34,12 @@ class SeqLineWidget; */ class ObjectWidget : public UMLWidget { Q_OBJECT + TQ_OBJECT public: /** * Creates an ObjectWidget. * - * @param view The parent to this object. + * @param view The tqparent to this object. * @param o The object it will be representing. * @param lid The local id for the object. */ @@ -120,7 +121,7 @@ public: } /** - * Activate the object after serializing it from a QDataStream + * Activate the object after serializing it from a TQDataStream */ bool activate(IDChangeLog* ChangeLog = 0); diff --git a/umbrello/umbrello/operation.cpp b/umbrello/umbrello/operation.cpp index dce9b41e..28cd1d11 100644 --- a/umbrello/umbrello/operation.cpp +++ b/umbrello/umbrello/operation.cpp @@ -25,9 +25,9 @@ #include "uniqueid.h" #include "dialogs/umloperationdialog.h" -UMLOperation::UMLOperation(const UMLClassifier *parent, const TQString& name, +UMLOperation::UMLOperation(const UMLClassifier *tqparent, const TQString& name, Uml::IDType id, Uml::Visibility s, UMLObject *rt) - : UMLClassifierListItem(parent, name, id) + : UMLClassifierListItem(tqparent, name, id) { if (rt) m_returnId = UniqueID::gen(); @@ -39,8 +39,8 @@ UMLOperation::UMLOperation(const UMLClassifier *parent, const TQString& name, m_bConst = false; } -UMLOperation::UMLOperation(const UMLClassifier * parent) - : UMLClassifierListItem (parent) +UMLOperation::UMLOperation(const UMLClassifier * tqparent) + : UMLClassifierListItem (tqparent) { m_BaseType = Uml::ot_Operation; m_bConst = false; @@ -65,7 +65,7 @@ void UMLOperation::moveParmLeft(UMLAttribute * a) { << endl; disconnect(a,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); int idx; - if ( (idx=m_List.find( a )) == -1 ) { + if ( (idx=m_List.tqfind( a )) == -1 ) { kDebug() << "Error move parm left " << a->getName() << endl; return; } @@ -85,7 +85,7 @@ void UMLOperation::moveParmRight(UMLAttribute * a) { << endl; disconnect(a,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); int idx; - if ( (idx=m_List.find( a )) == -1 ) { + if ( (idx=m_List.tqfind( a )) == -1 ) { kDebug() << "Error move parm right " << a->getName() << endl; return; } @@ -150,7 +150,7 @@ TQString UMLOperation::toString(Uml::Signature_Type sig) { } else if (parameterlessOpNeedsParentheses) { s.append("()"); } - UMLClassifier *ownParent = static_cast<UMLClassifier*>(parent()); + UMLClassifier *ownParent = static_cast<UMLClassifier*>(tqparent()); TQString returnType; UMLClassifier *retType = UMLClassifierListItem::getType(); if (retType) { @@ -218,8 +218,8 @@ void UMLOperation::copyInto(UMLOperation *rhs) const UMLObject* UMLOperation::clone() const { - //FIXME: The new operation should be slaved to the NEW parent not the old. - UMLOperation *clone = new UMLOperation( static_cast<UMLClassifier*>(parent()) ); + //FIXME: The new operation should be slaved to the NEW tqparent not the old. + UMLOperation *clone = new UMLOperation( static_cast<UMLClassifier*>(tqparent()) ); copyInto(clone); return clone; @@ -243,24 +243,24 @@ bool UMLOperation::isConstructorOperation() { if (getStereotype() == strConstructor) return true; - UMLClassifier * c = static_cast<UMLClassifier*>(this->parent()); + UMLClassifier * c = static_cast<UMLClassifier*>(this->tqparent()); TQString cName = c->getName(); TQString opName = getName(); // It's a constructor operation if the operation name - // matches that of the parent classifier. + // matches that of the tqparent classifier. return (cName == opName); } bool UMLOperation::isDestructorOperation() { if (getStereotype() == "destructor") return true; - UMLClassifier * c = static_cast<UMLClassifier*>(this->parent()); + UMLClassifier * c = static_cast<UMLClassifier*>(this->tqparent()); TQString cName = c->getName(); TQString opName = getName(); // Special support for C++ syntax: // It's a destructor operation if the operation name begins - // with "~" followed by the name of the parent classifier. + // with "~" followed by the name of the tqparent classifier. if (! opName.startsWith("~")) return false; opName.remove( TQRegExp("^~\\s*") ); @@ -279,8 +279,8 @@ bool UMLOperation::getConst() const { return m_bConst; } -bool UMLOperation::showPropertiesDialog(TQWidget* parent) { - UMLOperationDialog dialog(parent, this); +bool UMLOperation::showPropertiesDialog(TQWidget* tqparent) { + UMLOperationDialog dialog(tqparent, this); return dialog.exec(); } diff --git a/umbrello/umbrello/operation.h b/umbrello/umbrello/operation.h index 4ceef15a..12625ac2 100644 --- a/umbrello/umbrello/operation.h +++ b/umbrello/umbrello/operation.h @@ -24,20 +24,21 @@ class UMLClassifier; */ class UMLOperation : public UMLClassifierListItem { Q_OBJECT + TQ_OBJECT public: /** * Constructs an UMLOperation. * Not intended for general use: The operation is not tied in with - * umbrello's Qt signalling for object creation. + * umbrello's TQt signalling for object creation. * If you want to create an Operation use the method in UMLDoc instead. * - * @param parent The parent to this operation. + * @param tqparent The tqparent to this operation. * @param name The name of the operation. * @param id The id of the operation. * @param s The visibility of the operation. * @param rt The return type of the operation. */ - UMLOperation(const UMLClassifier * parent, const TQString& name, + UMLOperation(const UMLClassifier * tqparent, const TQString& name, Uml::IDType id = Uml::id_None, Uml::Visibility s = Uml::Visibility::Public, UMLObject *rt = 0); @@ -45,12 +46,12 @@ public: /** * Constructs an UMLOperation. * Not intended for general use: The operation is not tied in with - * umbrello's Qt signalling for object creation. + * umbrello's TQt signalling for object creation. * If you want to create an Operation use the method in UMLDoc instead. * - * @param parent The parent to this operation. + * @param tqparent The tqparent to this operation. */ - UMLOperation(const UMLClassifier * parent); + UMLOperation(const UMLClassifier * tqparent); public: /** @@ -156,7 +157,7 @@ public: /** * Display the properties configuration dialog for the template. */ - bool showPropertiesDialog(TQWidget* parent); + bool showPropertiesDialog(TQWidget* tqparent); /** * Returns whether this operation is a constructor. diff --git a/umbrello/umbrello/ownedcodeblock.cpp b/umbrello/umbrello/ownedcodeblock.cpp index f80fd315..22ceeed1 100644 --- a/umbrello/umbrello/ownedcodeblock.cpp +++ b/umbrello/umbrello/ownedcodeblock.cpp @@ -34,10 +34,10 @@ // Constructors/Destructors // -OwnedCodeBlock::OwnedCodeBlock ( UMLObject * parent ) - : TQObject ( (TQObject*)parent, "anOwnedCodeBlock" ) +OwnedCodeBlock::OwnedCodeBlock ( UMLObject * tqparent ) + : TQObject ( (TQObject*)tqparent, "anOwnedCodeBlock" ) { - initFields(parent); + initFields(tqparent); } OwnedCodeBlock::~OwnedCodeBlock ( ) { @@ -90,7 +90,7 @@ void OwnedCodeBlock::setAttributesOnNode(TQDomDocument& /*doc*/, TQDomElement& e UMLRole * role = dynamic_cast<UMLRole*>(m_parentObject); if(role) { - elem.setAttribute("parent_id",ID2STR(role->getParentAssociation()->getID())); + elem.setAttribute("tqparent_id",ID2STR(role->getParentAssociation()->getID())); // CAUTION: role_id here is numerically inverted wrt Uml::Role_Type, // i.e. role A is 1 and role B is 0. // I'll resist the temptation to change this - @@ -99,7 +99,7 @@ void OwnedCodeBlock::setAttributesOnNode(TQDomDocument& /*doc*/, TQDomElement& e } else { - elem.setAttribute("parent_id",ID2STR(m_parentObject->getID())); + elem.setAttribute("tqparent_id",ID2STR(m_parentObject->getID())); //elem.setAttribute("role_id","-1"); } @@ -110,11 +110,11 @@ void OwnedCodeBlock::setAttributesOnNode(TQDomDocument& /*doc*/, TQDomElement& e */ void OwnedCodeBlock::setAttributesFromNode ( TQDomElement & elem) { - // set local attributes, parent object first - TQString idStr = elem.attribute("parent_id","-1"); + // set local attributes, tqparent object first + TQString idStr = elem.attribute("tqparent_id","-1"); Uml::IDType id = STR2ID(idStr); - // always disconnect from current parent + // always disconnect from current tqparent getParentObject()->disconnect(this); // now, what is the new object we want to set? @@ -125,7 +125,7 @@ void OwnedCodeBlock::setAttributesFromNode ( TQDomElement & elem) { // FIX..one day. // Ugh. This is UGLY, but we have to do it this way because UMLRoles // don't go into the document list of UMLobjects, and have the same - // ID as their parent UMLAssociations. So..the drill is then special + // ID as their tqparent UMLAssociations. So..the drill is then special // for Associations..in that case we need to find out which role will // serve as the parametger here. The REAL fix, of course, would be to // treat UMLRoles on a more even footing, but im not sure how that change @@ -154,18 +154,18 @@ void OwnedCodeBlock::setAttributesFromNode ( TQDomElement & elem) { } else - kError() << "ERROR: can't load ownedcodeblock: parentUMLObject w/id:" + kError() << "ERROR: can't load ownedcodeblock: tqparentUMLObject w/id:" << ID2STR(id) << " not found, corrupt save file?" << endl; } -void OwnedCodeBlock::initFields(UMLObject * parent ) +void OwnedCodeBlock::initFields(UMLObject * tqparent ) { - m_parentObject = parent; + m_parentObject = tqparent; // one reason for being: set up the connection between - // this code block and the parent UMLObject..when the parent + // this code block and the tqparent UMLObject..when the tqparent // signals a change has been made, we automatically update // ourselves connect(m_parentObject, TQT_SIGNAL(modified()), this, TQT_SLOT(syncToParent())); diff --git a/umbrello/umbrello/ownedcodeblock.h b/umbrello/umbrello/ownedcodeblock.h index 0a71f50c..130bd4dd 100644 --- a/umbrello/umbrello/ownedcodeblock.h +++ b/umbrello/umbrello/ownedcodeblock.h @@ -29,12 +29,13 @@ class UMLObject; /** * class OwnedCodeBlock * Describes any codeblock which is 'owned' by a UMLobject of some sort and should - * be in sync with that parent. + * be in sync with that tqparent. */ -class OwnedCodeBlock : virtual public QObject +class OwnedCodeBlock : virtual public TQObject { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -43,7 +44,7 @@ public: /** * Constructor */ - OwnedCodeBlock ( UMLObject * parent ); + OwnedCodeBlock ( UMLObject * tqparent ); /** * Empty Destructor @@ -55,7 +56,7 @@ public: */ UMLObject * getParentObject ( ); - // get the parent code document of this code block + // get the tqparent code document of this code block virtual CodeDocument * getParentDocument ( ) = 0; protected: @@ -87,7 +88,7 @@ protected: private: - void initFields ( UMLObject * parent ); + void initFields ( UMLObject * tqparent ); UMLObject * m_parentObject; diff --git a/umbrello/umbrello/ownedhierarchicalcodeblock.cpp b/umbrello/umbrello/ownedhierarchicalcodeblock.cpp index 078a02b7..45e41875 100644 --- a/umbrello/umbrello/ownedhierarchicalcodeblock.cpp +++ b/umbrello/umbrello/ownedhierarchicalcodeblock.cpp @@ -31,8 +31,8 @@ // Constructors/Destructors // -OwnedHierarchicalCodeBlock::OwnedHierarchicalCodeBlock ( UMLObject *parent, CodeDocument * doc, const TQString &start, const TQString &end, const TQString &comment) - : HierarchicalCodeBlock ( doc, start, end, comment), OwnedCodeBlock(parent) +OwnedHierarchicalCodeBlock::OwnedHierarchicalCodeBlock ( UMLObject *tqparent, CodeDocument * doc, const TQString &start, const TQString &end, const TQString &comment) + : HierarchicalCodeBlock ( doc, start, end, comment), OwnedCodeBlock(tqparent) { } @@ -68,7 +68,7 @@ void OwnedHierarchicalCodeBlock::setAttributesOnNode (TQDomDocument & doc, TQDom OwnedCodeBlock::setAttributesOnNode(doc, elem); // set local class attributes - elem.setAttribute("parent_id",ID2STR(getParentObject()->getID())); + elem.setAttribute("tqparent_id",ID2STR(getParentObject()->getID())); // setting ID's takes special treatment // as UMLRoles arent properly stored in the XMI right now. diff --git a/umbrello/umbrello/ownedhierarchicalcodeblock.h b/umbrello/umbrello/ownedhierarchicalcodeblock.h index 04717381..7a99fe65 100644 --- a/umbrello/umbrello/ownedhierarchicalcodeblock.h +++ b/umbrello/umbrello/ownedhierarchicalcodeblock.h @@ -30,6 +30,7 @@ class CodeDocument; class OwnedHierarchicalCodeBlock : public HierarchicalCodeBlock, public OwnedCodeBlock { Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -38,7 +39,7 @@ public: /** constructor with TQString so we can create & populate it in * one step. */ - OwnedHierarchicalCodeBlock ( UMLObject * parent, CodeDocument * parentDoc, const TQString &start="", const TQString &end="", const TQString &comment="" ); + OwnedHierarchicalCodeBlock ( UMLObject * tqparent, CodeDocument * tqparentDoc, const TQString &start="", const TQString &end="", const TQString &comment="" ); /** * Empty Destructor @@ -48,7 +49,7 @@ public: // Public attributes // - // Return the parent code document + // Return the tqparent code document CodeDocument * getParentDocument(); // these next 2 methods should be supplied by inheriting classes diff --git a/umbrello/umbrello/package.cpp b/umbrello/umbrello/package.cpp index 04e8c14d..59553a9e 100644 --- a/umbrello/umbrello/package.cpp +++ b/umbrello/umbrello/package.cpp @@ -100,7 +100,7 @@ bool UMLPackage::addObject(UMLObject *pObject) { << endl; return false; } - if (m_objects.find(pObject) != -1) { + if (m_objects.tqfind(pObject) != -1) { kDebug() << "UMLPackage::addObject: " << pObject->getName() << " is already there" << endl; return false; @@ -129,7 +129,7 @@ void UMLPackage::removeObject(UMLObject *pObject) { UMLAssociation *assoc = static_cast<UMLAssociation*>(o); removeAssocFromConcepts(assoc); } - if (m_objects.findRef(pObject) == -1) + if (m_objects.tqfindRef(pObject) == -1) kDebug() << m_Name << " removeObject: object with id=" << ID2STR(pObject->getID()) << "not found." << endl; else diff --git a/umbrello/umbrello/package.h b/umbrello/umbrello/package.h index 65b0cb5c..6eef0eff 100644 --- a/umbrello/umbrello/package.h +++ b/umbrello/umbrello/package.h @@ -33,6 +33,7 @@ class UMLAssociation; class UMLPackage : public UMLCanvasObject { Q_OBJECT + TQ_OBJECT public: /** * Sets up a Package. diff --git a/umbrello/umbrello/packagewidget.cpp b/umbrello/umbrello/packagewidget.cpp index c4289b74..a6eff977 100644 --- a/umbrello/umbrello/packagewidget.cpp +++ b/umbrello/umbrello/packagewidget.cpp @@ -76,7 +76,7 @@ void PackageWidget::draw(TQPainter & p, int offsetX, int offsetY) { } p.drawRect(offsetX, offsetY + fontHeight - 1, w, h - fontHeight); - p.setPen( TQPen(Qt::black) ); + p.setPen( TQPen(TQt::black) ); p.setFont(font); int lines = 1; @@ -84,13 +84,13 @@ void PackageWidget::draw(TQPainter & p, int offsetX, int offsetY) { TQString stereotype = m_pObject->getStereotype(); if (!stereotype.isEmpty()) { p.drawText(offsetX, offsetY + fontHeight + PACKAGE_MARGIN, - w, fontHeight, Qt::AlignCenter, m_pObject->getStereotype(true)); + w, fontHeight, TQt::AlignCenter, m_pObject->getStereotype(true)); lines = 2; } } p.drawText(offsetX, offsetY + (fontHeight*lines) + PACKAGE_MARGIN, - w, fontHeight, Qt::AlignCenter, name ); + w, fontHeight, TQt::AlignCenter, name ); if(m_bSelected) { drawSelected(&p, offsetX, offsetY); diff --git a/umbrello/umbrello/packagewidget.h b/umbrello/umbrello/packagewidget.h index 3cff4ed6..c3fa4a8e 100644 --- a/umbrello/umbrello/packagewidget.h +++ b/umbrello/umbrello/packagewidget.h @@ -33,7 +33,7 @@ public: /** * Constructs a PackageWidget. * - * @param view The parent of this PackageWidget. + * @param view The tqparent of this PackageWidget. * @param o The UMLObject this will be representing. */ PackageWidget(UMLView * view, UMLPackage * o); diff --git a/umbrello/umbrello/petalnode.h b/umbrello/umbrello/petalnode.h index c9f52bde..8306e1d8 100644 --- a/umbrello/umbrello/petalnode.h +++ b/umbrello/umbrello/petalnode.h @@ -52,7 +52,7 @@ public: virtual ~StringOrNode() { } bool isEmpty() { return (string.isEmpty() && node == 0); } }; - typedef QPair<TQString, StringOrNode> NameValue; + typedef TQPair<TQString, StringOrNode> NameValue; typedef TQValueList<NameValue> NameValueList; enum NodeType { nt_object, nt_list }; diff --git a/umbrello/umbrello/petaltree2uml.cpp b/umbrello/umbrello/petaltree2uml.cpp index c8cccdc2..dc650a5d 100644 --- a/umbrello/umbrello/petaltree2uml.cpp +++ b/umbrello/umbrello/petaltree2uml.cpp @@ -77,7 +77,7 @@ TQString quidu(const PetalNode *node) { Uml::Object_Type typeToCreate(const TQString& name) { TQString n = name; n.remove(TQRegExp("^.*::")); // don't consider the scope prefix, it may contain spaces - Uml::Object_Type t = (n.contains(TQRegExp("\\W")) ? Uml::ot_Datatype : Uml::ot_Class); + Uml::Object_Type t = (n.tqcontains(TQRegExp("\\W")) ? Uml::ot_Datatype : Uml::ot_Class); return t; } @@ -129,12 +129,12 @@ public: } /** - * Insert the given UMLClassifierListItem at the parent Umbrello object. + * Insert the given UMLClassifierListItem at the tqparent Umbrello object. * Abstract method to be implemented by inheriting classes. - * NB the parent Umbrello object is not included in the ClassifierListReader + * NB the tqparent Umbrello object is not included in the ClassifierListReader * class - it must be added at inheriting classes. * - * @param node The PetalNode which corresponds to the parent Umbrello object. + * @param node The PetalNode which corresponds to the tqparent Umbrello object. * @param o The UMLObject to insert. */ virtual void insertAtParent(const PetalNode *node, UMLObject *o) = 0; @@ -249,7 +249,7 @@ public: return new UMLAssociation(Uml::at_Generalization); } /** - * Override parent implementation: The secondary data is not for the + * Override tqparent implementation: The secondary data is not for the * UMLAssociation itself but for its role B object. */ void setTypeReferences(UMLObject *item, @@ -282,7 +282,7 @@ public: return new UMLAssociation(Uml::at_Realization); } /** - * Override parent implementation: The secondary data is not for the + * Override tqparent implementation: The secondary data is not for the * UMLAssociation itself but for its role B object. */ void setTypeReferences(UMLObject *item, @@ -309,11 +309,11 @@ protected: * * @param node Pointer to the PetalNode which may contain a controlled unit * @param name Name of the current node - * @param id QUID of the current node - * @param parentPkg Pointer to the current parent UMLPackage. + * @param id TQUID of the current node + * @param tqparentPkg Pointer to the current tqparent UMLPackage. * @return True if the node actually contained a controlled unit. */ -bool handleControlledUnit(PetalNode *node, const TQString& name, Uml::IDType id, UMLPackage *parentPkg) { +bool handleControlledUnit(PetalNode *node, const TQString& name, Uml::IDType id, UMLPackage *tqparentPkg) { if (node->findAttribute("is_unit").string != "TRUE") return false; bool is_loaded = (node->findAttribute("is_loaded").string != "FALSE"); @@ -335,7 +335,7 @@ bool handleControlledUnit(PetalNode *node, const TQString& name, Uml::IDType id, * Given a PetalNode for which the mapping to Umbrello is not yet * implemented umbrellify() is a no-op but also returns true. */ -bool umbrellify(PetalNode *node, UMLPackage *parentPkg = NULL) { +bool umbrellify(PetalNode *node, UMLPackage *tqparentPkg = NULL) { if (node == NULL) { kError() << "umbrellify: node is NULL" << endl; return false; @@ -346,7 +346,7 @@ bool umbrellify(PetalNode *node, UMLPackage *parentPkg = NULL) { Uml::IDType id = quid(node); if (objType == "Class_Category") { - UMLObject *o = Import_Utils::createUMLObject(Uml::ot_Package, name, parentPkg); + UMLObject *o = Import_Utils::createUMLObject(Uml::ot_Package, name, tqparentPkg); o->setID(id); PetalNode *logical_models = node->findAttribute("logical_models").node; if (logical_models) { @@ -355,13 +355,13 @@ bool umbrellify(PetalNode *node, UMLPackage *parentPkg = NULL) { for (uint i = 0; i < atts.count(); i++) { umbrellify(atts[i].second.node, localParent); } - } else if (!handleControlledUnit(node, name, id, parentPkg)) { + } else if (!handleControlledUnit(node, name, id, tqparentPkg)) { kDebug() << "umbrellify: handling of " << objType << " " << name << " is not yet implemented" << endl; } } else if (objType == "Class") { - UMLObject *o = Import_Utils::createUMLObject(Uml::ot_Class, name, parentPkg); + UMLObject *o = Import_Utils::createUMLObject(Uml::ot_Class, name, tqparentPkg); o->setID(id); UMLClassifier *c = static_cast<UMLClassifier*>(o); // set stereotype @@ -455,9 +455,9 @@ bool umbrellify(PetalNode *node, UMLPackage *parentPkg = NULL) { return true; } -Uml::ListView_Type folderType(UMLListViewItem *parent) { +Uml::ListView_Type folderType(UMLListViewItem *tqparent) { Uml::ListView_Type type = Uml::lvt_Unknown; - switch (parent->getType()) { + switch (tqparent->getType()) { case Uml::lvt_Logical_View: case Uml::lvt_Logical_Folder: type = Uml::lvt_Logical_Folder; @@ -488,7 +488,7 @@ Uml::ListView_Type folderType(UMLListViewItem *parent) { * Given a PetalNode for which the mapping to Umbrello is not yet * implemented umbrellify() is a no-op but also returns true. */ -bool umbrellify(PetalNode *node, const TQString& modelsName, UMLListViewItem *parent) { +bool umbrellify(PetalNode *node, const TQString& modelsName, UMLListViewItem *tqparent) { if (node == NULL) { kError() << "umbrellify(" << modelsName << "): node is NULL" << endl; return false; @@ -501,13 +501,13 @@ bool umbrellify(PetalNode *node, const TQString& modelsName, UMLListViewItem *pa UMLListViewItem *item = NULL; if (objType == "Class_Category") { - Uml::ListView_Type lvType = folderType(parent); - item = new UMLListViewItem( parent, name, lvType, id ); + Uml::ListView_Type lvType = folderType(tqparent); + item = new UMLListViewItem( tqparent, name, lvType, id ); } else if (objType == "Class") { TQString stereotype = clean(node->findAttribute("stereotype").string); if (stereotype == "Actor") { UMLActor *act = new UMLActor(name, id); - item = new UMLListViewItem(parent, name, Uml::lvt_Actor, act); + item = new UMLListViewItem(tqparent, name, Uml::lvt_Actor, act); obj = act; } else { kDebug() << "umbrellify(" << name << "): handling of Class stereotype " @@ -515,16 +515,16 @@ bool umbrellify(PetalNode *node, const TQString& modelsName, UMLListViewItem *pa } } else if (objType == "UseCase") { UMLUseCase *uc = new UMLUseCase(name, id); - item = new UMLListViewItem(parent, name, Uml::lvt_UseCase, uc); + item = new UMLListViewItem(tqparent, name, Uml::lvt_UseCase, uc); obj = uc; } else if (objType == "SubSystem") { UMLComponent *comp = new UMLComponent(name, id); - item = new UMLListViewItem(parent, name, Uml::lvt_Component, comp); + item = new UMLListViewItem(tqparent, name, Uml::lvt_Component, comp); obj = comp; } else if (objType == "Processor" || objType == "Device") { UMLNode *un = new UMLNode(name, id); un->setStereotype(objType.lower()); - item = new UMLListViewItem(parent, name, Uml::lvt_Node, un); + item = new UMLListViewItem(tqparent, name, Uml::lvt_Node, un); obj = un; } else { kDebug() << "umbrellify: object type " << objType @@ -556,12 +556,12 @@ bool importView(PetalNode *root, const TQString& rootName, const TQString& modelsName, UMLListViewItem *lvParent) { PetalNode *viewRoot = root->findAttribute(rootName).node; if (viewRoot == NULL) { - kDebug() << "importView: cannot find " << rootName << endl; + kDebug() << "importView: cannot tqfind " << rootName << endl; return false; } PetalNode *models = viewRoot->findAttribute(modelsName).node; if (models == NULL) { - kError() << "importView: cannot find " << modelsName + kError() << "importView: cannot tqfind " << modelsName << " of " << rootName << endl; return false; } diff --git a/umbrello/umbrello/plugin.cpp b/umbrello/umbrello/plugin.cpp index 8a751374..72dc3169 100644 --- a/umbrello/umbrello/plugin.cpp +++ b/umbrello/umbrello/plugin.cpp @@ -28,10 +28,10 @@ using namespace Umbrello; -Plugin::Plugin(TQObject *parent, +Plugin::Plugin(TQObject *tqparent, const char *name, const TQStringList & /* args */) : - TQObject(parent, name), + TQObject(tqparent, name), Configurable(), _ref(0), _instanceName(name), @@ -106,7 +106,7 @@ Plugin::shutdown() return true; } -QCString +TQCString Plugin::instanceName() const { return _instanceName; @@ -158,7 +158,7 @@ Plugin::configure() return ret; } -QString +TQString Plugin::category() { return TQString("miscellaneous"); diff --git a/umbrello/umbrello/plugin.h b/umbrello/umbrello/plugin.h index ac1178f3..e566c5cc 100644 --- a/umbrello/umbrello/plugin.h +++ b/umbrello/umbrello/plugin.h @@ -19,7 +19,7 @@ #ifndef UMBRELLO_PLUGIN_H #define UMBRELLO_PLUGIN_H -// Qt includes +// TQt includes #include <tqobject.h> // KDE includes @@ -81,7 +81,7 @@ class PluginLoader; * only available within the scope of the shared library, the configuration * records must be set in the constructor of the derived plugin class. However, * because the construction name is passed to this constructor (as are the - * parent object and args), we can simply capture the name when the object + * tqparent object and args), we can simply capture the name when the object * is constructed. */ class Plugin : @@ -89,6 +89,7 @@ class Plugin : public Configurable { Q_OBJECT + TQ_OBJECT friend class PluginLoader; public: /** Destroy a plugin.*/ @@ -112,7 +113,7 @@ public: protected: /** Construct a plugin */ - Plugin(TQObject *parent, const char *name, const TQStringList &args); + Plugin(TQObject *tqparent, const char *name, const TQStringList &args); /** Can be reimplemented to define plugin specific startup behavior */ virtual bool onInit(); @@ -144,7 +145,7 @@ private: * The configure method is called by init to parse the configuration * file and load any plugins. Note that the libraries loaded depends * on the GUI state of the application. If the application is type - * Qt::Tty, then we don't use the "loadGUI" action. + * TQt::Tty, then we don't use the "loadGUI" action. * * @return True on success, false on failure. */ diff --git a/umbrello/umbrello/pluginloader.cpp b/umbrello/umbrello/pluginloader.cpp index 583b3858..9321ac15 100644 --- a/umbrello/umbrello/pluginloader.cpp +++ b/umbrello/umbrello/pluginloader.cpp @@ -16,7 +16,7 @@ // own header #include "pluginloader.h" -// Qt includes +// TQt includes #include <tqstring.h> // KDE includes @@ -63,7 +63,7 @@ PluginLoader::loadPlugin(const TQString &name) // if the plugin has already been loaded, increment // its reference and return. - if((it = _plugins.find(name)) != _plugins.end()) { + if((it = _plugins.tqfind(name)) != _plugins.end()) { plugin = it.data(); plugin->ref(); return plugin; @@ -127,7 +127,7 @@ Plugin * PluginLoader::findPlugin(const TQString &name) { Plugin *ret = NULL; - PluginMap::iterator it = _plugins.find(name); + PluginMap::iterator it = _plugins.tqfind(name); if(it != _plugins.end()) { ret = it.data(); } diff --git a/umbrello/umbrello/pluginloader.h b/umbrello/umbrello/pluginloader.h index 2841711b..12bdfba5 100644 --- a/umbrello/umbrello/pluginloader.h +++ b/umbrello/umbrello/pluginloader.h @@ -19,7 +19,7 @@ #ifndef UMBRELLO_PLUGINLOADER_H #define UMBRELLO_PLUGINLOADER_H -// Qt includes +// TQt includes #include <tqobject.h> #include <tqvaluelist.h> #include <tqmap.h> @@ -64,9 +64,10 @@ class Plugin; * method doesn't reference any local variables - it just returns * a string. */ -class PluginLoader : public QObject +class PluginLoader : public TQObject { Q_OBJECT + TQ_OBJECT public: /** Destry the plugin loader */ ~PluginLoader(); diff --git a/umbrello/umbrello/refactoring/refactoringassistant.cpp b/umbrello/umbrello/refactoring/refactoringassistant.cpp index 193f9545..ef96f5b3 100644 --- a/umbrello/umbrello/refactoring/refactoringassistant.cpp +++ b/umbrello/umbrello/refactoring/refactoringassistant.cpp @@ -35,8 +35,8 @@ using std::type_info; -RefactoringAssistant::RefactoringAssistant( UMLDoc *doc, UMLClassifier *obj, TQWidget *parent, const char *name ): - KListView( parent, name ), m_doc( doc ) +RefactoringAssistant::RefactoringAssistant( UMLDoc *doc, UMLClassifier *obj, TQWidget *tqparent, const char *name ): + KListView( tqparent, name ), m_doc( doc ) { loadPixmaps(); @@ -159,7 +159,7 @@ void RefactoringAssistant::umlObjectModified( const UMLObject *obj ) void RefactoringAssistant::operationAdded( UMLClassifierListItem *o ) { UMLOperation *op = static_cast<UMLOperation*>(o); - UMLClassifier *c = dynamic_cast<UMLClassifier*>(op->parent()); + UMLClassifier *c = dynamic_cast<UMLClassifier*>(op->tqparent()); if(!c) { kWarning() << "RefactoringAssistant::operationAdded(" << op->getName() @@ -201,7 +201,7 @@ void RefactoringAssistant::operationRemoved( UMLClassifierListItem *o ) void RefactoringAssistant::attributeAdded( UMLClassifierListItem *a ) { UMLAttribute *att = static_cast<UMLAttribute*>(a); - UMLClassifier *c = dynamic_cast<UMLClassifier*>(att->parent()); + UMLClassifier *c = dynamic_cast<UMLClassifier*>(att->tqparent()); if(!c) { kWarning() << "RefactoringAssistant::attributeAdded(" << att->getName() @@ -456,12 +456,12 @@ void RefactoringAssistant::createAttribute() } -void RefactoringAssistant::addClassifier( UMLClassifier *classifier, TQListViewItem *parent, bool addSuper, bool addSub, bool recurse) +void RefactoringAssistant::addClassifier( UMLClassifier *classifier, TQListViewItem *tqparent, bool addSuper, bool addSub, bool recurse) { TQListViewItem *classifierItem, *item; - if( parent ) + if( tqparent ) { - classifierItem = parent; + classifierItem = tqparent; } else { @@ -505,7 +505,7 @@ void RefactoringAssistant::addClassifier( UMLClassifier *classifier, TQListViewI operationAdded( op ); } - //if add parents + //if add tqparents if(addSuper) { TQListViewItem *superFolder = new KListViewItem( classifierItem, i18n("Base Classifiers") ); @@ -558,15 +558,15 @@ bool RefactoringAssistant::acceptDrag(TQDropEvent *event) const RefactoringAssistant *me = const_cast<RefactoringAssistant*>(this); //ok, check if the move is valid - TQListViewItem *movingItem = 0, *afterme = 0, *parentItem = 0; - me->findDrop(event->pos(), parentItem, afterme); + TQListViewItem *movingItem = 0, *afterme = 0, *tqparentItem = 0; + me->findDrop(event->pos(), tqparentItem, afterme); for( movingItem = firstChild(); movingItem != 0; movingItem = movingItem->itemBelow() ) { if( movingItem->isSelected() ) break; } - if(!movingItem || !parentItem) - { kDebug()<<"moving/parent items not found - can't accept drag!"<<endl; + if(!movingItem || !tqparentItem) + { kDebug()<<"moving/tqparent items not found - can't accept drag!"<<endl; return false; } @@ -583,26 +583,26 @@ bool RefactoringAssistant::acceptDrag(TQDropEvent *event) const return false; } - kDebug()<<"parent item is "<<parentItem->text(0)<<endl; - UMLObject *parentObject = me->findUMLObject(parentItem); - if( parentObject && dynamic_cast<UMLClassifier*>(parentObject) ) + kDebug()<<"tqparent item is "<<tqparentItem->text(0)<<endl; + UMLObject *tqparentObject = me->findUMLObject(tqparentItem); + if( tqparentObject && dynamic_cast<UMLClassifier*>(tqparentObject) ) { //droping to a classifier, ok } else - {//parent is not a classifier, so maybe it's a folder.. check types - if( (parentItem->text(1) == "operations" && t == Uml::ot_Operation) - || (parentItem->text(1) == "attributes" && t == Uml::ot_Attribute)) + {//tqparent is not a classifier, so maybe it's a folder.. check types + if( (tqparentItem->text(1) == "operations" && t == Uml::ot_Operation) + || (tqparentItem->text(1) == "attributes" && t == Uml::ot_Attribute)) { - parentObject = me->findUMLObject( parentItem->parent() ); + tqparentObject = me->findUMLObject( tqparentItem->tqparent() ); } else { - kDebug()<<"moving to item "<<parentItem->text(0)<<" -- "<<parentItem->text(1)<<" not valid"<<endl; + kDebug()<<"moving to item "<<tqparentItem->text(0)<<" -- "<<tqparentItem->text(1)<<" not valid"<<endl; return false; } } - if (dynamic_cast<UMLClassifier*>(parentObject) && + if (dynamic_cast<UMLClassifier*>(tqparentObject) && (t == Uml::ot_Attribute || t == Uml::ot_Operation)) { return true; @@ -613,7 +613,7 @@ bool RefactoringAssistant::acceptDrag(TQDropEvent *event) const } -void RefactoringAssistant::movableDropEvent (TQListViewItem* parentItem, TQListViewItem* afterme) +void RefactoringAssistant::movableDropEvent (TQListViewItem* tqparentItem, TQListViewItem* afterme) { //when dropping on a class, we have to put the item in the appropriate folder! UMLObject *movingObject; @@ -631,17 +631,17 @@ void RefactoringAssistant::movableDropEvent (TQListViewItem* parentItem, TQListV return; } Uml::Object_Type t = movingObject->getBaseType(); - newClassifier = dynamic_cast<UMLClassifier*>( findUMLObject( parentItem ) ); + newClassifier = dynamic_cast<UMLClassifier*>( findUMLObject( tqparentItem ) ); if(!newClassifier) { - if ((parentItem->text(1) == "operations" && t == Uml::ot_Operation) - || (parentItem->text(1) == "attributes" && t == Uml::ot_Attribute)) + if ((tqparentItem->text(1) == "operations" && t == Uml::ot_Operation) + || (tqparentItem->text(1) == "attributes" && t == Uml::ot_Attribute)) { - newClassifier = dynamic_cast<UMLClassifier*>( findUMLObject( parentItem->parent() ) ); + newClassifier = dynamic_cast<UMLClassifier*>( findUMLObject( tqparentItem->tqparent() ) ); } if(!newClassifier) { - kWarning()<<"New parent of object is not a Classifier - Drop had already been accepted - check!"<<endl; + kWarning()<<"New tqparent of object is not a Classifier - Drop had already been accepted - check!"<<endl; return; } } @@ -650,13 +650,13 @@ void RefactoringAssistant::movableDropEvent (TQListViewItem* parentItem, TQListV UMLOperation *op = static_cast<UMLOperation*>(movingObject); if(newClassifier->checkOperationSignature(op->getName(), op->getParmList())) { - TQString msg = TQString(i18n("An operation with that signature already exists in %1.\n")).arg(newClassifier->getName()) + TQString msg = TQString(i18n("An operation with that signature already exists in %1.\n")).tqarg(newClassifier->getName()) + TQString(i18n("Choose a different name or parameter list." )); KMessageBox::error(this, msg, i18n("Operation Name Invalid"), false); return; } - UMLClassifier *oldClassifier = dynamic_cast<UMLClassifier*>(op->parent()); + UMLClassifier *oldClassifier = dynamic_cast<UMLClassifier*>(op->tqparent()); if(oldClassifier) oldClassifier->removeOperation( op ); newClassifier->addOperation( op ); @@ -666,7 +666,7 @@ void RefactoringAssistant::movableDropEvent (TQListViewItem* parentItem, TQListV // UMLAttribute *att = static_cast<UMLAttribute*>(movingObject); // if(!newClassifier->checkAttributeSignature(att)) // { - // TQString msg = TQString(i18n("An attribute with that signature already exists in %1.\n")).arg(newClassifier->getName()) + // TQString msg = TQString(i18n("An attribute with that signature already exists in %1.\n")).tqarg(newClassifier->getName()) // + // TQString(i18n("Choose a different name or parameter list." )); // KMessageBox::error(this, msg, i18n("Operation Name Invalid"), false); diff --git a/umbrello/umbrello/refactoring/refactoringassistant.h b/umbrello/umbrello/refactoring/refactoringassistant.h index ba28fd7e..f69536ad 100644 --- a/umbrello/umbrello/refactoring/refactoringassistant.h +++ b/umbrello/umbrello/refactoring/refactoringassistant.h @@ -31,10 +31,11 @@ class TQPoint; class RefactoringAssistant : public KListView { Q_OBJECT + TQ_OBJECT public: typedef std::map<TQListViewItem*, UMLObject*> UMLObjectMap; - explicit RefactoringAssistant( UMLDoc *doc, UMLClassifier *obj = 0, TQWidget *parent = 0, const char *name = 0 ); + explicit RefactoringAssistant( UMLDoc *doc, UMLClassifier *obj = 0, TQWidget *tqparent = 0, const char *name = 0 ); virtual ~RefactoringAssistant(); void refactor( UMLClassifier *obj ); @@ -71,10 +72,10 @@ protected: UMLObject* findUMLObject( const TQListViewItem* ); TQListViewItem* findListViewItem( const UMLObject *obj ); void editProperties( UMLObject *obj ); - void addClassifier( UMLClassifier *classifier, TQListViewItem *parent = 0, bool addSuper = true, bool addSub = true, bool recurse = false ); + void addClassifier( UMLClassifier *classifier, TQListViewItem *tqparent = 0, bool addSuper = true, bool addSub = true, bool recurse = false ); void loadPixmaps(); virtual bool acceptDrag(TQDropEvent *event) const; - virtual void movableDropEvent (TQListViewItem* parent, TQListViewItem* afterme); + virtual void movableDropEvent (TQListViewItem* tqparent, TQListViewItem* afterme); void setVisibilityIcon( TQListViewItem *item , const UMLObject *obj ); UMLClassifier *m_umlObject; UMLDoc *m_doc; diff --git a/umbrello/umbrello/seqlinewidget.cpp b/umbrello/umbrello/seqlinewidget.cpp index 6d52834f..18d70a68 100644 --- a/umbrello/umbrello/seqlinewidget.cpp +++ b/umbrello/umbrello/seqlinewidget.cpp @@ -26,9 +26,9 @@ int const SeqLineWidget::m_nMouseDownEpsilonX = 20; SeqLineWidget::SeqLineWidget( UMLView * pView, ObjectWidget * pObject ) : TQCanvasLine( pView -> canvas() ) { m_pView = pView; m_pObject = pObject; - setPen( TQPen( m_pObject->getLineColor(), 0, Qt::DashLine ) ); + setPen( TQPen( m_pObject->getLineColor(), 0, TQt::DashLine ) ); setZ( 0 ); - setVisible( true ); + tqsetVisible( true ); m_DestructionBox.line1 = 0; m_nLengthY = 250; setupDestructionBox(); @@ -83,13 +83,13 @@ void SeqLineWidget::setupDestructionBox() { m_DestructionBox.line1 = new TQCanvasLine( m_pView->canvas() ); m_DestructionBox.setLine1Points(rect); - m_DestructionBox.line1->setVisible( true ); + m_DestructionBox.line1->tqsetVisible( true ); m_DestructionBox.line1->setPen( TQPen(m_pObject->getLineColor(), 2) ); m_DestructionBox.line1->setZ( 3 ); m_DestructionBox.line2 = new TQCanvasLine( m_pView -> canvas() ); m_DestructionBox.setLine2Points(rect); - m_DestructionBox.line2->setVisible( true ); + m_DestructionBox.line2->tqsetVisible( true ); m_DestructionBox.line2->setPen( TQPen(m_pObject->getLineColor(), 2) ); m_DestructionBox.line2->setZ( 3 ); } diff --git a/umbrello/umbrello/seqlinewidget.h b/umbrello/umbrello/seqlinewidget.h index 71ee9d73..7710038e 100644 --- a/umbrello/umbrello/seqlinewidget.h +++ b/umbrello/umbrello/seqlinewidget.h @@ -9,8 +9,8 @@ * Umbrello UML Modeller Authors <uml-devel@uml.sf.net> * ***************************************************************************/ -#ifndef SEQLINEWIDGET_H -#define SEQLINEWIDGET_H +#ifndef SETQLINEWIDGET_H +#define SETQLINEWIDGET_H #include <tqcanvas.h> diff --git a/umbrello/umbrello/statewidget.cpp b/umbrello/umbrello/statewidget.cpp index 871ab316..72ce43ea 100644 --- a/umbrello/umbrello/statewidget.cpp +++ b/umbrello/umbrello/statewidget.cpp @@ -55,23 +55,23 @@ void StateWidget::draw(TQPainter & p, int offsetX, int offsetY) { const int count = m_Activities.count(); if( count == 0 ) { p.drawRoundRect(offsetX, offsetY, w, h, (h*40)/w, (w*40)/h); - p.setPen(Qt::black); + p.setPen(TQt::black); TQFont font = UMLWidget::getFont(); font.setBold( false ); p.setFont( font ); p.drawText(offsetX + STATE_MARGIN, offsetY + textStartY, w - STATE_MARGIN * 2, fontHeight, - Qt::AlignCenter, getName()); + TQt::AlignCenter, getName()); UMLWidget::setPen(p); } else { p.drawRoundRect(offsetX, offsetY, w, h, (h*40)/w, (w*40)/h); textStartY = offsetY + STATE_MARGIN; - p.setPen(Qt::black); + p.setPen(TQt::black); TQFont font = UMLWidget::getFont(); font.setBold( true ); p.setFont( font ); p.drawText(offsetX + STATE_MARGIN, textStartY, w - STATE_MARGIN * 2, - fontHeight, Qt::AlignCenter, getName()); + fontHeight, TQt::AlignCenter, getName()); font.setBold( false ); p.setFont( font ); UMLWidget::setPen(p); @@ -81,9 +81,9 @@ void StateWidget::draw(TQPainter & p, int offsetX, int offsetY) { for( TQStringList::Iterator it(m_Activities.begin()); it != end; ++it ) { textStartY += fontHeight; p.drawLine( offsetX, linePosY, offsetX + w - 1, linePosY ); - p.setPen(Qt::black); + p.setPen(TQt::black); p.drawText(offsetX + STATE_MARGIN, textStartY, w - STATE_MARGIN * 2 - 1, - fontHeight, Qt::AlignCenter, *it); + fontHeight, TQt::AlignCenter, *it); UMLWidget::setPen(p); linePosY += fontHeight; }//end for @@ -97,7 +97,7 @@ void StateWidget::draw(TQPainter & p, int offsetX, int offsetY) { case End : p.setBrush( WidgetBase::getLineColor() ); p.drawEllipse( offsetX, offsetY, w, h ); - p.setBrush( Qt::white ); + p.setBrush( TQt::white ); p.drawEllipse( offsetX + 1, offsetY + 1, w - 2, h - 2 ); p.setBrush( WidgetBase::getLineColor() ); p.drawEllipse( offsetX + 3, offsetY + 3, w - 6, h - 6 ); @@ -192,7 +192,7 @@ bool StateWidget::addActivity( const TQString &activity ) { bool StateWidget::removeActivity( const TQString &activity ) { int index = - 1; - if( ( index = m_Activities.findIndex( activity ) ) == -1 ) + if( ( index = m_Activities.tqfindIndex( activity ) ) == -1 ) return false; m_Activities.remove( m_Activities.at( index ) ); updateComponentSize(); @@ -210,7 +210,7 @@ TQStringList & StateWidget::getActivityList() { bool StateWidget::renameActivity( const TQString &activity, const TQString &newName ) { int index = - 1; - if( ( index = m_Activities.findIndex( activity ) ) == -1 ) + if( ( index = m_Activities.tqfindIndex( activity ) ) == -1 ) return false; m_Activities[ index ] = newName; return true; diff --git a/umbrello/umbrello/statewidget.h b/umbrello/umbrello/statewidget.h index e1611c18..84471f10 100644 --- a/umbrello/umbrello/statewidget.h +++ b/umbrello/umbrello/statewidget.h @@ -37,6 +37,7 @@ */ class StateWidget : public UMLWidget { Q_OBJECT + TQ_OBJECT public: /// Enumeration that codes the different types of state. @@ -50,7 +51,7 @@ public: /** * Creates a State widget. * - * @param view The parent of the widget. + * @param view The tqparent of the widget. * @param stateType The type of state. * @param id The ID to assign (-1 will prompt a new ID.) */ diff --git a/umbrello/umbrello/stereotype.cpp b/umbrello/umbrello/stereotype.cpp index c3b912f4..e77f6c03 100644 --- a/umbrello/umbrello/stereotype.cpp +++ b/umbrello/umbrello/stereotype.cpp @@ -71,9 +71,9 @@ void UMLStereotype::saveToXMI(TQDomDocument& qDoc, TQDomElement& qElement) { qElement.appendChild( stereotypeElement ); } -bool UMLStereotype::showPropertiesDialog(TQWidget* parent) { +bool UMLStereotype::showPropertiesDialog(TQWidget* tqparent) { bool ok; - TQString name = KInputDialog::getText(i18n("Stereotype"), i18n("Enter name:"), getName(),&ok, parent); + TQString name = KInputDialog::getText(i18n("Stereotype"), i18n("Enter name:"), getName(),&ok, tqparent); if (ok) { setName(name); } diff --git a/umbrello/umbrello/stereotype.h b/umbrello/umbrello/stereotype.h index a727fed8..e5e593cc 100644 --- a/umbrello/umbrello/stereotype.h +++ b/umbrello/umbrello/stereotype.h @@ -85,7 +85,7 @@ public: * Display the properties configuration dialog for the stereotype * (just a line edit). */ - bool showPropertiesDialog(TQWidget* parent); + bool showPropertiesDialog(TQWidget* tqparent); protected: /** diff --git a/umbrello/umbrello/template.cpp b/umbrello/umbrello/template.cpp index f02f4426..615e12de 100644 --- a/umbrello/umbrello/template.cpp +++ b/umbrello/umbrello/template.cpp @@ -21,15 +21,15 @@ #include "umldoc.h" #include "dialogs/umltemplatedialog.h" -UMLTemplate::UMLTemplate(const UMLObject *parent, const TQString& name, +UMLTemplate::UMLTemplate(const UMLObject *tqparent, const TQString& name, Uml::IDType id, const TQString& type) - : UMLClassifierListItem( parent, name, id ) { + : UMLClassifierListItem( tqparent, name, id ) { setTypeName( type ); m_BaseType = Uml::ot_Template; } -UMLTemplate::UMLTemplate(const UMLObject *parent) - : UMLClassifierListItem( parent ) { +UMLTemplate::UMLTemplate(const UMLObject *tqparent) + : UMLClassifierListItem( tqparent ) { m_BaseType = Uml::ot_Template; } @@ -69,7 +69,7 @@ void UMLTemplate::copyInto(UMLTemplate *rhs) const UMLObject* UMLTemplate::clone() const { - UMLTemplate *clone = new UMLTemplate( (UMLTemplate*) parent()); + UMLTemplate *clone = new UMLTemplate( (UMLTemplate*) tqparent()); copyInto(clone); return clone; @@ -89,7 +89,7 @@ bool UMLTemplate::load(TQDomElement& element) { return true; } -bool UMLTemplate::showPropertiesDialog(TQWidget* parent) { - UMLTemplateDialog dialog(parent, this); +bool UMLTemplate::showPropertiesDialog(TQWidget* tqparent) { + UMLTemplateDialog dialog(tqparent, this); return dialog.exec(); } diff --git a/umbrello/umbrello/template.h b/umbrello/umbrello/template.h index 6b471207..e7558010 100644 --- a/umbrello/umbrello/template.h +++ b/umbrello/umbrello/template.h @@ -30,20 +30,20 @@ public: /** * Sets up a template. * - * @param parent The parent of this UMLTemplate (i.e. its concept). + * @param tqparent The tqparent of this UMLTemplate (i.e. its concept). * @param name The name of this UMLTemplate. * @param id The unique id given to this UMLTemplate. * @param type The type of this UMLTemplate. */ - UMLTemplate(const UMLObject *parent, const TQString& name, + UMLTemplate(const UMLObject *tqparent, const TQString& name, Uml::IDType id = Uml::id_None, const TQString& type = "class"); /** * Sets up a template. * - * @param parent The parent of this UMLTemplate (i.e. its concept). + * @param tqparent The tqparent of this UMLTemplate (i.e. its concept). */ - UMLTemplate(const UMLObject *parent); + UMLTemplate(const UMLObject *tqparent); /** * Overloaded '==' operator @@ -89,7 +89,7 @@ public: * * @return Success status. */ - bool showPropertiesDialog(TQWidget* parent); + bool showPropertiesDialog(TQWidget* tqparent); /** * Writes the <UML:TemplateParameter> XMI element. diff --git a/umbrello/umbrello/textblock.cpp b/umbrello/umbrello/textblock.cpp index f3ea35fe..1beae001 100644 --- a/umbrello/umbrello/textblock.cpp +++ b/umbrello/umbrello/textblock.cpp @@ -30,10 +30,10 @@ // Constructors/Destructors // -TextBlock::TextBlock ( CodeDocument * parent, const TQString & text ) - : TQObject ( (TQObject *)parent, "textBlock") +TextBlock::TextBlock ( CodeDocument * tqparent, const TQString & text ) + : TQObject ( (TQObject *)tqparent, "textBlock") { - initFields(parent); + initFields(tqparent); setText(text); } @@ -49,7 +49,7 @@ TextBlock::~TextBlock ( ) { } /** - * Set the value of the parent code document + * Set the value of the tqparent code document * @param new_var the new value of m_parentDocument */ void TextBlock::setParentDocument ( CodeDocument * new_var ) { @@ -137,7 +137,7 @@ void TextBlock::setIndentationLevel ( int level ) { } /** Get how many times to indent this text block. - * The amount of each indenatation is determined from the parent + * The amount of each indenatation is determined from the tqparent * codedocument codegeneration policy. */ int TextBlock::getIndentationLevel ( ) { @@ -205,12 +205,12 @@ TQString TextBlock::formatMultiLineText ( const TQString &work, const TQString & TQString output = ""; TQString text = work; TQString endLine = getNewLineEndingChars(); - int matches = text.contains(TQRegExp(breakStr)); + int matches = text.tqcontains(TQRegExp(breakStr)); if(matches) { // check that last part of string matches, if not, then // we have to tack on extra match - if(!text.contains(TQRegExp(breakStr+"\\$"))) + if(!text.tqcontains(TQRegExp(breakStr+"\\$"))) matches++; for(int i=0; i < matches; i++) @@ -280,7 +280,7 @@ void TextBlock::setAttributesFromNode (TQDomElement & root ) { // entity. TQString TextBlock::encodeText(const TQString& text, const TQString &endLine) { TQString encoded = text; - encoded.replace(TQRegExp(endLine),"
"); + encoded.tqreplace(TQRegExp(endLine),"
"); return encoded; } @@ -289,12 +289,12 @@ TQString TextBlock::encodeText(const TQString& text, const TQString &endLine) { // entity. TQString TextBlock::decodeText(const TQString& text, const TQString &endLine) { TQString decoded = text; - decoded.replace(TQRegExp("
"),endLine); + decoded.tqreplace(TQRegExp("
"),endLine); return decoded; } /** - * @return QString + * @return TQString */ TQString TextBlock::toString ( ) { @@ -308,10 +308,10 @@ TQString TextBlock::toString ( ) return ""; } -void TextBlock::initFields ( CodeDocument * parent ) { +void TextBlock::initFields ( CodeDocument * tqparent ) { m_canDelete = true; m_writeOutText = true; - m_parentDocument = parent; + m_parentDocument = tqparent; m_text = ""; m_tag = ""; m_indentationLevel = 0; diff --git a/umbrello/umbrello/textblock.h b/umbrello/umbrello/textblock.h index 8a3ac9fd..3e470c7a 100644 --- a/umbrello/umbrello/textblock.h +++ b/umbrello/umbrello/textblock.h @@ -33,6 +33,7 @@ class TextBlock : virtual public TQObject { friend class CodeGenObjectWithTextBlocks; friend class ClassifierCodeDocument; Q_OBJECT + TQ_OBJECT public: // Constructors/Destructors @@ -41,7 +42,7 @@ public: /** * Constructors */ - explicit TextBlock ( CodeDocument * parent, const TQString & text = ""); + explicit TextBlock ( CodeDocument * tqparent, const TQString & text = ""); // destructor ~TextBlock ( ); @@ -107,13 +108,13 @@ public: bool getWriteOutText ( ); /** Set how many times to indent this text block. - * The amount of each indenatation is determined from the parent + * The amount of each indenatation is determined from the tqparent * codedocument codegeneration policy. */ void setIndentationLevel ( int level ); /** Get how many times to indent this text block. - * The amount of each indenatation is determined from the parent + * The amount of each indenatation is determined from the tqparent * codedocument codegeneration policy. */ int getIndentationLevel ( ); @@ -142,7 +143,7 @@ public: virtual TQString unformatText ( const TQString & text, const TQString & indent = ""); /** - * @return QString + * @return TQString */ virtual TQString toString ( ); diff --git a/umbrello/umbrello/toolbarstate.h b/umbrello/umbrello/toolbarstate.h index 882f2137..5bcb12bf 100644 --- a/umbrello/umbrello/toolbarstate.h +++ b/umbrello/umbrello/toolbarstate.h @@ -70,6 +70,7 @@ class UMLWidget; */ class ToolBarState: public TQObject { Q_OBJECT + TQ_OBJECT public: /** @@ -162,7 +163,7 @@ protected: /** * Creates a new ToolBarState. - * UMLView is set as parent of this TQObject, and name is left empty. + * UMLView is set as tqparent of this TQObject, and name is left empty. * Protected to avoid classes other than derived to create objects of this * class. * diff --git a/umbrello/umbrello/toolbarstatearrow.cpp b/umbrello/umbrello/toolbarstatearrow.cpp index ad24d753..05e98734 100644 --- a/umbrello/umbrello/toolbarstatearrow.cpp +++ b/umbrello/umbrello/toolbarstatearrow.cpp @@ -57,8 +57,8 @@ void ToolBarStateArrow::mousePressEmpty() { TQCanvasLine* line = new TQCanvasLine(m_pUMLView->canvas()); line->setPoints(m_pMouseEvent->x(), m_pMouseEvent->y(), m_pMouseEvent->x(), m_pMouseEvent->y()); - line->setPen(TQPen(TQColor("grey"), 0, Qt::DotLine)); - line->setVisible(true); + line->setPen(TQPen(TQColor("grey"), 0, TQt::DotLine)); + line->tqsetVisible(true); line->setZ(100); m_selectionRect.append(line); } diff --git a/umbrello/umbrello/toolbarstatearrow.h b/umbrello/umbrello/toolbarstatearrow.h index 265bc5d0..c098c300 100644 --- a/umbrello/umbrello/toolbarstatearrow.h +++ b/umbrello/umbrello/toolbarstatearrow.h @@ -33,6 +33,7 @@ class TQCanvasLine; */ class ToolBarStateArrow : public ToolBarState { Q_OBJECT + TQ_OBJECT public: /** diff --git a/umbrello/umbrello/toolbarstateassociation.cpp b/umbrello/umbrello/toolbarstateassociation.cpp index 64d2fbfe..340a28dc 100644 --- a/umbrello/umbrello/toolbarstateassociation.cpp +++ b/umbrello/umbrello/toolbarstateassociation.cpp @@ -130,9 +130,9 @@ void ToolBarStateAssociation::setFirstWidget() { m_associationLine = new TQCanvasLine(m_pUMLView->canvas()); m_associationLine->setPoints(pos.x(), pos.y(), pos.x(), pos.y()); - m_associationLine->setPen(TQPen(m_pUMLView->getLineColor(), m_pUMLView->getLineWidth(), Qt::DashLine)); + m_associationLine->setPen(TQPen(m_pUMLView->getLineColor(), m_pUMLView->getLineWidth(), TQt::DashLine)); - m_associationLine->setVisible(true); + m_associationLine->tqsetVisible(true); m_pUMLView->viewport()->setMouseTracking(true); } diff --git a/umbrello/umbrello/toolbarstateassociation.h b/umbrello/umbrello/toolbarstateassociation.h index 1bc8513d..734e603f 100644 --- a/umbrello/umbrello/toolbarstateassociation.h +++ b/umbrello/umbrello/toolbarstateassociation.h @@ -37,6 +37,7 @@ class TQCanvasLine; */ class ToolBarStateAssociation : public ToolBarStatePool { Q_OBJECT + TQ_OBJECT public: /** diff --git a/umbrello/umbrello/toolbarstatemessages.cpp b/umbrello/umbrello/toolbarstatemessages.cpp index cd0fac78..453c6d7c 100644 --- a/umbrello/umbrello/toolbarstatemessages.cpp +++ b/umbrello/umbrello/toolbarstatemessages.cpp @@ -116,9 +116,9 @@ void ToolBarStateMessages::setFirstWidget(ObjectWidget* firstObject) { m_messageLine = new TQCanvasLine(m_pUMLView->canvas()); m_messageLine->setPoints(m_pMouseEvent->x(), m_pMouseEvent->y(), m_pMouseEvent->x(), m_pMouseEvent->y()); - m_messageLine->setPen(TQPen(m_pUMLView->getLineColor(), m_pUMLView->getLineWidth(), Qt::DashLine)); + m_messageLine->setPen(TQPen(m_pUMLView->getLineColor(), m_pUMLView->getLineWidth(), TQt::DashLine)); - m_messageLine->setVisible(true); + m_messageLine->tqsetVisible(true); m_pUMLView->viewport()->setMouseTracking(true); } diff --git a/umbrello/umbrello/toolbarstatemessages.h b/umbrello/umbrello/toolbarstatemessages.h index 796dee30..35719581 100644 --- a/umbrello/umbrello/toolbarstatemessages.h +++ b/umbrello/umbrello/toolbarstatemessages.h @@ -49,6 +49,7 @@ class ObjectWidget; */ class ToolBarStateMessages : public ToolBarStatePool { Q_OBJECT + TQ_OBJECT public: /** diff --git a/umbrello/umbrello/toolbarstateother.h b/umbrello/umbrello/toolbarstateother.h index d5c6f412..ea94feae 100644 --- a/umbrello/umbrello/toolbarstateother.h +++ b/umbrello/umbrello/toolbarstateother.h @@ -24,6 +24,7 @@ */ class ToolBarStateOther : public ToolBarStatePool { Q_OBJECT + TQ_OBJECT public: /** diff --git a/umbrello/umbrello/toolbarstatepool.h b/umbrello/umbrello/toolbarstatepool.h index 6b33f9ea..4541911b 100644 --- a/umbrello/umbrello/toolbarstatepool.h +++ b/umbrello/umbrello/toolbarstatepool.h @@ -23,6 +23,7 @@ */ class ToolBarStatePool : public ToolBarState { Q_OBJECT + TQ_OBJECT public: /** diff --git a/umbrello/umbrello/uml.cpp b/umbrello/umbrello/uml.cpp index e6a87cfd..13608f3c 100644 --- a/umbrello/umbrello/uml.cpp +++ b/umbrello/umbrello/uml.cpp @@ -55,7 +55,7 @@ #include "umlviewlist.h" #include "worktoolbar.h" #ifdef HAVE_DOT -# include "autolayout/autolayoutdlg.h" //dimitri +# include "autotqlayout/autotqlayoutdlg.h" //dimitri #endif #include "model_utils.h" #include "clipboard/umlclipboard.h" @@ -160,43 +160,43 @@ UMLApp* UMLApp::app() } void UMLApp::initActions() { - fileNew = KStdAction::openNew(this, TQT_SLOT(slotFileNew()), actionCollection()); - fileOpen = KStdAction::open(this, TQT_SLOT(slotFileOpen()), actionCollection()); - fileOpenRecent = KStdAction::openRecent(this, TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); - fileSave = KStdAction::save(this, TQT_SLOT(slotFileSave()), actionCollection()); - fileSaveAs = KStdAction::saveAs(this, TQT_SLOT(slotFileSaveAs()), actionCollection()); - fileClose = KStdAction::close(this, TQT_SLOT(slotFileClose()), actionCollection()); - filePrint = KStdAction::print(this, TQT_SLOT(slotFilePrint()), actionCollection()); - fileQuit = KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection()); - editUndo = KStdAction::undo(this, TQT_SLOT(slotEditUndo()), actionCollection()); - editRedo = KStdAction::redo(this, TQT_SLOT(slotEditRedo()), actionCollection()); - editCut = KStdAction::cut(this, TQT_SLOT(slotEditCut()), actionCollection()); - editCopy = KStdAction::copy(this, TQT_SLOT(slotEditCopy()), actionCollection()); - editPaste = KStdAction::paste(this, TQT_SLOT(slotEditPaste()), actionCollection()); + fileNew = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(slotFileNew()), actionCollection()); + fileOpen = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection()); + fileOpenRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); + fileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection()); + fileSaveAs = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), actionCollection()); + fileClose = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotFileClose()), actionCollection()); + filePrint = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection()); + fileQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection()); + editUndo = KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotEditUndo()), actionCollection()); + editRedo = KStdAction::redo(TQT_TQOBJECT(this), TQT_SLOT(slotEditRedo()), actionCollection()); + editCut = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotEditCut()), actionCollection()); + editCopy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()), actionCollection()); + editPaste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), actionCollection()); createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); - selectAll = KStdAction::selectAll(this, TQT_SLOT( slotSelectAll() ), actionCollection()); + selectAll = KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT( slotSelectAll() ), actionCollection()); fileExportDocbook = new KAction(i18n("&Export model to DocBook"), 0, - this, TQT_SLOT( slotFileExportDocbook() ), + TQT_TQOBJECT(this), TQT_SLOT( slotFileExportDocbook() ), actionCollection(), "file_export_docbook"); fileExportXhtml = new KAction(i18n("&Export model to XHTML"), 0, - this, TQT_SLOT( slotFileExportXhtml() ), + TQT_TQOBJECT(this), TQT_SLOT( slotFileExportXhtml() ), actionCollection(), "file_export_xhtml"); - classWizard = new KAction(i18n("&New Class Wizard..."),0,this,TQT_SLOT(slotClassWizard()), + classWizard = new KAction(i18n("&New Class Wizard..."),0,TQT_TQOBJECT(this),TQT_SLOT(slotClassWizard()), actionCollection(),"class_wizard"); - new KAction(i18n("&Add Default Datatypes for Active Language"), 0, this, + new KAction(i18n("&Add Default Datatypes for Active Language"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddDefaultDatatypes()), actionCollection(), "create_default_datatypes"); - preferences = KStdAction::preferences(this, TQT_SLOT( slotPrefs() ), actionCollection()); + preferences = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT( slotPrefs() ), actionCollection()); - genWizard = new KAction(i18n("&Code Generation Wizard..."),0,this,TQT_SLOT(generationWizard()), + genWizard = new KAction(i18n("&Code Generation Wizard..."),0,TQT_TQOBJECT(this),TQT_SLOT(generationWizard()), actionCollection(),"generation_wizard"); - genAll = new KAction(i18n("&Generate All Code"),0,this,TQT_SLOT(generateAllCode()), + genAll = new KAction(i18n("&Generate All Code"),0,TQT_TQOBJECT(this),TQT_SLOT(generateAllCode()), actionCollection(),"generate_all"); importClasses = new KAction(i18n("&Import Classes..."), SmallIconSet("source_cpp"), 0, - this,TQT_SLOT(slotImportClasses()), actionCollection(),"import_class"); + TQT_TQOBJECT(this),TQT_SLOT(slotImportClasses()), actionCollection(),"import_class"); fileNew->setToolTip(i18n("Creates a new document")); fileOpen->setToolTip(i18n("Opens an existing document")); @@ -215,63 +215,63 @@ void UMLApp::initActions() { deleteSelectedWidget = new KAction( i18n("Delete &Selected"), SmallIconSet("editdelete"), - KShortcut(Qt::Key_Delete), this, + KShortcut(TQt::Key_Delete), TQT_TQOBJECT(this), TQT_SLOT( slotDeleteSelectedWidget() ), actionCollection(), "delete_selected" ); // The different views newDiagram = new KActionMenu(0, SmallIconSet("filenew"), actionCollection(), "new_view"); classDiagram = new KAction( i18n( "&Class Diagram..." ), SmallIconSet("umbrello_diagram_class"), 0, - this, TQT_SLOT( slotClassDiagram() ), actionCollection(), "new_class_diagram" ); + TQT_TQOBJECT(this), TQT_SLOT( slotClassDiagram() ), actionCollection(), "new_class_diagram" ); #if defined (HAVE_DOT) - autolayout = new KAction(i18n("&Autolayout..."),0,0,this,TQT_SLOT(slotAutolayout()), - actionCollection(),"autolayout"); + autotqlayout = new KAction(i18n("&Autotqlayout..."),0,0,TQT_TQOBJECT(this),TQT_SLOT(slotAutotqlayout()), + actionCollection(),"autotqlayout"); #endif sequenceDiagram= new KAction( i18n( "&Sequence Diagram..." ), SmallIconSet("umbrello_diagram_sequence"), 0, - this, TQT_SLOT( slotSequenceDiagram() ), actionCollection(), "new_sequence_diagram" ); + TQT_TQOBJECT(this), TQT_SLOT( slotSequenceDiagram() ), actionCollection(), "new_sequence_diagram" ); collaborationDiagram = new KAction( i18n( "C&ollaboration Diagram..." ), SmallIconSet("umbrello_diagram_collaboration"), 0, - this, TQT_SLOT( slotCollaborationDiagram() ), actionCollection(), "new_collaboration_diagram" ); + TQT_TQOBJECT(this), TQT_SLOT( slotCollaborationDiagram() ), actionCollection(), "new_collaboration_diagram" ); useCaseDiagram= new KAction( i18n( "&Use Case Diagram..." ), SmallIconSet("umbrello_diagram_usecase"), 0, - this, TQT_SLOT( slotUseCaseDiagram() ), actionCollection(), "new_use_case_diagram" ); + TQT_TQOBJECT(this), TQT_SLOT( slotUseCaseDiagram() ), actionCollection(), "new_use_case_diagram" ); stateDiagram= new KAction( i18n( "S&tate Diagram..." ), SmallIconSet("umbrello_diagram_state"), 0, - this, TQT_SLOT( slotStateDiagram() ), actionCollection(), "new_state_diagram" ); + TQT_TQOBJECT(this), TQT_SLOT( slotStateDiagram() ), actionCollection(), "new_state_diagram" ); activityDiagram= new KAction( i18n( "&Activity Diagram..." ), SmallIconSet("umbrello_diagram_activity"), 0, - this, TQT_SLOT( slotActivityDiagram() ), actionCollection(), "new_activity_diagram" ); + TQT_TQOBJECT(this), TQT_SLOT( slotActivityDiagram() ), actionCollection(), "new_activity_diagram" ); componentDiagram = new KAction( i18n("Co&mponent Diagram..."), SmallIconSet("umbrello_diagram_component"), 0, - this, TQT_SLOT( slotComponentDiagram() ), actionCollection(), + TQT_TQOBJECT(this), TQT_SLOT( slotComponentDiagram() ), actionCollection(), "new_component_diagram" ); deploymentDiagram = new KAction( i18n("&Deployment Diagram..."), SmallIconSet("umbrello_diagram_deployment"), 0, - this, TQT_SLOT( slotDeploymentDiagram() ), actionCollection(), + TQT_TQOBJECT(this), TQT_SLOT( slotDeploymentDiagram() ), actionCollection(), "new_deployment_diagram" ); entityRelationshipDiagram = new KAction( i18n("&Entity Relationship Diagram..."), SmallIconSet("umbrello_diagram_entityrelationship"), 0, - this, TQT_SLOT( slotEntityRelationshipDiagram() ), actionCollection(), + TQT_TQOBJECT(this), TQT_SLOT( slotEntityRelationshipDiagram() ), actionCollection(), "new_entityrelationship_diagram" ); viewClearDiagram = new KAction(i18n("&Clear Diagram"), SmallIconSet("editclear"), 0, - this, TQT_SLOT( slotCurrentViewClearDiagram() ), actionCollection(), "view_clear_diagram"); + TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewClearDiagram() ), actionCollection(), "view_clear_diagram"); viewSnapToGrid = new KToggleAction(i18n("&Snap to Grid"), 0, - this, TQT_SLOT( slotCurrentViewToggleSnapToGrid() ), actionCollection(), "view_snap_to_grid"); + TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewToggleSnapToGrid() ), actionCollection(), "view_snap_to_grid"); viewShowGrid = new KToggleAction(i18n("S&how Grid"), 0, - this, TQT_SLOT( slotCurrentViewToggleShowGrid() ), actionCollection(), "view_show_grid"); + TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewToggleShowGrid() ), actionCollection(), "view_show_grid"); #if (KDE_VERSION_MINOR>=3) && (KDE_VERSION_MAJOR>=3) viewShowGrid->setCheckedState(i18n("&Hide Grid")); #endif deleteDiagram = new KAction(i18n("&Delete"), SmallIconSet("editdelete"), 0, - this, TQT_SLOT( slotDeleteDiagram() ), actionCollection(), "view_delete"); + TQT_TQOBJECT(this), TQT_SLOT( slotDeleteDiagram() ), actionCollection(), "view_delete"); viewExportImage = new KAction(i18n("&Export as Picture..."), SmallIconSet("image"), 0, - this, TQT_SLOT( slotCurrentViewExportImage() ), actionCollection(), "view_export_image"); + TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewExportImage() ), actionCollection(), "view_export_image"); viewExportImageAll = new KAction(i18n("Export &All Diagrams as Pictures..."), SmallIconSet("image"), 0, - this, TQT_SLOT( slotAllViewsExportImage() ), actionCollection(), "view_export_image_all"); + TQT_TQOBJECT(this), TQT_SLOT( slotAllViewsExportImage() ), actionCollection(), "view_export_image_all"); viewProperties = new KAction(i18n("&Properties"), SmallIconSet("info"), 0, - this, TQT_SLOT( slotCurrentViewProperties() ), actionCollection(), "view_properties"); + TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewProperties() ), actionCollection(), "view_properties"); viewSnapToGrid->setChecked(false); viewShowGrid->setChecked(false); @@ -284,35 +284,35 @@ void UMLApp::initActions() { viewProperties->setEnabled(false); zoomAction = new KPlayerPopupSliderAction(i18n("&Zoom Slider"), "viewmag", Key_F9, - this, TQT_SLOT(slotZoomSliderMoved(int)), + TQT_TQOBJECT(this), TQT_SLOT(slotZoomSliderMoved(int)), actionCollection(), "popup_zoom"); zoom100Action = new KAction(i18n( "Z&oom to 100%" ), "viewmag1", 0, - this, TQT_SLOT( slotZoom100() ), actionCollection(), + TQT_TQOBJECT(this), TQT_SLOT( slotZoom100() ), actionCollection(), "zoom100"); - KStdAction::tipOfDay( this, TQT_SLOT( tipOfTheDay() ), actionCollection() ); + KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( tipOfTheDay() ), actionCollection() ); TQString moveTabLeftString = i18n("&Move Tab Left"); TQString moveTabRightString = i18n("&Move Tab Right"); moveTabLeft = new KAction(TQApplication::reverseLayout() ? moveTabRightString : moveTabLeftString, TQApplication::reverseLayout() ? "forward" : "back", - TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Right : Qt::CTRL+Qt::SHIFT+Qt::Key_Left, - this, TQT_SLOT(slotMoveTabLeft()), actionCollection(), + TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Right : TQt::CTRL+TQt::SHIFT+TQt::Key_Left, + TQT_TQOBJECT(this), TQT_SLOT(slotMoveTabLeft()), actionCollection(), "move_tab_left"); moveTabRight = new KAction(TQApplication::reverseLayout() ? moveTabLeftString : moveTabRightString, TQApplication::reverseLayout() ? "back" : "forward", - TQApplication::reverseLayout() ? Qt::CTRL+Qt::SHIFT+Qt::Key_Left : Qt::CTRL+Qt::SHIFT+Qt::Key_Right, - this, TQT_SLOT(slotMoveTabRight()), actionCollection(), + TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Left : TQt::CTRL+TQt::SHIFT+TQt::Key_Right, + TQT_TQOBJECT(this), TQT_SLOT(slotMoveTabRight()), actionCollection(), "move_tab_right"); TQString selectTabLeftString = i18n("Select Diagram on Left"); TQString selectTabRightString = i18n("Select Diagram on Right"); changeTabLeft = new KAction(TQApplication::reverseLayout() ? selectTabRightString : selectTabLeftString, - TQApplication::reverseLayout() ? Qt::SHIFT+Qt::Key_Right : Qt::SHIFT+Qt::Key_Left, - this, TQT_SLOT(slotChangeTabLeft()), actionCollection(), "previous_tab"); + TQApplication::reverseLayout() ? TQt::SHIFT+TQt::Key_Right : TQt::SHIFT+TQt::Key_Left, + TQT_TQOBJECT(this), TQT_SLOT(slotChangeTabLeft()), actionCollection(), "previous_tab"); changeTabRight = new KAction(TQApplication::reverseLayout() ? selectTabLeftString : selectTabRightString, - TQApplication::reverseLayout() ? Qt::SHIFT+Qt::Key_Left : Qt::SHIFT+Qt::Key_Right, - this, TQT_SLOT(slotChangeTabRight()), actionCollection(), "next_tab"); + TQApplication::reverseLayout() ? TQt::SHIFT+TQt::Key_Left : TQt::SHIFT+TQt::Key_Right, + TQT_TQOBJECT(this), TQT_SLOT(slotChangeTabRight()), actionCollection(), "next_tab"); initStatusBar(); //call this here because the statusBar is shown/hidden by setupGUI() @@ -374,7 +374,7 @@ void UMLApp::setupZoomMenu() { void UMLApp::initStatusBar() { m_statusLabel = new KStatusBarLabel( i18n("Ready."), 0, statusBar() ); - m_statusLabel->setFixedHeight( m_statusLabel->sizeHint().height() ); + m_statusLabel->setFixedHeight( m_statusLabel->tqsizeHint().height() ); m_statusLabel->setFrameStyle( TQFrame::NoFrame | TQFrame::Plain ); m_statusLabel->setMargin( 0 ); @@ -382,7 +382,7 @@ void UMLApp::initStatusBar() { statusBar()->addWidget( m_statusLabel, 1, false ); - m_statusLabel->setAlignment(Qt::AlignLeft|Qt::AlignVCenter); + m_statusLabel->tqsetAlignment(TQt::AlignLeft|TQt::AlignVCenter); connect(m_doc, TQT_SIGNAL( sigWriteToStatusBar(const TQString &) ), this, TQT_SLOT( slotStatusMsg(const TQString &) )); } @@ -392,11 +392,11 @@ void UMLApp::initView() { m_view = NULL; toolsbar = new WorkToolBar(this, ""); toolsbar->setLabel(i18n("Diagram Toolbar")); - addToolBar(toolsbar, Qt::DockTop, false); + addToolBar(toolsbar, TQt::DockTop, false); m_alignToolBar = new AlignToolBar(this, ""); m_alignToolBar->setLabel(i18n("Alignment Toolbar")); - addToolBar(m_alignToolBar, Qt::DockTop, false); + addToolBar(m_alignToolBar, TQt::DockTop, false); m_mainDock = createDockWidget("maindock", 0L, 0L, "main dock"); m_newSessionButton = NULL; @@ -583,8 +583,8 @@ void UMLApp::readOptions() { fileOpenRecent->loadEntries(m_config,"Recent Files"); m_config->setGroup("General Options"); setImageMimeType(m_config->readEntry("imageMimeType","image/png")); - TQSize tmpQSize(630,460); - resize( m_config->readSizeEntry("Geometry", & tmpQSize) ); + TQSize tmpTQSize(630,460); + resize( m_config->readSizeEntry("Geometry", & tmpTQSize) ); } void UMLApp::saveProperties(KConfig *_config) { @@ -737,7 +737,7 @@ bool UMLApp::slotFileSaveAs() TQDir d = url.path(-1); if(TQFile::exists(d.path())) { - int want_save = KMessageBox::warningContinueCancel(this, i18n("The file %1 exists.\nDo you wish to overwrite it?").arg(url.path()), i18n("Warning"), i18n("Overwrite")); + int want_save = KMessageBox::warningContinueCancel(this, i18n("The file %1 exists.\nDo you wish to overwrite it?").tqarg(url.path()), i18n("Warning"), i18n("Overwrite")); if(want_save == KMessageBox::Continue) cont = false; } else @@ -776,7 +776,7 @@ void UMLApp::slotFilePrint() DiagramPrintPage * selectPage = new DiagramPrintPage(0, m_doc); printer.addDialogPage(selectPage); TQString msg; - if (printer.setup(this, i18n("Print %1").arg(m_doc->URL().prettyURL()))) { + if (printer.setup(this, i18n("Print %1").tqarg(m_doc->URL().prettyURL()))) { m_doc -> print(&printer); } @@ -842,7 +842,7 @@ void UMLApp::slotEditCopy() { void UMLApp::slotEditPaste() { slotStatusMsg(i18n("Inserting clipboard contents...")); - TQMimeSource* data = TQApplication::clipboard()->data(); + TQMimeSource* data = TQApplication::tqclipboard()->data(); UMLClipboard clipboard; setCursor(KCursor::waitCursor()); if(!clipboard.paste(data)) { @@ -895,7 +895,7 @@ void UMLApp::slotStatusMsg(const TQString &text) { statusBar()->clear(); m_statusLabel->setText( text ); - m_statusLabel->repaint(); + m_statusLabel->tqrepaint(); } void UMLApp::slotClassDiagram() { @@ -977,12 +977,12 @@ void UMLApp::enableRedo(bool enable) { /** initialize the QT's global clipboard support for the application */ void UMLApp::initClip() { - QClipboard* clip = TQApplication::clipboard(); + TQClipboard* clip = TQApplication::tqclipboard(); connect(clip, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipDataChanged())); // Don't poll the X11 clipboard every second. This is a little expensive and resulted - // in very annoying umbrello slowdowns / hangs. Qt will notify us about clipboard - // changes anyway (see dataChanged() signal above), albeit only when a Qt application + // in very annoying umbrello slowdowns / hangs. TQt will notify us about clipboard + // changes anyway (see dataChanged() signal above), albeit only when a TQt application // changes the clipboard. Work is in progress to make this work with other toolkits // as well. (pfeiffer) // m_clipTimer = new TQTimer(this, "timer"); @@ -1007,7 +1007,7 @@ bool UMLApp::canDecode(const TQMimeSource* mimeSource) { } void UMLApp::slotClipDataChanged() { - TQMimeSource * data = TQApplication::clipboard()->data(); + TQMimeSource * data = TQApplication::tqclipboard()->data(); //Pass the MimeSource to the Doc editPaste->setEnabled( data && canDecode(data) ); @@ -1075,7 +1075,7 @@ bool UMLApp::editCutCopy( bool bFromView ) { TQMimeSource * clipdata = 0; if ((clipdata = clipboard.copy(bFromView)) != 0) { - QClipboard* clip = TQApplication::clipboard(); + TQClipboard* clip = TQApplication::tqclipboard(); clip->setData(clipdata);//the global clipboard takes ownership of the clipdata memory connect(clip, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipDataChanged())); return true; @@ -1122,7 +1122,7 @@ void UMLApp::readOptionState() { m_config -> setGroup( "UI Options" ); optionState.uiState.useFillColor = m_config -> readBoolEntry( "useFillColor", true ); TQColor defaultYellow = TQColor( 255, 255, 192 ); - TQColor red ( Qt::red ); + TQColor red ( TQt::red ); optionState.uiState.fillColor = m_config -> readColorEntry( "fillColor", &defaultYellow ); optionState.uiState.lineColor = m_config -> readColorEntry( "lineColor", &red ); @@ -1484,12 +1484,12 @@ void UMLApp::updateLangSelectMenu(Uml::Programming_Language activeLanguage) { void UMLApp::tipOfTheDay() { - KTipDialog::showTip(this ,TQString::null, true); + KTipDialog::showTip(this ,TQString(), true); } void UMLApp::keyPressEvent(TQKeyEvent *e) { switch(e->key()) { - case Qt::Key_Shift: + case TQt::Key_Shift: //toolsbar->setOldTool(); e->accept(); break; @@ -1511,23 +1511,23 @@ void UMLApp::customEvent(TQCustomEvent* e) { void UMLApp::handleCursorKeyReleaseEvent(TQKeyEvent* e) { // in case we have selected something in the diagram, move it by one pixel // to the direction pointed by the cursor key - if (m_view == NULL || !m_view->getSelectCount() || e->state() != Qt::AltButton) { + if (m_view == NULL || !m_view->getSelectCount() || e->state() != TQt::AltButton) { e->ignore(); return; } int dx = 0; int dy = 0; switch (e->key()) { - case Qt::Key_Left: + case TQt::Key_Left: dx = -1; break; - case Qt::Key_Right: + case TQt::Key_Right: dx = 1; break; - case Qt::Key_Up: + case TQt::Key_Up: dy = -1; break; - case Qt::Key_Down: + case TQt::Key_Down: dy = 1; break; default: @@ -1546,19 +1546,19 @@ void UMLApp::handleCursorKeyReleaseEvent(TQKeyEvent* e) { void UMLApp::keyReleaseEvent(TQKeyEvent *e) { switch(e->key()) { - case Qt::Key_Backspace: + case TQt::Key_Backspace: if (!m_pDocWindow->isTyping()) toolsbar->setOldTool(); e->accept(); break; - case Qt::Key_Escape: + case TQt::Key_Escape: toolsbar->setDefaultTool(); e->accept(); break; - case Qt::Key_Left: - case Qt::Key_Right: - case Qt::Key_Up: - case Qt::Key_Down: + case TQt::Key_Left: + case TQt::Key_Right: + case TQt::Key_Up: + case TQt::Key_Down: handleCursorKeyReleaseEvent(e); break; default: @@ -1616,7 +1616,7 @@ TQPopupMenu* UMLApp::findMenu(TQMenuData* menu, const TQString &name) { for (int i=0; i<menuCount; i++) { int idAt = menu->idAt(i); - TQPopupMenu* popupMenu = menu->findItem(idAt)->popup(); + TQPopupMenu* popupMenu = menu->tqfindItem(idAt)->popup(); if (popupMenu) { TQString menuName = popupMenu->name(); if( menuName == name) { @@ -1640,7 +1640,7 @@ void UMLApp::slotChangeTabLeft() { } UMLViewList views = m_doc->getViewIterator(); UMLView *currView = m_view; - if (views.find(currView) < 0) { + if (views.tqfind(currView) < 0) { kError() << "UMLApp::slotChangeTabLeft(): currView not found in viewlist" << endl; return; } @@ -1657,7 +1657,7 @@ void UMLApp::slotChangeTabRight() { } UMLViewList views = m_doc->getViewIterator(); UMLView *currView = m_view; - if (views.find(currView) < 0) { + if (views.tqfind(currView) < 0) { kError() << "UMLApp::slotChangeTabRight(): currView not found in viewlist" << endl; return; } @@ -1679,10 +1679,10 @@ void UMLApp::slotMoveTabRight() { //m_tabWidget->moveTab( m_tabWidget->currentPageIndex(), m_tabWidget->currentPageIndex() + 1 ); } -void UMLApp::slotAutolayout(){ +void UMLApp::slotAutotqlayout(){ #ifdef HAVE_DOT /* - TQDialog* d = new AutolayoutDlg(getCurrentView()); + TQDialog* d = new AutotqlayoutDlg(getCurrentView()); d->show(); */ #endif diff --git a/umbrello/umbrello/uml.h b/umbrello/umbrello/uml.h index 973f4d03..13cbce16 100644 --- a/umbrello/umbrello/uml.h +++ b/umbrello/umbrello/uml.h @@ -53,10 +53,10 @@ class KTabWidget; class KToolBarButton; class KPopupMenu; -// Qt forward declarations +// TQt forward declarations class TQWidgetStack; class TQMenuData; -class QClipboard; +class TQClipboard; class TQToolButton; class TQCustomEvent; @@ -77,11 +77,12 @@ class TQCustomEvent; class UMLApp : public KDockMainWindow { Q_OBJECT + TQ_OBJECT public: /** * Constructor. Calls all init functions to create the application. */ - UMLApp(TQWidget* parent=0, const char* name=0); + UMLApp(TQWidget* tqparent=0, const char* name=0); /** * Standard deconstructor. @@ -246,7 +247,7 @@ public: void setDiagramMenuItemsState(bool bState); /** - * Returns the widget used as the parent for UMLViews. + * Returns the widget used as the tqparent for UMLViews. * @return The main view widget. */ TQWidget* getMainViewWidget(); @@ -339,7 +340,7 @@ protected: /** * Save general Options like all bar positions and status - * as well as the geometry and the recent file list to + * as well as the tqgeometry and the recent file list to * the configuration file. */ void saveOptions(); @@ -532,9 +533,9 @@ public slots: void slotViewStatusBar(); /** - * Autolayouts the current class diagram + * Autotqlayouts the current class diagram */ - void slotAutolayout(); + void slotAutotqlayout(); /** * Changes the statusbar contents for the standard label @@ -850,7 +851,7 @@ private: void readOptionState(); /** - * Initialize Qt's global clipboard support for the application. + * Initialize TQt's global clipboard support for the application. */ void initClip(); @@ -958,7 +959,7 @@ private: KAction* deleteSelectedWidget; KAction* deleteDiagram; #ifdef HAVE_DOT - KAction* autolayout; + KAction* autotqlayout; #endif KAction* changeTabLeft; @@ -983,13 +984,13 @@ private: bool m_loading; /** - * Shows, and is parent of, all the UMLViews (diagrams) + * Shows, and is tqparent of, all the UMLViews (diagrams) * if tabbed diagrams are not enabled. */ TQWidgetStack* m_viewStack; /** - * Shows, and is parent of, all the UMLViews (diagrams) + * Shows, and is tqparent of, all the UMLViews (diagrams) * if tabbed diagrams are enabled. */ KTabWidget* m_tabWidget; diff --git a/umbrello/umbrello/umlcanvasobject.cpp b/umbrello/umbrello/umlcanvasobject.cpp index 800336e3..8a4a30e0 100644 --- a/umbrello/umbrello/umlcanvasobject.cpp +++ b/umbrello/umbrello/umlcanvasobject.cpp @@ -80,7 +80,7 @@ bool UMLCanvasObject::addAssociationEnd(UMLAssociation* assoc) { } bool UMLCanvasObject::hasAssociation(UMLAssociation* assoc) { - if(m_List.containsRef(assoc) > 0) + if(m_List.tqcontainsRef(assoc) > 0) return true; return false; } diff --git a/umbrello/umbrello/umlcanvasobject.h b/umbrello/umbrello/umlcanvasobject.h index 8f7ccb8e..9a3ea04e 100644 --- a/umbrello/umbrello/umlcanvasobject.h +++ b/umbrello/umbrello/umlcanvasobject.h @@ -35,6 +35,7 @@ class UMLCanvasObject : public UMLObject { Q_OBJECT + TQ_OBJECT public: /** * Sets up a UMLCanvasObject. @@ -164,7 +165,7 @@ public: * Find a child object with the given name. * * @param n The name of the object to find. - * @param t The type to find (optional.) If not given then + * @param t The type to tqfind (optional.) If not given then * any object type will match. * @return Pointer to the object found; NULL if none found. */ diff --git a/umbrello/umbrello/umldoc.cpp b/umbrello/umbrello/umldoc.cpp index 4862193a..acc77eee 100644 --- a/umbrello/umbrello/umldoc.cpp +++ b/umbrello/umbrello/umldoc.cpp @@ -352,7 +352,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) { KIO::NetAccess::download( url, tmpfile, UMLApp::app() ); TQFile file( tmpfile ); if ( !file.exists() ) { - KMessageBox::error(0, i18n("The file %1 does not exist.").arg(d.path()), i18n("Load Error")); + KMessageBox::error(0, i18n("The file %1 does not exist.").tqarg(d.path()), i18n("Load Error")); m_doc_url.setFileName(i18n("Untitled")); m_bLoading = false; newDocument(); @@ -365,10 +365,10 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) { // check if the xmi file is a compressed archive like tar.bzip2 or tar.gz TQString filetype = m_doc_url.fileName(true); TQString mimetype = ""; - if (filetype.find(TQRegExp("\\.tgz$")) != -1) + if (filetype.tqfind(TQRegExp("\\.tgz$")) != -1) { mimetype = "application/x-gzip"; - } else if (filetype.find(TQRegExp("\\.tar.bz2$")) != -1) { + } else if (filetype.tqfind(TQRegExp("\\.tar.bz2$")) != -1) { mimetype = "application/x-bzip2"; } @@ -377,7 +377,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) { KTar archive(tmpfile, mimetype); if (archive.open(IO_ReadOnly) == false) { - KMessageBox::error(0, i18n("The file %1 seems to be corrupted.").arg(d.path()), i18n("Load Error")); + KMessageBox::error(0, i18n("The file %1 seems to be corrupted.").tqarg(d.path()), i18n("Load Error")); m_doc_url.setFileName(i18n("Untitled")); m_bLoading = false; newDocument(); @@ -419,7 +419,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) { entry = const_cast<KArchiveEntry*>(rootDir->entry(*it)); if (entry == 0) { - KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").arg(d.path()), i18n("Load Error")); + KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").tqarg(d.path()), i18n("Load Error")); m_doc_url.setFileName(i18n("Untitled")); m_bLoading = false; newDocument(); @@ -431,7 +431,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) { fileEntry = dynamic_cast<KArchiveFile*>(entry); if (fileEntry == 0) { - KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").arg(d.path()), i18n("Load Error")); + KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").tqarg(d.path()), i18n("Load Error")); m_doc_url.setFileName(i18n("Untitled")); m_bLoading = false; newDocument(); @@ -445,20 +445,20 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) { TQFile xmi_file(tmp_dir.name() + *it); if( !xmi_file.open( IO_ReadOnly ) ) { - KMessageBox::error(0, i18n("There was a problem loading the extracted file: %1").arg(d.path()), i18n("Load Error")); + KMessageBox::error(0, i18n("There was a problem loading the extracted file: %1").tqarg(d.path()), i18n("Load Error")); m_doc_url.setFileName(i18n("Untitled")); m_bLoading = false; newDocument(); return false; } - status = loadFromXMI( xmi_file, ENC_UNKNOWN ); + status = loadFromXMI( *TQT_TQIODEVICE(&xmi_file), ENC_UNKNOWN ); // close the extracted file and the temporary directory xmi_file.close(); tmp_dir.unlink(); } else { - KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").arg(d.path()), i18n("Load Error")); + KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.").tqarg(d.path()), i18n("Load Error")); m_doc_url.setFileName(i18n("Untitled")); m_bLoading = false; newDocument(); @@ -469,23 +469,23 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) { } else { // no, it seems to be an ordinary file if( !file.open( IO_ReadOnly ) ) { - KMessageBox::error(0, i18n("There was a problem loading file: %1").arg(d.path()), i18n("Load Error")); + KMessageBox::error(0, i18n("There was a problem loading file: %1").tqarg(d.path()), i18n("Load Error")); m_doc_url.setFileName(i18n("Untitled")); m_bLoading = false; newDocument(); return false; } if (filetype.endsWith(".mdl")) - status = Import_Rose::loadFromMDL(file); + status = Import_Rose::loadFromMDL(*TQT_TQIODEVICE(&file)); else - status = loadFromXMI( file, ENC_UNKNOWN ); + status = loadFromXMI( *TQT_TQIODEVICE(&file), ENC_UNKNOWN ); } file.close(); KIO::NetAccess::removeTempFile( tmpfile ); if( !status ) { - KMessageBox::error(0, i18n("There was a problem loading file: %1").arg(d.path()), i18n("Load Error")); + KMessageBox::error(0, i18n("There was a problem loading file: %1").tqarg(d.path()), i18n("Load Error")); m_bLoading = false; newDocument(); return false; @@ -553,7 +553,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) { // now check if we can write to the file if (archive->open(IO_WriteOnly) == false) { - KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error")); + KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(d.path()), i18n("Save Error")); return false; } @@ -562,27 +562,27 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) { KTempFile tmp_xmi_file; file.setName(tmp_xmi_file.name()); if( !file.open( IO_WriteOnly ) ) { - KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error")); + KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(d.path()), i18n("Save Error")); return false; } - saveToXMI(file); // save XMI to this file... + saveToXMI(*TQT_TQIODEVICE(&file)); // save XMI to this file... file.close(); // ...and close it // now add this file to the archive, but without the extension - TQString tmpQString = url.fileName(); + TQString tmpTQString = url.fileName(); if (fileFormat == "tgz") { - tmpQString.replace(TQRegExp("\\.tgz$"), ""); + tmpTQString.tqreplace(TQRegExp("\\.tgz$"), ""); } else { - tmpQString.replace(TQRegExp("\\.tar\\.bz2$"), ""); + tmpTQString.tqreplace(TQRegExp("\\.tar\\.bz2$"), ""); } - archive->addLocalFile(tmp_xmi_file.name(), tmpQString); + archive->addLocalFile(tmp_xmi_file.name(), tmpTQString); archive->close(); #if KDE_IS_VERSION(3,4,89) if (!archive->closeSucceeded()) { - KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error")); + KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(d.path()), i18n("Save Error")); return false; } #endif @@ -617,10 +617,10 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) { // lets open the file for writing if( !file.open( IO_WriteOnly ) ) { - KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error")); + KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(d.path()), i18n("Save Error")); return false; } - saveToXMI(file); // save the xmi stuff to it + saveToXMI(*TQT_TQIODEVICE(&file)); // save the xmi stuff to it file.close(); tmpfile.close(); @@ -630,7 +630,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) { } else { // now remove the original file if ( KIO::NetAccess::file_move( tmpfile.name(), d.path(), -1, true ) == false ) { - KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error")); + KMessageBox::error(0, i18n("There was a problem saving file: %1").tqarg(d.path()), i18n("Save Error")); m_doc_url.setFileName(i18n("Untitled")); return false; } @@ -638,7 +638,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) { } if( !uploaded ) { - KMessageBox::error(0, i18n("There was a problem uploading file: %1").arg(d.path()), i18n("Save Error")); + KMessageBox::error(0, i18n("There was a problem uploading file: %1").tqarg(d.path()), i18n("Save Error")); m_doc_url.setFileName(i18n("Untitled")); } setModified(false); @@ -733,19 +733,19 @@ bool UMLDoc::addUMLObject(UMLObject* object) { if (pkg == NULL) { pkg = currentRoot(); kDebug() << "UMLDoc::addUMLObject(" << object->getName() - << "): no parent package set, assuming " << pkg->getName() << endl; + << "): no tqparent package set, assuming " << pkg->getName() << endl; object->setUMLPackage( pkg ); } return pkg->addObject(object); } void UMLDoc::addStereotype(const UMLStereotype *s) { - if (! m_stereoList.contains(s)) + if (! m_stereoList.tqcontains(s)) m_stereoList.append(s); } void UMLDoc::removeStereotype(const UMLStereotype *s) { - if (m_stereoList.contains(s)) + if (m_stereoList.tqcontains(s)) m_stereoList.remove(s); } @@ -759,7 +759,7 @@ void UMLDoc::slotRemoveUMLObject(UMLObject* object) { UMLPackage *pkg = object->getUMLPackage(); if (pkg == NULL) { kError() << "UMLDoc::slotRemoveUMLObject(" << object->getName() - << "): parent package is not set !" << endl; + << "): tqparent package is not set !" << endl; return; } pkg->removeObject(object); @@ -769,10 +769,10 @@ bool UMLDoc::isUnique(const TQString &name) { UMLListView *listView = UMLApp::app()->getListView(); UMLListViewItem *currentItem = (UMLListViewItem*)listView->currentItem(); - UMLListViewItem *parentItem = 0; + UMLListViewItem *tqparentItem = 0; // check for current item, if its a package, then we do a check on that - // otherwise, if current item exists, find its parent and check if thats + // otherwise, if current item exists, find its tqparent and check if thats // a package.. if(currentItem) { @@ -780,18 +780,18 @@ bool UMLDoc::isUnique(const TQString &name) // do check now if (Model_Utils::typeIsContainer(currentItem->getType())) return isUnique (name, (UMLPackage*) currentItem->getUMLObject()); - parentItem = (UMLListViewItem*)currentItem->parent(); + tqparentItem = (UMLListViewItem*)currentItem->tqparent(); } // item is in a package so do check only in that - if (parentItem != NULL && Model_Utils::typeIsContainer(parentItem->getType())) { - UMLPackage *parentPkg = static_cast<UMLPackage*>(parentItem->getUMLObject()); - return isUnique(name, parentPkg); + if (tqparentItem != NULL && Model_Utils::typeIsContainer(tqparentItem->getType())) { + UMLPackage *tqparentPkg = static_cast<UMLPackage*>(tqparentItem->getUMLObject()); + return isUnique(name, tqparentPkg); } kError() << "UMLDoc::isUnique(" << name << "): Not currently in a package" << endl; - /* Check against all objects that _don't_ have a parent package. + /* Check against all objects that _don't_ have a tqparent package. for (UMLObjectListIt oit(m_objectList); oit.current(); ++oit) { UMLObject *obj = oit.current(); if (obj->getUMLPackage() == NULL && obj->getName() == name) @@ -810,7 +810,7 @@ bool UMLDoc::isUnique(const TQString &name, UMLPackage *package) // Not currently in a package: ERROR kError() << "UMLDoc::isUnique(2)(" << name << "): Not currently in a package" << endl; - /* Check against all objects that _don't_ have a parent package. + /* Check against all objects that _don't_ have a tqparent package. for (UMLObjectListIt oit(m_objectList); oit.current(); ++oit) { UMLObject *obj = oit.current(); if (obj->getUMLPackage() == NULL && obj->getName() == name) @@ -848,7 +848,7 @@ void UMLDoc::removeAssociation (UMLAssociation * assoc, bool doSetModified /*=tr UMLPackage *pkg = assoc->getUMLPackage(); if (pkg == NULL) { kError() << "UMLDoc::removeAssociation(" << assoc->getName() - << "): parent package is not set !" << endl; + << "): tqparent package is not set !" << endl; return; } pkg->removeObject(assoc); @@ -917,7 +917,7 @@ void UMLDoc::addAssociation(UMLAssociation *Assoc) UMLPackage *pkg = Assoc->getUMLPackage(); if (pkg == NULL) { kError() << "UMLDoc::addAssociation(" << Assoc->getName() - << "): parent package is not set !" << endl; + << "): tqparent package is not set !" << endl; return; } pkg->addObject(Assoc); @@ -1048,9 +1048,9 @@ void UMLDoc::renameUMLObject(UMLObject *o) { void UMLDoc::renameChildUMLObject(UMLObject *o) { bool ok = false; - UMLClassifier* p = dynamic_cast<UMLClassifier *>(o->parent()); + UMLClassifier* p = dynamic_cast<UMLClassifier *>(o->tqparent()); if(!p) { - kDebug() << "Can't create object, no parent found" << endl; + kDebug() << "Can't create object, no tqparent found" << endl; return; } @@ -1096,7 +1096,7 @@ void UMLDoc::removeDiagram(Uml::IDType id) { kError()<<"Request to remove diagram " << ID2STR(id) << ": Diagram not found!"<<endl; return; } - if (KMessageBox::warningContinueCancel(0, i18n("Are you sure you want to delete diagram %1?").arg(umlview->getName()), i18n("Delete Diagram"),KGuiItem( i18n("&Delete"), "editdelete")) == KMessageBox::Continue) { + if (KMessageBox::warningContinueCancel(0, i18n("Are you sure you want to delete diagram %1?").tqarg(umlview->getName()), i18n("Delete Diagram"),KGuiItem( i18n("&Delete"), "editdelete")) == KMessageBox::Continue) { removeView(umlview); emit sigDiagramRemoved(id); setModified(true); @@ -1134,25 +1134,25 @@ void UMLDoc::removeUMLObject(UMLObject* umlobject) { umlobject->setUMLStereotype(NULL); // triggers possible cleanup of UMLStereotype if (dynamic_cast<UMLClassifierListItem*>(umlobject)) { - UMLClassifier* parent = dynamic_cast<UMLClassifier*>(umlobject->parent()); - if (parent == NULL) { - kError() << "UMLDoc::removeUMLObject: parent of umlobject is NULL" + UMLClassifier* tqparent = dynamic_cast<UMLClassifier*>(umlobject->tqparent()); + if (tqparent == NULL) { + kError() << "UMLDoc::removeUMLObject: tqparent of umlobject is NULL" << endl; return; } if (type == ot_Operation) { - parent->removeOperation(static_cast<UMLOperation*>(umlobject)); + tqparent->removeOperation(static_cast<UMLOperation*>(umlobject)); } else if (type == ot_EnumLiteral) { - UMLEnum *e = static_cast<UMLEnum*>(parent); + UMLEnum *e = static_cast<UMLEnum*>(tqparent); e->removeEnumLiteral(static_cast<UMLEnumLiteral*>(umlobject)); } else if (type == ot_EntityAttribute) { - UMLEntity *ent = static_cast<UMLEntity*>(parent); + UMLEntity *ent = static_cast<UMLEntity*>(tqparent); ent->removeEntityAttribute(static_cast<UMLClassifierListItem*>(umlobject)); } else { - UMLClassifier* pClass = dynamic_cast<UMLClassifier*>(parent); + UMLClassifier* pClass = dynamic_cast<UMLClassifier*>(tqparent); if (pClass == NULL) { - kError() << "UMLDoc::removeUMLObject: parent of umlobject has " - << "unexpected type " << parent->getBaseType() << endl; + kError() << "UMLDoc::removeUMLObject: tqparent of umlobject has " + << "unexpected type " << tqparent->getBaseType() << endl; return; } if (type == ot_Attribute) { @@ -1174,7 +1174,7 @@ void UMLDoc::removeUMLObject(UMLObject* umlobject) { pkg->removeObject(umlobject); } else { kError() << "UMLDoc::removeUMLObject(" << umlobject->getName() - << "): parent package is not set !" << endl; + << "): tqparent package is not set !" << endl; } } emit sigObjectRemoved(umlobject); @@ -1213,7 +1213,7 @@ void UMLDoc::saveToXMI(TQIODevice& file) { TQDomElement root = doc.createElement( "XMI" ); root.setAttribute( "xmi.version", "1.2" ); - TQDateTime now = TQDateTime::currentDateTime(); + TQDateTime now = TQDateTime::tqcurrentDateTime(); root.setAttribute( "timestamp", now.toString(Qt::ISODate)); root.setAttribute( "verified", "false"); root.setAttribute( "xmlns:UML", "http://schema.omg.org/spec/UML/1.3"); @@ -1298,7 +1298,7 @@ void UMLDoc::saveToXMI(TQIODevice& file) { for (UMLStereotype *s = m_stereoList.first(); s; s = m_stereoList.next() ) { TQString stName = s->getName(); Uml::IDType stID = s->getID(); - if (!stereoNames.contains(stName) && !stereoIDs.contains(stID)) { + if (!stereoNames.tqcontains(stName) && !stereoIDs.tqcontains(stID)) { s->saveToXMI(doc, ownedNS); stereoNames.append(stName); stereoIDs.append(stID); @@ -1524,8 +1524,8 @@ bool UMLDoc::loadFromXMI( TQIODevice & file, short encode ) tagEq(tag, "Interface")) { // These tests are only for foreign XMI files that // are missing the <Model> tag (e.g. NSUML) - TQDomElement parentElem = node.toElement(); - if( !loadUMLObjectsFromXMI( parentElem ) ) { + TQDomElement tqparentElem = node.toElement(); + if( !loadUMLObjectsFromXMI( tqparentElem ) ) { kWarning() << "failed load on model objects" << endl; return false; } @@ -1693,7 +1693,7 @@ bool UMLDoc::loadUMLObjectsFromXMI(TQDomElement& element) { continue; } Uml::Object_Type ot = pObject->getBaseType(); - // Set the parent root folder. + // Set the tqparent root folder. UMLPackage *pkg = NULL; if (ot == Uml::ot_Datatype) { pkg = m_datatypeRoot; @@ -1839,7 +1839,7 @@ bool UMLDoc::loadDiagramsFromXMI( TQDomNode & node ) { return false; } // Put diagram in default predefined folder. - // @todo pass in the parent folder - it might be a user defined one. + // @todo pass in the tqparent folder - it might be a user defined one. Uml::Model_Type mt = Model_Utils::convert_DT_MT(pView->getType()); pView->setFolder(m_root[mt]); pView -> hide(); @@ -1915,7 +1915,7 @@ void UMLDoc::print(KPrinter * pPrinter) { for(int i = 0;i < count;i++) { if(i>0) pPrinter -> newPage(); - TQString diagram = i18n("kde-uml-Diagram") + TQString("%1").arg(i); + TQString diagram = i18n("kde-uml-Diagram") + TQString("%1").tqarg(i); TQString sID = pPrinter -> option(diagram); Uml::IDType id = STR2ID(sID); printView = findView(id); @@ -2101,7 +2101,7 @@ void UMLDoc::slotAutoSave() { } KURL tempURL = m_doc_url; if( tempURL.fileName() == i18n("Untitled") ) { - tempURL.setPath( TQDir::homeDirPath() + i18n("/autosave%1").arg(".xmi") ); + tempURL.setPath( TQDir::homeDirPath() + i18n("/autosave%1").tqarg(".xmi") ); saveDocument( tempURL ); m_doc_url.setFileName( i18n("Untitled") ); m_modified = true; @@ -2113,7 +2113,7 @@ void UMLDoc::slotAutoSave() { // don't overwrite manually saved file with autosave content TQString fileName = tempURL.fileName(); Settings::OptionState optionState = Settings::getOptionState(); - fileName.replace( ".xmi", optionState.generalState.autosavesuffix ); + fileName.tqreplace( ".xmi", optionState.generalState.autosavesuffix ); tempURL.setFileName( fileName ); // End Achim Spangler @@ -2148,7 +2148,7 @@ void UMLDoc::addToUndoStack() { buffer->open(IO_WriteOnly); TQDataStream* undoData = new TQDataStream(); undoData->setDevice(buffer); - saveToXMI(*buffer); + saveToXMI(*TQT_TQIODEVICE(buffer)); buffer->close(); undoStack.prepend(undoData); @@ -2196,7 +2196,7 @@ void UMLDoc::loadUndoData() { TQDataStream* undoData = undoStack.getFirst(); TQBuffer* buffer = static_cast<TQBuffer*>( undoData->device() ); buffer->open(IO_ReadOnly); - loadFromXMI(*buffer); + loadFromXMI(*TQT_TQIODEVICE(buffer)); buffer->close(); setModified(true, false); @@ -2235,7 +2235,7 @@ void UMLDoc::loadRedoData() { redoStack.removeFirst(); TQBuffer* buffer = static_cast<TQBuffer*>( redoData->device() ); buffer->open(IO_ReadOnly); - loadFromXMI(*buffer); + loadFromXMI(*TQT_TQIODEVICE(buffer)); buffer->close(); setModified(true, false); diff --git a/umbrello/umbrello/umldoc.h b/umbrello/umbrello/umldoc.h index 7a982e0f..ad62c698 100644 --- a/umbrello/umbrello/umldoc.h +++ b/umbrello/umbrello/umldoc.h @@ -76,6 +76,7 @@ class UMLFolder; */ class UMLDoc : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Constructor for the fileclass of the application @@ -212,7 +213,7 @@ public: bool isUnique(const TQString &name, UMLPackage *package); /** - * Finds or creates a stereotype for the parent object. + * Finds or creates a stereotype for the tqparent object. */ UMLStereotype* findOrCreateStereotype(const TQString &name); @@ -329,7 +330,7 @@ public: * Used to find a @ref UMLObject by its type and name. * * @param name The name of the @ref UMLObject to find. - * @param type Object_Type of the object to find (optional.) + * @param type Object_Type of the object to tqfind (optional.) * When the given type is ot_UMLObject the type is * disregarded, i.e. the given name is the only * search criterion. diff --git a/umbrello/umbrello/umllistview.cpp b/umbrello/umbrello/umllistview.cpp index f213c01d..b9644aa9 100644 --- a/umbrello/umbrello/umllistview.cpp +++ b/umbrello/umbrello/umllistview.cpp @@ -63,10 +63,10 @@ #include "dialogs/umltemplatedialog.h" #ifdef WANT_LVTOOLTIP -class LVToolTip : public QToolTip +class LVToolTip : public TQToolTip { public: - LVToolTip (TQWidget* parent) : TQToolTip (parent) {} + LVToolTip (TQWidget* tqparent) : TQToolTip (tqparent) {} virtual ~LVToolTip () {} protected: /** @@ -86,26 +86,26 @@ protected: return; UMLOperation *op = static_cast<UMLOperation*>(obj); TQString text = op->toString(Uml::st_ShowSig); - TQRect rect = lv->itemRect(item); + TQRect rect = lv->tqitemRect(item); tip(rect, text); } }; #endif -UMLListView::UMLListView(TQWidget *parent, const char *name) - : KListView(parent,name), m_pMenu(0), m_doc(UMLApp::app()->getDocument()) +UMLListView::UMLListView(TQWidget *tqparent, const char *name) + : KListView(tqparent,name), m_pMenu(0), m_doc(UMLApp::app()->getDocument()) { loadPixmaps(); //setup list view - setBackgroundColor(Qt::white); + setBackgroundColor(TQt::white); setAcceptDrops(true); setDropVisualizer(false); setItemsMovable(true); setItemsRenameable( true ); setSelectionModeExt(FileManager); - setFocusPolicy(TQWidget::StrongFocus); + setFocusPolicy(TQ_StrongFocus); setDragEnabled(true); setColumnWidthMode( 0, Manual ); setDefaultRenameAction( Accept ); @@ -144,7 +144,7 @@ UMLListView::~UMLListView() {} bool UMLListView::eventFilter(TQObject *o, TQEvent *e) { if (e->type() != TQEvent::MouseButtonPress || !o->isA(TQHEADER_OBJECT_NAME_STRING)) return TQListView::eventFilter(o, e); - TQMouseEvent *me = static_cast<TQMouseEvent*>(e); + TQMouseEvent *me = TQT_TQMOUSEEVENT(e); if (me->button() == Qt::RightButton) { if (m_pMenu) { m_pMenu->hide(); @@ -163,11 +163,11 @@ void UMLListView::contentsMousePressEvent(TQMouseEvent *me) { UMLView *currentView = UMLApp::app()->getCurrentView(); if (currentView) currentView->clearSelected(); - if( me -> state() != Qt::ShiftButton ) + if( me -> state() != TQt::ShiftButton ) clearSelection(); TQPoint pt = this->TQScrollView::contentsToViewport( me->pos() ); UMLListViewItem * item = (UMLListViewItem*)itemAt(pt); - const Qt::ButtonState button = me->button(); + const TQt::ButtonState button = me->button(); if (!item || (button != Qt::RightButton && button != Qt::LeftButton)) { UMLApp::app()->getDocWindow()->updateDocumentation(true); @@ -223,7 +223,7 @@ void UMLListView::keyPressEvent(TQKeyEvent *ke) { ke->accept(); // munge and do nothing } else { const int k = ke->key(); - if (k == Qt::Key_Delete || k == Qt::Key_Backspace) { + if (k == TQt::Key_Delete || k == TQt::Key_Backspace) { // delete every selected item UMLListViewItemList selecteditems; getSelectedItemsRoot(selecteditems); @@ -232,7 +232,7 @@ void UMLListView::keyPressEvent(TQKeyEvent *ke) { deleteItem(dynamic_cast<UMLListViewItem*>(item)); } } else { - TQListView::keyPressEvent(ke); // let parent handle it + TQListView::keyPressEvent(ke); // let tqparent handle it } } } @@ -349,7 +349,7 @@ void UMLListView::popupMenuSel(int sel) { fileDialog.setOperationMode(KFileDialog::Other); // set a sensible default filename TQString defaultFilename = current->getText().lower(); - defaultFilename.replace(TQRegExp("\\W+"), "_"); + defaultFilename.tqreplace(TQRegExp("\\W+"), "_"); defaultFilename.append(".xml"); // default extension fileDialog.setSelection(defaultFilename); fileDialog.exec(); @@ -381,7 +381,7 @@ void UMLListView::popupMenuSel(int sel) { file.close(); } else { KMessageBox::error(0, - i18n("There was a problem saving file: %1").arg(fileName), + i18n("There was a problem saving file: %1").tqarg(fileName), i18n("Save Error")); return; } @@ -402,7 +402,7 @@ void UMLListView::popupMenuSel(int sel) { kError() << "UMLListView::popupMenuSel: modelFolder is NULL" << endl; return; } - modelFolder->setFolderFile(TQString::null); + modelFolder->setFolderFile(TQString()); // Recompute text of the folder TQString folderText = current->getText(); folderText.remove( TQRegExp("\\s*\\(.*$") ); @@ -573,7 +573,7 @@ void UMLListView::slotDiagramCreated( Uml::IDType id ) { } UMLListViewItem* UMLListView::determineParentItem(UMLObject* object) const { - UMLListViewItem* parentItem = NULL; + UMLListViewItem* tqparentItem = NULL; UMLListViewItem* current = (UMLListViewItem*) currentItem(); Uml::ListView_Type lvt = Uml::lvt_Unknown; if (current) @@ -600,26 +600,26 @@ UMLListViewItem* UMLListView::determineParentItem(UMLObject* object) const { if (pkg) { UMLListViewItem* pkgItem = findUMLObject(pkg); if (pkgItem == NULL) - kError() << "UMLListView::determineParentItem: could not find " - << "parent package " << pkg->getName() << endl; + kError() << "UMLListView::determineParentItem: could not tqfind " + << "tqparent package " << pkg->getName() << endl; else - parentItem = pkgItem; + tqparentItem = pkgItem; } else if ((lvt == Uml::lvt_UseCase_Folder && (t == Uml::ot_Actor || t == Uml::ot_UseCase)) || (lvt == Uml::lvt_Component_Folder && t == Uml::ot_Component) || (lvt == Uml::lvt_Deployment_Folder && t == Uml::ot_Node) || (lvt == Uml::lvt_EntityRelationship_Folder && t == Uml::ot_Entity)) { - parentItem = current; + tqparentItem = current; } else if (t == Uml::ot_Datatype) { - parentItem = m_datatypeFolder; + tqparentItem = m_datatypeFolder; } else { Uml::Model_Type guess = Model_Utils::guessContainer(object); - parentItem = m_lv[guess]; + tqparentItem = m_lv[guess]; } } break; } - return parentItem; + return tqparentItem; } bool UMLListView::mayHaveChildItems(Uml::Object_Type type) { @@ -653,8 +653,8 @@ void UMLListView::slotObjectCreated(UMLObject* object) { newItem->setIcon(icon); return; } - UMLListViewItem* parentItem = determineParentItem(object); - if (parentItem == NULL) + UMLListViewItem* tqparentItem = determineParentItem(object); + if (tqparentItem == NULL) return; Uml::Object_Type type = object->getBaseType(); @@ -667,7 +667,7 @@ void UMLListView::slotObjectCreated(UMLObject* object) { if (!folderFile.isEmpty()) name.append(" (" + folderFile + ')'); } - newItem = new UMLListViewItem(parentItem, name, lvt, object); + newItem = new UMLListViewItem(tqparentItem, name, lvt, object); if (mayHaveChildItems(type)) { UMLClassifier *c = static_cast<UMLClassifier*>(object); UMLClassifierListItemList cListItems = c->getFilteredList(Uml::ot_UMLObject); @@ -764,30 +764,30 @@ void UMLListView::slotObjectChanged() { } void UMLListView::childObjectAdded(UMLClassifierListItem* obj) { - UMLClassifier *parent = const_cast<UMLClassifier*>(dynamic_cast<const UMLClassifier*>(sender())); - childObjectAdded(obj, parent); + UMLClassifier *tqparent = const_cast<UMLClassifier*>(dynamic_cast<const UMLClassifier*>(sender())); + childObjectAdded(obj, tqparent); } -void UMLListView::childObjectAdded(UMLClassifierListItem* child, UMLClassifier* parent) { +void UMLListView::childObjectAdded(UMLClassifierListItem* child, UMLClassifier* tqparent) { if (m_bCreatingChildObject) return; const TQString text = child->toString(Uml::st_SigNoVis); UMLListViewItem *childItem = NULL; - UMLListViewItem *parentItem = findUMLObject(parent); - if (parentItem == NULL) { + UMLListViewItem *tqparentItem = findUMLObject(tqparent); + if (tqparentItem == NULL) { kDebug() << "UMLListView::childObjectAdded(" << child->getName() - << "): parent " << parent->getName() + << "): tqparent " << tqparent->getName() << " does not yet exist, creating it now." << endl; - const Uml::ListView_Type lvt = Model_Utils::convert_OT_LVT(parent); - parentItem = new UMLListViewItem(m_lv[Uml::mt_Logical], parent->getName(), lvt, parent); + const Uml::ListView_Type lvt = Model_Utils::convert_OT_LVT(tqparent); + tqparentItem = new UMLListViewItem(m_lv[Uml::mt_Logical], tqparent->getName(), lvt, tqparent); } else { - childItem = parentItem->findChildObject(child); + childItem = tqparentItem->findChildObject(child); } if (childItem) { childItem->setText(text); } else { const Uml::ListView_Type lvt = Model_Utils::convert_OT_LVT(child); - childItem = new UMLListViewItem(parentItem, text, lvt, child); + childItem = new UMLListViewItem(tqparentItem, text, lvt, child); if (! m_doc->loading()) { ensureItemVisible(childItem); clearSelection(); @@ -798,14 +798,14 @@ void UMLListView::childObjectAdded(UMLClassifierListItem* child, UMLClassifier* } void UMLListView::childObjectRemoved(UMLClassifierListItem* obj) { - UMLClassifier *parent = const_cast<UMLClassifier*>(dynamic_cast<const UMLClassifier*>(sender())); - UMLListViewItem *parentItem = findUMLObject(parent); - if (parentItem == NULL) { + UMLClassifier *tqparent = const_cast<UMLClassifier*>(dynamic_cast<const UMLClassifier*>(sender())); + UMLListViewItem *tqparentItem = findUMLObject(tqparent); + if (tqparentItem == NULL) { kError() << "UMLListView::childObjectRemoved(" << obj->getName() - << "): cannot find parent UMLListViewItem" << endl; + << "): cannot find tqparent UMLListViewItem" << endl; return; } - parentItem->deleteChildItem(obj); + tqparentItem->deleteChildItem(obj); } void UMLListView::slotDiagramRenamed(Uml::IDType id) { @@ -1065,7 +1065,7 @@ void UMLListView::contentsMouseDoubleClickEvent(TQMouseEvent * me) { Uml::Object_Type type = object -> getBaseType(); int page = ClassPropDlg::page_gen; if(type == Uml::ot_Attribute || type == Uml::ot_Operation) - object = (UMLObject *)object -> parent(); + object = (UMLObject *)object -> tqparent(); //set what page to show if(type == Uml::ot_Attribute) page = ClassPropDlg::page_att; @@ -1222,12 +1222,12 @@ bool UMLListView::acceptDrag(TQDropEvent* event) const { return accept; } -void UMLListView::addAtContainer(UMLListViewItem *item, UMLListViewItem *parent) { +void UMLListView::addAtContainer(UMLListViewItem *item, UMLListViewItem *tqparent) { UMLCanvasObject *o = static_cast<UMLCanvasObject*>(item->getUMLObject()); if (o == NULL) { kDebug() << "UMLListView::addAtContainer(" << item->getText() << "): item's UMLObject is NULL" << endl; - } else if (Model_Utils::typeIsContainer(parent->getType())) { + } else if (Model_Utils::typeIsContainer(tqparent->getType())) { /**** TBC: Do this here? If yes then remove that logic at the callers and rename this method to moveAtContainer() @@ -1235,12 +1235,12 @@ void UMLListView::addAtContainer(UMLListViewItem *item, UMLListViewItem *parent) if (oldPkg) oldPkg->removeObject(o); *********/ - UMLPackage *pkg = static_cast<UMLPackage*>(parent->getUMLObject()); + UMLPackage *pkg = static_cast<UMLPackage*>(tqparent->getUMLObject()); o->setUMLPackage(pkg); pkg->addObject(o); } else { kError() << "UMLListView::addAtContainer(" << item->getText() - << "): parent type is " << parent->getType() << endl; + << "): tqparent type is " << tqparent->getType() << endl; } UMLView *currentView = UMLApp::app()->getCurrentView(); if (currentView) @@ -1256,7 +1256,7 @@ UMLListViewItem * UMLListView::moveObject(Uml::IDType srcId, Uml::ListView_Type return NULL; UMLObject *newParentObj = NULL; - // Remove the source object at the old parent package. + // Remove the source object at the old tqparent package. UMLObject *srcObj = m_doc->findObjectById(srcId); if (srcObj) { newParentObj = newParent->getUMLObject(); @@ -1422,14 +1422,14 @@ UMLListViewItem * UMLListView::moveObject(Uml::IDType srcId, Uml::ListView_Type // update model objects m_bCreatingChildObject = true; - UMLClassifier *oldParentClassifier = dynamic_cast<UMLClassifier*>(srcObj->parent()); + UMLClassifier *oldParentClassifier = dynamic_cast<UMLClassifier*>(srcObj->tqparent()); UMLClassifier *newParentClassifier = dynamic_cast<UMLClassifier*>(newParentObj); if (srcType == Uml::lvt_Attribute) { UMLAttribute *att = dynamic_cast<UMLAttribute*>(srcObj); // We can't use the existing 'att' directly - // because its parent is fixed to the old classifier + // because its tqparent is fixed to the old classifier // and we have no way of changing that: - // TQObject does not permit changing the parent(). + // TQObject does not permit changing the tqparent(). if (att == NULL) { kError() << "moveObject internal error: srcObj " << srcObj->getName() << " is not a UMLAttribute" << endl; @@ -1454,9 +1454,9 @@ UMLListViewItem * UMLListView::moveObject(Uml::IDType srcId, Uml::ListView_Type } else { UMLOperation *op = dynamic_cast<UMLOperation*>(srcObj); // We can't use the existing 'op' directly - // because its parent is fixed to the old classifier + // because its tqparent is fixed to the old classifier // and we have no way of changing that: - // TQObject does not permit changing the parent(). + // TQObject does not permit changing the tqparent(). if (op && oldParentClassifier->takeItem(op) != -1) { bool isExistingOp; Model_Utils::NameAndType_List ntDummyList; @@ -1502,7 +1502,7 @@ UMLListViewItem * UMLListView::moveObject(Uml::IDType srcId, Uml::ListView_Type return newItem; } -void UMLListView::slotDropped(TQDropEvent* de, TQListViewItem* /* parent */, TQListViewItem* item) { +void UMLListView::slotDropped(TQDropEvent* de, TQListViewItem* /* tqparent */, TQListViewItem* item) { item = (UMLListViewItem *)currentItem(); if(!item) { kDebug() << "UMLListView::slotDropped: item is NULL - doing nothing" << endl; @@ -1545,10 +1545,10 @@ int UMLListView::getSelectedItemsRoot(UMLListViewItemList &ItemList) { for ( ; it.current(); ++it ) { if ( it.current()->isSelected() ) { UMLListViewItem *item = (UMLListViewItem*)it.current(); - // this is the trick, we select only the item with a parent unselected - // since we can't select a child and its grandfather without its parent + // this is the trick, we select only the item with a tqparent unselected + // since we can't select a child and its grandfather without its tqparent // we would be able to delete each item individually, without an invalid iterator - if (item && item->parent() && item->parent()->isSelected()==false) { + if (item && item->tqparent() && item->tqparent()->isSelected()==false) { ItemList.append(item); } } @@ -1560,37 +1560,37 @@ int UMLListView::getSelectedItemsRoot(UMLListViewItemList &ItemList) { UMLListViewItem* UMLListView::createDiagramItem(UMLView *v) { Uml::ListView_Type lvt = Model_Utils::convert_DT_LVT(v->getType()); - UMLListViewItem *parent = NULL; + UMLListViewItem *tqparent = NULL; UMLFolder *f = v->getFolder(); if (f) { - parent = findUMLObject(f); - if (parent == NULL) + tqparent = findUMLObject(f); + if (tqparent == NULL) kError() << "UMLListView::createDiagramItem(" << v->getName() << "): findUMLObject(" << f->getName() << ") returns NULL" << endl; } else { kDebug() << "UMLListView::createDiagramItem(" << v->getName() - << "): no parent folder set, using predefined folder" << endl; + << "): no tqparent folder set, using predefined folder" << endl; } - if (parent == NULL) { - parent = determineParentItem(lvt); + if (tqparent == NULL) { + tqparent = determineParentItem(lvt); lvt = Model_Utils::convert_DT_LVT(v->getType()); } - UMLListViewItem *item = new UMLListViewItem(parent, v->getName(), lvt, v->getID()); + UMLListViewItem *item = new UMLListViewItem(tqparent, v->getName(), lvt, v->getID()); return item; } /** Creates a new UMLListViewItem from a UMLListViewItem, - if parent is null the ListView Decides who is going to be - the parent */ + if tqparent is null the ListView Decides who is going to be + the tqparent */ UMLListViewItem* UMLListView::createItem(UMLListViewItem& Data, IDChangeLog& IDChanges, - UMLListViewItem* parent /*= 0*/) { + UMLListViewItem* tqparent /*= 0*/) { UMLObject* pObject = 0; UMLListViewItem* item = 0; Uml::ListView_Type lvt = Data.getType(); - if(!parent) { - parent = determineParentItem(lvt); - if (!parent) + if(!tqparent) { + tqparent = determineParentItem(lvt); + if (!tqparent) return 0; } @@ -1618,13 +1618,13 @@ UMLListViewItem* UMLListView::createItem(UMLListViewItem& Data, IDChangeLog& IDC //it could exist an Item already asocciated if the user chose to reuse an uml object if(!(item = findItem(newID))) { pObject = m_doc->findObjectById( IDChanges.findNewID(Data.getID()) ); - item = new UMLListViewItem(parent, Data.getText(), lvt, pObject); + item = new UMLListViewItem(tqparent, Data.getText(), lvt, pObject); } ***/ pObject = m_doc->findObjectById( Data.getID() ); - item = new UMLListViewItem(parent, Data.getText(), lvt, pObject); + item = new UMLListViewItem(tqparent, Data.getText(), lvt, pObject); break; case Uml::lvt_Datatype_Folder: - item = new UMLListViewItem(parent, Data.getText(), lvt); + item = new UMLListViewItem(tqparent, Data.getText(), lvt); break; case Uml::lvt_Attribute: case Uml::lvt_EntityAttribute: @@ -1632,11 +1632,11 @@ UMLListViewItem* UMLListView::createItem(UMLListViewItem& Data, IDChangeLog& IDC case Uml::lvt_Template: case Uml::lvt_EnumLiteral: { - UMLClassifier *pClass = static_cast<UMLClassifier*>(parent->getUMLObject()); + UMLClassifier *pClass = static_cast<UMLClassifier*>(tqparent->getUMLObject()); Uml::IDType newID = IDChanges.findNewID( Data.getID() ); pObject = pClass->findChildObjectById(newID); if (pObject) { - item = new UMLListViewItem( parent, Data.getText(), lvt, pObject ); + item = new UMLListViewItem( tqparent, Data.getText(), lvt, pObject ); } else { item = 0; } @@ -1658,7 +1658,7 @@ UMLListViewItem* UMLListView::createItem(UMLListViewItem& Data, IDChangeLog& IDC return NULL; } const Uml::ListView_Type lvt = Model_Utils::convert_DT_LVT(v->getType()); - item = new UMLListViewItem(parent, v->getName(), lvt, newID); + item = new UMLListViewItem(tqparent, v->getName(), lvt, newID); } break; default: @@ -1669,36 +1669,36 @@ UMLListViewItem* UMLListView::createItem(UMLListViewItem& Data, IDChangeLog& IDC } UMLListViewItem* UMLListView::determineParentItem(Uml::ListView_Type lvt) const { - UMLListViewItem* parent = 0; + UMLListViewItem* tqparent = 0; switch (lvt) { case Uml::lvt_Datatype: - parent = m_datatypeFolder; + tqparent = m_datatypeFolder; break; case Uml::lvt_Actor: case Uml::lvt_UseCase: case Uml::lvt_UseCase_Folder: case Uml::lvt_UseCase_Diagram: - parent = m_lv[Uml::mt_UseCase]; + tqparent = m_lv[Uml::mt_UseCase]; break; case Uml::lvt_Component_Diagram: case Uml::lvt_Component: case Uml::lvt_Artifact: - parent = m_lv[Uml::mt_Component]; + tqparent = m_lv[Uml::mt_Component]; break; case Uml::lvt_Deployment_Diagram: case Uml::lvt_Node: - parent = m_lv[Uml::mt_Deployment]; + tqparent = m_lv[Uml::mt_Deployment]; break; case Uml::lvt_EntityRelationship_Diagram: case Uml::lvt_Entity: - parent = m_lv[Uml::mt_EntityRelationship]; + tqparent = m_lv[Uml::mt_EntityRelationship]; break; default: if (Model_Utils::typeIsDiagram(lvt) || !Model_Utils::typeIsClassifierList(lvt)) - parent = m_lv[Uml::mt_Logical]; + tqparent = m_lv[Uml::mt_Logical]; break; } - return parent; + return tqparent; } int UMLListView::getSelectedCount() { @@ -1715,12 +1715,11 @@ int UMLListView::getSelectedCount() { } void UMLListView::focusOutEvent ( TQFocusEvent * fe) { - TQFocusEvent::Reason reason = fe->reason(); - if (reason != TQFocusEvent::Popup) { + if (fe->reason() != TQFocusEvent::Popup) { clearSelection(); triggerUpdate(); } - //repaint(); + //tqrepaint(); TQListView::focusOutEvent(fe); } @@ -1738,9 +1737,9 @@ Uml::ListView_Type UMLListView::rootViewType(UMLListViewItem *item) { return Uml::lvt_Deployment_View; if (item == m_lv[Uml::mt_EntityRelationship]) return Uml::lvt_EntityRelationship_Model; - UMLListViewItem *parent = dynamic_cast<UMLListViewItem*>(item->parent()); - if (parent) - return rootViewType(parent); + UMLListViewItem *tqparent = dynamic_cast<UMLListViewItem*>(item->tqparent()); + if (tqparent) + return rootViewType(tqparent); return Uml::lvt_Unknown; } @@ -1843,13 +1842,13 @@ void UMLListView::slotCutSuccessful() { } } -void UMLListView::addNewItem(UMLListViewItem *parentItem, Uml::ListView_Type type) { +void UMLListView::addNewItem(UMLListViewItem *tqparentItem, Uml::ListView_Type type) { if (type == Uml::lvt_Datatype) { - parentItem = m_datatypeFolder; + tqparentItem = m_datatypeFolder; } UMLListViewItem * newItem = NULL; - parentItem->setOpen( true ); + tqparentItem->setOpen( true ); Uml::Icon_Type icon = Model_Utils::convert_LVT_IT(type); @@ -1857,7 +1856,7 @@ void UMLListView::addNewItem(UMLListViewItem *parentItem, Uml::ListView_Type typ if (Model_Utils::typeIsDiagram(type)) { Uml::Diagram_Type dt = Model_Utils::convert_LVT_DT(type); name = getUniqueDiagramName(dt); - newItem = new UMLListViewItem(parentItem, name, type, Uml::id_None); + newItem = new UMLListViewItem(tqparentItem, name, type, Uml::id_None); } else { Uml::Object_Type ot = Model_Utils::convert_LVT_OT(type); if (ot == Uml::ot_UMLObject) { @@ -1865,20 +1864,20 @@ void UMLListView::addNewItem(UMLListViewItem *parentItem, Uml::ListView_Type typ << type << endl; return; } - UMLPackage *parentPkg = - dynamic_cast<UMLPackage*>(parentItem->getUMLObject()); - if (parentPkg == NULL) { + UMLPackage *tqparentPkg = + dynamic_cast<UMLPackage*>(tqparentItem->getUMLObject()); + if (tqparentPkg == NULL) { kError() << "UMLListView::addNewItem(type " << type - << "): parentPkg is NULL" << endl; + << "): tqparentPkg is NULL" << endl; return; } if (Model_Utils::typeIsClassifierList(type)) { - UMLClassifier *parent = static_cast<UMLClassifier*>(parentPkg); - name = parent->uniqChildName(ot); + UMLClassifier *tqparent = static_cast<UMLClassifier*>(tqparentPkg); + name = tqparent->uniqChildName(ot); } else { - name = Model_Utils::uniqObjectName(ot, parentPkg); + name = Model_Utils::uniqObjectName(ot, tqparentPkg); } - newItem = new UMLListViewItem(parentItem, name, type, (UMLObject*)0); + newItem = new UMLListViewItem(tqparentItem, name, type, (UMLObject*)0); } m_bIgnoreCancelRename = false; newItem->setIcon( icon ); @@ -1901,7 +1900,7 @@ bool UMLListView::itemRenamed( TQListViewItem * item , int /*col*/ ) { renamedItem -> setCreating( false ); // If the type is empty then delete it. - if (newText.isEmpty() || newText.contains(TQRegExp("^\\s+$"))) { + if (newText.isEmpty() || newText.tqcontains(TQRegExp("^\\s+$"))) { KMessageBox::error( kapp -> mainWidget(), i18n( "The name you entered was invalid.\nCreation process has been canceled." ), @@ -2074,15 +2073,15 @@ UMLObject *UMLListView::createUMLObject( UMLListViewItem * item, Uml::Object_Typ return NULL; } - UMLListViewItem * parentItem = static_cast<UMLListViewItem *>(item->parent()); - const Uml::ListView_Type lvt = parentItem->getType(); + UMLListViewItem * tqparentItem = static_cast<UMLListViewItem *>(item->tqparent()); + const Uml::ListView_Type lvt = tqparentItem->getType(); if (! Model_Utils::typeIsContainer(lvt)) { kError() << "UMLListView::createUMLObject(" << object->getName() - << "): parentItem (" << lvt << " is not a container" << endl; + << "): tqparentItem (" << lvt << " is not a container" << endl; delete object; return NULL; } - UMLPackage *pkg = static_cast<UMLPackage*>(parentItem->getUMLObject()); + UMLPackage *pkg = static_cast<UMLPackage*>(tqparentItem->getUMLObject()); object->setUMLPackage(pkg); pkg->addObject(object); connectNewObjectsSlots(object); @@ -2094,9 +2093,9 @@ UMLObject *UMLListView::createUMLObject( UMLListViewItem * item, Uml::Object_Typ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type type ) { m_bCreatingChildObject = true; TQString text = item->text( 0 ); - UMLObject* parent = static_cast<UMLListViewItem *>( item->parent() )->getUMLObject(); - if( !parent ) { - kError() << "UMLListView::createChildUMLObject: parent UMLObject is NULL" << endl; + UMLObject* tqparent = static_cast<UMLListViewItem *>( item->tqparent() )->getUMLObject(); + if( !tqparent ) { + kError() << "UMLListView::createChildUMLObject: tqparent UMLObject is NULL" << endl; m_bCreatingChildObject = false; return false; } @@ -2104,15 +2103,15 @@ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type //kDebug() << "UMLListView::createChildUMLObject (" << text << ")" << endl; UMLObject* newObject = NULL; if ( type == Uml::ot_EnumLiteral ) { - UMLEnum *owningEnum = static_cast<UMLEnum*>(parent); + UMLEnum *owningEnum = static_cast<UMLEnum*>(tqparent); newObject = owningEnum->createEnumLiteral(text); UMLEnumLiteral* enumLiteral = static_cast<UMLEnumLiteral*>(newObject); text = enumLiteral->toString(Uml::st_SigNoVis); } else if ( type == Uml::ot_Template ) { - UMLClassifier *owningClassifier = static_cast<UMLClassifier*>(parent); + UMLClassifier *owningClassifier = static_cast<UMLClassifier*>(tqparent); Model_Utils::NameAndType nt; - Model_Utils::Parse_Status st = Model_Utils::parseTemplate(text, nt, owningClassifier); + Model_Utils::Parse_tqStatus st = Model_Utils::parseTemplate(text, nt, owningClassifier); if (st) { KMessageBox::error( kapp->mainWidget(), Model_Utils::psText(st), @@ -2125,10 +2124,10 @@ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type tmplParm->setType(nt.m_type); text = tmplParm->toString(Uml::st_SigNoVis); } else if (type == Uml::ot_Attribute || type == Uml::ot_EntityAttribute) { - UMLClassifier *owningClass = static_cast<UMLClassifier*>(parent); + UMLClassifier *owningClass = static_cast<UMLClassifier*>(tqparent); Model_Utils::NameAndType nt; Uml::Visibility vis; - Model_Utils::Parse_Status st; + Model_Utils::Parse_tqStatus st; st = Model_Utils::parseAttribute(text, nt, owningClass, &vis); if (st) { KMessageBox::error( kapp->mainWidget(), @@ -2142,9 +2141,9 @@ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type att->setParmKind(nt.m_direction); text = att->toString(Uml::st_SigNoVis); } else if ( type == Uml::ot_Operation ) { - UMLClassifier *owningClassifier = static_cast<UMLClassifier*>(parent); + UMLClassifier *owningClassifier = static_cast<UMLClassifier*>(tqparent); Model_Utils::OpDescriptor od; - Model_Utils::Parse_Status st = Model_Utils::parseOperation(text, od, owningClassifier); + Model_Utils::Parse_tqStatus st = Model_Utils::parseOperation(text, od, owningClassifier); if (st) { KMessageBox::error( kapp->mainWidget(), Model_Utils::psText(st), @@ -2181,9 +2180,9 @@ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type item->setText( text ); ensureItemVisible(item); - // as it's a ClassifierListItem add it to the childObjectMap of the parent + // as it's a ClassifierListItem add it to the childObjectMap of the tqparent UMLClassifierListItem* classifierListItem = static_cast<UMLClassifierListItem*>( newObject ); - static_cast<UMLListViewItem*>( item->parent() )->addClassifierListItem(classifierListItem, item ); + static_cast<UMLListViewItem*>( item->tqparent() )->addClassifierListItem(classifierListItem, item ); m_bCreatingChildObject = false; @@ -2199,15 +2198,15 @@ void UMLListView::createDiagram( UMLListViewItem * item, Uml::Diagram_Type type delete item; return; } - UMLListViewItem *parentItem = static_cast<UMLListViewItem*>(item->parent()); - UMLFolder *parentFolder = dynamic_cast<UMLFolder*>(parentItem->getUMLObject()); - if (parentFolder == NULL) { + UMLListViewItem *tqparentItem = static_cast<UMLListViewItem*>(item->tqparent()); + UMLFolder *tqparentFolder = dynamic_cast<UMLFolder*>(tqparentItem->getUMLObject()); + if (tqparentFolder == NULL) { kError() << "UMLListView::createDiagram(" << name - << "): parent UMLObject is not a UMLFolder" << endl; + << "): tqparent UMLObject is not a UMLFolder" << endl; delete item; return; } - view = new UMLView(parentFolder); + view = new UMLView(tqparentFolder); view->setName( name ); view->setType( type ); view->setID( UniqueID::gen() ); @@ -2224,7 +2223,7 @@ TQString UMLListView::getUniqueDiagramName(Uml::Diagram_Type type) { } bool UMLListView::isUnique( UMLListViewItem * item, const TQString &name ) { - UMLListViewItem * parentItem = static_cast<UMLListViewItem *>( item -> parent() ); + UMLListViewItem * tqparentItem = static_cast<UMLListViewItem *>( item -> tqparent() ); Uml::ListView_Type type = item -> getType(); switch( type ) { case Uml::lvt_Class_Diagram: @@ -2284,13 +2283,13 @@ bool UMLListView::isUnique( UMLListViewItem * item, const TQString &name ) { case Uml::lvt_Deployment_Folder: case Uml::lvt_EntityRelationship_Folder: { - Uml::ListView_Type lvt = parentItem->getType(); + Uml::ListView_Type lvt = tqparentItem->getType(); if (!Model_Utils::typeIsContainer(lvt)) return (m_doc->findUMLObject(name) == NULL); - UMLPackage *pkg = static_cast<UMLPackage*>(parentItem->getUMLObject()); + UMLPackage *pkg = static_cast<UMLPackage*>(tqparentItem->getUMLObject()); if (pkg == NULL) { kError() << "UMLListView::isUnique: internal error - " - << "parent listviewitem is package but has no UMLObject" << endl; + << "tqparent listviewitem is package but has no UMLObject" << endl; return true; } return (pkg->findObject(name) == NULL); @@ -2303,8 +2302,8 @@ bool UMLListView::isUnique( UMLListViewItem * item, const TQString &name ) { case Uml::lvt_Operation: case Uml::lvt_EnumLiteral: { - UMLClassifier *parent = static_cast<UMLClassifier*>(parentItem->getUMLObject()); - return (parent->findChildObject(name) == NULL); + UMLClassifier *tqparent = static_cast<UMLClassifier*>(tqparentItem->getUMLObject()); + return (tqparent->findChildObject(name) == NULL); break; } @@ -2356,7 +2355,7 @@ bool UMLListView::loadFromXMI( TQDomElement & element ) { return true; } -bool UMLListView::loadChildrenFromXMI( UMLListViewItem * parent, TQDomElement & element ) { +bool UMLListView::loadChildrenFromXMI( UMLListViewItem * tqparent, TQDomElement & element ) { TQDomNode node = element.firstChild(); TQDomElement domElement = node.toElement(); const TQString pfx("UMLListView::loadChildrenFromXMI: "); @@ -2379,7 +2378,7 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * parent, TQDomElement & UMLListViewItem * item = 0; if (nID != Uml::id_None) { // The following is an ad hoc hack for the copy/paste code. - // The clip still contains the old children although new + // The clip still contains the old tqchildren although new // UMLCLassifierListItems have already been created. // If the IDChangeLog finds new IDs this means we are in // copy/paste and need to adjust the child listitems to the @@ -2401,19 +2400,19 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * parent, TQDomElement & label = pObject->getName(); } else if (Model_Utils::typeIsFolder(lvType)) { // Synthesize the UMLFolder here - UMLObject *umlParent = parent->getUMLObject(); - UMLPackage *parentPkg = dynamic_cast<UMLPackage*>(umlParent); - if (parentPkg == NULL) { + UMLObject *umlParent = tqparent->getUMLObject(); + UMLPackage *tqparentPkg = dynamic_cast<UMLPackage*>(umlParent); + if (tqparentPkg == NULL) { kError() << pfx << "umlParent(" << umlParent << ") is not a UMLPackage" << endl; domElement = node.toElement(); continue; } UMLFolder *f = new UMLFolder(label, nID); - f->setUMLPackage(parentPkg); - parentPkg->addObject(f); + f->setUMLPackage(tqparentPkg); + tqparentPkg->addObject(f); pObject = f; - item = new UMLListViewItem(parent, label, lvType, pObject); + item = new UMLListViewItem(tqparent, label, lvType, pObject); // Moving all relevant UMLObjects to the new UMLFolder is done below, // in the switch(lvType) } @@ -2455,7 +2454,7 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * parent, TQDomElement & << "findItem(id " << ID2STR(nID) << ") returns NULL" << endl; /* if (pObject && pObject->getUMLPackage() && - parent->getType() != Uml::lvt_Package) { + tqparent->getType() != Uml::lvt_Package) { // Pre-1.2 file format: // Objects were not nested in their packages. // Synthesize the nesting here. @@ -2464,17 +2463,17 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * parent, TQDomElement & if (pkgItem == NULL) { kDebug() << pfx << "synthesizing ListViewItem for package " << ID2STR(umlpkg->getID()) << endl; - pkgItem = new UMLListViewItem(parent, umlpkg->getName(), + pkgItem = new UMLListViewItem(tqparent, umlpkg->getName(), Uml::lvt_Package, umlpkg); pkgItem->setOpen(true); } item = new UMLListViewItem(pkgItem, label, lvType, pObject); } else { - item = new UMLListViewItem(parent, label, lvType, pObject); + item = new UMLListViewItem(tqparent, label, lvType, pObject); } */ } - else if (parent != item->parent()) { + else if (tqparent != item->tqparent()) { // The existing item was created by the slot event triggered // by the loading of the corresponding model object from the // XMI file. @@ -2482,23 +2481,23 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * parent, TQDomElement & // of foreign XMI files that do not have the umbrello specific // <listview> tag. // However, now that we encountered the real <listview> info, - // we need to delete the existing item: Its parent is always + // we need to delete the existing item: Its tqparent is always // one of the default predefined folders, but the actual // listview item might be located in a user created folder. // Thanks to Achim Spangler for spotting the problem. - UMLListViewItem *itmParent = dynamic_cast<UMLListViewItem*>(item->parent()); - kDebug() << pfx << item->getText() << " parent " - << parent->getText() << " (" << parent << ") != " + UMLListViewItem *itmParent = dynamic_cast<UMLListViewItem*>(item->tqparent()); + kDebug() << pfx << item->getText() << " tqparent " + << tqparent->getText() << " (" << tqparent << ") != " << itmParent->getText() << " (" << itmParent << ")" << endl; if (item == m_datatypeFolder && itmParent == m_lv[Uml::mt_Logical]) { - kDebug() << pfx << "Reparenting the Datatypes folder is prohibited" << endl; + kDebug() << pfx << "Retqparenting the Datatypes folder is prohibited" << endl; } else { - UMLListViewItem *newItem = moveObject(nID, lvType, parent); + UMLListViewItem *newItem = moveObject(nID, lvType, tqparent); item = newItem; if (item) { kDebug() << pfx << "Attempted reparenting of " << item->getText() - << "(current parent: " << (itmParent ? itmParent->getText() : "NULL") - << ", new parent: " << parent->getText() << ")" << endl; + << "(current tqparent: " << (itmParent ? itmParent->getText() : "NULL") + << ", new tqparent: " << tqparent->getText() << ")" << endl; } } } @@ -2512,9 +2511,9 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * parent, TQDomElement & if (item == NULL) { kDebug() << pfx << "item " << ID2STR(nID) << " (of type " << lvType << ") does not yet exist..." << endl; - UMLObject* umlObject = parent->getUMLObject(); + UMLObject* umlObject = tqparent->getUMLObject(); if (!umlObject) { - kDebug() << "And also the parent->getUMLObject() does not exist" << endl; + kDebug() << "And also the tqparent->getUMLObject() does not exist" << endl; return false; } if (nID == Uml::id_None) { @@ -2526,7 +2525,7 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * parent, TQDomElement & if (umlObject) { connectNewObjectsSlots(umlObject); label = umlObject->getName(); - item = new UMLListViewItem( parent, label, lvType, umlObject); + item = new UMLListViewItem( tqparent, label, lvType, umlObject); } else { kDebug() << pfx << "lvtype " << lvType << " child object " << ID2STR(nID) << " not found" << endl; @@ -2557,7 +2556,7 @@ bool UMLListView::loadChildrenFromXMI( UMLListViewItem * parent, TQDomElement & break; default: if (Model_Utils::typeIsDiagram(lvType)) { - item = new UMLListViewItem( parent, label, lvType, nID ); + item = new UMLListViewItem( tqparent, label, lvType, nID ); } else { kError() << pfx << "INTERNAL ERROR: unexpected listview type " << lvType << " (ID " << ID2STR(nID) << ")" << endl; @@ -2635,14 +2634,14 @@ UMLListViewItem *UMLListView::rootView(Uml::ListView_Type type) { return theView; } -void UMLListView::deleteChildrenOf(TQListViewItem* parent) { - if ( !parent ) { +void UMLListView::deleteChildrenOf(TQListViewItem* tqparent) { + if ( !tqparent ) { return; } - if (parent == m_lv[Uml::mt_Logical]) + if (tqparent == m_lv[Uml::mt_Logical]) m_datatypeFolder = NULL; - while ( parent->firstChild() ) { - delete parent->firstChild(); + while ( tqparent->firstChild() ) { + delete tqparent->firstChild(); } } @@ -2687,7 +2686,7 @@ bool UMLListView::deleteItem(UMLListViewItem *temp) { } if (object) { m_doc->removeUMLObject(object); - // Physical deletion of `temp' will be done by Qt signal, see + // Physical deletion of `temp' will be done by TQt signal, see // UMLDoc::removeUMLObject() } else { delete temp; diff --git a/umbrello/umbrello/umllistview.h b/umbrello/umbrello/umllistview.h index ae9b3172..3420c1f4 100644 --- a/umbrello/umbrello/umllistview.h +++ b/umbrello/umbrello/umllistview.h @@ -43,15 +43,16 @@ class UMLClassifierListItem; class UMLListView : public KListView { Q_OBJECT + TQ_OBJECT public: /** * Constructs the tree view. * - * @param parent The parent to this. + * @param tqparent The tqparent to this. * @param name The internal name for this class. */ - UMLListView(TQWidget *parent,const char *name); + UMLListView(TQWidget *tqparent,const char *name); /** * Standard deconstructor. @@ -87,7 +88,7 @@ public: int getSelectedItems(UMLListViewItemList &ItemList); /** - * Get selected items, but only root elements selected (without children). + * Get selected items, but only root elements selected (without tqchildren). * * @param ItemList List of UMLListViewItems returned. * @return The number of selected items. @@ -105,41 +106,41 @@ public: * CHECK - This is perhaps redundant since the * UMLListViewItemData => UMLListViewItem merge. * Creates a new UMLListViewItem from a UMLListViewItem, if - * parent is null the ListView Decides who is going to be the - * parent + * tqparent is null the ListView Decides who is going to be the + * tqparent */ UMLListViewItem* createItem(UMLListViewItem& Data, IDChangeLog& IDChanges, - UMLListViewItem* parent = 0); + UMLListViewItem* tqparent = 0); /** - * Find the parent folder for a diagram. + * Find the tqparent folder for a diagram. * If the currently selected item in the list view is a folder - * then that folder is returned as the parent. + * then that folder is returned as the tqparent. * * @param dt The Diagram_Type of the diagram. * The type will only be used if there is no currently * selected item, or if the current item is not a folder. * In that case the root folder which is suitable for the * Diagram_Type is returned. - * @return Pointer to the parent UMLListViewItem for the diagram. + * @return Pointer to the tqparent UMLListViewItem for the diagram. */ UMLListViewItem *findFolderForDiagram(Uml::Diagram_Type dt); /** - * Determine the parent ListViewItem given an UMLObject. + * Determine the tqparent ListViewItem given an UMLObject. * - * @param object Pointer to the UMLObject for which to look up the parent. - * @return Pointer to the parent UMLListViewItem chosen. - * Returns NULL on error (no parent could be determined.) + * @param object Pointer to the UMLObject for which to look up the tqparent. + * @return Pointer to the tqparent UMLListViewItem chosen. + * Returns NULL on error (no tqparent could be determined.) */ UMLListViewItem* determineParentItem(UMLObject* object) const; /** - * Determine the parent ListViewItem given a ListView_Type. - * This parent is used for creating new UMLListViewItems. + * Determine the tqparent ListViewItem given a ListView_Type. + * This tqparent is used for creating new UMLListViewItems. * - * @param lvt The ListView_Type for which to lookup the parent. - * @return Pointer to the parent UMLListViewItem chosen. + * @param lvt The ListView_Type for which to lookup the tqparent. + * @return Pointer to the tqparent UMLListViewItem chosen. */ UMLListViewItem* determineParentItem(Uml::ListView_Type lvt) const; @@ -168,11 +169,11 @@ public: } /** - * Adds a new item to the tree of the given type under the given parent. + * Adds a new item to the tree of the given type under the given tqparent. * Method will take care of signalling anyone needed on creation of new item. * e.g. UMLDoc if an UMLObject is created. */ - void addNewItem(UMLListViewItem * parent, Uml::ListView_Type type); + void addNewItem(UMLListViewItem * tqparent, Uml::ListView_Type type); /** * Find an UMLObject in the listview. @@ -259,7 +260,7 @@ public: /** * Moves an object given is unique ID and listview type to an - * other listview parent item. + * other listview tqparent item. * Also takes care of the corresponding move in the model. */ UMLListViewItem * moveObject(Uml::IDType srcId, Uml::ListView_Type srcType, @@ -285,7 +286,7 @@ public: * predefined root views (Root, Logical, UseCase, Component, * Deployment, EntityRelationship.) Returns the ListView_Type * of the matching root view; if no match then continues the - * search using the item's parent, then grandparent, and so forth. + * search using the item's tqparent, then grandtqparent, and so forth. * Returns Uml::lvt_Unknown if no match at all is found. */ Uml::ListView_Type rootViewType(UMLListViewItem *item); @@ -294,7 +295,7 @@ public: bool loadFromXMI( TQDomElement & element ); - bool loadChildrenFromXMI( UMLListViewItem * parent, TQDomElement & element ); + bool loadChildrenFromXMI( UMLListViewItem * tqparent, TQDomElement & element ); protected: UMLListViewItem* m_rv; // root view (home) @@ -342,9 +343,9 @@ protected: void loadPixmaps(); /** - * Deletes all child-items of @p parent. + * Deletes all child-items of @p tqparent. */ - void deleteChildrenOf( TQListViewItem *parent ); + void deleteChildrenOf( TQListViewItem *tqparent ); /** * Delete a listview item. @@ -356,18 +357,18 @@ protected: /** * Adds a new operation, attribute or template item to a classifier, identical to - * childObjectAdded(obj) but with an explicit parent. + * childObjectAdded(obj) but with an explicit tqparent. * @param child the child object - * @param parent the parent object + * @param tqparent the tqparent object */ - void childObjectAdded(UMLClassifierListItem* child, UMLClassifier* parent); + void childObjectAdded(UMLClassifierListItem* child, UMLClassifier* tqparent); /** * Auxiliary method for moveObject(): Adds the model object at the proper * new container (package if nested, UMLDoc if at global level), and * updates the containment relationships in the model. */ - void addAtContainer(UMLListViewItem *item, UMLListViewItem *parent); + void addAtContainer(UMLListViewItem *item, UMLListViewItem *tqparent); public slots: @@ -432,7 +433,7 @@ public slots: /** * Something has been dragged and dropped onto the list view */ - void slotDropped(TQDropEvent* de, TQListViewItem* parent, TQListViewItem* item); + void slotDropped(TQDropEvent* de, TQListViewItem* tqparent, TQListViewItem* item); /** * calls updateFolder() on the item to update the icon to open diff --git a/umbrello/umbrello/umllistviewitem.cpp b/umbrello/umbrello/umllistviewitem.cpp index 89bb581c..2c81fc0f 100644 --- a/umbrello/umbrello/umllistviewitem.cpp +++ b/umbrello/umbrello/umllistviewitem.cpp @@ -39,10 +39,10 @@ UMLListView* UMLListViewItem::s_pListView = 0; -UMLListViewItem::UMLListViewItem( UMLListView * parent, const TQString &name, +UMLListViewItem::UMLListViewItem( UMLListView * tqparent, const TQString &name, Uml::ListView_Type t, UMLObject* o) - : TQListViewItem(parent, name) { - init(parent); + : TQListViewItem(tqparent, name) { + init(tqparent); m_Type = t; m_pObject = o; if (o) @@ -52,20 +52,20 @@ UMLListViewItem::UMLListViewItem( UMLListView * parent, const TQString &name, setRenameEnabled( 0, false ); } -UMLListViewItem::UMLListViewItem(UMLListView * parent) - : TQListViewItem(parent) { - init(parent); - if (parent == NULL) - kDebug() << "UMLListViewItem constructor called with a NULL listview parent" << endl; +UMLListViewItem::UMLListViewItem(UMLListView * tqparent) + : TQListViewItem(tqparent) { + init(tqparent); + if (tqparent == NULL) + kDebug() << "UMLListViewItem constructor called with a NULL listview tqparent" << endl; } -UMLListViewItem::UMLListViewItem(UMLListViewItem * parent) - : TQListViewItem(parent) { +UMLListViewItem::UMLListViewItem(UMLListViewItem * tqparent) + : TQListViewItem(tqparent) { init(); } -UMLListViewItem::UMLListViewItem(UMLListViewItem * parent, const TQString &name, Uml::ListView_Type t,UMLObject*o) - : TQListViewItem(parent, name) { +UMLListViewItem::UMLListViewItem(UMLListViewItem * tqparent, const TQString &name, Uml::ListView_Type t,UMLObject*o) + : TQListViewItem(tqparent, name) { init(); m_Type = t; m_pObject = o; @@ -75,7 +75,7 @@ UMLListViewItem::UMLListViewItem(UMLListViewItem * parent, const TQString &name, } else { UMLClassifierListItem *umlchild = dynamic_cast<UMLClassifierListItem*>(o); if (umlchild) - parent->addClassifierListItem(umlchild, this); + tqparent->addClassifierListItem(umlchild, this); updateObject(); m_nId = o->getID(); } @@ -83,8 +83,8 @@ UMLListViewItem::UMLListViewItem(UMLListViewItem * parent, const TQString &name, setText( name ); } -UMLListViewItem::UMLListViewItem(UMLListViewItem * parent, const TQString &name, Uml::ListView_Type t,Uml::IDType id) - : TQListViewItem(parent, name) { +UMLListViewItem::UMLListViewItem(UMLListViewItem * tqparent, const TQString &name, Uml::ListView_Type t,Uml::IDType id) + : TQListViewItem(tqparent, name) { init(); m_Type = t; m_nId = id; @@ -127,16 +127,16 @@ UMLListViewItem::UMLListViewItem(UMLListViewItem * parent, const TQString &name, UMLListViewItem::~UMLListViewItem() {} -void UMLListViewItem::init(UMLListView * parent) { +void UMLListViewItem::init(UMLListView * tqparent) { m_Type = Uml::lvt_Unknown; m_bCreating = false; m_pObject = NULL; m_nId = Uml::id_None; m_nChildren = 0; - if (s_pListView == NULL && parent != NULL) { + if (s_pListView == NULL && tqparent != NULL) { kDebug() << "UMLListViewItem::init: s_pListView still NULL, setting it now " << endl; - s_pListView = parent; + s_pListView = tqparent; } } @@ -182,7 +182,7 @@ bool UMLListViewItem::isOwnParent(Uml::IDType listViewItemID) { << ID2STR(listViewItemID) << ") returns NULL" << endl; return true; } - for (TQListViewItem *self = (TQListViewItem*)this; self; self = self->parent()) { + for (TQListViewItem *self = (TQListViewItem*)this; self; self = self->tqparent()) { if (lvi == self) return true; } @@ -331,9 +331,9 @@ void UMLListViewItem::okRename( int col ) { return; } UMLOperation *op = static_cast<UMLOperation*>(m_pObject); - UMLClassifier *parent = static_cast<UMLClassifier *>( op -> parent() ); + UMLClassifier *tqparent = static_cast<UMLClassifier *>( op -> tqparent() ); Model_Utils::OpDescriptor od; - Model_Utils::Parse_Status st = Model_Utils::parseOperation(newText, od, parent); + Model_Utils::Parse_tqStatus st = Model_Utils::parseOperation(newText, od, tqparent); if (st == Model_Utils::PS_OK) { // TODO: Check that no operation with the exact same profile exists. op->setName( od.m_name ); @@ -382,13 +382,13 @@ void UMLListViewItem::okRename( int col ) { cancelRenameWithMsg(); return; } - UMLClassifier *parent = static_cast<UMLClassifier*>(m_pObject->parent()); + UMLClassifier *tqparent = static_cast<UMLClassifier*>(m_pObject->tqparent()); Model_Utils::NameAndType nt; Uml::Visibility vis; - Model_Utils::Parse_Status st; - st = Model_Utils::parseAttribute(newText, nt, parent, &vis); + Model_Utils::Parse_tqStatus st; + st = Model_Utils::parseAttribute(newText, nt, tqparent, &vis); if (st == Model_Utils::PS_OK) { - UMLObject *exists = parent->findChildObject(newText); + UMLObject *exists = tqparent->findChildObject(newText); if (exists) { cancelRenameWithMsg(); return; @@ -415,11 +415,11 @@ void UMLListViewItem::okRename( int col ) { cancelRenameWithMsg(); return; } - UMLClassifier *parent = static_cast<UMLClassifier*>(m_pObject->parent()); + UMLClassifier *tqparent = static_cast<UMLClassifier*>(m_pObject->tqparent()); Model_Utils::NameAndType nt; - Model_Utils::Parse_Status st = Model_Utils::parseTemplate(newText, nt, parent); + Model_Utils::Parse_tqStatus st = Model_Utils::parseTemplate(newText, nt, tqparent); if (st == Model_Utils::PS_OK) { - UMLObject *exists = parent->findChildObject(newText); + UMLObject *exists = tqparent->findChildObject(newText); if (exists) { cancelRenameWithMsg(); return; @@ -465,7 +465,7 @@ void UMLListViewItem::okRename( int col ) { } default: KMessageBox::error( kapp->mainWidget() , - i18n("Renaming an item of listview type %1 is not yet implemented.").arg(m_Type), + i18n("Renaming an item of listview type %1 is not yet implemented.").tqarg(m_Type), i18n("Function Not Implemented") ); TQListViewItem::setText(0, m_Label); break; @@ -521,8 +521,8 @@ int UMLListViewItem::compare(TQListViewItem *other, int col, bool ascending) con #endif return retval; } - UMLClassifier *ourParent = dynamic_cast<UMLClassifier*>(m_pObject->parent()); - UMLClassifier *otherParent = dynamic_cast<UMLClassifier*>(otherObj->parent()); + UMLClassifier *ourParent = dynamic_cast<UMLClassifier*>(m_pObject->tqparent()); + UMLClassifier *otherParent = dynamic_cast<UMLClassifier*>(otherObj->tqparent()); if (ourParent == NULL) { retval = (subItem ? 1 : alphaOrder); #ifdef DEBUG_LVITEM_INSERTION_ORDER @@ -561,8 +561,8 @@ int UMLListViewItem::compare(TQListViewItem *other, int col, bool ascending) con return retval; } UMLClassifierListItemList items = ourParent->getFilteredList(thisUmlItem->getBaseType()); - int myIndex = items.findRef(thisUmlItem); - int otherIndex = items.findRef(otherUmlItem); + int myIndex = items.tqfindRef(thisUmlItem); + int otherIndex = items.tqfindRef(otherUmlItem); if (myIndex < 0) { retval = (subItem ? -1 : alphaOrder); kError() << dbgPfx << retval << " because (myIndex < 0)" << endl; @@ -607,7 +607,7 @@ UMLListViewItem* UMLListViewItem::findUMLObject(const UMLObject *o) { } UMLListViewItem* UMLListViewItem::findChildObject(UMLClassifierListItem *cli) { - ChildObjectMap::iterator it = m_comap.find(cli); + ChildObjectMap::iterator it = m_comap.tqfind(cli); if (it != m_comap.end()) { return *it; } diff --git a/umbrello/umbrello/umllistviewitem.h b/umbrello/umbrello/umllistviewitem.h index 1064befc..105b751e 100644 --- a/umbrello/umbrello/umllistviewitem.h +++ b/umbrello/umbrello/umllistviewitem.h @@ -38,46 +38,46 @@ public: /** * Sets up an instance. * - * @param parent The parent to this instance. + * @param tqparent The tqparent to this instance. * @param name The name of this instance. * @param t The type of this instance. * @param o The object it represents. */ - UMLListViewItem(UMLListView * parent, const TQString &name, Uml::ListView_Type t, UMLObject*o=0); + UMLListViewItem(UMLListView * tqparent, const TQString &name, Uml::ListView_Type t, UMLObject*o=0); /** * Sets up an instance for subsequent loadFromXMI(). * - * @param parent The parent to this instance. + * @param tqparent The tqparent to this instance. */ - UMLListViewItem(UMLListView * parent); + UMLListViewItem(UMLListView * tqparent); /** * Sets up an instance for subsequent loadFromXMI(). * - * @param parent The parent to this instance. + * @param tqparent The tqparent to this instance. */ - UMLListViewItem(UMLListViewItem * parent); + UMLListViewItem(UMLListViewItem * tqparent); /** * Sets up an instance. * - * @param parent The parent to this instance. + * @param tqparent The tqparent to this instance. * @param name The name of this instance. * @param t The type of this instance. * @param o The object it represents. */ - UMLListViewItem(UMLListViewItem * parent, const TQString &name, Uml::ListView_Type t, UMLObject*o=0); + UMLListViewItem(UMLListViewItem * tqparent, const TQString &name, Uml::ListView_Type t, UMLObject*o=0); /** * Sets up an instance. * - * @param parent The parent to this instance. + * @param tqparent The tqparent to this instance. * @param name The name of this instance. * @param t The type of this instance. * @param id The id of this instance. */ - UMLListViewItem(UMLListViewItem * parent, const TQString &name, Uml::ListView_Type t, Uml::IDType id); + UMLListViewItem(UMLListViewItem * tqparent, const TQString &name, Uml::ListView_Type t, Uml::IDType id); /** * Standard deconstructor. @@ -126,7 +126,7 @@ public: } /** - * Returns true if the UMLListViewItem of the given ID is a parent of + * Returns true if the UMLListViewItem of the given ID is a tqparent of * this UMLListViewItem. */ bool isOwnParent(Uml::IDType listViewItemID); @@ -190,7 +190,7 @@ public: virtual int compare(TQListViewItem *other, int col, bool ascending) const; /** - * Returns the number of children of the UMLListViewItem + * Returns the number of tqchildren of the UMLListViewItem * containing this object */ int childCount() const { @@ -199,7 +199,7 @@ public: /** * Create a deep copy of this UMLListViewItem, but using the - * given parent instead of the parent of this UMLListViewItem. + * given tqparent instead of the tqparent of this UMLListViewItem. * Return the new UMLListViewItem created. */ UMLListViewItem* deepCopy(UMLListViewItem *newParent); @@ -213,7 +213,7 @@ public: /** * Find the UMLListViewItem that represents the given UMLClassifierListItem - * in the children of the current UMLListViewItem. (Only makes sense if + * in the tqchildren of the current UMLListViewItem. (Only makes sense if * the current UMLListViewItem represents a UMLClassifier.) * Return a pointer to the item or NULL if not found. */ @@ -243,7 +243,7 @@ protected: /** * Initializes key variables of the class. */ - void init(UMLListView * parent = 0); + void init(UMLListView * tqparent = 0); /** * This function is called if the user presses Enter during in-place renaming diff --git a/umbrello/umbrello/umlnamespace.cpp b/umbrello/umbrello/umlnamespace.cpp index 45c40de6..391b0560 100644 --- a/umbrello/umbrello/umlnamespace.cpp +++ b/umbrello/umbrello/umlnamespace.cpp @@ -18,7 +18,7 @@ bool tagEq (const TQString& inTag, const TQString& inPattern) { TQString tag = inTag; TQString pattern = inPattern; tag.remove( TQRegExp("^\\w+:") ); // remove leading "UML:" or other - int patSections = pattern.contains( '.' ) + 1; + int patSections = pattern.tqcontains( '.' ) + 1; TQString tagEnd = tag.section( '.', -patSections ); return (tagEnd.lower() == pattern.lower()); } diff --git a/umbrello/umbrello/umlobject.cpp b/umbrello/umbrello/umlobject.cpp index 85de579f..776847d4 100644 --- a/umbrello/umbrello/umlobject.cpp +++ b/umbrello/umbrello/umlobject.cpp @@ -30,8 +30,8 @@ #include "docwindow.h" #include "dialogs/classpropdlg.h" -UMLObject::UMLObject(const UMLObject * parent, const TQString &name, Uml::IDType id) - : TQObject(const_cast<UMLObject*>(parent), "UMLObject" ) { +UMLObject::UMLObject(const UMLObject * tqparent, const TQString &name, Uml::IDType id) + : TQObject(const_cast<UMLObject*>(tqparent), "UMLObject" ) { init(); if (id == Uml::id_None) m_nId = UniqueID::gen(); @@ -50,8 +50,8 @@ UMLObject::UMLObject(const TQString &name, Uml::IDType id) m_Name = name; } -UMLObject::UMLObject(const UMLObject * parent) - : TQObject(const_cast<UMLObject*>(parent)) { +UMLObject::UMLObject(const UMLObject * tqparent) + : TQObject(const_cast<UMLObject*>(tqparent)) { init(); } @@ -200,9 +200,9 @@ void UMLObject::copyInto(UMLObject *rhs) const // Create a new ID. rhs->m_nId = UniqueID::gen(); - // Hope that the parent from TQObject is okay. - if (rhs->parent() != parent()) - kDebug() << "copyInto has a wrong parent" << endl; + // Hope that the tqparent from TQObject is okay. + if (rhs->tqparent() != tqparent()) + kDebug() << "copyInto has a wrong tqparent" << endl; } @@ -343,7 +343,7 @@ TQString UMLObject::getPackage(const TQString& separator, bool includeRoot) { if (tempSeparator.isEmpty()) tempSeparator = UMLApp::app()->activeLanguageScopeSeparator(); TQString fqn = getFullyQualifiedName(tempSeparator, includeRoot); - if (!fqn.contains(tempSeparator)) + if (!fqn.tqcontains(tempSeparator)) return ""; TQString scope = fqn.left(fqn.length() - tempSeparator.length() - m_Name.length()); return scope; @@ -448,7 +448,7 @@ bool UMLObject::resolveRef() { } // Work around Object_Factory::createUMLObject()'s incapability // of on-the-fly scope creation: - if (m_SecondaryId.contains("::")) { + if (m_SecondaryId.tqcontains("::")) { // TODO: Merge Import_Utils::createUMLObject() into Object_Factory::createUMLObject() m_pSecondary = Import_Utils::createUMLObject(Uml::ot_UMLObject, m_SecondaryId, m_pUMLPackage); if (m_pSecondary) { @@ -472,8 +472,8 @@ bool UMLObject::resolveRef() { // This is very C++ specific - we rely on some '*' or // '&' to decide it's a ref type. Plus, we don't recognize // typedefs of ref types. - bool isReferenceType = ( m_SecondaryId.contains('*') || - m_SecondaryId.contains('&') ); + bool isReferenceType = ( m_SecondaryId.tqcontains('*') || + m_SecondaryId.tqcontains('&') ); Uml::Object_Type ot = Uml::ot_Class; if (isReferenceType) { ot = Uml::ot_Datatype; @@ -721,15 +721,15 @@ bool UMLObject::loadFromXMI( TQDomElement & element) { m_BaseType != Uml::ot_Template && m_BaseType != Uml::ot_Stereotype && m_BaseType != Uml::ot_Role) { if (m_bInPaste) { - m_pUMLPackage = NULL; // forget any old parent + m_pUMLPackage = NULL; // forget any old tqparent UMLListView *listView = UMLApp::app()->getListView(); - UMLListViewItem *parentItem = (UMLListViewItem*)listView->currentItem(); - if (parentItem) { - Uml::ListView_Type lvt = parentItem->getType(); + UMLListViewItem *tqparentItem = (UMLListViewItem*)listView->currentItem(); + if (tqparentItem) { + Uml::ListView_Type lvt = tqparentItem->getType(); if (Model_Utils::typeIsContainer(lvt) || lvt == Uml::lvt_Class || lvt == Uml::lvt_Interface) { - UMLObject *o = parentItem->getUMLObject(); + UMLObject *o = tqparentItem->getUMLObject(); m_pUMLPackage = static_cast<UMLPackage*>( o ); } } diff --git a/umbrello/umbrello/umlobject.h b/umbrello/umbrello/umlobject.h index 56475807..727ec1d9 100644 --- a/umbrello/umbrello/umlobject.h +++ b/umbrello/umbrello/umlobject.h @@ -35,24 +35,25 @@ class UMLObject; */ class UMLObject : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Creates a UMLObject. * - * @param parent The parent of the object. + * @param tqparent The tqparent of the object. * @param name The name of the object. * @param id The ID of the object (optional.) If omitted * then a new ID will be assigned internally. */ - UMLObject(const UMLObject * parent, const TQString &name, Uml::IDType id = Uml::id_None); + UMLObject(const UMLObject * tqparent, const TQString &name, Uml::IDType id = Uml::id_None); /** * Creates a UMLObject. * - * @param parent The parent of the object. + * @param tqparent The tqparent of the object. */ - UMLObject(const UMLObject * parent); + UMLObject(const UMLObject * tqparent); /** * Creates a UMLObject with a given name and unique ID. @@ -196,7 +197,7 @@ public: * Default: false. * @return The UMLObject's enclosing package(s) as a text. */ - TQString getPackage(const TQString& separator = TQString::null, + TQString getPackage(const TQString& separator = TQString(), bool includeRoot = false); /** @@ -242,7 +243,7 @@ public: * See UMLDoc::getRootFolder(). Default: false. * @return The fully qualified name of this UMLObject. */ - virtual TQString getFullyQualifiedName(const TQString& separator = TQString::null, + virtual TQString getFullyQualifiedName(const TQString& separator = TQString(), bool includeRoot = false) const; /** @@ -378,7 +379,7 @@ public slots: signals: /** Emitted when the UMLObject has changed. Note that some objects emit - * this signal when one of its children changes, for example, a UMLClass + * this signal when one of its tqchildren changes, for example, a UMLClass * emits a modified() signal when one of its operation changes while the Operation * itself emits the corresponding signal as well. */ diff --git a/umbrello/umbrello/umlrole.cpp b/umbrello/umbrello/umlrole.cpp index ca33dffb..5543415f 100644 --- a/umbrello/umbrello/umlrole.cpp +++ b/umbrello/umbrello/umlrole.cpp @@ -23,10 +23,10 @@ // constructor -UMLRole::UMLRole(UMLAssociation * parent, UMLObject * parentObj, Uml::Role_Type role) - : UMLObject(const_cast<UMLAssociation*>(parent)) +UMLRole::UMLRole(UMLAssociation * tqparent, UMLObject * tqparentObj, Uml::Role_Type role) + : UMLObject(const_cast<UMLAssociation*>(tqparent)) { - init(parent, parentObj, role); + init(tqparent, tqparentObj, role); } UMLRole::~UMLRole() { } @@ -59,9 +59,9 @@ TQString UMLRole::getMultiplicity() const { } void UMLRole::setObject (UMLObject *obj) { - // because we will get the id of this role from the parent + // because we will get the id of this role from the tqparent // object, we CANT allow UMLRoles to take other UMLRoles as - // parent objects. In fact, there is probably good reason + // tqparent objects. In fact, there is probably good reason // to only take UMLClassifiers here, but I'll leave it more open // for the time being. -b.t. if (obj && dynamic_cast<UMLRole*>(obj)) { @@ -88,17 +88,17 @@ Uml::Role_Type UMLRole::getRole() { return m_role; } -void UMLRole::init(UMLAssociation * parent, UMLObject * parentObj, Uml::Role_Type r) { +void UMLRole::init(UMLAssociation * tqparent, UMLObject * tqparentObj, Uml::Role_Type r) { m_BaseType = Uml::ot_Role; m_role = r; - m_pAssoc = parent; - m_pSecondary = parentObj; + m_pAssoc = tqparent; + m_pSecondary = tqparentObj; m_Multi = ""; m_Name = ""; m_Changeability = Uml::chg_Changeable; - // connect this up to parent - connect(this,TQT_SIGNAL(modified()),parent,TQT_SIGNAL(modified())); + // connect this up to tqparent + connect(this,TQT_SIGNAL(modified()),tqparent,TQT_SIGNAL(modified())); } void UMLRole::saveToXMI( TQDomDocument & qDoc, TQDomElement & qElement ) { @@ -110,7 +110,7 @@ void UMLRole::saveToXMI( TQDomDocument & qDoc, TQDomElement & qElement ) { << "): m_pSecondary is NULL" << endl; if (!m_Multi.isEmpty()) roleElement.setAttribute("multiplicity", m_Multi); - if (m_role == Uml::A) { // role aggregation based on parent type + if (m_role == Uml::A) { // role aggregation based on tqparent type // role A switch (m_pAssoc->getAssocType()) { case Uml::at_Composition: @@ -268,8 +268,8 @@ bool UMLRole::load( TQDomElement & element ) { // Here comes the handling of the association type. // This is open for discussion - I'm pretty sure there are better ways.. - // Yeah, for one, setting the *parent* object parameters from here is sucky - // as hell. Why are we using roleA to store what is essentially a parent (association) + // Yeah, for one, setting the *tqparent* object parameters from here is sucky + // as hell. Why are we using roleA to store what is essentially a tqparent (association) // parameter, eh? The UML13.dtd is pretty silly, but since that is what // is driving us to that point, we have to go with it. Some analysis of // the component roles/linked items needs to be done in order to get things diff --git a/umbrello/umbrello/umlrole.h b/umbrello/umbrello/umlrole.h index 48e18049..4d750751 100644 --- a/umbrello/umbrello/umlrole.h +++ b/umbrello/umbrello/umlrole.h @@ -25,15 +25,16 @@ class UMLAssociation; class UMLRole : public UMLObject { Q_OBJECT + TQ_OBJECT public: /** * Sets up an association. * - * @param parent The parent (association) of this UMLRole. - * @param parentUMLObject The Parent UML Object of this UMLRole + * @param tqparent The tqparent (association) of this UMLRole. + * @param tqparentUMLObject The Parent UML Object of this UMLRole * @param role The Uml::Role_Type of this UMLRole */ - UMLRole (UMLAssociation * parent, UMLObject * parentUMLObject, Uml::Role_Type role); + UMLRole (UMLAssociation * tqparent, UMLObject * tqparentUMLObject, Uml::Role_Type role); /** * Overloaded '==' operator @@ -88,7 +89,7 @@ public: UMLAssociation * getParentAssociation (); - /** get the 'id' of the role (NOT the parent object). This could be + /** get the 'id' of the role (NOT the tqparent object). This could be * either Uml::A or Uml::B. Yes, it would be better if we * could get along without this, but we need it to distinguish saved * umlrole objects in the XMI for 'self' associations where both roles @@ -117,7 +118,7 @@ protected: private: /** do some initialization at construction time */ - void init (UMLAssociation * parent, UMLObject * parentObj, Uml::Role_Type r); + void init (UMLAssociation * tqparent, UMLObject * tqparentObj, Uml::Role_Type r); UMLAssociation * m_pAssoc; Uml::Role_Type m_role; diff --git a/umbrello/umbrello/umlview.cpp b/umbrello/umbrello/umlview.cpp index 35ee3a77..c7b76087 100644 --- a/umbrello/umbrello/umlview.cpp +++ b/umbrello/umbrello/umlview.cpp @@ -16,7 +16,7 @@ #include <climits> #include <math.h> -// include files for Qt +// include files for TQt #include <tqpixmap.h> #include <tqpicture.h> #include <tqprinter.h> @@ -95,7 +95,7 @@ #include "toolbarstatefactory.h" -// control the manual DoubleBuffering of QCanvas +// control the manual DoubleBuffering of TQCanvas // with a define, so that this memory X11 effect can // be tested more easily #define MANUAL_CONTROL_DOUBLE_BUFFERING @@ -107,10 +107,10 @@ using namespace Uml; // constructor -UMLView::UMLView(UMLFolder *parentFolder) : TQCanvasView(UMLApp::app()->getMainViewWidget()) { +UMLView::UMLView(UMLFolder *tqparentFolder) : TQCanvasView(UMLApp::app()->getMainViewWidget()) { init(); m_pDoc = UMLApp::app()->getDocument(); - m_pFolder = parentFolder; + m_pFolder = tqparentFolder; } void UMLView::init() { @@ -148,7 +148,7 @@ void UMLView::init() { m_pImageExporter = new UMLViewImageExporter(this); //setup graphical items - viewport() -> setBackgroundMode( Qt::NoBackground ); + viewport() -> setBackgroundMode( TQt::NoBackground ); setCanvas( new UMLViewCanvas( this ) ); // don't set the quite frequent update rate for each // diagram, as that causes also an update of invisible @@ -188,7 +188,7 @@ UMLView::~UMLView() { // before we can delete the TQCanvas, all widgets must be explicitly // removed // otherwise the implicit remove of the contained widgets will cause - // events which would demand a valid connected QCanvas + // events which would demand a valid connected TQCanvas // ==> this causes umbrello to crash for some - larger?? - projects // first avoid all events, which would cause some update actions // on deletion of each removed widget @@ -198,7 +198,7 @@ UMLView::~UMLView() { delete m_pToolBarStateFactory; m_pToolBarStateFactory = NULL; - // Qt Doc for TQCanvasView::~TQCanvasView () states: + // TQt Doc for TQCanvasView::~TQCanvasView () states: // "Destroys the canvas view. The associated canvas is not deleted." // we should do it now delete canvas(); @@ -294,11 +294,11 @@ void UMLView::print(KPrinter *pPrinter, TQPainter & pPainter) { pPainter.translate(offsetX,offsetY); //draw foot note - TQString string = i18n("Diagram: %2 Page %1").arg(page + 1).arg(getName()); + TQString string = i18n("Diagram: %2 Page %1").tqarg(page + 1).tqarg(getName()); TQColor textColor(50, 50, 50); pPainter.setPen(textColor); pPainter.drawLine(0, height + 2, width, height + 2); - pPainter.drawText(0, height + 4, width, fontHeight, Qt::AlignLeft, string); + pPainter.drawText(0, height + 4, width, fontHeight, TQt::AlignLeft, string); if(pageX+1 < numPagesX || pageY+1 < numPagesY) { pPrinter -> newPage(); @@ -307,7 +307,7 @@ void UMLView::print(KPrinter *pPrinter, TQPainter & pPainter) { } } #else - // be gentle - as described in Qt-Doc "The Coordinate System" + // be gentle - as described in TQt-Doc "The Coordinate System" pPainter.save(); int diagramHeight = rect.height(); @@ -346,7 +346,7 @@ void UMLView::print(KPrinter *pPrinter, TQPainter & pPainter) { pPainter.setWindow( rect.x(), rect.y(), windowWidth, windowHeight ); // set viewport - the physical mapping - // --> Qt's TQPainter will map all drawed elements from diagram area ( window ) + // --> TQt's TQPainter will map all drawed elements from diagram area ( window ) // to printer area ( viewport ) pPainter.setViewport( left, top, width, height ); @@ -354,11 +354,11 @@ void UMLView::print(KPrinter *pPrinter, TQPainter & pPainter) { getDiagram(TQRect(rect.x(), rect.y(), windowWidth, diagramHeight), pPainter); //draw foot note - TQString string = i18n("Diagram: %2 Page %1").arg( 1).arg(getName()); + TQString string = i18n("Diagram: %2 Page %1").tqarg( 1).tqarg(getName()); TQColor textColor(50, 50, 50); pPainter.setPen(textColor); pPainter.drawLine(rect.x(), footTop , windowWidth, footTop); - pPainter.drawText(rect.x(), footTop + 3, windowWidth, fontHeight, Qt::AlignLeft, string); + pPainter.drawText(rect.x(), footTop + 3, windowWidth, fontHeight, TQt::AlignLeft, string); // now restore scaling pPainter.restore(); @@ -371,7 +371,7 @@ void UMLView::print(KPrinter *pPrinter, TQPainter & pPainter) { void UMLView::setupNewWidget(UMLWidget *w) { w->setX( m_Pos.x() ); w->setY( m_Pos.y() ); - w->setVisible( true ); + w->tqsetVisible( true ); w->setActivated(); w->setFont( getFont() ); w->slotColorChanged( getID() ); @@ -451,7 +451,7 @@ void UMLView::slotObjectCreated(UMLObject* o) { UMLWidget* newWidget = Widget_Factory::createWidget(this, o); if (newWidget == NULL) return; - newWidget->setVisible( true ); + newWidget->tqsetVisible( true ); newWidget->setActivated(); newWidget->setFont( getFont() ); newWidget->slotColorChanged( getID() ); @@ -687,7 +687,7 @@ void UMLView::checkMessages(ObjectWidget * w) { MessageWidget *obj; while ( (obj = it.current()) != 0 ) { ++it; - if(! obj -> contains(w)) + if(! obj -> tqcontains(w)) continue; //make sure message doesn't have any associations removeAssociations(obj); @@ -1149,19 +1149,19 @@ bool UMLView::isSavedInSeparateFile() { << "listView->findUMLObject(this) returns false" << endl; return false; } - UMLListViewItem *parentItem = dynamic_cast<UMLListViewItem*>( lvItem->parent() ); - if (parentItem == NULL) { + UMLListViewItem *tqparentItem = dynamic_cast<UMLListViewItem*>( lvItem->tqparent() ); + if (tqparentItem == NULL) { kError() << msgPrefix - << "parent item in listview is not a UMLListViewItem (?)" << endl; + << "tqparent item in listview is not a UMLListViewItem (?)" << endl; return false; } - const Uml::ListView_Type lvt = parentItem->getType(); + const Uml::ListView_Type lvt = tqparentItem->getType(); if (! Model_Utils::typeIsFolder(lvt)) return false; - UMLFolder *modelFolder = dynamic_cast<UMLFolder*>(parentItem->getUMLObject()); + UMLFolder *modelFolder = dynamic_cast<UMLFolder*>(tqparentItem->getUMLObject()); if (modelFolder == NULL) { kError() << msgPrefix - << "parent model object is not a UMLFolder (?)" << endl; + << "tqparent model object is not a UMLFolder (?)" << endl; return false; } TQString folderFile = modelFolder->getFolderFile(); @@ -1362,7 +1362,7 @@ void UMLView::activate() { continue; if (obj->activate()) { - obj->setVisible(true); + obj->tqsetVisible(true); } else { m_WidgetList.remove(obj); delete obj; @@ -1378,7 +1378,7 @@ void UMLView::activate() { continue; obj->activate(m_pDoc->getChangeLog()); - obj->setVisible( true ); + obj->tqsetVisible( true ); }//end while @@ -1791,7 +1791,7 @@ void UMLView::removeAssociations(UMLWidget* Widget) { AssociationWidget* assocwidget = 0; while((assocwidget=assoc_it.current())) { ++assoc_it; - if(assocwidget->contains(Widget)) { + if(assocwidget->tqcontains(Widget)) { removeAssoc(assocwidget); } } @@ -1882,7 +1882,7 @@ void UMLView::updateContainment(UMLCanvasObject *self) { if (self == NULL) return; // See if the object has a widget representation in this view. - // While we're at it, also see if the new parent has a widget here. + // While we're at it, also see if the new tqparent has a widget here. UMLWidget *selfWidget = NULL, *newParentWidget = NULL; UMLPackage *newParent = self->getUMLPackage(); for (UMLWidgetListIt wit(m_WidgetList); wit.current(); ++wit) { @@ -1955,8 +1955,8 @@ void UMLView::createAutoAssociations( UMLWidget * widget ) { // end if // end loop // end if - // if the UMLCanvasObject has a parentPackage then - // if the parentPackage has a widget representation on this view then + // if the UMLCanvasObject has a tqparentPackage then + // if the tqparentPackage has a widget representation on this view then // create the containment AssocWidget // end if // end if @@ -2060,7 +2060,7 @@ void UMLView::createAutoAssociations( UMLWidget * widget ) { if (w->getID() != id) continue; // if the containedWidget is not physically located inside this widget - if (widget->rect().contains(w->rect())) + if (widget->rect().tqcontains(w->rect())) continue; // create the containment AssocWidget AssociationWidget *a = new AssociationWidget(this, widget, @@ -2072,12 +2072,12 @@ void UMLView::createAutoAssociations( UMLWidget * widget ) { } } } - // if the UMLCanvasObject has a parentPackage then - UMLPackage *parent = umlObj->getUMLPackage(); - if (parent == NULL) + // if the UMLCanvasObject has a tqparentPackage then + UMLPackage *tqparent = umlObj->getUMLPackage(); + if (tqparent == NULL) return; - // if the parentPackage has a widget representation on this view then - Uml::IDType pkgID = parent->getID(); + // if the tqparentPackage has a widget representation on this view then + Uml::IDType pkgID = tqparent->getID(); UMLWidget *pWidget; UMLWidgetListIt wit(m_WidgetList); while ((pWidget = wit.current()) != NULL) { @@ -2085,7 +2085,7 @@ void UMLView::createAutoAssociations( UMLWidget * widget ) { if (pWidget->getID() == pkgID) break; } - if (pWidget == NULL || pWidget->rect().contains(widget->rect())) + if (pWidget == NULL || pWidget->rect().tqcontains(widget->rect())) return; // create the containment AssocWidget AssociationWidget *a = new AssociationWidget(this, pWidget, at_Containment, widget); @@ -2365,7 +2365,7 @@ void UMLView::setMenu() { if( menu != ListPopupMenu::mt_Undefined ) { m_pMenu = new ListPopupMenu(this, menu, this); connect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuSelection(int))); - m_pMenu->popup( mapToGlobal( contentsToViewport(worldMatrix().map(m_Pos)) ) ); + m_pMenu->popup( mapToGlobal( contentsToViewport(tqworldMatrix().map(m_Pos)) ) ); } } @@ -2797,17 +2797,17 @@ void UMLView::setZoom(int zoom) { } int UMLView::currentZoom() { - return (int)(worldMatrix().m11()*100.0); + return (int)(tqworldMatrix().m11()*100.0); } void UMLView::zoomIn() { - TQWMatrix wm = worldMatrix(); + TQWMatrix wm = tqworldMatrix(); wm.scale(1.5,1.5); // adjust zooming step here setZoom( (int)(wm.m11()*100.0) ); } void UMLView::zoomOut() { - TQWMatrix wm = worldMatrix(); + TQWMatrix wm = tqworldMatrix(); wm.scale(2.0/3.0, 2.0/3.0); //adjust zooming step here setZoom( (int)(wm.m11()*100.0) ); } @@ -3014,10 +3014,10 @@ bool UMLView::loadFromXMI( TQDomElement & qElement ) { TQString zoom = qElement.attribute( "zoom", "100" ); m_nZoom = zoom.toInt(); - TQString height = qElement.attribute( "canvasheight", TQString("%1").arg(UMLView::defaultCanvasSize) ); + TQString height = qElement.attribute( "canvasheight", TQString("%1").tqarg(UMLView::defaultCanvasSize) ); m_nCanvasHeight = height.toInt(); - TQString width = qElement.attribute( "canvaswidth", TQString("%1").arg(UMLView::defaultCanvasSize) ); + TQString width = qElement.attribute( "canvaswidth", TQString("%1").tqarg(UMLView::defaultCanvasSize) ); m_nCanvasWidth = width.toInt(); int nType = type.toInt(); @@ -3226,7 +3226,7 @@ bool UMLView::loadUisDiagramPresentation(TQDomElement & qElement) { while (!e.isNull()) { tag = e.tagName(); kDebug() << "Presentation: tag = " << tag << endl; - if (Uml::tagEq(tag, "Presentation.geometry")) { + if (Uml::tagEq(tag, "Presentation.tqgeometry")) { TQDomNode gnode = e.firstChild(); TQDomElement gelem = gnode.toElement(); TQString csv = gelem.text(); diff --git a/umbrello/umbrello/umlview.h b/umbrello/umbrello/umlview.h index 0a74331f..b6dad4fe 100644 --- a/umbrello/umbrello/umlview.h +++ b/umbrello/umbrello/umlview.h @@ -59,13 +59,14 @@ class ToolBarStateFactory; */ class UMLView : public TQCanvasView { Q_OBJECT + TQ_OBJECT public: friend class UMLViewImageExporterModel; /** * Constructor */ - UMLView(UMLFolder *parentFolder); + UMLView(UMLFolder *tqparentFolder); /** * Destructor @@ -705,7 +706,7 @@ public: void resetPastePoint(); /** - * Called by the view or any of its children when they start a cut + * Called by the view or any of its tqchildren when they start a cut * operation. */ void setStartedCut() { @@ -901,7 +902,7 @@ public: } /** - * Emit the sigRemovePopupMenu Qt signal. + * Emit the sigRemovePopupMenu TQt signal. */ void emitRemovePopupMenu() { emit sigRemovePopupMenu(); @@ -1119,7 +1120,7 @@ protected: UMLWidgetList m_SelectedList; /** - * Flag if view/children started cut operation. + * Flag if view/tqchildren started cut operation. */ bool m_bStartedCut; @@ -1151,7 +1152,7 @@ private: bool m_bActivated; /** - * Status of a popupmenu on view. + * tqStatus of a popupmenu on view. * true - a popup is on view */ bool m_bPopupShowing; diff --git a/umbrello/umbrello/umlviewcanvas.cpp b/umbrello/umbrello/umlviewcanvas.cpp index 134bdf47..a505b0bd 100644 --- a/umbrello/umbrello/umlviewcanvas.cpp +++ b/umbrello/umbrello/umlviewcanvas.cpp @@ -19,7 +19,7 @@ #include "umlview.h" -UMLViewCanvas::UMLViewCanvas( UMLView * pView ) : TQCanvas( pView ) { +UMLViewCanvas::UMLViewCanvas( UMLView * pView ) : TQCanvas( TQT_TQOBJECT(pView) ) { m_pView = pView; } @@ -28,7 +28,7 @@ UMLViewCanvas::~UMLViewCanvas() {} void UMLViewCanvas::drawBackground( TQPainter & painter, const TQRect & clip ) { TQCanvas::drawBackground( painter, clip ); if( m_pView -> getShowSnapGrid() ) { - painter.setPen( Qt::gray ); + painter.setPen( TQt::gray ); int gridX = m_pView -> getSnapX(); int gridY = m_pView -> getSnapY(); int numX = width() / gridX; diff --git a/umbrello/umbrello/umlviewimageexporter.cpp b/umbrello/umbrello/umlviewimageexporter.cpp index 4c474751..23164171 100644 --- a/umbrello/umbrello/umlviewimageexporter.cpp +++ b/umbrello/umbrello/umlviewimageexporter.cpp @@ -12,7 +12,7 @@ // own header #include "umlviewimageexporter.h" -// include files for Qt +// include files for TQt #include <tqstring.h> #include <tqstringlist.h> @@ -63,7 +63,7 @@ bool UMLViewImageExporter::prepareExportView() { // check if the file exists if (KIO::NetAccess::exists(m_imageURL, true, UMLApp::app())) { int wantSave = KMessageBox::warningContinueCancel(0, - i18n("The selected file %1 exists.\nDo you want to overwrite it?").arg(m_imageURL.prettyURL()), + i18n("The selected file %1 exists.\nDo you want to overwrite it?").tqarg(m_imageURL.prettyURL()), i18n("File Already Exists"), i18n("&Overwrite")); if (wantSave == KMessageBox::Continue) { exportPrepared = true; @@ -80,7 +80,7 @@ bool UMLViewImageExporter::getParametersFromUser() { UMLApp *app = UMLApp::app(); // configure & show the file dialog - KFileDialog fileDialog(TQString::null, TQString::null, m_view, + KFileDialog fileDialog(TQString(), TQString(), m_view, ":export-image", true); prepareFileDialog(fileDialog); fileDialog.exec(); diff --git a/umbrello/umbrello/umlviewimageexporterall.cpp b/umbrello/umbrello/umlviewimageexporterall.cpp index 9f80dad1..95801867 100644 --- a/umbrello/umbrello/umlviewimageexporterall.cpp +++ b/umbrello/umbrello/umlviewimageexporterall.cpp @@ -12,7 +12,7 @@ // own header #include "umlviewimageexporterall.h" -// include files for Qt +// include files for TQt #include <tqstring.h> #include <tqstringlist.h> #include <tqcheckbox.h> diff --git a/umbrello/umbrello/umlviewimageexportermodel.cpp b/umbrello/umbrello/umlviewimageexportermodel.cpp index 7f34c104..d99c85f4 100644 --- a/umbrello/umbrello/umlviewimageexportermodel.cpp +++ b/umbrello/umbrello/umlviewimageexportermodel.cpp @@ -15,7 +15,7 @@ // system includes #include <math.h> -// include files for Qt +// include files for TQt #include <tqstringlist.h> #include <tqrect.h> #include <tqimage.h> @@ -83,7 +83,7 @@ TQString UMLViewImageExporterModel::imageTypeToMimeType(const TQString& imageTyp if (TQString("xpm") == imgType) return "image/x-xpm"; if (TQString("eps") == imgType) return "image/x-eps"; if (TQString("svg") == imgType) return "image/svg+xml"; - return TQString::null; + return TQString(); } TQString UMLViewImageExporterModel::mimeTypeToImageType(const TQString& mimeType) { @@ -97,7 +97,7 @@ TQString UMLViewImageExporterModel::mimeTypeToImageType(const TQString& mimeType if (TQString("image/x-xpm") == mimeType) return "xpm"; if (TQString("image/x-eps") == mimeType) return "eps"; if (TQString("image/svg+xml") == mimeType) return "svg"; - return TQString::null; + return TQString(); } TQStringList UMLViewImageExporterModel::exportAllViews(const TQString &imageType, const KURL &directory, bool useFolders) const { @@ -123,7 +123,7 @@ TQStringList UMLViewImageExporterModel::exportAllViews(const TQString &imageType TQString UMLViewImageExporterModel::exportView(UMLView* view, const TQString &imageType, const KURL &url) const { // create the needed directories if (!prepareDirectory(url)) { - return i18n("Can not create directory: %1").arg(url.directory()); + return i18n("Can not create directory: %1").tqarg(url.directory()); } // The fileName will be used when exporting the image. If the url isn't local, @@ -148,19 +148,19 @@ TQString UMLViewImageExporterModel::exportView(UMLView* view, const TQString &im // exporting the view to the file if (!exportViewTo(view, imageType, fileName)) { tmpFile.unlink(); - return i18n("A problem occured while saving diagram in %1").arg(fileName); + return i18n("A problem occured while saving diagram in %1").tqarg(fileName); } // if the file wasn't local, upload the temp file to the target if (!url.isLocalFile()) { if (!KIO::NetAccess::upload(tmpFile.name(), url, UMLApp::app())) { tmpFile.unlink(); - return i18n("There was a problem saving file: %1").arg(url.path()); + return i18n("There was a problem saving file: %1").tqarg(url.path()); } } //!isLocalFile tmpFile.unlink(); - return TQString::null; + return TQString(); } TQString UMLViewImageExporterModel::getDiagramFileName(UMLView *view, const TQString &imageType, bool useFolders /* = false */) const { @@ -174,14 +174,14 @@ TQString UMLViewImageExporterModel::getDiagramFileName(UMLView *view, const TQSt UMLListView *listView = UMLApp::app()->getListView(); UMLListViewItem* listViewItem = listView->findItem(view->getID()); // skip the name of the first item because it's the View - listViewItem = static_cast<UMLListViewItem*>(listViewItem->parent()); + listViewItem = static_cast<UMLListViewItem*>(listViewItem->tqparent()); // Relies on the tree structure of the UMLListView. There are a base "Views" folder - // and five children, one for each view type (Logical, use case, components, deployment + // and five tqchildren, one for each view type (Logical, use case, components, deployment // and entity relationship) while (listView->rootView(listViewItem->getType()) == NULL) { name.insert(0, listViewItem->getText() + '/'); - listViewItem = static_cast<UMLListViewItem*>(listViewItem->parent()); + listViewItem = static_cast<UMLListViewItem*>(listViewItem->tqparent()); if (listViewItem == NULL) break; } @@ -193,7 +193,7 @@ bool UMLViewImageExporterModel::prepareDirectory(const KURL &url) const { KURL directory = url; directory.setPath(""); - // creates the directory and any needed parent directories + // creates the directory and any needed tqparent directories TQStringList dirs = TQStringList::split(TQDir::separator(), url.directory()); for (TQStringList::ConstIterator it = dirs.begin() ; it != dirs.end(); ++it ) { directory.addPath(*it); @@ -298,7 +298,7 @@ bool UMLViewImageExporterModel::fixEPS(const TQString &fileName, const TQRect& r const int pos = rx.search(fileContent); if (pos < 0) { kError() << "UMLViewImageExporterModel::fixEPS(" << fileName - << "): cannot find %%BoundingBox" << endl; + << "): cannot tqfind %%BoundingBox" << endl; return false; } @@ -319,8 +319,8 @@ bool UMLViewImageExporterModel::fixEPS(const TQString &fileName, const TQRect& r const int bottom = int(floor(epstop)) - rect.height() + 1; // modify content - fileContent.replace(pos,rx.cap(0).length(), - TQString("%%BoundingBox: %1 %2 %3 %4").arg(left).arg(bottom).arg(right).arg(top)); + fileContent.tqreplace(pos,rx.cap(0).length(), + TQString("%%BoundingBox: %1 %2 %3 %4").tqarg(left).tqarg(bottom).tqarg(right).tqarg(top)); ts << fileContent; epsfile.close(); diff --git a/umbrello/umbrello/umlviewimageexportermodel.h b/umbrello/umbrello/umlviewimageexportermodel.h index 1517d2d0..a7f0193d 100644 --- a/umbrello/umbrello/umlviewimageexportermodel.h +++ b/umbrello/umbrello/umlviewimageexportermodel.h @@ -56,7 +56,7 @@ public: * The supported image types are those that the diagrams can be exported to. * * @param imageType The type of the image. - * @return A TQString with the equivalent mime type, or TQString::null if + * @return A TQString with the equivalent mime type, or TQString() if * it's unknown. */ static TQString imageTypeToMimeType(const TQString& imageType); @@ -66,7 +66,7 @@ public: * The supported image types are those that the diagrams can be exported to. * * @param mimeType The mime type. - * @return A lowercase TQString with the equivalent image type, or TQString::null + * @return A lowercase TQString with the equivalent image type, or TQString() * if it's unknown. */ static TQString mimeTypeToImageType(const TQString& mimeType); @@ -120,7 +120,7 @@ public: * @param imageType The type of the image the view will be exported to. * @param url The url where the image will be saved. * @return The message error if some problem occurred when exporting, or - * TQString::null if all went fine. + * TQString() if all went fine. */ TQString exportView(UMLView* view, const TQString &imageType, const KURL &url) const; @@ -129,11 +129,11 @@ private: /** * Returns the name of the file where the view will be exported to. * The name of the exported images will be like their view's name and using the - * 'imageType' as extension. It can also include the parent folders of the view. + * 'imageType' as extension. It can also include the tqparent folders of the view. * * The views are stored in folders in the document. The same tree structure used * in the document to store the views can be created with 'useFolders', so the file name - * will include recursively also its parent folders. Only the folders made by the user + * will include recursively also its tqparent folders. Only the folders made by the user * are included in the file name (Logical view, use case view and so on aren't created). * * @param view The view to export. @@ -146,7 +146,7 @@ private: /** * Creates, if it doesn't exist, the directory to save the file. - * It also creates all the needed parent directories. + * It also creates all the needed tqparent directories. * * @param url The url where the image will be saved. * @return True if the operation was successful, diff --git a/umbrello/umbrello/umlwidget.cpp b/umbrello/umbrello/umlwidget.cpp index 29dc2a86..c9733df2 100644 --- a/umbrello/umbrello/umlwidget.cpp +++ b/umbrello/umbrello/umlwidget.cpp @@ -450,14 +450,14 @@ void UMLWidget::drawSelected(TQPainter * p, int offsetX, int offsetY) { int w = width(); int h = height(); int s = 4; - TQBrush brush(Qt::blue); + TQBrush brush(TQt::blue); p -> fillRect(offsetX, offsetY, s, s, brush); p -> fillRect(offsetX, offsetY + h - s, s, s, brush); p -> fillRect(offsetX + w - s, offsetY, s, s, brush); // Draw the resize anchor in the lower right corner. if (m_bResizable) { - brush.setColor(Qt::red); + brush.setColor(TQt::red); const int right = offsetX + w; const int bottom = offsetY + h; p->drawLine(right - s, offsetY + h - 1, offsetX + w - 1, offsetY + h - s); @@ -537,7 +537,7 @@ void UMLWidget::setActivated(bool Active /*=true*/) { } void UMLWidget::addAssoc(AssociationWidget* pAssoc) { - if (pAssoc && !m_Assocs.contains(pAssoc)) { + if (pAssoc && !m_Assocs.tqcontains(pAssoc)) { m_Assocs.append(pAssoc); } } @@ -656,7 +656,7 @@ int UMLWidget::onWidget(const TQPoint & p) { const int top = getY(); const int bottom = top + h; if (p.x() < left || p.x() > right || - p.y() < top || p.y() > bottom) // Qt coord.sys. origin in top left corner + p.y() < top || p.y() > bottom) // TQt coord.sys. origin in top left corner return 0; return (w + h) / 2; } @@ -997,7 +997,7 @@ bool UMLWidget::loadFromXMI( TQDomElement & qElement ) { m_Font.fromString(font); //setFont(newFont); } else { - kWarning() << "Using default font " << m_Font.toString() + kWarning() << "Using default font " << TQString(m_Font.toString()) << " for widget with xmi.id " << ID2STR(m_nId) << endl; //setFont( m_Font ); } diff --git a/umbrello/umbrello/umlwidget.h b/umbrello/umbrello/umlwidget.h index 46bdfcb3..0cebb9d8 100644 --- a/umbrello/umbrello/umlwidget.h +++ b/umbrello/umbrello/umlwidget.h @@ -42,6 +42,7 @@ class TQFontMetrics; */ class UMLWidget : public WidgetBase, public TQCanvasRectangle { Q_OBJECT + TQ_OBJECT public: friend class UMLWidgetController; @@ -184,7 +185,7 @@ public: void setView(UMLView * v); /** - * Activate the object after serializing it from a QDataStream + * Activate the object after serializing it from a TQDataStream * * @param ChangeLog * @return true for success @@ -465,7 +466,7 @@ public: /** * Set the m_bActivated flag of a widget but does not perform the Activate method * - * @param Active Status of activation is to be set. + * @param Active tqStatus of activation is to be set. */ void setActivated(bool Active = true); @@ -542,7 +543,7 @@ protected: /** * Overrides default method. * - * @param p Device on which the shape has to be drawn. + * @param p Device on which the shape.has to be drawn. */ virtual void drawShape(TQPainter &p ); @@ -666,7 +667,7 @@ public slots: /** * This slot is entered when an event has occurred on the views display, * most likely a mouse event. Before it sends out that mouse event all - * children should make sure that they don't have a menu active or there + * tqchildren should make sure that they don't have a menu active or there * could be more than one popup menu displayed. */ virtual void slotRemovePopupMenu(); diff --git a/umbrello/umbrello/umlwidgetcontroller.cpp b/umbrello/umbrello/umlwidgetcontroller.cpp index 9764e74f..c7b9ce94 100644 --- a/umbrello/umbrello/umlwidgetcontroller.cpp +++ b/umbrello/umbrello/umlwidgetcontroller.cpp @@ -74,7 +74,7 @@ void UMLWidgetController::mousePressEvent(TQMouseEvent *me) { m_oldStatusBarMsg = UMLApp::app()->getStatusBarMsg(); - if (me->state() == Qt::ShiftButton || me->state() == Qt::ControlButton) { + if (me->state() == TQt::ShiftButton || me->state() == TQt::ControlButton) { m_shiftPressed = true; if (me->button() == Qt::LeftButton) { @@ -138,10 +138,10 @@ void UMLWidgetController::mouseMoveEvent(TQMouseEvent* me) { int diffX = position.x() - m_widget->getX(); int diffY = position.y() - m_widget->getY(); - if ((me->state() & Qt::ShiftButton) && (me->state() & Qt::ControlButton)) { + if ((me->state() & TQt::ShiftButton) && (me->state() & TQt::ControlButton)) { //Move in Y axis diffX = 0; - } else if ((me->state() & Qt::ShiftButton) || (me->state() & Qt::ControlButton)) { + } else if ((me->state() & TQt::ShiftButton) || (me->state() & TQt::ControlButton)) { //Move in X axis diffY = 0; } @@ -383,10 +383,10 @@ void UMLWidgetController::resize(TQMouseEvent *me) { int newW = m_oldW + me->x() - m_widget->getX() - m_pressOffsetX; int newH = m_oldH + me->y() - m_widget->getY() - m_pressOffsetY; - if ((me->state() & Qt::ShiftButton) && (me->state() & Qt::ControlButton)) { + if ((me->state() & TQt::ShiftButton) && (me->state() & TQt::ControlButton)) { //Move in Y axis newW = m_oldW; - } else if ((me->state() & Qt::ShiftButton) || (me->state() & Qt::ControlButton)) { + } else if ((me->state() & TQt::ShiftButton) || (me->state() & TQt::ControlButton)) { //Move in X axis newH = m_oldH; } diff --git a/umbrello/umbrello/umlwidgetcontroller.h b/umbrello/umbrello/umlwidgetcontroller.h index 54d42e55..032b3fbd 100644 --- a/umbrello/umbrello/umlwidgetcontroller.h +++ b/umbrello/umbrello/umlwidgetcontroller.h @@ -186,7 +186,7 @@ protected: * size in m_oldW/H. * * It can be overridden to save subclass specific values whenever a move or - * resize begins. However, parent method (that is, this method) must be + * resize begins. However, tqparent method (that is, this method) must be * called in the overridden method. * * @param me The TQMouseEvent to get the offset from. @@ -198,7 +198,7 @@ protected: * the cursor depending on that. * The cursor used when resizing is gotten from getResizeCursor(). * - * @param me The QMouseEVent to check. + * @param me The TQMouseEVent to check. * @return true if the mouse is in resize area, false otherwise. */ virtual bool isInResizeArea(TQMouseEvent *me); diff --git a/umbrello/umbrello/uniqueid.h b/umbrello/umbrello/uniqueid.h index 7dcbd4bb..56cedb56 100644 --- a/umbrello/umbrello/uniqueid.h +++ b/umbrello/umbrello/uniqueid.h @@ -9,8 +9,8 @@ * Umbrello UML Modeller Authors <uml-devel@uml.sf.net> * ***************************************************************************/ -#ifndef UNIQUEID_H -#define UNIQUEID_H +#ifndef UNITQUEID_H +#define UNITQUEID_H #include "umlnamespace.h" diff --git a/umbrello/umbrello/usecasewidget.cpp b/umbrello/umbrello/usecasewidget.cpp index 7eb8590a..79352e9a 100644 --- a/umbrello/umbrello/usecasewidget.cpp +++ b/umbrello/umbrello/usecasewidget.cpp @@ -44,8 +44,8 @@ void UseCaseWidget::draw(TQPainter & p, int offsetX, int offsetY) { const int textStartY = (h / 2) - (fontHeight / 2); p.drawEllipse(offsetX, offsetY, w, h); - p.setPen(Qt::black); - p.drawText(offsetX + UC_MARGIN, offsetY + textStartY, w - UC_MARGIN * 2, fontHeight, Qt::AlignCenter, getName()); + p.setPen(TQt::black); + p.drawText(offsetX + UC_MARGIN, offsetY + textStartY, w - UC_MARGIN * 2, fontHeight, TQt::AlignCenter, getName()); UMLWidget::setPen(p); if(m_bSelected) drawSelected(&p, offsetX, offsetY); diff --git a/umbrello/umbrello/usecasewidget.h b/umbrello/umbrello/usecasewidget.h index 65613d1e..de330b62 100644 --- a/umbrello/umbrello/usecasewidget.h +++ b/umbrello/umbrello/usecasewidget.h @@ -41,7 +41,7 @@ public: /** * Creates a UseCase widget. * - * @param view The parent of the widget. + * @param view The tqparent of the widget. * @param o The UMLObject to represent. */ UseCaseWidget(UMLView * view, UMLUseCase *o); diff --git a/umbrello/umbrello/widget_factory.cpp b/umbrello/umbrello/widget_factory.cpp index ea58e128..5b068aa5 100644 --- a/umbrello/umbrello/widget_factory.cpp +++ b/umbrello/umbrello/widget_factory.cpp @@ -148,8 +148,8 @@ bool validateObjType(Uml::Object_Type expected, UMLObject* &o, Uml::IDType id) { if (o == NULL) return false; o->setID(id); - UMLPackage *parentPkg = o->getUMLPackage(); - parentPkg->addObject(o); + UMLPackage *tqparentPkg = o->getUMLPackage(); + tqparentPkg->addObject(o); return true; } Uml::Object_Type actual = o->getBaseType(); diff --git a/umbrello/umbrello/widget_utils.cpp b/umbrello/umbrello/widget_utils.cpp index 9f363a62..eeb51956 100644 --- a/umbrello/umbrello/widget_utils.cpp +++ b/umbrello/umbrello/widget_utils.cpp @@ -99,9 +99,9 @@ TQCanvasRectangle *decoratePoint(const TQPoint& p) { rect = new TQCanvasRectangle(p.x() - SIZE / 2, p.y() - SIZE / 2, SIZE, SIZE, currentView->canvas()); - rect->setBrush( TQBrush(Qt::blue) ); - rect->setPen( TQPen(Qt::blue) ); - rect->setVisible(true); + rect->setBrush( TQBrush(TQt::blue) ); + rect->setPen( TQPen(TQt::blue) ); + rect->tqsetVisible(true); return rect; } diff --git a/umbrello/umbrello/widgetbase.h b/umbrello/umbrello/widgetbase.h index d9487964..5dd863f8 100644 --- a/umbrello/umbrello/widgetbase.h +++ b/umbrello/umbrello/widgetbase.h @@ -29,6 +29,7 @@ class UMLObject; */ class WidgetBase : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * Creates a WidgetBase object. diff --git a/umbrello/umbrello/worktoolbar.cpp b/umbrello/umbrello/worktoolbar.cpp index ef648a49..a60c67de 100644 --- a/umbrello/umbrello/worktoolbar.cpp +++ b/umbrello/umbrello/worktoolbar.cpp @@ -26,8 +26,8 @@ #include "worktoolbar.h" -WorkToolBar::WorkToolBar(TQMainWindow *parentWindow, const char*name) - : KToolBar(parentWindow,Qt::DockRight,false,name) { +WorkToolBar::WorkToolBar(TQMainWindow *tqparentWindow, const char*name) + : KToolBar(tqparentWindow,TQt::DockRight,false,name) { m_CurrentButtonID = tbb_Undefined; loadPixmaps(); m_Type = Uml::dt_Class; /* first time in just want it to load arrow, diff --git a/umbrello/umbrello/worktoolbar.h b/umbrello/umbrello/worktoolbar.h index 1570b567..01b7c9a3 100644 --- a/umbrello/umbrello/worktoolbar.h +++ b/umbrello/umbrello/worktoolbar.h @@ -41,14 +41,15 @@ class TQMainWindow; class WorkToolBar : public KToolBar { Q_OBJECT + TQ_OBJECT public: /** * Creates a work tool bar. * - * @param parentWindow The parent of the toolbar. + * @param tqparentWindow The tqparent of the toolbar. */ - WorkToolBar(TQMainWindow *parentWindow, const char *name); + WorkToolBar(TQMainWindow *tqparentWindow, const char *name); /** * Standard deconstructor. |