various ebn fixes (markup, uninling, QString())

svn path=/trunk/KDE/kdebase/workspace/; revision=692765

killer/killer.cpp

@@ -64,9 +64,9 @@ int main( int argc, char* argv[] )
 	return 1;
         }
     QString question = i18n(
-	"<qt>Window with title \"<b>%2</b>\" is not responding. "
-	"This window belongs to application <b>%1</b> (PID=%3, hostname=%4).<p>"
-	"Do you wish to terminate this application? (All unsaved data in this application will be lost.)</qt>" ,
+	"<p>Window with title \"<b>%2</b>\" is not responding. "
+	"This window belongs to application <b>%1</b> (PID=%3, hostname=%4).</p>"
+	"<p>Do you wish to terminate this application? (All unsaved data in this application will be lost.)</p>" ,
 	  appname, caption, pid, QString( hostname ) );
     app.updateUserTimestamp( timestamp );
     if( KMessageBox::warningYesNoWId( id, question, QString(), KGuiItem(i18n("Terminate")), KGuiItem(i18n("Keep Running")) ) == KMessageBox::Yes )

lib/kdecoration.cpp

@@ -297,6 +297,16 @@ void KDecoration::setKeepBelow( bool set )
     bridge_->setKeepBelow( set );
     }
 
+void KDecoration::emitKeepAboveChanged( bool above )
+    {
+    keepAboveChanged( above );
+    }
+
+void KDecoration::emitKeepBelowChanged( bool below )
+    {
+    keepBelowChanged( below );
+    }
+
 bool KDecoration::drawbound( const QRect&, bool )
     {
     return false;

lib/kdecoration.h

@@ -795,11 +795,11 @@ class KWIN_EXPORT KDecoration
         /**
          * @internal
          */
-        void emitKeepAboveChanged( bool above ) { keepAboveChanged( above ); }
+        void emitKeepAboveChanged( bool above );
         /**
          * @internal
          */
-        void emitKeepBelowChanged( bool below ) { keepBelowChanged( below ); }
+        void emitKeepBelowChanged( bool below );
     private:
 	KDecorationBridge* bridge_;
 	QWidget* w_;

lib/kdecoration_plugins_p.cpp

@@ -65,6 +65,11 @@ KDecorationPlugins::~KDecorationPlugins()
         }
     }
 
+QString KDecorationPlugins::currentPlugin()
+    {
+    return pluginStr;
+    }
+
 bool KDecorationPlugins::reset( unsigned long changed )
     {
     QString oldPlugin = pluginStr;

lib/kdecoration_plugins_p.h

@@ -51,7 +51,7 @@ class KWIN_EXPORT KDecorationPlugins
         void destroyPreviousPlugin();
         KDecorationFactory* factory();
         KDecoration* createDecoration( KDecorationBridge* );
-        QString currentPlugin() { return pluginStr; }
+        QString currentPlugin();
         bool reset( unsigned long changed ); // returns true if decorations need to be recreated
     protected:
         virtual void error( const QString& error_msg );

lib/kwineffects.cpp

@@ -255,6 +255,11 @@ Window EffectsHandler::createFullScreenInputWindow( Effect* e, const QCursor& cu
     return createInputWindow( e, 0, 0, displayWidth(), displayHeight(), cursor );
     }
 
+CompositingType EffectsHandler::compositingType() const
+    {
+    return compositing_type;
+    }
+
 void EffectsHandler::sendReloadMessage( const QString& effectname )
     {
     QDBusMessage message = QDBusMessage::createMethodCall("org.kde.kwin", "/KWin", "org.kde.KWin", "reloadEffect");

lib/kwineffects.h

@@ -230,7 +230,7 @@ class KWIN_EXPORT EffectsHandler
         virtual void addRepaint( const QRect& r ) = 0;
         virtual void addRepaint( int x, int y, int w, int h ) = 0;
 
-        CompositingType compositingType() const  { return compositing_type; }
+        CompositingType compositingType() const;
         virtual unsigned long xrenderBufferPicture() = 0;
         virtual void reconfigure() = 0;