diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-03 20:16:47 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-03 20:16:47 +0000 |
commit | 495d08bc2db58ee7fc4ea55a7158f2f61b82fc56 (patch) | |
tree | daabcb652c07b9a17cad88ca50b63a2d91ead4a3 /kicker/applets/menu | |
parent | 50001f1757f97510e80cb1990e2f2d5b00144c2a (diff) | |
download | tdebase-495d08bc2db58ee7fc4ea55a7158f2f61b82fc56.tar.gz tdebase-495d08bc2db58ee7fc4ea55a7158f2f61b82fc56.zip |
Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1211357 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kicker/applets/menu')
-rw-r--r-- | kicker/applets/menu/menuapplet.cpp | 8 | ||||
-rw-r--r-- | kicker/applets/menu/menuapplet.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp index 472f3bd0d..662859bd5 100644 --- a/kicker/applets/menu/menuapplet.cpp +++ b/kicker/applets/menu/menuapplet.cpp @@ -48,7 +48,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. This is because TQMenuBar tries really hard to keep its preffered size, se even if the X window for the menubar has the size enforced by this applet, Qt thinks it has the size Qt wants. This results in parts - of the menubar not being repainted. Also, old KMenuBar always forced + of the menubar not being tqrepainted. Also, old KMenuBar always forced with to be the width of the screen, so even if the menubar has only few entries, this applet will still indicate the menubar doesn't fit completely in it. There's no way to fix this, besides upgrading @@ -266,7 +266,7 @@ void Applet::positionChange( Position ) // Kicker's frame). void Applet::updateTopEdgeOffset() { - TQPoint p = topLevelWidget()->mapToGlobal( TQPoint( 0, 0 )); + TQPoint p = tqtopLevelWidget()->mapToGlobal( TQPoint( 0, 0 )); if( p.y() <= 2 ) // 2 = work also when running in appletproxy topEdgeOffset = mapToGlobal( TQPoint( 0, 0 )).y() - p.y(); else @@ -489,12 +489,12 @@ void MenuEmbed::setMinimumSize( int w, int h ) void MenuEmbed::setBackground() { - const TQPixmap *pbg = parentWidget()->backgroundPixmap(); + const TQPixmap *pbg = tqparentWidget()->backgroundPixmap(); if (pbg) { TQPixmap bg(width(), height()); - bg.fill(parentWidget(), pos()); + bg.fill(tqparentWidget(), pos()); setPaletteBackgroundPixmap(bg); setBackgroundOrigin(WidgetOrigin); } diff --git a/kicker/applets/menu/menuapplet.h b/kicker/applets/menu/menuapplet.h index 5ba54cd66..6f67cbed4 100644 --- a/kicker/applets/menu/menuapplet.h +++ b/kicker/applets/menu/menuapplet.h @@ -51,11 +51,11 @@ class MenuEmbed; * * @description All status change, such as when an window is activated, * a new window popped up, etc, is received via @ref KWin::WindowInfo and @ref - * NETWinInfo. Status changes for X selections are done via KSelectionWatcher. + * NETWinInfo. tqStatus changes for X selections are done via KSelectionWatcher. * * How it works in broad terms: KickerMenuApplet gets notified as soon a window * changes(a new pops up etc.) and accordingly updates the list @ref menus, - * which contains all known menus. When a new window gains focus, it looks up the + * which tqcontains all known menus. When a new window gains focus, it looks up the * correct MenuEmbed in @ref menus, and then switches to that one. * * The documentation is a bit rusty -- read it with a critical eye. |