summaryrefslogtreecommitdiffstats
path: root/kstyles/keramik/keramik.h
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-11-04 01:47:26 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2012-11-04 01:47:26 -0500
commit9f835b0b506b54e14e2e45301f2d3fc84dc51432 (patch)
tree99d8d815e965b677b39720bc13ba133f11246979 /kstyles/keramik/keramik.h
parente256298e9d1d5f3f7fb5660f0ca33ea8489acd08 (diff)
parent6e12d65ff7d934b0e3b3ab5caf0ff1a67c3ea536 (diff)
downloadtdelibs-9f835b0b506b54e14e2e45301f2d3fc84dc51432.tar.gz
tdelibs-9f835b0b506b54e14e2e45301f2d3fc84dc51432.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'kstyles/keramik/keramik.h')
-rw-r--r--kstyles/keramik/keramik.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/kstyles/keramik/keramik.h b/kstyles/keramik/keramik.h
index c9ec49639..53c06a3b4 100644
--- a/kstyles/keramik/keramik.h
+++ b/kstyles/keramik/keramik.h
@@ -146,8 +146,8 @@ private slots:
private:
- bool isSizeConstrainedCombo(const TQComboBox* combo) const;
- bool isFormWidget (const TQWidget* widget) const;
+ bool isSizeConstrainedCombo(const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQComboBox* widget) const;
+ bool isFormWidget (const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget* widget) const;
///Configuration settings
bool animateProgressBar;