diff options
| -rw-r--r-- | CMakeL10n.txt | 1 | ||||
| m--------- | admin | 0 | ||||
| -rw-r--r-- | eyesapplet/eyes.cpp | 2 | ||||
| -rw-r--r-- | fifteenapplet/fifteenapplet.cpp | 2 | ||||
| -rw-r--r-- | kmoon/kmoonapplet.cpp | 2 | ||||
| -rw-r--r-- | ktux/sprite.cpp | 10 | ||||
| -rw-r--r-- | kweather/kcmweatherapplet.cpp | 2 | ||||
| -rw-r--r-- | kweather/kcmweatherservice.cpp | 2 | ||||
| -rw-r--r-- | kweather/kcmweatherstations.cpp | 2 | ||||
| -rw-r--r-- | kweather/kweather.cpp | 2 | ||||
| -rw-r--r-- | kweather/reportmain.cpp | 2 | ||||
| -rw-r--r-- | kweather/weatherbar.cpp | 4 | ||||
| -rw-r--r-- | kworldwatch/applet.cpp | 2 |
13 files changed, 16 insertions, 17 deletions
diff --git a/CMakeL10n.txt b/CMakeL10n.txt index 0e88a47..212193b 100644 --- a/CMakeL10n.txt +++ b/CMakeL10n.txt @@ -14,7 +14,6 @@ include( TDEVersion ) cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) -tde_set_project_version( ) ##### include our cmake modules ################# diff --git a/admin b/admin -Subproject fabd8c1d11327788a46a50ae410d4777e274c7d +Subproject 36c8888e40e73634035e5bed05e401664d3ee54 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/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 |