diff options
Diffstat (limited to 'kmouth')
33 files changed, 132 insertions, 128 deletions
diff --git a/kmouth/CMakeLists.txt b/kmouth/CMakeLists.txt index 9fec611..ad050ca 100644 --- a/kmouth/CMakeLists.txt +++ b/kmouth/CMakeLists.txt @@ -60,4 +60,7 @@ install( DESTINATION ${CONFIG_INSTALL_DIR} ) -tde_create_translated_desktop( kmouth.desktop ) +tde_create_translated_desktop( + SOURCE kmouth.desktop + PO_DIR kmouth-desktops +) diff --git a/kmouth/books/CMakeLists.txt b/kmouth/books/CMakeLists.txt index 282dcb3..0b09e0f 100644 --- a/kmouth/books/CMakeLists.txt +++ b/kmouth/books/CMakeLists.txt @@ -14,5 +14,6 @@ foreach( _lang de en nl sv ) tde_create_translated_desktop( SOURCE ${_lang}.desktop DESTINATION ${DATA_INSTALL_DIR}/kmouth/books/${_lang} + PO_DIR kmouth-desktops ) endforeach() diff --git a/kmouth/configwizard.h b/kmouth/configwizard.h index 47054c2..8560e6c 100644 --- a/kmouth/configwizard.h +++ b/kmouth/configwizard.h @@ -34,7 +34,7 @@ class CompletionWizardWidget; */ class ConfigWizard : public KWizard { - Q_OBJECT + TQ_OBJECT public: ConfigWizard (TQWidget *parent, const char *name, TDEConfig *config); diff --git a/kmouth/kmouth.cpp b/kmouth/kmouth.cpp index 4d9faa8..a34e602 100644 --- a/kmouth/kmouth.cpp +++ b/kmouth/kmouth.cpp @@ -51,10 +51,10 @@ KMouthApp::KMouthApp(TQWidget* , const char* name):TDEMainWindow(0, name) initPhraseList(); initActions(); optionsDialog = new OptionsDialog(this); - connect (optionsDialog, TQT_SIGNAL(configurationChanged ()), - this, TQT_SLOT(slotConfigurationChanged ())); - connect (optionsDialog, TQT_SIGNAL(configurationChanged ()), - phraseList, TQT_SLOT(configureCompletion ())); + connect (optionsDialog, TQ_SIGNAL(configurationChanged ()), + this, TQ_SLOT(slotConfigurationChanged ())); + connect (optionsDialog, TQ_SIGNAL(configurationChanged ()), + phraseList, TQ_SLOT(configureCompletion ())); phrases = new TDEActionCollection (this); @@ -95,57 +95,57 @@ bool KMouthApp::configured() { void KMouthApp::initActions() { // The "File" menu - fileOpen = new TDEAction(i18n("&Open as History..."), "phrasehistory_open", TDEStdAccel::open(), TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection(),"file_open"); + fileOpen = new TDEAction(i18n("&Open as History..."), "phrasehistory_open", TDEStdAccel::open(), this, TQ_SLOT(slotFileOpen()), actionCollection(),"file_open"); fileOpen->setStatusText(i18n("Opens an existing file as history")); fileOpen->setWhatsThis (i18n("Opens an existing file as history")); - fileSaveAs = new TDEAction(i18n("Save &History As..."), "phrasehistory_save", TDEStdAccel::save(), TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), actionCollection(),"file_save_as"); + fileSaveAs = new TDEAction(i18n("Save &History As..."), "phrasehistory_save", TDEStdAccel::save(), this, TQ_SLOT(slotFileSaveAs()), actionCollection(),"file_save_as"); fileSaveAs->setStatusText(i18n("Saves the actual history as...")); fileSaveAs->setWhatsThis (i18n("Saves the actual history as...")); - filePrint = new TDEAction(i18n("&Print History..."), "phrasehistory_print", TDEStdAccel::print(), TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection(),"file_print"); + filePrint = new TDEAction(i18n("&Print History..."), "phrasehistory_print", TDEStdAccel::print(), this, TQ_SLOT(slotFilePrint()), actionCollection(),"file_print"); filePrint->setStatusText(i18n("Prints out the actual history")); filePrint->setWhatsThis (i18n("Prints out the actual history")); - fileQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection()); + fileQuit = KStdAction::quit(this, TQ_SLOT(slotFileQuit()), actionCollection()); fileQuit->setStatusText(i18n("Quits the application")); fileQuit->setWhatsThis (i18n("Quits the application")); // The "Edit" menu - editCut = KStdAction::cut(TQT_TQOBJECT(phraseList), TQT_SLOT(cut()), actionCollection()); + editCut = KStdAction::cut(phraseList, TQ_SLOT(cut()), actionCollection()); editCut->setStatusText(i18n("Cuts the selected section and puts it to the clipboard")); editCut->setWhatsThis (i18n("Cuts the selected section and puts it to the clipboard. If there is some text selected in the edit field it is placed it on the clipboard. Otherwise the selected sentences in the history (if any) are placed on the clipboard.")); - editCopy = KStdAction::copy(TQT_TQOBJECT(phraseList), TQT_SLOT(copy()), actionCollection()); + editCopy = KStdAction::copy(phraseList, TQ_SLOT(copy()), actionCollection()); editCopy->setStatusText(i18n("Copies the selected section to the clipboard")); editCopy->setWhatsThis (i18n("Copies the selected section to the clipboard. If there is some text selected in the edit field it is copied to the clipboard. Otherwise the selected sentences in the history (if any) are copied to the clipboard.")); - editPaste = KStdAction::paste(TQT_TQOBJECT(phraseList), TQT_SLOT(paste()), actionCollection()); + editPaste = KStdAction::paste(phraseList, TQ_SLOT(paste()), actionCollection()); editPaste->setStatusText(i18n("Pastes the clipboard contents to actual position")); editPaste->setWhatsThis (i18n("Pastes the clipboard contents at the current cursor position into the edit field.")); - editSpeak = new TDEAction (i18n("&Speak"), "speak", 0, TQT_TQOBJECT(phraseList), TQT_SLOT(speak()), actionCollection(),"edit_speak"); + editSpeak = new TDEAction (i18n("&Speak"), "speak", 0, phraseList, TQ_SLOT(speak()), actionCollection(),"edit_speak"); editSpeak->setStatusText(i18n("Speaks the currently active sentence(s)")); editSpeak->setWhatsThis (i18n("Speaks the currently active sentence(s). If there is some text in the edit field it is spoken. Otherwise the selected sentences in the history (if any) are spoken.")); // The "Phrase book" menu - phrasebookEdit = new TDEAction(i18n("&Edit..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditPhrasebook()), actionCollection(),"phrasebook_edit"); + phrasebookEdit = new TDEAction(i18n("&Edit..."), 0, 0, this, TQ_SLOT(slotEditPhrasebook()), actionCollection(),"phrasebook_edit"); // The "Options" menu - viewMenuBar = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(slotViewMenuBar()), actionCollection()); - viewToolBar = KStdAction::showToolbar(TQT_TQOBJECT(this), TQT_SLOT(slotViewToolBar()), actionCollection()); + viewMenuBar = KStdAction::showMenubar(this, TQ_SLOT(slotViewMenuBar()), actionCollection()); + viewToolBar = KStdAction::showToolbar(this, TQ_SLOT(slotViewToolBar()), actionCollection()); viewToolBar->setStatusText(i18n("Enables/disables the toolbar")); viewToolBar->setWhatsThis (i18n("Enables/disables the toolbar")); - viewPhrasebookBar = new TDEToggleAction (i18n("Show P&hrasebook Bar"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewPhrasebookBar()), actionCollection(), "showPhrasebookBar"); + viewPhrasebookBar = new TDEToggleAction (i18n("Show P&hrasebook Bar"), 0, 0, this, TQ_SLOT(slotViewPhrasebookBar()), actionCollection(), "showPhrasebookBar"); viewPhrasebookBar->setStatusText(i18n("Enables/disables the phrasebook bar")); viewPhrasebookBar->setWhatsThis (i18n("Enables/disables the phrasebook bar")); - viewStatusBar = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(slotViewStatusBar()), actionCollection()); + viewStatusBar = KStdAction::showStatusbar(this, TQ_SLOT(slotViewStatusBar()), actionCollection()); viewStatusBar->setStatusText(i18n("Enables/disables the statusbar")); viewStatusBar->setWhatsThis (i18n("Enables/disables the statusbar")); - configureTTS = new TDEAction (i18n("&Configure KMouth..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureTTS()), actionCollection(), "configureTTS"); + configureTTS = new TDEAction (i18n("&Configure KMouth..."), "configure", 0, this, TQ_SLOT(slotConfigureTTS()), actionCollection(), "configureTTS"); configureTTS->setStatusText(i18n("Opens the configuration dialog")); configureTTS->setWhatsThis (i18n("Opens the configuration dialog")); @@ -153,27 +153,27 @@ void KMouthApp::initActions() { // The "Help" menu will automatically get created. // The popup menu of the list of spoken sentences - phraseListSpeak = new TDEAction (i18n("&Speak"), "speak", 0, TQT_TQOBJECT(phraseList), TQT_SLOT(speakListSelection()), actionCollection(), "phraselist_speak"); + phraseListSpeak = new TDEAction (i18n("&Speak"), "speak", 0, phraseList, TQ_SLOT(speakListSelection()), actionCollection(), "phraselist_speak"); phraseListSpeak->setStatusText(i18n("Speaks the currently selected phrases in the history")); phraseListSpeak->setWhatsThis (i18n("Speaks the currently selected phrases in the history")); - phraseListRemove = new TDEAction (i18n("&Delete"), "edit-delete", 0, TQT_TQOBJECT(phraseList), TQT_SLOT(removeListSelection()), actionCollection(), "phraselist_remove"); + phraseListRemove = new TDEAction (i18n("&Delete"), "edit-delete", 0, phraseList, TQ_SLOT(removeListSelection()), actionCollection(), "phraselist_remove"); phraseListRemove->setStatusText(i18n("Deletes the currently selected phrases from the history")); phraseListRemove->setWhatsThis (i18n("Deletes the currently selected phrases from the history")); - phraseListCut = new TDEAction (i18n("Cu&t"), "edit-cut", 0, TQT_TQOBJECT(phraseList), TQT_SLOT(cutListSelection()), actionCollection(), "phraselist_cut"); + phraseListCut = new TDEAction (i18n("Cu&t"), "edit-cut", 0, phraseList, TQ_SLOT(cutListSelection()), actionCollection(), "phraselist_cut"); phraseListCut->setStatusText(i18n("Cuts the currently selected phrases from the history and puts them to the clipboard")); phraseListCut->setWhatsThis (i18n("Cuts the currently selected phrases from the history and puts them to the clipboard")); - phraseListCopy = new TDEAction (i18n("&Copy"), "edit-copy", 0, TQT_TQOBJECT(phraseList), TQT_SLOT(copyListSelection()), actionCollection(), "phraselist_copy"); + phraseListCopy = new TDEAction (i18n("&Copy"), "edit-copy", 0, phraseList, TQ_SLOT(copyListSelection()), actionCollection(), "phraselist_copy"); phraseListCut->setStatusText(i18n("Copies the currently selected phrases from the history to the clipboard")); phraseListCut->setWhatsThis (i18n("Copies the currently selected phrases from the history to the clipboard")); - phraselistSelectAll = new TDEAction (i18n("Select &All Entries"), 0, 0, TQT_TQOBJECT(phraseList), TQT_SLOT(selectAllEntries()), actionCollection(),"phraselist_select_all"); + phraselistSelectAll = new TDEAction (i18n("Select &All Entries"), 0, 0, phraseList, TQ_SLOT(selectAllEntries()), actionCollection(),"phraselist_select_all"); phraselistSelectAll->setStatusText(i18n("Selects all phrases in the history")); phraselistSelectAll->setWhatsThis (i18n("Selects all phrases in the history")); - phraselistDeselectAll = new TDEAction (i18n("D&eselect All Entries"), 0, 0, TQT_TQOBJECT(phraseList), TQT_SLOT(deselectAllEntries()), actionCollection(),"phraselist_deselect_all"); + phraselistDeselectAll = new TDEAction (i18n("D&eselect All Entries"), 0, 0, phraseList, TQ_SLOT(deselectAllEntries()), actionCollection(),"phraselist_deselect_all"); phraselistDeselectAll->setStatusText(i18n("Deselects all phrases in the history")); phraselistDeselectAll->setWhatsThis (i18n("Deselects all phrases in the history")); @@ -302,7 +302,7 @@ void KMouthApp::enableMenuEntries(bool existSelectedEntries, bool existDeselecte } ///////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATION +// SLOT IMPLEMENTATION ///////////////////////////////////////////////////////////////////// void KMouthApp::slotFileOpen() { @@ -358,10 +358,10 @@ void KMouthApp::slotEditPhrasebook () { PhraseBookDialog *phraseBookDialog = PhraseBookDialog::get(); // As we do not know whether the we are already connected to the slot, // we first disconnect and then connect again. - disconnect (phraseBookDialog, TQT_SIGNAL(phrasebookConfirmed (PhraseBook &)), - this, TQT_SLOT(slotPhrasebookConfirmed (PhraseBook &))); - connect (phraseBookDialog, TQT_SIGNAL(phrasebookConfirmed (PhraseBook &)), - this, TQT_SLOT(slotPhrasebookConfirmed (PhraseBook &))); + disconnect (phraseBookDialog, TQ_SIGNAL(phrasebookConfirmed (PhraseBook &)), + this, TQ_SLOT(slotPhrasebookConfirmed (PhraseBook &))); + connect (phraseBookDialog, TQ_SIGNAL(phrasebookConfirmed (PhraseBook &)), + this, TQ_SLOT(slotPhrasebookConfirmed (PhraseBook &))); // As we do not know whether the phrase book edit window is already open, // we first open and then raise it, so that it is surely the top window. @@ -458,7 +458,7 @@ void KMouthApp::slotPhrasebookConfirmed (PhraseBook &book) { delete phrases; phrases = new TDEActionCollection (this, actionCollection()); - book.addToGUI (popup, toolbar, phrases, TQT_TQOBJECT(this), TQT_SLOT(slotPhraseSelected (const TQString &))); + book.addToGUI (popup, toolbar, phrases, this, TQ_SLOT(slotPhraseSelected (const TQString &))); TQString bookLocation = TDEApplication::kApplication()->dirs()->saveLocation ("appdata", "/"); if (!bookLocation.isNull() && !bookLocation.isEmpty()) { diff --git a/kmouth/kmouth.h b/kmouth/kmouth.h index 628128c..4155e96 100644 --- a/kmouth/kmouth.h +++ b/kmouth/kmouth.h @@ -54,7 +54,7 @@ class PhraseBook; */ class KMouthApp : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmouth/optionsdialog.cpp b/kmouth/optionsdialog.cpp index 0c8e147..be01f0d 100644 --- a/kmouth/optionsdialog.cpp +++ b/kmouth/optionsdialog.cpp @@ -120,7 +120,7 @@ OptionsDialog::OptionsDialog (TQWidget *parent) setHelp ("config-dialog"); TQPixmap iconGeneral = TDEGlobal::iconLoader()->loadIcon("configure", TDEIcon::NoGroup, TDEIcon::SizeMedium); - TQGrid *pageGeneral = addGridPage (1, Qt::Horizontal, i18n("General Options"), TQString(), iconGeneral); + TQGrid *pageGeneral = addGridPage (1, TQt::Horizontal, i18n("General Options"), TQString(), iconGeneral); tabCtl = new TQTabWidget (pageGeneral, "general"); @@ -133,13 +133,13 @@ OptionsDialog::OptionsDialog (TQWidget *parent) tabCtl->addTab (commandWidget, i18n("&Text-to-Speech")); TQPixmap iconCompletion = TDEGlobal::iconLoader()->loadIcon("input-keyboard", TDEIcon::NoGroup, TDEIcon::SizeMedium); - TQGrid *pageCompletion = addGridPage (1, Qt::Horizontal, i18n("Word Completion"), TQString(), iconCompletion); + TQGrid *pageCompletion = addGridPage (1, TQt::Horizontal, i18n("Word Completion"), TQString(), iconCompletion); completionWidget = new WordCompletionWidget(pageCompletion, "Word Completion widget"); kttsd = loadKttsd(); if (kttsd != 0) { TQPixmap iconKttsd = TDEGlobal::iconLoader()->loadIcon("multimedia", TDEIcon::NoGroup, TDEIcon::SizeMedium); - TQGrid *pageKttsd = addGridPage (1, Qt::Horizontal, i18n("KTTSD Speech Service"), + TQGrid *pageKttsd = addGridPage (1, TQt::Horizontal, i18n("KTTSD Speech Service"), i18n("TDE Text-to-Speech Daemon Configuration"), iconKttsd); kttsd->reparent(pageKttsd,0,TQPoint(0,0),true); diff --git a/kmouth/optionsdialog.h b/kmouth/optionsdialog.h index 6955b34..d5fc7f3 100644 --- a/kmouth/optionsdialog.h +++ b/kmouth/optionsdialog.h @@ -32,7 +32,7 @@ class WordCompletionWidget; */ class PreferencesWidget : public PreferencesUI { - Q_OBJECT + TQ_OBJECT public: PreferencesWidget(TQWidget *parent, const char *name); @@ -56,7 +56,7 @@ private: */ class OptionsDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: OptionsDialog(TQWidget *parent); diff --git a/kmouth/phrasebook/phrasebook.cpp b/kmouth/phrasebook/phrasebook.cpp index c095e6d..1fc4f9f 100644 --- a/kmouth/phrasebook/phrasebook.cpp +++ b/kmouth/phrasebook/phrasebook.cpp @@ -339,7 +339,7 @@ bool PhraseBook::open (const KURL &url) { // First: try to load it as a normal phrase book TQFile file(tempFile); - TQXmlInputSource source (TQT_TQIODEVICE(&file)); + TQXmlInputSource source (&file); bool error = !decode (source); // Second: if the file does not contain a phrase book, load it as diff --git a/kmouth/phrasebook/phrasebook.h b/kmouth/phrasebook/phrasebook.h index 4fee8cc..92fabeb 100644 --- a/kmouth/phrasebook/phrasebook.h +++ b/kmouth/phrasebook/phrasebook.h @@ -147,7 +147,7 @@ public: * @author Gunnar Schmi Dt */ class PhraseBookDrag: public TQDragObject { - Q_OBJECT + TQ_OBJECT public: PhraseBookDrag (PhraseBook *book, TQWidget *dragSource = 0, const char *name = 0); @@ -170,13 +170,13 @@ private: }; class PhraseAction : public TDEAction { - Q_OBJECT + TQ_OBJECT public: PhraseAction (const TQString& phrase, const TQString& cut, const TQObject* receiver, const char* slot, TDEActionCollection* parent) : TDEAction (phrase, "phrase", TDEShortcut(cut), 0, 0, parent, phrase.latin1()) { this->phrase = phrase; - connect (this, TQT_SIGNAL(slotActivated (const TQString &)), receiver, slot); + connect (this, TQ_SIGNAL(slotActivated (const TQString &)), receiver, slot); }; ~PhraseAction () { } diff --git a/kmouth/phrasebook/phrasebookdialog.cpp b/kmouth/phrasebook/phrasebookdialog.cpp index 3525ce7..c26c7d5 100644 --- a/kmouth/phrasebook/phrasebookdialog.cpp +++ b/kmouth/phrasebook/phrasebookdialog.cpp @@ -303,17 +303,17 @@ void PhraseBookDialog::initGUI () { treeView->setAllColumnsShowFocus (true); treeView->setSelectionMode (TQListView::Extended); TQWhatsThis::add (treeView, i18n("This list contains the current phrase book in a tree structure. You can select and modify individual phrases and sub phrase books")); - connect (treeView, TQT_SIGNAL(selectionChanged()), TQT_TQOBJECT(this), TQT_SLOT(selectionChanged())); - connect (treeView, TQT_SIGNAL(contextMenuRequested (TQListViewItem *, const TQPoint &, int)), TQT_TQOBJECT(this), TQT_SLOT(contextMenuRequested (TQListViewItem *, const TQPoint &, int))); - connect (treeView, TQT_SIGNAL(dropped (TQDropEvent *, TQListViewItem *, TQListViewItem *)), TQT_TQOBJECT(this), TQT_SLOT(slotDropped (TQDropEvent *, TQListViewItem *, TQListViewItem *))); - connect (treeView, TQT_SIGNAL(moved (TQListViewItem *, TQListViewItem *, TQListViewItem *)), TQT_TQOBJECT(this), TQT_SLOT(slotMoved (TQListViewItem *, TQListViewItem *, TQListViewItem *))); + connect (treeView, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(selectionChanged())); + connect (treeView, TQ_SIGNAL(contextMenuRequested (TQListViewItem *, const TQPoint &, int)), this, TQ_SLOT(contextMenuRequested (TQListViewItem *, const TQPoint &, int))); + connect (treeView, TQ_SIGNAL(dropped (TQDropEvent *, TQListViewItem *, TQListViewItem *)), this, TQ_SLOT(slotDropped (TQDropEvent *, TQListViewItem *, TQListViewItem *))); + connect (treeView, TQ_SIGNAL(moved (TQListViewItem *, TQListViewItem *, TQListViewItem *)), this, TQ_SLOT(slotMoved (TQListViewItem *, TQListViewItem *, TQListViewItem *))); mainLayout->addWidget (treeView); buttonBox = new ButtonBoxWidget (page, "buttonbox"); - connect (buttonBox->lineEdit, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotTextChanged(const TQString &))); - connect (buttonBox->noKey, TQT_SIGNAL(clicked()), TQT_SLOT(slotNoKey())); - connect (buttonBox->customKey, TQT_SIGNAL(clicked()), TQT_SLOT(slotCustomKey())); - connect (buttonBox->keyButton, TQT_SIGNAL(capturedShortcut(const TDEShortcut&)), TQT_SLOT(capturedShortcut(const TDEShortcut&))); + connect (buttonBox->lineEdit, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotTextChanged(const TQString &))); + connect (buttonBox->noKey, TQ_SIGNAL(clicked()), TQ_SLOT(slotNoKey())); + connect (buttonBox->customKey, TQ_SIGNAL(clicked()), TQ_SLOT(slotCustomKey())); + connect (buttonBox->keyButton, TQ_SIGNAL(capturedShortcut(const TDEShortcut&)), TQ_SLOT(capturedShortcut(const TDEShortcut&))); mainLayout->addWidget (buttonBox); treeView->setFocus(); @@ -322,23 +322,23 @@ void PhraseBookDialog::initGUI () { void PhraseBookDialog::initActions() { // The file menu - fileNewPhrase = new TDEAction (i18n("&New Phrase"), "phrase_new", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddPhrase()), actionCollection(),"file_new_phrase"); + fileNewPhrase = new TDEAction (i18n("&New Phrase"), "phrase_new", 0, this, TQ_SLOT(slotAddPhrase()), actionCollection(),"file_new_phrase"); fileNewPhrase->setStatusText(i18n("Adds a new phrase")); fileNewPhrase->setWhatsThis (i18n("Adds a new phrase")); - fileNewBook = new TDEAction (i18n("New Phrase &Book"), "phrasebook_new", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddPhrasebook()), actionCollection(),"file_new_book"); + fileNewBook = new TDEAction (i18n("New Phrase &Book"), "phrasebook_new", 0, this, TQ_SLOT(slotAddPhrasebook()), actionCollection(),"file_new_book"); fileNewBook->setStatusText(i18n("Adds a new phrase book into which other books and phrases can be placed")); fileNewBook->setWhatsThis (i18n("Adds a new phrase book into which other books and phrases can be placed")); - fileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotSave()), actionCollection()); + fileSave = KStdAction::save(this, TQ_SLOT(slotSave()), actionCollection()); fileSave->setStatusText(i18n("Saves the phrase book onto the hard disk")); fileSave->setWhatsThis (i18n("Saves the phrase book onto the hard disk")); - fileImport = new TDEAction (i18n("&Import..."), "phrasebook_open", 0, TQT_TQOBJECT(this), TQT_SLOT(slotImportPhrasebook()), actionCollection(),"file_import"); + fileImport = new TDEAction (i18n("&Import..."), "phrasebook_open", 0, this, TQ_SLOT(slotImportPhrasebook()), actionCollection(),"file_import"); fileImport->setStatusText(i18n("Imports a file and adds its contents to the phrase book")); fileImport->setWhatsThis (i18n("Imports a file and adds its contents to the phrase book")); - toolbarImport = new TDEToolBarPopupAction (i18n("&Import..."), "phrasebook_open", 0, TQT_TQOBJECT(this), TQT_SLOT(slotImportPhrasebook()), actionCollection(),"toolbar_import"); + toolbarImport = new TDEToolBarPopupAction (i18n("&Import..."), "phrasebook_open", 0, this, TQ_SLOT(slotImportPhrasebook()), actionCollection(),"toolbar_import"); toolbarImport->setStatusText(i18n("Imports a file and adds its contents to the phrase book")); toolbarImport->setWhatsThis (i18n("Imports a file and adds its contents to the phrase book")); @@ -346,32 +346,32 @@ void PhraseBookDialog::initActions() { fileImportStandardBook->setStatusText(i18n("Imports a standard phrase book and adds its contents to the phrase book")); fileImportStandardBook->setWhatsThis (i18n("Imports a standard phrase book and adds its contents to the phrase book")); - fileExport = new TDEAction (i18n("&Export..."), "phrasebook_save", 0, TQT_TQOBJECT(this), TQT_SLOT(slotExportPhrasebook()), actionCollection(),"file_export"); + fileExport = new TDEAction (i18n("&Export..."), "phrasebook_save", 0, this, TQ_SLOT(slotExportPhrasebook()), actionCollection(),"file_export"); fileExport->setStatusText(i18n("Exports the currently selected phrase(s) or phrase book(s) into a file")); fileExport->setWhatsThis (i18n("Exports the currently selected phrase(s) or phrase book(s) into a file")); - filePrint = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotPrint()), actionCollection()); + filePrint = KStdAction::print(this, TQ_SLOT(slotPrint()), actionCollection()); filePrint->setStatusText(i18n("Prints the currently selected phrase(s) or phrase book(s)")); filePrint->setWhatsThis (i18n("Prints the currently selected phrase(s) or phrase book(s)")); - fileClose = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); + fileClose = KStdAction::close(this, TQ_SLOT(close()), actionCollection()); fileClose->setStatusText(i18n("Closes the window")); fileClose->setWhatsThis (i18n("Closes the window")); // The edit menu - editCut = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotCut()), actionCollection()); + editCut = KStdAction::cut(this, TQ_SLOT(slotCut()), actionCollection()); editCut->setStatusText(i18n("Cuts the currently selected entries from the phrase book and puts it to the clipboard")); editCut->setWhatsThis (i18n("Cuts the currently selected entries from the phrase book and puts it to the clipboard")); - editCopy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), actionCollection()); + editCopy = KStdAction::copy(this, TQ_SLOT(slotCopy()), actionCollection()); editCopy->setStatusText(i18n("Copies the currently selected entry from the phrase book to the clipboard")); editCopy->setWhatsThis (i18n("Copies the currently selected entry from the phrase book to the clipboard")); - editPaste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), actionCollection()); + editPaste = KStdAction::paste(this, TQ_SLOT(slotPaste()), actionCollection()); editPaste->setStatusText(i18n("Pastes the clipboard contents to actual position")); editPaste->setWhatsThis (i18n("Pastes the clipboard contents to actual position")); - editDelete = new TDEAction (i18n("&Delete"), "edit-delete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), actionCollection(),"edit_delete"); + editDelete = new TDEAction (i18n("&Delete"), "edit-delete", 0, this, TQ_SLOT(slotRemove()), actionCollection(),"edit_delete"); editDelete->setStatusText(i18n("Deletes the selected entries from the phrase book")); editDelete->setWhatsThis (i18n("Deletes the selected entries from the phrase book")); @@ -462,7 +462,7 @@ void PhraseBookDialog::initStandardPhraseBooks () { currentNamePath = dirs; TDEAction *book = new StandardPhraseBookInsertAction ( - url, (*it).name, TQT_TQOBJECT(this), TQT_SLOT(slotImportPhrasebook (const KURL &)), actionCollection()); + url, (*it).name, this, TQ_SLOT(slotImportPhrasebook (const KURL &)), actionCollection()); parent->insert(book); if (parent == fileImportStandardBook) book->plug(toolbarImport->popupMenu()); diff --git a/kmouth/phrasebook/phrasebookdialog.h b/kmouth/phrasebook/phrasebookdialog.h index 0665281..96260f9 100644 --- a/kmouth/phrasebook/phrasebookdialog.h +++ b/kmouth/phrasebook/phrasebookdialog.h @@ -73,7 +73,7 @@ private: */ class InitialPhraseBookWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: InitialPhraseBookWidget(TQWidget *parent, const char *name); @@ -94,13 +94,13 @@ private: * @author Gunnar Schmi Dt */ class StandardPhraseBookInsertAction : public TDEAction { - Q_OBJECT + TQ_OBJECT public: StandardPhraseBookInsertAction (const KURL &url, const TQString& name, const TQObject* receiver, const char* slot, TDEActionCollection* parent) : TDEAction (name, "phrasebook", 0, 0, 0, parent, 0) { this->url = url; - connect (this, TQT_SIGNAL(slotActivated (const KURL &)), receiver, slot); + connect (this, TQ_SIGNAL(slotActivated (const KURL &)), receiver, slot); }; ~StandardPhraseBookInsertAction () { }; @@ -142,7 +142,7 @@ protected: class PhraseBookDialog : public TDEMainWindow { friend class InitialPhraseBookWidget; - Q_OBJECT + TQ_OBJECT private: /** Constructor. It is private because this class implements the singleton diff --git a/kmouth/phrasebook/phrasetree.cpp b/kmouth/phrasebook/phrasetree.cpp index 6a2bac2..f08e95a 100644 --- a/kmouth/phrasebook/phrasetree.cpp +++ b/kmouth/phrasebook/phrasetree.cpp @@ -81,8 +81,8 @@ PhraseTree::PhraseTree (TQWidget *parent, const char *name) phrasebook_closed = TDEGlobal::iconLoader()->loadIcon("phrasebook_closed", TDEIcon::Small); phrase = TDEGlobal::iconLoader()->loadIcon("phrase", TDEIcon::Small); - connect (this, TQT_SIGNAL(expanded (TQListViewItem *)), this, TQT_SLOT(itemExpanded (TQListViewItem *))); - connect (this, TQT_SIGNAL(collapsed (TQListViewItem *)), this, TQT_SLOT(itemCollapsed (TQListViewItem *))); + connect (this, TQ_SIGNAL(expanded (TQListViewItem *)), this, TQ_SLOT(itemExpanded (TQListViewItem *))); + connect (this, TQ_SIGNAL(collapsed (TQListViewItem *)), this, TQ_SLOT(itemCollapsed (TQListViewItem *))); } PhraseTree::~PhraseTree (){ diff --git a/kmouth/phrasebook/phrasetree.h b/kmouth/phrasebook/phrasetree.h index a4936f4..b8d578e 100644 --- a/kmouth/phrasebook/phrasetree.h +++ b/kmouth/phrasebook/phrasetree.h @@ -59,7 +59,7 @@ private: class PhraseTree : public TDEListView { friend class PhraseTreeItem; - Q_OBJECT + TQ_OBJECT public: PhraseTree (TQWidget *parent = 0, const char *name = 0); diff --git a/kmouth/phraselist.cpp b/kmouth/phraselist.cpp index 24df32f..cbef4fd 100644 --- a/kmouth/phraselist.cpp +++ b/kmouth/phraselist.cpp @@ -51,7 +51,7 @@ PhraseList::PhraseList(TQWidget *parent, const char *name) : TQWidget(parent,nam TQVBoxLayout *layout = new TQVBoxLayout (this); listBox = new TDEListBox (this); - listBox->setFocusPolicy(TQ_NoFocus); + listBox->setFocusPolicy(TQWidget::NoFocus); listBox->setSelectionMode (TQListBox::Extended); TQWhatsThis::add (listBox, i18n("This list contains the history of spoken sentences. You can select sentences and press the speak button for re-speaking.")); layout->addWidget(listBox); @@ -66,7 +66,7 @@ PhraseList::PhraseList(TQWidget *parent, const char *name) : TQWidget(parent,nam rowLayout->addWidget(dictionaryCombo); lineEdit = new PhraseEdit ("", this); - lineEdit->setFocusPolicy(TQ_StrongFocus); + lineEdit->setFocusPolicy(TQWidget::StrongFocus); lineEdit->setFrame(true); lineEdit->setEchoMode(TQLineEdit::Normal); lineEdit->setCompletionObject (completion); @@ -77,18 +77,18 @@ PhraseList::PhraseList(TQWidget *parent, const char *name) : TQWidget(parent,nam TQIconSet icon = TDEGlobal::iconLoader()->loadIconSet("speak", TDEIcon::Small); speakButton = new TQPushButton (icon, i18n("&Speak"), this); - speakButton->setFocusPolicy(TQ_NoFocus); + speakButton->setFocusPolicy(TQWidget::NoFocus); speakButton->setAutoDefault(false); TQWhatsThis::add (speakButton, i18n("Speaks the currently active sentence(s). If there is some text in the edit field it is spoken. Otherwise the selected sentences in the history (if any) are spoken.")); rowLayout->addWidget(speakButton); - connect(dictionaryCombo, TQT_SIGNAL (activated (const TQString &)), completion, TQT_SLOT (setWordList(const TQString &))); - connect(completion, TQT_SIGNAL (wordListsChanged (const TQStringList &)), this, TQT_SLOT (configureCompletionCombo (const TQStringList &))); - connect(listBox, TQT_SIGNAL(selectionChanged()), TQT_SLOT(selectionChanged())); - connect(listBox, TQT_SIGNAL(contextMenuRequested (TQListBoxItem *, const TQPoint &)), TQT_SLOT(contextMenuRequested (TQListBoxItem *, const TQPoint &))); - connect(lineEdit, TQT_SIGNAL(returnPressed(const TQString &)), TQT_SLOT(lineEntered(const TQString &))); - connect(lineEdit, TQT_SIGNAL(textChanged (const TQString &)), TQT_SLOT(textChanged(const TQString &))); - connect(speakButton, TQT_SIGNAL( clicked ()), TQT_SLOT(speak())); + connect(dictionaryCombo, TQ_SIGNAL (activated (const TQString &)), completion, TQ_SLOT (setWordList(const TQString &))); + connect(completion, TQ_SIGNAL (wordListsChanged (const TQStringList &)), this, TQ_SLOT (configureCompletionCombo (const TQStringList &))); + connect(listBox, TQ_SIGNAL(selectionChanged()), TQ_SLOT(selectionChanged())); + connect(listBox, TQ_SIGNAL(contextMenuRequested (TQListBoxItem *, const TQPoint &)), TQ_SLOT(contextMenuRequested (TQListBoxItem *, const TQPoint &))); + connect(lineEdit, TQ_SIGNAL(returnPressed(const TQString &)), TQ_SLOT(lineEntered(const TQString &))); + connect(lineEdit, TQ_SIGNAL(textChanged (const TQString &)), TQ_SLOT(textChanged(const TQString &))); + connect(speakButton, TQ_SIGNAL( clicked ()), TQ_SLOT(speak())); } PhraseList::~PhraseList() { diff --git a/kmouth/phraselist.h b/kmouth/phraselist.h index 492082e..d27a74e 100644 --- a/kmouth/phraselist.h +++ b/kmouth/phraselist.h @@ -39,7 +39,7 @@ class WordCompletion; */ class PhraseList : public TQWidget { - Q_OBJECT + TQ_OBJECT public: PhraseList(TQWidget *parent=0, const char *name=0); diff --git a/kmouth/phraselistitem.cpp b/kmouth/phraselistitem.cpp index 10d29ae..721e893 100644 --- a/kmouth/phraselistitem.cpp +++ b/kmouth/phraselistitem.cpp @@ -46,7 +46,7 @@ void PhraseListItem::paint (TQPainter *p) { if (drawCursor()) { TQRect r (0, 0, listBox()->maxItemWidth(), height (listBox())); - listBox()->style().tqdrawPrimitive (TQStyle::PE_FocusRect, p, r, + listBox()->style().drawPrimitive (TQStyle::PE_FocusRect, p, r, listBox()->colorGroup()); } } diff --git a/kmouth/preferencesui.ui b/kmouth/preferencesui.ui index 16cb7ce..5921c8c 100644 --- a/kmouth/preferencesui.ui +++ b/kmouth/preferencesui.ui @@ -159,7 +159,7 @@ </vbox> </widget> <layoutdefaults spacing="6" margin="11"/> -<includehints> +<includes> <include location="global" impldecl="in implementation">kcombobox.h</include> -</includehints> +</includes> </UI> diff --git a/kmouth/speech.cpp b/kmouth/speech.cpp index ae68838..ad80946 100644 --- a/kmouth/speech.cpp +++ b/kmouth/speech.cpp @@ -206,10 +206,10 @@ void Speech::speak(TQString command, bool stdIn, const TQString &text, const TQS // 3. create a new process process << command; - connect(&process, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(processExited(TDEProcess *))); - connect(&process, TQT_SIGNAL(wroteStdin(TDEProcess *)), this, TQT_SLOT(wroteStdin(TDEProcess *))); - connect(&process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(receivedStdout(TDEProcess *, char *, int))); - connect(&process, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQT_SLOT(receivedStderr(TDEProcess *, char *, int))); + connect(&process, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(processExited(TDEProcess *))); + connect(&process, TQ_SIGNAL(wroteStdin(TDEProcess *)), this, TQ_SLOT(wroteStdin(TDEProcess *))); + connect(&process, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQ_SLOT(receivedStdout(TDEProcess *, char *, int))); + connect(&process, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQ_SLOT(receivedStderr(TDEProcess *, char *, int))); // 4. start the process if (stdIn) { diff --git a/kmouth/speech.h b/kmouth/speech.h index 145b032..87fa3fd 100644 --- a/kmouth/speech.h +++ b/kmouth/speech.h @@ -28,7 +28,7 @@ */ class Speech : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum CharacterCodec { diff --git a/kmouth/texttospeechconfigurationui.ui b/kmouth/texttospeechconfigurationui.ui index afbcfd6..babf3a6 100644 --- a/kmouth/texttospeechconfigurationui.ui +++ b/kmouth/texttospeechconfigurationui.ui @@ -157,9 +157,9 @@ </widget> </vbox> </widget> -<Q_SIGNALS> +<signals> <signal>configurationChanged()</signal> -</Q_SIGNALS> +</signals> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kurlrequester.h</include> diff --git a/kmouth/texttospeechsystem.h b/kmouth/texttospeechsystem.h index 8ad7782..67ae00e 100644 --- a/kmouth/texttospeechsystem.h +++ b/kmouth/texttospeechsystem.h @@ -30,7 +30,7 @@ class TDEConfig; */ class TextToSpeechSystem : public TQObject{ - Q_OBJECT + TQ_OBJECT friend class TextToSpeechConfigurationWidget; public: diff --git a/kmouth/wordcompletion/creationsourcedetailsui.ui b/kmouth/wordcompletion/creationsourcedetailsui.ui index 1efd8bd..838f5e2 100644 --- a/kmouth/wordcompletion/creationsourcedetailsui.ui +++ b/kmouth/wordcompletion/creationsourcedetailsui.ui @@ -169,9 +169,9 @@ <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> 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/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 c195cf0..92e4909 100644 --- a/kmouth/wordcompletion/wordcompletionui.ui +++ b/kmouth/wordcompletion/wordcompletionui.ui @@ -277,9 +277,9 @@ <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> 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); |