diff options
| author | Timothy Pearson <[email protected]> | 2013-02-01 23:21:33 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-01 23:21:33 -0600 |
| commit | 5b28c57424294aa30218a9c11cd6ed1a929409b6 (patch) | |
| tree | aaa8c9380d183dfa87857abd34b3ef42bb0de1b5 /kscd | |
| parent | 120dff5f18d13aab7d2731de84e64c898728dc60 (diff) | |
| download | tdemultimedia-5b28c57424294aa30218a9c11cd6ed1a929409b6.tar.gz tdemultimedia-5b28c57424294aa30218a9c11cd6ed1a929409b6.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kscd')
| -rw-r--r-- | kscd/cddbdlg.cpp | 2 | ||||
| -rw-r--r-- | kscd/configWidgetUI.ui | 2 | ||||
| -rw-r--r-- | kscd/docking.cpp | 4 | ||||
| -rw-r--r-- | kscd/kscd.cpp | 8 | ||||
| -rw-r--r-- | kscd/libwm/database.c | 10 |
5 files changed, 13 insertions, 13 deletions
diff --git a/kscd/cddbdlg.cpp b/kscd/cddbdlg.cpp index 2faa6cdf..f5d1111a 100644 --- a/kscd/cddbdlg.cpp +++ b/kscd/cddbdlg.cpp @@ -8,7 +8,7 @@ #include <tqfile.h> #include <tqdir.h> #include <tqfileinfo.h> -#include <klistview.h> +#include <tdelistview.h> #include <klineedit.h> #include <knuminput.h> diff --git a/kscd/configWidgetUI.ui b/kscd/configWidgetUI.ui index 7631bfde..a78ff4f0 100644 --- a/kscd/configWidgetUI.ui +++ b/kscd/configWidgetUI.ui @@ -452,7 +452,7 @@ <layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcolorbutton.h</includehint> - <includehint>kfontrequester.h</includehint> + <includehint>tdefontrequester.h</includehint> <includehint>knuminput.h</includehint> <includehint>kurlrequester.h</includehint> <includehint>kcombobox.h</includehint> diff --git a/kscd/docking.cpp b/kscd/docking.cpp index d3c0964f..9c21f1de 100644 --- a/kscd/docking.cpp +++ b/kscd/docking.cpp @@ -28,12 +28,12 @@ #include <tqtooltip.h> #include <kaboutdata.h> -#include <kactioncollection.h> +#include <tdeactioncollection.h> #include <kapplication.h> #include <klocale.h> #include <kglobal.h> #include <kiconloader.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kpassivepopup.h> #include <kdebug.h> diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp index 581c71e9..b5728c0a 100644 --- a/kscd/kscd.cpp +++ b/kscd/kscd.cpp @@ -34,8 +34,8 @@ #include <dcopclient.h> #include <kaboutdata.h> -#include <kaccel.h> -#include <kaction.h> +#include <tdeaccel.h> +#include <tdeaction.h> #include <dcopref.h> #include <kcharsets.h> #include <kcmdlineargs.h> @@ -49,9 +49,9 @@ #include <kiconloader.h> #include <kinputdialog.h> #include <klocale.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kmessagebox.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kprotocolmanager.h> #include <krun.h> #include <kstandarddirs.h> diff --git a/kscd/libwm/database.c b/kscd/libwm/database.c index 62d66a32..52ca419a 100644 --- a/kscd/libwm/database.c +++ b/kscd/libwm/database.c @@ -1101,7 +1101,7 @@ load( void ) FILE *fp; char **dbfile; int locked = 0; - int dbfound = 0, *trklist, i; + int dbfound = 0, *trtdelist, i; unsigned long dbpos; /* This is some kind of profiling code. I don't change it @@ -1121,12 +1121,12 @@ load( void ) found_in_db = 0; /* Turn the cd->trk array into a simple array of ints. */ - trklist = (int *)malloc(sizeof(int) * cd->ntracks); + trtdelist = (int *)malloc(sizeof(int) * cd->ntracks); for (i = 0; i < cd->ntracks; i++) - trklist[i] = cd->trk[i].start; + trtdelist[i] = cd->trk[i].start; do { - if (*dbfile && idx_find_entry(*dbfile, cd->ntracks, trklist, + if (*dbfile && idx_find_entry(*dbfile, cd->ntracks, trtdelist, cd->length * 75, 0, &dbpos) == 0) dbfound = 1; @@ -1183,7 +1183,7 @@ load( void ) fclose(fp); } - free(trklist); + free(trtdelist); if (cur_playnew == -1) cur_playnew = 0; |