summaryrefslogtreecommitdiffstats
path: root/lib/util
diff options
context:
space:
mode:
Diffstat (limited to 'lib/util')
-rw-r--r--lib/util/configwidgetproxy.cpp4
-rw-r--r--lib/util/configwidgetproxy.h2
-rw-r--r--lib/util/filetemplate.cpp22
-rw-r--r--lib/util/rurl.cpp10
-rw-r--r--lib/util/settings.cpp4
-rw-r--r--lib/util/urlutil.cpp14
6 files changed, 28 insertions, 28 deletions
diff --git a/lib/util/configwidgetproxy.cpp b/lib/util/configwidgetproxy.cpp
index 5ce6becf..3396adfd 100644
--- a/lib/util/configwidgetproxy.cpp
+++ b/lib/util/configwidgetproxy.cpp
@@ -92,7 +92,7 @@ void ConfigWidgetProxy::slotAboutToShowPage( TQWidget * page )
{
if ( !page ) return;
- PageMap::Iterator it = _pageMap.tqfind( page );
+ PageMap::Iterator it = _pageMap.find( page );
if ( it != _pageMap.end() )
{
emit insertConfigWidget( static_cast<KDialogBase*>(TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))), page, it.data() );
@@ -102,4 +102,4 @@ void ConfigWidgetProxy::slotAboutToShowPage( TQWidget * page )
#include "configwidgetproxy.moc"
-// kate: space-indent off; indent-width 4; tqreplace-tabs off; tab-width 4;
+// kate: space-indent off; indent-width 4; replace-tabs off; tab-width 4;
diff --git a/lib/util/configwidgetproxy.h b/lib/util/configwidgetproxy.h
index c35c09c9..b91bf3f7 100644
--- a/lib/util/configwidgetproxy.h
+++ b/lib/util/configwidgetproxy.h
@@ -127,4 +127,4 @@ private:
#endif
-// kate: space-indent off; indent-width 4; tqreplace-tabs off; tab-width 4;
+// kate: space-indent off; indent-width 4; replace-tabs off; tab-width 4;
diff --git a/lib/util/filetemplate.cpp b/lib/util/filetemplate.cpp
index f153642f..c3538040 100644
--- a/lib/util/filetemplate.cpp
+++ b/lib/util/filetemplate.cpp
@@ -73,15 +73,15 @@ TQString FileTemplate::makeSubstitutions( TQDomDocument & dom, const TQString &
TQString year = TQString::number(TQDate::tqcurrentDate().year());
TQString str = text;
- str.tqreplace(TQRegExp("\\$EMAIL\\$"),email);
- str.tqreplace(TQRegExp("\\$AUTHOR\\$"),author);
- str.tqreplace(TQRegExp("\\$VERSION\\$"),version);
- str.tqreplace(TQRegExp("\\$DATE\\$"),date);
- str.tqreplace(TQRegExp("\\$YEAR\\$"),year);
- str.tqreplace(TQRegExp("\\$APPNAME\\$"),appname);
- str.tqreplace(TQRegExp("\\$APPNAME\\$"),appname);
- str.tqreplace(TQRegExp("\\$APPNAMEUC\\$"),appname.upper());
- str.tqreplace(TQRegExp("\\$APPNAMELC\\$"),appname.lower());
+ str.replace(TQRegExp("\\$EMAIL\\$"),email);
+ str.replace(TQRegExp("\\$AUTHOR\\$"),author);
+ str.replace(TQRegExp("\\$VERSION\\$"),version);
+ str.replace(TQRegExp("\\$DATE\\$"),date);
+ str.replace(TQRegExp("\\$YEAR\\$"),year);
+ str.replace(TQRegExp("\\$APPNAME\\$"),appname);
+ str.replace(TQRegExp("\\$APPNAME\\$"),appname);
+ str.replace(TQRegExp("\\$APPNAMEUC\\$"),appname.upper());
+ str.replace(TQRegExp("\\$APPNAMELC\\$"),appname.lower());
return str;
}
@@ -99,8 +99,8 @@ bool FileTemplate::copy(KDevPlugin *part, const TQString &name,
TQFileInfo fi(f);
TQString module = fi.baseName();
TQString basefilename = fi.baseName(true);
- text.tqreplace(TQRegExp("\\$MODULE\\$"),module);
- text.tqreplace(TQRegExp("\\$FILENAME\\$"),basefilename);
+ text.replace(TQRegExp("\\$MODULE\\$"),module);
+ text.replace(TQRegExp("\\$FILENAME\\$"),basefilename);
TQTextStream stream(&f);
stream << text;
diff --git a/lib/util/rurl.cpp b/lib/util/rurl.cpp
index 86ca920a..05dac07d 100644
--- a/lib/util/rurl.cpp
+++ b/lib/util/rurl.cpp
@@ -113,9 +113,9 @@ TQString Name::extension( bool complete ) const
{
TQString temp = fileName();
if (complete)
- return temp.mid(temp.tqfind('.')+1);
+ return temp.mid(temp.find('.')+1);
else
- return temp.mid(temp.tqfindRev('.')+1);
+ return temp.mid(temp.findRev('.')+1);
}
return TQString();
}
@@ -129,10 +129,10 @@ TQString Name::fileName( ) const
TQString Name::directory( ) const
{
- if ( (m_type == File) && (m_rurl.tqfindRev('/') == -1) )
+ if ( (m_type == File) && (m_rurl.findRev('/') == -1) )
return TQString();
- return m_rurl.mid(0, m_rurl.tqfindRev('/')+1);
+ return m_rurl.mid(0, m_rurl.findRev('/')+1);
}
bool Name::isFile( ) const
@@ -159,7 +159,7 @@ bool Name::isValid( ) const
{
if (m_rurl.startsWith("/"))
return false;
- if (m_rurl.tqcontains("//"))
+ if (m_rurl.contains("//"))
return false;
if ( (m_rurl.endsWith("/")) && (m_type == File) )
return false;
diff --git a/lib/util/settings.cpp b/lib/util/settings.cpp
index 9855b06b..908df54e 100644
--- a/lib/util/settings.cpp
+++ b/lib/util/settings.cpp
@@ -46,9 +46,9 @@ TQString Settings::profileByAttributes(const TQString &language, const TQStringL
for (TQStringList::const_iterator it = profileKeywords.constBegin();
it != profileKeywords.constEnd(); ++it)
{
- if (keywords.tqcontains(*it))
+ if (keywords.contains(*it))
{
- idx = profileKeywords.tqfindIndex(*it);
+ idx = profileKeywords.findIndex(*it);
break;
}
}
diff --git a/lib/util/urlutil.cpp b/lib/util/urlutil.cpp
index 5f4d2dcd..d3cbc5e3 100644
--- a/lib/util/urlutil.cpp
+++ b/lib/util/urlutil.cpp
@@ -37,14 +37,14 @@
///////////////////////////////////////////////////////////////////////////////
TQString URLUtil::filename(const TQString & name) {
- int slashPos = name.tqfindRev("/");
+ int slashPos = name.findRev("/");
return slashPos<0 ? name : name.mid(slashPos+1);
}
///////////////////////////////////////////////////////////////////////////////
TQString URLUtil::directory(const TQString & name) {
- int slashPos = name.tqfindRev("/");
+ int slashPos = name.findRev("/");
return slashPos<0 ? TQString("") : name.left(slashPos);
}
@@ -103,7 +103,7 @@ TQString URLUtil::relativePath(const TQString & tqparent, const TQString & child
///////////////////////////////////////////////////////////////////////////////
TQString URLUtil::upDir(const TQString & path, bool slashSuffix) {
- int slashPos = path.tqfindRev("/");
+ int slashPos = path.findRev("/");
if (slashPos<1) return TQString();
return path.mid(0,slashPos+ (slashSuffix ? 1 : 0) );
}
@@ -132,7 +132,7 @@ KURL URLUtil::mergeURL(const KURL & source, const KURL & dest, const KURL & chil
///////////////////////////////////////////////////////////////////////////////
TQString URLUtil::getExtension(const TQString & path) {
- int dotPos = path.tqfindRev('.');
+ int dotPos = path.findRev('.');
if (dotPos<0) return TQString("");
return path.mid(dotPos+1);
}
@@ -143,7 +143,7 @@ TQString URLUtil::extractPathNameRelative(const KURL &baseDirUrl, const KURL &ur
{
TQString absBase = extractPathNameAbsolute( baseDirUrl ),
absRef = extractPathNameAbsolute( url );
- int i = absRef.tqfind( absBase, 0, true );
+ int i = absRef.find( absBase, 0, true );
if (i == -1)
return TQString();
@@ -151,7 +151,7 @@ TQString URLUtil::extractPathNameRelative(const KURL &baseDirUrl, const KURL &ur
if (absRef == absBase)
return TQString( "." );
else
- return absRef.tqreplace( 0, absBase.length(), TQString() );
+ return absRef.replace( 0, absBase.length(), TQString() );
}
///////////////////////////////////////////////////////////////////////////////
@@ -298,7 +298,7 @@ TQString URLUtil::envExpand ( const TQString& str )
if (len > 1 && str[0] == '$')
{
- int pos = str.tqfind ('/');
+ int pos = str.find ('/');
if (pos < 0)
pos = len;
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-27 02:48:26 +0000