[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.4/kdebase/konqueror
From:       Stephan Binner <binner () kde ! org>
Date:       2005-07-04 9:58:37
Message-ID: 1120471117.550083.30599.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 431434 by binner:

Fix "Go" toolbar position (#89708) by removing AlignItemRight hack, the 
reason for the hack given in commit 94287 doesn't seem to apply anymore


 M  +0 -21     konq_actions.cc  
 M  +0 -10     konq_actions.h  
 M  +1 -1      konq_mainwindow.cc  


--- branches/KDE/3.4/kdebase/konqueror/konq_actions.cc #431433:431434
@@ -502,25 +502,4 @@
 	return 0;
 }
 
-KonqGoURLAction::KonqGoURLAction( const QString &text, const QString &pix,
-                                  int accel, const QObject *receiver,
-                                  const char *slot, QObject *parent,
-                                  const char *name )
-    : KAction( text, pix, accel, receiver, slot, parent, name )
-{
-}
-
-int KonqGoURLAction::plug( QWidget *widget, int index )
-{
-    int container = KAction::plug( widget, index );
-
-    if ( widget->inherits( "KToolBar" ) && container != -1 )
-    {
-        int toolButtonId = itemId( container );
-        static_cast<KToolBar *>( widget )->alignItemRight( toolButtonId, true );
-    }
-
-    return container;
-}
-
 #include "konq_actions.moc"
--- branches/KDE/3.4/kdebase/konqueror/konq_actions.h #431433:431434
@@ -155,14 +155,4 @@
     KURL::List m_popupList;
 };
 
-class KonqGoURLAction : public KAction
-{
-public:
-    KonqGoURLAction( const QString &text, const QString &pix, int accel,
-                     const QObject *receiver, const char *slot,
-                     QObject *parent, const char *name );
-
-    virtual int plug( QWidget *widget, int index = -1 );
-};
-
 #endif
--- branches/KDE/3.4/kdebase/konqueror/konq_mainwindow.cc #431433:431434
@@ -3850,7 +3850,7 @@
 
   (void) new KAction( i18n( "Kon&queror Introduction" ), 0, this, SLOT( slotIntro() \
), actionCollection(), "konqintro" );  
-  KAction *goUrl = new KonqGoURLAction( i18n( "Go" ), "key_enter", 0, this, SLOT( \
goURL() ), actionCollection(), "go_url" ); +  KAction *goUrl = new KAction( i18n( \
"Go" ), "key_enter", 0, this, SLOT( goURL() ), actionCollection(), "go_url" );  \
                goUrl->setWhatsThis( i18n( "Go<p>"
 			     "Goes to the page that has been entered into the location bar." ) );
 


[prev in list] [next in list] [prev in thread] [next in thread]