summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
m---------admin0
-rw-r--r--doc/CMakeLists.txt19
-rw-r--r--eyesapplet/eyes.cpp2
-rw-r--r--fifteenapplet/fifteenapplet.cpp2
-rw-r--r--kmoon/kmoonapplet.cpp2
-rw-r--r--ktux/sprite.cpp10
-rw-r--r--kweather/kcmweatherapplet.cpp2
-rw-r--r--kweather/kcmweatherservice.cpp2
-rw-r--r--kweather/kcmweatherstations.cpp2
-rw-r--r--kweather/kweather.cpp2
-rw-r--r--kweather/reportmain.cpp2
-rw-r--r--kweather/weatherbar.cpp4
-rw-r--r--kweather/weatherservice.h8
-rw-r--r--kworldwatch/applet.cpp2
14 files changed, 27 insertions, 32 deletions
diff --git a/admin b/admin
-Subproject 7fc9aedfb802dbb23da9f54134dd1c381124bc5
+Subproject 34c35e11fbc7237f94ec8ede61ef0c8c9b6c58b
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index dc6bb77..148a9a5 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,12 +1,7 @@
-#################################################
-#
-# (C) 2012 Golubev Alexander
-# fatzer2 (AT) gmail.com
-#
-# Improvements and feedback are welcome
-#
-# This file is released under GPL >= 2
-#
-#################################################
-
-tde_auto_add_subdirectories( )
+tde_conditional_add_subdirectory( BUILD_AMOR amor )
+tde_conditional_add_subdirectory( BUILD_KMOON kmoon )
+tde_conditional_add_subdirectory( BUILD_KODO kodo )
+tde_conditional_add_subdirectory( BUILD_KTEATIME kteatime )
+tde_conditional_add_subdirectory( BUILD_KTUX ktux )
+tde_conditional_add_subdirectory( BUILD_KWEATHER kweather )
+tde_conditional_add_subdirectory( BUILD_KWORLDWATCH kworldclock )
diff --git a/eyesapplet/eyes.cpp b/eyesapplet/eyes.cpp
index 8bd35d4..292e9de 100644
--- a/eyesapplet/eyes.cpp
+++ b/eyesapplet/eyes.cpp
@@ -33,7 +33,7 @@
extern "C"
{
- KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
+ TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
{
TDEGlobal::locale()->insertCatalogue("keyesapplet");
EyesApplet *applet = new EyesApplet(configFile, KPanelApplet::Normal, 0, parent, "keyesapplet");
diff --git a/fifteenapplet/fifteenapplet.cpp b/fifteenapplet/fifteenapplet.cpp
index d2ffd9d..33de0bb 100644
--- a/fifteenapplet/fifteenapplet.cpp
+++ b/fifteenapplet/fifteenapplet.cpp
@@ -39,7 +39,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
extern "C"
{
- KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
+ TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
{
TDEGlobal::locale()->insertCatalogue("kfifteenapplet");
return new FifteenApplet(configFile, KPanelApplet::Normal,
diff --git a/kmoon/kmoonapplet.cpp b/kmoon/kmoonapplet.cpp
index 7ece643..5f9158b 100644
--- a/kmoon/kmoonapplet.cpp
+++ b/kmoon/kmoonapplet.cpp
@@ -35,7 +35,7 @@ const char *description = I18N_NOOP("Moon Phase Indicator for TDE");
extern "C"
{
- KDE_EXPORT KPanelApplet *init(TQWidget *parent, const TQString& configFile)
+ TDE_EXPORT KPanelApplet *init(TQWidget *parent, const TQString& configFile)
{
TDEGlobal::locale()->insertCatalogue("kmoon");
return new MoonPAWidget(configFile, KPanelApplet::Normal,
diff --git a/ktux/sprite.cpp b/ktux/sprite.cpp
index eda20a5..d7ada59 100644
--- a/ktux/sprite.cpp
+++ b/ktux/sprite.cpp
@@ -26,16 +26,16 @@
// libtdescreensaver interface
extern "C"
{
- KDE_EXPORT const char *kss_applicationName = "ktux";
- KDE_EXPORT const char *kss_description = I18N_NOOP( "Tux Screen Saver" );
- KDE_EXPORT const char *kss_version = "1.0.0";
+ TDE_EXPORT const char *kss_applicationName = "ktux";
+ TDE_EXPORT const char *kss_description = I18N_NOOP( "Tux Screen Saver" );
+ TDE_EXPORT const char *kss_version = "1.0.0";
- KDE_EXPORT KScreenSaver *kss_create( WId id )
+ TDE_EXPORT KScreenSaver *kss_create( WId id )
{
return new KSpriteSaver( id );
}
- KDE_EXPORT TQDialog *kss_setup()
+ TDE_EXPORT TQDialog *kss_setup()
{
return new KSpriteSetup();
}
diff --git a/kweather/kcmweatherapplet.cpp b/kweather/kcmweatherapplet.cpp
index 20b4cb4..2fbb50d 100644
--- a/kweather/kcmweatherapplet.cpp
+++ b/kweather/kcmweatherapplet.cpp
@@ -43,7 +43,7 @@
extern "C"
{
- KDE_EXPORT TDECModule *create_weatherapplet( TQWidget *parent, const char * )
+ TDE_EXPORT TDECModule *create_weatherapplet( TQWidget *parent, const char * )
{
return new KCMWeatherApplet( parent, "kweather" );
}
diff --git a/kweather/kcmweatherservice.cpp b/kweather/kcmweatherservice.cpp
index f014ff7..aa11467 100644
--- a/kweather/kcmweatherservice.cpp
+++ b/kweather/kcmweatherservice.cpp
@@ -45,7 +45,7 @@
extern "C"
{
- KDE_EXPORT TDECModule *create_weatherservice( TQWidget *parent, const char * )
+ TDE_EXPORT TDECModule *create_weatherservice( TQWidget *parent, const char * )
{
return new KCMWeatherService( parent, "kweather" );
}
diff --git a/kweather/kcmweatherstations.cpp b/kweather/kcmweatherstations.cpp
index 73e257d..9dc6991 100644
--- a/kweather/kcmweatherstations.cpp
+++ b/kweather/kcmweatherstations.cpp
@@ -33,7 +33,7 @@
extern "C"
{
- KDE_EXPORT TDECModule *create_weatherstations( TQWidget *parent, const char * ) {
+ TDE_EXPORT TDECModule *create_weatherstations( TQWidget *parent, const char * ) {
return new KCMWeatherStations( parent, "kweather" );
}
}
diff --git a/kweather/kweather.cpp b/kweather/kweather.cpp
index 9b8969a..61e5eb4 100644
--- a/kweather/kweather.cpp
+++ b/kweather/kweather.cpp
@@ -41,7 +41,7 @@
extern "C"
{
- KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
+ TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
{
TDEGlobal::locale()->insertCatalogue("kweather");
kweather *theApplet = new kweather(configFile, KPanelApplet::Normal,
diff --git a/kweather/reportmain.cpp b/kweather/reportmain.cpp
index 0055ab4..6b0c21c 100644
--- a/kweather/reportmain.cpp
+++ b/kweather/reportmain.cpp
@@ -15,7 +15,7 @@ static TDECmdLineOptions options[] =
TDECmdLineLastOption
};
-extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
+extern "C" TDE_EXPORT int kdemain(int argc, char *argv[])
{
TDEAboutData aboutData("reportview", I18N_NOOP("Weather Report"),
"0.8", I18N_NOOP("Weather Report for KWeatherService"),
diff --git a/kweather/weatherbar.cpp b/kweather/weatherbar.cpp
index 3570c1b..98cad49 100644
--- a/kweather/weatherbar.cpp
+++ b/kweather/weatherbar.cpp
@@ -217,13 +217,13 @@ bool KonqSidebarWeather::startWeatherService()
extern "C"
{
- KDE_EXPORT void* create_weather_sidebar(TDEInstance* inst, TQObject* par, TQWidget*widp,
+ TDE_EXPORT void* create_weather_sidebar(TDEInstance* inst, TQObject* par, TQWidget*widp,
TQString& desktopname, const char* name)
{
return new KonqSidebarWeather(inst, par, widp, desktopname, name);
}
- KDE_EXPORT bool add_weather_sidebar(TQString* fn, TQString* /*param*/,
+ TDE_EXPORT bool add_weather_sidebar(TQString* fn, TQString* /*param*/,
TQMap<TQString, TQString>* map)
{
map->insert("Type","Link");
diff --git a/kweather/weatherservice.h b/kweather/weatherservice.h
index 6b06133..df0587e 100644
--- a/kweather/weatherservice.h
+++ b/kweather/weatherservice.h
@@ -72,10 +72,10 @@ class WeatherService : public TQObject, public DCOPObject
bool weatherDataAvailable(const TQString &stationID);
/* compatibility */
- TQPixmap currentIcon(const TQString &stationID) KDE_DEPRECATED;
- TQPixmap icon(const TQString &stationID) KDE_DEPRECATED;
- TQString currentIconString(const TQString &stationID) KDE_DEPRECATED;
- TQString iconFileName(const TQString &stationID) KDE_DEPRECATED;
+ TQPixmap currentIcon(const TQString &stationID) TDE_DEPRECATED;
+ TQPixmap icon(const TQString &stationID) TDE_DEPRECATED;
+ TQString currentIconString(const TQString &stationID) TDE_DEPRECATED;
+ TQString iconFileName(const TQString &stationID) TDE_DEPRECATED;
TQString stationName(const TQString &stationID);
TQString stationCountry(const TQString &stationID);
diff --git a/kworldwatch/applet.cpp b/kworldwatch/applet.cpp
index aa7be5a..6e7ebb8 100644
--- a/kworldwatch/applet.cpp
+++ b/kworldwatch/applet.cpp
@@ -42,7 +42,7 @@
extern "C"
{
- KDE_EXPORT KPanelApplet *init(TQWidget *parent, const TQString& configFile)
+ TDE_EXPORT KPanelApplet *init(TQWidget *parent, const TQString& configFile)
{
TDEGlobal::locale()->insertCatalogue("kworldclock");
TDEGlobal::locale()->insertCatalogue("timezones"); // For time zone translation
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-25 08:33:20 +0000