Browse Source

Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

tags/r14.0.0
Timothy Pearson 6 years ago
parent
commit
1e90902cbb
4 changed files with 16 additions and 16 deletions
  1. 2
    2
      krename/commandplugin.cpp
  2. 2
    2
      krename/kmyhistorycombo.cpp
  3. 8
    8
      krename/undodialog.cpp
  4. 4
    4
      krename/undodialog.h

+ 2
- 2
krename/commandplugin.cpp View File

@@ -130,9 +130,9 @@ TQString CommandPlugin::processFile( BatchRenamer* b, int i, TQString, int )
130 130
     proc << c;
131 131
     
132 132
     if( noblock )
133
-        proc.start( KProcess::DontCare, KProcess::NoCommunication );
133
+        proc.start( TDEProcess::DontCare, TDEProcess::NoCommunication );
134 134
     else
135
-        proc.start( KProcess::Block, KProcess::NoCommunication );
135
+        proc.start( TDEProcess::Block, TDEProcess::NoCommunication );
136 136
 
137 137
     proc.resume();
138 138
 

+ 2
- 2
krename/kmyhistorycombo.cpp View File

@@ -52,8 +52,8 @@ KMyHistoryCombo::KMyHistoryCombo( bool customPopup, TQWidget* parent, const char
52 52
     setHistoryItems( history );
53 53
 
54 54
     completionObject()->setItems( ( completion.isEmpty() ? history : completion ) );
55
-    setCompletionMode( (KGlobalSettings::Completion)config->readNumEntry( "CompletionMode",
56
-                        KGlobalSettings::completionMode() ) );    
55
+    setCompletionMode( (TDEGlobalSettings::Completion)config->readNumEntry( "CompletionMode",
56
+                        TDEGlobalSettings::completionMode() ) );    
57 57
                         
58 58
     connect( this, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( textChangedGovernor() ) );
59 59
     connect( m_timer, TQT_SIGNAL( timeout() ), this, TQT_SIGNAL( delayedTextChanged() ) );

+ 8
- 8
krename/undodialog.cpp View File

@@ -77,24 +77,24 @@ void UndoDialog::start()
77 77
             == KMessageBox::Cancel )
78 78
             return;
79 79
 
80
-    KProcess *proc = new KProcess;
80
+    TDEProcess *proc = new TDEProcess;
81 81
     *proc << scriptname->url() << "--krename";
82 82
 
83 83
     enableButton( KDialogBase::User1, false );
84 84
 
85
-    if( !proc->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
85
+    if( !proc->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) {
86 86
         KMessageBox::sorry( this, i18n("Unable to start the given undo script!") );
87 87
         enableButton( KDialogBase::User1, true );
88 88
         delete proc;
89 89
         return;
90 90
     }
91 91
     proc->resume();
92
-    connect( proc, TQT_SIGNAL( receivedStdout( KProcess*, char*, int) ), this, TQT_SLOT( receive( KProcess*, char*, int ) ) );
93
-    connect( proc, TQT_SIGNAL( receivedStderr( KProcess*, char*, int) ), this, TQT_SLOT( receiveErr( KProcess*, char*, int ) ) );
94
-    connect( proc, TQT_SIGNAL( processExited( KProcess* ) ), this, TQT_SLOT( finished( KProcess* ) ) );
92
+    connect( proc, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int) ), this, TQT_SLOT( receive( TDEProcess*, char*, int ) ) );
93
+    connect( proc, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int) ), this, TQT_SLOT( receiveErr( TDEProcess*, char*, int ) ) );
94
+    connect( proc, TQT_SIGNAL( processExited( TDEProcess* ) ), this, TQT_SLOT( finished( TDEProcess* ) ) );
95 95
 }
96 96
 
97
-void UndoDialog::receive( KProcess*, char* buffer, int len )
97
+void UndoDialog::receive( TDEProcess*, char* buffer, int len )
98 98
 {
99 99
     TQString text;
100 100
     for( int i = 0; i < len; i++ )
@@ -103,7 +103,7 @@ void UndoDialog::receive( KProcess*, char* buffer, int len )
103 103
     browser->setText( browser->text() + text + "<br>");
104 104
 }
105 105
 
106
-void UndoDialog::receiveErr( KProcess*, char* buffer, int len )
106
+void UndoDialog::receiveErr( TDEProcess*, char* buffer, int len )
107 107
 {
108 108
     TQString text = "<b>";
109 109
     for( int i = 0; i < len; i++ )
@@ -112,7 +112,7 @@ void UndoDialog::receiveErr( KProcess*, char* buffer, int len )
112 112
     browser->setText( browser->text() + text + "</b><br>");
113 113
 }
114 114
 
115
-void UndoDialog::finished( KProcess* p )
115
+void UndoDialog::finished( TDEProcess* p )
116 116
 {
117 117
     delete p;
118 118
     KMessageBox::information( this, i18n("Finished successfully") );

+ 4
- 4
krename/undodialog.h View File

@@ -21,7 +21,7 @@
21 21
 #include <kdialogbase.h>
22 22
 
23 23
 class KPushButton;
24
-class KProcess;
24
+class TDEProcess;
25 25
 class KTextBrowser;
26 26
 class KURLRequester;
27 27
 class TQVBoxLayout;
@@ -42,9 +42,9 @@ class UndoDialog : public KDialogBase
42 42
         void start();
43 43
     
44 44
     private slots:
45
-        void receive( KProcess*, char* buffer, int len );
46
-        void receiveErr( KProcess*, char* buffer, int len );
47
-        void finished( KProcess* p );
45
+        void receive( TDEProcess*, char* buffer, int len );
46
+        void receiveErr( TDEProcess*, char* buffer, int len );
47
+        void finished( TDEProcess* p );
48 48
         void enableControls();
49 49
         
50 50
     private:

Loading…
Cancel
Save