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/ksvnwidgets | |
| 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/ksvnwidgets')
| -rw-r--r-- | src/ksvnwidgets/diffbrowser.cpp | 2 | ||||
| -rw-r--r-- | src/ksvnwidgets/diffsyntax.cpp | 2 | ||||
| -rw-r--r-- | src/ksvnwidgets/encodingselector_impl.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/ksvnwidgets/diffbrowser.cpp b/src/ksvnwidgets/diffbrowser.cpp index 5e71787..0c6c9a5 100644 --- a/src/ksvnwidgets/diffbrowser.cpp +++ b/src/ksvnwidgets/diffbrowser.cpp @@ -42,7 +42,7 @@ DiffBrowser::DiffBrowser(TQWidget*parent,const char*name) : KTextBrowser( parent, name) { setTextFormat(TQt::PlainText); - setFont(KGlobalSettings::fixedFont()); + setFont(TDEGlobalSettings::fixedFont()); m_Data = new DiffBrowserData; setWordWrap(TQTextEdit::NoWrap); diff --git a/src/ksvnwidgets/diffsyntax.cpp b/src/ksvnwidgets/diffsyntax.cpp index 77d2381..60a95de 100644 --- a/src/ksvnwidgets/diffsyntax.cpp +++ b/src/ksvnwidgets/diffsyntax.cpp @@ -42,7 +42,7 @@ int DiffSyntax::highlightParagraph ( const TQString & aText, int endStateOfLastP static TQRegExp a("^\\w+:\\s.*$"); static TQRegExp b("^\\W+$"); TQColor c(0,0,0); - TQFont f(KGlobalSettings::fixedFont()); + TQFont f(TDEGlobalSettings::fixedFont()); int ret = 0; if (endStateOfLastPara == 1) { ret = 2; diff --git a/src/ksvnwidgets/encodingselector_impl.cpp b/src/ksvnwidgets/encodingselector_impl.cpp index 3017581..265b1eb 100644 --- a/src/ksvnwidgets/encodingselector_impl.cpp +++ b/src/ksvnwidgets/encodingselector_impl.cpp @@ -27,7 +27,7 @@ EncodingSelector_impl::EncodingSelector_impl(const TQString&cur,TQWidget *parent, const char *name) :EncodingSelector(parent, name) { - m_encodingList->insertStringList( KGlobal::charsets()->availableEncodingNames()); + m_encodingList->insertStringList( TDEGlobal::charsets()->availableEncodingNames()); for (int j = 1;j<m_encodingList->count();++j ) { if(m_encodingList->text(j)==cur) { |