diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-19 01:42:14 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-19 01:42:14 +0000 |
commit | 8155225c9be993acc0512956416d195edfef4eb9 (patch) | |
tree | de4f3cd17614fc67e47eefabcdbe2fbe170c9be7 /konsole/konsole/schema.cpp | |
parent | 364641b8e0279758d236af39abd138d379328a19 (diff) | |
download | tdebase-8155225c9be993acc0512956416d195edfef4eb9.tar.gz tdebase-8155225c9be993acc0512956416d195edfef4eb9.zip |
Enable compilation with TQt for Qt4 3.4.0 TP2
This should not break compatibility with TQt for Qt3; if it does please fix it ASAP!
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'konsole/konsole/schema.cpp')
-rw-r--r-- | konsole/konsole/schema.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/konsole/konsole/schema.cpp b/konsole/konsole/schema.cpp index 8d85329eb..211f99b77 100644 --- a/konsole/konsole/schema.cpp +++ b/konsole/konsole/schema.cpp @@ -131,7 +131,7 @@ ColorSchema::ColorSchema(const TQString& pathname) ,lastRead(new TQDateTime()) { //start with a valid time, aleXXX - *lastRead = TQDateTime::currentDateTime(); + *lastRead = TQDateTime::tqcurrentDateTime(); TQString fPath = pathname.startsWith("/") ? pathname : locate("data", "konsole/"+pathname); if (fPath.isEmpty() || !TQFile::exists(fPath)) { @@ -169,7 +169,7 @@ ColorSchema::ColorSchema(KConfig& c) m_title = c.readEntry("Title",i18n("[no title]")); m_imagePath = c.readEntry("ImagePath"); - m_alignment = c.readNumEntry("ImageAlignment",1); + m_tqalignment = c.readNumEntry("ImageAlignment",1); m_useTransparency = c.readBoolEntry("UseTransparency",false); m_tr_r = c.readNumEntry("TransparentR",0); @@ -203,7 +203,7 @@ void ColorSchema::clearSchema() } m_title = i18n("[no title]"); m_imagePath = ""; - m_alignment = 1; + m_tqalignment = 1; m_useTransparency = false; m_tr_x = 0.0; m_tr_r = 0; @@ -216,7 +216,7 @@ void ColorSchema::setDefaultSchema() m_numb = 0; m_title = i18n("Konsole Default"); m_imagePath = ""; // background pixmap - m_alignment = 1; // none + m_tqalignment = 1; // none m_useTransparency = false; // not use pseudo-transparency by default m_tr_r = m_tr_g = m_tr_b = 0; // just to be on the safe side m_tr_x = 0.0; @@ -273,7 +273,7 @@ void ColorSchema::writeConfig(const TQString& path) const c.setGroup("SchemaGeneral"); c.writeEntry("Title",m_title); c.writeEntry("ImagePath",m_imagePath); - c.writeEntry("ImageAlignment",m_alignment); + c.writeEntry("ImageAlignment",m_tqalignment); c.writeEntry("UseTransparency",m_useTransparency); c.writeEntry("TransparentR",m_tr_r); @@ -313,7 +313,7 @@ bool ColorSchema::rereadSchemaFile() char line[100]; - *lastRead = TQDateTime::currentDateTime(); + *lastRead = TQDateTime::tqcurrentDateTime(); while (fscanf(sysin,"%80[^\n]\n",line) > 0) { @@ -333,8 +333,8 @@ bool ColorSchema::rereadSchemaFile() continue; TQString qline(line); - m_imagePath = locate("wallpaper", qline.mid( qline.find(" ",7)+1 ) ); - m_alignment = attr; + m_imagePath = locate("wallpaper", qline.mid( qline.tqfind(" ",7)+1 ) ); + m_tqalignment = attr; } if (!strncmp(line,"transparency",12)) { float rx; @@ -388,7 +388,7 @@ bool ColorSchema::rereadSchemaFile() if (!(0 <= fi && fi <= TABLE_COLORS)) continue; if (!(0 <= tr && tr <= 1 )) continue; if (!(0 <= bo && bo <= 1 )) continue; - m_table[fi].color = kapp->palette().active().text(); + m_table[fi].color = kapp->tqpalette().active().text(); m_table[fi].transparent = tr; m_table[fi].bold = bo; } @@ -399,7 +399,7 @@ bool ColorSchema::rereadSchemaFile() if (!(0 <= fi && fi <= TABLE_COLORS)) continue; if (!(0 <= tr && tr <= 1 )) continue; if (!(0 <= bo && bo <= 1 )) continue; - m_table[fi].color = kapp->palette().active().base(); + m_table[fi].color = kapp->tqpalette().active().base(); m_table[fi].transparent = tr; m_table[fi].bold = bo; } @@ -537,7 +537,7 @@ bool ColorSchemaList::updateAllSchemaTimes(const TQDateTime& now) for (it=list.begin(); it!=list.end(); ++it) { TQString filename=*it; - int j=filename.findRev('/'); + int j=filename.tqfindRev('/'); if (j>-1) filename = filename.mid(8); @@ -615,7 +615,7 @@ bool ColorSchemaList::checkSchemas() // now. // // - TQDateTime now = TQDateTime::currentDateTime(); + TQDateTime now = TQDateTime::tqcurrentDateTime(); r = updateAllSchemaTimes(now); |