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

List:       kde-commits
Subject:    KDE/kdebase/konqueror/keditbookmarks
From:       Daniel Teske <teske () squorn ! de>
Date:       2005-08-16 14:11:29
Message-ID: 1124201489.014005.5738.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 449711 by teske:

Fix compilation error for some gcc versions.



 M  +4 -2      bookmarkmodel.h  
 M  +17 -15    toplevel.cpp  


--- trunk/KDE/kdebase/konqueror/keditbookmarks/bookmarkmodel.h #449710:449711
@@ -35,13 +35,15 @@
 class BookmarkModel : public QAbstractItemModel
 {
     Q_OBJECT
-public:
+
+protected:
     class insertSentry;
     friend class insertSentry;
     class removeSentry;
     friend class removeSentry;
     friend class IKEBCommand;
-    
+
+public:    
     static BookmarkModel* self() { if(!s_bookmarkModel) s_bookmarkModel = new \
BookmarkModel(CurrentMgr::self()->root()); return s_bookmarkModel; }  virtual \
~BookmarkModel() {}  
--- trunk/KDE/kdebase/konqueror/keditbookmarks/toplevel.cpp #449710:449711
@@ -211,24 +211,24 @@
     s_topLevel = this;
 
     QSplitter *vsplitter = new QSplitter(this);
-    KToolBar *quicksearch = new KToolBar(vsplitter, "search toolbar");
 
-    KAction *resetQuickSearch = new KAction( i18n( "Reset Quick Search" ),
-        QApplication::reverseLayout() ? "clear_left" : "locationbar_erase",
-        0, actionCollection(), "reset_quicksearch" );
-    resetQuickSearch->setWhatsThis( i18n( "<b>Reset Quick Search</b><br>"
-        "Resets the quick search so that all bookmarks are shown again." ) );
-    resetQuickSearch->plug( quicksearch );
+//FIXME
+//     KToolBar *quicksearch = new KToolBar(vsplitter, "search toolbar");
+// 
+//     KAction *resetQuickSearch = new KAction( i18n( "Reset Quick Search" ),
+//         QApplication::reverseLayout() ? "clear_left" : "locationbar_erase",
+//         0, actionCollection(), "reset_quicksearch" );
+//     resetQuickSearch->setWhatsThis( i18n( "<b>Reset Quick Search</b><br>"
+//         "Resets the quick search so that all bookmarks are shown again." ) );
+//     resetQuickSearch->plug( quicksearch );
+// 
+//     QLabel *lbl = new QLabel(i18n("Se&arch:"), quicksearch, "kde toolbar \
widget");  
-    QLabel *lbl = new QLabel(i18n("Se&arch:"), quicksearch, "kde toolbar widget");
+    K4ListViewSearchLine *searchLineEdit = new K4ListViewSearchLine(/*quicksearch*/ \
vsplitter, 0, "KListViewSearchLine"); +    \
//quicksearch->setStretchableWidget(searchLineEdit); +    \
//lbl->setBuddy(searchLineEdit); +    //connect(resetQuickSearch, \
SIGNAL(activated()), searchLineEdit, SLOT(clear()));  
-    KListViewSearchLine *searchLineEdit = new KEBSearchLine(quicksearch, 0, \
                "KListViewSearchLine");
-    quicksearch->setStretchableWidget(searchLineEdit);
-    lbl->setBuddy(searchLineEdit);
-    connect(resetQuickSearch, SIGNAL(activated()), searchLineEdit, SLOT(clear()));
-
-    //FIXME searchLineEdit->setListView(static_cast<KListView*>(ListView::self()->widget()));
                
-
     createActions();
     if (m_browser)
         createGUI();
@@ -248,6 +248,8 @@
 
     //QT 4 new code
     mBookmarkListView = new BookmarkListView(vsplitter);
+    searchLineEdit->setListView(mBookmarkListView);
+
     mBookmarkListView->setModel( BookmarkModel::self() );
     mBookmarkListView->setSelectionMode(QAbstractItemView::ExtendedSelection);
     expandAll();


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