diff options
| m--------- | admin | 0 | ||||
| -rw-r--r-- | konq-plugins/domtreeviewer/domtreewindow.cpp | 5 | ||||
| -rw-r--r-- | konq-plugins/kimgalleryplugin/imgalleryplugin.cpp | 1 | ||||
| -rw-r--r-- | konq-plugins/rellinks/plugin_rellinks.cpp | 8 | ||||
| -rw-r--r-- | noatun-plugins/noatunmadness/madness.h | 2 |
5 files changed, 4 insertions, 12 deletions
diff --git a/admin b/admin -Subproject 60f84493601273e216a013532248513e733f72c +Subproject 95578bc83bad7ea609c9c3fbfbfba54864c7abe diff --git a/konq-plugins/domtreeviewer/domtreewindow.cpp b/konq-plugins/domtreeviewer/domtreewindow.cpp index e943385..a783308 100644 --- a/konq-plugins/domtreeviewer/domtreewindow.cpp +++ b/konq-plugins/domtreeviewer/domtreewindow.cpp @@ -28,7 +28,6 @@ #include <tdeapplication.h> #include <kcommand.h> #include <tdeconfig.h> -#include <tdeversion.h> #include <tdeglobal.h> #include <tdehtml_part.h> #include <kiconloader.h> @@ -197,11 +196,7 @@ void DOMTreeWindow::saveProperties(TDEConfig *config) #if 0 if (!m_view->currentURL().isNull()) { -#if KDE_IS_VERSION(3,1,3) config->writePathEntry("lastURL", m_view->currentURL()); -#else - config->writeEntry("lastURL", m_view->currentURL()); -#endif } #endif } diff --git a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp index 61a3a4e..270eba0 100644 --- a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp +++ b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp @@ -32,6 +32,7 @@ Boston, MA 02110-1301, USA. #include <tdeaction.h> #include <tdeglobal.h> #include <tdelocale.h> +#include <tdeversion.h> #include <kcharsets.h> #include <tdemessagebox.h> #include <kurl.h> diff --git a/konq-plugins/rellinks/plugin_rellinks.cpp b/konq-plugins/rellinks/plugin_rellinks.cpp index 894eb2a..20f2f00 100644 --- a/konq-plugins/rellinks/plugin_rellinks.cpp +++ b/konq-plugins/rellinks/plugin_rellinks.cpp @@ -38,6 +38,7 @@ #include <tdehtml_part.h> #include <tdehtmlview.h> #include <kiconloader.h> +#include <tdeaboutdata.h> #include <tdeinstance.h> #include <tdelocale.h> #include <tdepopupmenu.h> @@ -51,14 +52,9 @@ /** Rellinks factory */ typedef KGenericFactory<RelLinksPlugin> RelLinksFactory; -#include <tdeversion.h> -#if KDE_IS_VERSION(3,2,90) -#include <tdeaboutdata.h> + static const TDEAboutData aboutdata("rellinks", I18N_NOOP("Rellinks") , "1.0" ); K_EXPORT_COMPONENT_FACTORY( librellinksplugin, RelLinksFactory(&aboutdata) ) -#else -K_EXPORT_COMPONENT_FACTORY( librellinksplugin, RelLinksFactory("rellinks") ) -#endif /** Constructor of the plugin. */ RelLinksPlugin::RelLinksPlugin(TQObject *parent, const char *name, const TQStringList &) diff --git a/noatun-plugins/noatunmadness/madness.h b/noatun-plugins/noatunmadness/madness.h index 15e6b73..ed23436 100644 --- a/noatun-plugins/noatunmadness/madness.h +++ b/noatun-plugins/noatunmadness/madness.h @@ -24,7 +24,7 @@ protected: virtual void scopeEvent(float *data, int bands); private: - KWinModule mWm; + TWinModule mWm; TQValueList<WId> mWindowList; TQRect mWorkArea; TQMap<WId, TQPoint> mOriginalPositions; |