Use a QLinkedList instead of Q3PtrList

[dolphin.git] / src / urlbutton.cpp

diff --git a/src/urlbutton.cpp b/src/urlbutton.cpp
index d441ab1845e9ba0145b18c225ff96ea110d96a6d..f2bf8ccdac643b43c0d1b8cd2ec12044b1dbe852 100644 (file)
--- a/src/urlbutton.cpp
+++ b/src/urlbutton.cpp
@@ -25,16 +25,14 @@
 #include <qfontmetrics.h>
 //Added by qt3to4:
 #include <QEvent>
-#include <kurldrag.h>
-#include <kpopupmenu.h>
 #include <kiconloader.h>
 #include <klocale.h>
 
 #include "urlnavigator.h"
-#include "dolphin.h"
+#include "dolphinmainwindow.h"
 
 
-URLButton::URLButton(URLNavigator* parent)
+UrlButton::UrlButton(UrlNavigator* parent)
 : QPushButton(parent),
   m_displayHint(0),
   m_urlNavigator(parent)
@@ -44,20 +42,20 @@ URLButton::URLButton(URLNavigator* parent)
     setMinimumHeight(parent->minimumHeight());
 
     connect(this, SIGNAL(clicked()), parent, SLOT(slotRequestActivation()));
-    connect(&Dolphin::mainWin(), SIGNAL(activeViewChanged()),
+    connect(parent->dolphinView()->mainWindow(), SIGNAL(activeViewChanged()),
             this, SLOT(update()));
 }
 
-URLButton::~URLButton()
+UrlButton::~UrlButton()
 {
 }
 
-URLNavigator* URLButton::urlNavigator() const
+UrlNavigator* UrlButton::urlNavigator() const
 {
     return m_urlNavigator;
 }
 
-void URLButton::setDisplayHintEnabled(DisplayHint hint,
+void UrlButton::setDisplayHintEnabled(DisplayHint hint,
                                       bool enable)
 {
     if (enable) {
@@ -69,30 +67,32 @@ void URLButton::setDisplayHintEnabled(DisplayHint hint,
     update();
 }
 
-bool URLButton::isDisplayHintEnabled(DisplayHint hint) const
+bool UrlButton::isDisplayHintEnabled(DisplayHint hint) const
 {
     return (m_displayHint & hint) > 0;
 }
 
-void URLButton::enterEvent(QEvent* event)
+void UrlButton::enterEvent(QEvent* event)
 {
     QPushButton::enterEvent(event);
     setDisplayHintEnabled(EnteredHint, true);
     update();
 }
 
-void URLButton::leaveEvent(QEvent* event)
+void UrlButton::leaveEvent(QEvent* event)
 {
     QPushButton::leaveEvent(event);
     setDisplayHintEnabled(EnteredHint, false);
     update();
 }
 
-QColor URLButton::mixColors(const QColor& c1,
+QColor UrlButton::mixColors(const QColor& c1,
                             const QColor& c2) const
 {
-    const int Qt::red   = (c1.Qt::red()   + c2.Qt::red())   / 2;
-    const int Qt::green = (c1.Qt::green() + c2.Qt::green()) / 2;
-    const int Qt::blue  = (c1.Qt::blue()  + c2.Qt::blue())  / 2;
-    return QColor(Qt::red, Qt::green, Qt::blue);
+    const int red   = (c1.red()   + c2.red())   / 2;
+    const int green = (c1.green() + c2.green()) / 2;
+    const int blue  = (c1.blue()  + c2.blue())  / 2;
+    return QColor(red, green, blue);
 }
+
+#include "urlbutton.moc"