From b87fcaba5364f33191401b8554fb98a2880807a8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 30 Sep 2014 10:16:08 -0500 Subject: [PATCH] Fix FTFBS due to commit 54e82466 This resolves Bug 2134 --- styles/dotnet/dotnet.cpp | 2 +- styles/phase/phasestyle.cpp | 2 +- twin-styles/riscos/Manager.cpp | 19 ------------------- .../smooth-blend/client/smoothblend.cc | 16 ---------------- 4 files changed, 2 insertions(+), 37 deletions(-) diff --git a/styles/dotnet/dotnet.cpp b/styles/dotnet/dotnet.cpp index 3c4aa487..00add309 100644 --- a/styles/dotnet/dotnet.cpp +++ b/styles/dotnet/dotnet.cpp @@ -70,7 +70,7 @@ class dotNETstylePlugin : public TQStylePlugin } }; -TDE_Q_EXPORT_PLUGIN( dotNETstylePlugin ) +KDE_Q_EXPORT_PLUGIN( dotNETstylePlugin ) // --------------------------------------------------- diff --git a/styles/phase/phasestyle.cpp b/styles/phase/phasestyle.cpp index 952ade00..782116a6 100644 --- a/styles/phase/phasestyle.cpp +++ b/styles/phase/phasestyle.cpp @@ -2485,6 +2485,6 @@ TQStyle* PhaseStylePlugin::create(const TQString& key) 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 635d0f28..770d5092 100644 --- a/twin-styles/riscos/Manager.cpp +++ b/twin-styles/riscos/Manager.cpp @@ -390,26 +390,7 @@ void Manager::slotLower() 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 dda1f1b0..2f342b06 100644 --- a/twin-styles/smooth-blend/client/smoothblend.cc +++ b/twin-styles/smooth-blend/client/smoothblend.cc @@ -1303,23 +1303,7 @@ void smoothblendClient::showEvent(TQShowEvent *) { 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 - } }