summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-13 08:32:36 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-13 08:32:36 +0000
commitf7e71d47719ab6094cf4a9fafffa5ea351973522 (patch)
tree30834aa632d442019e14f88685001d94657d060b /win
parentb31cfd9a1ee986fe2ae9a693f3afd7f171dd897c (diff)
downloadtdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.tar.gz
tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.zip
Initial conversion for TQt for Qt4 3.4.0 TP2
This will also compile with TQt for Qt3, and should not cause any problems with dependent modules such as kdebase. If it does then it needs to be fixed! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'win')
-rw-r--r--win/qeventloopex.h2
-rw-r--r--win/win32_utils2.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/win/qeventloopex.h b/win/qeventloopex.h
index 26247ac82..648ddf228 100644
--- a/win/qeventloopex.h
+++ b/win/qeventloopex.h
@@ -28,7 +28,7 @@
class QEventLoopExPrivate;
-class QEventLoopEx : public QEventLoop
+class QEventLoopEx : public TQEventLoop
{
Q_OBJECT
diff --git a/win/win32_utils2.cpp b/win/win32_utils2.cpp
index 2e46d2acb..24630667a 100644
--- a/win/win32_utils2.cpp
+++ b/win/win32_utils2.cpp
@@ -98,7 +98,7 @@ TQString convertKFileDialogFilterToQFileDialogFilter(const TQString& filter)
// escaped '/' characters.
TQString copy (kde_filters);
- for (pos = 0; (pos = copy.find("\\/", pos)) != -1; ++pos)
+ for (pos = 0; (pos = copy.tqfind("\\/", pos)) != -1; ++pos)
copy.remove(pos, 1);
//<js>
@@ -112,7 +112,7 @@ TQString convertKFileDialogFilterToQFileDialogFilter(const TQString& filter)
current = *it;
TQString new_f;//filter part
TQString new_name;//filter name part
- int p = (*it).find('|');
+ int p = (*it).tqfind('|');
if (p!=-1) {
new_f = current.left(p);
new_name = current.mid(p+1);
@@ -122,7 +122,7 @@ TQString convertKFileDialogFilterToQFileDialogFilter(const TQString& filter)
new_name = current; //nothing better
}
//remove (.....) from name
- p=new_name.find('(');
+ p=new_name.tqfind('(');
int p2 = new_name.findRev(')');
TQString new_name1, new_name2;
if (p!=-1)