diff options
Diffstat (limited to 'kmouth/wordcompletion')
-rw-r--r-- | kmouth/wordcompletion/CMakeLists.txt | 30 | ||||
-rw-r--r-- | kmouth/wordcompletion/creationsourcedetailsui.ui | 15 | ||||
-rw-r--r-- | kmouth/wordcompletion/creationsourcedetailsui.ui.h | 2 | ||||
-rw-r--r-- | kmouth/wordcompletion/dictionarycreationwizard.cpp | 12 | ||||
-rw-r--r-- | kmouth/wordcompletion/dictionarycreationwizard.h | 6 | ||||
-rw-r--r-- | kmouth/wordcompletion/kdedocsourceui.ui | 8 | ||||
-rw-r--r-- | kmouth/wordcompletion/klanguagebutton.cpp | 16 | ||||
-rw-r--r-- | kmouth/wordcompletion/klanguagebutton.h | 2 | ||||
-rw-r--r-- | kmouth/wordcompletion/wordcompletion.h | 2 | ||||
-rw-r--r-- | kmouth/wordcompletion/wordcompletionui.ui | 18 | ||||
-rw-r--r-- | kmouth/wordcompletion/wordcompletionui.ui.h | 2 | ||||
-rw-r--r-- | kmouth/wordcompletion/wordcompletionwidget.cpp | 18 | ||||
-rw-r--r-- | kmouth/wordcompletion/wordcompletionwidget.h | 2 | ||||
-rw-r--r-- | kmouth/wordcompletion/wordlist.cpp | 2 |
14 files changed, 76 insertions, 59 deletions
diff --git a/kmouth/wordcompletion/CMakeLists.txt b/kmouth/wordcompletion/CMakeLists.txt new file mode 100644 index 0000000..295a8d0 --- /dev/null +++ b/kmouth/wordcompletion/CMakeLists.txt @@ -0,0 +1,30 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + +##### wordcompletion (static) + +tde_add_library( wordcompletion STATIC_PIC AUTOMOC + + SOURCES + wordcompletionui.ui + creationsourceui.ui + creationsourcedetailsui.ui + kdedocsourceui.ui + wordlist.cpp + wordcompletion.cpp + wordcompletionwidget.cpp + dictionarycreationwizard.cpp + klanguagebutton.cpp + klanguagebuttonhelper.cpp +) diff --git a/kmouth/wordcompletion/creationsourcedetailsui.ui b/kmouth/wordcompletion/creationsourcedetailsui.ui index 52aa8a7..838f5e2 100644 --- a/kmouth/wordcompletion/creationsourcedetailsui.ui +++ b/kmouth/wordcompletion/creationsourcedetailsui.ui @@ -159,6 +159,9 @@ <include location="local" impldecl="in implementation">klanguagebutton.h</include> <include location="local" impldecl="in implementation">klanguagebuttonhelper.h</include> <include location="local" impldecl="in implementation">creationsourcedetailsui.ui.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> </includes> <forwards> <forward>class KLanguageButton</forward> @@ -166,19 +169,11 @@ <variables> <variable access="public">KLanguageButton *languageButton;</variable> </variables> -<Q_SLOTS> +<slots> <slot access="protected" specifier="non virtual">languageButton_activated( int index )</slot> -</Q_SLOTS> +</slots> <functions> <function access="private" specifier="non virtual">init()</function> </functions> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kinputdialog.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>kinputdialog.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/kmouth/wordcompletion/creationsourcedetailsui.ui.h b/kmouth/wordcompletion/creationsourcedetailsui.ui.h index 12869aa..384cd1f 100644 --- a/kmouth/wordcompletion/creationsourcedetailsui.ui.h +++ b/kmouth/wordcompletion/creationsourcedetailsui.ui.h @@ -17,7 +17,7 @@ void CreationSourceDetailsUI::init() { loadLanguageList(languageButton); languageButton->insertLanguage("??", i18n("Other"), TQString::fromLatin1("l10n/"), TQString()); - connect (languageButton, TQT_SIGNAL(activated(int)), this, TQT_SLOT(languageButton_activated(int))); + connect (languageButton, TQ_SIGNAL(activated(int)), this, TQ_SLOT(languageButton_activated(int))); } void CreationSourceDetailsUI::languageButton_activated (int) { diff --git a/kmouth/wordcompletion/dictionarycreationwizard.cpp b/kmouth/wordcompletion/dictionarycreationwizard.cpp index 7211768..920fdd1 100644 --- a/kmouth/wordcompletion/dictionarycreationwizard.cpp +++ b/kmouth/wordcompletion/dictionarycreationwizard.cpp @@ -72,11 +72,11 @@ DictionaryCreationWizard::DictionaryCreationWizard (TQWidget *parent, const char mergeWidget = new MergeWidget (this, "merge source page", dictionaryNames, dictionaryFiles, dictionaryLanguages); addPage (mergeWidget, i18n("Source of New Dictionary (2)")); - connect (creationSource->fileButton, TQT_SIGNAL (toggled(bool)), this, TQT_SLOT(calculateAppropriate(bool)) ); - connect (creationSource->directoryButton,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(calculateAppropriate(bool)) ); - connect (creationSource->kdeDocButton, TQT_SIGNAL (toggled(bool)), this, TQT_SLOT(calculateAppropriate(bool)) ); - connect (creationSource->mergeButton, TQT_SIGNAL (toggled(bool)), this, TQT_SLOT(calculateAppropriate(bool)) ); - connect (creationSource->emptyButton, TQT_SIGNAL (toggled(bool)), this, TQT_SLOT(calculateAppropriate(bool)) ); + connect (creationSource->fileButton, TQ_SIGNAL (toggled(bool)), this, TQ_SLOT(calculateAppropriate(bool)) ); + connect (creationSource->directoryButton,TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(calculateAppropriate(bool)) ); + connect (creationSource->kdeDocButton, TQ_SIGNAL (toggled(bool)), this, TQ_SLOT(calculateAppropriate(bool)) ); + connect (creationSource->mergeButton, TQ_SIGNAL (toggled(bool)), this, TQ_SLOT(calculateAppropriate(bool)) ); + connect (creationSource->emptyButton, TQ_SIGNAL (toggled(bool)), this, TQ_SLOT(calculateAppropriate(bool)) ); calculateAppropriate (true); } @@ -301,7 +301,7 @@ MergeWidget::MergeWidget(KWizard *parent, const char *name, checkbox->setChecked (true); numInput->setRange (1, 100, 10, true); numInput->setValue (100); - connect (checkbox, TQT_SIGNAL (toggled(bool)), numInput, TQT_SLOT(setEnabled(bool))); + connect (checkbox, TQ_SIGNAL (toggled(bool)), numInput, TQ_SLOT(setEnabled(bool))); dictionaries.insert(*fIt, checkbox); weights.insert(*fIt, numInput); diff --git a/kmouth/wordcompletion/dictionarycreationwizard.h b/kmouth/wordcompletion/dictionarycreationwizard.h index fb82fcd..0e589ad 100644 --- a/kmouth/wordcompletion/dictionarycreationwizard.h +++ b/kmouth/wordcompletion/dictionarycreationwizard.h @@ -41,7 +41,7 @@ class MergeWidget; * completion. */ class DictionaryCreationWizard : public KWizard { - Q_OBJECT + TQ_OBJECT public: DictionaryCreationWizard (TQWidget *parent, const char *name, @@ -76,7 +76,7 @@ private: * @author Gunnar Schmi Dt */ class MergeWidget : public TQScrollView { - Q_OBJECT + TQ_OBJECT public: MergeWidget(KWizard *parent, const char *name, @@ -100,7 +100,7 @@ private: * @author Gunnar Schmi Dt */ class CompletionWizardWidget : public KDEDocSourceUI { - Q_OBJECT + TQ_OBJECT friend class ConfigWizard; public: diff --git a/kmouth/wordcompletion/kdedocsourceui.ui b/kmouth/wordcompletion/kdedocsourceui.ui index c310fa1..91a410a 100644 --- a/kmouth/wordcompletion/kdedocsourceui.ui +++ b/kmouth/wordcompletion/kdedocsourceui.ui @@ -82,6 +82,9 @@ <include location="local" impldecl="in implementation">klanguagebutton.h</include> <include location="local" impldecl="in implementation">klanguagebuttonhelper.h</include> <include location="local" impldecl="in implementation">kdedocsourceui.ui.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> </includes> <forwards> <forward>class KLanguageButton</forward> @@ -93,9 +96,4 @@ <function access="private" specifier="non virtual">init()</function> </functions> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> </UI> diff --git a/kmouth/wordcompletion/klanguagebutton.cpp b/kmouth/wordcompletion/klanguagebutton.cpp index ffb6715..9d72f3a 100644 --- a/kmouth/wordcompletion/klanguagebutton.cpp +++ b/kmouth/wordcompletion/klanguagebutton.cpp @@ -123,10 +123,10 @@ void KLanguageButton::insertSubmenu( const TQString &text, const TQString &tag, checkInsertPos( pi, text, index ); pi->insertItem( text, p, count(), index ); m_tags->append( tag ); - connect( p, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( slotActivated( int ) ) ); - connect( p, TQT_SIGNAL( highlighted( int ) ), this, - TQT_SIGNAL( highlighted( int ) ) ); + connect( p, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( slotActivated( int ) ) ); + connect( p, TQ_SIGNAL( highlighted( int ) ), this, + TQ_SIGNAL( highlighted( int ) ) ); } void KLanguageButton::insertLanguage( const TQString& path, const TQString& name, @@ -169,10 +169,10 @@ void KLanguageButton::clear() setPopup( m_popup ); - connect( m_popup, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( slotActivated( int ) ) ); - connect( m_popup, TQT_SIGNAL( highlighted( int ) ), - TQT_SIGNAL( highlighted( int ) ) ); + connect( m_popup, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( slotActivated( int ) ) ); + connect( m_popup, TQ_SIGNAL( highlighted( int ) ), + TQ_SIGNAL( highlighted( int ) ) ); setText( TQString() ); setIconSet( TQIconSet() ); diff --git a/kmouth/wordcompletion/klanguagebutton.h b/kmouth/wordcompletion/klanguagebutton.h index 385e363..d061b7e 100644 --- a/kmouth/wordcompletion/klanguagebutton.h +++ b/kmouth/wordcompletion/klanguagebutton.h @@ -39,7 +39,7 @@ */ class KLanguageButton : public TQPushButton { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmouth/wordcompletion/wordcompletion.h b/kmouth/wordcompletion/wordcompletion.h index c7304f8..ff87820 100644 --- a/kmouth/wordcompletion/wordcompletion.h +++ b/kmouth/wordcompletion/wordcompletion.h @@ -8,7 +8,7 @@ */ class WordCompletion : public TDECompletion { friend class WordListWidget; - Q_OBJECT + TQ_OBJECT public: WordCompletion(); diff --git a/kmouth/wordcompletion/wordcompletionui.ui b/kmouth/wordcompletion/wordcompletionui.ui index bc9cde5..92e4909 100644 --- a/kmouth/wordcompletion/wordcompletionui.ui +++ b/kmouth/wordcompletion/wordcompletionui.ui @@ -266,6 +266,10 @@ <include location="local" impldecl="in implementation">klanguagebutton.h</include> <include location="local" impldecl="in implementation">klanguagebuttonhelper.h</include> <include location="local" impldecl="in implementation">wordcompletionui.ui.h</include> + <include location="local" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> </includes> <forwards> <forward>class KLanguageButton</forward> @@ -273,21 +277,11 @@ <variables> <variable access="public">KLanguageButton *languageButton;</variable> </variables> -<Q_SLOTS> +<slots> <slot access="protected" specifier="non virtual">languageButton_activated( int index )</slot> -</Q_SLOTS> +</slots> <functions> <function access="private" specifier="non virtual">init()</function> </functions> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kurlrequester.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>tdelistview.h</includehint> - <includehint>kinputdialog.h</includehint> -</includehints> </UI> diff --git a/kmouth/wordcompletion/wordcompletionui.ui.h b/kmouth/wordcompletion/wordcompletionui.ui.h index 6ce5e75..f1c3728 100644 --- a/kmouth/wordcompletion/wordcompletionui.ui.h +++ b/kmouth/wordcompletion/wordcompletionui.ui.h @@ -17,7 +17,7 @@ void WordCompletionUI::init() { loadLanguageList(languageButton); languageButton->insertLanguage("??", i18n("Other"), TQString::fromLatin1("l10n/"), TQString()); - connect (languageButton, TQT_SIGNAL(activated(int)), this, TQT_SLOT(languageButton_activated(int))); + connect (languageButton, TQ_SIGNAL(activated(int)), this, TQ_SLOT(languageButton_activated(int))); } void WordCompletionUI::languageButton_activated (int) { diff --git a/kmouth/wordcompletion/wordcompletionwidget.cpp b/kmouth/wordcompletion/wordcompletionwidget.cpp index 6e6002d..2ba1fb2 100644 --- a/kmouth/wordcompletion/wordcompletionwidget.cpp +++ b/kmouth/wordcompletion/wordcompletionwidget.cpp @@ -95,15 +95,15 @@ WordCompletionWidget::WordCompletionWidget(TQWidget *parent, const char *name) : dictionaryList->setSorting (-1); // no sorted list // Connect the signals from hte KCMKTTSDWidget to this class - connect (addButton, TQT_SIGNAL (clicked()), this, TQT_SLOT(addDictionary()) ); - connect (deleteButton, TQT_SIGNAL (clicked()), this, TQT_SLOT (deleteDictionary()) ); - connect (moveUpButton, TQT_SIGNAL (clicked()), this, TQT_SLOT (moveUp()) ); - connect (moveDownButton, TQT_SIGNAL (clicked()), this, TQT_SLOT (moveDown()) ); - connect (exportButton, TQT_SIGNAL (clicked()), this, TQT_SLOT (exportDictionary()) ); - - connect (dictionaryList, TQT_SIGNAL (selectionChanged()), this, TQT_SLOT (selectionChanged()) ); - connect (dictionaryName, TQT_SIGNAL (textChanged (const TQString &)), this, TQT_SLOT (nameChanged (const TQString &)) ); - connect (languageButton, TQT_SIGNAL (activated (int)), this, TQT_SLOT (languageSelected(int)) ); + connect (addButton, TQ_SIGNAL (clicked()), this, TQ_SLOT(addDictionary()) ); + connect (deleteButton, TQ_SIGNAL (clicked()), this, TQ_SLOT (deleteDictionary()) ); + connect (moveUpButton, TQ_SIGNAL (clicked()), this, TQ_SLOT (moveUp()) ); + connect (moveDownButton, TQ_SIGNAL (clicked()), this, TQ_SLOT (moveDown()) ); + connect (exportButton, TQ_SIGNAL (clicked()), this, TQ_SLOT (exportDictionary()) ); + + connect (dictionaryList, TQ_SIGNAL (selectionChanged()), this, TQ_SLOT (selectionChanged()) ); + connect (dictionaryName, TQ_SIGNAL (textChanged (const TQString &)), this, TQ_SLOT (nameChanged (const TQString &)) ); + connect (languageButton, TQ_SIGNAL (activated (int)), this, TQ_SLOT (languageSelected(int)) ); // Object for the KCMKTTSD configuration config = new TDEConfig("kmouthrc"); diff --git a/kmouth/wordcompletion/wordcompletionwidget.h b/kmouth/wordcompletion/wordcompletionwidget.h index a3f5088..80532b0 100644 --- a/kmouth/wordcompletion/wordcompletionwidget.h +++ b/kmouth/wordcompletion/wordcompletionwidget.h @@ -29,7 +29,7 @@ class KLanguageButton; * @author Gunnar Schmi Dt */ class WordCompletionWidget : public WordCompletionUI { - Q_OBJECT + TQ_OBJECT public: WordCompletionWidget(TQWidget *parent, const char *name); diff --git a/kmouth/wordcompletion/wordlist.cpp b/kmouth/wordcompletion/wordlist.cpp index adf73cb..2031c8e 100644 --- a/kmouth/wordcompletion/wordlist.cpp +++ b/kmouth/wordcompletion/wordlist.cpp @@ -160,7 +160,7 @@ void addWords (WordMap &map, WordMap add) { void addWordsFromFile (WordMap &map, TQString filename, TQTextStream::Encoding encoding, TQTextCodec *codec) { TQFile xmlfile(filename); - TQXmlInputSource source (TQT_TQIODEVICE(&xmlfile)); + TQXmlInputSource source (&xmlfile); XMLParser parser; TQXmlSimpleReader reader; reader.setFeature ("http://trolltech.com/xml/features/report-start-end-entity", true); |