diff options
| -rw-r--r-- | kicker/kicker/buttons/windowlist.desktop | 2 | ||||
| -rw-r--r-- | konqueror/keditbookmarks/bookmarkiterator.cpp | 8 | ||||
| -rw-r--r-- | konqueror/keditbookmarks/bookmarkiterator.h | 2 | ||||
| -rw-r--r-- | tdm/backend/socket.c | 42 |
4 files changed, 27 insertions, 27 deletions
diff --git a/kicker/kicker/buttons/windowlist.desktop b/kicker/kicker/buttons/windowlist.desktop index 3b2e677fb..f3d15fd69 100644 --- a/kicker/kicker/buttons/windowlist.desktop +++ b/kicker/kicker/buttons/windowlist.desktop @@ -25,7 +25,7 @@ Name[fy]=Finsterlistmenu Name[gl]=Lista de Fiestras Name[he]=תפריט רשימת חלונות Name[hr]=Izbornik popisa prozora -Name[hu]=Ablatdelista menü +Name[hu]=Ablaklista menü Name[is]=Gluggalista valmynd Name[it]=Menu elenco delle finestre Name[ja]=ウィンドウリストメニュー diff --git a/konqueror/keditbookmarks/bookmarkiterator.cpp b/konqueror/keditbookmarks/bookmarkiterator.cpp index c22d2e628..c30d890e3 100644 --- a/konqueror/keditbookmarks/bookmarkiterator.cpp +++ b/konqueror/keditbookmarks/bookmarkiterator.cpp @@ -28,7 +28,7 @@ #include <tqtimer.h> -BookmarkIterator::BookmarkIterator(TQValueList<KBookmark> bks) : m_btdelist(bks) { +BookmarkIterator::BookmarkIterator(TQValueList<KBookmark> bks) : m_bklist(bks) { connect(this, TQT_SIGNAL( deleteSelf(BookmarkIterator *) ), TQT_SLOT( slotCancelTest(BookmarkIterator *) )); delayedEmitNextOne(); @@ -60,12 +60,12 @@ const KBookmark BookmarkIterator::curBk() const { void BookmarkIterator::nextOne() { // kdDebug() << "BookmarkIterator::nextOne" << endl; - if (m_btdelist.isEmpty()) { + if (m_bklist.isEmpty()) { emit deleteSelf(this); return; } - TQValueListIterator<KBookmark> head = m_btdelist.begin(); + TQValueListIterator<KBookmark> head = m_bklist.begin(); KBookmark bk = (*head); bool viable = bk.hasParent() && isApplicable(bk); @@ -75,7 +75,7 @@ void BookmarkIterator::nextOne() { doAction(); } - m_btdelist.remove(head); + m_bklist.remove(head); if (!viable) delayedEmitNextOne(); diff --git a/konqueror/keditbookmarks/bookmarkiterator.h b/konqueror/keditbookmarks/bookmarkiterator.h index a7d06952a..0931ccaf7 100644 --- a/konqueror/keditbookmarks/bookmarkiterator.h +++ b/konqueror/keditbookmarks/bookmarkiterator.h @@ -53,7 +53,7 @@ protected: private: KBookmark m_bk; - TQValueList<KBookmark> m_btdelist; + TQValueList<KBookmark> m_bklist; }; class BookmarkIteratorHolder diff --git a/tdm/backend/socket.c b/tdm/backend/socket.c index 151fbc552..677a3d32f 100644 --- a/tdm/backend/socket.c +++ b/tdm/backend/socket.c @@ -99,9 +99,9 @@ CreateListeningSocket( struct sockaddr *sock_addr, int salen ) return fd; } -struct soctdelist { - struct soctdelist *next; - struct soctdelist *mcastgroups; +struct socklist { + struct socklist *next; + struct socklist *mcastgroups; struct sockaddr *addr; int salen; int addrlen; @@ -109,12 +109,12 @@ struct soctdelist { int ref; /* referenced bit - see UpdateListenSockets */ }; -static struct soctdelist *listensocks; +static struct socklist *listensocks; static void -DestroyListeningSocket( struct soctdelist *s ) +DestroyListeningSocket( struct socklist *s ) { - struct soctdelist *g, *n; + struct socklist *g, *n; if (s->fd >= 0) { CloseNClearCloseOnFork( s->fd ); @@ -134,10 +134,10 @@ DestroyListeningSocket( struct soctdelist *s ) s->mcastgroups = NULL; } -static struct soctdelist* -FindInList( struct soctdelist *list, ARRAY8Ptr addr ) +static struct socklist* +FindInList( struct socklist *list, ARRAY8Ptr addr ) { - struct soctdelist *s; + struct socklist *s; for (s = list; s; s = s->next) { if (s->addrlen == addr->length) { @@ -165,12 +165,12 @@ FindInList( struct soctdelist *list, ARRAY8Ptr addr ) return NULL; } -static struct soctdelist * -CreateSoctdelistEntry( ARRAY8Ptr addr ) +static struct socklist * +CreateSocklistEntry( ARRAY8Ptr addr ) { - struct soctdelist *s; + struct socklist *s; - if (!(s = Calloc( 1, sizeof(struct soctdelist) ))) + if (!(s = Calloc( 1, sizeof(struct socklist) ))) return NULL; if (addr->length == 4) { /* IPv4 */ @@ -212,7 +212,7 @@ CreateSoctdelistEntry( ARRAY8Ptr addr ) static void UpdateListener( ARRAY8Ptr addr, void **closure ) { - struct soctdelist *s; + struct socklist *s; *closure = NULL; @@ -242,7 +242,7 @@ UpdateListener( ARRAY8Ptr addr, void **closure ) return; } - if (!(s = CreateSoctdelistEntry( addr ))) + if (!(s = CreateSocklistEntry( addr ))) return; if ((s->fd = CreateListeningSocket( s->addr, s->salen )) < 0) { @@ -260,7 +260,7 @@ UpdateListener( ARRAY8Ptr addr, void **closure ) #define LEAVE_MCAST_GROUP 1 static void -ChangeMcastMembership( struct soctdelist *s, struct soctdelist *g, int op ) +ChangeMcastMembership( struct socklist *s, struct socklist *g, int op ) { int sockopt; @@ -342,8 +342,8 @@ ChangeMcastMembership( struct soctdelist *s, struct soctdelist *g, int op ) static void UpdateMcastGroup( ARRAY8Ptr addr, void **closure ) { - struct soctdelist *s = (struct soctdelist *)*closure; - struct soctdelist *g; + struct socklist *s = (struct socklist *)*closure; + struct socklist *g; if (!s) return; @@ -355,7 +355,7 @@ UpdateMcastGroup( ARRAY8Ptr addr, void **closure ) } /* Need to join the group */ - if (!(g = CreateSoctdelistEntry( addr ))) + if (!(g = CreateSocklistEntry( addr ))) return; ChangeMcastMembership( s, g, JOIN_MCAST_GROUP ); @@ -367,7 +367,7 @@ UpdateMcastGroup( ARRAY8Ptr addr, void **closure ) void UpdateListenSockets( void ) { - struct soctdelist *s, *g, **ls, **lg; + struct socklist *s, *g, **ls, **lg; void *tmpPtr = NULL; /* Clear Ref bits - any not marked by UpdateCallback will be closed */ @@ -404,7 +404,7 @@ AnyListenSockets( void ) int ProcessListenSockets( FD_TYPE *reads ) { - struct soctdelist *s; + struct socklist *s; int ret = 0; for (s = listensocks; s; s = s->next) |