[uim-commit] r277 - in trunk/qt/uim-kdehelper/src: . chardict common switcher

[kzk@freedesktop.org]

Author: kzk
Date: 2005-01-13 15:45:14 -0800 (Thu, 13 Jan 2005)
New Revision: 277

Modified:
   trunk/qt/uim-kdehelper/src/Makefile.am
   trunk/qt/uim-kdehelper/src/chardict/bushuviewwidget.cpp
   trunk/qt/uim-kdehelper/src/chardict/uim-chardict-qt.cpp
   trunk/qt/uim-kdehelper/src/common/quimhelpertoolbar.cpp
   trunk/qt/uim-kdehelper/src/switcher/im-switcher-qt.cpp
Log:
* remove KDE dependency of chardict-qt, switcher-qt,
  and toolbar-qt from source code for merging
  uim-kdehelper to uim package.

* qt/uim-kdehelper/src/chardict/bushuviewwidget.cpp
  - remove #include <klocale.h>
* qt/uim-kdehelper/src/chardict/uim-chardict-qt.cpp
  - remove #include <klocale.h>
* qt/uim-kdehelper/src/switcher/im-switcher-qt.cpp
  - remove #include <klocale.h>
* qt/uim-kdehelper/src/common/quimhelpertoolbar.cpp
  - remove #include <klocale.h>

* qt/uim-kdehelper/src/Makefile.am
  - add pref in SUBDIRS


Modified: trunk/qt/uim-kdehelper/src/Makefile.am
===================================================================
--- trunk/qt/uim-kdehelper/src/Makefile.am	2005-01-13 14:21:56 UTC (rev 276)
+++ trunk/qt/uim-kdehelper/src/Makefile.am	2005-01-13 23:45:14 UTC (rev 277)
@@ -1 +1 @@
-SUBDIRS = common applet systray toolbar candwin switcher chardict
+SUBDIRS = common applet systray toolbar candwin switcher chardict pref

Modified: trunk/qt/uim-kdehelper/src/chardict/bushuviewwidget.cpp
===================================================================
--- trunk/qt/uim-kdehelper/src/chardict/bushuviewwidget.cpp	2005-01-13 14:21:56 UTC (rev 276)
+++ trunk/qt/uim-kdehelper/src/chardict/bushuviewwidget.cpp	2005-01-13 23:45:14 UTC (rev 277)
@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+Copyright (c) 2003,2004,2005 uim Project http://uim.freedesktop.org/
 
 All rights reserved.
 
@@ -44,7 +44,7 @@
 #include <qpainter.h>
 #include <qdrawutil.h>
 
-#include <klocale.h>
+#define i18n(string) (string)
 
 BushuViewWidget::BushuViewWidget( QWidget *parent, const char *name )
         : CharDictViewBase( parent, name )

Modified: trunk/qt/uim-kdehelper/src/chardict/uim-chardict-qt.cpp
===================================================================
--- trunk/qt/uim-kdehelper/src/chardict/uim-chardict-qt.cpp	2005-01-13 14:21:56 UTC (rev 276)
+++ trunk/qt/uim-kdehelper/src/chardict/uim-chardict-qt.cpp	2005-01-13 23:45:14 UTC (rev 277)
@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+Copyright (c) 2003,2004,2005 uim Project http://uim.freedesktop.org/
 
 All rights reserved.
 
@@ -47,7 +47,7 @@
 #include <qvbox.h>
 #include <qsettings.h>
 
-#include <klocale.h>
+#define i18n(string) (string)
 
 int main( int argc, char *argv[] )
 {

Modified: trunk/qt/uim-kdehelper/src/common/quimhelpertoolbar.cpp
===================================================================
--- trunk/qt/uim-kdehelper/src/common/quimhelpertoolbar.cpp	2005-01-13 14:21:56 UTC (rev 276)
+++ trunk/qt/uim-kdehelper/src/common/quimhelpertoolbar.cpp	2005-01-13 23:45:14 UTC (rev 277)
@@ -1,6 +1,6 @@
 /*
 
- Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+ Copyright (c) 2003,2004,2005 uim Project http://uim.freedesktop.org/
 
  All rights reserved.
 
@@ -36,7 +36,7 @@
 #include <qtooltip.h>
 #include <qtoolbutton.h>
 
-#include <klocale.h>
+#define i18n(string) (string)
 
 QUimHelperToolbar::QUimHelperToolbar( QWidget *parent, const char *name, WFlags f )
         : QHBox( parent, name, f )

Modified: trunk/qt/uim-kdehelper/src/switcher/im-switcher-qt.cpp
===================================================================
--- trunk/qt/uim-kdehelper/src/switcher/im-switcher-qt.cpp	2005-01-13 14:21:56 UTC (rev 276)
+++ trunk/qt/uim-kdehelper/src/switcher/im-switcher-qt.cpp	2005-01-13 23:45:14 UTC (rev 277)
@@ -1,6 +1,6 @@
 /*
 
- Copyright (c) 2003,2004 uim Project http://uim.freedesktop.org/
+ Copyright (c) 2003,2004,2005 uim Project http://uim.freedesktop.org/
 
  All rights reserved.
 
@@ -43,7 +43,7 @@
 #include <qlayout.h>
 #include <qsizepolicy.h>
 
-#include <klocale.h>
+#define i18n(string) (string)
 
 #define NAME_COLUMN 0