From d727bd514f24080005381ce793df127d8432550d Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 5 Jul 2026 10:09:45 +0900 Subject: Rename staticQString to staticTQString Signed-off-by: Michele Calgaro --- kate/part/katehighlight.cpp | 2 +- tdecore/kiconloader.cpp | 28 ++++++++++++------------- tdecore/kstringhandler.cpp | 2 +- tdecore/kurl.cpp | 4 ++-- tdecore/tdeapplication.cpp | 2 +- tdecore/tdeconfigbase.cpp | 4 ++-- tdecore/tdeglobal.cpp | 10 ++++----- tdecore/tdeglobal.h | 12 +++++------ tdehtml/misc/loader.cpp | 2 +- tdehtml/tdehtmlimage.cpp | 2 +- tdeio/bookmarks/kbookmark.cpp | 6 +++--- tdeio/tdefile/kdirsize.cpp | 4 ++-- tdeio/tdefile/kurlcombobox.cpp | 2 +- tdeio/tdefile/tdefiledialog.cpp | 4 ++-- tdeio/tdefile/tdefileview.cpp | 2 +- tdeio/tdeio/global.cpp | 2 +- tdeio/tdeio/kdirlister.cpp | 14 ++++++------- tdeio/tdeio/kmimetype.cpp | 12 +++++------ tdeio/tdeio/krun.cpp | 2 +- tdeio/tdeio/kuserprofile.cpp | 4 ++-- tdeio/tdeio/sessiondata.cpp | 2 +- tdeio/tdeio/tdefilefilter.cpp | 4 ++-- tdeio/tdeio/tdefileitem.cpp | 4 ++-- tdestyles/klegacy/klegacystyle.cpp | 2 +- tdeui/kedittoolbar.cpp | 42 +++++++++++++++++++------------------- tdeui/kxmlguiclient.cpp | 30 +++++++++++++-------------- tdeui/kxmlguifactory.cpp | 16 +++++++-------- tdeui/kxmlguifactory_p.cpp | 34 +++++++++++++++--------------- tdeui/tdetoolbar.cpp | 18 ++++++++-------- 29 files changed, 136 insertions(+), 136 deletions(-) diff --git a/kate/part/katehighlight.cpp b/kate/part/katehighlight.cpp index d5af43f57..12093902c 100644 --- a/kate/part/katehighlight.cpp +++ b/kate/part/katehighlight.cpp @@ -2093,7 +2093,7 @@ bool KateHighlighting::isInWord( TQChar c, int attrib ) const bool KateHighlighting::canBreakAt( TQChar c, int attrib ) const { - static const TQString& sq = TDEGlobal::staticQString("\"'"); + static const TQString& sq = TDEGlobal::staticTQString("\"'"); return (m_additionalData[ hlKeyForAttrib( attrib ) ]->wordWrapDeliminator.find(c) != -1) && (sq.find(c) == -1); } diff --git a/tdecore/kiconloader.cpp b/tdecore/kiconloader.cpp index b1ee62efd..bda648d02 100644 --- a/tdecore/kiconloader.cpp +++ b/tdecore/kiconloader.cpp @@ -410,15 +410,15 @@ TQString TDEIconLoader::removeIconExtension(const TQString &name) const TQString ext = name.right(4); - static const TQString &png_ext = TDEGlobal::staticQString(".png"); - static const TQString &xpm_ext = TDEGlobal::staticQString(".xpm"); + static const TQString &png_ext = TDEGlobal::staticTQString(".png"); + static const TQString &xpm_ext = TDEGlobal::staticTQString(".xpm"); if (ext == png_ext || ext == xpm_ext) extensionLength=4; #ifdef HAVE_LIBART else { - static const TQString &svgz_ext = TDEGlobal::staticQString(".svgz"); - static const TQString &svg_ext = TDEGlobal::staticQString(".svg"); + static const TQString &svgz_ext = TDEGlobal::staticTQString(".svgz"); + static const TQString &svg_ext = TDEGlobal::staticTQString(".svg"); if (name.right(5) == svgz_ext) extensionLength=5; @@ -455,15 +455,15 @@ TDEIcon TDEIconLoader::findMatchingIcon(const TQString& name, int size) const const TQString *ext[4]; int count=0; - static const TQString &png_ext = TDEGlobal::staticQString(".png"); + static const TQString &png_ext = TDEGlobal::staticTQString(".png"); ext[count++]=&png_ext; #ifdef HAVE_LIBART - static const TQString &svgz_ext = TDEGlobal::staticQString(".svgz"); + static const TQString &svgz_ext = TDEGlobal::staticTQString(".svgz"); ext[count++]=&svgz_ext; - static const TQString &svg_ext = TDEGlobal::staticQString(".svg"); + static const TQString &svg_ext = TDEGlobal::staticTQString(".svg"); ext[count++]=&svg_ext; #endif - static const TQString &xpm_ext = TDEGlobal::staticQString(".xpm"); + static const TQString &xpm_ext = TDEGlobal::staticTQString(".xpm"); ext[count++]=&xpm_ext; /* JRT: To follow the XDG spec, the order in which we look for an @@ -499,7 +499,7 @@ TDEIcon TDEIconLoader::findMatchingIcon(const TQString& name, int size) const inline TQString TDEIconLoader::unknownIconPath( int size ) const { - static const TQString &str_unknown = TDEGlobal::staticQString("unknown"); + static const TQString &str_unknown = TDEGlobal::staticTQString("unknown"); TDEIcon icon = findMatchingIcon(str_unknown, size); if (!icon.isValid()) @@ -527,13 +527,13 @@ TQString TDEIconLoader::iconPath(const TQString& _name, int group_or_size, TQString path; if (group_or_size == TDEIcon::User) { - static const TQString &png_ext = TDEGlobal::staticQString(".png"); - static const TQString &xpm_ext = TDEGlobal::staticQString(".xpm"); + static const TQString &png_ext = TDEGlobal::staticTQString(".png"); + static const TQString &xpm_ext = TDEGlobal::staticTQString(".xpm"); path = d->mpDirs->findResource("appicon", name + png_ext); #ifdef HAVE_LIBART - static const TQString &svgz_ext = TDEGlobal::staticQString(".svgz"); - static const TQString &svg_ext = TDEGlobal::staticQString(".svg"); + static const TQString &svgz_ext = TDEGlobal::staticTQString(".svgz"); + static const TQString &svg_ext = TDEGlobal::staticTQString(".svg"); if (path.isEmpty()) path = d->mpDirs->findResource("appicon", name + svgz_ext); if (path.isEmpty()) @@ -599,7 +599,7 @@ TQPixmap TDEIconLoader::loadIcon(const TQString& _name, TDEIcon::Group group, in } if (!TQDir::isRelativePath(name)) absolutePath=true; - static const TQString &str_unknown = TDEGlobal::staticQString("unknown"); + static const TQString &str_unknown = TDEGlobal::staticTQString("unknown"); // Special case for "User" icons. if (group == TDEIcon::User) diff --git a/tdecore/kstringhandler.cpp b/tdecore/kstringhandler.cpp index e6fef9350..28d4311fc 100644 --- a/tdecore/kstringhandler.cpp +++ b/tdecore/kstringhandler.cpp @@ -654,7 +654,7 @@ TQString KStringHandler::from8Bit( const char *str ) if (!str) return TQString::null; if (!*str) { - static const TQString &emptyString = TDEGlobal::staticQString(""); + static const TQString &emptyString = TDEGlobal::staticTQString(""); return emptyString; } return KStringHandler::isUtf8( str ) ? diff --git a/tdecore/kurl.cpp b/tdecore/kurl.cpp index 8122bb4bf..5ddb7426d 100644 --- a/tdecore/kurl.cpp +++ b/tdecore/kurl.cpp @@ -334,14 +334,14 @@ static TQString cleanpath(const TQString &_path, bool cleanDirSeparator, bool de if (decodeDots) { #ifndef KDE_QT_ONLY - static const TQString &encodedDot = TDEGlobal::staticQString("%2e"); + static const TQString &encodedDot = TDEGlobal::staticTQString("%2e"); #else TQString encodedDot("%2e"); #endif if (path.find(encodedDot, 0, false) != -1) { #ifndef KDE_QT_ONLY - static const TQString &encodedDOT = TDEGlobal::staticQString("%2E"); // Uppercase! + static const TQString &encodedDOT = TDEGlobal::staticTQString("%2E"); // Uppercase! #else TQString encodedDOT("%2E"); #endif diff --git a/tdecore/tdeapplication.cpp b/tdecore/tdeapplication.cpp index 4b5b427f3..0c27098f5 100644 --- a/tdecore/tdeapplication.cpp +++ b/tdecore/tdeapplication.cpp @@ -3443,7 +3443,7 @@ bool TDEApplication::authorizeTDEAction(const char *action) if (!d->actionRestrictions || !action) return true; - static const TQString &action_prefix = TDEGlobal::staticQString( "action/" ); + static const TQString &action_prefix = TDEGlobal::staticTQString( "action/" ); return authorize(action_prefix + action); } diff --git a/tdecore/tdeconfigbase.cpp b/tdecore/tdeconfigbase.cpp index 3f44fbc7e..4487e9592 100644 --- a/tdecore/tdeconfigbase.cpp +++ b/tdecore/tdeconfigbase.cpp @@ -259,7 +259,7 @@ TQString TDEConfigBase::readEntry( const char *pKey, aValue = TQString::fromUtf8(aEntryData.mValue.data()); if (aValue.isNull()) { - static const TQString &emptyString = TDEGlobal::staticQString(""); + static const TQString &emptyString = TDEGlobal::staticTQString(""); aValue = emptyString; } expand = aEntryData.bExpand; @@ -516,7 +516,7 @@ TQStringList TDEConfigBase::readListEntry( const TQString& pKey, char sep ) cons TQStringList TDEConfigBase::readListEntry( const char *pKey, char sep ) const { - static const TQString& emptyString = TDEGlobal::staticQString(""); + static const TQString& emptyString = TDEGlobal::staticTQString(""); TQStringList list; if( !hasKey( pKey ) ) diff --git a/tdecore/tdeglobal.cpp b/tdecore/tdeglobal.cpp index 517debcad..70aa03877 100644 --- a/tdecore/tdeglobal.cpp +++ b/tdecore/tdeglobal.cpp @@ -142,12 +142,12 @@ void TDEGlobal::setActiveInstance(TDEInstance *i) * Create a static TQString * * To be used inside functions(!) like: - * static const TQString &myString = TDEGlobal::staticQString("myText"); + * static const TQString &myString = TDEGlobal::staticTQString("myText"); */ const TQString & -TDEGlobal::staticQString(const char *str) +TDEGlobal::staticTQString(const char *str) { - return staticQString(TQString::fromLatin1(str)); + return staticTQString(TQString::fromLatin1(str)); } class KStringDict : public TQDict @@ -160,10 +160,10 @@ public: * Create a static TQString * * To be used inside functions(!) like: - * static const TQString &myString = TDEGlobal::staticQString(i18n("My Text")); + * static const TQString &myString = TDEGlobal::staticTQString(i18n("My Text")); */ const TQString & -TDEGlobal::staticQString(const TQString &str) +TDEGlobal::staticTQString(const TQString &str) { if (!_stringDict) { _stringDict = new KStringDict; diff --git a/tdecore/tdeglobal.h b/tdecore/tdeglobal.h index a8c16d3fb..8332bd1ad 100644 --- a/tdecore/tdeglobal.h +++ b/tdecore/tdeglobal.h @@ -112,38 +112,38 @@ public: * * To be used inside functions(!) like: * \code - * static const TQString &myString = TDEGlobal::staticQString("myText"); + * static const TQString &myString = TDEGlobal::staticTQString("myText"); * \endcode * * !!! Do _NOT_ use: !!! * \code - * static TQString myString = TDEGlobal::staticQString("myText"); + * static TQString myString = TDEGlobal::staticTQString("myText"); * \endcode * This creates a static object (instead of a static reference) * and as you know static objects are EVIL. * @param str the string to create * @return the static string */ - static const TQString &staticQString(const char *str); + static const TQString &staticTQString(const char *str); /** * Creates a static TQString. * * To be used inside functions(!) like: * \code - * static const TQString &myString = TDEGlobal::staticQString(i18n("My Text")); + * static const TQString &myString = TDEGlobal::staticTQString(i18n("My Text")); * \endcode * * !!! Do _NOT_ use: !!! * \code - * static TQString myString = TDEGlobal::staticQString(i18n("myText")); + * static TQString myString = TDEGlobal::staticTQString(i18n("myText")); * \endcode * This creates a static object (instead of a static reference) * and as you know static objects are EVIL. * @param str the string to create * @return the static string */ - static const TQString &staticQString(const TQString &str); + static const TQString &staticTQString(const TQString &str); /** * Registers a static deleter. diff --git a/tdehtml/misc/loader.cpp b/tdehtml/misc/loader.cpp index 8b98f0749..293c7c200 100644 --- a/tdehtml/misc/loader.cpp +++ b/tdehtml/misc/loader.cpp @@ -469,7 +469,7 @@ static TQString buildAcceptHeader() CachedImage::CachedImage(DocLoader* dl, const DOMString &url, TDEIO::CacheControl _cachePolicy, const char*) : TQObject(), CachedObject(url, Image, _cachePolicy, 0) { - static const TQString &acceptHeader = TDEGlobal::staticQString( buildAcceptHeader() ); + static const TQString &acceptHeader = TDEGlobal::staticTQString( buildAcceptHeader() ); m = 0; p = 0; diff --git a/tdehtml/tdehtmlimage.cpp b/tdehtml/tdehtmlimage.cpp index 3ade9bd4d..2f1ea699b 100644 --- a/tdehtml/tdehtmlimage.cpp +++ b/tdehtml/tdehtmlimage.cpp @@ -135,7 +135,7 @@ TDEHTMLImage::~TDEHTMLImage() bool TDEHTMLImage::openURL( const KURL &url ) { - static const TQString &html = TDEGlobal::staticQString( "" ); + static const TQString &html = TDEGlobal::staticTQString( "" ); disposeImage(); diff --git a/tdeio/bookmarks/kbookmark.cpp b/tdeio/bookmarks/kbookmark.cpp index 1e8bf8f7a..f28242f56 100644 --- a/tdeio/bookmarks/kbookmark.cpp +++ b/tdeio/bookmarks/kbookmark.cpp @@ -87,9 +87,9 @@ KBookmark KBookmarkGroup::next( const KBookmark & current ) const // firstElement() and lastElement() TQDomElement KBookmarkGroup::nextKnownTag( TQDomElement start, bool goNext ) const { - static const TQString & bookmark = TDEGlobal::staticQString("bookmark"); - static const TQString & folder = TDEGlobal::staticQString("folder"); - static const TQString & separator = TDEGlobal::staticQString("separator"); + static const TQString & bookmark = TDEGlobal::staticTQString("bookmark"); + static const TQString & folder = TDEGlobal::staticTQString("folder"); + static const TQString & separator = TDEGlobal::staticTQString("separator"); for( TQDomNode n = start; !n.isNull(); ) { diff --git a/tdeio/tdefile/kdirsize.cpp b/tdeio/tdefile/kdirsize.cpp index 40d0b5d13..02deb58d3 100644 --- a/tdeio/tdefile/kdirsize.cpp +++ b/tdeio/tdefile/kdirsize.cpp @@ -79,8 +79,8 @@ void KDirSize::startNextJob( const KURL & url ) void KDirSize::slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList & list ) { - static const TQString& dot = TDEGlobal::staticQString( "." ); - static const TQString& dotdot = TDEGlobal::staticQString( ".." ); + static const TQString& dot = TDEGlobal::staticTQString( "." ); + static const TQString& dotdot = TDEGlobal::staticTQString( ".." ); TDEIO::UDSEntryListConstIterator it = list.begin(); TDEIO::UDSEntryListConstIterator end = list.end(); for (; it != end; ++it) { diff --git a/tdeio/tdefile/kurlcombobox.cpp b/tdeio/tdefile/kurlcombobox.cpp index f19dbe961..65da732aa 100644 --- a/tdeio/tdefile/kurlcombobox.cpp +++ b/tdeio/tdefile/kurlcombobox.cpp @@ -81,7 +81,7 @@ void KURLComboBox::init( Mode mode ) TQStringList KURLComboBox::urls() const { kdDebug(250) << "::urls()" << endl; - //static const TQString &fileProt = TDEGlobal::staticQString("file:"); + //static const TQString &fileProt = TDEGlobal::staticTQString("file:"); TQStringList list; TQString url; for ( int i = defaultList.count(); i < count(); i++ ) { diff --git a/tdeio/tdefile/tdefiledialog.cpp b/tdeio/tdefile/tdefiledialog.cpp index 60c017459..2cddb9594 100644 --- a/tdeio/tdefile/tdefiledialog.cpp +++ b/tdeio/tdefile/tdefiledialog.cpp @@ -754,7 +754,7 @@ void KFileDialog::multiSelectionChanged() return; } - static const TQString &begin = TDEGlobal::staticQString(" \""); + static const TQString &begin = TDEGlobal::staticTQString(" \""); KFileItemListIterator it ( *list ); TQString text; while ( (item = it.current()) ) { @@ -1473,7 +1473,7 @@ KURL::List& KFileDialog::parseSelectedURLs() const d->urlList.clear(); if ( d->filenames.contains( '/' )) { // assume _one_ absolute filename - static const TQString &prot = TDEGlobal::staticQString(":/"); + static const TQString &prot = TDEGlobal::staticTQString(":/"); KURL u; if ( d->filenames.find( prot ) != -1 ) u = d->filenames; diff --git a/tdeio/tdefile/tdefileview.cpp b/tdeio/tdefile/tdefileview.cpp index 66111595b..fd136504b 100644 --- a/tdeio/tdefile/tdefileview.cpp +++ b/tdeio/tdefile/tdefileview.cpp @@ -171,7 +171,7 @@ void KFileView::sortReversed() #if 0 int KFileView::compareItems(const KFileItem *fi1, const KFileItem *fi2) const { - static const TQString &dirup = TDEGlobal::staticQString(".."); + static const TQString &dirup = TDEGlobal::staticTQString(".."); bool bigger = true; bool keepFirst = false; bool dirsFirst = ((m_sorting & TQDir::DirsFirst) == TQDir::DirsFirst); diff --git a/tdeio/tdeio/global.cpp b/tdeio/tdeio/global.cpp index f026b3044..89e9d8b16 100644 --- a/tdeio/tdeio/global.cpp +++ b/tdeio/tdeio/global.cpp @@ -1696,7 +1696,7 @@ static TQString get_mount_info(const TQString& filename, gotDevice = true; if (stat_buf.st_dev == rootDevice) { - static const TQString &root = TDEGlobal::staticQString("/"); + static const TQString &root = TDEGlobal::staticTQString("/"); isautofs = Wrong; isslow = Wrong; ismanual = Wrong; diff --git a/tdeio/tdeio/kdirlister.cpp b/tdeio/tdeio/kdirlister.cpp index e5045db5b..d330a6cfb 100644 --- a/tdeio/tdeio/kdirlister.cpp +++ b/tdeio/tdeio/kdirlister.cpp @@ -996,8 +996,8 @@ void KDirListerCache::slotEntries( TDEIO::Job *job, const TDEIO::UDSEntryList &e } // avoid creating these QStrings again and again - static const TQString& dot = TDEGlobal::staticQString("."); - static const TQString& dotdot = TDEGlobal::staticQString(".."); + static const TQString& dot = TDEGlobal::staticTQString("."); + static const TQString& dotdot = TDEGlobal::staticTQString(".."); TDEIO::UDSEntryListConstIterator it = entries.begin(); TDEIO::UDSEntryListConstIterator end = entries.end(); @@ -1603,8 +1603,8 @@ void KDirListerCache::slotUpdateResult( TDEIO::Job * j ) } } - static const TQString& dot = TDEGlobal::staticQString("."); - static const TQString& dotdot = TDEGlobal::staticQString(".."); + static const TQString& dot = TDEGlobal::staticTQString("."); + static const TQString& dotdot = TDEGlobal::staticTQString(".."); KFileItem *item = 0, *tmp; @@ -2094,8 +2094,8 @@ void KDirLister::emitChanges() if ( d->changes == NONE ) return; - static const TQString& dot = TDEGlobal::staticQString("."); - static const TQString& dotdot = TDEGlobal::staticQString(".."); + static const TQString& dot = TDEGlobal::staticTQString("."); + static const TQString& dotdot = TDEGlobal::staticTQString(".."); for ( KURL::List::Iterator it = d->lstDirs.begin(); it != d->lstDirs.end(); ++it ) @@ -2300,7 +2300,7 @@ bool KDirLister::matchesMimeFilter( const TQString& mime ) const bool KDirLister::matchesFilter( const KFileItem *item ) const { Q_ASSERT( item ); - static const TQString& dotdot = TDEGlobal::staticQString(".."); + static const TQString& dotdot = TDEGlobal::staticTQString(".."); if ( item->text() == dotdot ) return false; diff --git a/tdeio/tdeio/kmimetype.cpp b/tdeio/tdeio/kmimetype.cpp index d0014d99c..286de531e 100644 --- a/tdeio/tdeio/kmimetype.cpp +++ b/tdeio/tdeio/kmimetype.cpp @@ -204,7 +204,7 @@ KMimeType::Ptr KMimeType::findByURL( const KURL& _url, mode_t _mode, TQString fileName ( _url.fileName() ); - static const TQString& slash = TDEGlobal::staticQString("/"); + static const TQString& slash = TDEGlobal::staticTQString("/"); if ( ! fileName.isNull() && !path.endsWith( slash ) ) { // Try to find it out by looking at the filename @@ -234,9 +234,9 @@ KMimeType::Ptr KMimeType::findByURL( const KURL& _url, mode_t _mode, } } - static const TQString& dotdesktop = TDEGlobal::staticQString(".desktop"); - static const TQString& dotkdelnk = TDEGlobal::staticQString(".kdelnk"); - static const TQString& dotdirectory = TDEGlobal::staticQString(".directory"); + static const TQString& dotdesktop = TDEGlobal::staticTQString(".desktop"); + static const TQString& dotkdelnk = TDEGlobal::staticTQString(".kdelnk"); + static const TQString& dotdirectory = TDEGlobal::staticTQString(".directory"); // Another filename binding, hardcoded, is .desktop: if ( fileName.endsWith( dotdesktop ) ) @@ -508,7 +508,7 @@ TQString KMimeType::iconForURL( const KURL & _url, mode_t _mode ) { const KMimeType::Ptr mt = findByURL( _url, _mode, _url.isLocalFile(), false /*HACK*/); - static const TQString& unknown = TDEGlobal::staticQString("unknown"); + static const TQString& unknown = TDEGlobal::staticTQString("unknown"); const TQString mimeTypeIcon = mt->icon( _url, _url.isLocalFile() ); TQString i = mimeTypeIcon; @@ -1160,7 +1160,7 @@ void KDEDesktopMimeType::executeService( const KURL::List& urls, KDEDesktopMimeT const TQString & KMimeType::defaultMimeType() { static const TQString & s_strDefaultMimeType = - TDEGlobal::staticQString( "application/octet-stream" ); + TDEGlobal::staticTQString( "application/octet-stream" ); return s_strDefaultMimeType; } diff --git a/tdeio/tdeio/krun.cpp b/tdeio/tdeio/krun.cpp index d6fd8a80e..93af2af60 100644 --- a/tdeio/tdeio/krun.cpp +++ b/tdeio/tdeio/krun.cpp @@ -186,7 +186,7 @@ pid_t KRun::runURL( const KURL& u, const TQString& _mimetype, TQWidget* window, KURL::List lst; lst.append( u ); - static const TQString& app_str = TDEGlobal::staticQString("Application"); + static const TQString& app_str = TDEGlobal::staticTQString("Application"); KService::Ptr offer = KServiceTypeProfile::preferredService( _mimetype, app_str ); diff --git a/tdeio/tdeio/kuserprofile.cpp b/tdeio/tdeio/kuserprofile.cpp index a9bdc40c1..4796b37ac 100644 --- a/tdeio/tdeio/kuserprofile.cpp +++ b/tdeio/tdeio/kuserprofile.cpp @@ -55,7 +55,7 @@ void KServiceTypeProfile::initStatic() TDEConfig config( "profilerc", true, false); - static const TQString & defaultGroup = TDEGlobal::staticQString(""); + static const TQString & defaultGroup = TDEGlobal::staticTQString(""); TQStringList tmpList = config.groupList(); for (TQStringList::Iterator aIt = tmpList.begin(); @@ -243,7 +243,7 @@ bool KServiceTypeProfile::allowAsDefault( const TQString& _service ) const KServiceTypeProfile* KServiceTypeProfile::serviceTypeProfile( const TQString& _servicetype, const TQString& _genericServiceType ) { initStatic(); - static const TQString& app_str = TDEGlobal::staticQString("Application"); + static const TQString& app_str = TDEGlobal::staticTQString("Application"); const TQString &_genservicetype = ((!_genericServiceType.isEmpty()) ? _genericServiceType : app_str); diff --git a/tdeio/tdeio/sessiondata.cpp b/tdeio/tdeio/sessiondata.cpp index d16137cad..044075667 100644 --- a/tdeio/tdeio/sessiondata.cpp +++ b/tdeio/tdeio/sessiondata.cpp @@ -269,7 +269,7 @@ void SessionData::reset() d->useCookie = cfg->readBoolEntry( "Cookies", true ); delete cfg; - static const TQString & english = TDEGlobal::staticQString( "en" ); + static const TQString & english = TDEGlobal::staticTQString( "en" ); // Get language settings... TQStringList languageList = TDEGlobal::locale()->languagesTwoAlpha(); diff --git a/tdeio/tdeio/tdefilefilter.cpp b/tdeio/tdeio/tdefilefilter.cpp index c1663c2e8..7e60ac1e6 100644 --- a/tdeio/tdeio/tdefilefilter.cpp +++ b/tdeio/tdeio/tdefilefilter.cpp @@ -79,8 +79,8 @@ void KSimpleFileFilter::setModeFilter( mode_t mode ) bool KSimpleFileFilter::passesFilter( const KFileItem *item ) const { - static const TQString& dot = TDEGlobal::staticQString("."); - static const TQString& dotdot = TDEGlobal::staticQString(".."); + static const TQString& dot = TDEGlobal::staticTQString("."); + static const TQString& dotdot = TDEGlobal::staticTQString(".."); const TQString& name = item->name(); diff --git a/tdeio/tdeio/tdefileitem.cpp b/tdeio/tdeio/tdefileitem.cpp index aa4d1f873..c7788adec 100644 --- a/tdeio/tdeio/tdefileitem.cpp +++ b/tdeio/tdeio/tdefileitem.cpp @@ -276,7 +276,7 @@ void KFileItem::readUDSEntry( bool _urlIsDirectory ) } // avoid creating these QStrings again and again - static const TQString& dot = TDEGlobal::staticQString("."); + static const TQString& dot = TDEGlobal::staticTQString("."); if ( _urlIsDirectory && !UDS_URL_seen && !m_strName.isEmpty() && m_strName != dot ) { m_url.addPath( m_strName ); } @@ -665,7 +665,7 @@ TQPixmap KFileItem::pixmap( int _size, int _state ) const if ( !m_pMimeType ) { static const TQString & defaultFolderIcon = - TDEGlobal::staticQString(KMimeType::mimeType( "inode/directory" )->KServiceType::icon()); + TDEGlobal::staticTQString(KMimeType::mimeType( "inode/directory" )->KServiceType::icon()); if ( S_ISDIR( m_fileMode ) ) return DesktopIcon( defaultFolderIcon, _size, _state ); diff --git a/tdestyles/klegacy/klegacystyle.cpp b/tdestyles/klegacy/klegacystyle.cpp index 1dcfadf56..60da348af 100644 --- a/tdestyles/klegacy/klegacystyle.cpp +++ b/tdestyles/klegacy/klegacystyle.cpp @@ -3038,7 +3038,7 @@ void KLegacyStyle::drawKickerTaskButton(TQPainter *p, int x, int y, int w, int h TQString s(title); - static const TQString &modStr = TDEGlobal::staticQString( + static const TQString &modStr = TDEGlobal::staticTQString( TQString::fromUtf8("[") + i18n("modified") + TQString::fromUtf8("]")); int modStrPos = s.find(modStr); diff --git a/tdeui/kedittoolbar.cpp b/tdeui/kedittoolbar.cpp index be0d47a51..f1acaebd5 100644 --- a/tdeui/kedittoolbar.cpp +++ b/tdeui/kedittoolbar.cpp @@ -253,8 +253,8 @@ public: */ ToolbarList findToolbars(TQDomNode n) { - static const TQString &tagToolbar = TDEGlobal::staticQString( "ToolBar" ); - static const TQString &attrNoEdit = TDEGlobal::staticQString( "noEdit" ); + static const TQString &tagToolbar = TDEGlobal::staticTQString( "ToolBar" ); + static const TQString &attrNoEdit = TDEGlobal::staticTQString( "noEdit" ); ToolbarList list; for( ; !n.isNull(); n = n.nextSibling() ) @@ -277,9 +277,9 @@ public: */ TQString toolbarName( const KEditToolbarInternal::XmlData& xmlData, const TQDomElement& it ) const { - static const TQString &tagText = TDEGlobal::staticQString( "text" ); - static const TQString &tagText2 = TDEGlobal::staticQString( "Text" ); - static const TQString &attrName = TDEGlobal::staticQString( "name" ); + static const TQString &tagText = TDEGlobal::staticTQString( "text" ); + static const TQString &tagText2 = TDEGlobal::staticTQString( "Text" ); + static const TQString &attrName = TDEGlobal::staticTQString( "name" ); TQString name; TQCString txt( it.namedItem( tagText ).toElement().text().utf8() ); @@ -305,7 +305,7 @@ public: */ TQDomElement findElementForToolbarItem( const KEditToolbarInternal::ToolbarItem* item ) const { - static const TQString &attrName = TDEGlobal::staticQString( "name" ); + static const TQString &attrName = TDEGlobal::staticTQString( "name" ); for(TQDomNode n = m_currentToolbarElem.firstChild(); !n.isNull(); n = n.nextSibling()) { TQDomElement elem = n.toElement(); @@ -902,7 +902,7 @@ void KEditToolbarWidget::setupLayout() void KEditToolbarWidget::loadToolbarCombo(const TQString& defaultToolbar) { - static const TQString &attrName = TDEGlobal::staticQString( "name" ); + static const TQString &attrName = TDEGlobal::staticTQString( "name" ); // just in case, we clear our combo m_toolbarCombo->clear(); @@ -941,11 +941,11 @@ void KEditToolbarWidget::loadToolbarCombo(const TQString& defaultToolbar) void KEditToolbarWidget::loadActionList(TQDomElement& elem) { - static const TQString &tagSeparator = TDEGlobal::staticQString( "Separator" ); - static const TQString &tagMerge = TDEGlobal::staticQString( "Merge" ); - static const TQString &tagActionList= TDEGlobal::staticQString( "ActionList" ); - static const TQString &attrName = TDEGlobal::staticQString( "name" ); - static const TQString &attrLineSeparator = TDEGlobal::staticQString( "lineSeparator" ); + static const TQString &tagSeparator = TDEGlobal::staticTQString( "Separator" ); + static const TQString &tagMerge = TDEGlobal::staticTQString( "Merge" ); + static const TQString &tagActionList= TDEGlobal::staticTQString( "ActionList" ); + static const TQString &attrName = TDEGlobal::staticTQString( "name" ); + static const TQString &attrLineSeparator = TDEGlobal::staticTQString( "lineSeparator" ); int sep_num = 0; TQString sep_name("separator_%1"); @@ -1114,7 +1114,7 @@ void KEditToolbarWidget::slotActiveSelected(TQListViewItem *item) KEditToolbarInternal::ToolbarItem* toolitem = static_cast(item); m_removeAction->setEnabled( item ); - static const TQString &tagAction = TDEGlobal::staticQString( "Action" ); + static const TQString &tagAction = TDEGlobal::staticTQString( "Action" ); d->m_changeIcon->setEnabled( item && d->m_hasKDialog && toolitem->internalTag() == tagAction ); @@ -1197,11 +1197,11 @@ void KEditToolbarWidget::insertActive(KEditToolbarInternal::ToolbarItem *item, T if (!item) return; - static const TQString &tagAction = TDEGlobal::staticQString( "Action" ); - static const TQString &tagSeparator = TDEGlobal::staticQString( "Separator" ); - static const TQString &attrName = TDEGlobal::staticQString( "name" ); - static const TQString &attrLineSeparator = TDEGlobal::staticQString( "lineSeparator" ); - static const TQString &attrNoMerge = TDEGlobal::staticQString( "noMerge" ); + static const TQString &tagAction = TDEGlobal::staticTQString( "Action" ); + static const TQString &tagSeparator = TDEGlobal::staticTQString( "Separator" ); + static const TQString &attrName = TDEGlobal::staticTQString( "name" ); + static const TQString &attrLineSeparator = TDEGlobal::staticTQString( "lineSeparator" ); + static const TQString &attrNoMerge = TDEGlobal::staticTQString( "noMerge" ); TQDomElement new_item; // let's handle the separator specially @@ -1244,7 +1244,7 @@ void KEditToolbarWidget::removeActive(KEditToolbarInternal::ToolbarItem *item) if (!item) return; - static const TQString &attrNoMerge = TDEGlobal::staticQString( "noMerge" ); + static const TQString &attrNoMerge = TDEGlobal::staticTQString( "noMerge" ); // we're modified, so let this change emit enableOk(true); @@ -1312,7 +1312,7 @@ void KEditToolbarWidget::moveActive( KEditToolbarInternal::ToolbarItem* item, TQ d->m_currentToolbarElem.insertAfter(e, d->findElementForToolbarItem( (KEditToolbarInternal::ToolbarItem*)before )); // and set this container as a noMerge - static const TQString &attrNoMerge = TDEGlobal::staticQString( "noMerge" ); + static const TQString &attrNoMerge = TDEGlobal::staticTQString( "noMerge" ); d->m_currentToolbarElem.setAttribute( attrNoMerge, "1"); // update the local doc @@ -1336,7 +1336,7 @@ void KEditToolbarWidget::slotDownButton() void KEditToolbarWidget::updateLocal(TQDomElement& elem) { - static const TQString &attrName = TDEGlobal::staticQString( "name" ); + static const TQString &attrName = TDEGlobal::staticTQString( "name" ); KEditToolbarInternal::XmlDataList::Iterator xit = d->m_xmlFiles.begin(); for ( ; xit != d->m_xmlFiles.end(); ++xit) diff --git a/tdeui/kxmlguiclient.cpp b/tdeui/kxmlguiclient.cpp index b8fd549f5..4dfdcba0c 100644 --- a/tdeui/kxmlguiclient.cpp +++ b/tdeui/kxmlguiclient.cpp @@ -116,7 +116,7 @@ TDEActionCollection *KXMLGUIClient::actionCollection() const TDEAction *KXMLGUIClient::action( const TQDomElement &element ) const { - static const TQString &attrName = TDEGlobal::staticQString( "name" ); + static const TQString &attrName = TDEGlobal::staticTQString( "name" ); return actionCollection()->action( element.attribute( attrName ).latin1() ); } @@ -250,17 +250,17 @@ void KXMLGUIClient::setDOMDocument( const TQDomDocument &document, bool merge ) bool KXMLGUIClient::mergeXML( TQDomElement &base, const TQDomElement &additive, TDEActionCollection *actionCollection ) { - static const TQString &tagAction = TDEGlobal::staticQString( "Action" ); - static const TQString &tagMerge = TDEGlobal::staticQString( "Merge" ); - static const TQString &tagSeparator = TDEGlobal::staticQString( "Separator" ); - static const TQString &attrName = TDEGlobal::staticQString( "name" ); - static const TQString &attrAppend = TDEGlobal::staticQString( "append" ); - static const TQString &attrWeakSeparator = TDEGlobal::staticQString( "weakSeparator" ); - static const TQString &tagMergeLocal = TDEGlobal::staticQString( "MergeLocal" ); - static const TQString &tagText = TDEGlobal::staticQString( "text" ); - static const TQString &attrAlreadyVisited = TDEGlobal::staticQString( "alreadyVisited" ); - static const TQString &attrNoMerge = TDEGlobal::staticQString( "noMerge" ); - static const TQString &attrOne = TDEGlobal::staticQString( "1" ); + static const TQString &tagAction = TDEGlobal::staticTQString( "Action" ); + static const TQString &tagMerge = TDEGlobal::staticTQString( "Merge" ); + static const TQString &tagSeparator = TDEGlobal::staticTQString( "Separator" ); + static const TQString &attrName = TDEGlobal::staticTQString( "name" ); + static const TQString &attrAppend = TDEGlobal::staticTQString( "append" ); + static const TQString &attrWeakSeparator = TDEGlobal::staticTQString( "weakSeparator" ); + static const TQString &tagMergeLocal = TDEGlobal::staticTQString( "MergeLocal" ); + static const TQString &tagText = TDEGlobal::staticTQString( "text" ); + static const TQString &attrAlreadyVisited = TDEGlobal::staticTQString( "alreadyVisited" ); + static const TQString &attrNoMerge = TDEGlobal::staticTQString( "noMerge" ); + static const TQString &attrOne = TDEGlobal::staticTQString( "1" ); // there is a possibility that we don't want to merge in the // additive.. rather, we might want to *replace* the base with the @@ -501,9 +501,9 @@ bool KXMLGUIClient::mergeXML( TQDomElement &base, const TQDomElement &additive, TQDomElement KXMLGUIClient::findMatchingElement( const TQDomElement &base, const TQDomElement &additive ) { - static const TQString &tagAction = TDEGlobal::staticQString( "Action" ); - static const TQString &tagMergeLocal = TDEGlobal::staticQString( "MergeLocal" ); - static const TQString &attrName = TDEGlobal::staticQString( "name" ); + static const TQString &tagAction = TDEGlobal::staticTQString( "Action" ); + static const TQString &tagMergeLocal = TDEGlobal::staticTQString( "MergeLocal" ); + static const TQString &attrName = TDEGlobal::staticTQString( "name" ); TQDomNode n = additive.firstChild(); while ( !n.isNull() ) diff --git a/tdeui/kxmlguifactory.cpp b/tdeui/kxmlguifactory.cpp index bee9683c4..cf2f72dcd 100644 --- a/tdeui/kxmlguifactory.cpp +++ b/tdeui/kxmlguifactory.cpp @@ -51,9 +51,9 @@ class KXMLGUIFactoryPrivate : public BuildState public: KXMLGUIFactoryPrivate() { - static const TQString &defaultMergingName = TDEGlobal::staticQString( "" ); - static const TQString &actionList = TDEGlobal::staticQString( "actionlist" ); - static const TQString &name = TDEGlobal::staticQString( "name" ); + static const TQString &defaultMergingName = TDEGlobal::staticTQString( "" ); + static const TQString &actionList = TDEGlobal::staticTQString( "actionlist" ); + static const TQString &name = TDEGlobal::staticTQString( "name" ); m_rootNode = new ContainerNode( 0L, TQString::null, 0L ); m_defaultMergingName = defaultMergingName; @@ -224,7 +224,7 @@ KXMLGUIFactory::~KXMLGUIFactory() void KXMLGUIFactory::addClient( KXMLGUIClient *client ) { kdDebug(1002) << "KXMLGUIFactory::addClient( " << client << " )" << endl; // ellis - static const TQString &actionPropElementName = TDEGlobal::staticQString( "ActionProperties" ); + static const TQString &actionPropElementName = TDEGlobal::staticTQString( "ActionProperties" ); if ( client->factory() ) { if ( client->factory() == this ) @@ -497,7 +497,7 @@ void KXMLGUIFactory::unplugActionList( KXMLGUIClient *client, const TQString &na void KXMLGUIFactory::applyActionProperties( const TQDomElement &actionPropElement ) { - static const TQString &tagAction = TDEGlobal::staticQString( "action" ); + static const TQString &tagAction = TDEGlobal::staticTQString( "action" ); for (TQDomNode n = actionPropElement.firstChild(); !n.isNull(); n = n.nextSibling() ) @@ -528,7 +528,7 @@ void KXMLGUIFactory::configureAction( TDEAction *action, const TQDomNamedNodeMap void KXMLGUIFactory::configureAction( TDEAction *action, const TQDomAttr &attribute ) { - static const TQString &attrShortcut = TDEGlobal::staticQString( "shortcut" ); + static const TQString &attrShortcut = TDEGlobal::staticTQString( "shortcut" ); TQString attrName = attribute.name(); // If the attribute is a deprecated "accel", change to "shortcut". @@ -588,8 +588,8 @@ TQDomElement KXMLGUIFactory::actionPropertiesElement( TQDomDocument& doc ) TQDomElement KXMLGUIFactory::findActionByName( TQDomElement& elem, const TQString& sName, bool create ) { - static const TQString& attrName = TDEGlobal::staticQString( "name" ); - static const TQString& tagAction = TDEGlobal::staticQString( "Action" ); + static const TQString& attrName = TDEGlobal::staticTQString( "name" ); + static const TQString& tagAction = TDEGlobal::staticTQString( "Action" ); for( TQDomNode it = elem.firstChild(); !it.isNull(); it = it.nextSibling() ) { TQDomElement e = it.toElement(); if( e.attribute( attrName ) == sName ) diff --git a/tdeui/kxmlguifactory_p.cpp b/tdeui/kxmlguifactory_p.cpp index e6aa7eb78..681f22246 100644 --- a/tdeui/kxmlguifactory_p.cpp +++ b/tdeui/kxmlguifactory_p.cpp @@ -220,7 +220,7 @@ void ContainerNode::plugActionList( BuildState &state ) void ContainerNode::plugActionList( BuildState &state, const MergingIndexList::Iterator &mergingIdxIt ) { - static const TQString &tagActionList = TDEGlobal::staticQString( "actionlist" ); + static const TQString &tagActionList = TDEGlobal::staticTQString( "actionlist" ); MergingIndex mergingIdx = *mergingIdxIt; @@ -262,7 +262,7 @@ void ContainerNode::unplugActionList( BuildState &state ) void ContainerNode::unplugActionList( BuildState &state, const MergingIndexList::Iterator &mergingIdxIt ) { - static const TQString &tagActionList = TDEGlobal::staticQString( "actionlist" ); + static const TQString &tagActionList = TDEGlobal::staticTQString( "actionlist" ); MergingIndex mergingIdx = *mergingIdxIt; @@ -365,7 +365,7 @@ void ContainerNode::destructChildren( const TQDomElement &element, BuildState &s TQDomElement ContainerNode::findElementForChild( const TQDomElement &baseElement, ContainerNode *childNode ) { - static const TQString &attrName = TDEGlobal::staticQString( "name" ); + static const TQString &attrName = TDEGlobal::staticTQString( "name" ); // ### slow for ( TQDomNode n = baseElement.firstChild(); !n.isNull(); @@ -412,7 +412,7 @@ void ContainerNode::unplugActions( BuildState &state ) void ContainerNode::unplugClient( ContainerClient *client ) { - static const TQString &tagActionList = TDEGlobal::staticQString( "actionlist" ); + static const TQString &tagActionList = TDEGlobal::staticTQString( "actionlist" ); assert( builder ); @@ -497,7 +497,7 @@ int ContainerNode::calcMergingIndex( const TQString &mergingName, int BuildHelper::calcMergingIndex( const TQDomElement &element, MergingIndexList::Iterator &it, TQString &group ) { - static const TQString &attrGroup = TDEGlobal::staticQString( "group" ); + static const TQString &attrGroup = TDEGlobal::staticTQString( "group" ); bool haveGroup = false; group = element.attribute( attrGroup ); @@ -521,7 +521,7 @@ BuildHelper::BuildHelper( BuildState &state, ContainerNode *node ) : containerClient( 0 ), ignoreDefaultMergingIndex( false ), m_state( state ), parentNode( node ) { - static const TQString &defaultMergingName = TDEGlobal::staticQString( "" ); + static const TQString &defaultMergingName = TDEGlobal::staticTQString( "" ); // create a list of supported container and custom tags customTags = m_state.builderCustomTags; @@ -556,12 +556,12 @@ void BuildHelper::build( const TQDomElement &element ) void BuildHelper::processElement( const TQDomElement &e ) { // some often used QStrings - static const TQString &tagAction = TDEGlobal::staticQString( "action" ); - static const TQString &tagMerge = TDEGlobal::staticQString( "merge" ); - static const TQString &tagState = TDEGlobal::staticQString( "state" ); - static const TQString &tagDefineGroup = TDEGlobal::staticQString( "definegroup" ); - static const TQString &tagActionList = TDEGlobal::staticQString( "actionlist" ); - static const TQString &attrName = TDEGlobal::staticQString( "name" ); + static const TQString &tagAction = TDEGlobal::staticTQString( "action" ); + static const TQString &tagMerge = TDEGlobal::staticTQString( "merge" ); + static const TQString &tagState = TDEGlobal::staticTQString( "state" ); + static const TQString &tagDefineGroup = TDEGlobal::staticTQString( "definegroup" ); + static const TQString &tagActionList = TDEGlobal::staticTQString( "actionlist" ); + static const TQString &attrName = TDEGlobal::staticTQString( "name" ); TQString tag( e.tagName().lower() ); TQString currName( e.attribute( attrName ) ); @@ -670,10 +670,10 @@ void BuildHelper::processStateElement( const TQDomElement &element ) void BuildHelper::processMergeElement( const TQString &tag, const TQString &name, const TQDomElement &e ) { - static const TQString &tagDefineGroup = TDEGlobal::staticQString( "definegroup" ); - static const TQString &tagActionList = TDEGlobal::staticQString( "actionlist" ); - static const TQString &defaultMergingName = TDEGlobal::staticQString( "" ); - static const TQString &attrGroup = TDEGlobal::staticQString( "group" ); + static const TQString &tagDefineGroup = TDEGlobal::staticTQString( "definegroup" ); + static const TQString &tagActionList = TDEGlobal::staticTQString( "actionlist" ); + static const TQString &defaultMergingName = TDEGlobal::staticTQString( "" ); + static const TQString &attrGroup = TDEGlobal::staticTQString( "group" ); TQString mergingName( name ); if ( mergingName.isEmpty() ) @@ -734,7 +734,7 @@ void BuildHelper::processMergeElement( const TQString &tag, const TQString &name void BuildHelper::processContainerElement( const TQDomElement &e, const TQString &tag, const TQString &name ) { - static const TQString &defaultMergingName = TDEGlobal::staticQString( "" ); + static const TQString &defaultMergingName = TDEGlobal::staticTQString( "" ); ContainerNode *containerNode = parentNode->findContainer( name, tag, &containerList, diff --git a/tdeui/tdetoolbar.cpp b/tdeui/tdetoolbar.cpp index 6f93db4fc..a14daddec 100644 --- a/tdeui/tdetoolbar.cpp +++ b/tdeui/tdetoolbar.cpp @@ -1529,10 +1529,10 @@ void TDEToolBar::applyAppearanceSettings(TDEConfig *config, const TQString &_con TDEConfig *gconfig = TDEGlobal::config(); - static const TQString &attrIconText = TDEGlobal::staticQString("IconText"); - static const TQString &attrHighlight = TDEGlobal::staticQString("Highlighting"); - static const TQString &attrTrans = TDEGlobal::staticQString("TransparentMoving"); - static const TQString &attrIconSize = TDEGlobal::staticQString("IconSize"); + static const TQString &attrIconText = TDEGlobal::staticTQString("IconText"); + static const TQString &attrHighlight = TDEGlobal::staticTQString("Highlighting"); + static const TQString &attrTrans = TDEGlobal::staticTQString("TransparentMoving"); + static const TQString &attrIconSize = TDEGlobal::staticTQString("IconSize"); // we actually do this in two steps. // First, we read in the global styles [Toolbar style] (from the KControl module). @@ -1670,11 +1670,11 @@ void TDEToolBar::applySettings(TDEConfig *config, const TQString &_configGroup, { TDEConfigGroupSaver cgs(config, configGroup); - static const TQString &attrPosition = TDEGlobal::staticQString("Position"); - static const TQString &attrIndex = TDEGlobal::staticQString("Index"); - static const TQString &attrOffset = TDEGlobal::staticQString("Offset"); - static const TQString &attrNewLine = TDEGlobal::staticQString("NewLine"); - static const TQString &attrHidden = TDEGlobal::staticQString("Hidden"); + static const TQString &attrPosition = TDEGlobal::staticTQString("Position"); + static const TQString &attrIndex = TDEGlobal::staticTQString("Index"); + static const TQString &attrOffset = TDEGlobal::staticTQString("Offset"); + static const TQString &attrNewLine = TDEGlobal::staticTQString("NewLine"); + static const TQString &attrHidden = TDEGlobal::staticTQString("Hidden"); TQString position = config->readEntry(attrPosition, d->PositionDefault); int index = config->readNumEntry(attrIndex, -1); -- cgit v1.2.3