summaryrefslogtreecommitdiffstats
path: root/languages/cpp/app_templates
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:51:01 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:51:01 -0600
commitb9e542d0c805e9adee3a67e44532d5321032e21e (patch)
treee82d85b9035cc2ca322911e8a6e38a3bd8b1d431 /languages/cpp/app_templates
parent7a392a04059bd904dab4c78910a6d34aa0b37798 (diff)
downloadtdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.tar.gz
tdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'languages/cpp/app_templates')
-rw-r--r--languages/cpp/app_templates/kateplugin/plugin_app.cpp2
-rw-r--r--languages/cpp/app_templates/kateplugin2/plugin_app.cpp2
-rw-r--r--languages/cpp/app_templates/kicker/applet.cpp2
-rw-r--r--languages/cpp/app_templates/kofficepart/kopart_factory.cpp2
-rw-r--r--languages/cpp/app_templates/kpartapp/app.cpp12
-rw-r--r--languages/cpp/app_templates/kpartapp/app_part.cpp2
-rw-r--r--languages/cpp/app_templates/kpartplugin/plugin_app.cpp2
-rw-r--r--languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp4
-rw-r--r--languages/cpp/app_templates/kscons_kxt/app.cpp4
-rw-r--r--languages/cpp/app_templates/kscreensaver/kscreensaver.cpp10
-rw-r--r--languages/cpp/app_templates/kxt/app.cpp4
-rw-r--r--languages/cpp/app_templates/noatunui/plugin_app.cpp2
-rw-r--r--languages/cpp/app_templates/noatunvisual/plugin_app.cpp2
13 files changed, 25 insertions, 25 deletions
diff --git a/languages/cpp/app_templates/kateplugin/plugin_app.cpp b/languages/cpp/app_templates/kateplugin/plugin_app.cpp
index d7d8080c..9ef7ccc7 100644
--- a/languages/cpp/app_templates/kateplugin/plugin_app.cpp
+++ b/languages/cpp/app_templates/kateplugin/plugin_app.cpp
@@ -18,7 +18,7 @@ extern "C"
{
void* init_lib%{APPNAMELC}plugin()
{
- KGlobal::locale()->insertCatalogue("kate%{APPNAMELC}");
+ TDEGlobal::locale()->insertCatalogue("kate%{APPNAMELC}");
return new KatePluginFactory;
}
}
diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
index 43084511..c74deda0 100644
--- a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
+++ b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
@@ -22,7 +22,7 @@ extern "C"
{
void* init_lib%{APPNAMELC}plugin()
{
- KGlobal::locale()->insertCatalogue("kate%{APPNAMELC}");
+ TDEGlobal::locale()->insertCatalogue("kate%{APPNAMELC}");
return new KatePluginFactory;
}
}
diff --git a/languages/cpp/app_templates/kicker/applet.cpp b/languages/cpp/app_templates/kicker/applet.cpp
index 29ec3d1d..8db1939e 100644
--- a/languages/cpp/app_templates/kicker/applet.cpp
+++ b/languages/cpp/app_templates/kicker/applet.cpp
@@ -64,7 +64,7 @@ extern "C"
{
KPanelApplet* init( TQWidget *parent, const TQString& configFile)
{
- KGlobal::locale()->insertCatalogue("%{APPNAMELC}");
+ TDEGlobal::locale()->insertCatalogue("%{APPNAMELC}");
return new %{APPNAME}(configFile, KPanelApplet::Normal,
KPanelApplet::About | KPanelApplet::Help | KPanelApplet::Preferences,
parent, "%{APPNAMELC}");
diff --git a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp
index 7d2d20d1..f0173476 100644
--- a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp
+++ b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp
@@ -15,7 +15,7 @@ extern "C"
{
void* init_lib%{APPNAMELC}part()
{
- KGlobal::locale()->insertCatalogue("%{APPNAMELC}");
+ TDEGlobal::locale()->insertCatalogue("%{APPNAMELC}");
return new %{APPNAME}Factory;
}
};
diff --git a/languages/cpp/app_templates/kpartapp/app.cpp b/languages/cpp/app_templates/kpartapp/app.cpp
index 1088f65d..1a306aee 100644
--- a/languages/cpp/app_templates/kpartapp/app.cpp
+++ b/languages/cpp/app_templates/kpartapp/app.cpp
@@ -149,12 +149,12 @@ void %{APPNAME}::optionsConfigureToolbars()
{
#if defined(TDE_MAKE_VERSION)
# if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0)
- saveMainWindowSettings(KGlobal::config(), autoSaveGroup());
+ saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
# else
- saveMainWindowSettings(KGlobal::config() );
+ saveMainWindowSettings(TDEGlobal::config() );
# endif
#else
- saveMainWindowSettings(KGlobal::config() );
+ saveMainWindowSettings(TDEGlobal::config() );
#endif
// use the standard toolbar editor
@@ -168,12 +168,12 @@ void %{APPNAME}::applyNewToolbarConfig()
{
#if defined(TDE_MAKE_VERSION)
# if TDE_VERSION >= TDE_MAKE_VERSION(3,1,0)
- applyMainWindowSettings(KGlobal::config(), autoSaveGroup());
+ applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
# else
- applyMainWindowSettings(KGlobal::config());
+ applyMainWindowSettings(TDEGlobal::config());
# endif
#else
- applyMainWindowSettings(KGlobal::config());
+ applyMainWindowSettings(TDEGlobal::config());
#endif
}
diff --git a/languages/cpp/app_templates/kpartapp/app_part.cpp b/languages/cpp/app_templates/kpartapp/app_part.cpp
index 80c9f967..e46d21ca 100644
--- a/languages/cpp/app_templates/kpartapp/app_part.cpp
+++ b/languages/cpp/app_templates/kpartapp/app_part.cpp
@@ -193,7 +193,7 @@ extern "C"
{
void* init_lib%{APPNAMELC}part()
{
- KGlobal::locale()->insertCatalogue("%{APPNAMELC}");
+ TDEGlobal::locale()->insertCatalogue("%{APPNAMELC}");
return new %{APPNAME}PartFactory;
}
};
diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp
index 1812b5e2..c5bdb434 100644
--- a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp
+++ b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp
@@ -99,7 +99,7 @@ extern "C"
{
void* init_lib%{APPNAMELC}plugin()
{
- KGlobal::locale()->insertCatalogue("%{APPNAMELC}");
+ TDEGlobal::locale()->insertCatalogue("%{APPNAMELC}");
return new %{APPNAME}Factory;
}
}
diff --git a/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp b/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp
index 6b55b671..dd297ed7 100644
--- a/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp
+++ b/languages/cpp/app_templates/kscons_kmdi/appkmdi.cpp
@@ -298,7 +298,7 @@ void %{APPNAMELC}kmdi::optionsConfigureKeys()
void %{APPNAMELC}kmdi::optionsConfigureToolbars()
{
- //saveMainWindowSettings(KGlobal::config(), autoSaveGroup());
+ //saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
}
void %{APPNAMELC}kmdi::newToolbarConfig()
@@ -306,7 +306,7 @@ void %{APPNAMELC}kmdi::newToolbarConfig()
// This slot is called when user clicks "Ok" or "Apply" in the toolbar editor.
// recreate our GUI, and re-apply the settings (e.g. "text under icons", etc.)
//createGUI();
- //applyMainWindowSettings(KGlobal::config(), autoSaveGroup());
+ //applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
}
void %{APPNAMELC}kmdi::optionsPreferences()
diff --git a/languages/cpp/app_templates/kscons_kxt/app.cpp b/languages/cpp/app_templates/kscons_kxt/app.cpp
index 2a89e471..750fd94c 100644
--- a/languages/cpp/app_templates/kscons_kxt/app.cpp
+++ b/languages/cpp/app_templates/kscons_kxt/app.cpp
@@ -120,7 +120,7 @@ void %{APPNAME}::optionsConfigureKeys()
void %{APPNAME}::optionsConfigureToolbars()
{
// use the standard toolbar editor
- saveMainWindowSettings(KGlobal::config(), autoSaveGroup());
+ saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
}
void %{APPNAME}::newToolbarConfig()
@@ -129,7 +129,7 @@ void %{APPNAME}::newToolbarConfig()
// recreate our GUI, and re-apply the settings (e.g. "text under icons", etc.)
createGUI();
- applyMainWindowSettings(KGlobal::config(), autoSaveGroup());
+ applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
}
void %{APPNAME}::optionsPreferences()
diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp b/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp
index efdbf40b..569c69a3 100644
--- a/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp
+++ b/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp
@@ -20,13 +20,13 @@ extern "C"
%{APPNAME} *kss_create( WId id )
{
- KGlobal::locale()->insertCatalogue("%{APPNAMELC}");
+ TDEGlobal::locale()->insertCatalogue("%{APPNAMELC}");
return new %{APPNAME}( id );
}
TQDialog *kss_setup()
{
- KGlobal::locale()->insertCatalogue("%{APPNAMELC}");
+ TDEGlobal::locale()->insertCatalogue("%{APPNAMELC}");
return new %{APPNAME}Setup();
}
}
@@ -48,7 +48,7 @@ extern "C"
//! read settings from config file
void %{APPNAME}Setup::readSettings()
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup( "Settings" );
/// @todo
// Add your config options here...
@@ -59,7 +59,7 @@ void %{APPNAME}Setup::readSettings()
//! Ok pressed - save settings and exit
void %{APPNAME}Setup::slotOkPressed()
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup( "Settings" );
/// @todo
// Add your config options here.
@@ -89,7 +89,7 @@ void %{APPNAME}Setup::slotCancelPressed()
//! read configuration settings from config file
void %{APPNAME}::readSettings()
{
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup( "Settings" );
/// @todo
// Add your config options here...
diff --git a/languages/cpp/app_templates/kxt/app.cpp b/languages/cpp/app_templates/kxt/app.cpp
index e3032dc1..81a1118c 100644
--- a/languages/cpp/app_templates/kxt/app.cpp
+++ b/languages/cpp/app_templates/kxt/app.cpp
@@ -115,7 +115,7 @@ void %{APPNAMELC}::optionsConfigureKeys()
void %{APPNAMELC}::optionsConfigureToolbars()
{
// use the standard toolbar editor
- saveMainWindowSettings(KGlobal::config(), autoSaveGroup());
+ saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
}
void %{APPNAMELC}::newToolbarConfig()
@@ -124,7 +124,7 @@ void %{APPNAMELC}::newToolbarConfig()
// recreate our GUI, and re-apply the settings (e.g. "text under icons", etc.)
createGUI();
- applyMainWindowSettings(KGlobal::config(), autoSaveGroup());
+ applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
}
void %{APPNAMELC}::optionsPreferences()
diff --git a/languages/cpp/app_templates/noatunui/plugin_app.cpp b/languages/cpp/app_templates/noatunui/plugin_app.cpp
index 23067139..a98ab7a6 100644
--- a/languages/cpp/app_templates/noatunui/plugin_app.cpp
+++ b/languages/cpp/app_templates/noatunui/plugin_app.cpp
@@ -8,7 +8,7 @@ extern "C"
{
Plugin *create_plugin()
{
- KGlobal::locale()->insertCatalogue("%{APPNAMELC}");
+ TDEGlobal::locale()->insertCatalogue("%{APPNAMELC}");
return new %{APPNAME}UI;
}
}
diff --git a/languages/cpp/app_templates/noatunvisual/plugin_app.cpp b/languages/cpp/app_templates/noatunvisual/plugin_app.cpp
index 442bdefd..ae60d277 100644
--- a/languages/cpp/app_templates/noatunvisual/plugin_app.cpp
+++ b/languages/cpp/app_templates/noatunvisual/plugin_app.cpp
@@ -12,7 +12,7 @@ extern "C"
{
Plugin *create_plugin()
{
- KGlobal::locale()->insertCatalogue("%{APPNAMELC}");
+ TDEGlobal::locale()->insertCatalogue("%{APPNAMELC}");
return new %{APPNAME}Scope();
}
}