svnno****@sourc*****
svnno****@sourc*****
2009年 7月 5日 (日) 12:36:25 JST
Revision: 2361 http://sourceforge.jp/projects/kita/svn/view?view=rev&revision=2361 Author: nogu Date: 2009-07-05 12:36:25 +0900 (Sun, 05 Jul 2009) Log Message: ----------- QComboBox -> KComboBox Modified Paths: -------------- kita/branches/KITA-KDE4/kita/src/bbsview.cpp kita/branches/KITA-KDE4/kita/src/bbsview.h kita/branches/KITA-KDE4/kita/src/threadview.cpp kita/branches/KITA-KDE4/kita/src/threadview.h Modified: kita/branches/KITA-KDE4/kita/src/bbsview.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/bbsview.cpp 2009-07-05 03:19:28 UTC (rev 2360) +++ kita/branches/KITA-KDE4/kita/src/bbsview.cpp 2009-07-05 03:36:25 UTC (rev 2361) @@ -12,6 +12,7 @@ #include <kio/netaccess.h> #include <kaction.h> +#include <kcombobox.h> #include <krun.h> #include <k3listview.h> #include <kmenu.h> @@ -33,7 +34,6 @@ #include <qclipboard.h> #include <qmessagebox.h> #include <qtoolbutton.h> -#include <qcombobox.h> #include <qlayout.h> #include "viewmediator.h" @@ -68,7 +68,7 @@ layout10 = new QHBoxLayout( 0 ); - SearchCombo = new QComboBox( this ); + SearchCombo = new KComboBox( this ); QSizePolicy sizePolicy( static_cast<QSizePolicy::Policy>(1), static_cast<QSizePolicy::Policy>(4) ); sizePolicy.setHorizontalStretch( 0 ); sizePolicy.setVerticalStretch( 0 ); Modified: kita/branches/KITA-KDE4/kita/src/bbsview.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/bbsview.h 2009-07-05 03:19:28 UTC (rev 2360) +++ kita/branches/KITA-KDE4/kita/src/bbsview.h 2009-07-05 03:36:25 UTC (rev 2361) @@ -16,12 +16,12 @@ #include <qwidget.h> #include <q3valuelist.h> +class KComboBox; class KUrl; class K3ListView; class QCp932Codec; class Q3ListViewItem; class QSpacerItem; -class QComboBox; class QVBoxLayout; class QHBoxLayout; @@ -50,7 +50,7 @@ Q3ValueList<Kita::Category> getCategoryList( const QString& html ) const; void saveOpened(); - QComboBox* SearchCombo; + KComboBox* SearchCombo; K3ListView* m_boardList; protected: Modified: kita/branches/KITA-KDE4/kita/src/threadview.cpp =================================================================== --- kita/branches/KITA-KDE4/kita/src/threadview.cpp 2009-07-05 03:19:28 UTC (rev 2360) +++ kita/branches/KITA-KDE4/kita/src/threadview.cpp 2009-07-05 03:36:25 UTC (rev 2361) @@ -32,7 +32,6 @@ #include <qlayout.h> #include <qtoolbutton.h> #include <qlabel.h> -#include <qcombobox.h> #include <qprogressdialog.h> #include <qcursor.h> #include <qtextbrowser.h> @@ -68,12 +67,12 @@ writeButton->setEnabled( false ); layout2->addWidget( writeButton ); - SearchCombo = new QComboBox( this ); + SearchCombo = new KComboBox( this ); SearchCombo->setMinimumSize( QSize( 200, 0 ) ); SearchCombo->setEditable( true ); SearchCombo->setMaxVisibleItems( 10 ); SearchCombo->setMaxCount( 15 ); - SearchCombo->setInsertPolicy( QComboBox::InsertAtTop ); + SearchCombo->setInsertPolicy( KComboBox::InsertAtTop ); SearchCombo->setDuplicatesEnabled( false ); layout2->addWidget( SearchCombo ); @@ -90,7 +89,7 @@ ReloadButton->setEnabled( false ); layout2->addWidget( ReloadButton ); - gotoCombo = new QComboBox( this ); + gotoCombo = new KComboBox( this ); gotoCombo->setMinimumSize( QSize( 200, 0 ) ); layout2->addWidget( gotoCombo ); Modified: kita/branches/KITA-KDE4/kita/src/threadview.h =================================================================== --- kita/branches/KITA-KDE4/kita/src/threadview.h 2009-07-05 03:19:28 UTC (rev 2360) +++ kita/branches/KITA-KDE4/kita/src/threadview.h 2009-07-05 03:36:25 UTC (rev 2361) @@ -18,9 +18,9 @@ class KUrl; class KitaHTMLPart; +class KComboBox; class QToolButton; class QSpacerItem; -class QComboBox; class QVBoxLayout; class QHBoxLayout; class KitaThreadTabWidget; @@ -97,11 +97,11 @@ void setSubjectLabel( const QString& boardName, const QString& threadName, const QString boardURL ); void updateButton(); QToolButton* writeButton; - QComboBox* SearchCombo; + KComboBox* SearchCombo; QToolButton* HighLightButton; QToolButton* BookmarkButton; QToolButton* ReloadButton; - QComboBox* gotoCombo; + KComboBox* gotoCombo; QToolButton* deleteButton; QToolButton* closeButton; QFrame* threadFrame;