diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:27:08 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:27:08 -0600 |
| commit | 773793eead2fea173ec9202ee938020592e86a02 (patch) | |
| tree | 2df8f77f488c1e7de1c16eb6d50d33337bc6bea5 /src/svnfrontend/blamedisplay_impl.cpp | |
| parent | f4899658cbe0d29487071c8340b66c80cc2a3010 (diff) | |
| download | tdesvn-773793eead2fea173ec9202ee938020592e86a02.tar.gz tdesvn-773793eead2fea173ec9202ee938020592e86a02.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src/svnfrontend/blamedisplay_impl.cpp')
| -rw-r--r-- | src/svnfrontend/blamedisplay_impl.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/svnfrontend/blamedisplay_impl.cpp b/src/svnfrontend/blamedisplay_impl.cpp index 873d9c1..6eccfa0 100644 --- a/src/svnfrontend/blamedisplay_impl.cpp +++ b/src/svnfrontend/blamedisplay_impl.cpp @@ -145,7 +145,7 @@ BlameDisplayItem::BlameDisplayItem(KListView*lv,BlameDisplayItem*it,const svn::A int BlameDisplayItem::width (const TQFontMetrics & fm, const TQListView * lv, int c ) const { if (c == COL_LINE) { - return KListViewItem::width(TQFontMetrics(KGlobalSettings::fixedFont()),lv,c)+2*BORDER; + return KListViewItem::width(TQFontMetrics(TDEGlobalSettings::fixedFont()),lv,c)+2*BORDER; } return KListViewItem::width(fm,lv,c)+2*BORDER; } @@ -156,7 +156,7 @@ void BlameDisplayItem::display() setText(COL_REV,TQString("%1").arg(m_Content.revision())); setText(COL_AUT,m_Content.tAuthor()); if (m_Content.date().isValid()) { - setText(COL_DATE,KGlobal::locale()->formatDateTime(m_Content.date())); + setText(COL_DATE,TDEGlobal::locale()->formatDateTime(m_Content.date())); } } @@ -190,14 +190,14 @@ void BlameDisplayItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colum /* don't copy string */ const TQString & str = text(column);; if (column == COL_LINE) { - p->setFont(KGlobalSettings::fixedFont()); + p->setFont(TDEGlobalSettings::fixedFont()); } TQColorGroup _cg = cg; TQColor _bgColor; if (column==COL_LINENR || isSelected()) { - _bgColor = KGlobalSettings::highlightColor(); - p->setPen(KGlobalSettings::highlightedTextColor()); + _bgColor = TDEGlobalSettings::highlightColor(); + p->setPen(TDEGlobalSettings::highlightedTextColor()); } else { if (Kdesvnsettings::self()->colored_blame()) { _bgColor = cb->rev2color(m_Content.revision()); @@ -415,7 +415,7 @@ void BlameDisplay_impl::showCommit(BlameDisplayItem*bit) KDialogBase::Close); TQWidget* Dialog1Layout = dlg->makeVBoxMainWidget(); KTextBrowser*ptr = new KTextBrowser(Dialog1Layout); - ptr->setFont(KGlobalSettings::fixedFont()); + ptr->setFont(TDEGlobalSettings::fixedFont()); ptr->setWordWrap(TQTextEdit::NoWrap); ptr->setText(text); dlg->resize(dlg->configDialogSize(*(Kdesvnsettings::self()->config()),"simplelog_display")); |