Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

4 files changed, 11 insertions, 11 deletions

diff --git a/src/k9copy.cpp b/src/k9copy.cpp
index 70ce41b..030a1e1 100644
--- a/src/k9copy.cpp
+++ b/src/k9copy.cpp
@@ -351,7 +351,7 @@ void k9Copy::optionsConfigureKeys() {
 
 void k9Copy::optionsConfigureToolbars() {
     // use the standard toolbar editor
-    saveMainWindowSettings(KGlobal::config(), autoSaveGroup());
+    saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
     KEditToolbar dlg(factory());
     connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(newToolbarConfig()));
     dlg.exec();
@@ -362,7 +362,7 @@ void k9Copy::newToolbarConfig() {
     // recreate our GUI, and re-apply the settings (e.g. "text under icons", etc.)
     createGUI(0);
 
-    applyMainWindowSettings(KGlobal::config(), autoSaveGroup());
+    applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
 }
 
 void k9Copy::fileOpen() {
diff --git a/src/k9mencodercmdgen.cpp b/src/k9mencodercmdgen.cpp
index 299f2a8..2f2924e 100644
--- a/src/k9mencodercmdgen.cpp
+++ b/src/k9mencodercmdgen.cpp
@@ -136,7 +136,7 @@ void k9MencoderCmdGen::listViewCurrentChanged(TQListViewItem *_item) {
 }
 
 void k9MencoderCmdGen::loadXml() {
-    TQFile file(KGlobal::dirs()->findResource( "data", "k9copy/mencoder.xml"));
+    TQFile file(TDEGlobal::dirs()->findResource( "data", "k9copy/mencoder.xml"));
     if ( !file.open( IO_ReadOnly ) )
         return;
     if ( !m_doc.setContent( &file ) ) {
diff --git a/src/k9redirect.cpp b/src/k9redirect.cpp
index fda674b..f38c242 100644
--- a/src/k9redirect.cpp
+++ b/src/k9redirect.cpp
@@ -21,11 +21,11 @@ k9Redirect::~k9Redirect()
 }
 
 void k9Redirect::execute() {
-    KProcess *p=new KProcess();
+    TDEProcess *p=new TDEProcess();
     *p << "mencoder";
     *p << "-oac" << "lavc" << "-ovc" << "lavc" << "-of" << "mpeg";
     *p << "-mpegopts" << "format=dvd" << "-vf" << "scale=720:576,harddup" << "-srate" << "48000" << "-af"  << "lavcresample=48000" << "-lavcopts" << "vcodec=mpeg2video:vrc_buf_size=1835:vrc_maxrate=9800:vbitrate=5000:keyint=15:acodec=ac3:abitrate=192:aspect=16/9" << "-ofps" << "25" << "-o" << "/tmp/tde-jmp/k9copy/tmp.mpeg" << "-ss" << "00:00:00.000" << "-endpos" << "00:00:57.360" << "-really-quiet" << "/home/jmp/t.avi";
-    p->start(KProcess::NotifyOnExit);
+    p->start(TDEProcess::NotifyOnExit);
     p->wait();
 
 
diff --git a/src/k9settings.cpp b/src/k9settings.cpp
index f3507aa..99bd031 100644
--- a/src/k9settings.cpp
+++ b/src/k9settings.cpp
@@ -24,14 +24,14 @@ k9settings::k9settings(TQWidget *parent,const TQString &caption):  KDialogBase (
     setInitialSize(TQSize(750,350), false);
 
     TQFrame *frDevices;
-    frDevices=addPage (i18n("Devices"),i18n("Devices not detected by k9copy"),KGlobal::iconLoader()->loadIcon("blockdevice", KIcon::Panel, KIcon::SizeMedium));
+    frDevices=addPage (i18n("Devices"),i18n("Devices not detected by k9copy"),TDEGlobal::iconLoader()->loadIcon("blockdevice", KIcon::Panel, KIcon::SizeMedium));
     TQGridLayout *grid = new TQGridLayout(frDevices, 0, 0, 10 );
     m_configDlg=new kConfigDlg(frDevices);
     grid->addWidget(m_configDlg,0,0);
 
 
     TQFrame *frDVD;
-    frDVD=addPage (i18n("DVD"),i18n("DVD Backup"),KGlobal::iconLoader()->loadIcon("dvdcopy", KIcon::Panel, KIcon::SizeMedium));
+    frDVD=addPage (i18n("DVD"),i18n("DVD Backup"),TDEGlobal::iconLoader()->loadIcon("dvdcopy", KIcon::Panel, KIcon::SizeMedium));
     grid = new TQGridLayout(frDVD, 0, 0, 10 );
     m_prefDVD =new k9prefDVD(frDVD);
     grid->addWidget(m_prefDVD,0,0);
@@ -39,13 +39,13 @@ k9settings::k9settings(TQWidget *parent,const TQString &caption):  KDialogBase (
     //TODO afficher uniquement si mencoder et mplayer installés
 
     TQFrame *frMencoder;
-    frMencoder=addPage (i18n("MEncoder"),i18n("MPEG-4 Codecs"),KGlobal::iconLoader()->loadIcon("mencoder", KIcon::Panel, KIcon::SizeMedium));
+    frMencoder=addPage (i18n("MEncoder"),i18n("MPEG-4 Codecs"),TDEGlobal::iconLoader()->loadIcon("mencoder", KIcon::Panel, KIcon::SizeMedium));
     m_prefMencoder =new k9prefMencoder(frMencoder);
 
 
 
     TQFrame *frMPEG4;
-    frMPEG4=addPage (i18n("MPEG-4"),i18n("MPEG-4 Encoding"),KGlobal::iconLoader()->loadIcon("mp4", KIcon::Panel, KIcon::SizeMedium));
+    frMPEG4=addPage (i18n("MPEG-4"),i18n("MPEG-4 Encoding"),TDEGlobal::iconLoader()->loadIcon("mp4", KIcon::Panel, KIcon::SizeMedium));
     grid = new TQGridLayout(frMPEG4, 0, 0, 10 );
     m_prefMPEG4 =new k9prefMPEG4(frMPEG4);
     grid->addWidget(m_prefMPEG4,0,0);
@@ -54,13 +54,13 @@ k9settings::k9settings(TQWidget *parent,const TQString &caption):  KDialogBase (
     grid->addWidget(m_prefMencoder,0,0);
 
     TQFrame *frPreview;
-    frPreview=addPage (i18n("Preview"),i18n("Title preview"),KGlobal::iconLoader()->loadIcon("mplayer", KIcon::Panel, KIcon::SizeMedium));
+    frPreview=addPage (i18n("Preview"),i18n("Title preview"),TDEGlobal::iconLoader()->loadIcon("mplayer", KIcon::Panel, KIcon::SizeMedium));
     grid = new TQGridLayout(frPreview, 0, 0, 10 );
     m_prefPreview =new k9prefPreview(frPreview);
     grid->addWidget(m_prefPreview,0,0);
 
     TQFrame *frAuthor;
-    frAuthor=addPage(i18n("Authoring"),i18n("Authoring"),KGlobal::iconLoader()->loadIcon("author",KIcon::Panel,KIcon::SizeMedium));
+    frAuthor=addPage(i18n("Authoring"),i18n("Authoring"),TDEGlobal::iconLoader()->loadIcon("author",KIcon::Panel,KIcon::SizeMedium));
     grid = new TQGridLayout(frAuthor, 0, 0, 10 );
     m_prefAuthor =new k9prefAuthor(frAuthor);
     grid->addWidget(m_prefAuthor,0,0);