summaryrefslogtreecommitdiffstats
path: root/tde-i18n-sv
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:40:06 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:40:06 -0600
commit885d90404a23b3a5036d64d99920cb8f7874bdd5 (patch)
treebd876b447715b3987c7b6c2c77ca04b3d870e515 /tde-i18n-sv
parentfbd0d7aacf83e98be86e714d220941dc7b5c5e0b (diff)
downloadtde-i18n-885d90404a23b3a5036d64d99920cb8f7874bdd5.tar.gz
tde-i18n-885d90404a23b3a5036d64d99920cb8f7874bdd5.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'tde-i18n-sv')
-rw-r--r--tde-i18n-sv/docs/tdebase/ksplashml/index.docbook2
-rw-r--r--tde-i18n-sv/docs/tdevelop/kdearch/index.docbook12
-rw-r--r--tde-i18n-sv/docs/tdewebdev/kommander/extending.docbook6
3 files changed, 10 insertions, 10 deletions
diff --git a/tde-i18n-sv/docs/tdebase/ksplashml/index.docbook b/tde-i18n-sv/docs/tdebase/ksplashml/index.docbook
index 885b40b9506..8372db85596 100644
--- a/tde-i18n-sv/docs/tdebase/ksplashml/index.docbook
+++ b/tde-i18n-sv/docs/tdebase/ksplashml/index.docbook
@@ -1403,7 +1403,7 @@ void Theme2k::initUi()
mText-&gt;setFixedHeight( 48 );
setFixedSize( vbox-&gt;sizeHint() );
- QRect rect(KGlobalSettings::splashScreenDesktopGeometry());
+ QRect rect(TDEGlobalSettings::splashScreenDesktopGeometry());
move( rect.x() + (rect.width() - size().width())/2,
rect.y() + (rect.height() - size().height())/2 );
}
diff --git a/tde-i18n-sv/docs/tdevelop/kdearch/index.docbook b/tde-i18n-sv/docs/tdevelop/kdearch/index.docbook
index c3fde2c43f4..4bc911484d9 100644
--- a/tde-i18n-sv/docs/tdevelop/kdearch/index.docbook
+++ b/tde-i18n-sv/docs/tdevelop/kdearch/index.docbook
@@ -237,8 +237,8 @@
<listitem
><formalpara
><title
-><ulink url="kdeapi:tdecore/KGlobalSettings"
->KGlobalSettings</ulink
+><ulink url="kdeapi:tdecore/TDEGlobalSettings"
+>TDEGlobalSettings</ulink
></title>
<para
>Bekväm åtkomst till inställningar som inte är programspecifika. </para>
@@ -295,8 +295,8 @@
<listitem
><formalpara
><title
-><ulink url="kdeapi:tdecore/KProcess"
->KProcess</ulink
+><ulink url="kdeapi:tdecore/TDEProcess"
+>TDEProcess</ulink
></title>
<para
>Startar och styr underprocesser. </para>
@@ -452,7 +452,7 @@
<listitem
><formalpara
><title
-><ulink url="kdeapi:tdecore/KGlobalAccel"
+><ulink url="kdeapi:tdecore/TDEGlobalAccel"
></ulink
></title>
<para
@@ -3362,7 +3362,7 @@ int kdemain(int argc, char **argv)
{
KLocale::setMainCatalogue("tdelibs");
TDEInstance instance("kio_ftp");
- (void) KGlobal::locale();
+ (void) TDEGlobal::locale();
if (argc != 4) {
fprintf(stderr, "Usage: kio_ftp protocol "
diff --git a/tde-i18n-sv/docs/tdewebdev/kommander/extending.docbook b/tde-i18n-sv/docs/tdewebdev/kommander/extending.docbook
index 1c60c6aaff6..7877420887d 100644
--- a/tde-i18n-sv/docs/tdewebdev/kommander/extending.docbook
+++ b/tde-i18n-sv/docs/tdewebdev/kommander/extending.docbook
@@ -237,7 +237,7 @@ KomLineEdit::KomLineEdit(QWidget *a_parent, const char *a_name)
<screen
>if (KommanderWidget::inEditor)
{
- setPixmap(KGlobal::iconLoader()->loadIcon("iconname", KIcon::NoGroup, KIcon::SizeMedium));
+ setPixmap(TDEGlobal::iconLoader()->loadIcon("iconname", KIcon::NoGroup, KIcon::SizeMedium));
setFrameStyle(QFrame::Box | QFrame::Plain);
setLineWidth(1);
setFixedSize(pixmap()->size());
@@ -306,7 +306,7 @@ public:
<screen
>MyKomPlugin::MyKomPlugin()
{
- addWidget( "KomLineEdit", "My Widget Group", i18n("A Kommander line edit widget") new QIconSet(KGlobal::iconLoader()->loadIcon("iconname", KIcon::NoGroup, KIcon::SizeMedium)));
+ addWidget( "KomLineEdit", "My Widget Group", i18n("A Kommander line edit widget") new QIconSet(TDEGlobal::iconLoader()->loadIcon("iconname", KIcon::NoGroup, KIcon::SizeMedium)));
// lägg till mina andra komponenter här
}
</screen>
@@ -432,7 +432,7 @@ QWidget *WidgetFactory::createWidget( const QString &amp;className, QWidget *par
>KomStdPlugin::KomStdPlugin()
{
...
- addWidget("MyWidgetName", group, "", new QIconSet(KGlobal::iconLoader()->loadIcon("iconname", KIcon::NoGroup, KIcon::SizeMedium)));
+ addWidget("MyWidgetName", group, "", new QIconSet(TDEGlobal::iconLoader()->loadIcon("iconname", KIcon::NoGroup, KIcon::SizeMedium)));
...
}
</screen>