From 8cbfe58bc7f5ad43f95d88259f6e3703325a2b0a Mon Sep 17 00:00:00 2001
From: mlaurent <mlaurent@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sat, 27 Jan 2007 13:14:44 +0000
Subject: [PATCH] pendulum compile fix

git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/KDE/kdeartwork@627625 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kscreensaver/kdesavers/CMakeLists.txt | 13 ++++++-------
 kscreensaver/kdesavers/pendulum.cpp   | 10 ++++++----
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/kscreensaver/kdesavers/CMakeLists.txt b/kscreensaver/kdesavers/CMakeLists.txt
index 72584e21..41e19f8e 100644
--- a/kscreensaver/kdesavers/CMakeLists.txt
+++ b/kscreensaver/kdesavers/CMakeLists.txt
@@ -142,13 +142,12 @@ endif(OPENGL_FOUND AND OPENGL_GLU_FOUND AND KDE4_SOUND_SUPPORT)
 ########### next target ###############
 if(OPENGL_FOUND AND OPENGL_GLU_FOUND AND QT_QTOPENGL_LIBRARY)
 
-MESSAGE(STATUS "Fix compile of kscreensaver/kdesavers/kpendulum.kss")
-#set(kpendulum.kss  pendulum.cpp sspreviewarea.cpp rkodesolver.cpp)
-#kde4_add_ui3_files(kpendulum.kss_SRCS pendulumcfg.ui)
-#kde4_automoc(${kpendulum.kss})
-#kde4_add_executable(kpendulum.kss ${kpendulum.kss_SRCS})
-#target_link_libraries(kpendulum.kss ${KDE4_KDEUI_LIBS} ${QT_QTOPENGL_LIBRARY} kscreensaver)
-#install(TARGETS kpendulum.kss DESTINATION ${BIN_INSTALL_DIR} )
+set(kpendulum.kss_SRCS  pendulum.cpp sspreviewarea.cpp rkodesolver.cpp)
+kde4_add_ui3_files(kpendulum.kss_SRCS pendulumcfg.ui)
+kde4_automoc(${kpendulum.kss_SRCS})
+kde4_add_executable(kpendulum.kss ${kpendulum.kss_SRCS})
+target_link_libraries(kpendulum.kss ${KDE4_KDEUI_LIBS} ${QT_QTOPENGL_LIBRARY} kscreensaver)
+install(TARGETS kpendulum.kss DESTINATION ${BIN_INSTALL_DIR} )
 
 set(krotation.kss_SRCS rotation.cpp sspreviewarea.cpp rkodesolver.cpp vec3.cpp )
 kde4_add_ui3_files(krotation.kss_SRCS rotationcfg.ui)
diff --git a/kscreensaver/kdesavers/pendulum.cpp b/kscreensaver/kdesavers/pendulum.cpp
index 3defeef2..c756039d 100644
--- a/kscreensaver/kdesavers/pendulum.cpp
+++ b/kscreensaver/kdesavers/pendulum.cpp
@@ -43,6 +43,7 @@
 // KDE headers
 #include <klocale.h>
 #include <kconfig.h>
+#include <kglobal.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 
@@ -712,7 +713,7 @@ KPendulumSetup::KPendulumSetup(QWidget* parent, const char* name)
    // set tool tips of editable fields
    QToolTip::add(
       mEdit,
-      k18n("Ratio of 2nd mass to sum of both masses.\nValid values from %1 to %2.")
+      ki18n("Ratio of 2nd mass to sum of both masses.\nValid values from %1 to %2.")
       .subs(KPendulumSaver::massRatioLimitLower, 0, 'f', 2)
       .subs(KPendulumSaver::massRatioLimitUpper, 0, 'f', 2)
       .toString());
@@ -865,7 +866,7 @@ void KPendulumSetup::persChangeEnteredSlot(int t)
 void KPendulumSetup::barColorButtonClickedSlot(void)
 {
    QColor color = QColorDialog::getColor(
-      saver->barColor(), this, QString("bar color dialog"));
+      saver->barColor(), this);
    if (color.isValid())
    {
       saver->setBarColor(color);
@@ -875,7 +876,7 @@ void KPendulumSetup::barColorButtonClickedSlot(void)
 void KPendulumSetup::m1ColorButtonClickedSlot(void)
 {
    QColor color = QColorDialog::getColor(
-      saver->m1Color(), this, QString("mass 1 color dialog"));
+      saver->m1Color(), this);
    if (color.isValid())
    {
       saver->setM1Color(color);
@@ -885,10 +886,11 @@ void KPendulumSetup::m1ColorButtonClickedSlot(void)
 void KPendulumSetup::m2ColorButtonClickedSlot(void)
 {
    QColor color = QColorDialog::getColor(
-      saver->m2Color(), this, QString("mass 2 color dialog"));
+      saver->m2Color(), this);
    if (color.isValid())
    {
       saver->setM2Color(color);
       m2ColorButton->setPaletteBackgroundColor(color);
    }
 }
+
-- 
2.11.4.GIT