TDE
/
tdeedu
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdeedu
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KStandard for enhanced compatibility with KDE4

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent 9a22ee8ba6
commit 949de81936
19 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File

2
khangman/khangman/khangman.cpp
Unescape View File

@ -284,7 +284,7 @@ void KHangMan::loadLevels()
{
//build the Level combobox menu dynamically depending of the data for each language
levels.clear();//initialize TQStringList levels
KStandardDirs *dirs = TDEGlobal::dirs();
TDEStandardDirs *dirs = TDEGlobal::dirs();
TQStringList mfiles = dirs->findAllResources("data","khangman/data/" + Prefs::selectedLanguage() + "/*.kvtml");
bool levelBool = false;
if (!mfiles.isEmpty())

4
khangman/khangman/khnewstuff.cpp
Unescape View File

@ -46,9 +46,9 @@ bool KHNewStuff::install( const TQString &fileName )
if ( !archive.open( IO_ReadOnly ) )
return false;
const KArchiveDirectory *archiveDir = archive.directory();
KStandardDirs myStdDir;
TDEStandardDirs myStdDir;
const TQString destDir =myStdDir.saveLocation("data", kapp->instanceName() + "/data/", true);
KStandardDirs::makeDir( destDir );
TDEStandardDirs::makeDir( destDir );
archiveDir->copyTo(destDir);
archive.close();
//look for languages dirs installed

2
kiten/asyndeta.cpp
Unescape View File

@ -59,7 +59,7 @@ Dict::Index *Asyndeta::retrieveIndex()
void Asyndeta::readKitenConfiguration()
{
KStandardDirs *dirs = TDEGlobal::dirs();
TDEStandardDirs *dirs = TDEGlobal::dirs();
TDEConfig config(dirs->findResource("config", "kitenrc"));
TQString globaledict = dirs->findResource("data", "kiten/edict");

2
kiten/deinf.cpp
Unescape View File

@ -37,7 +37,7 @@ void Deinf::Index::load()
if (loaded)
return;
KStandardDirs *dirs = TDEGlobal::dirs();
TDEStandardDirs *dirs = TDEGlobal::dirs();
TQString vconj = dirs->findResource("data", "kiten/vconj");
if (vconj.isNull())
{

2
kiten/dict.cpp
Unescape View File

@ -105,7 +105,7 @@ File::File(TQString path, TQString n)
//kdDebug() << "creating " << indexFile.name() << endl;
// find the index generator executable
TDEProcess proc;
proc << KStandardDirs::findExe("kitengen") << path << indexFile.name();
proc << TDEStandardDirs::findExe("kitengen") << path << indexFile.name();
// TODO: put up a status dialog and event loop instead of blocking
proc.start(TDEProcess::Block, TDEProcess::NoCommunication);
}

2
kiten/kromajiedit.cpp
Unescape View File

@ -33,7 +33,7 @@ KRomajiEdit::KRomajiEdit(TQWidget *parent, const char *name)
{
kana = "unset";
KStandardDirs *dirs = TDEGlobal::dirs();
TDEStandardDirs *dirs = TDEGlobal::dirs();
TQString romkana = dirs->findResource("data", "kiten/romkana.cnv");
if (romkana.isNull())
{

2
kiten/rad.cpp
Unescape View File

@ -51,7 +51,7 @@ void Rad::load()
if (loaded)
return;
KStandardDirs *dirs = TDEGlobal::dirs();
TDEStandardDirs *dirs = TDEGlobal::dirs();
TQString radtdefile = dirs->findResource("data", "kiten/radtdefile");
if (radtdefile.isNull())
{

2
kiten/widgets.cpp
Unescape View File

@ -404,7 +404,7 @@ void eEdit::save()
// find the index generator executable
TDEProcess proc;
proc << KStandardDirs::findExe("kitengen") << filename << TDEGlobal::dirs()->saveLocation("data", "kiten/xjdx/", true) + TQFileInfo(filename).baseName() + ".xjdx";
proc << TDEStandardDirs::findExe("kitengen") << filename << TDEGlobal::dirs()->saveLocation("data", "kiten/xjdx/", true) + TQFileInfo(filename).baseName() + ".xjdx";
// TODO: put up a status dialog and event loop instead of blocking
proc.start(TDEProcess::Block, TDEProcess::NoCommunication);

4
klettres/klettres/klnewstuff.cpp
Unescape View File

@ -39,9 +39,9 @@ bool KLNewStuff::install( const TQString &fileName )
if ( !archive.open( IO_ReadOnly ) )
return false;
const KArchiveDirectory *archiveDir = archive.directory();
KStandardDirs myStdDir;
TDEStandardDirs myStdDir;
const TQString destDir =myStdDir.saveLocation("data", kapp->instanceName() + "/", true);
KStandardDirs::makeDir( destDir );
TDEStandardDirs::makeDir( destDir );
archiveDir->copyTo(destDir);
archive.close();
//look for languages dirs installed

2
kmplot/kmplot/kmplot.cpp
Unescape View File

@ -249,7 +249,7 @@ void KmPlot::fileOpen(const KURL &url)
// says that it should open a new window if the document is _not_
// in its initial state. This is what we do here..
if ( m_part->url().isEmpty() && !isModified() )
load( KStandardDirs::realFilePath(url.url())); // we open the file in this window...
load( TDEStandardDirs::realFilePath(url.url())); // we open the file in this window...
else
openFileInNewWindow(url); // we open the file in a new window...
}

2
kstars/kstars/ksnewstuff.cpp
Unescape View File

@ -55,7 +55,7 @@ bool KSNewStuff::install( const TQString &fileName )
const KArchiveDirectory *archiveDir = archive.directory();
const TQString destDir = TDEGlobal::dirs()->saveLocation("data", kapp->instanceName(), true);
KStandardDirs::makeDir( destDir );
TDEStandardDirs::makeDir( destDir );
//monitor destDir for changes; inform updateData when files are created.
connect( kdw, TQT_SIGNAL( dirty( const TQString & ) ), this, TQT_SLOT( updateData( const TQString & ) ) );

2
kstars/kstars/kstarsactions.cpp
Unescape View File

@ -345,7 +345,7 @@ void KStars::slotGeoLocator() {
}
void KStars::slotViewOps() {
KStandardDirs stdDirs;
TDEStandardDirs stdDirs;
//An instance of your dialog could be already created and could be cached,
//in which case you want to display the cached dialog instead of creating

2
kstars/kstars/kstarsdata.cpp
Unescape View File

@ -70,7 +70,7 @@ KStarsData::KStarsData() : stdDirs(0), locale(0),
objects++;
//standard directories and locale objects
stdDirs = new KStandardDirs();
stdDirs = new TDEStandardDirs();
locale = new KLocale( "kstars" );
//Check to see if config file already exists. If not, set

4
kstars/kstars/kstarsdata.h
Unescape View File

@ -53,7 +53,7 @@ class TQDataPump;
class TQFile;
class TQTimer;
class KStandardDirs;
class TDEStandardDirs;
class dms;
class SkyMap;
@ -735,7 +735,7 @@ private:
bool TimeRunsForward, temporaryTrail, snapToFocus;
TQString cnameFile;
KStandardDirs *stdDirs;
TDEStandardDirs *stdDirs;
KLocale *locale;
dms *LST, *HourAngle;

2
ktouch/src/ktouch.cpp
Unescape View File

@ -747,7 +747,7 @@ void KTouch::updateFontFromLecture() {
// This function populates the file lists with the installed training, keyboard and
// examination files.
void KTouch::updateFileLists() {
KStandardDirs *dirs = TDEGlobal::dirs();
TDEStandardDirs *dirs = TDEGlobal::dirs();
// first search for all installed keyboard files
// TODO : search in i18n() directories

2
kverbos/kverbos/kfeedercontrol.cpp
Unescape View File

@ -22,7 +22,7 @@
KFeederControl::KFeederControl(int ID, bool splash, bool automatic)
{
TQString f = KStandardDirs::findExe("kfeeder");
TQString f = TDEStandardDirs::findExe("kfeeder");
TQString s;
s.setNum(ID);
childFeeder << f;

4
kvoctrain/kvoctrain/kvtnewstuff.cpp
Unescape View File

@ -57,7 +57,7 @@ TQString KVTNewStuff::destinationPath(KNS::Entry * entry)
else
{
file = TQDir::home().path() + "/" + path + "/";
KStandardDirs::makeDir(file); //ensure the directory exists
TDEStandardDirs::makeDir(file); //ensure the directory exists
file += fileName;
}
return file;
@ -71,7 +71,7 @@ TQString KVTNewStuff::downloadDestination(KNS::Entry * entry)
{
TQString file = destinationPath(entry);
if (KStandardDirs::exists(file))
if (TDEStandardDirs::exists(file))
{
int result = KMessageBox::warningContinueCancel(parentWidget(),
i18n("The file '%1' already exists. Do you want to overwrite it?")

2
kwordquiz/src/kwordquiz.cpp
Unescape View File

@ -1084,7 +1084,7 @@ TQString KWordQuizApp::charIcon(const TQChar & c)
TQString s = locateLocal("icon", "char" + TQString::number(c.unicode()) + ".png");
///No need to redraw if it already exists
if (KStandardDirs::exists(s))
if (TDEStandardDirs::exists(s))
return s;
TQRect r(4, 4, 120, 120);

4
kwordquiz/src/kwqnewstuff.cpp
Unescape View File

@ -61,7 +61,7 @@ TQString KWQNewStuff::destinationPath(KNS::Entry * entry)
else
{
file = TQDir::home().path() + "/" + path + "/";
KStandardDirs::makeDir(file); //ensure the directory exists
TDEStandardDirs::makeDir(file); //ensure the directory exists
file += fileName;
}
return file;
@ -75,7 +75,7 @@ TQString KWQNewStuff::downloadDestination(KNS::Entry * entry)
{
TQString file = destinationPath(entry);
if (KStandardDirs::exists(file))
if (TDEStandardDirs::exists(file))
{
int result = KMessageBox::questionYesNo(parentWidget(),
i18n("The file '%1' already exists. Do you want to overwrite it?")

Write Preview
Loading…
Cancel
Save