diff options
Diffstat (limited to 'kbabel')
30 files changed, 49 insertions, 49 deletions
diff --git a/kbabel/catalogmanager/catmanlistitem.h b/kbabel/catalogmanager/catmanlistitem.h index a21db4f0..e31a5d4d 100644 --- a/kbabel/catalogmanager/catmanlistitem.h +++ b/kbabel/catalogmanager/catmanlistitem.h @@ -184,7 +184,7 @@ private: * file using @ref Catalog::info * ( slow for big files ) * @param includeChildren flag, if possible tqchildren should be updated,too - * @param noParents flag, if tqparents should be updated, when state + * @param noParents flag, if parents should be updated, when state * of the item has changed */ void update(bool showPoInfo=true,bool includeChildren=false diff --git a/kbabel/catalogmanager/markpatternwidget.ui b/kbabel/catalogmanager/markpatternwidget.ui index 056bf6aa..1380acfe 100644 --- a/kbabel/catalogmanager/markpatternwidget.ui +++ b/kbabel/catalogmanager/markpatternwidget.ui @@ -120,7 +120,7 @@ <forwards> <forward>class KComboBox;</forward> </forwards> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/kbabel/catalogmanager/validateprogresswidget.ui b/kbabel/catalogmanager/validateprogresswidget.ui index 4477d800..01cb4c5f 100644 --- a/kbabel/catalogmanager/validateprogresswidget.ui +++ b/kbabel/catalogmanager/validateprogresswidget.ui @@ -119,7 +119,7 @@ <Q_SLOTS> <slot>setupFileProgressBar( TQString text, int maxvalue )</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kprogress.h</includehint> <includehint>ksqueezedtextlabel.h</includehint> diff --git a/kbabel/catalogmanager/validationoptions.ui b/kbabel/catalogmanager/validationoptions.ui index 0357f3fe..23c3cb71 100644 --- a/kbabel/catalogmanager/validationoptions.ui +++ b/kbabel/catalogmanager/validationoptions.ui @@ -56,5 +56,5 @@ marked as fuzzy will not be validated at all.</p></qt></string> </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kbabel/commonui/diffpreferences.ui b/kbabel/commonui/diffpreferences.ui index f7ea7c7f..c52e3c27 100644 --- a/kbabel/commonui/diffpreferences.ui +++ b/kbabel/commonui/diffpreferences.ui @@ -133,7 +133,7 @@ the database are used for diffing.</p></qt></string> <functions> <function>init()</function> </functions> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kbabel/commonui/klisteditor.ui b/kbabel/commonui/klisteditor.ui index 14cc8dc1..b31497b4 100644 --- a/kbabel/commonui/klisteditor.ui +++ b/kbabel/commonui/klisteditor.ui @@ -257,5 +257,5 @@ <slot>setTitle( const TQString & s )</slot> <slot returnType="TQStringList">list()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kbabel/commonui/projectwizardwidget.ui b/kbabel/commonui/projectwizardwidget.ui index 7adae4fb..c9329be7 100644 --- a/kbabel/commonui/projectwizardwidget.ui +++ b/kbabel/commonui/projectwizardwidget.ui @@ -255,8 +255,8 @@ done</li> <includes> <include location="local" impldecl="in implementation">projectwizardwidget.ui.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> -<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> +<layoutdefaults spacing="6" margin="11"/> +<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kbabel/commonui/projectwizardwidget2.ui b/kbabel/commonui/projectwizardwidget2.ui index f99a0367..97030b94 100644 --- a/kbabel/commonui/projectwizardwidget2.ui +++ b/kbabel/commonui/projectwizardwidget2.ui @@ -149,7 +149,7 @@ will not work.</string> </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kbabel/filters/linguist/linguistimport.cpp b/kbabel/filters/linguist/linguistimport.cpp index b46f5f97..82dd6ad4 100644 --- a/kbabel/filters/linguist/linguistimport.cpp +++ b/kbabel/filters/linguist/linguistimport.cpp @@ -113,9 +113,9 @@ ConversiontqStatus LinguistImportPlugin::load( const TQString& filename, const T return OK; } -void LinguistImportPlugin::parse( const TQDomElement& tqparentElement ) +void LinguistImportPlugin::parse( const TQDomElement& parentElement ) { - TQDomNode node = tqparentElement.firstChild( ); + TQDomNode node = parentElement.firstChild( ); while ( !node.isNull( ) ) { if ( node.isElement( ) ) { diff --git a/kbabel/filters/linguist/linguistimport.h b/kbabel/filters/linguist/linguistimport.h index fa7aa36c..3f6d8051 100644 --- a/kbabel/filters/linguist/linguistimport.h +++ b/kbabel/filters/linguist/linguistimport.h @@ -56,7 +56,7 @@ class LinguistImportPlugin : public KBabel::CatalogImportPlugin virtual const TQString id( ) { return "TQt translation source"; } private: - void parse( const TQDomElement& tqparentElement ); + void parse( const TQDomElement& parentElement ); private: uint msgcnt; diff --git a/kbabel/filters/xliff/xliffexport.cpp b/kbabel/filters/xliff/xliffexport.cpp index 82033521..187a1dda 100644 --- a/kbabel/filters/xliff/xliffexport.cpp +++ b/kbabel/filters/xliff/xliffexport.cpp @@ -147,7 +147,7 @@ void XLIFFExportPlugin::createMessage( TQDomDocument& doc, TQDomElement& transla TQDomElement XLIFFExportPlugin::getContext( TQDomDocument& doc, const TQString& file, const TQString& id ) { // Find out whether there is already such a context in the TQDomDocument. - TQDomNode tqparentelem = doc.documentElement(); + TQDomNode parentelem = doc.documentElement(); TQDomNode elem = doc.documentElement( ).firstChild( ); while ( !elem.isNull( ) ) { if ( elem.isElement( ) && elem.toElement().tagName( ) == "file" && elem.toElement().attribute ("original") == file ) { @@ -162,12 +162,12 @@ TQDomElement XLIFFExportPlugin::getContext( TQDomDocument& doc, const TQString& kdError () << "File not found at all, creating" << endl; TQDomElement newelem = doc.createElement ("file"); newelem.setAttribute ("original", file); - tqparentelem.appendChild (newelem); + parentelem.appendChild (newelem); elem = newelem; } // lookup body tag - tqparentelem = elem; + parentelem = elem; elem = elem.firstChild (); while ( !elem.isNull( ) ) { if ( elem.isElement( ) && elem.toElement().tagName( ) == "body" ) { @@ -181,7 +181,7 @@ TQDomElement XLIFFExportPlugin::getContext( TQDomDocument& doc, const TQString& { kdError () << "File body not found at all, creating" << endl; TQDomElement newelem = doc.createElement ("body"); - tqparentelem.appendChild (newelem); + parentelem.appendChild (newelem); elem = newelem; } @@ -192,7 +192,7 @@ TQDomElement XLIFFExportPlugin::getContext( TQDomDocument& doc, const TQString& kdError () << "Trans-unit not found at all, creating" << endl; TQDomElement newelem = doc.createElement ("trans-unit"); newelem.setAttribute ("id", id); - tqparentelem.appendChild (newelem); + parentelem.appendChild (newelem); elem = newelem; } diff --git a/kbabel/filters/xliff/xliffimport.cpp b/kbabel/filters/xliff/xliffimport.cpp index 9d14c054..01c39092 100644 --- a/kbabel/filters/xliff/xliffimport.cpp +++ b/kbabel/filters/xliff/xliffimport.cpp @@ -128,9 +128,9 @@ ConversiontqStatus XLIFFImportPlugin::load( const TQString& filename, const TQSt return OK; } -void XLIFFImportPlugin::parse( const TQDomElement& tqparentElement ) +void XLIFFImportPlugin::parse( const TQDomElement& parentElement ) { - TQDomNode node = tqparentElement.firstChild( ); + TQDomNode node = parentElement.firstChild( ); while ( !node.isNull( ) ) { if ( node.isElement( ) ) { diff --git a/kbabel/filters/xliff/xliffimport.h b/kbabel/filters/xliff/xliffimport.h index 2dbe1066..a18a9a82 100644 --- a/kbabel/filters/xliff/xliffimport.h +++ b/kbabel/filters/xliff/xliffimport.h @@ -56,7 +56,7 @@ class XLIFFImportPlugin : public KBabel::CatalogImportPlugin virtual const TQString id( ) { return "XLIFF 1.1"; } private: - void parse( const TQDomElement& tqparentElement ); + void parse( const TQDomElement& parentElement ); private: uint msgcnt; diff --git a/kbabel/kbabel/colorpreferences.ui b/kbabel/kbabel/colorpreferences.ui index d2c89da6..ae8e57fe 100644 --- a/kbabel/kbabel/colorpreferences.ui +++ b/kbabel/kbabel/colorpreferences.ui @@ -175,7 +175,7 @@ phrases.</qt></string> </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> diff --git a/kbabel/kbabel/editordiffpreferences.ui b/kbabel/kbabel/editordiffpreferences.ui index c1e6caa9..33460635 100644 --- a/kbabel/kbabel/editordiffpreferences.ui +++ b/kbabel/kbabel/editordiffpreferences.ui @@ -184,7 +184,7 @@ <functions> <function>init()</function> </functions> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> diff --git a/kbabel/kbabel/editorpreferences.ui b/kbabel/kbabel/editorpreferences.ui index f47a5c56..15498f32 100644 --- a/kbabel/kbabel/editorpreferences.ui +++ b/kbabel/kbabel/editorpreferences.ui @@ -345,7 +345,7 @@ activated, you will still see a message in the statusbar. <slot specifier="non virtual">ledWarning( bool show )</slot> <slot specifier="non virtual">toggleOther( bool other )</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>toolselectionwidget.h</includehint> <includehint>kcolorbutton.h</includehint> diff --git a/kbabel/kbabel/fontpreferences.ui b/kbabel/kbabel/fontpreferences.ui index 4ef37af7..22b49455 100644 --- a/kbabel/kbabel/fontpreferences.ui +++ b/kbabel/kbabel/fontpreferences.ui @@ -59,5 +59,5 @@ <Q_SLOTS> <slot access="private">showOnlyFixedFonts( bool on )</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kbabel/kbabel/headerwidget.ui b/kbabel/kbabel/headerwidget.ui index 303d6426..344ef7f0 100644 --- a/kbabel/kbabel/headerwidget.ui +++ b/kbabel/kbabel/headerwidget.ui @@ -56,7 +56,7 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>ktextedit.h</includehint> <includehint>ktextedit.h</includehint> diff --git a/kbabel/kbabel/mymultilineedit.h b/kbabel/kbabel/mymultilineedit.h index 10592b0c..bc0075d0 100644 --- a/kbabel/kbabel/mymultilineedit.h +++ b/kbabel/kbabel/mymultilineedit.h @@ -253,7 +253,7 @@ private: TQRect mapToView( int para, int index ); /** - * tests if the character in string str at position col is tqmasked with + * tests if the character in string str at position col is masked with * '\' by counting the number of '\' backwards */ static bool isMasked(TQString *str,uint col); diff --git a/kbabel/kbabel/searchpreferences.ui b/kbabel/kbabel/searchpreferences.ui index ee56f125..c00e537f 100644 --- a/kbabel/kbabel/searchpreferences.ui +++ b/kbabel/kbabel/searchpreferences.ui @@ -105,5 +105,5 @@ the desired dictionary from <b>Settings->Configure Dictionary</b> </spacer> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kbabel/kbabel/spelldlgwidget.ui b/kbabel/kbabel/spelldlgwidget.ui index 8fa2a06b..1c770064 100644 --- a/kbabel/kbabel/spelldlgwidget.ui +++ b/kbabel/kbabel/spelldlgwidget.ui @@ -122,5 +122,5 @@ <tabstop>endBtn</tabstop> <tabstop>defaultBtn</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui b/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui index 5b80967f..3e694330 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui +++ b/kbabel/kbabeldict/modules/dbsearchengine/dbseprefwidget.ui @@ -1032,5 +1032,5 @@ Finally you can set the maximum number of entries in the list.</string> <include location="local" impldecl="in declaration">klocale.h</include> <include location="global" impldecl="in declaration">kseparator.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui index ca3b0f90..285319e5 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2.ui @@ -706,7 +706,7 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui b/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui index 6ba04971..fe3b1f6f 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui @@ -1035,5 +1035,5 @@ Finally you can set the maximum number of entries in the list.</string> <include location="local" impldecl="in declaration">klocale.h</include> <include location="global" impldecl="in declaration">kseparator.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui b/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui index 8c595c07..39e1f2ac 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui +++ b/kbabel/kbabeldict/modules/dbsearchengine2/sourcedialog.ui @@ -251,7 +251,7 @@ <slot>reject()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp index dab127bf..bc79f082 100644 --- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp @@ -421,7 +421,7 @@ bool PoCompendium::searchWords(const TQString& searchStr, uint pluralForm, TQPtr if(!found && matchContains && !wholeWords) { - TQString s=tqmaskString(searchStr); + TQString s=maskString(searchStr); TQRegExp searchReg(s); if(searchReg.search(origStr) >= 0) @@ -430,7 +430,7 @@ bool PoCompendium::searchWords(const TQString& searchStr, uint pluralForm, TQPtr if(!found && matchIsContained && !wholeWords) { - TQString s=tqmaskString(origStr); + TQString s=maskString(origStr); TQRegExp reg(s); if(reg.search(searchStr) >= 0) @@ -445,7 +445,7 @@ bool PoCompendium::searchWords(const TQString& searchStr, uint pluralForm, TQPtr for ( TQStringList::Iterator wit2 = list.begin() ; wit2 != list.end(); ++wit2 ) { - TQString s=tqmaskString(*wit2); + TQString s=maskString(*wit2); TQRegExp reg(s); if(reg.search(origStr) >= 0) @@ -491,7 +491,7 @@ bool PoCompendium::searchNGram(const TQString& searchStr, uint pluralForm, TQPtr TQRegExp searchReg; if(matchContains) { - TQString s=tqmaskString(searchStr); + TQString s=maskString(searchStr); searchReg.setPattern(s); } @@ -564,7 +564,7 @@ bool PoCompendium::searchNGram(const TQString& searchStr, uint pluralForm, TQPtr if(!found && matchIsContained) { - TQString s=tqmaskString(origStr); + TQString s=maskString(origStr); TQRegExp reg(s); if(reg.search(searchStr) >= 0) @@ -580,7 +580,7 @@ bool PoCompendium::searchNGram(const TQString& searchStr, uint pluralForm, TQPtr for ( TQStringList::Iterator wit2 = list.begin() ; wit2 != list.end(); ++wit2 ) { - TQString s=tqmaskString(*wit2); + TQString s=maskString(*wit2); if(wholeWords) { @@ -864,7 +864,7 @@ void PoCompendium::recheckData() loading=false; } -TQString PoCompendium::tqmaskString(TQString s) +TQString PoCompendium::maskString(TQString s) { s.tqreplace("\\","\\\\"); s.tqreplace("\?","\\?"); diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.h b/kbabel/kbabeldict/modules/pocompendium/pocompendium.h index 70386572..1b3d1496 100644 --- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.h +++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.h @@ -99,7 +99,7 @@ protected slots: protected: void loadCompendium(); void addResult(SearchResult *, TQPtrList<SearchResult>& allResults); - TQString tqmaskString(TQString string); + TQString maskString(TQString string); void registerData(); void unregisterData(); diff --git a/kbabel/kbabeldict/modules/tmx/pwidget.ui b/kbabel/kbabeldict/modules/tmx/pwidget.ui index ab3fd636..9d0d4281 100644 --- a/kbabel/kbabeldict/modules/tmx/pwidget.ui +++ b/kbabel/kbabeldict/modules/tmx/pwidget.ui @@ -209,7 +209,7 @@ <includes> <include location="global" impldecl="in declaration">kseparator.h</include> </includes> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> </includehints> diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp index f375574c..123935e7 100644 --- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp +++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp @@ -389,7 +389,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea if(!found && matchContains && !wholeWords) { - TQString s=tqmaskString(searchStr); + TQString s=maskString(searchStr); TQRegExp searchReg(s); if(searchReg.search(origStr) >= 0) @@ -398,7 +398,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea if(!found && matchIsContained && !wholeWords) { - TQString s=tqmaskString(origStr); + TQString s=maskString(origStr); TQRegExp reg(s); if(reg.search(searchStr) >= 0) @@ -413,7 +413,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea for ( TQStringList::Iterator wit2 = list.begin() ; wit2 != list.end(); ++wit2 ) { - TQString s=tqmaskString(*wit2); + TQString s=maskString(*wit2); TQRegExp reg(s); if(reg.search(origStr) >= 0) @@ -454,7 +454,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea TQRegExp searchReg; if(matchContains) { - TQString s=tqmaskString(searchStr); + TQString s=maskString(searchStr); searchReg.setPattern(s); } @@ -523,7 +523,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea if(!found && matchIsContained) { - TQString s=tqmaskString(origStr); + TQString s=maskString(origStr); TQRegExp reg(s); if(reg.search(searchStr) >= 0) @@ -538,7 +538,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea for ( TQStringList::Iterator wit2 = list.begin() ; wit2 != list.end(); ++wit2 ) { - TQString s=tqmaskString(*wit2); + TQString s=maskString(*wit2); if(wholeWords) { @@ -746,7 +746,7 @@ void TmxCompendium::recheckData() loading=false; } -TQString TmxCompendium::tqmaskString(TQString s) const +TQString TmxCompendium::maskString(TQString s) const { s.tqreplace('\\',"\\\\"); s.tqreplace('?',"\\?"); diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.h b/kbabel/kbabeldict/modules/tmx/tmxcompendium.h index e6b76f53..8e96fbd5 100644 --- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.h +++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.h @@ -97,7 +97,7 @@ protected slots: protected: void loadCompendium(); void addResult(SearchResult *); - TQString tqmaskString(TQString string) const; + TQString maskString(TQString string) const; void registerData(); void unregisterData(); |