summaryrefslogtreecommitdiffstats
path: root/knode/kncomposer.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:49:30 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:49:30 -0600
commita9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch)
treed087071b1e8fcf79698938efec19f8e48bab0799 /knode/kncomposer.cpp
parent5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff)
downloadtdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz
tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'knode/kncomposer.cpp')
-rw-r--r--knode/kncomposer.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp
index 4ea5b2ed5..ec6e61b1c 100644
--- a/knode/kncomposer.cpp
+++ b/knode/kncomposer.cpp
@@ -840,9 +840,9 @@ bool KNComposer::applyChanges()
TQString tmpText = tmp;
Kpgp::Block block;
bool ok=true;
- TQTextCodec *codec=KGlobal::charsets()->codecForName(c_harset, ok);
+ TQTextCodec *codec=TDEGlobal::charsets()->codecForName(c_harset, ok);
if(!ok) // no suitable codec found => try local settings and hope the best ;-)
- codec=KGlobal::locale()->codecForEncoding();
+ codec=TDEGlobal::locale()->codecForEncoding();
block.setText( codec->fromUnicode(tmpText) );
kdDebug(5003) << "signing article from " << article()->from()->email() << endl;
@@ -964,7 +964,7 @@ void KNComposer::insertFile(TQFile *file, bool clear, bool box, TQString boxTitl
{
TQString temp;
bool ok=true;
- TQTextCodec *codec=KGlobal::charsets()->codecForName(c_harset, ok);
+ TQTextCodec *codec=TDEGlobal::charsets()->codecForName(c_harset, ok);
TQTextStream ts(file);
ts.setCodec(codec);
@@ -1264,7 +1264,7 @@ void KNComposer::slotExternalEditor()
}
bool ok=true;
- TQTextCodec *codec=KGlobal::charsets()->codecForName(c_harset, ok);
+ TQTextCodec *codec=TDEGlobal::charsets()->codecForName(c_harset, ok);
TQString tmp;
TQStringList textLines = v_iew->e_dit->processedText();
@@ -1287,7 +1287,7 @@ void KNComposer::slotExternalEditor()
return;
}
- e_xternalEditor=new KProcess();
+ e_xternalEditor=new TDEProcess();
// construct command line...
TQStringList command = TQStringList::split(' ',editorCommand);
@@ -1302,7 +1302,7 @@ void KNComposer::slotExternalEditor()
if(!filenameAdded) // no %f in the editor command
(*e_xternalEditor) << e_ditorTempfile->name();
- connect(e_xternalEditor, TQT_SIGNAL(processExited(KProcess *)),this, TQT_SLOT(slotEditorFinished(KProcess *)));
+ connect(e_xternalEditor, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotEditorFinished(TDEProcess *)));
if(!e_xternalEditor->start()) {
KMessageBox::error(this, i18n("Unable to start external editor.\nPlease check your configuration in the settings dialog."));
delete e_xternalEditor;
@@ -1520,7 +1520,7 @@ void KNComposer::slotGroupsBtnClicked()
}
-void KNComposer::slotEditorFinished(KProcess *)
+void KNComposer::slotEditorFinished(TDEProcess *)
{
if(e_xternalEditor->normalExit()) {
e_ditorTempfile->file()->close();