Browse Source

rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/bibletime@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19
tags/v3.5.13
tpearson 7 years ago
parent
commit
fbb51be9cf
36 changed files with 125 additions and 125 deletions
  1. 3
    3
      bibletime/backend/bt_gbfhtml.cpp
  2. 1
    1
      bibletime/backend/bt_osishtml.cpp
  3. 3
    3
      bibletime/backend/bt_thmlhtml.cpp
  4. 3
    3
      bibletime/backend/cdisplayrendering.cpp
  5. 13
    13
      bibletime/backend/cdisplaytemplatemgr.cpp
  6. 3
    3
      bibletime/backend/clanguagemgr.cpp
  7. 6
    6
      bibletime/backend/creferencemanager.cpp
  8. 1
    1
      bibletime/backend/cswordbackend.cpp
  9. 2
    2
      bibletime/backend/cswordkey.cpp
  10. 2
    2
      bibletime/backend/cswordmoduleinfo.cpp
  11. 2
    2
      bibletime/backend/ctextrendering.cpp
  12. 1
    1
      bibletime/bibletimeinterface_skel.cpp
  13. 1
    1
      bibletime/frontend/btinstallmgr.cpp
  14. 3
    3
      bibletime/frontend/cbtconfig.cpp
  15. 1
    1
      bibletime/frontend/cinfodisplay.cpp
  16. 2
    2
      bibletime/frontend/coptionsdialog.cpp
  17. 1
    1
      bibletime/frontend/cprofile.cpp
  18. 10
    10
      bibletime/frontend/cswordsetupdialog.cpp
  19. 1
    1
      bibletime/frontend/display/chtmlwritedisplay.cpp
  20. 3
    3
      bibletime/frontend/display/cplainwritedisplay.cpp
  21. 1
    1
      bibletime/frontend/displaywindow/cdisplaywindow.cpp
  22. 4
    4
      bibletime/frontend/displaywindow/cmodulechooserbutton.cpp
  23. 2
    2
      bibletime/frontend/displaywindow/cplainwritewindow.cpp
  24. 1
    1
      bibletime/frontend/keychooser/ckeychooserwidget.cpp
  25. 1
    1
      bibletime/frontend/keychooser/clexiconkeychooser.cpp
  26. 2
    2
      bibletime/frontend/mainindex/cindexitem.cpp
  27. 2
    2
      bibletime/frontend/mainindex/cmainindex.cpp
  28. 2
    2
      bibletime/frontend/searchdialog/cmodulechooser.cpp
  29. 2
    2
      bibletime/frontend/searchdialog/cmoduleresultview.cpp
  30. 2
    2
      bibletime/frontend/searchdialog/crangechooser.cpp
  31. 5
    5
      bibletime/frontend/searchdialog/csearchanalysis.cpp
  32. 21
    21
      bibletime/frontend/searchdialog/csearchdialogpages.cpp
  33. 1
    1
      bibletime/frontend/searchdialog/csearchdialogpages.h
  34. 1
    1
      bibletime/frontend/util/csortlistviewitem.cpp
  35. 5
    5
      bibletime/util/cresmgr.cpp
  36. 11
    11
      bibletime/util/ctoolclass.cpp

+ 3
- 3
bibletime/backend/bt_gbfhtml.cpp View File

@@ -166,7 +166,7 @@ char BT_GBFHTML::processText(sword::SWBuf& buf, const sword::SWKey * key, const
166 166
 
167 167
 			//insert the span
168 168
 			if (!insertedTag) { //we have to insert a new tag end and beginning, i.e. our first loop
169
-				e.tqreplace(pos, tag.matchedLength(), "</span>");
169
+				e.replace(pos, tag.matchedLength(), "</span>");
170 170
 				pos += 7;
171 171
 
172 172
 				//skip blanks, commas, dots and stuff at the beginning, it doesn't belong to the morph code
@@ -200,7 +200,7 @@ char BT_GBFHTML::processText(sword::SWBuf& buf, const sword::SWKey * key, const
200 200
 					//search the existing attribute start
201 201
 					TQRegExp attrRegExp( isMorph ? "morph=\".+(?=\")" : "lemma=\".+(?=\")" );
202 202
 					attrRegExp.setMinimal(true);
203
-					const int foundPos = e.tqfind(attrRegExp, tagAttributeStart);
203
+					const int foundPos = e.find(attrRegExp, tagAttributeStart);
204 204
 
205 205
 					if (foundPos != -1) {
206 206
 						e.insert(foundPos + attrRegExp.matchedLength(), TQString("|").append(value));
@@ -239,7 +239,7 @@ char BT_GBFHTML::processText(sword::SWBuf& buf, const sword::SWKey * key, const
239 239
 }
240 240
 
241 241
 bool BT_GBFHTML::handleToken(sword::SWBuf &buf, const char *token, sword::BasicFilterUserData *userData) {
242
-	if (!substituteToken(buf, token)) {  //more than a simple tqreplace
242
+	if (!substituteToken(buf, token)) {  //more than a simple replace
243 243
 		const unsigned int tokenLength = strlen(token);
244 244
 		unsigned long i;
245 245
 		sword::SWBuf value;

+ 1
- 1
bibletime/backend/bt_osishtml.cpp View File

@@ -354,7 +354,7 @@ bool BT_OSISHTML::handleToken(sword::SWBuf &buf, const char *token, sword::Basic
354 354
 					Q_ASSERT(mod);
355 355
 
356 356
 					//if the osisRef like "GerLut:key" contains a module, use that
357
-					int pos = ref.tqfind(":");
357
+					int pos = ref.find(":");
358 358
 
359 359
 					if ((pos >= 0) && ref.at(pos-1).isLetter() && ref.at(pos+1).isLetter()) {
360 360
 						TQString newModuleName = ref.left(pos);

+ 3
- 3
bibletime/backend/bt_thmlhtml.cpp View File

@@ -140,7 +140,7 @@ char BT_ThMLHTML::processText(sword::SWBuf& buf, const sword::SWKey* key, const
140 140
 
141 141
 			//insert the span
142 142
 			if (!insertedTag) {
143
-				e.tqreplace(pos, tag.matchedLength(), "</span>");
143
+				e.replace(pos, tag.matchedLength(), "</span>");
144 144
 				pos += 7;
145 145
 
146 146
 				TQString rep;
@@ -166,7 +166,7 @@ char BT_ThMLHTML::processText(sword::SWBuf& buf, const sword::SWKey* key, const
166 166
 					//search the existing attribute start
167 167
 					TQRegExp attrRegExp( isMorph ? "morph=\".+(?=\")" : "lemma=\".+(?=\")" );
168 168
 					attrRegExp.setMinimal(true);
169
-					const int foundAttrPos = e.tqfind(attrRegExp, pos);
169
+					const int foundAttrPos = e.find(attrRegExp, pos);
170 170
 
171 171
 					if (foundAttrPos != -1) {
172 172
 						e.insert(foundAttrPos + attrRegExp.matchedLength(), TQString("|").append(value));
@@ -177,7 +177,7 @@ char BT_ThMLHTML::processText(sword::SWBuf& buf, const sword::SWKey* key, const
177 177
 					}
178 178
 				}
179 179
 				else { //attribute was not yet inserted
180
-					const int attrPos = e.tqfind(TQRegExp("morph=|lemma="), 0);
180
+					const int attrPos = e.find(TQRegExp("morph=|lemma="), 0);
181 181
 
182 182
 					if (attrPos >= 0) {
183 183
 						TQString attr;

+ 3
- 3
bibletime/backend/cdisplayrendering.cpp View File

@@ -117,7 +117,7 @@ namespace Rendering {
117 117
 		 TQString text = oldText;
118 118
 
119 119
 		 TQRegExp re("(\\b)(?=\\w)"); //word begin marker
120
-		 int pos = text.tqfind(re, 0);
120
+		 int pos = text.find(re, 0);
121 121
 
122 122
 		 while (pos != -1) { //word begin found
123 123
 		  //qWarning("found word at %i in %i", pos, text.length());
@@ -126,7 +126,7 @@ namespace Rendering {
126 126
 		   //qWarning("matched %s", text.mid(pos+1, 4).latin1());
127 127
 
128 128
 		   //find end of word and put a marker around it
129
-		   endPos = text.tqfind(TQRegExp("\\b|[,.:]"), pos+1);
129
+		   endPos = text.find(TQRegExp("\\b|[,.:]"), pos+1);
130 130
 		   if ((endPos != -1) && !CToolClass::inHTMLTag(endPos, text) && (endPos - pos >= 3)) { //reuire wordslonger than 3 chars
131 131
 		    text.insert(endPos, "</span>");
132 132
 		    text.insert(pos, "<span class=\"word\">");
@@ -134,7 +134,7 @@ namespace Rendering {
134 134
 		    endPos += 26;
135 135
 		   }
136 136
 		  }
137
-		  pos = text.tqfind(re, endPos);
137
+		  pos = text.find(re, endPos);
138 138
 		 }
139 139
 		*/
140 140
 		const CLanguageMgr::Language* const lang =

+ 13
- 13
bibletime/backend/cdisplaytemplatemgr.cpp View File

@@ -44,7 +44,7 @@ CDisplayTemplateMgr::~CDisplayTemplateMgr() {}
44 44
     \fn CDisplayTemplateMgr::fillTemplate( const TQString& name, const TQString& title, const TQString& content )
45 45
  */
46 46
 const TQString CDisplayTemplateMgr::fillTemplate( const TQString& name, const TQString& content, Settings& settings ) {
47
-	const TQString templateName = m_templateMap.tqcontains(name) ? name : defaultTemplate();
47
+	const TQString templateName = m_templateMap.contains(name) ? name : defaultTemplate();
48 48
 
49 49
 	TQString displayTypeString;
50 50
 
@@ -145,22 +145,22 @@ const TQString CDisplayTemplateMgr::fillTemplate( const TQString& name, const TQ
145 145
 
146 146
 // 	qWarning("Outputing unformated text");
147 147
 	const TQString t = TQString(m_templateMap[ templateName ]) //don't change the map's content directly, use  a copy
148
-	 		.tqreplace("#TITLE#", settings.title)
149
-	 		.tqreplace("#LANG_ABBREV#", settings.langAbbrev.isEmpty() ? TQString("en") : settings.langAbbrev)
150
-	 		.tqreplace("#DISPLAYTYPE#", displayTypeString)
151
-	 		.tqreplace("#LANG_CSS#", langCSS)
152
-	 		.tqreplace("#PAGE_DIRECTION#", settings.pageDirection)
153
-	 		.tqreplace("#CONTENT#", newContent);
148
+	 		.replace("#TITLE#", settings.title)
149
+	 		.replace("#LANG_ABBREV#", settings.langAbbrev.isEmpty() ? TQString("en") : settings.langAbbrev)
150
+	 		.replace("#DISPLAYTYPE#", displayTypeString)
151
+	 		.replace("#LANG_CSS#", langCSS)
152
+	 		.replace("#PAGE_DIRECTION#", settings.pageDirection)
153
+	 		.replace("#CONTENT#", newContent);
154 154
  	 //printf("%s\n\n", t.latin1());
155 155
 
156 156
 	return t;
157 157
 /*			TQString(m_templateMap[ templateName ]) //don't change the map's content directly, use  a copy
158
-		   .tqreplace("#TITLE#", settings.title)
159
-		   .tqreplace("#LANG_ABBREV#", settings.langAbbrev.isEmpty() ? TQString("en") : settings.langAbbrev)
160
-		   .tqreplace("#DISPLAYTYPE#", displayTypeString)
161
-		   .tqreplace("#LANG_CSS#", langCSS)
162
-		   .tqreplace("#PAGE_DIRECTION#", settings.pageDirection)
163
-		   .tqreplace("#CONTENT#", newContent);*/
158
+		   .replace("#TITLE#", settings.title)
159
+		   .replace("#LANG_ABBREV#", settings.langAbbrev.isEmpty() ? TQString("en") : settings.langAbbrev)
160
+		   .replace("#DISPLAYTYPE#", displayTypeString)
161
+		   .replace("#LANG_CSS#", langCSS)
162
+		   .replace("#PAGE_DIRECTION#", settings.pageDirection)
163
+		   .replace("#CONTENT#", newContent);*/
164 164
 }
165 165
 
166 166
 

+ 3
- 3
bibletime/backend/clanguagemgr.cpp View File

@@ -97,7 +97,7 @@ const CLanguageMgr::LangMap& CLanguageMgr::availableLanguages() {
97 97
 			//   for (CSwordModuleInfo* m = mods.first(); m; m = mods.next()) {
98 98
 			abbrev = (*it)->module()->Lang();
99 99
 
100
-			if (abbrev && !abbrevs.tqcontains(abbrev)) {
100
+			if (abbrev && !abbrevs.contains(abbrev)) {
101 101
 				abbrevs.append( abbrev );
102 102
 			}
103 103
 		};
@@ -122,7 +122,7 @@ const CLanguageMgr::LangMap& CLanguageMgr::availableLanguages() {
122 122
 };
123 123
 
124 124
 const CLanguageMgr::Language* const CLanguageMgr::languageForAbbrev( const TQString& abbrev ) const {
125
-	Language* lang = m_langMap.tqfind(abbrev);
125
+	Language* lang = m_langMap.find(abbrev);
126 126
 
127 127
 	if (lang) {
128 128
 		return lang;
@@ -131,7 +131,7 @@ const CLanguageMgr::Language* const CLanguageMgr::languageForAbbrev( const TQStr
131 131
 	//try to search in the alternative abbrevs
132 132
 	//const LangMapIterator end = m_langMap.constEnd();
133 133
 	for ( LangMapIterator it( m_langMap ); it.current(); ++it ) {
134
-		if (it.current()->alternativeAbbrevs() && it.current()->alternativeAbbrevs()->tqcontains(abbrev)) {
134
+		if (it.current()->alternativeAbbrevs() && it.current()->alternativeAbbrevs()->contains(abbrev)) {
135 135
 			return it.current();
136 136
 		}
137 137
 	}

+ 6
- 6
bibletime/backend/creferencemanager.cpp View File

@@ -159,7 +159,7 @@ const bool CReferenceManager::decodeHyperlink( const TQString& hyperlink, TQStri
159 159
 		if (ref.at(0) != '/' ) { //we have a module given
160 160
 
161 161
 			while (true) {
162
-				const int pos = ref.tqfind("/");
162
+				const int pos = ref.find("/");
163 163
 
164 164
 				if ((pos>0) && ref.at(pos-1) != '\\') { //found a slash which is not escaped
165 165
 					module = ref.mid(0,pos);
@@ -179,7 +179,7 @@ const bool CReferenceManager::decodeHyperlink( const TQString& hyperlink, TQStri
179 179
 		}
180 180
 
181 181
 		//the key may be an osis key like "NASBLex:Moses", which sets the module, too
182
-		//   const int modPos = key.tqfind(":");
182
+		//   const int modPos = key.find(":");
183 183
 		//   if (modPos != -1 && key.at(modPos-1).isLetter() && key.at(modPos+1).isLetter()) {
184 184
 		//    module = key.left(modPos);
185 185
 		//    key = key.mid(modPos+1);
@@ -187,8 +187,8 @@ const bool CReferenceManager::decodeHyperlink( const TQString& hyperlink, TQStri
187 187
 		//    qWarning("found the module name %s with key %s", module.latin1(), key.latin1());
188 188
 		//   }
189 189
 
190
-		//tqreplace \/ escapes with /
191
-		key.tqreplace(TQRegExp("\\\\/"), "/");
190
+		//replace \/ escapes with /
191
+		key.replace(TQRegExp("\\\\/"), "/");
192 192
 	}
193 193
 	else if (ref.left(8).lower() == "morph://" || ref.left(10).lower() == "strongs://") { //strongs or morph URL have the same format
194 194
 		enum PreType {IsMorph, IsStrongs};
@@ -204,7 +204,7 @@ const bool CReferenceManager::decodeHyperlink( const TQString& hyperlink, TQStri
204 204
 		}
205 205
 
206 206
 		//part up to next slash is the language
207
-		const int pos = ref.tqfind("/");
207
+		const int pos = ref.find("/");
208 208
 
209 209
 		if (pos>0) { //found
210 210
 			const TQString language = ref.mid(0,pos);
@@ -253,7 +253,7 @@ const TQString CReferenceManager::encodeReference(const TQString &module, const
253 253
 }
254 254
 
255 255
 void CReferenceManager::decodeReference(TQString &dragreference, TQString &module, TQString &reference) {
256
-	const int pos = dragreference.tqfind(")");
256
+	const int pos = dragreference.find(")");
257 257
 	const TQString fallbackModule = dragreference.mid( 1, pos - 1);
258 258
 	dragreference = dragreference.mid(pos+1);
259 259
 

+ 1
- 1
bibletime/backend/cswordbackend.cpp View File

@@ -329,7 +329,7 @@ CSwordModuleInfo* const CSwordBackend::findModuleByDescription(const TQString& d
329 329
 
330 330
 /** This function searches for a module with the specified description */
331 331
 const TQString CSwordBackend::findModuleNameByDescription(const TQString& description) {
332
-	if (m_moduleDescriptionMap.tqcontains(description)) {
332
+	if (m_moduleDescriptionMap.contains(description)) {
333 333
 		return m_moduleDescriptionMap[description];
334 334
 	}
335 335
 

+ 2
- 2
bibletime/backend/cswordkey.cpp View File

@@ -81,7 +81,7 @@ const TQString CSwordKey::renderedText( const CSwordKey::TextRenderType mode ) {
81 81
 		if (m_module->type() == CSwordModuleInfo::Lexicon) {
82 82
 			m_module->snap();
83 83
 			/* In lexicons make sure that our key (e.g. 123) was successfully set to the module,
84
-			i.e. the module key contains this key (e.g. 0123 tqcontains 123) */
84
+			i.e. the module key contains this key (e.g. 0123 contains 123) */
85 85
 
86 86
 			if ( strcasecmp(m_module->module()->getKey()->getText(), buffer)
87 87
 					&& !strstr(m_module->module()->getKey()->getText(), buffer)
@@ -108,7 +108,7 @@ const TQString CSwordKey::renderedText( const CSwordKey::TextRenderType mode ) {
108 108
 				TQString number = rx.cap(2);
109 109
 				TQString paddednumber = number.rightJustify(5, '0');	// Form 00123
110 110
 
111
-				text.tqreplace(
111
+				text.replace(
112 112
 						TQRegExp( TQString(
113 113
 							"(>[^<>]+)"			// Avoid replacing inside tags
114 114
 							"\\b(0*%1)\\b").tqarg(number) ),	// And span around 0's

+ 2
- 2
bibletime/backend/cswordmoduleinfo.cpp View File

@@ -496,7 +496,7 @@ const TQString CSwordModuleInfo::config(const CSwordModuleInfo::ConfigEntry entr
496 496
 
497 497
     case AbsoluteDataPath: {
498 498
         TQString path( getSimpleConfigEntry("AbsoluteDataPath") );
499
-        path.tqreplace(TQRegExp("/./"), "/"); // make /abs/path/./modules/ looking better
499
+        path.replace(TQRegExp("/./"), "/"); // make /abs/path/./modules/ looking better
500 500
         //make sure we have a trailing slash!
501 501
 
502 502
         if (path.right(1) != "/") {
@@ -510,7 +510,7 @@ const TQString CSwordModuleInfo::config(const CSwordModuleInfo::ConfigEntry entr
510 510
         TQString path(getSimpleConfigEntry("DataPath"));
511 511
 
512 512
         if ((type() == CSwordModuleInfo::GenericBook) || (type() == CSwordModuleInfo::Lexicon)) {
513
-            int pos = path.tqfindRev("/"); //last slash in the string
513
+            int pos = path.findRev("/"); //last slash in the string
514 514
 
515 515
             if (pos != -1) {
516 516
                 path = path.left(pos + 1); //include the slash

+ 2
- 2
bibletime/backend/ctextrendering.cpp View File

@@ -172,7 +172,7 @@ ListCSwordModuleInfo CTextRendering::KeyTree::collectModules() const {
172 172
 		/*ToDo: Use the const iterators as soon as we use TQt > 3.1
173 173
 		 const ListCSwordModuleInfo::const_iterator c_end = childMods.end();
174 174
 		  for (ListCSwordModuleInfo::const_iterator c_it = childMods.constBegin(); c_it != c_end; ++c_it) {
175
-		   if (!modules.tqcontains(*c_it)) {
175
+		   if (!modules.contains(*c_it)) {
176 176
 		    modules.append(*c_it);
177 177
 		   }
178 178
 		  }*/
@@ -181,7 +181,7 @@ ListCSwordModuleInfo CTextRendering::KeyTree::collectModules() const {
181 181
 		ListCSwordModuleInfo::iterator end_it = childMods.end();
182 182
 
183 183
 		for (ListCSwordModuleInfo::iterator it(childMods.begin()); it != end_it; ++it) {
184
-			if (!modules.tqcontains(*it)) {
184
+			if (!modules.contains(*it)) {
185 185
 				modules.append(*it);
186 186
 			}
187 187
 		}

+ 1
- 1
bibletime/bibletimeinterface_skel.cpp View File

@@ -53,7 +53,7 @@ bool BibleTimeInterface::process(const TQCString &fun, const TQByteArray &data,
53 53
 	for ( int i = 0; BibleTimeInterface_ftable[i][1]; i++ )
54 54
 	    fdict->insert( BibleTimeInterface_ftable[i][1],  new int( i ) );
55 55
     }
56
-    int* fp = fdict->tqfind( fun );
56
+    int* fp = fdict->find( fun );
57 57
     switch ( fp?*fp:-1) {
58 58
     case 0: { // void syncAllBibles(TQString)
59 59
 	TQString arg0;

+ 1
- 1
bibletime/frontend/btinstallmgr.cpp View File

@@ -102,7 +102,7 @@ namespace BookshelfManager {
102 102
 
103 103
 		for (TQStringList::const_iterator it = targets.begin(); it != targets.end(); ++it) {
104 104
 			TQString t = *it;
105
-			if (t.tqcontains( TQString("%1/.sword").tqarg(getenv("HOME")) )) {
105
+			if (t.contains( TQString("%1/.sword").tqarg(getenv("HOME")) )) {
106 106
 				//we don't want HOME/.sword in the config
107 107
 				continue;
108 108
 			}

+ 3
- 3
bibletime/frontend/cbtconfig.cpp View File

@@ -386,8 +386,8 @@ const CBTConfig::StringMap CBTConfig::get
386 386
 
387 387
 const CBTConfig::FontSettingsPair CBTConfig::get
388 388
 	( const CLanguageMgr::Language* const language ) {
389
-	if (fontConfigMap && fontConfigMap->tqcontains(language)) {
390
-		return fontConfigMap->tqfind(language).data();
389
+	if (fontConfigMap && fontConfigMap->contains(language)) {
390
+		return fontConfigMap->find(language).data();
391 391
 	}
392 392
 
393 393
 	if (!fontConfigMap) {
@@ -515,7 +515,7 @@ void CBTConfig::set
515 515
 	config->setGroup("font standard settings");
516 516
 	config->writeEntry(getKey(language), value.first);
517 517
 
518
-	if (fontConfigMap && fontConfigMap->tqcontains(language)) {
518
+	if (fontConfigMap && fontConfigMap->contains(language)) {
519 519
 		fontConfigMap->remove
520 520
 		(language); //remove it from the cache
521 521
 	}

+ 1
- 1
bibletime/frontend/cinfodisplay.cpp View File

@@ -356,7 +356,7 @@ namespace InfoDisplay {
356 356
 			TQString value = "";
357 357
 			TQString valueClass = "";
358 358
 
359
-			int valStart = (*it).tqfind(':');
359
+			int valStart = (*it).find(':');
360 360
 			if (valStart > -1) {
361 361
 				valueClass = (*it).mid(0, valStart);
362 362
 				module = CPointers::backend()->findModuleByName( valueClass );

+ 2
- 2
bibletime/frontend/coptionsdialog.cpp View File

@@ -90,7 +90,7 @@ COptionsDialog::~COptionsDialog() {
90 90
 /**  */
91 91
 void COptionsDialog::newDisplayWindowFontSelected(const TQFont &newFont) {
92 92
 	CBTConfig::FontSettingsPair oldSettings = m_settings.fonts.fontMap[ m_settings.fonts.usage->currentText() ];
93
-	m_settings.fonts.fontMap.tqreplace( m_settings.fonts.usage->currentText(), CBTConfig::FontSettingsPair(oldSettings.first, newFont) );
93
+	m_settings.fonts.fontMap.replace( m_settings.fonts.usage->currentText(), CBTConfig::FontSettingsPair(oldSettings.first, newFont) );
94 94
 }
95 95
 
96 96
 /** Called when the combobox contents is changed */
@@ -267,7 +267,7 @@ void COptionsDialog::initLanguages() {
267 267
 													);
268 268
 
269 269
 		TQString currentLanguageName;
270
-		if ( l->isValid() && languageNames.tqcontains(l->translatedName()) ) { //tranlated language name is in the box
270
+		if ( l->isValid() && languageNames.contains(l->translatedName()) ) { //tranlated language name is in the box
271 271
 			currentLanguageName = l->translatedName();
272 272
 		}
273 273
 		else { //a language like "German Abbrevs" might be the language to set

+ 1
- 1
bibletime/frontend/cprofile.cpp View File

@@ -38,7 +38,7 @@ m_tqgeometry(10,20,640,480) {
38 38
 	}
39 39
 	else if (m_filename.isEmpty() && !name.isEmpty()) {
40 40
 		m_filename = name;
41
-		m_filename.tqreplace(TQRegExp("\\s=#."),"_");
41
+		m_filename.replace(TQRegExp("\\s=#."),"_");
42 42
 		KStandardDirs stdDirs;
43 43
 		m_filename = stdDirs.saveLocation("data", "bibletime/sessions/") + m_filename + ".xml";
44 44
 		init(m_filename);

+ 10
- 10
bibletime/frontend/cswordsetupdialog.cpp View File

@@ -239,7 +239,7 @@ the module remote installation feature!</b>")
239 239
 	void CSwordSetupDialog::initManageIndices()
240 240
 	{
241 241
 		TQFrame* page = m_manageIndiciesPage = addPage(i18n("Manage search indicies"),
242
-			TQString(), SmallIcon("filetqfind",32));
242
+			TQString(), SmallIcon("filefind",32));
243 243
 
244 244
 		page->setMinimumSize(500,400);
245 245
 		TQVBoxLayout* box = new TQVBoxLayout(page, 4, 4);
@@ -364,12 +364,12 @@ the module remote installation feature!</b>")
364 364
 		TQString source = sourceName;
365 365
 
366 366
 		TQString rep = i18n("[Local]") + " ";
367
-		int i = source.tqfind(rep);
367
+		int i = source.find(rep);
368 368
 		if (i>=0) {
369 369
 			source.remove(i, rep.length());
370 370
 		}
371 371
 		rep = i18n("[Remote]") + " ";
372
-		i = source.tqfind(rep);
372
+		i = source.find(rep);
373 373
 		if (i>=0) {
374 374
 			source.remove(i, rep.length());
375 375
 		}
@@ -420,8 +420,8 @@ the module remote installation feature!</b>")
420 420
 						dataPath = dataPath.mid(2);
421 421
 					}
422 422
 
423
-					if (prefixPath.tqcontains(dataPath)) { //remove module part to get the prefix path
424
-						prefixPath = prefixPath.remove( prefixPath.tqfind(dataPath), dataPath.length() );
423
+					if (prefixPath.contains(dataPath)) { //remove module part to get the prefix path
424
+						prefixPath = prefixPath.remove( prefixPath.find(dataPath), dataPath.length() );
425 425
 					}
426 426
 					else { //fall back to default Sword config path
427 427
 						prefixPath = TQString::tqfromLatin1(backend()->prefixPath);
@@ -753,9 +753,9 @@ the module remote installation feature!</b>")
753 753
 						dataPath = dataPath.mid(2);
754 754
 					}
755 755
 
756
-					if (prefixPath.tqcontains(dataPath)) {
757
-						prefixPath.remove( prefixPath.tqfind(dataPath), dataPath.length() ); //complicated to work with TQt 3.0
758
-						//prefixPath = prefixPath.tqreplace(dataPath, ""); //old code working with TQt 3.2
756
+					if (prefixPath.contains(dataPath)) {
757
+						prefixPath.remove( prefixPath.find(dataPath), dataPath.length() ); //complicated to work with TQt 3.0
758
+						//prefixPath = prefixPath.replace(dataPath, ""); //old code working with TQt 3.2
759 759
 					}
760 760
 					else {
761 761
 						prefixPath = TQString::tqfromLatin1(backend()->prefixPath);
@@ -885,12 +885,12 @@ the module remote installation feature!</b>")
885 885
 	const TQString CSwordSetupDialog::currentInstallSource() {
886 886
 		TQString source = m_sourceCombo->currentText();
887 887
 		TQString rep = i18n("[Local]") + " ";
888
-		int i = source.tqfind(rep);
888
+		int i = source.find(rep);
889 889
 		if (i>=0) {
890 890
 			source.remove(i, rep.length());
891 891
 		}
892 892
 		rep = i18n("[Remote]") + " ";
893
-		i = source.tqfind(rep);
893
+		i = source.find(rep);
894 894
 		if (i>=0) {
895 895
 			source.remove(i, rep.length());
896 896
 		}

+ 1
- 1
bibletime/frontend/display/chtmlwritedisplay.cpp View File

@@ -43,7 +43,7 @@ CHTMLWriteDisplay::~CHTMLWriteDisplay() {}
43 43
 
44 44
 void CHTMLWriteDisplay::setText( const TQString& newText ) {
45 45
 	TQString text = newText;
46
-// 	text.tqreplace("\n<br/><!-- BT newline -->\n", "\n");
46
+// 	text.replace("\n<br/><!-- BT newline -->\n", "\n");
47 47
 
48 48
 	TQTextEdit::setText(text);
49 49
 }

+ 3
- 3
bibletime/frontend/display/cplainwritedisplay.cpp View File

@@ -42,8 +42,8 @@ void CPlainWriteDisplay::selectAll() {
42 42
 void CPlainWriteDisplay::setText( const TQString& newText ) {
43 43
 	//make sure the text has been converted to show \n instead of <br/>
44 44
 	TQString text = newText;
45
-// 	text.tqreplace("\n<br /><!-- BT newline -->\n", "\n");
46
-	text.tqreplace("<br />", "\n"); //inserted by BT or the TQt textedit widget
45
+// 	text.replace("\n<br /><!-- BT newline -->\n", "\n");
46
+	text.replace("<br />", "\n"); //inserted by BT or the TQt textedit widget
47 47
 
48 48
 	TQTextEdit::setText(text);
49 49
 }
@@ -80,7 +80,7 @@ const TQString CPlainWriteDisplay::plainText() {
80 80
 	TQString ret = TQTextEdit::text();
81 81
 
82 82
 	//in plain text mode the text just contains newlines, convert them into <br/> before we return the text for display in a HTML widget
83
-	ret.tqreplace("\n", "<br />");
83
+	ret.replace("\n", "<br />");
84 84
 
85 85
 	return ret;
86 86
 }

+ 1
- 1
bibletime/frontend/displaywindow/cdisplaywindow.cpp View File

@@ -421,7 +421,7 @@ void CDisplayWindow::lookup( const TQString& moduleName, const TQString& keyName
421 421
 	}
422 422
 
423 423
 	//ToDo: check for containsRef compat
424
-	if (m && modules().tqcontains(m)) {
424
+	if (m && modules().contains(m)) {
425 425
 		key()->key(keyName);
426 426
 		keyChooser()->setKey(key()); //the key chooser does send an update signal
427 427
 	}

+ 4
- 4
bibletime/frontend/displaywindow/cmodulechooserbutton.cpp View File

@@ -85,7 +85,7 @@ CSwordModuleInfo* CModuleChooserButton::module() {
85 85
 		for (unsigned int i = 0; i < popup->count(); i++) {
86 86
 			if ( m_popup->isItemChecked(popup->idAt(i)) ) {
87 87
 				TQString mod = popup->text(popup->idAt(i)).remove('&');
88
-				return backend()->findModuleByName( mod.left(mod.tqfind(" ")) );
88
+				return backend()->findModuleByName( mod.left(mod.find(" ")) );
89 89
 			}
90 90
 		}
91 91
 
@@ -197,7 +197,7 @@ void CModuleChooserButton::populateMenu() {
197 197
 			}
198 198
 		}
199 199
 
200
-		if (languages.tqfind( lang ) == languages.end() ) { //this lang was not yet added
200
+		if (languages.find( lang ) == languages.end() ) { //this lang was not yet added
201 201
 			languages += lang;
202 202
 
203 203
 			KPopupMenu* menu = new KPopupMenu;
@@ -258,14 +258,14 @@ void CModuleChooserButton::updateMenuItems() {
258 258
 
259 259
 		for (unsigned int i = 0; i < popup->count(); i++) {
260 260
 			moduleName = popup->text(popup->idAt(i)).remove('&');
261
-			module = backend()->findModuleByName( moduleName.left(moduleName.tqfindRev(" ")) );
261
+			module = backend()->findModuleByName( moduleName.left(moduleName.findRev(" ")) );
262 262
 
263 263
  			Q_ASSERT(module);
264 264
 // 			if (!module) {
265 265
 // 				qWarning("Can't find module with name %s", moduleName.latin1());
266 266
 // 			}
267 267
 
268
-			bool alreadyChosen = chosenModules.tqcontains( module );
268
+			bool alreadyChosen = chosenModules.contains( module );
269 269
 			if (m_module) {
270 270
 				alreadyChosen = alreadyChosen && (m_module->name() != moduleName);
271 271
 			}

+ 2
- 2
bibletime/frontend/displaywindow/cplainwritewindow.cpp View File

@@ -122,8 +122,8 @@ void CPlainWriteWindow::saveCurrentText( const TQString& /*key*/ ) {
122 122
 	//since t is a complete HTML page at the moment, strip away headers and footers of a HTML page
123 123
 	TQRegExp re("(?:<html.*>.+<body.*>)", false); //remove headers, case insensitive
124 124
 	re.setMinimal(true);
125
-	t.tqreplace(re, "");
126
-	t.tqreplace(TQRegExp("</body></html>", false), "");//remove footer
125
+	t.replace(re, "");
126
+	t.replace(TQRegExp("</body></html>", false), "");//remove footer
127 127
 
128 128
 	const TQString& oldKey = this->key()->key();
129 129
 	if( modules().first()->isWritable() ) {

+ 1
- 1
bibletime/frontend/keychooser/ckeychooserwidget.cpp View File

@@ -44,7 +44,7 @@ bool CKCComboBox::eventFilter( TQObject *o, TQEvent *e ) {
44 44
 		TQFocusEvent* f = TQT_TQFOCUSEVENT(e);
45 45
 
46 46
 		if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(lineEdit()) && f->reason() == TQFocusEvent::Tab) {
47
-			int index = listBox()->index( listBox()->tqfindItem(currentText()) );
47
+			int index = listBox()->index( listBox()->findItem(currentText()) );
48 48
 			if (index == -1) {
49 49
 				index = 0;// return 0 if not found
50 50
 			}

+ 1
- 1
bibletime/frontend/keychooser/clexiconkeychooser.cpp View File

@@ -75,7 +75,7 @@ void CLexiconKeyChooser::setKey(CSwordKey* key) {
75 75
 
76 76
 	//  qWarning("setKey start");
77 77
 	TQString newKey = m_key->key();
78
-	const int index = m_widget->comboBox()->listBox()->index(m_widget->comboBox()->listBox()->tqfindItem( newKey ));
78
+	const int index = m_widget->comboBox()->listBox()->index(m_widget->comboBox()->listBox()->findItem( newKey ));
79 79
 	m_widget->comboBox()->setCurrentItem(index);
80 80
 
81 81
 	//   qWarning("setKey end");

+ 2
- 2
bibletime/frontend/mainindex/cindexitem.cpp View File

@@ -667,7 +667,7 @@ void CTreeFolder::initTree() {
667 667
 			TQString lang = TQString::tqfromLatin1((*it)->module()->Lang());
668 668
 			//      if (lang.isEmpty())
669 669
 			//        lang = ");
670
-			if (!usedLangs.tqcontains(lang)) {
670
+			if (!usedLangs.contains(lang)) {
671 671
 				usedLangs.append(lang);
672 672
 			}
673 673
 		}
@@ -1163,7 +1163,7 @@ void CGlossaryFolder::initTree() {
1163 1163
 				(*it)->config(CSwordModuleInfo::GlossaryTo)
1164 1164
 			);
1165 1165
 
1166
-			if (!usedLangs.tqcontains(langPair)) {
1166
+			if (!usedLangs.contains(langPair)) {
1167 1167
 				usedLangs.append(langPair);
1168 1168
 			}
1169 1169
 		}

+ 2
- 2
bibletime/frontend/mainindex/cmainindex.cpp View File

@@ -768,7 +768,7 @@ void CMainIndex::readSettings() {
768 768
 		unsigned int index = 1;
769 769
 
770 770
 		for (TQStringList::Iterator p_it( path.begin() ); p_it != path.end(); ++p_it) {
771
-			TQString itemName = (*p_it).tqreplace("\\/", "/");
771
+			TQString itemName = (*p_it).replace("\\/", "/");
772 772
 
773 773
 			while (item && (item->text(0) != itemName)) {
774 774
 				item = item->nextSibling();
@@ -835,7 +835,7 @@ void CMainIndex::saveSettings() {
835 835
 			TQString fullName = i->text(0);
836 836
 			while (i->tqparent()) {
837 837
 				i = i->tqparent();
838
-				fullName.prepend("/").prepend( i->text(0).tqreplace("/", "\\/")); // tqparent / child
838
+				fullName.prepend("/").prepend( i->text(0).replace("/", "\\/")); // tqparent / child
839 839
 			}
840 840
 			openGroups << fullName;
841 841
 		}

+ 2
- 2
bibletime/frontend/searchdialog/cmodulechooser.cpp View File

@@ -186,7 +186,7 @@ void CModuleChooser::initTree() {
186 186
 		//     for (modsForType.first(); modsForType.current(); modsForType.next()) {
187 187
 		ListCSwordModuleInfo::iterator end_it = modsForType.end();
188 188
 		for (ListCSwordModuleInfo::iterator it(modsForType.begin()); it != end_it; ++it) {
189
-			if ( !langs.tqcontains(TQString( (*it)->module()->Lang() ))) {
189
+			if ( !langs.contains(TQString( (*it)->module()->Lang() ))) {
190 190
 				langs.append( (*it)->module()->Lang() );
191 191
 			}
192 192
 		};
@@ -256,7 +256,7 @@ void CModuleChooser::setModules( ListCSwordModuleInfo modules ) {
256 256
 	TQListViewItemIterator it( this );
257 257
 	for ( ; it.current(); ++it ) {
258 258
 		if ( ModuleCheckBoxItem* i = dynamic_cast<ModuleCheckBoxItem*>(it.current()) ) {
259
-			i->setOn(modules.tqcontains(i->module())); //set the status for the module checkbox item
259
+			i->setOn(modules.contains(i->module())); //set the status for the module checkbox item
260 260
 			//      if (i->isOn()) { //if it's checked, show the item
261 261
 			//        qWarning("show item!");
262 262
 			//        ensureItemVisible(i);

+ 2
- 2
bibletime/frontend/searchdialog/cmoduleresultview.cpp View File

@@ -125,7 +125,7 @@ void CModuleResultView::setupTree( ListCSwordModuleInfo modules, const TQString&
125 125
 		// I choose option number 2 at this time.
126 126
 		//----------------------------------------------------------------------
127 127
 		int sstIndex, sTokenIndex; // strong search text index for finding "strong:"
128
-		if ((sstIndex = searchedText.tqfind("strong:", 0)) != -1) {
128
+		if ((sstIndex = searchedText.find("strong:", 0)) != -1) {
129 129
 			TQString sNumber;
130 130
 			//--------------------------------------------------
131 131
 			// get the strongs number from the search text
@@ -133,7 +133,7 @@ void CModuleResultView::setupTree( ListCSwordModuleInfo modules, const TQString&
133 133
 			// first find the first space after "strong:"
134 134
 			//    this should indicate a change in search token
135 135
 			sstIndex = sstIndex + 7;
136
-			sTokenIndex = searchedText.tqfind(" ", sstIndex);
136
+			sTokenIndex = searchedText.find(" ", sstIndex);
137 137
 			sNumber = searchedText.mid(sstIndex, sTokenIndex - sstIndex);
138 138
 
139 139
 			setupStrongsResults((*it), item, sNumber);

+ 2
- 2
bibletime/frontend/searchdialog/crangechooser.cpp View File

@@ -190,7 +190,7 @@ void CRangeChooserDialog::parseRange() {
190 190
 
191 191
 	//hack: repair range to  work with Sword 1.5.6
192 192
 	TQString range( m_rangeEdit->text() );
193
-	range.tqreplace(TQRegExp("\\s{0,}-\\s{0,}"), "-" );
193
+	range.replace(TQRegExp("\\s{0,}-\\s{0,}"), "-" );
194 194
 
195 195
 	sword::VerseKey key;
196 196
 	sword::ListKey verses = key.ParseVerseList((const char*)range.utf8(), "Genesis 1:1", true);
@@ -207,7 +207,7 @@ void CRangeChooserDialog::rangeChanged() {
207 207
 	   ) {
208 208
 		TQString range( m_rangeEdit->text() );
209 209
 		//hack: repair range to work with Sword 1.5.6
210
-		range.tqreplace(TQRegExp("\\s{0,}-\\s{0,}"), "-" );
210
+		range.replace(TQRegExp("\\s{0,}-\\s{0,}"), "-" );
211 211
 		i->setRange(range);
212 212
 	};
213 213
 }

+ 5
- 5
bibletime/frontend/searchdialog/csearchanalysis.cpp View File

@@ -161,7 +161,7 @@ void CSearchAnalysis::analyse(ListCSwordModuleInfo modules) {
161 161
 		ListCSwordModuleInfo::iterator end_it = m_moduleList.end();
162 162
 		for (ListCSwordModuleInfo::iterator it(m_moduleList.begin()); it != end_it; ++it) {
163 163
 			KApplication::kApplication()->tqprocessEvents( 10 ); //10 ms only
164
-			if (!m_lastPosList.tqcontains(*it)) {
164
+			if (!m_lastPosList.contains(*it)) {
165 165
 				m_lastPosList.insert(*it,0);
166 166
 			}
167 167
 
@@ -281,7 +281,7 @@ const unsigned int CSearchAnalysis::getCount( const TQString book, CSwordModuleI
281 281
 		i++;
282 282
 		++count;
283 283
 	}
284
-	m_lastPosList.tqcontains(module) ? m_lastPosList.tqreplace(module,i) : m_lastPosList.insert(module,i);
284
+	m_lastPosList.contains(module) ? m_lastPosList.replace(module,i) : m_lastPosList.insert(module,i);
285 285
 
286 286
 	return count;
287 287
 }
@@ -453,7 +453,7 @@ void CSearchAnalysisView::ToolTip::maybeTip(const TQPoint& p) {
453 453
 	TQPoint p2 = view->viewport()->mapTo(view, view->contentsToViewport(i->rect().bottomRight()));
454 454
 	p2.setY(view->height());
455 455
 	TQRect r = TQRect( p1, p2 );
456
-	if (r.tqcontains(p))
456
+	if (r.contains(p))
457 457
 		tip(r, text);
458 458
 }
459 459
 
@@ -535,7 +535,7 @@ void CSearchAnalysis::saveAsHTML() {
535 535
 
536 536
 	key.key("Genesis 1:1");
537 537
 
538
-	CSearchAnalysisItem* analysisItem = m_canvasItemList.tqfind( key.book() );
538
+	CSearchAnalysisItem* analysisItem = m_canvasItemList.find( key.book() );
539 539
 
540 540
 	TQString text = "<html>\n<head>\n<title>" + i18n("BibleTime Search Analysis") + "</title>\n" + txtCSS + metaEncoding + "</head>\n<body>\n";
541 541
 	text += "<table>\n<tr><th>" + i18n("Search text :") + "</th><th>" + CSearchDialog::getSearchDialog()->searchText() + "</th></tr>\n";
@@ -560,7 +560,7 @@ void CSearchAnalysis::saveAsHTML() {
560 560
 	bool ok = true;
561 561
 	while (ok) {
562 562
 		m_searchAnalysisHTML += TQString("<tr><td>") + key.book() + TQString("</td>");
563
-		analysisItem = m_canvasItemList.tqfind( key.book() );
563
+		analysisItem = m_canvasItemList.find( key.book() );
564 564
 
565 565
 		//    for (moduleIndex = 0, m_moduleList.first(); m_moduleList.current(); m_moduleList.next(), ++moduleIndex) {
566 566
 		moduleIndex = 0;

+ 21
- 21
bibletime/frontend/searchdialog/csearchdialogpages.cpp View File

@@ -121,25 +121,25 @@ TQString StrongsResultClass::getStrongsNumberText(const TQString& verseContent,
121 121
 	const bool cs = false;
122 122
 	
123 123
 	if (*startIndex == 0) {
124
-		index = verseContent.tqfind("<body", 0);
124
+		index = verseContent.find("<body", 0);
125 125
 	}
126 126
 	else {
127 127
 		index = *startIndex;
128 128
 	}
129 129
    
130 130
 	// find all the "lemma=" inside the the content
131
-	while((index = verseContent.tqfind("lemma=", index, cs)) != -1) {
131
+	while((index = verseContent.find("lemma=", index, cs)) != -1) {
132 132
 		// get the strongs number after the lemma and compare it with the
133 133
 		// strongs number we are looking for
134
-		idx1 = verseContent.tqfind("\"", index) + 1;
135
-		idx2 = verseContent.tqfind("\"", idx1 + 1);
134
+		idx1 = verseContent.find("\"", index) + 1;
135
+		idx2 = verseContent.find("\"", idx1 + 1);
136 136
 		sNumber = verseContent.mid(idx1, idx2 - idx1);
137 137
 		if (sNumber == lemmaText) {
138 138
 			// strongs number is found now we need to get the text of this node
139 139
 			// search right until the ">" is found.  Get the text from here to
140 140
 			// the next "<".
141
-			index = verseContent.tqfind(">", index, cs) + 1;
142
-			idx2  = verseContent.tqfind("<", index, cs);
141
+			index = verseContent.find(">", index, cs) + 1;
142
+			idx2  = verseContent.find("<", index, cs);
143 143
 			strongsText = verseContent.mid(index, idx2 - index);
144 144
 			index = idx2;
145 145
 			*startIndex = index;
@@ -413,12 +413,12 @@ TQStringList CSearchResultPage::QueryParser(const TQString& queryString) {
413 413
 		}
414 414
 		// if the token contains a ^ then trim the remainder of the
415 415
 		// token from the ^
416
-		else if ( (pos = (*it).tqcontains("^")) >= 0 ) {
416
+		else if ( (pos = (*it).contains("^")) >= 0 ) {
417 417
 			(*it) = (*it).left(pos - 1); 
418 418
 		}
419 419
 		// if the token contains a ~ then trim the remainder of the
420 420
 		// token from the ~
421
-		else if ( (pos = (*it).tqcontains("~")) >= 0 ) {
421
+		else if ( (pos = (*it).contains("~")) >= 0 ) {
422 422
 			(*it) = (*it).left(pos - 2) + "*"; 
423 423
 		}
424 424
 	}	
@@ -432,7 +432,7 @@ const TQString CSearchResultPage::highlightSearchedText(const TQString& content,
432 432
 	const bool cs = false;
433 433
 	
434 434
 	//   int index = 0;
435
-	int index = ret.tqfind("<body", 0);
435
+	int index = ret.find("<body", 0);
436 436
 	int matchLen = 0;
437 437
 	int length = searchedText.length();
438 438
 
@@ -449,7 +449,7 @@ const TQString CSearchResultPage::highlightSearchedText(const TQString& content,
449 449
 	//---------------------------------------------------------------------
450 450
 	// search the searched text for "strong:" until it is not found anymore
451 451
 	sstIndex = 0;
452
-	while ((sstIndex = newSearchText.tqfind("strong:", sstIndex)) != -1) {
452
+	while ((sstIndex = newSearchText.find("strong:", sstIndex)) != -1) {
453 453
 		int idx1, idx2, sTokenIndex, sTokenIndex2;
454 454
 		TQString sNumber, lemmaText;
455 455
 		const TQString rep3("style=\"background-color:#FFFF66;\" ");
@@ -461,8 +461,8 @@ const TQString CSearchResultPage::highlightSearchedText(const TQString& content,
461 461
 		// first find the first space after "strong:"
462 462
 		//	 this should indicate a change in search token
463 463
 		sstIndex = sstIndex + 7;
464
-		sTokenIndex  = newSearchText.tqfind(" ", sstIndex);
465
-		sTokenIndex2 = newSearchText.tqfind("|", sstIndex);
464
+		sTokenIndex  = newSearchText.find(" ", sstIndex);
465
+		sTokenIndex2 = newSearchText.find("|", sstIndex);
466 466
 		if ((sTokenIndex2 != -1) && (sTokenIndex2 < sTokenIndex)) {
467 467
 			sNumber = newSearchText.mid(sstIndex, sTokenIndex2 - sstIndex);
468 468
 		}
@@ -471,13 +471,13 @@ const TQString CSearchResultPage::highlightSearchedText(const TQString& content,
471 471
 		}
472 472
 		// remove this strong entry
473 473
 		sstIndex -= 7;
474
-		newSearchText.tqreplace(sstIndex, sTokenIndex - sstIndex, "");
474
+		newSearchText.replace(sstIndex, sTokenIndex - sstIndex, "");
475 475
 		// find all the "lemma=" inside the the content
476
-		while((strongIndex = ret.tqfind("lemma=", strongIndex, cs)) != -1) {
476
+		while((strongIndex = ret.find("lemma=", strongIndex, cs)) != -1) {
477 477
 			// get the strongs number after the lemma and compare it with the
478 478
 			// strongs number we are looking for
479
-			idx1 = ret.tqfind("\"", strongIndex) + 1;
480
-			idx2 = ret.tqfind("\"", idx1 + 1);
479
+			idx1 = ret.find("\"", strongIndex) + 1;
480
+			idx2 = ret.find("\"", idx1 + 1);
481 481
 			lemmaText = ret.mid(idx1, idx2 - idx1);
482 482
 			if (lemmaText == sNumber) {
483 483
 				// strongs number is found now we need to highlight it
@@ -521,9 +521,9 @@ const TQString CSearchResultPage::highlightSearchedText(const TQString& content,
521 521
 	for ( int wi = 0; (unsigned int)wi < words.count(); ++wi ) { //search for every word in the list
522 522
 		TQRegExp findExp;
523 523
 		TQString word = words[ wi ];
524
-		if (word.tqcontains("*")) {
524
+		if (word.contains("*")) {
525 525
 			length = word.length() - 1;
526
-			word.tqreplace('*', "\\S*"); //match within a word
526
+			word.replace('*', "\\S*"); //match within a word
527 527
 			findExp = TQRegExp(word);
528 528
 			findExp.setMinimal(TRUE);
529 529
 		}
@@ -533,9 +533,9 @@ const TQString CSearchResultPage::highlightSearchedText(const TQString& content,
533 533
 		}
534 534
 
535 535
 		//       index = 0; //for every word start at the beginning
536
-		index = ret.tqfind("<body", 0);
536
+		index = ret.find("<body", 0);
537 537
 		findExp.setCaseSensitive(cs);
538
-		//while ( (index = ret.tqfind(findExp, index)) != -1 ) { //while we found the word
538
+		//while ( (index = ret.find(findExp, index)) != -1 ) { //while we found the word
539 539
 		while ( (index = findExp.search(ret, index)) != -1 ) { //while we found the word
540 540
 			matchLen = findExp.matchedLength();
541 541
 			if (!CToolClass::inHTMLTag(index, ret)) {
@@ -658,7 +658,7 @@ void CSearchOptionsPage::setModules( ListCSwordModuleInfo modules ) {
658 658
 			continue;
659 659
 		}
660 660
 		
661
-		if ( !m_modules.tqcontains(*it) ) {
661
+		if ( !m_modules.contains(*it) ) {
662 662
 			m_modules.append( *it );
663 663
 			t.append( (*it)->name() );
664 664
 			if (*it != modules.last()) {

+ 1
- 1
bibletime/frontend/searchdialog/csearchdialogpages.h View File

@@ -78,7 +78,7 @@ public:
78 78
 		return keyNameList.count();
79 79
 	}
80 80
 	void addKeyName(const TQString& keyName) {
81
-		if (keyNameList.tqfindIndex(keyName) == -1)
81
+		if (keyNameList.findIndex(keyName) == -1)
82 82
 			keyNameList.append(keyName);
83 83
 	}
84 84
 	TQStringList* getKeyList() {

+ 1
- 1
bibletime/frontend/util/csortlistviewitem.cpp View File

@@ -57,7 +57,7 @@ CSortListViewItem::~CSortListViewItem() {
57 57
 int CSortListViewItem::compare( TQListViewItem* i, int col, bool ascending ) const {
58 58
 	int ret = 0;
59 59
 
60
-	if ( !columnSorting.tqcontains(col) ) {
60
+	if ( !columnSorting.contains(col) ) {
61 61
 		return KListViewItem::compare(i, col, ascending);
62 62
 	}
63 63
 	

+ 5
- 5
bibletime/util/cresmgr.cpp View File

@@ -79,14 +79,14 @@ namespace CResMgr {
79 79
 			namespace search {
80 80
 				TQString tooltip;
81 81
 
82
-				const TQString icon        = "tqfind";
82
+				const TQString icon        = "find";
83 83
 				const KShortcut accel     = TQt::CTRL + TQt::Key_O;
84 84
 				const char* actionName    = "mainindex_search_action";
85 85
 			}
86 86
 			namespace searchdefaultbible {
87 87
 				TQString tooltip;
88 88
 
89
-				const TQString icon        = "tqfind";
89
+				const TQString icon        = "find";
90 90
 				const KShortcut accel     = TQt::CTRL + TQt::ALT + TQt::Key_F;
91 91
 				const char* actionName    = "mainindex_searchdefaultbible_action";
92 92
 			}
@@ -248,7 +248,7 @@ namespace CResMgr {
248 248
 	}  //end of main menu
249 249
 
250 250
 	namespace searchdialog {
251
-		const TQString icon = "tqfind";
251
+		const TQString icon = "find";
252 252
 
253 253
 		namespace searchButton {
254 254
 			TQString tooltip;
@@ -379,7 +379,7 @@ namespace CResMgr {
379 379
 			namespace search {
380 380
 				TQString tooltip;
381 381
 
382
-				const TQString icon        = "tqfind";
382
+				const TQString icon        = "find";
383 383
 				const KShortcut accel     = TQt::CTRL + TQt::Key_L;
384 384
 				const char* actionName    = "window_search_action";
385 385
 			}
@@ -668,7 +668,7 @@ namespace CResMgr {
668 668
 		namespace search {
669 669
 			TQString tooltip;
670 670
 
671
-			const TQString icon        = "tqfind";
671
+			const TQString icon        = "find";
672 672
 			const KShortcut accel     = TQt::CTRL + TQt::ALT + TQt::Key_M;
673 673
 			const char* actionName    = "GMsearch_action";
674 674
 		}

+ 11
- 11
bibletime/util/ctoolclass.cpp View File

@@ -47,22 +47,22 @@ TQString CToolClass::locatehtml(const TQString &filename) {
47 47
 TQString CToolClass::htmlToText(const TQString& html) {
48 48
 	TQString newText = html;
49 49
 	// convert some tags we need in code
50
-	newText.tqreplace( TQRegExp(" "),"#SPACE#" );
51
-	newText.tqreplace( TQRegExp("<br/?>\\s*"), "<br/>\n" );
52
-	newText.tqreplace( TQRegExp("#SPACE#")," " );
50
+	newText.replace( TQRegExp(" "),"#SPACE#" );
51
+	newText.replace( TQRegExp("<br/?>\\s*"), "<br/>\n" );
52
+	newText.replace( TQRegExp("#SPACE#")," " );
53 53
 
54 54
 	TQRegExp re("<.+>");
55 55
 	re.setMinimal(true);
56
-	newText.tqreplace( re,"" );
56
+	newText.replace( re,"" );
57 57
 	return newText;
58 58
 }
59 59
 
60 60
 /** Converts text to HTML (\n to <BR>) */
61 61
 TQString CToolClass::textToHTML(const TQString& text) {
62 62
 	TQString newText = text;
63
-	newText.tqreplace( TQRegExp("<BR>\n"),"#NEWLINE#" );
64
-	newText.tqreplace( TQRegExp("\n"),"<BR>\n" );
65
-	newText.tqreplace( TQRegExp("#NEWLINE#"),"<BR>\n");
63
+	newText.replace( TQRegExp("<BR>\n"),"#NEWLINE#" );
64
+	newText.replace( TQRegExp("\n"),"<BR>\n" );
65
+	newText.replace( TQRegExp("#NEWLINE#"),"<BR>\n");
66 66
 	return newText;
67 67
 }
68 68
 
@@ -169,10 +169,10 @@ TQLabel* CToolClass::explanationLabel(TQWidget* tqparent, const TQString& headin
169 169
 
170 170
 /** No descriptions */
171 171
 bool CToolClass::inHTMLTag(int pos, TQString & text) {
172
-	int i1=text.tqfindRev("<",pos);
173
-	int i2=text.tqfindRev(">",pos);
174
-	int i3=text.tqfind(">",pos);
175
-	int i4=text.tqfind("<",pos);
172
+	int i1=text.findRev("<",pos);
173
+	int i2=text.findRev(">",pos);
174
+	int i3=text.find(">",pos);
175
+	int i4=text.find("<",pos);
176 176
 
177 177
 
178 178
 	// if ((i1>0) && (i2==-1))  //we're in th first html tag

Loading…
Cancel
Save