summaryrefslogtreecommitdiffstats
path: root/kdesktop
diff options
context:
space:
mode:
Diffstat (limited to 'kdesktop')
-rw-r--r--kdesktop/desktop.cc6
-rw-r--r--kdesktop/init.cc2
-rw-r--r--kdesktop/kcustommenu.cc2
-rw-r--r--kdesktop/kdiconview.cc20
-rw-r--r--kdesktop/kxdglauncher.cpp6
-rw-r--r--kdesktop/lock/lockdlg.cc2
-rw-r--r--kdesktop/lock/lockprocess.cc2
-rw-r--r--kdesktop/lock/main.cc2
-rw-r--r--kdesktop/main.cc2
-rw-r--r--kdesktop/minicli.cpp8
-rw-r--r--kdesktop/pixmapserver.cc24
11 files changed, 38 insertions, 38 deletions
diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc
index 5696d2e4a..2f6e3831f 100644
--- a/kdesktop/desktop.cc
+++ b/kdesktop/desktop.cc
@@ -1160,7 +1160,7 @@ void KDesktop::addIcon(const TQString & _url, int x, int y)
void KDesktop::addIcon(const TQString & _url, const TQString & _dest, int x, int y)
{
- TQString filename = _url.mid(_url.tqfindRev('/') + 1);
+ TQString filename = _url.mid(_url.findRev('/') + 1);
TQValueList<KIO::CopyInfo> files;
KIO::CopyInfo i;
@@ -1168,7 +1168,7 @@ void KDesktop::addIcon(const TQString & _url, const TQString & _dest, int x, int
i.uDest = KURL::fromPathOrURL( _dest );
i.uDest.addPath( filename );
files.append(i);
- if (!TQFile::exists(i.uDest.prettyURL().tqreplace("file://",TQString()))) { m_pIconView->slotAboutToCreate( TQPoint( x, y ), files );
+ if (!TQFile::exists(i.uDest.prettyURL().replace("file://",TQString()))) { m_pIconView->slotAboutToCreate( TQPoint( x, y ), files );
KIO::copy( i.uSource, i.uDest, false ); }
// m_pIconView->addFuturePosition(filename, x, y);
@@ -1184,7 +1184,7 @@ void KDesktop::removeIcon(const TQString &_url)
return;
}
unlink(KURL(_url).path().latin1());
- TQString dest = _url.left(_url.tqfindRev('/') + 1);
+ TQString dest = _url.left(_url.findRev('/') + 1);
m_pIconView->update( dest );
}
diff --git a/kdesktop/init.cc b/kdesktop/init.cc
index 1d4411ce6..27441b170 100644
--- a/kdesktop/init.cc
+++ b/kdesktop/init.cc
@@ -123,7 +123,7 @@ static TQString realDesktopPath()
if (kdesktop_screen_number != 0) {
TQString dn = "Desktop";
dn += TQString::number(kdesktop_screen_number);
- desktopPath.tqreplace("Desktop", dn);
+ desktopPath.replace("Desktop", dn);
}
return desktopPath;
}
diff --git a/kdesktop/kcustommenu.cc b/kdesktop/kcustommenu.cc
index 00e3ce24c..1d39a093d 100644
--- a/kdesktop/kcustommenu.cc
+++ b/kdesktop/kcustommenu.cc
@@ -82,7 +82,7 @@ KCustomMenu::insertMenuItem(KService::Ptr & s, int nId, int nIndex/*= -1*/)
// item names may contain ampersands. To avoid them being converted
// to accelators, replace them with two ampersands.
- serviceName.tqreplace("&", "&&");
+ serviceName.replace("&", "&&");
TQPixmap normal = KGlobal::instance()->iconLoader()->loadIcon(s->icon(), KIcon::Small,
0, KIcon::DefaultState, 0L, true);
diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc
index 23c89f8ce..7bfe4844f 100644
--- a/kdesktop/kdiconview.cc
+++ b/kdesktop/kdiconview.cc
@@ -321,7 +321,7 @@ void KDIconView::initConfig( bool init )
if ( previewSettings().count() )
{
for ( TQStringList::ConstIterator it = oldPreview.begin(); it != oldPreview.end(); ++it)
- if ( !previewSettings().tqcontains( *it ) ){
+ if ( !previewSettings().contains( *it ) ){
kdDebug(1204) << "Disabling preview for " << *it << endl;
if ( *it == "audio/" )
disableSoundPreviews();
@@ -581,7 +581,7 @@ KURL KDIconView::desktopURL()
if (kdesktop_screen_number != 0) {
TQString dn = "Desktop";
dn += TQString::number(kdesktop_screen_number);
- desktopPath.tqreplace("Desktop", dn);
+ desktopPath.replace("Desktop", dn);
}
KURL desktopURL;
@@ -607,7 +607,7 @@ void KDIconView::contentsMousePressEvent( TQMouseEvent *e )
// TQIconView, as of Qt 2.2, doesn't emit mouseButtonPressed for LMB on background
if ( e->button() == Qt::LeftButton && KRootWm::self()->hasLeftButtonMenu() )
{
- TQIconViewItem *item = tqfindItem( e->pos() );
+ TQIconViewItem *item = findItem( e->pos() );
if ( !item )
{
// Left click menu
@@ -628,7 +628,7 @@ void KDIconView::wheelEvent( TQWheelEvent* e )
if (!m_dirLister) return;
//kdDebug(1204) << "KDIconView::wheelEvent" << endl;
- TQIconViewItem *item = tqfindItem( e->pos() );
+ TQIconViewItem *item = findItem( e->pos() );
if ( !item )
{
emit wheelRolled( e->delta() );
@@ -748,7 +748,7 @@ void KDIconView::fillMediaListView()
for (; it2 != mimetypes.end(); ++it2) {
if ( ((*it2)->name().startsWith("media/")) )
{
- bool ok=excludedMedia.tqcontains((*it2)->name())==0;
+ bool ok=excludedMedia.contains((*it2)->name())==0;
new DesktopBehaviorMediaItem (mMediaListView, (*it2)->comment(), (*it2)->name(),ok);
}
}
@@ -784,7 +784,7 @@ void KDIconView::removeBuiltinIcon(TQString iconName)
{
DesktopBehaviorMediaItem *changeItem;
fillMediaListView();
- changeItem = static_cast<DesktopBehaviorMediaItem *>(mMediaListView->tqfindItem(iconName, 0));
+ changeItem = static_cast<DesktopBehaviorMediaItem *>(mMediaListView->findItem(iconName, 0));
if (changeItem != 0) {
changeItem->setOn(false);
}
@@ -1009,12 +1009,12 @@ bool KDIconView::makeFriendlyText( KFileIVI *fileIVI )
TQStringList tmpList;
if (cfg.hasKey("OnlyShowIn"))
{
- if (!cfg.readListEntry("OnlyShowIn", ';').tqcontains("KDE"))
+ if (!cfg.readListEntry("OnlyShowIn", ';').contains("KDE"))
return false;
}
if (cfg.hasKey("NotShowIn"))
{
- if (cfg.readListEntry("NotShowIn", ';').tqcontains("KDE"))
+ if (cfg.readListEntry("NotShowIn", ';').contains("KDE"))
return false;
}
if (cfg.hasKey("TryExec"))
@@ -1499,7 +1499,7 @@ void KDIconView::contentsDropEvent( TQDropEvent * e )
bool adjustedAnyItems = false;
for( TQIconViewItem *item = firstItem(); item; item = item->nextItem() )
{
- if( !desk.tqcontains( item->rect(), true ))
+ if( !desk.contains( item->rect(), true ))
{
TQRect r = item->rect();
@@ -1615,7 +1615,7 @@ void KDIconView::setupSortKeys()
if (!m_itemsAlwaysFirst.isEmpty())
{
TQString strFileName = static_cast<KFileIVI *>( it )->item()->url().fileName();
- int nFind = m_itemsAlwaysFirst.tqfindIndex(strFileName);
+ int nFind = m_itemsAlwaysFirst.findIndex(strFileName);
if (nFind >= 0)
strKey = "0" + TQString::number(nFind);
}
diff --git a/kdesktop/kxdglauncher.cpp b/kdesktop/kxdglauncher.cpp
index 97dd253a7..d4e4f63ea 100644
--- a/kdesktop/kxdglauncher.cpp
+++ b/kdesktop/kxdglauncher.cpp
@@ -52,9 +52,9 @@ void readXdgUserDirs(TQString *desktop, TQString *documents)
while (!line.isNull())
{
if (line.startsWith("XDG_DESKTOP_DIR="))
- *desktop = TQString(line.remove("XDG_DESKTOP_DIR=").remove("\"")).tqreplace("$HOME", TQDir::homeDirPath());
+ *desktop = TQString(line.remove("XDG_DESKTOP_DIR=").remove("\"")).replace("$HOME", TQDir::homeDirPath());
else if (line.startsWith("XDG_DOCUMENTS_DIR="))
- *documents = TQString(line.remove("XDG_DOCUMENTS_DIR=").remove("\"")).tqreplace("$HOME", TQDir::homeDirPath());
+ *documents = TQString(line.remove("XDG_DOCUMENTS_DIR=").remove("\"")).replace("$HOME", TQDir::homeDirPath());
line = s.readLine();
}
@@ -132,7 +132,7 @@ int main( int argc, char **argv)
}
if (directoryOk == true) {
TQString xdgModifiedDirectory = newDirectory;
- xdgModifiedDirectory = xdgModifiedDirectory.tqreplace(TQDir::homeDirPath(), "$HOME");
+ xdgModifiedDirectory = xdgModifiedDirectory.replace(TQDir::homeDirPath(), "$HOME");
while (xdgModifiedDirectory.endsWith("/")) {
xdgModifiedDirectory.truncate(xdgModifiedDirectory.length()-1);
}
diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc
index 60c382511..ef07679b3 100644
--- a/kdesktop/lock/lockdlg.cc
+++ b/kdesktop/lock/lockdlg.cc
@@ -144,7 +144,7 @@ PasswordDlg::PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin)
layoutsList = kxkb.call("getLayoutsList");
TQString currentLayout = kxkb.call("getCurrentLayout");
if( !currentLayout.isEmpty() && layoutsList.count() > 1 ) {
- currLayout = layoutsList.tqfind(currentLayout);
+ currLayout = layoutsList.find(currentLayout);
if (currLayout == layoutsList.end())
setLayoutText("err");
else
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index 69c121002..c11314bb8 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -1576,7 +1576,7 @@ bool LockProcess::forwardVkbdEvent( XEvent* event )
for( TQValueList< VkbdWindow >::ConstIterator it = mVkbdWindows.begin();
it != mVkbdWindows.end();
++it ) {
- if( TQT_TQRECT_OBJECT((*it).rect).tqcontains( pos )) {
+ if( TQT_TQRECT_OBJECT((*it).rect).contains( pos )) {
// Find the subwindow where the event should actually go.
// Not exactly cheap in the number of X roundtrips but oh well.
Window window = (*it).id;
diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
index 3f6bdb330..6e032bebb 100644
--- a/kdesktop/lock/main.cc
+++ b/kdesktop/lock/main.cc
@@ -96,7 +96,7 @@ int main( int argc, char **argv )
kdDebug() << "screen " << number_of_screens << " " << kdesktop_screen_number << " " << display_name << " " << starting_screen << endl;
dpy = 0;
- if ((pos = display_name.tqfindRev('.')) != -1)
+ if ((pos = display_name.findRev('.')) != -1)
display_name.remove(pos, 10);
TQCString env;
diff --git a/kdesktop/main.cc b/kdesktop/main.cc
index d9eaa5f91..695392165 100644
--- a/kdesktop/main.cc
+++ b/kdesktop/main.cc
@@ -129,7 +129,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
XCloseDisplay(dpy);
dpy = 0;
- if ((pos = display_name.tqfindRev('.')) != -1)
+ if ((pos = display_name.findRev('.')) != -1)
display_name.remove(pos, 10);
TQCString env;
diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp
index 306a4d736..69fef8e8f 100644
--- a/kdesktop/minicli.cpp
+++ b/kdesktop/minicli.cpp
@@ -173,7 +173,7 @@ void Minicli::setCommand(const TQString& command)
{
m_dlg->cbCommand->lineEdit()->setText(command);
m_dlg->cbCommand->lineEdit()->deselect();
- int firstSpace = command.tqfind(' ');
+ int firstSpace = command.find(' ');
if (firstSpace > 0) {
m_dlg->cbCommand->lineEdit()->setSelection(firstSpace+1, command.length());
}
@@ -389,7 +389,7 @@ TQString Minicli::terminalCommand (const TQString& cmd, const TQString& args)
else
terminal += TQString(" -e /bin/sh -c \"%1 %2\"").arg(cmd).arg(args);
- if (!m_terminalAppList.tqcontains(cmd))
+ if (!m_terminalAppList.contains(cmd))
m_terminalAppList << cmd;
return terminal;
@@ -674,7 +674,7 @@ void Minicli::slotCmdChanged(const TQString& text)
// Also use autocompletion if it appears that I am using some kind of ioslave, except the http:// ioslave
m_urlCompletionStarted = true; // flag for slotMatch()
- if ((text.startsWith( "/" ) || text.startsWith( "~" ) || (text.tqcontains("://", false) != 0)) && (text.tqcontains("http://", false) == 0)) {
+ if ((text.startsWith( "/" ) || text.startsWith( "~" ) || (text.contains("://", false) != 0)) && (text.contains("http://", false) == 0)) {
TQString completion = m_pURLCompletion->makeCompletion( text );
}
}
@@ -763,7 +763,7 @@ void Minicli::parseLine( bool final )
KURIFilter::self()->filterURI( *(m_filterData), m_middleFilters );
bool isTerminalApp = ((m_filterData->uriType() == KURIFilterData::EXECUTABLE) &&
- m_terminalAppList.tqcontains(m_filterData->uri().url()));
+ m_terminalAppList.contains(m_filterData->uri().url()));
if( !isTerminalApp )
{
diff --git a/kdesktop/pixmapserver.cc b/kdesktop/pixmapserver.cc
index 17c1ee04e..bc869d341 100644
--- a/kdesktop/pixmapserver.cc
+++ b/kdesktop/pixmapserver.cc
@@ -58,7 +58,7 @@ KPixmapServer::~KPixmapServer()
void KPixmapServer::add(TQString name, TQPixmap *pm, bool overwrite)
{
- if (m_Names.tqcontains(name))
+ if (m_Names.contains(name))
{
if (overwrite)
remove(name);
@@ -77,7 +77,7 @@ void KPixmapServer::add(TQString name, TQPixmap *pm, bool overwrite)
si.handle = pm->handle();
m_Selections[sel] = si;
- DataIterator it = m_Data.tqfind(pm->handle());
+ DataIterator it = m_Data.find(pm->handle());
if (it == m_Data.end())
{
KPixmapData data;
@@ -95,20 +95,20 @@ void KPixmapServer::add(TQString name, TQPixmap *pm, bool overwrite)
void KPixmapServer::remove(TQString name)
{
// Remove the name
- NameIterator it = m_Names.tqfind(name);
+ NameIterator it = m_Names.find(name);
if (it == m_Names.end())
return;
KPixmapInode pi = it.data();
m_Names.remove(it);
// Remove and disown the selection
- SelectionIterator it2 = m_Selections.tqfind(pi.selection);
+ SelectionIterator it2 = m_Selections.find(pi.selection);
assert(it2 != m_Selections.end());
m_Selections.remove(it2);
XSetSelectionOwner(qt_xdisplay(), pi.selection, None, CurrentTime);
// Decrease refcount on data
- DataIterator it3 = m_Data.tqfind(pi.handle);
+ DataIterator it3 = m_Data.find(pi.handle);
assert(it3 != m_Data.end());
it3.data().refcount--;
if (!it3.data().refcount && !it3.data().usecount)
@@ -131,7 +131,7 @@ TQStringList KPixmapServer::list()
void KPixmapServer::setOwner(TQString name)
{
- NameIterator it = m_Names.tqfind(name);
+ NameIterator it = m_Names.find(name);
if (it == m_Names.end())
return;
@@ -160,7 +160,7 @@ bool KPixmapServer::x11Event(XEvent *event)
// Check if we know about this selection
Atom sel = ev->selection;
- SelectionIterator it = m_Selections.tqfind(sel);
+ SelectionIterator it = m_Selections.find(sel);
if (it == m_Selections.end())
return false;
KSelectionInode si = it.data();
@@ -174,7 +174,7 @@ bool KPixmapServer::x11Event(XEvent *event)
}
// Check if there is no transaction in progress to the same property
- if (m_Active.tqcontains(ev->property))
+ if (m_Active.contains(ev->property))
{
kdDebug(1204) << ID << "selection is busy.\n";
XSendEvent(qt_xdisplay(), ev->requestor, false, 0, &reply);
@@ -182,7 +182,7 @@ bool KPixmapServer::x11Event(XEvent *event)
}
// Check if the selection was not deleted
- DataIterator it2 = m_Data.tqfind(si.handle);
+ DataIterator it2 = m_Data.find(si.handle);
if (it2 == m_Data.end())
{
kdDebug(1204) << ID << "selection has been deleted.\n";
@@ -216,13 +216,13 @@ bool KPixmapServer::x11Event(XEvent *event)
{
XPropertyEvent *ev = &event->xproperty;
- AtomIterator it = m_Active.tqfind(ev->atom);
+ AtomIterator it = m_Active.find(ev->atom);
if (it == m_Active.end())
return false;
HANDLE handle = it.data();
m_Active.remove(it);
- DataIterator it2 = m_Data.tqfind(handle);
+ DataIterator it2 = m_Data.find(handle);
assert(it2 != m_Data.end());
it2.data().usecount--;
if (!it2.data().usecount && !it2.data().refcount)
@@ -239,7 +239,7 @@ bool KPixmapServer::x11Event(XEvent *event)
{
XSelectionClearEvent *ev = &event->xselectionclear;
- SelectionIterator it = m_Selections.tqfind(ev->selection);
+ SelectionIterator it = m_Selections.find(ev->selection);
if (it == m_Selections.end())
return false;