summaryrefslogtreecommitdiffstats
path: root/examples/gestures
diff options
context:
space:
mode:
authorDenis Dzyubenko <denis.dzyubenko@nokia.com>2009-10-22 18:15:36 (GMT)
committerDenis Dzyubenko <denis.dzyubenko@nokia.com>2009-10-22 18:20:52 (GMT)
commit7856c0397a42d26fa4fdd3ead3df7886b408b8ed (patch)
treea382c40e86b27d66ec152de2591f943be34592a7 /examples/gestures
parent30b66e1b92b54b8f035da3c66ad086340befcf5b (diff)
downloadQt-7856c0397a42d26fa4fdd3ead3df7886b408b8ed.zip
Qt-7856c0397a42d26fa4fdd3ead3df7886b408b8ed.tar.gz
Qt-7856c0397a42d26fa4fdd3ead3df7886b408b8ed.tar.bz2
Compile fix.
QPanGesture was changed to use QPointF instead of QSizeF, also need to change all usages of the pan gesture. Reviewed-by: trustme
Diffstat (limited to 'examples/gestures')
-rw-r--r--examples/gestures/imagegestures/imagewidget.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/gestures/imagegestures/imagewidget.cpp b/examples/gestures/imagegestures/imagewidget.cpp
index 95525c5..28de6da 100644
--- a/examples/gestures/imagegestures/imagewidget.cpp
+++ b/examples/gestures/imagegestures/imagewidget.cpp
@@ -128,9 +128,9 @@ void ImageWidget::panTriggered(QPanGesture *gesture)
setCursor(Qt::ArrowCursor);
}
#endif
- QSizeF lastOffset = gesture->offset();
- horizontalOffset += lastOffset.width();
- verticalOffset += lastOffset.height();
+ QPointF lastOffset = gesture->offset();
+ horizontalOffset += lastOffset.x();
+ verticalOffset += lastOffset.y();
update();
}
ify_all.__func__ else: - notify_all = threading._Condition.notifyAll + notify_all = threading._Condition.notify_all # # # Process = DummyProcess -current_process = threading.currentThread +current_process = threading.current_thread current_process()._children = weakref.WeakKeyDictionary() def active_children(): children = current_process()._children for p in list(children): - if not p.isAlive(): + if not p.is_alive(): children.pop(p, None) return list(children) diff --git a/Lib/multiprocessing/managers.py b/Lib/multiprocessing/managers.py index ecad563..2deee8c 100644 --- a/Lib/multiprocessing/managers.py +++ b/Lib/multiprocessing/managers.py @@ -169,7 +169,7 @@ class Server(object): except (OSError, IOError): continue t = threading.Thread(target=self.handle_request, args=(c,)) - t.setDaemon(True) + t.set_daemon(True) t.start() except (KeyboardInterrupt, SystemExit): pass @@ -216,7 +216,7 @@ class Server(object): Handle requests from the proxies in a particular process/thread ''' util.debug('starting server thread to service %r', - threading.currentThread().getName()) + threading.current_thread().get_name()) recv = conn.recv send = conn.send @@ -266,7 +266,7 @@ class Server(object): except EOFError: util.debug('got EOF -- exiting thread serving %r', - threading.currentThread().getName()) + threading.current_thread().get_name()) sys.exit(0) except Exception: @@ -279,7 +279,7 @@ class Server(object): send(('#UNSERIALIZABLE', repr(msg))) except Exception as e: util.info('exception in thread serving %r', - threading.currentThread().getName()) + threading.current_thread().get_name()) util.info(' ... message was %r', msg) util.info(' ... exception was %r', e) conn.close() @@ -401,7 +401,7 @@ class Server(object): ''' Spawn a new thread to serve this connection ''' - threading.currentThread().setName(name) + threading.current_thread().set_name(name) c.send(('#RETURN', None)) self.serve_client(c) @@ -715,8 +715,8 @@ class BaseProxy(object): def _connect(self): util.debug('making connection to manager') name = current_process().get_name() - if threading.currentThread().getName() != 'MainThread': - name += '|' + threading.currentThread().getName() + if threading.current_thread().get_name() != 'MainThread': + name += '|' + threading.current_thread().get_name() conn = self._Client(self._token.address, authkey=self._authkey) dispatch(conn, None, 'accept_connection',