summaryrefslogtreecommitdiffstats
path: root/tdeioslave/media
diff options
context:
space:
mode:
Diffstat (limited to 'tdeioslave/media')
-rw-r--r--tdeioslave/media/libmediacommon/actionlistboxitem.cpp2
-rw-r--r--tdeioslave/media/libmediacommon/medium.cpp2
-rw-r--r--tdeioslave/media/libmediacommon/notifieraction.cpp2
-rw-r--r--tdeioslave/media/libmediacommon/notifiernothingaction.cpp2
-rw-r--r--tdeioslave/media/libmediacommon/notifieropenaction.cpp2
-rw-r--r--tdeioslave/media/libmediacommon/notifierserviceaction.cpp2
-rw-r--r--tdeioslave/media/libmediacommon/notifiersettings.cpp2
-rw-r--r--tdeioslave/media/mediaimpl.cpp2
-rw-r--r--tdeioslave/media/mediamanager/dialog.h4
-rw-r--r--tdeioslave/media/mediamanager/fstabbackend.cpp2
-rw-r--r--tdeioslave/media/mediamanager/halbackend.cpp6
-rw-r--r--tdeioslave/media/mediamanager/mediamanager.cpp4
-rw-r--r--tdeioslave/media/mediamanager/removablebackend.cpp2
-rw-r--r--tdeioslave/media/mediamanager/tdehardwarebackend.cpp6
-rw-r--r--tdeioslave/media/medianotifier/medianotifier.cpp6
-rw-r--r--tdeioslave/media/medianotifier/medianotifier.h2
-rw-r--r--tdeioslave/media/medianotifier/notificationdialog.cpp2
-rw-r--r--tdeioslave/media/mounthelper/dialog.h4
-rw-r--r--tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp8
-rw-r--r--tdeioslave/media/propsdlgplugin/propertiespage.cpp4
-rw-r--r--tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp4
-rw-r--r--tdeioslave/media/tdecmodule/main.cpp2
-rw-r--r--tdeioslave/media/tdecmodule/managermodule.cpp2
-rw-r--r--tdeioslave/media/tdecmodule/notifiermodule.cpp2
-rw-r--r--tdeioslave/media/tdecmodule/serviceconfigdialog.cpp2
-rw-r--r--tdeioslave/media/tdeio_media.cpp2
26 files changed, 40 insertions, 40 deletions
diff --git a/tdeioslave/media/libmediacommon/actionlistboxitem.cpp b/tdeioslave/media/libmediacommon/actionlistboxitem.cpp
index 271d2e487..9fd3b2bfb 100644
--- a/tdeioslave/media/libmediacommon/actionlistboxitem.cpp
+++ b/tdeioslave/media/libmediacommon/actionlistboxitem.cpp
@@ -19,7 +19,7 @@
#include "actionlistboxitem.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqpixmap.h>
diff --git a/tdeioslave/media/libmediacommon/medium.cpp b/tdeioslave/media/libmediacommon/medium.cpp
index 7b97fb1a0..ca526ea49 100644
--- a/tdeioslave/media/libmediacommon/medium.cpp
+++ b/tdeioslave/media/libmediacommon/medium.cpp
@@ -19,7 +19,7 @@
#include "medium.h"
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
const TQString Medium::SEPARATOR = "---";
diff --git a/tdeioslave/media/libmediacommon/notifieraction.cpp b/tdeioslave/media/libmediacommon/notifieraction.cpp
index 0dfc4110e..5222b9e65 100644
--- a/tdeioslave/media/libmediacommon/notifieraction.cpp
+++ b/tdeioslave/media/libmediacommon/notifieraction.cpp
@@ -20,7 +20,7 @@
#include "notifieraction.h"
#include <tqfile.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <kicontheme.h>
diff --git a/tdeioslave/media/libmediacommon/notifiernothingaction.cpp b/tdeioslave/media/libmediacommon/notifiernothingaction.cpp
index 6a86ad92f..b1c4bae3d 100644
--- a/tdeioslave/media/libmediacommon/notifiernothingaction.cpp
+++ b/tdeioslave/media/libmediacommon/notifiernothingaction.cpp
@@ -19,7 +19,7 @@
#include "notifiernothingaction.h"
-#include <klocale.h>
+#include <tdelocale.h>
NotifierNothingAction::NotifierNothingAction()
: NotifierAction()
diff --git a/tdeioslave/media/libmediacommon/notifieropenaction.cpp b/tdeioslave/media/libmediacommon/notifieropenaction.cpp
index 4d6d8025c..110b9fe28 100644
--- a/tdeioslave/media/libmediacommon/notifieropenaction.cpp
+++ b/tdeioslave/media/libmediacommon/notifieropenaction.cpp
@@ -19,7 +19,7 @@
#include "notifieropenaction.h"
-#include <klocale.h>
+#include <tdelocale.h>
NotifierOpenAction::NotifierOpenAction()
: NotifierAction()
diff --git a/tdeioslave/media/libmediacommon/notifierserviceaction.cpp b/tdeioslave/media/libmediacommon/notifierserviceaction.cpp
index c7bece4f8..2405dfb39 100644
--- a/tdeioslave/media/libmediacommon/notifierserviceaction.cpp
+++ b/tdeioslave/media/libmediacommon/notifierserviceaction.cpp
@@ -24,7 +24,7 @@
#include <tqfileinfo.h>
#include <kstddirs.h>
#include <kdesktopfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
NotifierServiceAction::NotifierServiceAction()
: NotifierAction()
diff --git a/tdeioslave/media/libmediacommon/notifiersettings.cpp b/tdeioslave/media/libmediacommon/notifiersettings.cpp
index 254e591cb..a7dc7ee21 100644
--- a/tdeioslave/media/libmediacommon/notifiersettings.cpp
+++ b/tdeioslave/media/libmediacommon/notifiersettings.cpp
@@ -19,7 +19,7 @@
#include "notifiersettings.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdesktopfile.h>
#include <kstandarddirs.h>
#include <tqdir.h>
diff --git a/tdeioslave/media/mediaimpl.cpp b/tdeioslave/media/mediaimpl.cpp
index 59dba75cf..e00cedccd 100644
--- a/tdeioslave/media/mediaimpl.cpp
+++ b/tdeioslave/media/mediaimpl.cpp
@@ -19,7 +19,7 @@
#include "mediaimpl.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <dcopclient.h>
#include <dcopref.h>
diff --git a/tdeioslave/media/mediamanager/dialog.h b/tdeioslave/media/mediamanager/dialog.h
index dc1d552d8..6a164b8e8 100644
--- a/tdeioslave/media/mediamanager/dialog.h
+++ b/tdeioslave/media/mediamanager/dialog.h
@@ -23,8 +23,8 @@
#ifndef DIALOG_H_
#define DIALOG_H_
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <kdialogbase.h>
diff --git a/tdeioslave/media/mediamanager/fstabbackend.cpp b/tdeioslave/media/mediamanager/fstabbackend.cpp
index 2f5bea220..84910352d 100644
--- a/tdeioslave/media/mediamanager/fstabbackend.cpp
+++ b/tdeioslave/media/mediamanager/fstabbackend.cpp
@@ -36,7 +36,7 @@
#include <tqfile.h>
#endif
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeio/job.h>
#include <tdeio/netaccess.h>
#include <kdebug.h>
diff --git a/tdeioslave/media/mediamanager/halbackend.cpp b/tdeioslave/media/mediamanager/halbackend.cpp
index e3c1b1985..a9db771b9 100644
--- a/tdeioslave/media/mediamanager/halbackend.cpp
+++ b/tdeioslave/media/mediamanager/halbackend.cpp
@@ -24,17 +24,17 @@
#include <locale.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqeventloop.h>
#include <tqfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurl.h>
#include <kdebug.h>
#include <kprocess.h>
#include <tdeconfig.h>
#include <tqstylesheet.h>
#include <kmountpoint.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeio/job.h>
#include <kprotocolinfo.h>
#include <kstandarddirs.h>
diff --git a/tdeioslave/media/mediamanager/mediamanager.cpp b/tdeioslave/media/mediamanager/mediamanager.cpp
index 295f4269a..9a4089ca5 100644
--- a/tdeioslave/media/mediamanager/mediamanager.cpp
+++ b/tdeioslave/media/mediamanager/mediamanager.cpp
@@ -22,8 +22,8 @@
#include <tqtimer.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kdirnotify_stub.h>
#include <kstandarddirs.h>
diff --git a/tdeioslave/media/mediamanager/removablebackend.cpp b/tdeioslave/media/mediamanager/removablebackend.cpp
index dc619701a..54df3d6f1 100644
--- a/tdeioslave/media/mediamanager/removablebackend.cpp
+++ b/tdeioslave/media/mediamanager/removablebackend.cpp
@@ -18,7 +18,7 @@
#include "removablebackend.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdirwatch.h>
#include <kurl.h>
#include <kmountpoint.h>
diff --git a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
index 6ee284dc1..31481b6e8 100644
--- a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
+++ b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
@@ -23,14 +23,14 @@
#include <tqeventloop.h>
#include <tqstylesheet.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <tdeio/job.h>
#include <kprocess.h>
#include <kmimetype.h>
#include <kmountpoint.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeapplication.h>
#include <kprotocolinfo.h>
diff --git a/tdeioslave/media/medianotifier/medianotifier.cpp b/tdeioslave/media/medianotifier/medianotifier.cpp
index ab9d8ad63..e500731a2 100644
--- a/tdeioslave/media/medianotifier/medianotifier.cpp
+++ b/tdeioslave/media/medianotifier/medianotifier.cpp
@@ -27,12 +27,12 @@
#include <tqcheckbox.h>
#include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprocess.h>
#include <krun.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstdguiitem.h>
#include <kstandarddirs.h>
diff --git a/tdeioslave/media/medianotifier/medianotifier.h b/tdeioslave/media/medianotifier/medianotifier.h
index 9e9a772bb..3e30d12b1 100644
--- a/tdeioslave/media/medianotifier/medianotifier.h
+++ b/tdeioslave/media/medianotifier/medianotifier.h
@@ -23,7 +23,7 @@
#include <kdedmodule.h>
#include <tdefileitem.h>
#include <tdeio/job.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqstring.h>
#include <tqmap.h>
diff --git a/tdeioslave/media/medianotifier/notificationdialog.cpp b/tdeioslave/media/medianotifier/notificationdialog.cpp
index 4efe155d9..981d48e6a 100644
--- a/tdeioslave/media/medianotifier/notificationdialog.cpp
+++ b/tdeioslave/media/medianotifier/notificationdialog.cpp
@@ -21,7 +21,7 @@
#include <tqlayout.h>
#include <krun.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <tdeio/global.h>
#include <tdelistbox.h>
diff --git a/tdeioslave/media/mounthelper/dialog.h b/tdeioslave/media/mounthelper/dialog.h
index dc1d552d8..6a164b8e8 100644
--- a/tdeioslave/media/mounthelper/dialog.h
+++ b/tdeioslave/media/mounthelper/dialog.h
@@ -23,8 +23,8 @@
#ifndef DIALOG_H_
#define DIALOG_H_
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <kdialogbase.h>
diff --git a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
index c130d5dcb..230d69715 100644
--- a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
+++ b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
@@ -20,18 +20,18 @@
*/
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <dcopclient.h>
#include <dcopref.h>
#include <tqtimer.h>
#include <stdlib.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kprocess.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
#include <kmimetype.h>
#include "dialog.h"
diff --git a/tdeioslave/media/propsdlgplugin/propertiespage.cpp b/tdeioslave/media/propsdlgplugin/propertiespage.cpp
index 33d481ef5..5b54c8c5a 100644
--- a/tdeioslave/media/propsdlgplugin/propertiespage.cpp
+++ b/tdeioslave/media/propsdlgplugin/propertiespage.cpp
@@ -25,8 +25,8 @@
#include <tqlabel.h>
#include <tqregexp.h>
#include <kpushbutton.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <tqcombobox.h>
#include <tqtimer.h>
#include <kdebug.h>
diff --git a/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp b/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp
index 1ceff0bc1..ea830d2e1 100644
--- a/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp
+++ b/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp
@@ -27,11 +27,11 @@
#include <kdebug.h>
#include <kpushbutton.h>
#include <tdefileshare.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kprocess.h>
#include <kstandarddirs.h>
#include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <dcopref.h>
#include "propertiespage.h"
diff --git a/tdeioslave/media/tdecmodule/main.cpp b/tdeioslave/media/tdecmodule/main.cpp
index 96d7135b5..e2d367e7d 100644
--- a/tdeioslave/media/tdecmodule/main.cpp
+++ b/tdeioslave/media/tdecmodule/main.cpp
@@ -22,7 +22,7 @@
#include <tqtabwidget.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaboutdata.h>
#include <kdialog.h>
diff --git a/tdeioslave/media/tdecmodule/managermodule.cpp b/tdeioslave/media/tdecmodule/managermodule.cpp
index 3a44c446e..39ea8fe00 100644
--- a/tdeioslave/media/tdecmodule/managermodule.cpp
+++ b/tdeioslave/media/tdecmodule/managermodule.cpp
@@ -22,7 +22,7 @@
#include "managermodule.h"
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <dcopref.h>
#include <tqbutton.h>
#include <tqcheckbox.h>
diff --git a/tdeioslave/media/tdecmodule/notifiermodule.cpp b/tdeioslave/media/tdecmodule/notifiermodule.cpp
index 4146c514f..4364d93ad 100644
--- a/tdeioslave/media/tdecmodule/notifiermodule.cpp
+++ b/tdeioslave/media/tdecmodule/notifiermodule.cpp
@@ -19,7 +19,7 @@
#include "notifiermodule.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
#include <kcombobox.h>
diff --git a/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp b/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp
index 989419703..4147e437c 100644
--- a/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp
+++ b/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp
@@ -19,7 +19,7 @@
#include "serviceconfigdialog.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <klineedit.h>
#include <tdeactionselector.h>
#include <kicondialog.h>
diff --git a/tdeioslave/media/tdeio_media.cpp b/tdeioslave/media/tdeio_media.cpp
index be30ec5d5..1d32b14c2 100644
--- a/tdeioslave/media/tdeio_media.cpp
+++ b/tdeioslave/media/tdeio_media.cpp
@@ -20,7 +20,7 @@
#include <stdlib.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <dcopclient.h>
#include <tdecmdlineargs.h>