From 31fde11959900b0fd3748bab9a3539b88825feb9 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 31 Jan 2013 13:29:26 -0600
Subject: Rename KStandard for enhanced compatibility with KDE4

---
 umbrello/umbrello/aligntoolbar.cpp                     | 2 +-
 umbrello/umbrello/codegenerationpolicy.cpp             | 2 +-
 umbrello/umbrello/kstartuplogo.cpp                     | 2 +-
 umbrello/umbrello/listpopupmenu.cpp                    | 2 +-
 umbrello/umbrello/refactoring/refactoringassistant.cpp | 2 +-
 umbrello/umbrello/umllistview.cpp                      | 2 +-
 umbrello/umbrello/worktoolbar.cpp                      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'umbrello')

diff --git a/umbrello/umbrello/aligntoolbar.cpp b/umbrello/umbrello/aligntoolbar.cpp
index d8248bda..cf2a15cc 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 = TDEGlobal::dirs();
+    TDEStandardDirs* dirs = TDEGlobal::dirs();
     TQString dataDir = dirs->findResourceDir( "data", "umbrello/pics/object.png" );
     dataDir += "/umbrello/pics/";
 
diff --git a/umbrello/umbrello/codegenerationpolicy.cpp b/umbrello/umbrello/codegenerationpolicy.cpp
index dbabc9a3..0b33372a 100644
--- a/umbrello/umbrello/codegenerationpolicy.cpp
+++ b/umbrello/umbrello/codegenerationpolicy.cpp
@@ -469,7 +469,7 @@ void CodeGenerationPolicy::setDefaults( TDEConfig * config, bool emitUpdateSigna
 
     path = config -> readPathEntry("headingsDirectory");
     if(path.isEmpty()) {
-        KStandardDirs stddirs;
+        TDEStandardDirs stddirs;
         path =  stddirs.findDirs("data","umbrello/headings").first();
     }
     setHeadingFileDir ( path );
diff --git a/umbrello/umbrello/kstartuplogo.cpp b/umbrello/umbrello/kstartuplogo.cpp
index 1b3f8625..21e1ff57 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 = TDEGlobal::dirs();
+    TDEStandardDirs * 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 15ce6c21..96679522 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 = TDEGlobal::dirs();
+    TDEStandardDirs* 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 9951e00f..1616751b 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 = TDEGlobal::dirs();
+    TDEStandardDirs *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 12671fdf..d6f23206 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 = TDEGlobal::dirs();
+    TDEStandardDirs * 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 1f291ec9..e973e553 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 = TDEGlobal::dirs();
+    TDEStandardDirs * dirs = TDEGlobal::dirs();
     TQString dataDir = dirs->findResourceDir( "data", "umbrello/pics/object.png" );
     dataDir += "/umbrello/pics/";
     const size_t n_buttonInfos = sizeof(buttonInfo) / sizeof(ButtonInfo);
-- 
cgit v1.2.3