diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 04:10:07 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 04:10:07 +0000 |
| commit | fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf (patch) | |
| tree | 9eda848e56fcb862fdfdf479adeccd95b6fe387a /kdesktop/desktop.cc | |
| parent | 02f67d0e1355b79b1806746efb0f2f640e57f13d (diff) | |
| download | tdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.tar.gz tdebase-fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf.zip | |
Revert automated changes
Sorry guys, they are just not ready for prime time
Work will continue as always
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdesktop/desktop.cc')
| -rw-r--r-- | kdesktop/desktop.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc index 2a35eacd0..f923d953d 100644 --- a/kdesktop/desktop.cc +++ b/kdesktop/desktop.cc @@ -159,7 +159,7 @@ KDesktop::KDesktop( bool x_root_hack, bool wait_for_kded ) : kapp->dcopClient()->connectDCOPSignal(kicker_name, kicker_name, "desktopIconsAreaChanged(TQRect, int)", "KDesktopIface", "desktopIconsAreaChanged(TQRect, int)", false); - // Dont tqrepaint on configuration changes during construction + // Dont repaint on configuration changes during construction m_bInit = true; // It's the child widget that gets the focus, not us @@ -179,7 +179,7 @@ KDesktop::KDesktop( bool x_root_hack, bool wait_for_kded ) : } - setGeometry( TQApplication::desktop()->tqgeometry() ); + setGeometry( TQApplication::desktop()->geometry() ); lower(); connect( kapp, TQT_SIGNAL( shutDown() ), @@ -230,7 +230,7 @@ KDesktop::initRoot() TQToolTip::add( &w, "foo" ); } // NOTE: If mouse clicks stop working again, it's most probably something doing XSelectInput() - // on the root window after this, and setting it to some fixed value instead of adding its tqmask. + // on the root window after this, and setting it to some fixed value instead of adding its mask. XWindowAttributes attrs; XGetWindowAttributes(dpy, root, &attrs); XSelectInput(dpy, root, attrs.your_event_mask | ButtonPressMask); @@ -279,7 +279,7 @@ KDesktop::initRoot() m_pIconView->viewport()->setBackgroundMode( X11ParentRelative ); m_pIconView->setFocusPolicy( StrongFocus ); m_pIconView->viewport()->setFocusPolicy( StrongFocus ); - m_pIconView->setGeometry( tqgeometry() ); + m_pIconView->setGeometry( geometry() ); m_pIconView->show(); // Geert Jansen: backgroundmanager belongs here @@ -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::null))) { m_pIconView->slotAboutToCreate( TQPoint( x, y ), files ); + if (!TQFile::exists(i.uDest.prettyURL().replace("file://",TQString::null))) { m_pIconView->slotAboutToCreate( TQPoint( x, y ), files ); KIO::copy( i.uSource, i.uDest, false ); } // m_pIconView->addFuturePosition(filename, x, y); |