summaryrefslogtreecommitdiffstats
path: root/kmid
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 13:16:17 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 13:16:17 -0600
commit748e86c67717d8262d7125e7b71d7440fd0a88a4 (patch)
tree4377ccca40952d12aae2ba2210ef83449d72fad6 /kmid
parentde9a6aa007626eba4e333ac4080cbdfcb9f98386 (diff)
downloadtdemultimedia-748e86c67717d8262d7125e7b71d7440fd0a88a4.tar.gz
tdemultimedia-748e86c67717d8262d7125e7b71d7440fd0a88a4.zip
Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig, KIOBuffer, and KBuffer to avoid conflicts with KDE4
Diffstat (limited to 'kmid')
-rw-r--r--kmid/history.txt2
-rw-r--r--kmid/main.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/kmid/history.txt b/kmid/history.txt
index 3723e854..b6ed3407 100644
--- a/kmid/history.txt
+++ b/kmid/history.txt
@@ -460,7 +460,7 @@ Tuesday 26-1-99
- Removed ; after QOBJECT and fixed default midi map in consolekmid (not kmid)
Sunday 21-2-99
-- Made a quick hack (no more than 15 lines) and kmid uses KIOJob to be
+- Made a quick hack (no more than 15 lines) and kmid uses TDEIOJob to be
net transparent (now it can download files using an http or ftp protocol just
using dnd from a kfm window or using the open file dialog)
diff --git a/kmid/main.cpp b/kmid/main.cpp
index c368e523..21b0198a 100644
--- a/kmid/main.cpp
+++ b/kmid/main.cpp
@@ -80,7 +80,7 @@ int main(int argc, char **argv)
kmidframe->show();
- //CT KIOJob::initStatic();
+ //CT TDEIOJob::initStatic();
/*
if (app->isRestored())