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

17 files changed, 25 insertions, 25 deletions

diff --git a/umbrello/umbrello/aligntoolbar.cpp b/umbrello/umbrello/aligntoolbar.cpp
index 3aac8342..d8248bda 100644
--- a/umbrello/umbrello/aligntoolbar.cpp
+++ b/umbrello/umbrello/aligntoolbar.cpp
@@ -67,7 +67,7 @@ bool AlignToolBar::hasWidgetSmallerY(const UMLWidget* widget1, const UMLWidget*
 }
 
 void AlignToolBar::loadPixmaps() {
-    KStandardDirs* dirs = KGlobal::dirs();
+    KStandardDirs* dirs = TDEGlobal::dirs();
     TQString dataDir = dirs->findResourceDir( "data", "umbrello/pics/object.png" );
     dataDir += "/umbrello/pics/";
 
diff --git a/umbrello/umbrello/dialogs/assocgenpage.cpp b/umbrello/umbrello/dialogs/assocgenpage.cpp
index b093cae0..5a84a3ec 100644
--- a/umbrello/umbrello/dialogs/assocgenpage.cpp
+++ b/umbrello/umbrello/dialogs/assocgenpage.cpp
@@ -107,7 +107,7 @@ void AssocGenPage::constructWidget() {
     m_pTypeCB->setCompletedItems(m_AssocTypeStrings);
     m_pTypeCB->setCurrentText(currentTypeAsString);
     m_pTypeCB->setDuplicatesEnabled(false);//only allow one of each type in box
-    m_pTypeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
+    m_pTypeCB->setCompletionMode( TDEGlobalSettings::CompletionPopup );
     m_pDoc->setWordWrap(TQMultiLineEdit::WidgetWidth);
     nameLayout->addWidget(m_pTypeCB, 1, 1);
 
diff --git a/umbrello/umbrello/dialogs/classgenpage.cpp b/umbrello/umbrello/dialogs/classgenpage.cpp
index d633b6ae..0e923cdf 100644
--- a/umbrello/umbrello/dialogs/classgenpage.cpp
+++ b/umbrello/umbrello/dialogs/classgenpage.cpp
@@ -212,7 +212,7 @@ ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* parent, UMLObject* o) : TQWidget
 
     // manage stereotypes
     m_pStereoTypeCB -> setDuplicatesEnabled(false);//only allow one of each type in box
-    m_pStereoTypeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
+    m_pStereoTypeCB->setCompletionMode( TDEGlobalSettings::CompletionPopup );
     insertStereotype (TQString("")); // an empty stereotype is the default
     int defaultStereotype=0;
     bool foundDefaultStereotype = false;
@@ -338,7 +338,7 @@ ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* parent, UMLWidget* widget) : TQW
     m_pNameLayout->addWidget(m_pStereoTypeCB, 1, 1);
 
     m_pStereoTypeCB->setCurrentText( widget->getUMLObject()->getStereotype() );
-    m_pStereoTypeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
+    m_pStereoTypeCB->setCompletionMode( TDEGlobalSettings::CompletionPopup );
 
     m_pInstanceL = new TQLabel(this);
     m_pInstanceL->setText(i18n("Instance name:"));
diff --git a/umbrello/umbrello/dialogs/parmpropdlg.cpp b/umbrello/umbrello/dialogs/parmpropdlg.cpp
index 38a75292..05140934 100644
--- a/umbrello/umbrello/dialogs/parmpropdlg.cpp
+++ b/umbrello/umbrello/dialogs/parmpropdlg.cpp
@@ -123,7 +123,7 @@ ParmPropDlg::ParmPropDlg(TQWidget * parent, UMLDoc * doc, UMLAttribute * a)
 
     m_pTypeCB->setDuplicatesEnabled(false);//only allow one of each type in box
     m_pTypeCB->setEditable(true);
-    m_pTypeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
+    m_pTypeCB->setCompletionMode( TDEGlobalSettings::CompletionPopup );
 //    m_pTypeCB->setAutoCompletion(false);
 
     //add template parameters
@@ -163,7 +163,7 @@ ParmPropDlg::ParmPropDlg(TQWidget * parent, UMLDoc * doc, UMLAttribute * a)
 
     // manage stereotypes
     m_pStereoTypeCB->setDuplicatesEnabled(false); //only allow one of each type in box
-    m_pStereoTypeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
+    m_pStereoTypeCB->setCompletionMode( TDEGlobalSettings::CompletionPopup );
     insertStereotype (TQString("")); // an empty stereotype is the default
     int defaultStereotype=0;
     bool foundDefaultStereotype = false;
diff --git a/umbrello/umbrello/dialogs/selectopdlg.cpp b/umbrello/umbrello/dialogs/selectopdlg.cpp
index 1c175752..63673e01 100644
--- a/umbrello/umbrello/dialogs/selectopdlg.cpp
+++ b/umbrello/umbrello/dialogs/selectopdlg.cpp
@@ -47,7 +47,7 @@ SelectOpDlg::SelectOpDlg(UMLView * parent, UMLClassifier * c)
     mainLayout -> addWidget(m_pOpRB, 1, 0);
 
     m_pOpCB = new KComboBox(m_pOpGB);
-    m_pOpCB->setCompletionMode( KGlobalSettings::CompletionPopup );
+    m_pOpCB->setCompletionMode( TDEGlobalSettings::CompletionPopup );
     m_pOpCB->setDuplicatesEnabled(false);//only allow one of each type in box
     mainLayout -> addWidget(m_pOpCB, 1, 1);
 
diff --git a/umbrello/umbrello/dialogs/settingsdlg.cpp b/umbrello/umbrello/dialogs/settingsdlg.cpp
index b5cddff5..172c695f 100644
--- a/umbrello/umbrello/dialogs/settingsdlg.cpp
+++ b/umbrello/umbrello/dialogs/settingsdlg.cpp
@@ -177,7 +177,7 @@ void SettingsDlg::setupGeneralPage() {
     startupLayout -> addWidget( m_GeneralWidgets.startL, 2, 0 );
 
     m_GeneralWidgets.diagramKB = new KComboBox( m_GeneralWidgets.startupGB );
-    m_GeneralWidgets.diagramKB->setCompletionMode( KGlobalSettings::CompletionPopup );
+    m_GeneralWidgets.diagramKB->setCompletionMode( TDEGlobalSettings::CompletionPopup );
     startupLayout -> addWidget( m_GeneralWidgets.diagramKB, 2, 1 );
 
     TQString diagrams [] = { i18n("No Diagram"), i18n("Class Diagram"),
@@ -260,7 +260,7 @@ void SettingsDlg::setupClassPage() {
     insertAttribScope( tr2i18n( "Private" ) );
     insertAttribScope( tr2i18n( "Protected" ) );
     m_ClassWidgets.m_pAttribScopeCB->setCurrentItem((m_pOptionState->classState.defaultAttributeScope - 200));
-    m_ClassWidgets.m_pAttribScopeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
+    m_ClassWidgets.m_pAttribScopeCB->setCompletionMode( TDEGlobalSettings::CompletionPopup );
     scopeLayout -> addWidget( m_ClassWidgets.m_pAttribScopeCB, 0, 1 );
 
     m_ClassWidgets.m_pOperationScopeCB = new KComboBox(m_ClassWidgets.scopeGB);
@@ -268,7 +268,7 @@ void SettingsDlg::setupClassPage() {
     insertOperationScope( tr2i18n( "Private" ) );
     insertOperationScope( tr2i18n( "Protected" ) );
     m_ClassWidgets.m_pOperationScopeCB->setCurrentItem((m_pOptionState->classState.defaultOperationScope - 200));
-    m_ClassWidgets.m_pOperationScopeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
+    m_ClassWidgets.m_pOperationScopeCB->setCompletionMode( TDEGlobalSettings::CompletionPopup );
     scopeLayout -> addWidget( m_ClassWidgets.m_pOperationScopeCB, 1, 1 );
 
 }
diff --git a/umbrello/umbrello/dialogs/umlattributedialog.cpp b/umbrello/umbrello/dialogs/umlattributedialog.cpp
index d6ea57ce..c45241e2 100644
--- a/umbrello/umbrello/dialogs/umlattributedialog.cpp
+++ b/umbrello/umbrello/dialogs/umlattributedialog.cpp
@@ -112,7 +112,7 @@ void UMLAttributeDialog::setupDialog() {
           m_pImplementationRB -> setChecked( true );
 
     m_pTypeCB->setDuplicatesEnabled(false);//only allow one of each type in box
-    m_pTypeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
+    m_pTypeCB->setCompletionMode( TDEGlobalSettings::CompletionPopup );
 
     //now add the Concepts
     UMLClassifierList namesList( pDoc->getConcepts() );
diff --git a/umbrello/umbrello/dialogs/umlentityattributedialog.cpp b/umbrello/umbrello/dialogs/umlentityattributedialog.cpp
index 55a47857..5b92b043 100644
--- a/umbrello/umbrello/dialogs/umlentityattributedialog.cpp
+++ b/umbrello/umbrello/dialogs/umlentityattributedialog.cpp
@@ -93,7 +93,7 @@ void UMLEntityAttributeDialog::setupDialog() {
     valuesLayout->addWidget(m_pAttributesL, 7, 0);
 
     m_pAttributesCB = new KComboBox(true, m_pValuesGB);
-    m_pAttributesCB->setCompletionMode( KGlobalSettings::CompletionPopup );
+    m_pAttributesCB->setCompletionMode( TDEGlobalSettings::CompletionPopup );
     valuesLayout->addWidget(m_pAttributesCB, 7, 1);
     m_pTypeL->setBuddy(m_pAttributesCB);
 
@@ -134,7 +134,7 @@ void UMLEntityAttributeDialog::setupDialog() {
     }
 
     m_pTypeCB->setDuplicatesEnabled(false);//only allow one of each type in box
-    m_pTypeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
+    m_pTypeCB->setCompletionMode( TDEGlobalSettings::CompletionPopup );
 
     // Add the data types.
     UMLClassifierList dataTypes = pDoc->getDatatypes();
diff --git a/umbrello/umbrello/dialogs/umloperationdialog.cpp b/umbrello/umbrello/dialogs/umloperationdialog.cpp
index a1be7a6f..e8113763 100644
--- a/umbrello/umbrello/dialogs/umloperationdialog.cpp
+++ b/umbrello/umbrello/dialogs/umloperationdialog.cpp
@@ -159,7 +159,7 @@ void UMLOperationDialog::setupDialog() {
     insertType( "void" );
 
     m_pRtypeCB->setDuplicatesEnabled(false);//only allow one of each type in box
-    m_pRtypeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
+    m_pRtypeCB->setCompletionMode( TDEGlobalSettings::CompletionPopup );
 
     // add template parameters
     UMLClassifier *classifier = dynamic_cast<UMLClassifier*>(m_pOperation->parent());
@@ -212,7 +212,7 @@ void UMLOperationDialog::setupDialog() {
 
     // manage stereotypes
     m_pStereoTypeCB -> setDuplicatesEnabled(false);//only allow one of each type in box
-    m_pStereoTypeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
+    m_pStereoTypeCB->setCompletionMode( TDEGlobalSettings::CompletionPopup );
     insertStereotype (TQString("")); // an empty stereotype is the default
     int defaultStereotype=0;
     bool foundDefaultStereotype = false;
diff --git a/umbrello/umbrello/dialogs/umltemplatedialog.cpp b/umbrello/umbrello/dialogs/umltemplatedialog.cpp
index 6075fbe4..57b5824e 100644
--- a/umbrello/umbrello/dialogs/umltemplatedialog.cpp
+++ b/umbrello/umbrello/dialogs/umltemplatedialog.cpp
@@ -79,7 +79,7 @@ void UMLTemplateDialog::setupDialog() {
 
     m_pTypeCB->setEditable(true);
     m_pTypeCB->setDuplicatesEnabled(false);//only allow one of each type in box
-    m_pTypeCB->setCompletionMode( KGlobalSettings::CompletionPopup );
+    m_pTypeCB->setCompletionMode( TDEGlobalSettings::CompletionPopup );
 //    m_pTypeCB->setAutoCompletion(true);
 
     //work out which one to select
diff --git a/umbrello/umbrello/docgenerators/docbookgenerator.cpp b/umbrello/umbrello/docgenerators/docbookgenerator.cpp
index 41bf5d12..0afbcb0a 100644
--- a/umbrello/umbrello/docgenerators/docbookgenerator.cpp
+++ b/umbrello/umbrello/docgenerators/docbookgenerator.cpp
@@ -110,7 +110,7 @@ KIO::Job* DocbookGenerator::generateDocbookForProjectInto(const KURL& destDir)
   int nbparams = 0;
   params[nbparams] = NULL;
 
-  TQString xsltFile(KGlobal::dirs()->findResource("appdata","xmi2docbook.xsl"));
+  TQString xsltFile(TDEGlobal::dirs()->findResource("appdata","xmi2docbook.xsl"));
 
   xmlSubstituteEntitiesDefault(1);
   xmlLoadExtDtdDefaultValue = 1;
diff --git a/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp b/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp
index a0555188..1b8e3a46 100644
--- a/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp
+++ b/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp
@@ -102,7 +102,7 @@ void XhtmlGenerator::slotDocbookToXhtml(KIO::Job * docbookJob)
   int nbparams = 0;
   params[nbparams] = NULL;
 
-  TQString xsltFileName(KGlobal::dirs()->findResource("appdata","docbook2xhtml.xsl"));
+  TQString xsltFileName(TDEGlobal::dirs()->findResource("appdata","docbook2xhtml.xsl"));
   kDebug() << "XSLT file is'"<<xsltFileName<<"'" << endl;
   TQFile xsltFile(xsltFileName);
   xsltFile.open(IO_ReadOnly);
@@ -110,7 +110,7 @@ void XhtmlGenerator::slotDocbookToXhtml(KIO::Job * docbookJob)
   kDebug() << "XSLT is'"<<xslt<<"'" << endl;
   xsltFile.close();
 
-  TQString localXsl = KGlobal::dirs()->findResource("data","ksgmltools2/docbook/xsl/html/docbook.xsl");
+  TQString localXsl = TDEGlobal::dirs()->findResource("data","ksgmltools2/docbook/xsl/html/docbook.xsl");
   kDebug() << "Local xsl is'"<<localXsl<<"'" << endl;
   if (!localXsl.isEmpty())
   {
@@ -154,7 +154,7 @@ void XhtmlGenerator::slotDocbookToXhtml(KIO::Job * docbookJob)
   job->setAutoErrorHandlingEnabled(true);
   connect (job, TQT_SIGNAL(result( KIO::Job* )), this, TQT_SLOT(slotHtmlCopyFinished( KIO::Job* )));
 
-  TQString cssFileName(KGlobal::dirs()->findResource("appdata","xmi.css"));
+  TQString cssFileName(TDEGlobal::dirs()->findResource("appdata","xmi.css"));
   kDebug() << "CSS file is'"<<cssFileName<<"'" << endl;
   KURL cssUrl = m_destDir;
   cssUrl.addPath("xmi.css");
diff --git a/umbrello/umbrello/kstartuplogo.cpp b/umbrello/umbrello/kstartuplogo.cpp
index 1839dc06..1b3f8625 100644
--- a/umbrello/umbrello/kstartuplogo.cpp
+++ b/umbrello/umbrello/kstartuplogo.cpp
@@ -21,7 +21,7 @@ KStartupLogo::KStartupLogo(TQWidget * parent, const char *name)
         : TQWidget(parent,name, TQt::WStyle_NoBorder | TQt::WStyle_Customize | TQt::WDestructiveClose )
 ,m_bReadyToHide(false) {
     //pm.load(locate("appdata", "pics/startlogo.png"));
-    KStandardDirs * dirs = KGlobal::dirs();
+    KStandardDirs * dirs = TDEGlobal::dirs();
     TQString dataDir = dirs -> findResourceDir("data", "umbrello/pics/object.png");
     dataDir += "/umbrello/pics/";
     TQPixmap pm(dataDir + "startlogo.png");
diff --git a/umbrello/umbrello/listpopupmenu.cpp b/umbrello/umbrello/listpopupmenu.cpp
index 8eacf57e..15ce6c21 100644
--- a/umbrello/umbrello/listpopupmenu.cpp
+++ b/umbrello/umbrello/listpopupmenu.cpp
@@ -826,7 +826,7 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) {
     m_pShow = 0;
     m_pColor = 0;
 
-    KStandardDirs* dirs = KGlobal::dirs();
+    KStandardDirs* dirs = TDEGlobal::dirs();
     TQString dataDir = dirs->findResourceDir("data", "umbrello/pics/object.png");
     dataDir += "/umbrello/pics/";
     m_pixmap[pm_Class]       .load(dataDir+"class.png",         "PNG");
diff --git a/umbrello/umbrello/refactoring/refactoringassistant.cpp b/umbrello/umbrello/refactoring/refactoringassistant.cpp
index 193f9545..9951e00f 100644
--- a/umbrello/umbrello/refactoring/refactoringassistant.cpp
+++ b/umbrello/umbrello/refactoring/refactoringassistant.cpp
@@ -681,7 +681,7 @@ void RefactoringAssistant::movableDropEvent (TQListViewItem* parentItem, TQListV
 
 void RefactoringAssistant::loadPixmaps()
 {
-    KStandardDirs *dirs = KGlobal::dirs();
+    KStandardDirs *dirs = TDEGlobal::dirs();
     TQString dataDir = dirs -> findResourceDir( "data", "umbrello/pics/object.png" );
     dataDir += "/umbrello/pics/";
 
diff --git a/umbrello/umbrello/umllistview.cpp b/umbrello/umbrello/umllistview.cpp
index 5db7d670..0edf4df6 100644
--- a/umbrello/umbrello/umllistview.cpp
+++ b/umbrello/umbrello/umllistview.cpp
@@ -1753,7 +1753,7 @@ TQPixmap & UMLListView::getPixmap(Uml::Icon_Type type) {
 }
 
 void UMLListView::loadPixmaps() {
-    KStandardDirs * dirs = KGlobal::dirs();
+    KStandardDirs * dirs = TDEGlobal::dirs();
     TQString dataDir = dirs -> findResourceDir("data", "umbrello/pics/object.png");
     dataDir += "/umbrello/pics/";
 
diff --git a/umbrello/umbrello/worktoolbar.cpp b/umbrello/umbrello/worktoolbar.cpp
index 4b64f575..1f291ec9 100644
--- a/umbrello/umbrello/worktoolbar.cpp
+++ b/umbrello/umbrello/worktoolbar.cpp
@@ -289,7 +289,7 @@ void WorkToolBar::loadPixmaps() {
         { tbb_Initial_Activity, i18n("Initial Activity"), "initial_state.png" },
         { tbb_Coll_Message, i18n("Message"), "message-asynchronous.png" }
     };
-    KStandardDirs * dirs = KGlobal::dirs();
+    KStandardDirs * dirs = TDEGlobal::dirs();
     TQString dataDir = dirs->findResourceDir( "data", "umbrello/pics/object.png" );
     dataDir += "/umbrello/pics/";
     const size_t n_buttonInfos = sizeof(buttonInfo) / sizeof(ButtonInfo);