diff options
Diffstat (limited to 'kicker')
-rw-r--r-- | kicker/kicker/buttons/CMakeLists.txt | 2 | ||||
-rw-r--r-- | kicker/kicker/buttons/Makefile.am | 2 | ||||
-rw-r--r-- | kicker/kicker/buttons/nontdeappbutton.cpp (renamed from kicker/kicker/buttons/nonkdeappbutton.cpp) | 4 | ||||
-rw-r--r-- | kicker/kicker/buttons/nontdeappbutton.h (renamed from kicker/kicker/buttons/nonkdeappbutton.h) | 4 | ||||
-rw-r--r-- | kicker/kicker/core/container_button.cpp | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/kicker/kicker/buttons/CMakeLists.txt b/kicker/kicker/buttons/CMakeLists.txt index 1e7ede5b1..72d9254c3 100644 --- a/kicker/kicker/buttons/CMakeLists.txt +++ b/kicker/kicker/buttons/CMakeLists.txt @@ -42,7 +42,7 @@ set( target kicker_buttons ) set( ${target}_SRCS servicebutton.cpp bookmarksbutton.cpp browserbutton.cpp knewbutton.cpp desktopbutton.cpp extensionbutton.cpp - kbutton.cpp nonkdeappbutton.cpp servicemenubutton.cpp + kbutton.cpp nontdeappbutton.cpp servicemenubutton.cpp urlbutton.cpp windowlistbutton.cpp ) diff --git a/kicker/kicker/buttons/Makefile.am b/kicker/kicker/buttons/Makefile.am index 4dcbbb165..1bdba20a5 100644 --- a/kicker/kicker/buttons/Makefile.am +++ b/kicker/kicker/buttons/Makefile.am @@ -6,7 +6,7 @@ noinst_LTLIBRARIES = libkicker_buttons.la libkicker_buttons_la_SOURCES = servicebutton.cpp bookmarksbutton.cpp \ browserbutton.cpp knewbutton.cpp \ desktopbutton.cpp extensionbutton.cpp kbutton.cpp \ - nonkdeappbutton.cpp servicemenubutton.cpp urlbutton.cpp \ + nontdeappbutton.cpp servicemenubutton.cpp urlbutton.cpp \ windowlistbutton.cpp libkicker_buttons_la_LDFLAGS = $(all_libraries) diff --git a/kicker/kicker/buttons/nonkdeappbutton.cpp b/kicker/kicker/buttons/nontdeappbutton.cpp index b2e90065a..4f88f2d37 100644 --- a/kicker/kicker/buttons/nonkdeappbutton.cpp +++ b/kicker/kicker/buttons/nontdeappbutton.cpp @@ -39,10 +39,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "exe_dlg.h" // our own definition -#include "nonkdeappbutton.h" +#include "nontdeappbutton.h" // we include the "moc" file so that the TDE build system knows to create it -#include "nonkdeappbutton.moc" +#include "nontdeappbutton.moc" // this is one of the two constructors. gets called when creating a new button // e.g. via the "non-TDE Application" dialog, not one that was saved and then diff --git a/kicker/kicker/buttons/nonkdeappbutton.h b/kicker/kicker/buttons/nontdeappbutton.h index 0407e85a4..0bc3cd9ab 100644 --- a/kicker/kicker/buttons/nonkdeappbutton.h +++ b/kicker/kicker/buttons/nontdeappbutton.h @@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ******************************************************************/ -#ifndef __nonkdeappbutton_h__ -#define __nonkdeappbutton_h__ +#ifndef __nontdeappbutton_h__ +#define __nontdeappbutton_h__ // pull in the superclass's definition #include "panelbutton.h" diff --git a/kicker/kicker/core/container_button.cpp b/kicker/kicker/core/container_button.cpp index a73d08abf..40f479308 100644 --- a/kicker/kicker/core/container_button.cpp +++ b/kicker/kicker/core/container_button.cpp @@ -47,7 +47,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "kicker.h" #include "kickerSettings.h" #include "kickertip.h" -#include "nonkdeappbutton.h" +#include "nontdeappbutton.h" #include "paneldrag.h" #include "servicebutton.h" #include "servicemenubutton.h" |