summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <[email protected]>2012-07-04 23:33:25 -0500
committerDarrell Anderson <[email protected]>2012-07-04 23:33:25 -0500
commit5dba83aa33727351e85e1042e55a17f5d3994c10 (patch)
tree6945ffde061a870eed488da9b775aec1d8d48c51
parent5f382dd7a2e8febf453f8e87fa09949ec56299a5 (diff)
downloadtdebase-5dba83aa33727351e85e1042e55a17f5d3994c10.tar.gz
tdebase-5dba83aa33727351e85e1042e55a17f5d3994c10.zip
Nominal cleanup related to bug report 892.
-rw-r--r--doc/userguide/tde-for-admins.docbook8
-rw-r--r--kicker/DESIGN2
-rw-r--r--kicker/applets/minipager/pagerapplet.cpp2
-rw-r--r--kicker/applets/taskbar/taskbarapplet.cpp2
-rw-r--r--kicker/menuext/tdeprint/print_mnu.cpp2
5 files changed, 8 insertions, 8 deletions
diff --git a/doc/userguide/tde-for-admins.docbook b/doc/userguide/tde-for-admins.docbook
index 1ca81bec4..c440c079c 100644
--- a/doc/userguide/tde-for-admins.docbook
+++ b/doc/userguide/tde-for-admins.docbook
@@ -1662,8 +1662,8 @@ new menu format:
&lt;Directory&gt;suse-office.directory&lt;/Directory&gt;
&lt;Include&gt;
&lt;Filename&gt;Acrobat Reader.desktop&lt;/Filename&gt;
- &lt;Filename&gt;kde-kpresenter.desktop&lt;/Filename&gt;
- &lt;Filename&gt;kde-kword.desktop&lt;/Filename&gt;
+ &lt;Filename&gt;tde-kpresenter.desktop&lt;/Filename&gt;
+ &lt;Filename&gt;tde-kword.desktop&lt;/Filename&gt;
&lt;/Include&gt;
&lt;Menu&gt;
</markup>
@@ -2286,7 +2286,7 @@ as part of the <guilabel>Configure Konqueror</guilabel> dialog in
<para>To start the Proxy module use:</para>
<itemizedlist>
<listitem><para><command>kcmshell</command>
-<filename>kde-proxy.desktop</filename></para></listitem>
+<filename>tde-proxy.desktop</filename></para></listitem>
<listitem><para><command>kcmshell</command> proxy</para></listitem>
</itemizedlist>
@@ -2330,7 +2330,7 @@ following to <filename>kdeglobals</filename>:</para>
<replaceable>module-id</replaceable>=false</screen>
<para>For example, to disable the proxy module use</para>
<screen>[TDE Control Module Restrictions]
-kde-proxy.desktop=false</screen>
+tde-proxy.desktop=false</screen>
<para>Check the Control Center and the <guilabel>Configure
Konqueror</guilabel> dialog if the proxy configuration is still
there.</para>
diff --git a/kicker/DESIGN b/kicker/DESIGN
index c6672aa2f..d589ab833 100644
--- a/kicker/DESIGN
+++ b/kicker/DESIGN
@@ -171,7 +171,7 @@ as menu-editing (see below)
How: ??? "General" group in kickerrc is marked immutable (??? that would
imply that buttons can't be added either, loss of flexibility)
-How: Use "kde-panel.desktop" control module restriction.
+How: Use "tde-panel.desktop" control module restriction.
* Menu editing can be restricted. Kicker offers several menu items in the
TDE menu beyond the applications menu itself. See "Configure Panel -> Menus"
diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp
index cf9507700..6ab7febf5 100644
--- a/kicker/applets/minipager/pagerapplet.cpp
+++ b/kicker/applets/minipager/pagerapplet.cpp
@@ -143,7 +143,7 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions,
connect( m_twin, TQT_SIGNAL( desktopNamesChanged() ), this, TQT_SLOT( slotDesktopNamesChanged() ) );
connect( kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int)) );
- if (kapp->authorizeKAction("kicker_rmb") && kapp->authorizeControlModule("kde-kcmtaskbar.desktop"))
+ if (kapp->authorizeKAction("kicker_rmb") && kapp->authorizeControlModule("tde-kcmtaskbar.desktop"))
{
m_contextMenu = new TQPopupMenu();
connect(m_contextMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(aboutToShowContextMenu()));
diff --git a/kicker/applets/taskbar/taskbarapplet.cpp b/kicker/applets/taskbar/taskbarapplet.cpp
index 55e5d113f..d317e1cb4 100644
--- a/kicker/applets/taskbar/taskbarapplet.cpp
+++ b/kicker/applets/taskbar/taskbarapplet.cpp
@@ -43,7 +43,7 @@ extern "C"
// FIXME: what about two taskbars? perhaps this should be inserted just once
KGlobal::locale()->insertCatalogue( "ktaskbarapplet" );
int options = 0;
- if (kapp->authorizeControlModule("kde-kcmtaskbar.desktop"))
+ if (kapp->authorizeControlModule("tde-kcmtaskbar.desktop"))
options = KPanelApplet::Preferences;
TaskbarApplet *taskbar = new TaskbarApplet( configFile, KPanelApplet::Stretch,
options, parent, "ktaskbarapplet" );
diff --git a/kicker/menuext/tdeprint/print_mnu.cpp b/kicker/menuext/tdeprint/print_mnu.cpp
index 9deef5555..4b61b5cf9 100644
--- a/kicker/menuext/tdeprint/print_mnu.cpp
+++ b/kicker/menuext/tdeprint/print_mnu.cpp
@@ -112,7 +112,7 @@ void PrintMenu::slotExec(int ID)
kapp->tdeinitExec("kaddprinterwizard", TQStringList("--serverconfig"));
break;
case PRINT_MANAGER_ID:
- KRun::runCommand("kcmshell kde-printers.desktop");
+ KRun::runCommand("kcmshell tde-printers.desktop");
break;
case PRINT_BROWSER_ID:
KRun::runCommand("kfmclient openProfile filemanagement print:/", "kfmclient", "konqueror");