summaryrefslogtreecommitdiffstats
path: root/kate/part/katedialogs.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:47:22 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:47:22 -0600
commit28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch)
tree7b7a01768b3781763186c825af21bb14717d2c32 /kate/part/katedialogs.cpp
parent07c48c43ff72c237e4028154f4594102b798073f (diff)
downloadtdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz
tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kate/part/katedialogs.cpp')
-rw-r--r--kate/part/katedialogs.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/kate/part/katedialogs.cpp b/kate/part/katedialogs.cpp
index 5a5a73b70..1ae416264 100644
--- a/kate/part/katedialogs.cpp
+++ b/kate/part/katedialogs.cpp
@@ -999,7 +999,7 @@ void KateSaveConfigTab::apply()
KateDocumentConfig::global()->setConfigFlags(configFlags);
- KateDocumentConfig::global()->setEncoding((m_encoding->currentItem() == 0) ? "" : KGlobal::charsets()->encodingForName(m_encoding->currentText()));
+ KateDocumentConfig::global()->setEncoding((m_encoding->currentItem() == 0) ? "" : TDEGlobal::charsets()->encodingForName(m_encoding->currentText()));
KateDocumentConfig::global()->setEol(m_eol->currentItem());
KateDocumentConfig::global()->setAllowEolDetection(allowEolDetection->isChecked());
@@ -1013,12 +1013,12 @@ void KateSaveConfigTab::reload()
m_encoding->clear ();
m_encoding->insertItem (i18n("TDE Default"));
m_encoding->setCurrentItem(0);
- TQStringList encodings (KGlobal::charsets()->descriptiveEncodingNames());
+ TQStringList encodings (TDEGlobal::charsets()->descriptiveEncodingNames());
int insert = 1;
for (uint i=0; i < encodings.count(); i++)
{
bool found = false;
- TQTextCodec *codecForEnc = KGlobal::charsets()->codecForName(KGlobal::charsets()->encodingForName(encodings[i]), found);
+ TQTextCodec *codecForEnc = TDEGlobal::charsets()->codecForName(TDEGlobal::charsets()->encodingForName(encodings[i]), found);
if (found)
{
@@ -1529,7 +1529,7 @@ void KateHlDownloadDialog::listDataReceived(KIO::Job *, const TQByteArray &data)
void KateHlDownloadDialog::slotUser1()
{
- TQString destdir=KGlobal::dirs()->saveLocation("data","katepart/syntax/");
+ TQString destdir=TDEGlobal::dirs()->saveLocation("data","katepart/syntax/");
for (TQListViewItem *it=list->firstChild();it;it=it->nextSibling())
{
if (list->isSelected(it))
@@ -1640,16 +1640,16 @@ KateModOnHdPrompt::~KateModOnHdPrompt()
void KateModOnHdPrompt::slotDiff()
{
- // Start a KProcess that creates a diff
+ // Start a TDEProcess that creates a diff
KProcIO *p = new KProcIO();
- p->setComm( KProcess::All );
+ p->setComm( TDEProcess::All );
*p << "diff" << "-u" << "-" << m_doc->url().path();
- connect( p, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotPDone(KProcess*)) );
+ connect( p, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotPDone(TDEProcess*)) );
connect( p, TQT_SIGNAL(readReady(KProcIO*)), this, TQT_SLOT(slotPRead(KProcIO*)) );
setCursor( WaitCursor );
- p->start( KProcess::NotifyOnExit, true );
+ p->start( TDEProcess::NotifyOnExit, true );
uint lastln = m_doc->numLines();
for ( uint l = 0; l < lastln; l++ )
@@ -1678,7 +1678,7 @@ void KateModOnHdPrompt::slotPRead( KProcIO *p)
p->ackRead();
}
-void KateModOnHdPrompt::slotPDone( KProcess *p )
+void KateModOnHdPrompt::slotPDone( TDEProcess *p )
{
setCursor( ArrowCursor );
if( ! m_tmpfile )