summaryrefslogtreecommitdiffstats
path: root/kedit
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:50:20 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:50:20 -0600
commitaef5eada7f51ee48f3d21448db290bd8f06953a8 (patch)
tree9d6e7572ebcc27e402501d6966f9b46361a1702c /kedit
parent95d05392f9bc01594738a1e06ebf23123b3d3e6e (diff)
downloadtdeutils-aef5eada7f51ee48f3d21448db290bd8f06953a8.tar.gz
tdeutils-aef5eada7f51ee48f3d21448db290bd8f06953a8.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kedit')
-rw-r--r--kedit/kedit.cpp8
-rw-r--r--kedit/kedit.kcfg6
-rw-r--r--kedit/ktextfiledlg.cpp6
3 files changed, 10 insertions, 10 deletions
diff --git a/kedit/kedit.cpp b/kedit/kedit.cpp
index ad1e4de..c4e5849 100644
--- a/kedit/kedit.cpp
+++ b/kedit/kedit.cpp
@@ -342,7 +342,7 @@ void TopLevel::insertDate(){
TQString string;
TQDate dt = TQDate::currentDate();
- string = KGlobal::locale()->formatDate(dt);
+ string = TDEGlobal::locale()->formatDate(dt);
eframe->getCursorPosition(&line,&column);
eframe->insertAt(string,line,column);
@@ -896,7 +896,7 @@ void TopLevel::statusbar_slot(){
void TopLevel::print()
{
bool aborted = false;
- TQString headerLeft = i18n("Date: %1").arg(KGlobal::locale()->formatDate(TQDate::currentDate(),true));
+ TQString headerLeft = i18n("Date: %1").arg(TDEGlobal::locale()->formatDate(TQDate::currentDate(),true));
TQString headerMid = i18n("File: %1").arg(m_caption);
TQString headerRight;
@@ -1215,8 +1215,8 @@ void TopLevel::set_colors()
}
else
{
- ncgrp.setColor(TQColorGroup::Text, KGlobalSettings::textColor());
- ncgrp.setColor(TQColorGroup::Base, KGlobalSettings::baseColor());
+ ncgrp.setColor(TQColorGroup::Text, TDEGlobalSettings::textColor());
+ ncgrp.setColor(TQColorGroup::Base, TDEGlobalSettings::baseColor());
}
mypalette.setActive(ncgrp);
diff --git a/kedit/kedit.kcfg b/kedit/kedit.kcfg
index a647737..ef1e433 100644
--- a/kedit/kedit.kcfg
+++ b/kedit/kedit.kcfg
@@ -8,7 +8,7 @@
<group name="Text Font">
<entry name="Font" type="Font" key="KEditFont">
<label>Font</label>
- <default code="true">KGlobalSettings::fixedFont()</default>
+ <default code="true">TDEGlobalSettings::fixedFont()</default>
</entry>
</group>
<group name="General Options">
@@ -18,11 +18,11 @@
</entry>
<entry name="TextColor" type="Color" key="ForeColor">
<label>Text color</label>
- <default code="true">KGlobalSettings::textColor()</default>
+ <default code="true">TDEGlobalSettings::textColor()</default>
</entry>
<entry name="BackgroundColor" type="Color" key="BackColor">
<label>Background color</label>
- <default code="true">KGlobalSettings::baseColor()</default>
+ <default code="true">TDEGlobalSettings::baseColor()</default>
</entry>
<entry name="WrapMode" type="Enum">
<label>Wrapping mode</label>
diff --git a/kedit/ktextfiledlg.cpp b/kedit/ktextfiledlg.cpp
index 027ee2f..47dbd07 100644
--- a/kedit/ktextfiledlg.cpp
+++ b/kedit/ktextfiledlg.cpp
@@ -43,7 +43,7 @@ KTextFileDialog::KTextFileDialog(const TQString& startDir,
TQT_SLOT( slotSetEncoding() ), this,
"encoding" );
- TQStringList encodings = KGlobal::charsets()->descriptiveEncodingNames();
+ TQStringList encodings = TDEGlobal::charsets()->descriptiveEncodingNames();
encodings.prepend( i18n( "Default encoding" ) );
mEncoding->setItems( encodings );
mEncoding->setCurrentItem(0);
@@ -103,7 +103,7 @@ void KTextFileDialog::slotShowEncCombo()
encCombo->setInsertionPolicy(TQComboBox::NoInsertion);
encCombo->insertItem(i18n("Default Encoding"));
- TQStringList encodings = KGlobal::charsets()->descriptiveEncodingNames();
+ TQStringList encodings = TDEGlobal::charsets()->descriptiveEncodingNames();
encodings.prepend( i18n( "Default encoding" ) );
encCombo->insertStringList( encodings );
encCombo->setCurrentItem(0);
@@ -131,7 +131,7 @@ void KTextFileDialog::slotShowEncCombo()
if (encCombo->currentItem() == 0) { // Default
setEncoding("");
} else {
- setEncoding(KGlobal::charsets()->
+ setEncoding(TDEGlobal::charsets()->
encodingForName(encCombo->currentText()));
}
}