Rename KStandard for enhanced compatibility with KDE4

r14.0.x
Timothy Pearson 12 years ago
parent 04f68c54fa
commit 171ad6a564

@ -39,7 +39,7 @@ m_geometry(10,20,640,480) {
else if (m_filename.isEmpty() && !name.isEmpty()) { else if (m_filename.isEmpty() && !name.isEmpty()) {
m_filename = name; m_filename = name;
m_filename.replace(TQRegExp("\\s=#."),"_"); m_filename.replace(TQRegExp("\\s=#."),"_");
KStandardDirs stdDirs; TDEStandardDirs stdDirs;
m_filename = stdDirs.saveLocation("data", "bibletime/sessions/") + m_filename + ".xml"; m_filename = stdDirs.saveLocation("data", "bibletime/sessions/") + m_filename + ".xml";
init(m_filename); init(m_filename);
} }

@ -24,7 +24,7 @@ namespace Profile {
CProfileMgr::CProfileMgr() : m_startupProfile(0) { CProfileMgr::CProfileMgr() : m_startupProfile(0) {
m_profiles.setAutoDelete(true); m_profiles.setAutoDelete(true);
KStandardDirs stdDirs; TDEStandardDirs stdDirs;
m_profilePath = stdDirs.saveLocation("data", "bibletime/sessions/"); m_profilePath = stdDirs.saveLocation("data", "bibletime/sessions/");
TQDir d( m_profilePath ); TQDir d( m_profilePath );

@ -948,7 +948,7 @@ CBookmarkFolder::~CBookmarkFolder() {}
void CBookmarkFolder::initTree() { void CBookmarkFolder::initTree() {
addGroup(OldBookmarkFolder, "*"); addGroup(OldBookmarkFolder, "*");
KStandardDirs stdDirs; TDEStandardDirs stdDirs;
const TQString path = stdDirs.saveLocation("data", "bibletime/"); const TQString path = stdDirs.saveLocation("data", "bibletime/");
if (!path.isEmpty()) { if (!path.isEmpty()) {
loadBookmarks(path + "bookmarks.xml"); loadBookmarks(path + "bookmarks.xml");

@ -741,7 +741,7 @@ void CMainIndex::saveBookmarks() {
if (i && (i->type() == CItemBase::BookmarkFolder)) { if (i && (i->type() == CItemBase::BookmarkFolder)) {
//found the bookmark folder //found the bookmark folder
KStandardDirs stdDirs; TDEStandardDirs stdDirs;
const TQString path = stdDirs.saveLocation("data", "bibletime/"); const TQString path = stdDirs.saveLocation("data", "bibletime/");
if (!path.isEmpty()) { if (!path.isEmpty()) {

@ -271,7 +271,7 @@ int main(int argc, char* argv[]) {
// compatibility stuff for 1.3, needs to be moved to better place later // compatibility stuff for 1.3, needs to be moved to better place later
if (CBTConfig::get(CBTConfig::bibletimeVersion) != VERSION) { if (CBTConfig::get(CBTConfig::bibletimeVersion) != VERSION) {
KStandardDirs stdDirs; TDEStandardDirs stdDirs;
TQDir dir(stdDirs.saveLocation("data", "bibletime/")); TQDir dir(stdDirs.saveLocation("data", "bibletime/"));
if (!dir.exists("sessions/") && dir.exists("profiles/")) { //only old dir exists if (!dir.exists("sessions/") && dir.exists("profiles/")) { //only old dir exists
dir.rename("profiles", "sessions"); dir.rename("profiles", "sessions");

Loading…
Cancel
Save