Branch: master

b87fcaba 2014-09-30 10:16:08 Timothy Pearson
Fix FTFBS due to commit 54e82466
This resolves Bug 2134
M styles/dotnet/dotnet.cpp
M styles/phase/phasestyle.cpp
M twin-styles/riscos/Manager.cpp
M twin-styles/smooth-blend/client/smoothblend.cc
diff --git a/styles/dotnet/dotnet.cpp b/styles/dotnet/dotnet.cpp
index 3c4aa48..00add30 100644
--- a/styles/dotnet/dotnet.cpp
+++ b/styles/dotnet/dotnet.cpp
@@ -70,7 +70,7 @@
 		}
 };
 
-TDE_Q_EXPORT_PLUGIN( dotNETstylePlugin )
+KDE_Q_EXPORT_PLUGIN( dotNETstylePlugin )
 
 // ---------------------------------------------------
 
diff --git a/styles/phase/phasestyle.cpp b/styles/phase/phasestyle.cpp
index 952ade0..782116a 100644
--- a/styles/phase/phasestyle.cpp
+++ b/styles/phase/phasestyle.cpp
@@ -2485,6 +2485,6 @@
     return 0;
 }
 
-TDE_Q_EXPORT_PLUGIN(PhaseStylePlugin)
+KDE_Q_EXPORT_PLUGIN(PhaseStylePlugin)
 
 #include "phasestyle.moc"
diff --git a/twin-styles/riscos/Manager.cpp b/twin-styles/riscos/Manager.cpp
index 635d0f2..770d509 100644
--- a/twin-styles/riscos/Manager.cpp
+++ b/twin-styles/riscos/Manager.cpp
@@ -390,26 +390,7 @@
 
 void Manager::slotMaximizeClicked(ButtonState state)
 {
-#if TDE_IS_VERSION(3, 3, 0)
    maximize(state);
-#else
-   switch (state)
-   {
-      case RightButton:
-         maximize(maximizeMode() ^ MaximizeHorizontal);
-         break;
-
-      case MidButton:
-         maximize(maximizeMode() ^ MaximizeVertical);
-         break;
-
-      case LeftButton:
-      default:
-         maximize(maximizeMode() == MaximizeFull ? MaximizeRestore
-                                                 : MaximizeFull);
-         break;
-   }
-#endif
    emit(maximizeChanged(maximizeMode() == MaximizeFull));
 }
 
diff --git a/twin-styles/smooth-blend/client/smoothblend.cc b/twin-styles/smooth-blend/client/smoothblend.cc
index dda1f1b..2f342b0 100644
--- a/twin-styles/smooth-blend/client/smoothblend.cc
+++ b/twin-styles/smooth-blend/client/smoothblend.cc
@@ -1303,23 +1303,7 @@
 
 void smoothblendClient::maxButtonPressed() {
     if (button[ButtonMax]) {
-#if TDE_IS_VERSION(3, 3, 0)
         maximize(button[ButtonMax]->lastMousePress());
-#else
-
-        switch (button[ButtonMax]->lastMousePress()) {
-        case MidButton:
-            maximize(maximizeMode() ^ MaximizeVertical);
-            break;
-        case RightButton:
-            maximize(maximizeMode() ^ MaximizeHorizontal);
-            break;
-        default:
-            (maximizeMode() == MaximizeFull) ? maximize(MaximizeRestore)
-            : maximize(MaximizeFull);
-        }
-#endif
-
     }
 }