[Uml-devel] branches/work/soc-umbrello

[Gopala Krishna A]

SVN commit 829700 by gopala:

Merged revisions 829236 via svnmerge from 
svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdesdk/umbrello

........
  r829236 | fischer | 2008-07-08 02:57:06 +0530 (Tue, 08 Jul 2008) | 1 line
  
  Krazy: replacing QTabWidget by KTabWidget.
........


 _M            . (directory)  
 M  +5 -4      umbrello/dialogs/codeeditor.cpp  
 M  +1 -10     umbrello/dialogs/codeeditor.h  
 M  +10 -2     umbrello/dialogs/codeviewerdialogbase.ui  


** branches/work/soc-umbrello #property svnmerge-integrated
   - /trunk/KDE/kdesdk/umbrello:1-814855,815154,815906,815954,816854,816861,817524,817552,819993,820008,821827,823169,823983,824915,825421,828311,828369,828633,828663,828672
   + /trunk/KDE/kdesdk/umbrello:1-814855,815154,815906,815954,816854,816861,817524,817552,819993,820008,821827,823169,823983,824915,825421,828311,828369,828633,828663,828672,829236
--- branches/work/soc-umbrello/umbrello/dialogs/codeeditor.cpp #829699:829700
@@ -1,11 +1,10 @@
 /***************************************************************************
- *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   copyright (C) 2003  Brian Thomas  brian.thomas at gsfc.nasa.gov          *
+ *   copyright (C) 2003  Brian Thomas  <brian.thomas at gsfc.nasa.gov>        *
  *   copyright (C) 2004-2008                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
@@ -13,7 +12,7 @@
 // own header
 #include "codeeditor.h"
 
-// qt/kde includes
+// qt includes
 #include <QtGui/QMouseEvent>
 #include <QtGui/QKeyEvent>
 #include <QtGui/QKeySequence>
@@ -23,6 +22,8 @@
 #include <QtGui/QBrush>
 #include <QtGui/QLayout>
 #include <QtCore/QRegExp>
+
+// kde includes
 #include <kdebug.h>
 #include <klocale.h>
 #include <kaction.h>
@@ -94,7 +95,7 @@
 
 QLabel * CodeEditor::getComponentLabel()
 {
-    return m_parentDlg->componentLabel;
+    return m_parentDlg->ui_componentLabel;
 }
 
 // FIX: used only for debugging right now. eliminate eventually -b.t.
--- branches/work/soc-umbrello/umbrello/dialogs/codeeditor.h #829699:829700
@@ -1,19 +1,10 @@
-
 /***************************************************************************
-                          codeeditor.h  -  description
-                             -------------------
-    begin                : Fri Aug 1 2003
-    copyright            : (C) 2003 by Brian Thomas
-    email                : brian.thomas at gsfc.nasa.gov
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
+ *   copyright (C) 2003 Brian Thomas  <brian.thomas at gsfc.nasa.gov>         *
  *   copyright (C) 2004-2008                                               *
  *   Umbrello UML Modeller Authors <uml-devel at uml.sf.net>                  *
  ***************************************************************************/
--- branches/work/soc-umbrello/umbrello/dialogs/codeviewerdialogbase.ui #829699:829700
@@ -22,7 +22,7 @@
         </widget>
        </item>
        <item row="1" column="0" colspan="3" >
-        <widget class="QLabel" name="componentLabel" >
+        <widget class="QLabel" name="ui_componentLabel" >
          <property name="sizePolicy" >
           <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
            <horstretch>0</horstretch>
@@ -53,12 +53,20 @@
       </layout>
      </item>
      <item>
-      <widget class="QTabWidget" name="m_tabWidget" />
+      <widget class="KTabWidget" name="m_tabWidget" />
      </item>
     </layout>
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>KTabWidget</class>
+   <extends>QTabWidget</extends>
+   <header>ktabwidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>