summaryrefslogtreecommitdiffstats
path: root/kpersonalizer
diff options
context:
space:
mode:
authorDarrell Anderson <[email protected]>2013-08-18 10:16:29 -0500
committerDarrell Anderson <[email protected]>2013-08-18 10:16:29 -0500
commit3fce7943f47444f0ac0ccbd225e8b48d8275764b (patch)
tree1245fb62987e54d04ddd5a245a84ab90b28eea4d /kpersonalizer
parentdf510360d365d88e9496f583fc4d385680b15a17 (diff)
downloadtdebase-3fce7943f47444f0ac0ccbd225e8b48d8275764b.tar.gz
tdebase-3fce7943f47444f0ac0ccbd225e8b48d8275764b.zip
Rename KStyle to TDEStyle to avoid conflicts with KDE4.
Diffstat (limited to 'kpersonalizer')
-rw-r--r--kpersonalizer/CMakeLists.txt4
-rw-r--r--kpersonalizer/Makefile.am6
-rw-r--r--kpersonalizer/TODO2
-rw-r--r--kpersonalizer/kpersonalizer.cpp2
-rw-r--r--kpersonalizer/tdestylepage.cpp (renamed from kpersonalizer/kstylepage.cpp)6
-rw-r--r--kpersonalizer/tdestylepage.h (renamed from kpersonalizer/kstylepage.h)8
-rw-r--r--kpersonalizer/tdestylepagedlg.ui (renamed from kpersonalizer/kstylepagedlg.ui)0
7 files changed, 14 insertions, 14 deletions
diff --git a/kpersonalizer/CMakeLists.txt b/kpersonalizer/CMakeLists.txt
index 4c151b493..313ff48a5 100644
--- a/kpersonalizer/CMakeLists.txt
+++ b/kpersonalizer/CMakeLists.txt
@@ -35,11 +35,11 @@ install( FILES uninstall.desktop DESTINATION ${APPS_INSTALL_DIR}/System RENAME k
tde_add_executable( kpersonalizer AUTOMOC
SOURCES
- stylepreview.ui krefinepage.cpp kstylepage.cpp
+ stylepreview.ui krefinepage.cpp tdestylepage.cpp
keyecandypage.cpp kospage.cpp kcountrypage.cpp
kpersonalizer.cpp main.cpp kfindlanguage.cpp
kcountrypagedlg.ui kospagedlg.ui keyecandypagedlg.ui
- kstylepagedlg.ui krefinepagedlg.ui ksysinfo.cpp
+ tdestylepagedlg.ui krefinepagedlg.ui ksysinfo.cpp
LINK tdeio-shared
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/kpersonalizer/Makefile.am b/kpersonalizer/Makefile.am
index 66b957804..c4e01d719 100644
--- a/kpersonalizer/Makefile.am
+++ b/kpersonalizer/Makefile.am
@@ -1,13 +1,13 @@
bin_PROGRAMS = kpersonalizer
kpersonalizer_SOURCES = stylepreview.ui krefinepage.cpp \
- kstylepage.cpp keyecandypage.cpp kospage.cpp kcountrypage.cpp kpersonalizer.cpp \
+ tdestylepage.cpp keyecandypage.cpp kospage.cpp kcountrypage.cpp kpersonalizer.cpp \
main.cpp kfindlanguage.cpp \
- kcountrypagedlg.ui kospagedlg.ui keyecandypagedlg.ui kstylepagedlg.ui \
+ kcountrypagedlg.ui kospagedlg.ui keyecandypagedlg.ui tdestylepagedlg.ui \
krefinepagedlg.ui ksysinfo.cpp
kpersonalizer_LDADD = $(LIB_KIO)
-EXTRA_DIST = main.cpp kpersonalizer.cpp kpersonalizer.h kpersonalizer.desktop kcountrypage.cpp kcountrypage.h kospage.cpp kospage.h keyecandypage.cpp keyecandypage.h kstylepage.cpp kstylepage.h krefinepage.cpp krefinepage.h cr16-app-kpersonalizer.png cr32-app-kpersonalizer.png README kcountrypagedlg.ui kospage.ui keyecandypagedlg.ui kstylepagedlg.ui krefinepagedlg.ui kfindlanguage.cpp kfindlanguage.h
+EXTRA_DIST = main.cpp kpersonalizer.cpp kpersonalizer.h kpersonalizer.desktop kcountrypage.cpp kcountrypage.h kospage.cpp kospage.h keyecandypage.cpp keyecandypage.h tdestylepage.cpp tdestylepage.h krefinepage.cpp krefinepage.h cr16-app-kpersonalizer.png cr32-app-kpersonalizer.png README kcountrypagedlg.ui kospage.ui keyecandypagedlg.ui tdestylepagedlg.ui krefinepagedlg.ui kfindlanguage.cpp kfindlanguage.h
xdg_apps_DATA = kpersonalizer.desktop
diff --git a/kpersonalizer/TODO b/kpersonalizer/TODO
index fdc0bf705..0a1bab85f 100644
--- a/kpersonalizer/TODO
+++ b/kpersonalizer/TODO
@@ -17,7 +17,7 @@ o kospage:
- Desktop Icons are arranged after dcop-call, but we just want to align them
o krefinepage:
- quit kpersonalizer, if user starts kcontrol
-o kstylepage:
+o tdestylepage:
- don't hardcode the styles
- style preview
o keyecandypage:
diff --git a/kpersonalizer/kpersonalizer.cpp b/kpersonalizer/kpersonalizer.cpp
index c3611baf3..86b0a5b4a 100644
--- a/kpersonalizer/kpersonalizer.cpp
+++ b/kpersonalizer/kpersonalizer.cpp
@@ -43,7 +43,7 @@
#include "kcountrypage.h"
#include "kospage.h"
#include "keyecandypage.h"
-#include "kstylepage.h"
+#include "tdestylepage.h"
#include "krefinepage.h"
#include "kpersonalizer.h"
diff --git a/kpersonalizer/kstylepage.cpp b/kpersonalizer/tdestylepage.cpp
index 974ac0c9d..4995460cb 100644
--- a/kpersonalizer/kstylepage.cpp
+++ b/kpersonalizer/tdestylepage.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- kstylepage.cpp - description
+ tdestylepage.cpp - description
-------------------
begin : Tue May 22 2001
copyright : (C) 2001 by Ralf Nolden
@@ -41,7 +41,7 @@
#include <kiconloader.h>
#include "stylepreview.h"
-#include "kstylepage.h"
+#include "tdestylepage.h"
TDEStylePage::TDEStylePage(TQWidget *parent, const char *name ) : TDEStylePageDlg(parent,name) {
@@ -581,4 +581,4 @@ TQPalette TDEStylePage::createPalette() {
return TQPalette( colgrp, disabledgrp, colgrp);
}
-#include "kstylepage.moc"
+#include "tdestylepage.moc"
diff --git a/kpersonalizer/kstylepage.h b/kpersonalizer/tdestylepage.h
index 7a31e26cf..30b907094 100644
--- a/kpersonalizer/kstylepage.h
+++ b/kpersonalizer/tdestylepage.h
@@ -1,5 +1,5 @@
/***************************************************************************
- kstylepage.h - description
+ tdestylepage.h - description
-------------------
begin : Tue May 22 2001
copyright : (C) 2001 by Ralf Nolden
@@ -15,11 +15,11 @@
* *
***************************************************************************/
-#ifndef KSTYLEPAGE_H
-#define KSTYLEPAGE_H
+#ifndef TDESTYLEPAGE_H
+#define TDESTYLEPAGE_H
#include <tqcolor.h>
-#include "kstylepagedlg.h"
+#include "tdestylepagedlg.h"
/**Abstract class for the style page
*@author Ralf Nolden
diff --git a/kpersonalizer/kstylepagedlg.ui b/kpersonalizer/tdestylepagedlg.ui
index 65570e542..65570e542 100644
--- a/kpersonalizer/kstylepagedlg.ui
+++ b/kpersonalizer/tdestylepagedlg.ui