From 674496c9e32c32f5530fa79251946dedeb32457d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 3 Feb 2013 23:00:39 -0600 Subject: [PATCH] Rename KStyle to TDEStyle to avoid conflicts with KDE4 --- kalyptus/kalyptusDataDict.pm | 2 +- kdejava/koala/org/kde/koala/KArrowButton.java | 2 +- kdejava/koala/org/kde/koala/KDE.java | 40 +++++++++---------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/kalyptus/kalyptusDataDict.pm b/kalyptus/kalyptusDataDict.pm index a38114b2..0710eca9 100644 --- a/kalyptus/kalyptusDataDict.pm +++ b/kalyptus/kalyptusDataDict.pm @@ -1163,7 +1163,7 @@ BEGIN 'KStdAction*' => 'kde_KStdAction*', 'KStdGuiItem*' => 'kde_KStdGuiItem*', 'KStringHandler*' => 'kde_KStringHandler*', -'KStyle*' => 'kde_KStyle*' , +'TDEStyle*' => 'kde_TDEStyle*' , 'KSycoca*' => 'kde_KSycoca*' , 'KSycocaEntry*' => 'kde_KSycocaEntry*' , 'KSycocaFactoryId' => 'int' , diff --git a/kdejava/koala/org/kde/koala/KArrowButton.java b/kdejava/koala/org/kde/koala/KArrowButton.java index bcec2fee..81e593ef 100644 --- a/kdejava/koala/org/kde/koala/KArrowButton.java +++ b/kdejava/koala/org/kde/koala/KArrowButton.java @@ -14,7 +14,7 @@ import org.kde.qt.TQPushButton; Draws a button which shows an arrow pointing into a certain direction. The arrow's alignment on the button depends on the direction it's pointing to, e.g. a left arrow is aligned at the left border, a upwards arrow at the top - border. This class honors the currently configured KStyle when drawing + border. This class honors the currently configured TDEStyle when drawing the arrow. @author Frerich Raabe diff --git a/kdejava/koala/org/kde/koala/KDE.java b/kdejava/koala/org/kde/koala/KDE.java index d1b1d1f9..825b65e3 100644 --- a/kdejava/koala/org/kde/koala/KDE.java +++ b/kdejava/koala/org/kde/koala/KDE.java @@ -375,7 +375,7 @@ public class KDE { public static native TQDataStream op_write(TQDataStream s, int p); public static native TQDataStream op_read(TQDataStream s, int p); /** - {@link KStyle} + {@link TDEStyle} #include <kdrawutil.h> Draws a Next-style button (solid black shadow with light and midlight highlight). @param p The painter to use for drawing the button. @@ -384,21 +384,21 @@ public class KDE { @param sunken Whether to draw the button as sunken (pressed) or not. @param fill The brush to use for filling the interior of the button. Pass null to prevent the button from being filled. - @short {@link KStyle} @c \#include @c #include <kdrawutil.h> Draws a Be-style button. @param p The painter to use for drawing the button. @@ -407,22 +407,22 @@ public class KDE { @param sunken Whether to draw the button as sunken (pressed) or not. @param fill The brush to use for filling the interior of the button. Pass null to prevent the button from being filled. - @short {@link KStyle} @c \#include @c #include <kdrawutil.h> @overload - @short {@link KStyle} @c \#include @c #include <kdrawutil.h> Draws a rounded oval button. This function doesn't fill the button. See kRoundMaskRegion() for setting masks for fills. @@ -430,19 +430,19 @@ public class KDE { @param r Specifies the rect in which to draw the button. @param g Specifies the shading colors. @param sunken Whether to draw the button as sunken (pressed) or not. - @short {@link KStyle} @c \#include @c #include <kdrawutil.h> Sets a region to the pixels covered by a round button of the given size. You can use this to set clipping regions. @@ -451,13 +451,13 @@ public class KDE { @param y The Y coordinate of the button. @param w The width of the button. @param h The height of the button. - @short {@link KStyle} @c \#include @c #include <kdrawutil.h> Paints the pixels covered by a round button of the given size with Qt.color1. This function is useful in TQStyle.drawControlMask(). @@ -468,12 +468,12 @@ public class KDE { @param h The height of the button. @param clear Whether to clear the rectangle specified by (x, y, w, h) to Qt.color0 before drawing the mask. - @short {@link KStyle} @c \#include @c #include <kdrawutil.h> Paints the provided bitmaps in the painter, using the supplied colorgroup for the foreground colors. There's one bitmap for each color. If you want to skip @@ -490,7 +490,7 @@ public class KDE { @param darkColor The bitmap to use for the dark part. @param blackColor The bitmap to use for the black part. @param whiteColor The bitmap to use for the white part. - @short {@link KStyle} @c \#include @c #include <kdrawutil.h> @overload - @short {@link KStyle} @c \#include @c