@ -48,12 +48,12 @@
# include <unistd.h>
# include <time.h>
bool operator < ( const KateSession: : Ptr & a , const KateSession: : Ptr & b )
bool operator < ( const Old KateSession: : Ptr & a , const Old KateSession: : Ptr & b )
{
return a - > sessionName ( ) . lower ( ) < b - > sessionName ( ) . lower ( ) ;
}
KateSession: : KateSession ( KateSessionManager * manager , const TQString & fileName , const TQString & name )
Old KateSession: : Old KateSession ( Old KateSessionManager * manager , const TQString & fileName , const TQString & name )
: m_sessionFileRel ( fileName )
, m_sessionName ( name )
, m_documents ( 0 )
@ -64,7 +64,7 @@ KateSession::KateSession (KateSessionManager *manager, const TQString &fileName,
init ( ) ;
}
void KateSession: : init ( )
void Old KateSession: : init ( )
{
// given file exists, use it to load some stuff ;)
if ( ! m_sessionFileRel . isEmpty ( ) & & TDEGlobal : : dirs ( ) - > exists ( sessionFile ( ) ) )
@ -113,18 +113,18 @@ void KateSession::init ()
}
}
KateSession: : ~ KateSession ( )
Old KateSession: : ~ Old KateSession ( )
{
delete m_readConfig ;
delete m_writeConfig ;
}
TQString KateSession: : sessionFile ( ) const
TQString Old KateSession: : sessionFile ( ) const
{
return m_manager - > sessionsDir ( ) + " / " + m_sessionFileRel ;
}
bool KateSession: : create ( const TQString & name , bool force )
bool Old KateSession: : create ( const TQString & name , bool force )
{
if ( ! force & & ( name . isEmpty ( ) | | ! m_sessionFileRel . isEmpty ( ) ) )
return false ;
@ -162,7 +162,7 @@ bool KateSession::create (const TQString &name, bool force)
return true ;
}
bool KateSession: : rename ( const TQString & name )
bool Old KateSession: : rename ( const TQString & name )
{
if ( name . isEmpty ( ) | | m_sessionFileRel . isEmpty ( ) | | m_sessionFileRel = = " default.katesession " )
return false ;
@ -177,7 +177,7 @@ bool KateSession::rename (const TQString &name)
return true ;
}
TDEConfig * KateSession: : configRead ( )
TDEConfig * Old KateSession: : configRead ( )
{
if ( m_sessionFileRel . isEmpty ( ) )
return 0 ;
@ -188,7 +188,7 @@ TDEConfig *KateSession::configRead ()
return m_readConfig = new KSimpleConfig ( sessionFile ( ) , true ) ;
}
TDEConfig * KateSession: : configWrite ( )
TDEConfig * Old KateSession: : configWrite ( )
{
if ( m_sessionFileRel . isEmpty ( ) )
return 0 ;
@ -203,10 +203,10 @@ TDEConfig *KateSession::configWrite ()
return m_writeConfig ;
}
KateSessionManager: : KateSessionManager ( TQObject * parent )
Old KateSessionManager: : Old KateSessionManager ( TQObject * parent )
: TQObject ( parent )
, m_sessionsDir ( locateLocal ( " data " , " kate/sessions " ) )
, m_activeSession ( new KateSession ( this , " " , " " ) )
, m_activeSession ( new Old KateSession ( this , " " , " " ) )
{
kdDebug ( ) < < " LOCAL SESSION DIR: " < < m_sessionsDir < < endl ;
@ -214,21 +214,21 @@ KateSessionManager::KateSessionManager (TQObject *parent)
TDEGlobal : : dirs ( ) - > makeDir ( m_sessionsDir ) ;
}
KateSessionManager: : ~ KateSessionManager( )
Old KateSessionManager: : ~ Old KateSessionManager( )
{
}
KateSessionManager * KateSessionManager: : self ( )
Old KateSessionManager * Old KateSessionManager: : self ( )
{
return KateApp : : self ( ) - > sessionManager ( ) ;
}
void KateSessionManager: : dirty ( const TQString & )
void Old KateSessionManager: : dirty ( const TQString & )
{
updateSessionList ( ) ;
}
void KateSessionManager: : updateSessionList ( )
void Old KateSessionManager: : updateSessionList ( )
{
m_sessionList . clear ( ) ;
@ -238,7 +238,7 @@ void KateSessionManager::updateSessionList ()
bool foundDefault = false ;
for ( unsigned int i = 0 ; i < dir . count ( ) ; + + i )
{
KateSession * session = new KateSession ( this , dir [ i ] , " " ) ;
Old KateSession * session = new Old KateSession ( this , dir [ i ] , " " ) ;
m_sessionList . append ( session ) ;
kdDebug ( ) < < " FOUND SESSION: " < < session - > sessionName ( ) < < " FILE: " < < session - > sessionFile ( ) < < endl ;
@ -249,12 +249,12 @@ void KateSessionManager::updateSessionList ()
// add default session, if not there
if ( ! foundDefault )
m_sessionList . append ( new KateSession ( this , " default.katesession " , i18n ( " Default Session " ) ) ) ;
m_sessionList . append ( new Old KateSession ( this , " default.katesession " , i18n ( " Default Session " ) ) ) ;
qHeapSort ( m_sessionList ) ;
}
void KateSessionManager: : activateSession ( KateSession: : Ptr session , bool closeLast , bool saveLast , bool loadNew )
void Old KateSessionManager: : activateSession ( Old KateSession: : Ptr session , bool closeLast , bool saveLast , bool loadNew )
{
// don't reload.
// ### comparing the pointers directly is b0rk3d :(
@ -342,18 +342,18 @@ void KateSessionManager::activateSession (KateSession::Ptr session, bool closeLa
}
}
KateSession: : Ptr KateSessionManager: : createSession ( const TQString & name )
Old KateSession: : Ptr Old KateSessionManager: : createSession ( const TQString & name )
{
KateSession: : Ptr s = new KateSession ( this , " " , " " ) ;
Old KateSession: : Ptr s = new Old KateSession ( this , " " , " " ) ;
s - > create ( name ) ;
return s ;
}
KateSession: : Ptr KateSessionManager: : giveSession ( const TQString & name )
Old KateSession: : Ptr Old KateSessionManager: : giveSession ( const TQString & name )
{
if ( name . isEmpty ( ) )
return new KateSession ( this , " " , " " ) ;
return new Old KateSession ( this , " " , " " ) ;
updateSessionList ( ) ;
@ -366,7 +366,7 @@ KateSession::Ptr KateSessionManager::giveSession (const TQString &name)
return createSession ( name ) ;
}
bool KateSessionManager: : saveActiveSession ( bool tryAsk , bool rememberAsLast )
bool Old KateSessionManager: : saveActiveSession ( bool tryAsk , bool rememberAsLast )
{
if ( tryAsk )
{
@ -437,7 +437,7 @@ bool KateSessionManager::saveActiveSession (bool tryAsk, bool rememberAsLast)
return true ;
}
bool KateSessionManager: : chooseSession ( )
bool Old KateSessionManager: : chooseSession ( )
{
bool success = true ;
@ -452,18 +452,18 @@ bool KateSessionManager::chooseSession ()
// uhh, just open last used session, show no chooser
if ( sesStart = = " last " )
{
activateSession ( new KateSession ( this , lastSession , " " ) , false , false ) ;
activateSession ( new Old KateSession ( this , lastSession , " " ) , false , false ) ;
return success ;
}
// start with empty new session
if ( sesStart = = " new " )
{
activateSession ( new KateSession ( this , " " , " " ) , false , false ) ;
activateSession ( new Old KateSession ( this , " " , " " ) , false , false ) ;
return success ;
}
KateSessionChooser * chooser = new KateSessionChooser ( 0 , lastSession ) ;
Old KateSessionChooser * chooser = new Old KateSessionChooser ( 0 , lastSession ) ;
bool retry = true ;
int res = 0 ;
@ -473,9 +473,9 @@ bool KateSessionManager::chooseSession ()
switch ( res )
{
case KateSessionChooser: : resultOpen :
case Old KateSessionChooser: : resultOpen :
{
KateSession: : Ptr s = chooser - > selectedSession ( ) ;
Old KateSession: : Ptr s = chooser - > selectedSession ( ) ;
if ( ! s )
{
@ -489,13 +489,13 @@ bool KateSessionManager::chooseSession ()
}
// exit the app lateron
case KateSessionChooser: : resultQuit :
case Old KateSessionChooser: : resultQuit :
success = false ;
retry = false ;
break ;
default :
activateSession ( new KateSession ( this , " " , " " ) , false , false ) ;
activateSession ( new Old KateSession ( this , " " , " " ) , false , false ) ;
retry = false ;
break ;
}
@ -506,9 +506,9 @@ bool KateSessionManager::chooseSession ()
{
c - > setGroup ( " General " ) ;
if ( res = = KateSessionChooser: : resultOpen )
if ( res = = Old KateSessionChooser: : resultOpen )
c - > writeEntry ( " Startup Session " , " last " ) ;
else if ( res = = KateSessionChooser: : resultNew )
else if ( res = = Old KateSessionChooser: : resultNew )
c - > writeEntry ( " Startup Session " , " new " ) ;
c - > sync ( ) ;
@ -519,24 +519,24 @@ bool KateSessionManager::chooseSession ()
return success ;
}
void KateSessionManager: : sessionNew ( )
void Old KateSessionManager: : sessionNew ( )
{
activateSession ( new KateSession ( this , " " , " " ) ) ;
activateSession ( new Old KateSession ( this , " " , " " ) ) ;
}
void KateSessionManager: : sessionOpen ( )
void Old KateSessionManager: : sessionOpen ( )
{
KateSessionOpenDialog * chooser = new KateSessionOpenDialog ( 0 ) ;
Old KateSessionOpenDialog * chooser = new Old KateSessionOpenDialog ( 0 ) ;
int res = chooser - > exec ( ) ;
if ( res = = KateSessionOpenDialog: : resultCancel )
if ( res = = Old KateSessionOpenDialog: : resultCancel )
{
delete chooser ;
return ;
}
KateSession: : Ptr s = chooser - > selectedSession ( ) ;
Old KateSession: : Ptr s = chooser - > selectedSession ( ) ;
if ( s )
activateSession ( s ) ;
@ -544,7 +544,7 @@ void KateSessionManager::sessionOpen ()
delete chooser ;
}
void KateSessionManager: : sessionSave ( )
void Old KateSessionManager: : sessionSave ( )
{
// if the active session is valid, just save it :)
if ( saveActiveSession ( ) )
@ -566,7 +566,7 @@ void KateSessionManager::sessionSave ()
saveActiveSession ( ) ;
}
void KateSessionManager: : sessionSaveAs ( )
void Old KateSessionManager: : sessionSaveAs ( )
{
bool ok = false ;
TQString name = KInputDialog : : getText ( i18n ( " Specify New Name for Current Session " ) , i18n ( " Session name: " ) , " " , & ok ) ;
@ -585,9 +585,9 @@ void KateSessionManager::sessionSaveAs ()
}
void KateSessionManager: : sessionManage ( )
void Old KateSessionManager: : sessionManage ( )
{
KateSessionManageDialog * dlg = new KateSessionManageDialog ( 0 ) ;
Old KateSessionManageDialog * dlg = new Old KateSessionManageDialog ( 0 ) ;
dlg - > exec ( ) ;
@ -596,10 +596,10 @@ void KateSessionManager::sessionManage ()
//BEGIN CHOOSER DIALOG
class KateSessionChooserItem : public TQListViewItem
class Old KateSessionChooserItem : public TQListViewItem
{
public :
KateSessionChooserItem ( TDEListView * lv , KateSession: : Ptr s )
Old KateSessionChooserItem ( TDEListView * lv , Old KateSession: : Ptr s )
: TQListViewItem ( lv , s - > sessionName ( ) )
, session ( s )
{
@ -608,10 +608,10 @@ class KateSessionChooserItem : public TQListViewItem
setText ( 1 , docs ) ;
}
KateSession: : Ptr session ;
Old KateSession: : Ptr session ;
} ;
KateSessionChooser: : KateSessionChooser ( TQWidget * parent , const TQString & lastSession )
Old KateSessionChooser: : Old KateSessionChooser ( TQWidget * parent , const TQString & lastSession )
: KDialogBase ( parent
, " "
, true
@ -648,10 +648,10 @@ KateSessionChooser::KateSessionChooser (TQWidget *parent, const TQString &lastSe
connect ( m_sessions , TQT_SIGNAL ( selectionChanged ( ) ) , this , TQT_SLOT ( selectionChanged ( ) ) ) ;
connect ( m_sessions , TQT_SIGNAL ( doubleClicked ( TQListViewItem * , const TQPoint & , int ) ) , this , TQT_SLOT ( slotUser2 ( ) ) ) ;
KateSessionList & slist ( KateSessionManager: : self ( ) - > sessionList ( ) ) ;
Old KateSessionList & slist ( Old KateSessionManager: : self ( ) - > sessionList ( ) ) ;
for ( unsigned int i = 0 ; i < slist . count ( ) ; + + i )
{
KateSessionChooserItem * item = new KateSessionChooserItem ( m_sessions , slist [ i ] ) ;
Old KateSessionChooserItem * item = new Old KateSessionChooserItem ( m_sessions , slist [ i ] ) ;
if ( slist [ i ] - > sessionFileRelative ( ) = = lastSession )
m_sessions - > setSelected ( item , true ) ;
@ -665,13 +665,13 @@ KateSessionChooser::KateSessionChooser (TQWidget *parent, const TQString &lastSe
selectionChanged ( ) ;
}
KateSessionChooser: : ~ KateSessionChooser ( )
Old KateSessionChooser: : ~ Old KateSessionChooser ( )
{
}
KateSession: : Ptr KateSessionChooser: : selectedSession ( )
Old KateSession: : Ptr Old KateSessionChooser: : selectedSession ( )
{
KateSessionChooserItem * item = ( KateSessionChooserItem * ) m_sessions - > selectedItem ( ) ;
Old KateSessionChooserItem * item = ( Old KateSessionChooserItem * ) m_sessions - > selectedItem ( ) ;
if ( ! item )
return 0 ;
@ -679,27 +679,27 @@ KateSession::Ptr KateSessionChooser::selectedSession ()
return item - > session ;
}
bool KateSessionChooser: : reopenLastSession ( )
bool Old KateSessionChooser: : reopenLastSession ( )
{
return m_useLast - > isChecked ( ) ;
}
void KateSessionChooser: : slotUser2 ( )
void Old KateSessionChooser: : slotUser2 ( )
{
done ( resultOpen ) ;
}
void KateSessionChooser: : slotUser3 ( )
void Old KateSessionChooser: : slotUser3 ( )
{
done ( resultNew ) ;
}
void KateSessionChooser: : slotUser1 ( )
void Old KateSessionChooser: : slotUser1 ( )
{
done ( resultQuit ) ;
}
void KateSessionChooser: : selectionChanged ( )
void Old KateSessionChooser: : selectionChanged ( )
{
enableButton ( KDialogBase : : User2 , m_sessions - > selectedItem ( ) ) ;
}
@ -708,7 +708,7 @@ void KateSessionChooser::selectionChanged ()
//BEGIN OPEN DIALOG
KateSessionOpenDialog: : KateSessionOpenDialog ( TQWidget * parent )
Old KateSessionOpenDialog: : Old KateSessionOpenDialog ( TQWidget * parent )
: KDialogBase ( parent
, " "
, true
@ -737,22 +737,22 @@ KateSessionOpenDialog::KateSessionOpenDialog (TQWidget *parent)
connect ( m_sessions , TQT_SIGNAL ( doubleClicked ( TQListViewItem * , const TQPoint & , int ) ) , this , TQT_SLOT ( slotUser2 ( ) ) ) ;
KateSessionList & slist ( KateSessionManager: : self ( ) - > sessionList ( ) ) ;
Old KateSessionList & slist ( Old KateSessionManager: : self ( ) - > sessionList ( ) ) ;
for ( unsigned int i = 0 ; i < slist . count ( ) ; + + i )
{
new KateSessionChooserItem ( m_sessions , slist [ i ] ) ;
new Old KateSessionChooserItem ( m_sessions , slist [ i ] ) ;
}
setResult ( resultCancel ) ;
}
KateSessionOpenDialog: : ~ KateSessionOpenDialog ( )
Old KateSessionOpenDialog: : ~ Old KateSessionOpenDialog ( )
{
}
KateSession: : Ptr KateSessionOpenDialog: : selectedSession ( )
Old KateSession: : Ptr Old KateSessionOpenDialog: : selectedSession ( )
{
KateSessionChooserItem * item = ( KateSessionChooserItem * ) m_sessions - > selectedItem ( ) ;
Old KateSessionChooserItem * item = ( Old KateSessionChooserItem * ) m_sessions - > selectedItem ( ) ;
if ( ! item )
return 0 ;
@ -760,12 +760,12 @@ KateSession::Ptr KateSessionOpenDialog::selectedSession ()
return item - > session ;
}
void KateSessionOpenDialog: : slotUser1 ( )
void Old KateSessionOpenDialog: : slotUser1 ( )
{
done ( resultCancel ) ;
}
void KateSessionOpenDialog: : slotUser2 ( )
void Old KateSessionOpenDialog: : slotUser2 ( )
{
done ( resultOk ) ;
}
@ -774,7 +774,7 @@ void KateSessionOpenDialog::slotUser2 ()
//BEGIN MANAGE DIALOG
KateSessionManageDialog: : KateSessionManageDialog ( TQWidget * parent )
Old KateSessionManageDialog: : Old KateSessionManageDialog ( TQWidget * parent )
: KDialogBase ( parent
, " "
, true
@ -821,27 +821,27 @@ KateSessionManageDialog::KateSessionManageDialog (TQWidget *parent)
selectionChanged ( ) ;
}
KateSessionManageDialog: : ~ KateSessionManageDialog ( )
Old KateSessionManageDialog: : ~ Old KateSessionManageDialog ( )
{
}
void KateSessionManageDialog: : slotUser1 ( )
void Old KateSessionManageDialog: : slotUser1 ( )
{
done ( 0 ) ;
}
void KateSessionManageDialog: : selectionChanged ( )
void Old KateSessionManageDialog: : selectionChanged ( )
{
KateSessionChooserItem * item = ( KateSessionChooserItem * ) m_sessions - > selectedItem ( ) ;
Old KateSessionChooserItem * item = ( Old KateSessionChooserItem * ) m_sessions - > selectedItem ( ) ;
m_rename - > setEnabled ( item & & item - > session - > sessionFileRelative ( ) ! = " default.katesession " ) ;
m_del - > setEnabled ( item & & item - > session - > sessionFileRelative ( ) ! = " default.katesession " ) ;
}
void KateSessionManageDialog: : rename ( )
void Old KateSessionManageDialog: : rename ( )
{
KateSessionChooserItem * item = ( KateSessionChooserItem * ) m_sessions - > selectedItem ( ) ;
Old KateSessionChooserItem * item = ( Old KateSessionChooserItem * ) m_sessions - > selectedItem ( ) ;
if ( ! item | | item - > session - > sessionFileRelative ( ) = = " default.katesession " )
return ;
@ -862,43 +862,43 @@ void KateSessionManageDialog::rename ()
updateSessionList ( ) ;
}
void KateSessionManageDialog: : del ( )
void Old KateSessionManageDialog: : del ( )
{
KateSessionChooserItem * item = ( KateSessionChooserItem * ) m_sessions - > selectedItem ( ) ;
Old KateSessionChooserItem * item = ( Old KateSessionChooserItem * ) m_sessions - > selectedItem ( ) ;
if ( ! item | | item - > session - > sessionFileRelative ( ) = = " default.katesession " )
return ;
TQFile : : remove ( item - > session - > sessionFile ( ) ) ;
KateSessionManager: : self ( ) - > updateSessionList ( ) ;
Old KateSessionManager: : self ( ) - > updateSessionList ( ) ;
updateSessionList ( ) ;
}
void KateSessionManageDialog: : updateSessionList ( )
void Old KateSessionManageDialog: : updateSessionList ( )
{
m_sessions - > clear ( ) ;
KateSessionList & slist ( KateSessionManager: : self ( ) - > sessionList ( ) ) ;
Old KateSessionList & slist ( Old KateSessionManager: : self ( ) - > sessionList ( ) ) ;
for ( unsigned int i = 0 ; i < slist . count ( ) ; + + i )
{
new KateSessionChooserItem ( m_sessions , slist [ i ] ) ;
new Old KateSessionChooserItem ( m_sessions , slist [ i ] ) ;
}
}
//END MANAGE DIALOG
KateSessionsAction: : KateSessionsAction( const TQString & text , TQObject * parent , const char * name )
Old KateSessionsAction: : Old KateSessionsAction( const TQString & text , TQObject * parent , const char * name )
: TDEActionMenu ( text , parent , name )
{
connect ( popupMenu ( ) , TQT_SIGNAL ( aboutToShow ( ) ) , this , TQT_SLOT ( slotAboutToShow ( ) ) ) ;
}
void KateSessionsAction: : slotAboutToShow ( )
void Old KateSessionsAction: : slotAboutToShow ( )
{
popupMenu ( ) - > clear ( ) ;
KateSessionList & slist ( KateSessionManager: : self ( ) - > sessionList ( ) ) ;
Old KateSessionList & slist ( Old KateSessionManager: : self ( ) - > sessionList ( ) ) ;
for ( unsigned int i = 0 ; i < slist . count ( ) ; + + i )
{
popupMenu ( ) - > insertItem (
@ -908,13 +908,13 @@ void KateSessionsAction::slotAboutToShow()
}
}
void KateSessionsAction: : openSession ( int i )
void Old KateSessionsAction: : openSession ( int i )
{
KateSessionList & slist ( KateSessionManager: : self ( ) - > sessionList ( ) ) ;
Old KateSessionList & slist ( Old KateSessionManager: : self ( ) - > sessionList ( ) ) ;
if ( ( uint ) i > = slist . count ( ) )
return ;
KateSessionManager: : self ( ) - > activateSession ( slist [ ( uint ) i ] ) ;
Old KateSessionManager: : self ( ) - > activateSession ( slist [ ( uint ) i ] ) ;
}
// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;