diff options
| author | Timothy Pearson <[email protected]> | 2012-01-26 23:32:43 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2012-01-26 23:32:43 -0600 |
| commit | ea318d1431c89e647598c510c4245c6571aa5f46 (patch) | |
| tree | 996d29b80c30d453dda86d1a23162d441628f169 /src/inputmethod | |
| parent | aaf89d4b48f69c9293feb187db26362e550b5561 (diff) | |
| download | tqt3-ea318d1431c89e647598c510c4245c6571aa5f46.tar.gz tqt3-ea318d1431c89e647598c510c4245c6571aa5f46.zip | |
Update to latest tqt3 automated conversion
Diffstat (limited to 'src/inputmethod')
| -rw-r--r-- | src/inputmethod/ntqinputcontextfactory.h (renamed from src/inputmethod/qinputcontextfactory.h) | 4 | ||||
| -rw-r--r-- | src/inputmethod/ntqinputcontextplugin.h (renamed from src/inputmethod/qinputcontextplugin.h) | 6 | ||||
| -rw-r--r-- | src/inputmethod/qinputcontextfactory.cpp | 8 | ||||
| -rw-r--r-- | src/inputmethod/qinputcontextplugin.cpp | 4 | ||||
| -rw-r--r-- | src/inputmethod/qt_inputmethod.pri | 4 |
5 files changed, 13 insertions, 13 deletions
diff --git a/src/inputmethod/qinputcontextfactory.h b/src/inputmethod/ntqinputcontextfactory.h index 515593fe8..29ecda7f3 100644 --- a/src/inputmethod/qinputcontextfactory.h +++ b/src/inputmethod/ntqinputcontextfactory.h @@ -1,5 +1,5 @@ /**************************************************************************** -** $Id: qinputcontextfactory.h,v 1.1.1.1 2004/05/11 11:16:49 daisuke Exp $ +** $Id: ntqinputcontextfactory.h,v 1.1.1.1 2004/05/11 11:16:49 daisuke Exp $ ** ** Definition of TQInputContextFactory class ** @@ -37,7 +37,7 @@ #define TQINPUTCONTEXTFACTORY_H #ifndef QT_H -#include "qstringlist.h" +#include "ntqstringlist.h" #endif // QT_H #ifndef QT_NO_IM diff --git a/src/inputmethod/qinputcontextplugin.h b/src/inputmethod/ntqinputcontextplugin.h index e54f54cc3..92875c52e 100644 --- a/src/inputmethod/qinputcontextplugin.h +++ b/src/inputmethod/ntqinputcontextplugin.h @@ -1,5 +1,5 @@ /**************************************************************************** -** $Id: qinputcontextplugin.h,v 1.2 2004/06/20 18:43:11 daisuke Exp $ +** $Id: ntqinputcontextplugin.h,v 1.2 2004/06/20 18:43:11 daisuke Exp $ ** ** Definition of TQInputContextPlugin class ** @@ -39,8 +39,8 @@ #define TQINPUTCONTEXTPLUGIN_H #ifndef QT_H -#include "qgplugin.h" -#include "qstringlist.h" +#include "ntqgplugin.h" +#include "ntqstringlist.h" #endif // QT_H #ifndef QT_NO_IM diff --git a/src/inputmethod/qinputcontextfactory.cpp b/src/inputmethod/qinputcontextfactory.cpp index a1ac4f35d..ae4391525 100644 --- a/src/inputmethod/qinputcontextfactory.cpp +++ b/src/inputmethod/qinputcontextfactory.cpp @@ -36,12 +36,12 @@ **********************************************************************/ #include "qinputcontextinterface_p.h" // up here for GCC 2.7.* compatibility -#include "qinputcontextfactory.h" -#include "qinputcontext.h" +#include "ntqinputcontextfactory.h" +#include "ntqinputcontext.h" #ifndef QT_NO_IM -#include "qapplication.h" +#include "ntqapplication.h" #ifdef QT_THREAD_SUPPORT #include <private/qmutexpool_p.h> @@ -49,7 +49,7 @@ #include <stdlib.h> -#include "qcleanuphandler.h" +#include "ntqcleanuphandler.h" #include <private/qpluginmanager_p.h> #ifndef QT_NO_COMPONENT diff --git a/src/inputmethod/qinputcontextplugin.cpp b/src/inputmethod/qinputcontextplugin.cpp index fa34e07e9..3b474d2ff 100644 --- a/src/inputmethod/qinputcontextplugin.cpp +++ b/src/inputmethod/qinputcontextplugin.cpp @@ -35,7 +35,7 @@ ** **********************************************************************/ -#include "qinputcontextplugin.h" +#include "ntqinputcontextplugin.h" #ifndef QT_NO_IM #ifndef QT_NO_COMPONENT @@ -43,7 +43,7 @@ #include "qinputcontextinterface_p.h" /*! - \class TQInputContextPlugin qinputcontextplugin.h + \class TQInputContextPlugin ntqinputcontextplugin.h \brief The TQInputContextPlugin class provides an abstract base for custom TQInputContext plugins. \reentrant \ingroup plugins diff --git a/src/inputmethod/qt_inputmethod.pri b/src/inputmethod/qt_inputmethod.pri index d9ac32aec..202bba267 100644 --- a/src/inputmethod/qt_inputmethod.pri +++ b/src/inputmethod/qt_inputmethod.pri @@ -2,9 +2,9 @@ inputmethod { INPUTMETHOD_P = inputmethod - HEADERS +=$$INPUTMETHOD_H/qinputcontextfactory.h \ + HEADERS +=$$INPUTMETHOD_H/ntqinputcontextfactory.h \ $$INPUTMETHOD_P/qinputcontextinterface_p.h \ - $$INPUTMETHOD_H/qinputcontextplugin.h + $$INPUTMETHOD_H/ntqinputcontextplugin.h SOURCES +=$$INPUTMETHOD_CPP/qinputcontextfactory.cpp \ $$INPUTMETHOD_CPP/qinputcontextplugin.cpp } |