From 1dd83e5f38d1c16d3e6da18d0caca0ee093ab58f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:35:10 -0600 Subject: Rename old tq methods that no longer need a unique name --- cervisia/annotateview.cpp | 4 ++-- cervisia/annotateview.h | 2 +- cervisia/cervisiapart.cpp | 12 ++++++------ cervisia/cervisiapart.h | 2 +- cervisia/changelogdlg.cpp | 2 +- cervisia/checkoutdlg.cpp | 2 +- cervisia/commitdlg.cpp | 2 +- cervisia/cvsservice/repository.cpp | 2 +- cervisia/diffdlg.cpp | 4 ++-- cervisia/diffview.cpp | 8 ++++---- cervisia/diffview.h | 4 ++-- cervisia/entry.h | 4 ++-- cervisia/entry_status.cpp | 4 ++-- cervisia/entry_status.h | 6 +++--- cervisia/entry_status_change.h | 2 +- cervisia/globalignorelist.cpp | 4 ++-- cervisia/historydlg.cpp | 4 ++-- cervisia/loginfo.cpp | 20 +++++++++---------- cervisia/loglist.cpp | 8 ++++---- cervisia/logtree.cpp | 2 +- cervisia/logtree.h | 2 +- cervisia/mergedlg.cpp | 2 +- cervisia/misc.cpp | 4 ++-- cervisia/progressdlg.cpp | 6 +++--- cervisia/qttableview.cpp | 10 +++++----- cervisia/repositorydlg.cpp | 16 +++++++-------- cervisia/resolvedlg.cpp | 2 +- cervisia/settingsdlg.cpp | 40 +++++++++++++++++++------------------- cervisia/settingsdlg_advanced.ui | 2 +- cervisia/updatedlg.cpp | 2 +- cervisia/updateview.cpp | 16 +++++++-------- cervisia/updateview.h | 2 +- cervisia/updateview_items.cpp | 24 +++++++++++------------ cervisia/updateview_items.h | 6 +++--- 34 files changed, 116 insertions(+), 116 deletions(-) (limited to 'cervisia') diff --git a/cervisia/annotateview.cpp b/cervisia/annotateview.cpp index f3d80605..6d99c573 100644 --- a/cervisia/annotateview.cpp +++ b/cervisia/annotateview.cpp @@ -175,7 +175,7 @@ void AnnotateView::addLine(const LogInfo& logInfo, const TQString& content, } -TQSize AnnotateView::tqsizeHint() const +TQSize AnnotateView::sizeHint() 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 = tqitemRect(item); + viewportRect = itemRect(item); text = item->m_logInfo.createToolTipText(false); } } diff --git a/cervisia/annotateview.h b/cervisia/annotateview.h index e4c78b58..aa6d947b 100644 --- a/cervisia/annotateview.h +++ b/cervisia/annotateview.h @@ -46,7 +46,7 @@ public: void addLine(const Cervisia::LogInfo& logInfo, const TQString& content, bool odd); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; private slots: diff --git a/cervisia/cervisiapart.cpp b/cervisia/cervisiapart.cpp index 9087bacc..1af4f881 100644 --- a/cervisia/cervisiapart.cpp +++ b/cervisia/cervisiapart.cpp @@ -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->tqsizeHint()); + filterLabel->setFixedSize(filterLabel->sizeHint()); filterLabel->setText(""); TQToolTip::add(filterLabel, i18n("F - All files are hidden, the tree shows only folders\n" @@ -258,7 +258,7 @@ void CervisiaPart::setupActions() action->setWhatsThis( hint ); action = new KAction( i18n("&Status"), "vcs_status", Key_F5, - this, TQT_SLOT( slottqStatus() ), + this, TQT_SLOT( slotStatus() ), actionCollection(), "file_status" ); hint = i18n("Updates the status (cvs -n update) of the selected files and folders"); action->setToolTip( hint ); @@ -856,7 +856,7 @@ void CervisiaPart::slotUpdate() } -void CervisiaPart::slottqStatus() +void CervisiaPart::slotStatus() { TQStringList list = update->multipleSelection(); if (list.isEmpty()) @@ -1166,13 +1166,13 @@ void CervisiaPart::slotAnnotate() void CervisiaPart::slotDiffBase() { - showDiff(TQString::tqfromLatin1("BASE")); + showDiff(TQString::fromLatin1("BASE")); } void CervisiaPart::slotDiffHead() { - showDiff(TQString::tqfromLatin1("HEAD")); + showDiff(TQString::fromLatin1("HEAD")); } @@ -1764,7 +1764,7 @@ bool CervisiaPart::openSandbox(const TQString &dirname) if (dostatus) { update->setSelected(update->firstChild(), true); - slottqStatus(); + slotStatus(); } //load the recentCommits for this app from the KConfig app diff --git a/cervisia/cervisiapart.h b/cervisia/cervisiapart.h index b802e8ad..7a3802fd 100644 --- a/cervisia/cervisiapart.h +++ b/cervisia/cervisiapart.h @@ -83,7 +83,7 @@ public slots: void slotOpen(); void slotResolve(); - void slottqStatus(); + void slotStatus(); void slotUpdate(); void slotChangeLog(); void slotCommit(); diff --git a/cervisia/changelogdlg.cpp b/cervisia/changelogdlg.cpp index 9d00a8e8..8c19a9fc 100644 --- a/cervisia/changelogdlg.cpp +++ b/cervisia/changelogdlg.cpp @@ -33,7 +33,7 @@ static inline TQString DateStringISO8601() { - return TQDate::tqcurrentDate().toString(Qt::ISODate); + return TQDate::currentDate().toString(Qt::ISODate); } diff --git a/cervisia/checkoutdlg.cpp b/cervisia/checkoutdlg.cpp index 9be04dd4..faafa37c 100644 --- a/cervisia/checkoutdlg.cpp +++ b/cervisia/checkoutdlg.cpp @@ -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->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); + repo_combo->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); grid->addWidget(repo_combo, 0, 1); TQLabel* repo_label = new TQLabel(repo_combo, i18n("&Repository:"), mainWidget); diff --git a/cervisia/commitdlg.cpp b/cervisia/commitdlg.cpp index a2e587f3..5f45ce16 100644 --- a/cervisia/commitdlg.cpp +++ b/cervisia/commitdlg.cpp @@ -84,7 +84,7 @@ CommitDialog::CommitDialog(KConfig& cfg, CvsService_stub* service, archivelabel->setBuddy(combo); connect( combo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(comboActivated(int)) ); // make sure that combobox is smaller than the screen - combo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed)); + combo->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed)); tqlayout->addWidget(combo); TQLabel *messagelabel = new TQLabel(i18n("&Log message:"), mainWidget); diff --git a/cervisia/cvsservice/repository.cpp b/cervisia/cvsservice/repository.cpp index 822a77ae..398c1c47 100644 --- a/cervisia/cvsservice/repository.cpp +++ b/cervisia/cvsservice/repository.cpp @@ -223,7 +223,7 @@ 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::tqfromLatin1("Repository-") + location; + TQString repositoryGroup = TQString::fromLatin1("Repository-") + location; if( !config->hasGroup(repositoryGroup) ) { // find the position of the first path separator diff --git a/cervisia/diffdlg.cpp b/cervisia/diffdlg.cpp index 8d7ed8c8..ef6c725c 100644 --- a/cervisia/diffdlg.cpp +++ b/cervisia/diffdlg.cpp @@ -93,10 +93,10 @@ DiffDialog::DiffDialog(KConfig& cfg, TQWidget *parent, const char *name, bool mo // avoids auto resize when the text is changed nofnlabel->setMinimumWidth(fontMetrics().width(i18n("%1 differences").tqarg(10000))); - backbutton = new TQPushButton(TQString::tqfromLatin1("&<<"), mainWidget); + backbutton = new TQPushButton(TQString::fromLatin1("&<<"), mainWidget); connect( backbutton, TQT_SIGNAL(clicked()), TQT_SLOT(backClicked()) ); - forwbutton = new TQPushButton(TQString::tqfromLatin1("&>>"), mainWidget); + forwbutton = new TQPushButton(TQString::fromLatin1("&>>"), mainWidget); connect( forwbutton, TQT_SIGNAL(clicked()), TQT_SLOT(forwClicked()) ); connect( this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(saveAsClicked()) ); diff --git a/cervisia/diffview.cpp b/cervisia/diffview.cpp index 554e6d3f..70e0ed2b 100644 --- a/cervisia/diffview.cpp +++ b/cervisia/diffview.cpp @@ -293,7 +293,7 @@ int DiffView::cellWidth(int col) } -TQSize DiffView::tqsizeHint() const +TQSize DiffView::sizeHint() const { TQFontMetrics fm(font()); return TQSize( 4*fm.width("0123456789"), fm.lineSpacing()*8 ); @@ -391,7 +391,7 @@ void DiffView::wheelEvent(TQWheelEvent *e) DiffZoomWidget::DiffZoomWidget(KConfig& cfg, TQWidget *parent, const char *name) : TQFrame(parent, name) { - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) ); + setSizePolicy( 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::tqsizeHint() const +TQSize DiffZoomWidget::sizeHint() const { - return TQSize(25, tqstyle().tqpixelMetric(TQStyle::PM_ScrollBarExtent, this)); + return TQSize(25, tqstyle().pixelMetric(TQStyle::PM_ScrollBarExtent, this)); } diff --git a/cervisia/diffview.h b/cervisia/diffview.h index 2a2b998b..9bc57b06 100644 --- a/cervisia/diffview.h +++ b/cervisia/diffview.h @@ -74,7 +74,7 @@ public: virtual void setFont(const TQFont &font); virtual int cellWidth(int col); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; virtual void paintCell(TQPainter *p, int row, int col); virtual void wheelEvent(TQWheelEvent *); const TQScrollBar *scrollBar() const @@ -112,7 +112,7 @@ public: ~DiffZoomWidget(); void setDiffView(DiffView *view); - TQSize tqsizeHint() const; + TQSize sizeHint() const; protected: void paintEvent(TQPaintEvent *); diff --git a/cervisia/entry.h b/cervisia/entry.h index 2c0a1c98..f3705d35 100644 --- a/cervisia/entry.h +++ b/cervisia/entry.h @@ -43,7 +43,7 @@ struct Entry }; /** - * Sets status to \a EntrytqStatus::Unknown and type to \a File. + * Sets status to \a EntryStatus::Unknown and type to \a File. */ Entry(); @@ -60,7 +60,7 @@ struct Entry /** * The status of this entry. */ - EntrytqStatus m_status; + EntryStatus m_status; /** * The revision of this entry. diff --git a/cervisia/entry_status.cpp b/cervisia/entry_status.cpp index c76c135c..00ff3b32 100644 --- a/cervisia/entry_status.cpp +++ b/cervisia/entry_status.cpp @@ -28,10 +28,10 @@ namespace Cervisia { -TQString toString(EntrytqStatus entrytqStatus) +TQString toString(EntryStatus entryStatus) { TQString result; - switch (entrytqStatus) + switch (entryStatus) { case LocallyModified: result = i18n("Locally Modified"); diff --git a/cervisia/entry_status.h b/cervisia/entry_status.h index b1d6cf6f..aa964735 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 EntrytqStatus +enum EntryStatus { LocallyModified, LocallyAdded, @@ -51,11 +51,11 @@ enum EntrytqStatus /** * The entry status as translated string. * - * @param entrytqStatus The entry status to translate. + * @param entryStatus The entry status to translate. * * @return The translated string. */ -TQString toString(EntrytqStatus entrytqStatus); +TQString toString(EntryStatus entryStatus); } // namespace Cervisia diff --git a/cervisia/entry_status_change.h b/cervisia/entry_status_change.h index 7935cf1d..3518eed8 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. */ - EntrytqStatus m_status; + EntryStatus m_status; }; diff --git a/cervisia/globalignorelist.cpp b/cervisia/globalignorelist.cpp index 4b5c8a47..b3834a42 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::tqfromLatin1(". ..")); + addEntriesFromString(TQString::fromLatin1(". ..")); } } @@ -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::tqfromLatin1(ignorestr)); + addEntriesFromString(TQString::fromLatin1(ignorestr)); addEntriesFromString(TQString::fromLocal8Bit(::getenv("CVSIGNORE"))); addEntriesFromFile(TQDir::homeDirPath() + "/.cvsignore"); diff --git a/cervisia/historydlg.cpp b/cervisia/historydlg.cpp index 1eb3b6ee..9e226e34 100644 --- a/cervisia/historydlg.cpp +++ b/cervisia/historydlg.cpp @@ -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::tqfromLatin1("HistoryListView")); + listview->restoreLayout(&partConfig, TQString::fromLatin1("HistoryListView")); } @@ -254,7 +254,7 @@ HistoryDialog::~HistoryDialog() { saveDialogSize(partConfig, "HistoryDialog"); - listview->saveLayout(&partConfig, TQString::tqfromLatin1("HistoryListView")); + listview->saveLayout(&partConfig, TQString::fromLatin1("HistoryListView")); } diff --git a/cervisia/loginfo.cpp b/cervisia/loginfo.cpp index 8e6464d0..b97ff1f0 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::tqfromLatin1(": "); + text += typeToString() + TQString::fromLatin1(": "); } text += m_name; @@ -71,32 +71,32 @@ TQString TagInfo::typeToString() const TQString LogInfo::createToolTipText(bool showTime) const { - TQString text(TQString::tqfromLatin1("")); + TQString text(TQString::fromLatin1("")); text += TQStyleSheet::escape(m_revision); - text += TQString::tqfromLatin1("  "); + text += TQString::fromLatin1("  "); text += TQStyleSheet::escape(m_author); - text += TQString::tqfromLatin1("  "); + text += TQString::fromLatin1("  "); text += TQStyleSheet::escape(dateTimeToString(showTime)); - text += TQString::tqfromLatin1(""); + text += TQString::fromLatin1(""); if (!m_comment.isEmpty()) { - text += TQString::tqfromLatin1("
");
+        text += TQString::fromLatin1("
");
         text += TQStyleSheet::escape(m_comment);
-        text += TQString::tqfromLatin1("
");
+        text += TQString::fromLatin1("
"); } if (!m_tags.isEmpty()) { - text += TQString::tqfromLatin1(""); + text += TQString::fromLatin1(""); for (TTagInfoSeq::const_iterator it = m_tags.begin(); it != m_tags.end(); ++it) { if (it != m_tags.begin() || m_comment.isEmpty()) - text += TQString::tqfromLatin1("
"); + text += TQString::fromLatin1("
"); text += TQStyleSheet::escape((*it).toString()); } - text += TQString::tqfromLatin1(""); + text += TQString::fromLatin1(""); } return text; diff --git a/cervisia/loglist.cpp b/cervisia/loglist.cpp index 439ba36f..d676718a 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::tqfromLatin1(", "))); + TQString::fromLatin1(", "))); } @@ -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::tqfromLatin1("LogList view")); + restoreLayout(&partConfig, TQString::fromLatin1("LogList view")); } LogListView::~LogListView() { - saveLayout(&partConfig, TQString::tqfromLatin1("LogList view")); + saveLayout(&partConfig, TQString::fromLatin1("LogList view")); } @@ -220,7 +220,7 @@ void LogListView::slotQueryToolTip(const TQPoint& viewportPos, { if (const LogListViewItem* item = static_cast(itemAt(viewportPos))) { - viewportRect = tqitemRect(item); + viewportRect = itemRect(item); text = item->m_logInfo.createToolTipText(); } } diff --git a/cervisia/logtree.cpp b/cervisia/logtree.cpp index 88684312..e48c3870 100644 --- a/cervisia/logtree.cpp +++ b/cervisia/logtree.cpp @@ -249,7 +249,7 @@ void LogTreeView::setSelectedPair(TQString selectionA, TQString selectionB) } -TQSize LogTreeView::tqsizeHint() const +TQSize LogTreeView::sizeHint() const { return TQSize(2 * static_width, 3 * static_height); } diff --git a/cervisia/logtree.h b/cervisia/logtree.h index f1af28b9..c895c183 100644 --- a/cervisia/logtree.h +++ b/cervisia/logtree.h @@ -56,7 +56,7 @@ public: virtual void paintCell(TQPainter *p, int row, int col, const TQRect& cr, bool selected, const TQColorGroup& cg); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; virtual TQString text(int row, int col) const; diff --git a/cervisia/mergedlg.cpp b/cervisia/mergedlg.cpp index be371c62..b91ca889 100644 --- a/cervisia/mergedlg.cpp +++ b/cervisia/mergedlg.cpp @@ -40,7 +40,7 @@ MergeDialog::MergeDialog(CvsService_stub* service, cvsService(service) { int const iComboBoxMinWidth(30 * fontMetrics().width('0')); - int const iWidgetIndent(tqstyle().tqpixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0) + 6); + int const iWidgetIndent(tqstyle().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0) + 6); TQFrame* mainWidget = makeMainWidget(); diff --git a/cervisia/misc.cpp b/cervisia/misc.cpp index 76ae72d1..99ae25ec 100644 --- a/cervisia/misc.cpp +++ b/cervisia/misc.cpp @@ -261,14 +261,14 @@ TQStringList splitLine(TQString line, char delim) const TQStringList fetchBranches(CvsService_stub* cvsService, TQWidget* parent) { - return FetchBranchesAndTags(TQString::tqfromLatin1("branch"), cvsService, + return FetchBranchesAndTags(TQString::fromLatin1("branch"), cvsService, parent); } const TQStringList fetchTags(CvsService_stub* cvsService, TQWidget* parent) { - return FetchBranchesAndTags(TQString::tqfromLatin1("revision"), cvsService, + return FetchBranchesAndTags(TQString::fromLatin1("revision"), cvsService, parent); } diff --git a/cervisia/progressdlg.cpp b/cervisia/progressdlg.cpp index abf23d1a..a7e34018 100644 --- a/cervisia/progressdlg.cpp +++ b/cervisia/progressdlg.cpp @@ -90,8 +90,8 @@ void ProgressDialog::setupGui(const TQString& heading) TQHBoxLayout* hboxLayout = new TQHBoxLayout(headingBox); TQLabel* textLabel = new TQLabel(heading, headingBox); - textLabel->setMinimumWidth(textLabel->tqsizeHint().width()); - textLabel->setFixedHeight(textLabel->tqsizeHint().height()); + textLabel->setMinimumWidth(textLabel->sizeHint().width()); + textLabel->setFixedHeight(textLabel->sizeHint().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(tqsizeHint()); + resize(sizeHint()); } diff --git a/cervisia/qttableview.cpp b/cervisia/qttableview.cpp index a9e8a9fd..02de078e 100644 --- a/cervisia/qttableview.cpp +++ b/cervisia/qttableview.cpp @@ -33,8 +33,8 @@ enum ScrollBarDirtyFlags { }; -#define HSBEXT horizontalScrollBar()->tqsizeHint().height() -#define VSBEXT verticalScrollBar()->tqsizeHint().width() +#define HSBEXT horizontalScrollBar()->sizeHint().height() +#define VSBEXT verticalScrollBar()->sizeHint().width() class TQCornerSquare : public TQWidget // internal class @@ -1384,7 +1384,7 @@ void QtTableView::paintEvent( TQPaintEvent *e ) // outside the cells. TQRect viewR = viewRect(); - const TQColorGroup g = tqcolorGroup(); + const TQColorGroup g = colorGroup(); if ( xPos <= maxX ) { TQRect r = viewR; @@ -1447,7 +1447,7 @@ TQScrollBar *QtTableView::verticalScrollBar() const #ifndef TQT_NO_CURSOR sb->setCursor( arrowCursor ); #endif - sb->resize( sb->tqsizeHint() ); // height is irrelevant + sb->resize( sb->sizeHint() ); // height is irrelevant Q_CHECK_PTR(sb); sb->setTracking( FALSE ); sb->setFocusPolicy( TQ_NoFocus ); @@ -1478,7 +1478,7 @@ TQScrollBar *QtTableView::horizontalScrollBar() const #ifndef TQT_NO_CURSOR sb->setCursor( arrowCursor ); #endif - sb->resize( sb->tqsizeHint() ); // width is irrelevant + sb->resize( sb->sizeHint() ); // width is irrelevant sb->setFocusPolicy( TQ_NoFocus ); Q_CHECK_PTR(sb); sb->setTracking( FALSE ); diff --git a/cervisia/repositorydlg.cpp b/cervisia/repositorydlg.cpp index 64adc69e..25cca4c9 100644 --- a/cervisia/repositorydlg.cpp +++ b/cervisia/repositorydlg.cpp @@ -141,14 +141,14 @@ void RepositoryListItem::setIsLoggedIn(bool isLoggedIn) void RepositoryListItem::changeLoginStatusColumn() { - TQString logintqStatus; + TQString loginStatus; if( LoginNeeded(repository()) ) - logintqStatus = m_isLoggedIn ? i18n("Logged in") : i18n("Not logged in"); + loginStatus = m_isLoggedIn ? i18n("Logged in") : i18n("Not logged in"); else - logintqStatus = i18n("No login required"); + loginStatus = i18n("No login required"); - setText(3, logintqStatus); + setText(3, loginStatus); } @@ -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::tqfromLatin1("RepositoryListView")); + m_repoList->restoreLayout(&m_partConfig, TQString::fromLatin1("RepositoryListView")); } @@ -239,7 +239,7 @@ RepositoryDialog::~RepositoryDialog() { saveDialogSize(m_partConfig, "RepositoryDialog"); - m_repoList->saveLayout(&m_partConfig, TQString::tqfromLatin1("RepositoryListView")); + m_repoList->saveLayout(&m_partConfig, TQString::fromLatin1("RepositoryListView")); delete m_serviceConfig; } @@ -274,7 +274,7 @@ void RepositoryDialog::readConfigFile() RepositoryListItem* ritem = static_cast(item); // read entries from cvs DCOP service configuration - m_serviceConfig->setGroup(TQString::tqfromLatin1("Repository-") + + m_serviceConfig->setGroup(TQString::fromLatin1("Repository-") + ritem->repository()); TQString rsh = m_serviceConfig->readEntry("rsh", TQString()); @@ -490,7 +490,7 @@ void RepositoryDialog::slotSelectionChanged() void RepositoryDialog::writeRepositoryData(RepositoryListItem* item) { // write entries to cvs DCOP service configuration - m_serviceConfig->setGroup(TQString::tqfromLatin1("Repository-") + + m_serviceConfig->setGroup(TQString::fromLatin1("Repository-") + item->repository()); m_serviceConfig->writeEntry("rsh", item->rsh()); diff --git a/cervisia/resolvedlg.cpp b/cervisia/resolvedlg.cpp index fd3e7d9a..a2aceced 100644 --- a/cervisia/resolvedlg.cpp +++ b/cervisia/resolvedlg.cpp @@ -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->tqsetAlignment(AlignCenter); + nofnlabel->setAlignment(AlignCenter); backbutton = new TQPushButton("&<<", mainWidget); connect( backbutton, TQT_SIGNAL(clicked()), TQT_SLOT(backClicked()) ); diff --git a/cervisia/settingsdlg.cpp b/cervisia/settingsdlg.cpp index eecdd41f..d1350323 100644 --- a/cervisia/settingsdlg.cpp +++ b/cervisia/settingsdlg.cpp @@ -52,7 +52,7 @@ namespace inline TQPixmap LoadIcon(const char* iconName) { KIconLoader* loader = KGlobal::instance()->iconLoader(); - return loader->loadIcon(TQString::tqfromLatin1(iconName), KIcon::NoGroup, + return loader->loadIcon(TQString::fromLatin1(iconName), KIcon::NoGroup, KIcon::SizeMedium); } } @@ -99,7 +99,7 @@ SettingsDialog::SettingsDialog( KConfig *conf, TQWidget *parent, const char *nam addDiffPage(); // - // tqStatus Options + // Status 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::tqallWidgets()); + TQWidgetListIt it(*TQApplication::allWidgets()); for (; it.current(); ++it) { TQWidget *w = it.current(); @@ -341,37 +341,37 @@ void SettingsDialog::addLookAndFeelPage() m_changelogFontBox = new FontButton(i18n("Font for ChangeLog View..."), fontGroupBox); - TQGroupBox* tqcolorGroupBox = new TQGroupBox(4, Qt::Horizontal, + TQGroupBox* colorGroupBox = new TQGroupBox(4, Qt::Horizontal, i18n("Colors"), lookPage); - tqcolorGroupBox->setColumns(4); - tqcolorGroupBox->setInsideSpacing(KDialog::spacingHint()); + colorGroupBox->setColumns(4); + colorGroupBox->setInsideSpacing(KDialog::spacingHint()); - TQLabel* conflictLabel = new TQLabel(i18n("Conflict:"), tqcolorGroupBox); - m_conflictButton = new KColorButton(tqcolorGroupBox); + TQLabel* conflictLabel = new TQLabel(i18n("Conflict:"), colorGroupBox); + m_conflictButton = new KColorButton(colorGroupBox); conflictLabel->setBuddy(m_conflictButton); - TQLabel* diffChangeLabel = new TQLabel(i18n("Diff change:"), tqcolorGroupBox); - m_diffChangeButton = new KColorButton(tqcolorGroupBox); + TQLabel* diffChangeLabel = new TQLabel(i18n("Diff change:"), colorGroupBox); + m_diffChangeButton = new KColorButton(colorGroupBox); diffChangeLabel->setBuddy(m_diffChangeButton); - TQLabel* localChangeLabel = new TQLabel(i18n("Local change:"), tqcolorGroupBox); - m_localChangeButton = new KColorButton(tqcolorGroupBox); + TQLabel* localChangeLabel = new TQLabel(i18n("Local change:"), colorGroupBox); + m_localChangeButton = new KColorButton(colorGroupBox); localChangeLabel->setBuddy(m_localChangeButton); - TQLabel* diffInsertLabel = new TQLabel(i18n("Diff insertion:"), tqcolorGroupBox); - m_diffInsertButton = new KColorButton(tqcolorGroupBox); + TQLabel* diffInsertLabel = new TQLabel(i18n("Diff insertion:"), colorGroupBox); + m_diffInsertButton = new KColorButton(colorGroupBox); diffInsertLabel->setBuddy(m_diffInsertButton); - TQLabel* remoteChangeLabel = new TQLabel(i18n("Remote change:"), tqcolorGroupBox); - m_remoteChangeButton = new KColorButton(tqcolorGroupBox); + TQLabel* remoteChangeLabel = new TQLabel(i18n("Remote change:"), colorGroupBox); + m_remoteChangeButton = new KColorButton(colorGroupBox); remoteChangeLabel->setBuddy( m_remoteChangeButton ); - TQLabel* diffDeleteLabel = new TQLabel(i18n("Diff deletion:"), tqcolorGroupBox); - m_diffDeleteButton = new KColorButton(tqcolorGroupBox); + TQLabel* diffDeleteLabel = new TQLabel(i18n("Diff deletion:"), colorGroupBox); + m_diffDeleteButton = new KColorButton(colorGroupBox); diffDeleteLabel->setBuddy(m_diffDeleteButton); - TQLabel* notInCvsLabel = new TQLabel(i18n("Not in cvs:"), tqcolorGroupBox); - m_notInCvsButton = new KColorButton(tqcolorGroupBox); + TQLabel* notInCvsLabel = new TQLabel(i18n("Not in cvs:"), colorGroupBox); + m_notInCvsButton = new KColorButton(colorGroupBox); notInCvsLabel->setBuddy(m_notInCvsButton); m_splitterBox = new TQCheckBox(i18n("Split main window &horizontally"), lookPage); diff --git a/cervisia/settingsdlg_advanced.ui b/cervisia/settingsdlg_advanced.ui index 2100e8ff..c15d391f 100644 --- a/cervisia/settingsdlg_advanced.ui +++ b/cervisia/settingsdlg_advanced.ui @@ -26,7 +26,7 @@ Expanding - + 31 41 diff --git a/cervisia/updatedlg.cpp b/cervisia/updatedlg.cpp index 55243796..1b49493e 100644 --- a/cervisia/updatedlg.cpp +++ b/cervisia/updatedlg.cpp @@ -40,7 +40,7 @@ UpdateDialog::UpdateDialog(CvsService_stub* service, cvsService(service) { int const iComboBoxMinWidth(40 * fontMetrics().width('0')); - int const iWidgetIndent(tqstyle().tqpixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0) + 6); + int const iWidgetIndent(tqstyle().pixelMetric(TQStyle::PM_ExclusiveIndicatorWidth, 0) + 6); TQFrame* mainWidget = makeMainWidget(); diff --git a/cervisia/updateview.cpp b/cervisia/updateview.cpp index 47ab5c65..52e44b2e 100644 --- a/cervisia/updateview.cpp +++ b/cervisia/updateview.cpp @@ -35,7 +35,7 @@ using Cervisia::Entry; -using Cervisia::EntrytqStatus; +using Cervisia::EntryStatus; UpdateView::UpdateView(KConfig& partConfig, TQWidget *parent, const char *name) @@ -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::tqfromLatin1("UpdateView")); + restoreLayout(&m_partConfig, TQString::fromLatin1("UpdateView")); } UpdateView::~UpdateView() { - saveLayout(&m_partConfig, TQString::tqfromLatin1("UpdateView")); + saveLayout(&m_partConfig, TQString::fromLatin1("UpdateView")); } @@ -548,7 +548,7 @@ void UpdateView::updateColors() /** - * Process one line from the output of 'cvs update'. If parseAstqStatus + * Process one line from the output of 'cvs update'. If parseAsStatus * 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] == ' ') { - EntrytqStatus status(Cervisia::Unknown); + EntryStatus 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::tqfromLatin1("cvs server: ")); - const TQString removedFileEnd(TQString::tqfromLatin1(" is no longer in the repository")); + const TQString removedFileStart(TQString::fromLatin1("cvs server: ")); + const TQString removedFileEnd(TQString::fromLatin1(" 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, EntrytqStatus status, bool isdir) +void UpdateView::updateItem(const TQString& filePath, EntryStatus status, bool isdir) { if (isdir && filePath == TQChar('.')) return; diff --git a/cervisia/updateview.h b/cervisia/updateview.h index 181cf739..9fde0956 100644 --- a/cervisia/updateview.h +++ b/cervisia/updateview.h @@ -86,7 +86,7 @@ private slots: void itemExecuted(TQListViewItem *item); private: - void updateItem(const TQString &filename, Cervisia::EntrytqStatus status, bool isdir); + void updateItem(const TQString &filename, Cervisia::EntryStatus 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 4e07c1ab..99276c3c 100644 --- a/cervisia/updateview_items.cpp +++ b/cervisia/updateview_items.cpp @@ -39,7 +39,7 @@ using Cervisia::Entry; -using Cervisia::EntrytqStatus; +using Cervisia::EntryStatus; // ------------------------------------------------------------------------------ @@ -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, - EntrytqStatus status, + EntryStatus 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(item); - fileItem->settqStatus(status); + fileItem->setStatus(status); } return; } @@ -127,7 +127,7 @@ void UpdateDirItem::updateChildItem(const TQString& name, else { entry.m_type = Entry::File; - createFileItem(entry)->settqStatus(status); + createFileItem(entry)->setStatus(status); } } @@ -150,7 +150,7 @@ void UpdateDirItem::updateEntriesItem(const Entry& entry, entry.m_status == Cervisia::LocallyRemoved || entry.m_status == Cervisia::Conflict) { - fileItem->settqStatus(entry.m_status); + fileItem->setStatus(entry.m_status); } fileItem->setRevTag(entry.m_revision, entry.m_tag); fileItem->setDate(entry.m_dateTime); @@ -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::tqfromLatin1("[0-9][0-9]:[0-9][0-9]:[0-9][0-9]")) ); + int pivot = s.find( TQRegExp(TQString::fromLatin1("[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(); @@ -392,7 +392,7 @@ void UpdateDirItem::syncWithDirectory() // is file removed? if (!dir.exists(it.key())) { - fileItem->settqStatus(Cervisia::Removed); + fileItem->setStatus(Cervisia::Removed); fileItem->setRevTag(TQString(), TQString()); } } @@ -501,7 +501,7 @@ UpdateFileItem::UpdateFileItem(UpdateDirItem* parent, const Entry& entry) } -void UpdateFileItem::settqStatus(EntrytqStatus status) +void UpdateFileItem::setStatus(EntryStatus status) { if (status != m_entry.m_status) { @@ -598,13 +598,13 @@ void UpdateFileItem::setDate(const TQDateTime& date) void UpdateFileItem::markUpdated(bool laststage, bool success) { - EntrytqStatus newstatus = m_entry.m_status; + EntryStatus newstatus = m_entry.m_status; if (laststage) { if (undefinedState() && m_entry.m_status != Cervisia::NotInCVS) newstatus = success? Cervisia::UpToDate : Cervisia::Unknown; - settqStatus(newstatus); + setStatus(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 tqStatus: + case Status: 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 tqStatus: + case Status: result = toString(entry().m_status); break; case Revision: diff --git a/cervisia/updateview_items.h b/cervisia/updateview_items.h index ca26930f..b3a034c3 100644 --- a/cervisia/updateview_items.h +++ b/cervisia/updateview_items.h @@ -78,7 +78,7 @@ public: void syncWithDirectory(); void syncWithEntries(); - void updateChildItem(const TQString& name, Cervisia::EntrytqStatus status, bool isdir); + void updateChildItem(const TQString& name, Cervisia::EntryStatus status, bool isdir); void updateEntriesItem(const Cervisia::Entry& entry, bool isBinary); bool wasScanned() const { return m_opened; } @@ -119,7 +119,7 @@ class UpdateFileItem : public UpdateItem { public: - enum { Name, MimeType, tqStatus, Revision, TagOrDate, Timestamp }; + enum { Name, MimeType, Status, Revision, TagOrDate, Timestamp }; UpdateFileItem(UpdateDirItem* parent, const Cervisia::Entry& entry); @@ -132,7 +132,7 @@ public: int col, int width, int align); virtual int rtti() const { return RTTI; } - void settqStatus(Cervisia::EntrytqStatus status); + void setStatus(Cervisia::EntryStatus status); void setRevTag(const TQString& rev, const TQString& tag); void setDate(const TQDateTime& date); void setUndefinedState(bool b) -- cgit v1.2.3