rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeutils@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

8 files changed, 28 insertions, 28 deletions

diff --git a/klaptopdaemon/acpi_helper.cpp b/klaptopdaemon/acpi_helper.cpp
index 0640986..cf5c980 100644
--- a/klaptopdaemon/acpi_helper.cpp
+++ b/klaptopdaemon/acpi_helper.cpp
@@ -110,7 +110,7 @@ void run_program(const char *path, const int action)
 
 	if ((err = stat(path, &sb)) != 0 || sb.st_mode&S_IWOTH) {
 		if (err != 0) {
-			fprintf(stderr, "Can't tqfind %s\n", path);
+			fprintf(stderr, "Can't find %s\n", path);
 			return;
 		} else {
 			fprintf(stderr, "%s is writeable by anyone - we don't trust it\n", path);
diff --git a/klaptopdaemon/battery.cpp b/klaptopdaemon/battery.cpp
index 6f1d7ab..a80ecbf 100644
--- a/klaptopdaemon/battery.cpp
+++ b/klaptopdaemon/battery.cpp
@@ -171,7 +171,7 @@ BatteryConfig::BatteryConfig (TQWidget * tqparent, const char *name)
       }
 
       // TODO: remove linefeed from string, can't do it right now coz we have a string freeze
-      TQLabel* explain = new KRichTextLabel( i18n("This panel controls whether the battery status monitor\nappears in the system tray and what it looks like.").tqreplace("\n"," "), this);
+      TQLabel* explain = new KRichTextLabel( i18n("This panel controls whether the battery status monitor\nappears in the system tray and what it looks like.").replace("\n"," "), this);
       top_layout->addWidget(explain, 0);
       laptop_portable::extra_config(this, config, top_layout);
     }
diff --git a/klaptopdaemon/daemondock.cpp b/klaptopdaemon/daemondock.cpp
index 60540b0..1388b0a 100644
--- a/klaptopdaemon/daemondock.cpp
+++ b/klaptopdaemon/daemondock.cpp
@@ -469,7 +469,7 @@ void laptop_dock::mousePressEvent( TQMouseEvent *event )
 }
 void laptop_dock::mouseReleaseEvent( TQMouseEvent *e )
 {
-    if ( !TQT_TQRECT_OBJECT(rect()).tqcontains( e->pos() ) )
+    if ( !TQT_TQRECT_OBJECT(rect()).contains( e->pos() ) )
         return;
 
     switch ( e->button() ) {
diff --git a/klaptopdaemon/kpcmcia.cpp b/klaptopdaemon/kpcmcia.cpp
index 762959b..83e4971 100644
--- a/klaptopdaemon/kpcmcia.cpp
+++ b/klaptopdaemon/kpcmcia.cpp
@@ -186,8 +186,8 @@ tv.tv_sec = 0;  tv.tv_usec = 0;
             TQString s;
             if (ts.eof()) break;
             s = ts.readLine();
-            if (s.tqcontains(thisreg)) {
-               _cardname = s.right(s.length() - s.tqfind(':') - 1);
+            if (s.contains(thisreg)) {
+               _cardname = s.right(s.length() - s.find(':') - 1);
                _cardname = _cardname.stripWhiteSpace();
                foundit = true;
                CHECK_CHANGED(oldValues, _cardname);
@@ -200,23 +200,23 @@ tv.tv_sec = 0;  tv.tv_usec = 0;
             int end;
             s.simplifyWhiteSpace();
 
-            end = s.tqfind(TQRegExp("[ \r\t\n]"));
+            end = s.find(TQRegExp("[ \r\t\n]"));
             s = s.remove(0, end+1);
 
-            end = s.tqfind(TQRegExp("[ \r\t\n]"));
+            end = s.find(TQRegExp("[ \r\t\n]"));
             _type = s;
             _type.truncate(end);
             s = s.remove(0, end+1);
 
-            end = s.tqfind(TQRegExp("[ \r\t\n]"));
+            end = s.find(TQRegExp("[ \r\t\n]"));
             _module = s;
             _module.truncate(end);
             s = s.remove(0, end+1);
 
-            end = s.tqfind(TQRegExp("[ \r\t\n]"));
+            end = s.find(TQRegExp("[ \r\t\n]"));
             s = s.remove(0, end+1);
 
-            end = s.tqfind(TQRegExp("[ \r\t\n]"));
+            end = s.find(TQRegExp("[ \r\t\n]"));
             _device = s;
             _device.truncate(end);
             s = s.remove(0, end+1);
@@ -508,7 +508,7 @@ TQString thisreg;
       while (!t.eof()) {
          s = t.readLine();
 
-         if (s.tqcontains(TQRegExp(thisreg))) {
+         if (s.contains(TQRegExp(thisreg))) {
             int n = (s.left(3).stripWhiteSpace()).toInt();
             df.close();
             return n;
diff --git a/klaptopdaemon/portable.cpp b/klaptopdaemon/portable.cpp
index fda010b..29c4d22 100644
--- a/klaptopdaemon/portable.cpp
+++ b/klaptopdaemon/portable.cpp
@@ -333,7 +333,7 @@ static void acpi_read_batteries() {
 			f = new TQFile(bat.info_file);
 			if (f && f->exists() && f->open(IO_ReadOnly)) {
 				while(f->readLine(buff,1024) > 0) {
-					if (buff.tqcontains("design capacity low:", false)) {
+					if (buff.contains("design capacity low:", false)) {
 						TQRegExp rx("(\\d*)\\D*$");
 						rx.search(buff);
 						bat.cap_low = rx.cap(1).toInt();
@@ -341,7 +341,7 @@ static void acpi_read_batteries() {
 							bat.cap_low = 0;
 						continue;
 					}
-					if (buff.tqcontains("last full capacity:", false)) {
+					if (buff.contains("last full capacity:", false)) {
 						TQRegExp rx("(\\d*)\\D*$");
 						rx.search(buff);
 						bat.cap = rx.cap(1).toInt();
@@ -363,7 +363,7 @@ static void acpi_read_batteries() {
 			f = new TQFile(bat.state_file);
 			if (f && f->exists() && f->open(IO_ReadOnly)) {
 				while(f->readLine(buff,1024) > 0) {
-					if (buff.tqcontains("present rate:", false)) {
+					if (buff.contains("present rate:", false)) {
 						TQRegExp rx("(\\d*)\\D*$");
 						rx.search(buff);
 						bat.rate = rx.cap(1).toInt();
@@ -372,7 +372,7 @@ static void acpi_read_batteries() {
 						present = true;
 						continue;
 					}
-					if (buff.tqcontains("remaining capacity:", false)) {
+					if (buff.contains("remaining capacity:", false)) {
 						TQRegExp rx("(\\d*)\\D*$");
 						rx.search(buff);
 						bat.remaining = rx.cap(1).toInt();
@@ -961,16 +961,16 @@ TQLabel *laptop_portable::how_to_do_suspend_resume(TQWidget *tqparent)
  		TQLabel* note = new KRichTextLabel(i18n("\nIf you make /usr/bin/apm setuid then you will also "
 						"be able to choose 'suspend' and 'standby' in the above "
 						"dialog - check out the help button below to find out "
-						"how to do this").tqreplace("\n", TQString()), tqparent);
+						"how to do this").replace("\n", TQString()), tqparent);
 		return(note);
 	}
 	if (::has_acpi()) {
                 // TODO: remove linefeed from string, can't do it right now coz we have a string freeze
- 		TQLabel* note = new KRichTextLabel(i18n("\nYou may need to enable ACPI suspend/resume in the ACPI panel").tqreplace("\n", TQString()), tqparent);
+ 		TQLabel* note = new KRichTextLabel(i18n("\nYou may need to enable ACPI suspend/resume in the ACPI panel").replace("\n", TQString()), tqparent);
 		return(note);
 	}
         // TODO: remove linefeed from string, can't do it right now coz we have a string freeze
- 	TQLabel* note = new KRichTextLabel(i18n("\nYour system does not support suspend/standby").tqreplace("\n", TQString()), tqparent);
+ 	TQLabel* note = new KRichTextLabel(i18n("\nYour system does not support suspend/standby").replace("\n", TQString()), tqparent);
 	return(note);
 }
 
@@ -1580,7 +1580,7 @@ get_acpi_list(char p, int *map, const char *dev, TQStringList &list, int &index,
 						while (!f.atEnd() && i < MAP_SIZE) {
 							TQString l;
 							f.readLine(l, 500);
-							if (l.tqcontains("active limit", false)) {
+							if (l.contains("active limit", false)) {
 								TQRegExp rx(TQString("%1(\\d+)").tqarg(p));
 								if (rx.search(l) >= 0) {
 									bool ok;
@@ -1835,7 +1835,7 @@ laptop_portable::set_system_performance(TQString val)	// val = string given by g
 	int current, result;
 	if((result = get_acpi_list('P', acpi_performance_map, "/performance", performance_list, current, acpi_performance_cpu, false, acpi_performance_enable))) {
 		char tmp[20];
-		int ind = performance_list.tqfindIndex(val);
+		int ind = performance_list.findIndex(val);
 		if (ind < 0 || ind >= MAP_SIZE || current == ind)
 			return;
 		snprintf(tmp, sizeof(tmp), "%d", acpi_performance_map[ind]);
@@ -1857,7 +1857,7 @@ laptop_portable::set_system_performance(TQString val)	// val = string given by g
 				invoke_acpi_helper("--cpufreq-25", tmp.latin1(), 0);
 				return;
 			case CPUFREQ_24:
-				int target = performance_list.tqfindIndex(val);
+				int target = performance_list.findIndex(val);
 				invoke_acpi_helper("--cpufreq-24", cpufreq_cpu.latin1(), cpufreq_minmax_frequency[target].latin1());
 				return;
 		}
@@ -1871,7 +1871,7 @@ laptop_portable::set_system_throttling(TQString val)	// val = string given by ge
 {
 	if (::has_acpi()) {
 		char tmp[20];
-		int ind = throttle_list.tqfindIndex(val);
+		int ind = throttle_list.findIndex(val);
 		if (ind < 0 || ind >= MAP_SIZE)
 			return;
 		snprintf(tmp, sizeof(tmp), "%d", acpi_throttle_map[ind]);
@@ -1909,7 +1909,7 @@ acpi_check_button(const char *prefix, TQString &result)
 				while (!f.atEnd()) {
 					TQString l;
       					f.readLine(l, 500);
-					if (l.tqcontains("state:")) {
+					if (l.contains("state:")) {
 						result = name;
 						v = 1;
 						break;
diff --git a/klaptopdaemon/sony.cpp b/klaptopdaemon/sony.cpp
index 3ecbf35..c922fd5 100644
--- a/klaptopdaemon/sony.cpp
+++ b/klaptopdaemon/sony.cpp
@@ -68,7 +68,7 @@ SonyConfig::SonyConfig(TQWidget * tqparent, const char *name)
     // TODO: remove linefeed from string, can't do it right now coz we have a string freeze
     top_layout->addWidget(new KRichTextLabel(i18n("This panel allows you to control some of the features of the\n"
 		    	"'sonypi' device for your laptop - you should not enable the options below if you\nalso "
-			"use the 'sonypid' program in your system").tqreplace("\n", " "), this));
+			"use the 'sonypid' program in your system").replace("\n", " "), this));
 
     enableScrollBar = new TQCheckBox( i18n("Enable &scroll bar"), this );
     TQToolTip::add( enableScrollBar, i18n( "When checked this box enables the scrollbar so that it works under KDE" ) );
@@ -86,7 +86,7 @@ SonyConfig::SonyConfig(TQWidget * tqparent, const char *name)
 	
         // TODO: remove linefeed from string, can't do it right now coz we have a string freeze
     	top_layout->addWidget(new KRichTextLabel(i18n("The /dev/sonypi is not accessable, if you wish to use the above features its\n"
-					      "protections need to be changed. Clicking on the button below will change them\n").tqreplace("\n", " "), this));
+					      "protections need to be changed. Clicking on the button below will change them\n").replace("\n", " "), this));
         TQHBoxLayout *ll = new TQHBoxLayout();
         TQPushButton *setupButton = new TQPushButton(i18n("Setup /dev/sonypi"), this);
         connect( setupButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(setupHelper()) );
diff --git a/klaptopdaemon/xautolock.cc b/klaptopdaemon/xautolock.cc
index 51e1637..25b2242 100644
--- a/klaptopdaemon/xautolock.cc
+++ b/klaptopdaemon/xautolock.cc
@@ -246,14 +246,14 @@ bool XAutoLock::x11Event( XEvent* ev )
 // don't futher process key events that were received only because XAutoLock wants them
     if( ev->type == KeyPress && !ev->xkey.send_event
         && !xautolock_useXidle && !xautolock_useMit
-        && !TQWidget::tqfind( ev->xkey.window ))
+        && !TQWidget::find( ev->xkey.window ))
         return true;
     return false;
 }
 
 bool XAutoLock::ignoreWindow( WId w )
 {
-    if( w != qt_xrootwin() && TQWidget::tqfind( w ))
+    if( w != qt_xrootwin() && TQWidget::find( w ))
         return true;
     return false;
 }
diff --git a/klaptopdaemon/xautolock_engine.c b/klaptopdaemon/xautolock_engine.c
index 08094e7..c293d9e 100644
--- a/klaptopdaemon/xautolock_engine.c
+++ b/klaptopdaemon/xautolock_engine.c
@@ -380,7 +380,7 @@ evaluateTriggers (Display* d)
           *  Nevertheless, simply resetting the screensaver is a
           *  convenience action that aids many xlock users, and doesn't
           *  harm anyone (*). The problem with older versions of xlock 
-	  *  is that they can be told to tqreplace (= disable) the real
+	  *  is that they can be told to replace (= disable) the real
 	  *  screensaver, but forget to reset that same screensaver if
 	  *  it was already active at the time xlock starts. I guess 
 	  *  xlock initially wasn't designed to be run without a user