From 6486b6457693414862fdc34ea07457ed5cbf0a0d Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sun, 12 May 2002 22:45:28 +0000 Subject: [PATCH] LinkedList->STL conversion completed. LinkedList is no longer use and it has been removed from the source tree. --- src/BaseDisplay.cc | 1 - src/LinkedList.cc | 356 --------------------------------------------- src/LinkedList.h | 130 ----------------- src/Makefile.am | 39 +++-- src/Makefile.in | 54 ++++--- 5 files changed, 45 insertions(+), 535 deletions(-) delete mode 100644 src/LinkedList.cc delete mode 100644 src/LinkedList.h diff --git a/src/BaseDisplay.cc b/src/BaseDisplay.cc index 901efea4..15c0c7e6 100644 --- a/src/BaseDisplay.cc +++ b/src/BaseDisplay.cc @@ -88,7 +88,6 @@ #include "i18n.h" #include "BaseDisplay.h" -#include "LinkedList.h" #include "Timer.h" #include diff --git a/src/LinkedList.cc b/src/LinkedList.cc deleted file mode 100644 index 8e066965..00000000 --- a/src/LinkedList.cc +++ /dev/null @@ -1,356 +0,0 @@ -// LinkedList.cc for Openbox -// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. - -// stupid macros needed to access some functions in version 2 of the GNU C -// library -#ifndef _GNU_SOURCE -#define _GNU_SOURCE -#endif // _GNU_SOURCE - -#include "LinkedList.h" - -#ifdef HAVE_CONFIG_H -# include "../config.h" -#endif // HAVE_CONFIG_H - -#ifdef HAVE_STDIO_H -# include -#endif // HAVE_STDIO_H - - -__llist_iterator::__llist_iterator(__llist *l) { - // initialize the iterator... - list = l; - - if (list) { - if (! list->iterators) - list->iterators = new __llist; - - list->iterators->insert(this); - } - - reset(); -} - - -__llist_iterator::~__llist_iterator(void) { - if (list && list->iterators) - list->iterators->remove(this); -} - - -void *__llist_iterator::current(void) { - // return the current node data... if any - return ((node) ? node->getData() : 0); -} - - -void __llist_iterator::reset(void) { - // update the iterator's current node to the first node in the linked list - if (list) - node = list->_first; -} - - -const int __llist_iterator::set(const int index) { - // set the current node to index - if (list) { - if (index < list->elements && index >= 0 && list->_first) { - node = list->_first; - - for (register int i = 0; i < index; i++) - node = node->getNext(); - - return 1; - } - } - - node = (__llist_node *) 0; - return 0; -} - - -void __llist_iterator::operator++(void) { - // iterate to the next node in the list... - node = ((node) ? node->getNext() : 0); -} - - -void __llist_iterator::operator++(int) { - // iterate to the next node in the list... - node = ((node) ? node->getNext() : 0); -} - - -__llist::__llist(void *d) { - // initialize the linked list... - _first = (__llist_node *) 0; - _last = (__llist_node *) 0; - iterators = (__llist *) 0; - elements = 0; - - if (d) insert(d); -} - - -__llist::~__llist(void) { - // remove all the items in the list... - for (register int i = 0; i < elements; i++) - remove(0); - - if (iterators) { - __llist_node *n = iterators->_first; - - while (n) { - __llist_iterator *p = (__llist_iterator *) n->getData(); - p->list = (__llist *) 0; - p->node = (__llist_node *) 0; - - n = n->getNext(); - } - - delete iterators; - } -} - - -const int __llist::insert(void *d, int index) { - // insert item into linked list at specified index... - - __llist_node *nnode = new __llist_node; - if (! nnode) return -1; - - if ((! _first) || (! _last)) { - // list is empty... insert the item as the first item, regardless of the - // index given - _first = nnode; - _first->setData(d); - _first->setNext((__llist_node *) 0); - _last = _first; - } else { - if (index == 0) { - // if index is 0... prepend the data on the list - - nnode->setData(d); - nnode->setNext(_first); - - _first = nnode; - } else if ((index == -1) || (index == elements)) { - // if index is -1... append the data on the list - - nnode->setData(d); - nnode->setNext((__llist_node *) 0); - _last->setNext(nnode); - - _last = nnode; - } else if (index < elements) { - // otherwise... insert the item at the position specified by index - __llist_node *inode = _first; - - for (register int i = 1; i < index; i++) { - if (inode) { - inode = inode->getNext(); - } else { - delete nnode; - return -1; - } - } - - nnode->setData(d); - - if ((! inode) || inode == _last) { - nnode->setNext((__llist_node *) 0); - _last->setNext(nnode); - - _last = nnode; - } else { - nnode->setNext(inode->getNext()); - inode->setNext(nnode); - } - } - } - - return ++elements; -} - - -const int __llist::remove(void *d) { - // remove list item whose data pointer address matches the pointer address - // given - - if ((! _first) || (! _last)) - return -1; - - if (_first->getData() == d) { - // remove the first item in the list... - __llist_node *node = _first; - _first = _first->getNext(); - - if (iterators && iterators->_first) { - __llist_node *n = iterators->_first; - while (n) { - ((__llist_iterator *) n->getData())->reset(); - n = n->getNext(); - } - } - - --elements; - delete node; - return 0; - } else { - // iterate through the list and remove the first occurance of the item - - // NOTE: we don't validate _first in this assignment, because it is checked - // for validity above... - __llist_node *rnode = _first->getNext(), *prev = _first; - - for (register int i = 1; i < elements; i++) { - if (rnode) { - if (rnode->getData() == d) { - // we found the item... update the previous node and delete the - // now useless rnode... - prev->setNext(rnode->getNext()); - - if (rnode == _last) - _last = prev; - - if (iterators && iterators->_first) { - __llist_node *n = iterators->_first; - while (n) { - ((__llist_iterator *) n->getData())->reset(); - n = n->getNext(); - } - } - - --elements; - delete rnode; - return i; - } else { - prev = rnode; - rnode = rnode->getNext(); - } - } - } - - return -1; - } -} - - -void *__llist::remove(const int index) { - if (index >= elements || index < 0 || (! _first) || (! _last)) - return (void *) 0; - - // remove list item at specified index within the list - if (index == 0) { - // remove the first item in the list... - __llist_node *node = _first; - void *data_return = _first->getData(); - - _first = _first->getNext(); - - if (iterators && iterators->_first) { - __llist_node *n = iterators->_first; - while (n) { - ((__llist_iterator *) n->getData())->reset(); - n = n->getNext(); - } - } - - --elements; - delete node; - - return data_return; - } else { - __llist_node *rnode = _first->getNext(), *prev = _first; - void *data_return = (void *) 0; - - for (register int i = 1; i < index; i++) { - if (rnode) { - prev = rnode; - rnode = rnode->getNext(); - } else { - return (void *) 0; - } - } - - if (! rnode) return (void *) 0; - - prev->setNext(rnode->getNext()); - data_return = rnode->getData(); - - if (rnode == _last) - _last = prev; - - if (iterators && iterators->_first) { - __llist_node *n = iterators->_first; - while (n) { - ((__llist_iterator *) n->getData())->reset(); - n = n->getNext(); - } - } - - --elements; - data_return = rnode->getData(); - delete rnode; - return data_return; - } - - return (void *) 0; -} - - -void *__llist::find(const int index) { - if (index >= elements || index < 0 || (! _first) || (! _last)) - return (void *) 0; - - if (index == 0) // return the first item - return first(); - if (index == (elements - 1)) // return the last item - return last(); - - __llist_node *fnode = _first->getNext(); - - for (register int i = 1; i < index; i++) { - if (fnode) - fnode = fnode->getNext(); - else - return (void *) 0; - } - - return fnode->getData(); -} - - -void *__llist::first(void) { - if (_first) - return _first->getData(); - - return (void *) 0; -} - - -void *__llist::last(void) { - if (_last) - return _last->getData(); - - return (void *) 0; -} diff --git a/src/LinkedList.h b/src/LinkedList.h deleted file mode 100644 index ba546163..00000000 --- a/src/LinkedList.h +++ /dev/null @@ -1,130 +0,0 @@ -// LinkedList.h for Openbox -// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. - -#ifndef __LinkedList_hh -#define __LinkedList_hh - - -class __llist_node { -private: - __llist_node *next; - void *data; - -protected: - -public: - __llist_node(void) { next = (__llist_node *) 0; data = (void *) 0; } - - inline __llist_node *getNext(void) { return next; } - - inline void *getData(void) { return data; } - inline void setData(void *d) { data = d; } - inline void setNext(__llist_node *n) { next = n; } -}; - - -// forward declaration -class __llist; - - -class __llist_iterator { -private: - __llist *list; - __llist_node *node; - - friend class __llist; - - -protected: - __llist_iterator(__llist *); - ~__llist_iterator(void); - - const int set(const int); - - void *current(void); - void reset(void); - - void operator++(void); - void operator++(int); -}; - - -class __llist { -private: - int elements; - __llist_node *_first, *_last; - __llist *iterators; - - friend class __llist_iterator; - - -protected: - __llist(void * = 0); - ~__llist(void); - - inline const int &count(void) const { return elements; } - inline const int empty(void) const { return (elements == 0); } - - const int insert(void *, int = -1); - const int remove(void *); - - void *find(const int); - void *remove(const int); - void *first(void); - void *last(void); -}; - - -template -class LinkedListIterator : public __llist_iterator { -public: - LinkedListIterator(__llist *d = 0) : __llist_iterator(d) { return; } - - inline Z *current(void) { return (Z *) __llist_iterator::current(); } - - inline const int set(const int i) { return __llist_iterator::set(i); } - - inline void reset(void) { __llist_iterator::reset(); } - - inline void operator++(void) { __llist_iterator::operator++(); } - inline void operator++(int) { __llist_iterator::operator++(0); } -}; - - -template -class LinkedList : public __llist { -public: - LinkedList(Z *d = 0) : __llist(d) { return; } - - inline Z *find(const int i) { return (Z *) __llist::find(i); } - inline Z *remove(const int i) { return (Z *) __llist::remove(i); } - inline Z *first(void) { return (Z *) __llist::first(); } - inline Z *last(void) { return (Z *) __llist::last(); } - - inline const int count(void) const { return __llist::count(); } - inline const int empty(void) const { return __llist::empty(); } - - inline const int insert(Z *d, int i = -1) { return __llist::insert((void *) d, i); } - inline const int remove(Z *d) { return __llist::remove((void *) d); } -}; - - -#endif // __LinkedList_hh diff --git a/src/Makefile.am b/src/Makefile.am index 3fb5cb5e..980acc6e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -30,7 +30,7 @@ CPPFLAGS= @CPPFLAGS@ @SHAPE@ @SLIT@ @INTERLACE@ @ORDEREDPSEUDO@ \ bin_PROGRAMS= openbox -openbox_SOURCES= BaseDisplay.cc Basemenu.cc Clientmenu.cc Configmenu.cc Geometry.cc Iconmenu.cc Image.cc LinkedList.cc Netizen.cc Resource.cc Rootmenu.cc Screen.cc Slit.cc Timer.cc Toolbar.cc Window.cc Windowmenu.cc Workspace.cc Workspacemenu.cc openbox.cc bsd-snprintf.c i18n.cc main.cc +openbox_SOURCES= BaseDisplay.cc Basemenu.cc Clientmenu.cc Configmenu.cc Geometry.cc Iconmenu.cc Image.cc Netizen.cc Resource.cc Rootmenu.cc Screen.cc Slit.cc Timer.cc Toolbar.cc Window.cc Windowmenu.cc Workspace.cc Workspacemenu.cc openbox.cc bsd-snprintf.c i18n.cc main.cc MAINTAINERCLEANFILES= Makefile.in @@ -39,74 +39,73 @@ distclean-local: # local dependencies -BaseDisplay.o: BaseDisplay.cc i18n.h BaseDisplay.h LinkedList.h \ +BaseDisplay.o: BaseDisplay.cc i18n.h BaseDisplay.h \ Timer.h Basemenu.o: Basemenu.cc i18n.h openbox.h BaseDisplay.h \ - LinkedList.h Timer.h Image.h Iconmenu.h Basemenu.h \ + Timer.h Image.h Iconmenu.h Basemenu.h \ Windowmenu.h Slit.h Screen.h Configmenu.h Netizen.h Rootmenu.h \ Workspace.h Workspacemenu.h Resource.h -Clientmenu.o: Clientmenu.cc openbox.h BaseDisplay.h LinkedList.h \ +Clientmenu.o: Clientmenu.cc openbox.h BaseDisplay.h \ Timer.h Image.h Window.h Iconmenu.h Basemenu.h Windowmenu.h Slit.h \ Clientmenu.h Workspace.h Screen.h Configmenu.h Netizen.h \ Rootmenu.h Workspacemenu.h Resource.h Geometry.h Configmenu.o: Configmenu.cc i18n.h Configmenu.h Basemenu.h \ - LinkedList.h Screen.h BaseDisplay.h Timer.h Iconmenu.h Netizen.h \ + Screen.h BaseDisplay.h Timer.h Iconmenu.h Netizen.h \ Rootmenu.h Workspace.h Workspacemenu.h openbox.h Image.h \ Window.h Windowmenu.h Slit.h Toolbar.h Resource.h Geometry.h Geometry.o: Geometry.cc Geometry.h -Icon.o: Iconmenu.cc i18n.h openbox.h BaseDisplay.h LinkedList.h \ +Icon.o: Iconmenu.cc i18n.h openbox.h BaseDisplay.h \ Timer.h Image.h Window.h Iconmenu.h Basemenu.h Windowmenu.h Slit.h \ Screen.h Configmenu.h Netizen.h Rootmenu.h Workspace.h \ Workspacemenu.h Toolbar.h Resource.h Geometry.h -Image.o: Image.cc i18n.h BaseDisplay.h LinkedList.h Timer.h \ +Image.o: Image.cc i18n.h BaseDisplay.h Timer.h \ Image.h -LinkedList.o: LinkedList.cc LinkedList.h -Netizen.o: Netizen.cc Netizen.h BaseDisplay.h LinkedList.h Timer.h \ +Netizen.o: Netizen.cc Netizen.h BaseDisplay.h Timer.h \ Screen.h Configmenu.h Basemenu.h openbox.h Image.h Window.h \ Iconmenu.h Windowmenu.h Slit.h Rootmenu.h Workspace.h \ Workspacemenu.h Resource.h Geometry.h Resource.o: Resource.cc Resource.h Util.h -Rootmenu.o: Rootmenu.cc openbox.h BaseDisplay.h LinkedList.h \ +Rootmenu.o: Rootmenu.cc openbox.h BaseDisplay.h \ Timer.h Image.h Window.h Iconmenu.h Basemenu.h Windowmenu.h Slit.h \ Rootmenu.h Screen.h Configmenu.h Netizen.h Workspace.h \ Workspacemenu.h Resource.h Geometry.h Screen.o: Screen.cc i18n.h bsd-snprintf.h openbox.h BaseDisplay.h \ - LinkedList.h Timer.h Image.h Window.h Iconmenu.h Basemenu.h \ + Timer.h Image.h Window.h Iconmenu.h Basemenu.h \ Windowmenu.h Slit.h Clientmenu.h Workspace.h Screen.h Configmenu.h \ Netizen.h Rootmenu.h Workspacemenu.h Toolbar.h Resource.h Geometry.h -Slit.o: Slit.cc i18n.h openbox.h BaseDisplay.h LinkedList.h \ +Slit.o: Slit.cc i18n.h openbox.h BaseDisplay.h \ Timer.h Image.h Window.h Iconmenu.h Basemenu.h Windowmenu.h Slit.h \ Screen.h Configmenu.h Netizen.h Rootmenu.h Workspace.h \ Workspacemenu.h Toolbar.h Resource.h Geometry.h -Timer.o: Timer.cc BaseDisplay.h LinkedList.h Timer.h -Toolbar.o: Toolbar.cc i18n.h openbox.h BaseDisplay.h LinkedList.h \ +Timer.o: Timer.cc BaseDisplay.h Timer.h +Toolbar.o: Toolbar.cc i18n.h openbox.h BaseDisplay.h \ Timer.h Image.h Window.h Iconmenu.h Basemenu.h Windowmenu.h Slit.h \ Clientmenu.h Workspace.h Rootmenu.h Screen.h Configmenu.h \ Netizen.h Workspacemenu.h Toolbar.h Resource.h Geometry.h -Window.o: Window.cc i18n.h openbox.h BaseDisplay.h LinkedList.h \ +Window.o: Window.cc i18n.h openbox.h BaseDisplay.h \ Timer.h Image.h Window.h Iconmenu.h Basemenu.h Windowmenu.h Slit.h \ Screen.h Configmenu.h Netizen.h Rootmenu.h Workspace.h \ Workspacemenu.h Toolbar.h Resource.h Geometry.h Windowmenu.o: Windowmenu.cc i18n.h openbox.h BaseDisplay.h \ - LinkedList.h Timer.h Image.h Window.h Iconmenu.h Basemenu.h \ + Timer.h Image.h Window.h Iconmenu.h Basemenu.h \ Windowmenu.h Slit.h Screen.h Configmenu.h Netizen.h Rootmenu.h \ Workspace.h Workspacemenu.h Resource.h Geometry.h Workspace.o: Workspace.cc i18n.h openbox.h BaseDisplay.h \ - LinkedList.h Timer.h Image.h Window.h Iconmenu.h Basemenu.h \ + Timer.h Image.h Window.h Iconmenu.h Basemenu.h \ Windowmenu.h Slit.h Clientmenu.h Workspace.h Screen.h \ Configmenu.h Netizen.h Rootmenu.h Workspacemenu.h Toolbar.h Resource.h \ Geometry.h Geometry.h Util.h Workspacemenu.o: Workspacemenu.cc i18n.h openbox.h BaseDisplay.h \ - LinkedList.h Timer.h Image.h Window.h Iconmenu.h Basemenu.h \ + Timer.h Image.h Window.h Iconmenu.h Basemenu.h \ Windowmenu.h Slit.h Screen.h Configmenu.h Netizen.h Rootmenu.h \ Workspace.h Workspacemenu.h Toolbar.h Resource.h Geometry.h openbox.o: openbox.cc i18n.h openbox.h BaseDisplay.h \ - LinkedList.h Timer.h Image.h Window.h Iconmenu.h Basemenu.h \ + Timer.h Image.h Window.h Iconmenu.h Basemenu.h \ Windowmenu.h Slit.h Clientmenu.h Workspace.h Rootmenu.h \ Screen.h Configmenu.h Netizen.h Workspacemenu.h Toolbar.h Resource.h \ Geometry.h Util.h bsd-snprintf.o: bsd-snprintf.c bsd-snprintf.h i18n.o: i18n.cc i18n.h main.o: main.cc ../version.h i18n.h openbox.h BaseDisplay.h \ - LinkedList.h Timer.h Image.h Window.h Iconmenu.h Basemenu.h \ + Timer.h Image.h Window.h Iconmenu.h Basemenu.h \ Windowmenu.h Slit.h Resource.h Geometry.h diff --git a/src/Makefile.in b/src/Makefile.in index d891d136..0aaf4ee1 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -104,7 +104,7 @@ CPPFLAGS = @CPPFLAGS@ @SHAPE@ @SLIT@ @INTERLACE@ @ORDEREDPSEUDO@ @DEBUG@ @NEWWMS bin_PROGRAMS = openbox -openbox_SOURCES = BaseDisplay.cc Basemenu.cc Clientmenu.cc Configmenu.cc Geometry.cc Iconmenu.cc Image.cc LinkedList.cc Netizen.cc Resource.cc Rootmenu.cc Screen.cc Slit.cc Timer.cc Toolbar.cc Window.cc Windowmenu.cc Workspace.cc Workspacemenu.cc openbox.cc bsd-snprintf.c i18n.cc main.cc +openbox_SOURCES = BaseDisplay.cc Basemenu.cc Clientmenu.cc Configmenu.cc Geometry.cc Iconmenu.cc Image.cc Netizen.cc Resource.cc Rootmenu.cc Screen.cc Slit.cc Timer.cc Toolbar.cc Window.cc Windowmenu.cc Workspace.cc Workspacemenu.cc openbox.cc bsd-snprintf.c i18n.cc main.cc MAINTAINERCLEANFILES = Makefile.in mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -121,9 +121,9 @@ X_LIBS = @X_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ openbox_OBJECTS = BaseDisplay.o Basemenu.o Clientmenu.o Configmenu.o \ -Geometry.o Iconmenu.o Image.o LinkedList.o Netizen.o Resource.o \ -Rootmenu.o Screen.o Slit.o Timer.o Toolbar.o Window.o Windowmenu.o \ -Workspace.o Workspacemenu.o openbox.o bsd-snprintf.o i18n.o main.o +Geometry.o Iconmenu.o Image.o Netizen.o Resource.o Rootmenu.o Screen.o \ +Slit.o Timer.o Toolbar.o Window.o Windowmenu.o Workspace.o \ +Workspacemenu.o openbox.o bsd-snprintf.o i18n.o main.o openbox_LDADD = $(LDADD) openbox_DEPENDENCIES = openbox_LDFLAGS = @@ -144,11 +144,10 @@ TAR = tar GZIP_ENV = --best DEP_FILES = .deps/BaseDisplay.P .deps/Basemenu.P .deps/Clientmenu.P \ .deps/Configmenu.P .deps/Geometry.P .deps/Iconmenu.P .deps/Image.P \ -.deps/LinkedList.P .deps/Netizen.P .deps/Resource.P .deps/Rootmenu.P \ -.deps/Screen.P .deps/Slit.P .deps/Timer.P .deps/Toolbar.P \ -.deps/Window.P .deps/Windowmenu.P .deps/Workspace.P \ -.deps/Workspacemenu.P .deps/bsd-snprintf.P .deps/i18n.P .deps/main.P \ -.deps/openbox.P +.deps/Netizen.P .deps/Resource.P .deps/Rootmenu.P .deps/Screen.P \ +.deps/Slit.P .deps/Timer.P .deps/Toolbar.P .deps/Window.P \ +.deps/Windowmenu.P .deps/Workspace.P .deps/Workspacemenu.P \ +.deps/bsd-snprintf.P .deps/i18n.P .deps/main.P .deps/openbox.P SOURCES = $(openbox_SOURCES) OBJECTS = $(openbox_OBJECTS) @@ -390,76 +389,75 @@ distclean-local: # local dependencies -BaseDisplay.o: BaseDisplay.cc i18n.h BaseDisplay.h LinkedList.h \ +BaseDisplay.o: BaseDisplay.cc i18n.h BaseDisplay.h \ Timer.h Basemenu.o: Basemenu.cc i18n.h openbox.h BaseDisplay.h \ - LinkedList.h Timer.h Image.h Iconmenu.h Basemenu.h \ + Timer.h Image.h Iconmenu.h Basemenu.h \ Windowmenu.h Slit.h Screen.h Configmenu.h Netizen.h Rootmenu.h \ Workspace.h Workspacemenu.h Resource.h -Clientmenu.o: Clientmenu.cc openbox.h BaseDisplay.h LinkedList.h \ +Clientmenu.o: Clientmenu.cc openbox.h BaseDisplay.h \ Timer.h Image.h Window.h Iconmenu.h Basemenu.h Windowmenu.h Slit.h \ Clientmenu.h Workspace.h Screen.h Configmenu.h Netizen.h \ Rootmenu.h Workspacemenu.h Resource.h Geometry.h Configmenu.o: Configmenu.cc i18n.h Configmenu.h Basemenu.h \ - LinkedList.h Screen.h BaseDisplay.h Timer.h Iconmenu.h Netizen.h \ + Screen.h BaseDisplay.h Timer.h Iconmenu.h Netizen.h \ Rootmenu.h Workspace.h Workspacemenu.h openbox.h Image.h \ Window.h Windowmenu.h Slit.h Toolbar.h Resource.h Geometry.h Geometry.o: Geometry.cc Geometry.h -Icon.o: Iconmenu.cc i18n.h openbox.h BaseDisplay.h LinkedList.h \ +Icon.o: Iconmenu.cc i18n.h openbox.h BaseDisplay.h \ Timer.h Image.h Window.h Iconmenu.h Basemenu.h Windowmenu.h Slit.h \ Screen.h Configmenu.h Netizen.h Rootmenu.h Workspace.h \ Workspacemenu.h Toolbar.h Resource.h Geometry.h -Image.o: Image.cc i18n.h BaseDisplay.h LinkedList.h Timer.h \ +Image.o: Image.cc i18n.h BaseDisplay.h Timer.h \ Image.h -LinkedList.o: LinkedList.cc LinkedList.h -Netizen.o: Netizen.cc Netizen.h BaseDisplay.h LinkedList.h Timer.h \ +Netizen.o: Netizen.cc Netizen.h BaseDisplay.h Timer.h \ Screen.h Configmenu.h Basemenu.h openbox.h Image.h Window.h \ Iconmenu.h Windowmenu.h Slit.h Rootmenu.h Workspace.h \ Workspacemenu.h Resource.h Geometry.h Resource.o: Resource.cc Resource.h Util.h -Rootmenu.o: Rootmenu.cc openbox.h BaseDisplay.h LinkedList.h \ +Rootmenu.o: Rootmenu.cc openbox.h BaseDisplay.h \ Timer.h Image.h Window.h Iconmenu.h Basemenu.h Windowmenu.h Slit.h \ Rootmenu.h Screen.h Configmenu.h Netizen.h Workspace.h \ Workspacemenu.h Resource.h Geometry.h Screen.o: Screen.cc i18n.h bsd-snprintf.h openbox.h BaseDisplay.h \ - LinkedList.h Timer.h Image.h Window.h Iconmenu.h Basemenu.h \ + Timer.h Image.h Window.h Iconmenu.h Basemenu.h \ Windowmenu.h Slit.h Clientmenu.h Workspace.h Screen.h Configmenu.h \ Netizen.h Rootmenu.h Workspacemenu.h Toolbar.h Resource.h Geometry.h -Slit.o: Slit.cc i18n.h openbox.h BaseDisplay.h LinkedList.h \ +Slit.o: Slit.cc i18n.h openbox.h BaseDisplay.h \ Timer.h Image.h Window.h Iconmenu.h Basemenu.h Windowmenu.h Slit.h \ Screen.h Configmenu.h Netizen.h Rootmenu.h Workspace.h \ Workspacemenu.h Toolbar.h Resource.h Geometry.h -Timer.o: Timer.cc BaseDisplay.h LinkedList.h Timer.h -Toolbar.o: Toolbar.cc i18n.h openbox.h BaseDisplay.h LinkedList.h \ +Timer.o: Timer.cc BaseDisplay.h Timer.h +Toolbar.o: Toolbar.cc i18n.h openbox.h BaseDisplay.h \ Timer.h Image.h Window.h Iconmenu.h Basemenu.h Windowmenu.h Slit.h \ Clientmenu.h Workspace.h Rootmenu.h Screen.h Configmenu.h \ Netizen.h Workspacemenu.h Toolbar.h Resource.h Geometry.h -Window.o: Window.cc i18n.h openbox.h BaseDisplay.h LinkedList.h \ +Window.o: Window.cc i18n.h openbox.h BaseDisplay.h \ Timer.h Image.h Window.h Iconmenu.h Basemenu.h Windowmenu.h Slit.h \ Screen.h Configmenu.h Netizen.h Rootmenu.h Workspace.h \ Workspacemenu.h Toolbar.h Resource.h Geometry.h Windowmenu.o: Windowmenu.cc i18n.h openbox.h BaseDisplay.h \ - LinkedList.h Timer.h Image.h Window.h Iconmenu.h Basemenu.h \ + Timer.h Image.h Window.h Iconmenu.h Basemenu.h \ Windowmenu.h Slit.h Screen.h Configmenu.h Netizen.h Rootmenu.h \ Workspace.h Workspacemenu.h Resource.h Geometry.h Workspace.o: Workspace.cc i18n.h openbox.h BaseDisplay.h \ - LinkedList.h Timer.h Image.h Window.h Iconmenu.h Basemenu.h \ + Timer.h Image.h Window.h Iconmenu.h Basemenu.h \ Windowmenu.h Slit.h Clientmenu.h Workspace.h Screen.h \ Configmenu.h Netizen.h Rootmenu.h Workspacemenu.h Toolbar.h Resource.h \ Geometry.h Geometry.h Util.h Workspacemenu.o: Workspacemenu.cc i18n.h openbox.h BaseDisplay.h \ - LinkedList.h Timer.h Image.h Window.h Iconmenu.h Basemenu.h \ + Timer.h Image.h Window.h Iconmenu.h Basemenu.h \ Windowmenu.h Slit.h Screen.h Configmenu.h Netizen.h Rootmenu.h \ Workspace.h Workspacemenu.h Toolbar.h Resource.h Geometry.h openbox.o: openbox.cc i18n.h openbox.h BaseDisplay.h \ - LinkedList.h Timer.h Image.h Window.h Iconmenu.h Basemenu.h \ + Timer.h Image.h Window.h Iconmenu.h Basemenu.h \ Windowmenu.h Slit.h Clientmenu.h Workspace.h Rootmenu.h \ Screen.h Configmenu.h Netizen.h Workspacemenu.h Toolbar.h Resource.h \ Geometry.h Util.h bsd-snprintf.o: bsd-snprintf.c bsd-snprintf.h i18n.o: i18n.cc i18n.h main.o: main.cc ../version.h i18n.h openbox.h BaseDisplay.h \ - LinkedList.h Timer.h Image.h Window.h Iconmenu.h Basemenu.h \ + Timer.h Image.h Window.h Iconmenu.h Basemenu.h \ Windowmenu.h Slit.h Resource.h Geometry.h # Tell versions [3.59,3.63) of GNU make to not export all variables. -- 2.45.2