[uim] r6697 committed - * qt4/chardict/bushuviewwidget.cpp...

[codesite-noreply]

Revision: 6697
Author: nogu.dev
Date: Sun Aug  8 15:14:27 2010
Log: * qt4/chardict/bushuviewwidget.cpp
  - (BushuViewWidget::setFont): Rename to setCharFont()
    to fix bug in font settings.
* qt4/chardict/bushuviewwidget.h
  - Ditto.
* qt4/chardict/chargridview.cpp
  - (CharGridView::setFont)
    * Rename to setCharFont().
    * Call QWidget::setFont().
* qt4/chardict/chargridview.h
  - (CharGridView::setFont): Rename to setCharFont().
* qt4/chardict/qt4.cpp
  - (KUimCharDict::setCharDictFont): Follow change of function name.
* qt4/chardict/qt4.h
  - (CharDictViewBase::setFont)
    * Rename to setCharFont().
    * Don't override non-virtual function QWidget::setFont().
* qt4/chardict/unicodeviewwidget.cpp
  - (UnicodeViewWidget::setFont): Rename to setCharFont().
* qt4/chardict/unicodeviewwidget.h
  - Ditto.
http://code.google.com/p/uim/source/detail?r=6697

Modified:
 /trunk/qt4/chardict/bushuviewwidget.cpp
 /trunk/qt4/chardict/bushuviewwidget.h
 /trunk/qt4/chardict/chargridview.cpp
 /trunk/qt4/chardict/chargridview.h
 /trunk/qt4/chardict/qt4.cpp
 /trunk/qt4/chardict/qt4.h
 /trunk/qt4/chardict/unicodeviewwidget.cpp
 /trunk/qt4/chardict/unicodeviewwidget.h

=======================================
--- /trunk/qt4/chardict/bushuviewwidget.cpp     Sun Apr  4 20:35:54 2010
+++ /trunk/qt4/chardict/bushuviewwidget.cpp     Sun Aug  8 15:14:27 2010
@@ -175,7 +175,7 @@
     }
 }

-void BushuViewWidget::setFont( const QFont &font )
-{
-    m_charGridView->setFont( font );
-}
+void BushuViewWidget::setCharFont( const QFont &font )
+{
+    m_charGridView->setCharFont( font );
+}
=======================================
--- /trunk/qt4/chardict/bushuviewwidget.h       Sun Apr  4 20:35:54 2010
+++ /trunk/qt4/chardict/bushuviewwidget.h       Sun Aug  8 15:14:27 2010
@@ -51,7 +51,7 @@
     explicit BushuViewWidget( QWidget *parent = 0 );
     ~BushuViewWidget();

-    void setFont( const QFont &font );
+    void setCharFont( const QFont &font );

 protected:
     void setupWidgets();
=======================================
--- /trunk/qt4/chardict/chargridview.cpp        Sun Apr  4 20:35:54 2010
+++ /trunk/qt4/chardict/chargridview.cpp        Sun Aug  8 15:14:27 2010
@@ -94,8 +94,9 @@
         rowCount() * verticalHeader()->sectionSize( 0 ) );
 }

-void CharGridView::setFont( const QFont &font )
-{
+void CharGridView::setCharFont( const QFont &font )
+{
+    setFont( font );
     for ( int i = 0; i < rowCount(); i++)
     {
         for ( int j = 0; j < columnCount(); j++)
=======================================
--- /trunk/qt4/chardict/chargridview.h  Sun Apr  4 20:35:54 2010
+++ /trunk/qt4/chardict/chargridview.h  Sun Aug  8 15:14:27 2010
@@ -51,7 +51,7 @@
     void setCharacters( const QStringList &charList );
     virtual QSize sizeHint() const;

-    void setFont( const QFont &font );
+    void setCharFont( const QFont &font );

 protected:
     virtual void resizeEvent( QResizeEvent * e );
=======================================
--- /trunk/qt4/chardict/qt4.cpp Sun Aug  8 15:14:15 2010
+++ /trunk/qt4/chardict/qt4.cpp Sun Aug  8 15:14:27 2010
@@ -222,9 +222,9 @@
     // button
     m_fontselButton->setFont( font );
     // bushu
-    m_bushuView->setFont( font );
+    m_bushuView->setCharFont( font );
     // unicode
-    m_unicodeView->setFont( font );
+    m_unicodeView->setCharFont( font );
 }


=======================================
--- /trunk/qt4/chardict/qt4.h   Sun Apr  4 20:35:54 2010
+++ /trunk/qt4/chardict/qt4.h   Sun Aug  8 15:14:27 2010
@@ -92,7 +92,7 @@
     explicit CharDictViewBase( QWidget *parent = 0 )
             : QWidget( parent ) {}

-    virtual void setFont( const QFont &font ) = 0;
+    virtual void setCharFont( const QFont &font ) = 0;

 signals:
     void charSelected( const QString & );
=======================================
--- /trunk/qt4/chardict/unicodeviewwidget.cpp   Sun Apr  4 20:35:54 2010
+++ /trunk/qt4/chardict/unicodeviewwidget.cpp   Sun Aug  8 15:14:27 2010
@@ -288,7 +288,7 @@
     }
 }

-void UnicodeViewWidget::setFont( const QFont &font )
-{
-    m_charGridView->setFont( font );
-}
+void UnicodeViewWidget::setCharFont( const QFont &font )
+{
+    m_charGridView->setCharFont( font );
+}
=======================================
--- /trunk/qt4/chardict/unicodeviewwidget.h     Sun Apr  4 20:35:54 2010
+++ /trunk/qt4/chardict/unicodeviewwidget.h     Sun Aug  8 15:14:27 2010
@@ -53,7 +53,7 @@
     explicit UnicodeViewWidget( QWidget *parent = 0 );
     ~UnicodeViewWidget();

-    void setFont( const QFont &font );
+    void setCharFont( const QFont &font );

 protected:
     void setupWidgets();